commit 879265b762c0012fecd2c226ad7f30113ad34e2f
parent 8af4f293d704980874f1cccb3cd5383f123d05b7
Author: Nick Mathewson <nickm@torproject.org>
Date: Tue, 18 May 2010 19:07:14 +0000
Another fix to make anonbib.bib into valid bibtex.
Apparently, when you have a crossref in a bibtex file, the thing you
refer to needs to be defined _after_ you use it. Wild!
This patch and the previous one are derived from a patch by Eugene
Vasserman.
svn:r340
Diffstat:
| M | BibTeX.py | | | 5 | +++++ |
| M | anonbib.bib | | | 240 | +++++++++++++++++++++++++++++++++++++++---------------------------------------- |
2 files changed, 124 insertions(+), 121 deletions(-)
diff --git a/BibTeX.py b/BibTeX.py
@@ -85,6 +85,9 @@ class BibTeX:
seen[cr.key] = 1
del ent.entries['crossref']
+ if cr.entryLine < ent.entryLine:
+ print "Warning: crossref %s used after declaration"%cr.key
+
for k in cr.entries.keys():
if ent.entries.has_key(k):
print "ERROR: %s defined both in %s and in %s"%(
@@ -273,6 +276,7 @@ class BibTeXEntry:
self.type = type # What kind of entry is it? (@book,@injournal,etc)
self.key = key # What key does it have?
self.entries = entries # Map from key to value.
+ self.entryLine = 0 # Defined on this line number
def get(self, k, v=None):
return self.entries.get(k,v)
def has_key(self, k):
@@ -1158,6 +1162,7 @@ class Parser:
for i in xrange(1,len(v),2):
d[v[i].lower()] = v[i+1]
ent = BibTeXEntry(self.curEntType, key, d)
+ ent.entryLine = self.entryLine
self.result.addEntry(ent)
return line
diff --git a/anonbib.bib b/anonbib.bib
@@ -28,69 +28,6 @@
@string{lncs = "Lecture Notes in Computer Science"}
-%% Journals and proceedings: used by reference
-
-@Proceedings{eurocrypt-02,
- editor = {Lars R. Knudsen},
- booktitle = "Proceedings of Eurocrypt 2002",
- month = may,
- year = {2002},
- bookurl = {http://www.ec2002.tue.nl/},
- www_tags={selected},
-}
-
-@Proceedings{pet2006,
- editor = {George Danezis and Philippe Golle},
- booktitle = "Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)",
- month = {June},
- year = {2006},
- publisher = {Springer},
- address = {Cambridge, UK},
- bookurl = {http://petworkshop.org/2006/},
-}
-
-@Proceedings{weis2006,
- editor = {Ross Anderson},
- booktitle = "Proceedings of the Fifth Workshop on the Economics of Information Security (WEIS 2006)",
- month = {June},
- year = {2006},
- address = {Cambridge, UK},
- bookurl = {http://weis2006.econinfosec.org/},
-}
-
-@Proceedings{pet2007,
- editor = {Nikita Borisov and Philippe Golle},
- booktitle = "Proceedings of the Seventh Workshop on Privacy Enhancing Technologies (PET 2007)",
- month = {June},
- year = {2007},
- publisher = {Springer},
- address = {Ottawa, Canada},
- bookurl = {http://petworkshop.org/2007/},
-}
-
-@Proceedings{pet2008,
- editor = {Nikita Borisov and Ian Goldberg},
- booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
- month = {July},
- year = {2008},
- publisher = {Springer},
- address = {Leuven, Belgium},
- bookurl = {http://petsymposium.org/2008/},
-}
-
-% title = {Advances in Cryptology - EUROCRYPT 2005, 24th Annual International
-% Conference on the Theory and Applications of Cryptographic
-% Techniques, Aarhus, Denmark, May 22-26, 2005, Proceedings},
-@Proceedings{eurocrypt2005,
- editor = {Ronald Cramer},
- booktitle = {Proceedings of EUROCRYPT 2005},
- publisher = {Springer},
- series = {Lecture Notes in Computer Science},
- volume = {3494},
- year = {2005},
- isbn = {3-540-25910-4},
- bibsource = {DBLP, http://dblp.uni-trier.de}
-}
%% Section: Mix Networks: Design
@Article{chaum-mix,
@@ -4087,19 +4024,6 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
www_pdf_url = {http://cs.gmu.edu/~astavrou/research/Par_PET_2008.pdf}
}
-@proceedings{esorics2007,
- editor = {Joachim Biskup and
- Javier Lopez},
- booktitle = {Proceedings of ESORICS 2007, 12th European Symposium
- On Research In Computer Security, Dresden, Germany, September
- 24-26, 2007, Proceedings},
- publisher = {Springer},
- series = {Lecture Notes in Computer Science},
- volume = {4734},
- year = {2007},
- isbn = {978-3-540-74834-2},
-}
-
@inproceedings{DBLP:conf/esorics/MalleshW07,
author = {Nayantara Mallesh and
Matthew Wright},
@@ -4139,40 +4063,6 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
www_section = comm,
}
-
-@proceedings{DBLP:conf/acns/2008,
- editor = {Steven M. Bellovin and
- Rosario Gennaro and
- Angelos D. Keromytis and
- Moti Yung},
- booktitle = {Proceedings of the 6th International Conference on
- Applied Cryptography and Network Security
- (ACNS 2008), New York, NY, USA, June 3-6, 2008.
- Proceedings},
- series = {Lecture Notes in Computer Science},
- volume = {5037},
- year = {2008},
- isbn = {978-3-540-68913-3},
- bibsource = {DBLP, http://dblp.uni-trier.de}
-}
-
-@proceedings{DBLP:conf/pervasive/2008,
- editor = {Jadwiga Indulska and
- Donald J. Patterson and
- Tom Rodden and
- Max Ott},
- booktitle = {Proceedings of the 6th International Pervasive Computing
- Conference (Pervasive
- 2008) Sydney, Australia, May 19-22, 2008},
- publisher = {Springer},
- series = {Lecture Notes in Computer Science},
- volume = {5013},
- year = {2008},
- isbn = {978-3-540-79575-9},
- bibsource = {DBLP, http://dblp.uni-trier.de}
-}
-
-
@inproceedings{DBLP:conf/acns/KlonowskiKL08,
author = {Marek Klonowski and
Miroslaw Kutylowski and
@@ -4245,17 +4135,6 @@ Omer Reingold",
}
-@proceedings{ccs2008,
- editor = {Paul Syverson and Somesh Jha and Xiaolan Zhang},
- booktitle = {{Proceedings of the 15th ACM Conference on Computer and
- Communications Security (CCS 2008)}},
- address = {Alexandria, Virginia, USA},
- publisher = {ACM Press},
- day = {27--31},
- month = oct,
- year = 2008,
-}
-
@inproceedings{ccs2008:wang,
title={Dependent Link Padding Algorithms for Low Latency Anonymity Systems},
author={Wei Wang and Mehul Motani and Vikram Srinivasan},
@@ -4296,6 +4175,17 @@ Omer Reingold",
anonymity network architectures.}
}
+@proceedings{ccs2008,
+ editor = {Paul Syverson and Somesh Jha and Xiaolan Zhang},
+ booktitle = {{Proceedings of the 15th ACM Conference on Computer and
+ Communications Security (CCS 2008)}},
+ address = {Alexandria, Virginia, USA},
+ publisher = {ACM Press},
+ day = {27--31},
+ month = oct,
+ year = 2008,
+}
+
@inproceedings{MORE,
author = {Olaf Landsiedel and Lexi Pimenidis and Klaus Wehrle and Heiko
+Niedermayer and Georg Carle},
@@ -4744,3 +4634,111 @@ Omer Reingold",
www_section = {Misc},
}
+%%%%%%% Journals and proceedings: used by reference
+
+@Proceedings{eurocrypt-02,
+ editor = {Lars R. Knudsen},
+ booktitle = "Proceedings of Eurocrypt 2002",
+ month = may,
+ year = {2002},
+ bookurl = {http://www.ec2002.tue.nl/},
+ www_tags={selected},
+}
+
+@Proceedings{pet2006,
+ editor = {George Danezis and Philippe Golle},
+ booktitle = "Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)",
+ month = {June},
+ year = {2006},
+ publisher = {Springer},
+ address = {Cambridge, UK},
+ bookurl = {http://petworkshop.org/2006/},
+}
+
+@Proceedings{weis2006,
+ editor = {Ross Anderson},
+ booktitle = "Proceedings of the Fifth Workshop on the Economics of Information Security (WEIS 2006)",
+ month = {June},
+ year = {2006},
+ address = {Cambridge, UK},
+ bookurl = {http://weis2006.econinfosec.org/},
+}
+
+@Proceedings{pet2007,
+ editor = {Nikita Borisov and Philippe Golle},
+ booktitle = "Proceedings of the Seventh Workshop on Privacy Enhancing Technologies (PET 2007)",
+ month = {June},
+ year = {2007},
+ publisher = {Springer},
+ address = {Ottawa, Canada},
+ bookurl = {http://petworkshop.org/2007/},
+}
+
+@Proceedings{pet2008,
+ editor = {Nikita Borisov and Ian Goldberg},
+ booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
+ month = {July},
+ year = {2008},
+ publisher = {Springer},
+ address = {Leuven, Belgium},
+ bookurl = {http://petsymposium.org/2008/},
+}
+
+% title = {Advances in Cryptology - EUROCRYPT 2005, 24th Annual International
+% Conference on the Theory and Applications of Cryptographic
+% Techniques, Aarhus, Denmark, May 22-26, 2005, Proceedings},
+@Proceedings{eurocrypt2005,
+ editor = {Ronald Cramer},
+ booktitle = {Proceedings of EUROCRYPT 2005},
+ publisher = {Springer},
+ series = {Lecture Notes in Computer Science},
+ volume = {3494},
+ year = {2005},
+ isbn = {3-540-25910-4},
+ bibsource = {DBLP, http://dblp.uni-trier.de}
+}
+
+@proceedings{esorics2007,
+ editor = {Joachim Biskup and
+ Javier Lopez},
+ booktitle = {Proceedings of ESORICS 2007, 12th European Symposium
+ On Research In Computer Security, Dresden, Germany, September
+ 24-26, 2007, Proceedings},
+ publisher = {Springer},
+ series = {Lecture Notes in Computer Science},
+ volume = {4734},
+ year = {2007},
+ isbn = {978-3-540-74834-2},
+}
+
+@proceedings{DBLP:conf/acns/2008,
+ editor = {Steven M. Bellovin and
+ Rosario Gennaro and
+ Angelos D. Keromytis and
+ Moti Yung},
+ booktitle = {Proceedings of the 6th International Conference on
+ Applied Cryptography and Network Security
+ (ACNS 2008), New York, NY, USA, June 3-6, 2008.
+ Proceedings},
+ series = {Lecture Notes in Computer Science},
+ volume = {5037},
+ year = {2008},
+ isbn = {978-3-540-68913-3},
+ bibsource = {DBLP, http://dblp.uni-trier.de}
+}
+
+@proceedings{DBLP:conf/pervasive/2008,
+ editor = {Jadwiga Indulska and
+ Donald J. Patterson and
+ Tom Rodden and
+ Max Ott},
+ booktitle = {Proceedings of the 6th International Pervasive Computing
+ Conference (Pervasive
+ 2008) Sydney, Australia, May 19-22, 2008},
+ publisher = {Springer},
+ series = {Lecture Notes in Computer Science},
+ volume = {5013},
+ year = {2008},
+ isbn = {978-3-540-79575-9},
+ bibsource = {DBLP, http://dblp.uni-trier.de}
+}
