Add hicss,imc and cleanup parser.

rescrv · May 15, 2013 · 58570b5 · 58570b5
1 parent b50968e
commit 58570b5
Show file tree

Hide file tree

Showing 28 changed files with 40,315 additions and 137,166 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,10 @@ all:
 
 xtx: xtx/TIMESTAMP
 
-xtx/TIMESTAMP: dblp.xml dblp.dtd dblpparse.py  latex.py  xtx/locations.xtx  overrides.py  parentheticals.py
+pre-wipe:
+	rm xtx/*
+
+xtx/TIMESTAMP: dblp.xml dblp.dtd dblpparse.py latex.py pre-wipe xtx/locations.xtx  overrides.py  parentheticals.py
 	python dblpparse.py
 
 xtx/locations.xtx: locations.py
@@ -32,11 +35,13 @@ install: install-local
 
 install-local:
 	mkdir -p ${HOME}/.crosstex
+	cp xtx-static/*.xtx ${HOME}/.crosstex
 	cp xtx-todo/*.xtx ${HOME}/.crosstex
 	cp xtx/*.xtx ${HOME}/.crosstex
 
 install-global:
 	mkdir -p /usr/local/share/crosstex
+	cp xtx-static/*.xtx /usr/local/share/crosstex
 	cp xtx-todo/*.xtx /usr/local/share/crosstex
 	cp xtx/*.xtx /usr/local/share/crosstex
 

diff --git a/dblpparse.py b/dblpparse.py
diff --git a/locations.py b/locations.py
@@ -89,6 +89,7 @@
 
 US_LOCATIONS = [('Albuquerque', {'city': 'Albuquerque', 'state': 'NM'})
                ,('Alexandria', {'city': 'Alexandria', 'state': 'VA'})
+               ,('Asilomar', {'city': 'Asilomar', 'state': 'CA'})
                ,('Amherst', {'city': 'Amherst', 'state': 'MA'})
                ,('Anaheim', {'city': 'Anaheim', 'state': 'CA'})
                ,('Anchorage', {'city': 'Anchorage', 'state': 'AK'})
@@ -129,13 +130,16 @@
                ,('Davis', {'city': 'Davis', 'state': 'CA'})
                ,('DC', {'city': 'Washington', 'state': '"D.C."'})
                ,('Denver', {'city': 'Denver', 'state': 'CO'})
+               ,('Detroit', {'city': 'Detroit', 'state': 'MI'})
                ,('Durham', {'city': 'Durham', 'state': 'NC'})
+               ,('EastLansing', {'city': 'East Lansing', 'state': 'MI'})
                ,('ElPaso', {'city': 'El Paso', 'state': 'TX'})
                ,('EstesPark', {'city': 'Estes Park', 'state': 'CO'})
                ,('Eugene', {'city': 'Eugene', 'state': 'OR'})
                ,('Fairfax', {'city': 'Fairfax', 'state': 'VA'})
                ,('FortLauderdale', {'city': 'Fort Lauderdale', 'state': 'FL'})
-               ,('Gaithersberg', {'city': 'Gaithersberg', 'state': 'MD'})
+               ,('Framingham', {'city': 'Framingham', 'state': 'Massachusetts'})
+               ,('Gaithersburg', {'city': 'Gaithersburg', 'state': 'MD'})
                ,('Gatlinburg', {'city': 'Gatlinburg', 'state': 'TN'})
                ,('Hanover', {'city': 'Hanover', 'state': 'NH'})
                ,('Hawaii', {'city': 'Hawaii', 'state': 'HI'})
@@ -174,6 +178,7 @@
                ,('NewOrleans', {'city': 'New Orleans', 'state': 'LA'})
                ,('NewportBeach', {'city': 'Newport Beach', 'state': 'CA'})
                ,('Newport', {'city': 'Newport', 'state': 'RI'})
+               ,('NiagaraFalls', {'city': 'Niagara Falls', 'state': 'NY'})
                ,('Northampton', {'city': 'Northampton', 'state': 'MA'})
                ,('NYC', {'city': 'New York', 'state': 'NY'})
                ,('Oakland', {'city': 'Oakland', 'state': 'CA'})
@@ -249,6 +254,7 @@
                  ,('Bratislava', {'city': 'Bratislava', 'country': 'Slovakia'})
                  ,('Bremen', {'city': 'Bremen', 'country': 'Germany'})
                  ,('Brighton', {'city': 'Brighton', 'country': 'UK'})
+                 ,('Brisbane', {'city': 'Brisbane', 'state': 'Queensland', 'country': 'Australia'})
                  ,('Brussels', {'city': 'Brussels', 'country': 'Belgium'})
                  ,('Budapest', {'city': 'Budapest', 'country': 'Hungary'})
                  ,('Cairns', {'city': 'Cairns', 'state': 'Queensland', 'country': 'Oz'})
@@ -299,6 +305,7 @@
                  ,('Manchester', {'city': 'Manchester', 'country': 'UK'})
                  ,('Marseille', {'city': 'Marseille', 'country': 'France'})
                  ,('Melbourne', {'city': 'Melbourne', 'state': 'Victoria', 'country': 'Oz'})
+                 ,('MexicoCity', {'city': 'MexicoCity', 'country': 'Mexico'})
                  ,('Minaki', {'city': 'Minaki', 'country': 'Canada'})
                  ,('MonteVerita', {'city': 'Monte Verit{\`a}', 'country': 'Switzerland'})
                  ,('Montreal', {'city': '{Montr\\\'eal}', 'country': 'Canada'})
@@ -315,6 +322,7 @@
                  ,('Paris', {'city': 'Paris', 'country': 'France'})
                  ,('Piza', {'city': 'Piza', 'country': 'Italy'})
                  ,('Poznan', {'city': 'Poznan', 'country': 'Poland'})
+                 ,('Prague', {'city': 'Prague', 'country': 'Czech Republic'})
                  ,('PuertoVallarta', {'city': 'Puerto Vallarta', 'country': 'Mexico'})
                  ,('QuebecCity', {'city': 'Quebec City', 'country': 'Canada'})
                  ,('RhodesIsland', {'city': 'Rhodes Island', 'country': 'Greece'})
@@ -339,6 +347,7 @@
                  ,('TelAviv', {'city': 'Tel Aviv', 'country': 'Israel'})
                  ,('Tokyo', {'city': 'Tokyo', 'country': 'Japan'})
                  ,('Toronto', {'city': 'Toronto', 'country': 'Canada'})
+                 ,('Trondheim', {'city': 'Trondheim', 'country': 'Norway'})
                  ,('Trento', {'city': 'Trento', 'country': 'Italy'})
                  ,('Tsukuba', {'city': 'Tsukuba', 'country': 'Japan'})
                  ,('Turku', {'city': 'Turku', 'country': 'Finland'})
@@ -371,14 +380,17 @@
                    ,'Lihue(Kauai)': 'Lihue'
                    ,'Lisboa': 'Lisbon'
                    ,'MarinadelRay': 'MarinaDelRay'
+                   ,'MarinadelRey': 'MarinaDelRay'
                    ,'Miami/FtLauderdale': 'MiamiFtLauderdale'
                    ,u'Montr\xe9al': 'Montreal'
                    ,'MontSaint-Michel': 'MontSaintMichel'
                    ,u'MonteVerit\xe0': 'MonteVerita'
                    ,'NewYork': 'NYC'
+                   ,'NewYorkCity': 'NYC'
                    ,'Philadephia': 'Philadelphia'
                    ,'Pisa': 'Piza'
                    ,'RiodeJaneiro': 'Rio'
+                   ,'RiodeJaneriro': 'Rio'
                    ,u'R\xfcschlikon': 'Ruschlikon'
                    ,'Saint-Emilion': 'SaintEmilion'
                    ,'SaltLakeCity': 'SaltLake'

diff --git a/xtx-todo/conferences-cs-todo.xtx b/xtx-todo/conferences-cs-todo.xtx
@@ -224,7 +224,6 @@
 @conference{starconf, shortname="STAR", longname="International Conference on Software Testing And Review"}
 @conference{usenixsa, shortname="USENIX SAC", longname="USENIX Systems Administration Conference"}
 @conference{usenixvm, shortname="USENIX VM", longname="USENIX Virtual Machine Research and Technology Symposium"}
-@conference{vldb, shortname="VLDB", longname="International Conference on Very Large Databases"}
 
 @conference{acsac,
   name="Annual Computer Security Applications Conference",
@@ -311,8 +310,8 @@
   name="Hawaii International International Conference on Systems",
   shortname="HICSS",
   [year=2007] address=Waikoloa, month=jan,
-  [year=2006] isbn="0-7695-2507-5", address=Kauai, month=jan,
-  [year=2005] isbn="0-7695-2268-8", address=Hawaii, month=jan,
+  [year=2006] address=Kauai, month=jan,
+  [year=2005] address=Hawaii, month=jan,
   [year=2004] address=Hawaii, month=jan,
   [year=2003] address=Hawaii, month=jan,
   [year=2002] address=Hawaii, month=jan,