[tor-commits] [tech-reports/master] Update datagram-comparison report to new style.
karsten at torproject.org
karsten at torproject.org
Sun Aug 26 06:01:05 UTC 2012
commit ef5e226756db78e38048fd46b371e8865b078dbf
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Wed Aug 8 08:57:47 2012 +0200
Update datagram-comparison report to new style.
---
2011/datagram-comparison/.gitignore | 11 +--
2011/datagram-comparison/Makefile | 21 -----
2011/datagram-comparison/datagram-comparison.tex | 17 ++---
2011/datagram-comparison/freedom-data.pdf | Bin 0 -> 14592 bytes
2011/datagram-comparison/liberatore-data.pdf | Bin 0 -> 14479 bytes
2011/datagram-comparison/prettyref.sty | 41 ----------
2011/datagram-comparison/reardon-data.pdf | Bin 0 -> 14776 bytes
2011/datagram-comparison/tor-data.pdf | Bin 0 -> 14091 bytes
2011/datagram-comparison/tor-extension.pdf | Bin 0 -> 11779 bytes
2011/datagram-comparison/tortechrep.cls | 1 +
2011/datagram-comparison/vc | 24 ------
2011/datagram-comparison/vc-git.awk | 89 ----------------------
2011/datagram-comparison/viecco-data.pdf | Bin 0 -> 15242 bytes
13 files changed, 9 insertions(+), 195 deletions(-)
diff --git a/2011/datagram-comparison/.gitignore b/2011/datagram-comparison/.gitignore
index 6060eac..de61ef1 100644
--- a/2011/datagram-comparison/.gitignore
+++ b/2011/datagram-comparison/.gitignore
@@ -1,10 +1,3 @@
-*.swp
-*.aux
-*.log
-*.out
-*.bbl
-*.blg
-tor-data.pdf
-tor-extension.pdf
datagram-comparison.pdf
-vc.tex
+datagram-comparison-2011-11-07.pdf
+
diff --git a/2011/datagram-comparison/Makefile b/2011/datagram-comparison/Makefile
deleted file mode 100644
index 05746ab..0000000
--- a/2011/datagram-comparison/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-all: datagram-comparison.pdf
-
-%.pdf: %.svg
- inkscape --without-gui --export-area-page --export-pdf=`pwd`/$@ `pwd`/$<
-
-datagram-comparison.pdf: tor-data.pdf tor-extension.pdf reardon-data.pdf viecco-data.pdf \
- liberatore-data.pdf freedom-data.pdf
-
-%.pdf: %.tex references.bib
- ./vc -m
- pdflatex $<
- bibtex datagram-comparison
- pdflatex $<
- pdflatex $<
-
-publish: datagram-comparison.pdf
- cp datagram-comparison.pdf ~/public_html/volatile
-
-clean:
- rm -f *.aux *.bbl *.blg *.log *.out \
- tor-data.pdf tor-extension.pdf datagram-comparison.pdf vc.tex
diff --git a/2011/datagram-comparison/datagram-comparison.tex b/2011/datagram-comparison/datagram-comparison.tex
index 8a12791..0741547 100644
--- a/2011/datagram-comparison/datagram-comparison.tex
+++ b/2011/datagram-comparison/datagram-comparison.tex
@@ -1,5 +1,4 @@
-\documentclass[a4paper]{article}
-\usepackage{a4wide}
+\documentclass{tortechrep}
\usepackage{upgreek}
\usepackage{palatino}
\usepackage{fancyhdr}
@@ -7,7 +6,6 @@
\usepackage{graphicx}
\usepackage{parskip}
%\immediate\write18{sh ./vc}
-\input{vc.tex}
%\usepackage{draftwatermark}
\usepackage{hyperref}
@@ -41,20 +39,17 @@
\newrefformat{cha}{Chapter~\ref{#1}}
\newrefformat{app}{Appendix~\ref{#1}}
-\pagestyle{fancy}
-\fancyhf{}
-
-\fancyhead[C]{\sc revision \VCRevisionMod~(\VCDateISO~\VCTime)}
-\fancyfoot[C]{\thepage}
-
\newcommand{\figref}[1]{\textsf{#1}}
-\title{Comparison of Tor Datagram Designs}
-\author{Steven J. Murdoch}
%\renewcommand{\today}{29 March 2011}
\begin{document}
+\title{Comparison of Tor Datagram Designs}
+\author{Steven J. Murdoch}
+\contact{steven.murdoch at cl.cam.ac.uk}
+\date{November 7, 2011}
+\reportid{2011-11-001}
\maketitle
%\setlength{\parindent}{0pt}
diff --git a/2011/datagram-comparison/freedom-data.pdf b/2011/datagram-comparison/freedom-data.pdf
new file mode 100644
index 0000000..680a2d2
Binary files /dev/null and b/2011/datagram-comparison/freedom-data.pdf differ
diff --git a/2011/datagram-comparison/liberatore-data.pdf b/2011/datagram-comparison/liberatore-data.pdf
new file mode 100644
index 0000000..1bc6b2f
Binary files /dev/null and b/2011/datagram-comparison/liberatore-data.pdf differ
diff --git a/2011/datagram-comparison/prettyref.sty b/2011/datagram-comparison/prettyref.sty
deleted file mode 100644
index f3ce032..0000000
--- a/2011/datagram-comparison/prettyref.sty
+++ /dev/null
@@ -1,41 +0,0 @@
-%%
-%% This is file `prettyref.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% prettyref.dtx (with options: `style')
-%%
-%% Copyright (c) 1995 Kevin Ruland
-%%
-%%
-%% prettyref v3.0
-%%
-%% Copyright 1995,1998. by Kevin Ruland kevin at rodin.wustl.edu
-%%
-%% The following licence notice was added by Clea F. Rees on behalf of Kevin Ruland on 2008/11/05.
-%%
-%% prettyref consists of the files prettyref.dtx, prettyref.ins, prettyref.pdf, README and the derived file prettyref.sty. It is released to the public domain.
-%%
-\ProvidesPackage{prettyref}[1998/07/09 v3.0]
-\def\newrefformat#1#2{%
- \@namedef{pr@#1}##1{#2}}
-\newrefformat{eq}{\textup{(\ref{#1})}}
-\newrefformat{lem}{Lemma \ref{#1}}
-\newrefformat{thm}{Theorem \ref{#1}}
-\newrefformat{cha}{Chapter \ref{#1}}
-\newrefformat{sec}{Section \ref{#1}}
-\newrefformat{tab}{Table \ref{#1} on page \pageref{#1}}
-\newrefformat{fig}{Figure \ref{#1} on page \pageref{#1}}
-\def\prettyref#1{\@prettyref#1:}
-\def\@prettyref#1:#2:{%
- \expandafter\ifx\csname pr@#1\endcsname\relax%
- \PackageWarning{prettyref}{Reference format #1\space undefined}%
- \ref{#1:#2}%
- \else%
- \csname pr@#1\endcsname{#1:#2}%
- \fi%
-}
-\endinput
-%%
-%% End of file `prettyref.sty'.
diff --git a/2011/datagram-comparison/reardon-data.pdf b/2011/datagram-comparison/reardon-data.pdf
new file mode 100644
index 0000000..7a5f631
Binary files /dev/null and b/2011/datagram-comparison/reardon-data.pdf differ
diff --git a/2011/datagram-comparison/tor-data.pdf b/2011/datagram-comparison/tor-data.pdf
new file mode 100644
index 0000000..699b346
Binary files /dev/null and b/2011/datagram-comparison/tor-data.pdf differ
diff --git a/2011/datagram-comparison/tor-extension.pdf b/2011/datagram-comparison/tor-extension.pdf
new file mode 100644
index 0000000..29167f9
Binary files /dev/null and b/2011/datagram-comparison/tor-extension.pdf differ
diff --git a/2011/datagram-comparison/tortechrep.cls b/2011/datagram-comparison/tortechrep.cls
new file mode 120000
index 0000000..4c24db2
--- /dev/null
+++ b/2011/datagram-comparison/tortechrep.cls
@@ -0,0 +1 @@
+../../tortechrep.cls
\ No newline at end of file
diff --git a/2011/datagram-comparison/vc b/2011/datagram-comparison/vc
deleted file mode 100755
index 5c5a1b3..0000000
--- a/2011/datagram-comparison/vc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# This is file 'vc' from the vc bundle for TeX.
-# The original file can be found at CTAN:support/vc.
-# This file is Public Domain.
-
-# Parse command line options.
-full=0
-mod=0
-while [ -n "$(echo $1 | grep '-')" ]; do
- case $1 in
- -f ) full=1 ;;
- -m ) mod=1 ;;
- * ) echo 'usage: vc [-f] [-m]'
- exit 1
- esac
- shift
-done
-# English locale.
-LC_ALL=C
-git --no-pager log -1 HEAD --pretty=format:"Hash: %H%nAbr. Hash: %h%nParent Hashes: %P%nAbr. Parent Hashes: %p%nAuthor Name: %an%nAuthor Email: %ae%nAuthor Date: %ai%nCommitter Name: %cn%nCommitter Email: %ce%nCommitter Date: %ci%n" |gawk -v script=log -v full=$full -f vc-git.awk > vc.tex
-if [ "$mod" = 1 ]
-then
- git status |gawk -v script=status -f vc-git.awk >> vc.tex
-fi
diff --git a/2011/datagram-comparison/vc-git.awk b/2011/datagram-comparison/vc-git.awk
deleted file mode 100644
index 66b3526..0000000
--- a/2011/datagram-comparison/vc-git.awk
+++ /dev/null
@@ -1,89 +0,0 @@
-# This is file 'vc-git.awk' from the vc bundle for TeX.
-# The original file can be found at CTAN:support/vc.
-# This file is Public Domain.
-BEGIN {
-
-### Process output of "git status".
- if (script=="status") {
- modified = 0
- }
-
-}
-
-
-
-### Process output of "git log".
-script=="log" && /^Hash:/ { Hash = substr($0, 2+match($0, ":")) }
-script=="log" && /^Abr. Hash:/ { AbrHash = substr($0, 2+match($0, ":")) }
-script=="log" && /^Parent Hashes:/ { ParentHashes = substr($0, 2+match($0, ":")) }
-script=="log" && /^Abr. Parent Hashes:/ { AbrParentHashes = substr($0, 2+match($0, ":")) }
-script=="log" && /^Author Name:/ { AuthorName = substr($0, 2+match($0, ":")) }
-script=="log" && /^Author Email:/ { AuthorEmail = substr($0, 2+match($0, ":")) }
-script=="log" && /^Author Date:/ { AuthorDate = substr($0, 2+match($0, ":")) }
-script=="log" && /^Committer Name:/ { CommitterName = substr($0, 2+match($0, ":")) }
-script=="log" && /^Committer Email:/ { CommitterEmail = substr($0, 2+match($0, ":")) }
-script=="log" && /^Committer Date:/ { CommitterDate = substr($0, 2+match($0, ":")) }
-
-### Process output of "git status".
-### Changed index?
-script=="status" && /^# Changes to be committed:/ { modified = 1 }
-### Unstaged modifications?
-script=="status" && /^# Changed but not updated:/ { modified = 2 }
-
-
-
-END {
-
-### Process output of "git log".
- if (script=="log") {
-### Standard encoding is UTF-8.
- if (Encoding == "") Encoding = "UTF-8"
-### Extract relevant information from variables.
- LongDate = substr(AuthorDate, 1, 25)
- DateRAW = substr(LongDate, 1, 10)
- DateISO = DateRAW
- DateTEX = DateISO
- gsub("-", "/", DateTEX)
- Time = substr(LongDate, 12, 14)
-### Write file identification to vc.tex.
- print "%%% This file has been generated by the vc bundle for TeX."
- print "%%% Do not edit this file!"
- print "%%%"
-### Write Git specific macros.
- print "%%% Define Git specific macros."
- print "\\gdef\\GITHash{" Hash "}%"
- print "\\gdef\\GITAbrHash{" AbrHash "}%"
- print "\\gdef\\GITParentHashes{" ParentHashes "}%"
- print "\\gdef\\GITAbrParentHashes{" AbrParentHashes "}%"
- print "\\gdef\\GITAuthorName{" AuthorName "}%"
- print "\\gdef\\GITAuthorEmail{" AuthorEmail "}%"
- print "\\gdef\\GITAuthorDate{" AuthorDate "}%"
- print "\\gdef\\GITCommitterName{" CommitterName "}%"
- print "\\gdef\\GITCommitterEmail{" CommitterEmail "}%"
- print "\\gdef\\GITCommitterDate{" CommitterDate "}%"
-### Write generic version control macros.
- print "%%% Define generic version control macros."
- print "\\gdef\\VCRevision{\\GITAbrHash}%"
- print "\\gdef\\VCAuthor{\\GITAuthorName}%"
- print "\\gdef\\VCDateRAW{" DateRAW "}%"
- print "\\gdef\\VCDateISO{" DateISO "}%"
- print "\\gdef\\VCDateTEX{" DateTEX "}%"
- print "\\gdef\\VCTime{" Time "}%"
- print "\\gdef\\VCModifiedText{\\textcolor{red}{with local modifications!}}%"
- print "%%% Assume clean working copy."
- print "\\gdef\\VCModified{0}%"
- print "\\gdef\\VCRevisionMod{\\VCRevision}%"
- }
-
-### Process output of "git status".
- if (script=="status") {
- print "%%% Is working copy modified?"
- print "\\gdef\\VCModified{" modified "}%"
- if (modified==0) {
- print "\\gdef\\VCRevisionMod{\\VCRevision}%"
- } else {
- print "\\gdef\\VCRevisionMod{\\VCRevision~\\VCModifiedText}%"
- }
- }
-
-}
diff --git a/2011/datagram-comparison/viecco-data.pdf b/2011/datagram-comparison/viecco-data.pdf
new file mode 100644
index 0000000..4e51fc4
Binary files /dev/null and b/2011/datagram-comparison/viecco-data.pdf differ
More information about the tor-commits
mailing list