Merged trunk back into gep 18

svn: r22513
2013-06-17 11:14:05 +00:00
parent dce3fc0605 dc853e2ee6
commit f177537525
17 changed files with 6324 additions and 6326 deletions
--- a/data/evidencestyle/evidence_style.csv
+++ b/data/evidencestyle/evidence_style.csv
--- a/data/evidencestyle/evidencefieldgenerator.py
+++ b/data/evidencestyle/evidencefieldgenerator.py
@@ -48,12 +48,13 @@ CITETYPECOL = 5
 IDENTCOL = 6
 LDELCOL = 7  # left delimiter
 FIELDCOL = 8
-RDELCOL = 9 # right delimiter
-GEDCOMCOL = 10
-SHORTERCOL = 11
-STYLECOL = 12
-PRIVACYCOL = 13
-OPTCOL = 14
+LABELCOL = 9
+RDELCOL = 10 # right delimiter
+GEDCOMCOL = 11
+SHORTERCOL = 12
+STYLECOL = 13
+PRIVACYCOL = 14
+OPTCOL = 15

 CITE_TYPES = {'F': 'REF_TYPE_F', 'L': 'REF_TYPE_L', 'S': 'REF_TYPE_S'}
 GEDCOMFIELDS = {'A': 'GED_AUTHOR', 'T': 'GED_TITLE',