From 21ba3834984db6dd30556abdd17a2d866920f8cb Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 29 Nov 2007 20:31:54 +0000 Subject: r16856@catbus: nickm | 2007-11-29 15:31:50 -0500 Make "location" a preferred synonym for "address." svn:r260 --- BibTeX.py | 7 +++++-- README | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/BibTeX.py b/BibTeX.py index a1f45c7..a4ad624 100644 --- a/BibTeX.py +++ b/BibTeX.py @@ -263,7 +263,7 @@ def sortEntriesByDate(entries): # List of fields that appear when we display the entries as BibTeX. DISPLAYED_FIELDS = [ 'title', 'author', 'journal', 'booktitle', 'school', 'institution', 'organization', 'volume', 'number', 'year', -'month', 'address', 'chapter', 'edition', 'pages', 'editor', +'month', 'address', 'location', 'chapter', 'edition', 'pages', 'editor', 'howpublished', 'key', 'publisher', 'type', 'note', 'series' ] class BibTeXEntry: @@ -419,7 +419,10 @@ class BibTeXEntry: if self.get("edition"): res.append(",") res.append(self['edition']) - if self.get("address"): + if self.get("location"): + res.append(", ") + res.append(self['location']) + elif self.get("address"): res.append(", ") res.append(self['address']) res.append(", %s %s" % (self.get('month',""), self['year'])) diff --git a/README b/README index a2774c5..ed77e70 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ anonbib 0.2 -- Code to generate the anonymity bibliography -Copyright (c) 2003-2006 Nick Mathewson +Copyright (c) 2003-2007 Nick Mathewson Based on 'PDOSBib' perl code by Eddie Kohler This software is licensed under the GNU GPL, version 2 or later. -- cgit v1.2.3-70-g09d2