Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GEP 18: automatic update as you type for citation fields, fix in formatting, fix with indicators

Browse Source 
svn: r22526
This commit is contained in:
Benny Malengier 2013-06-19 21:14:18 +00:00
parent 2b6ee1aa60
commit 8ad6600746
5 changed files with 70 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/evidencestyle/evidence_style.csv
View File

@ -2958,10 +2958,10 @@
;;;;;;;;"[WEBSITE]";;;;;"Italics";;;;
;;;;;;;"(";"[URL (DIGITAL LOCATION)]";;":";;;;;;;
;;;;;;;"accessed";"[DATE ACCESSED]";;"),";;;;;;;
;;;;;;;;"[LOCATION]";"Location on Page";".";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";".";;;;;;;
160;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Periodicals";"Journal articles";"Online archives of print journals";"S";"ESM780";;"[AUTHOR]";;",";;"S";;;;;
;;;;;;;;"[TITLE]";"Article Title";",";;;"Quoted";;;;
;;;;;;;;"[LOCATION]";"Location on Page";".";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";".";;;;;;;
161;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Periodicals";"Journal articles";"Online journals";"L";"ESM781";;"[AUTHOR]";;".";"A";"SG";;;;;
;;;;;;;;"[TITLE]";"Article Title";":";"T";;"QuotedCont";;;;
;;;;;;;;"[SUBTITLE]";"Article Subtitle";".";"T";;"QuotedCont";;;;
@ -2980,10 +2980,10 @@
;;;;;;;;"[FORMAT]";;;;;;;;;
;;;;;;;"(";"[URL (DIGITAL LOCATION)]";;":";;;;;;;
;;;;;;;"accessed";"[DATE ACCESSED]";;"),";;;;;;;
;;;;;;;;"[LOCATION]";"Location on Page";".";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";".";;;;;;;
161;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Periodicals";"Journal articles";"Online journals";"S";"ESM781";;"[AUTHOR]";;",";;"S";;;;;
;;;;;;;;"[TITLE]";"Article Title";",";;;"Quoted";;;;
;;;;;;;;"[LOCATION]";"Location on Page";".";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";".";;;;;;;
162;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Periodicals";"Magazine articles";"Print editions";"L";"ESM782";;"[AUTHOR]";;".";"A";"SG";;;;;
;;;;;;;;"[TITLE]";"Article Title";".";"T";;"Quoted";;;;
;;;;;;;;"[PUBLICATION TITLE]";"Magazine";;;"T";;"Italics";;;
@ -3011,11 +3011,11 @@
;;;;;;;;"[WEBSITE]";;;;;"Italics";;;;
;;;;;;;"(";"[URL (DIGITAL LOCATION)]";;":";;;;;;;
;;;;;;;"accessed";"[DATE ACCESSED]";;"),";;;;;;;
;;;;;;;;"[LOCATION]";"Location on Page";";";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";";";;;;;;;
;;;;;;;;"[CREDIT LINE]";;".";;;;;;;
163;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Periodicals";"Magazine articles";"Online reprints, random items";"S";"ESM783";;"[AUTHOR]";;",";;"S";;;;;
;;;;;;;;"[TITLE]";"Article Title";",";;;"Quoted";;;;
;;;;;;;;"[LOCATION]";"Location on Page";".";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";".";;;;;;;
164;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Periodicals";"Newsletter articles";"Print editions";"L";"ESM784";;"[AUTHOR]";;".";"A";"SG";;;;;
;;;;;;;;"[TITLE]";"Article Title";".";"T";;"Quoted";;;;
;;;;;;;;"[PUBLICATION TITLE]";"Newsletter";;"T";;"Italics";;;;
@ -3056,11 +3056,11 @@
;;;;;;;;"[EDITION]";;;;;;;;;
;;;;;;;"(";"[URL (DIGITAL LOCATION)]";;":";;;;;;;
;;;;;;;"accessed";"[DATE ACCESSED]";;"),";;;;;;;
;;;;;;;;"[LOCATION]";"Location on Page";";";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";";";;;;;;;
;;;;;;;;"[CREDIT LINE]";;".";;;;;;;
166;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Periodicals";"Newspaper articles";"Online archives ";"S";"ESM786";;"[AUTHOR]";;",";;"S";;;;;
;;;;;;;;"[TITLE]";"Article Title";",";;;"Quoted";;;;
;;;;;;;;"[LOCATION]";"Location on Page";".";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";".";;;;;;;
167;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Broadcasts & Web Miscellanea";"Blogs";;"L";"ESM787";;"[AUTHOR]";;".";"A";"SG";;;;;
;;;;;;;;"[TITLE]";"Article Title";".";"T";;"Quoted";;;;
;;;;;;;;"[CREATOR]";"Creator of Blog";".";"P";;;;;;
@ -3075,10 +3075,10 @@
;;;;;;;;"[ISSUE DATE]";"Posting Date";;;;;;;;
;;;;;;;"(";"[URL (DIGITAL LOCATION)]";;":";;;;;;;
;;;;;;;"accessed";"[DATE ACCESSED]";;"),";;;;;;;
;;;;;;;;"[LOCATION]";"Location on Page";".";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";".";;;;;;;
167;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Broadcasts & Web Miscellanea";"Blogs";;"S";"ESM787";;"[AUTHOR]";;",";;"S";;;;;
;;;;;;;;"[TITLE]";"Article Title";",";;;"Quoted";;;;
;;;;;;;;"[LOCATION]";"Location on Page";".";;;;;;;
;;;;;;;;"[POSITION]";"Location on Page";".";;;;;;;
168;"EE Publications: Periodicals, Broadcasts & Web Miscellanea";"Broadcasts & Web Miscellanea";"Discussion forums & lists";;"L";"ESM788";;"[PUBLICATION TITLE]";"Name of Forum";",";"T";;"Italics";;;;
;;;;;;;;"[TYPE]";"Type of Forum";",";"T";;;;;;
;;;;;;;;"[DATE RANGE]";"Date-span Read";".";"T";;;;;;

1 N Category Category Type Type Description Type Identifier LDEL Fields Label RDEL GEDCOM Shorten Attribute Privacy Optional Hint Tooltip
2958 [WEBSITE] Italics
2959 ( [URL (DIGITAL LOCATION)] :
2960 accessed [DATE ACCESSED] ),
2961 [LOCATION] [POSITION] Location on Page .
2962 160 EE Publications: Periodicals, Broadcasts & Web Miscellanea Periodicals Journal articles Online archives of print journals S ESM780 [AUTHOR] , S
2963 [TITLE] Article Title , Quoted
2964 [LOCATION] [POSITION] Location on Page .
2965 161 EE Publications: Periodicals, Broadcasts & Web Miscellanea Periodicals Journal articles Online journals L ESM781 [AUTHOR] . A SG
2966 [TITLE] Article Title : T QuotedCont
2967 [SUBTITLE] Article Subtitle . T QuotedCont
2980 [FORMAT]
2981 ( [URL (DIGITAL LOCATION)] :
2982 accessed [DATE ACCESSED] ),
2983 [LOCATION] [POSITION] Location on Page .
2984 161 EE Publications: Periodicals, Broadcasts & Web Miscellanea Periodicals Journal articles Online journals S ESM781 [AUTHOR] , S
2985 [TITLE] Article Title , Quoted
2986 [LOCATION] [POSITION] Location on Page .
2987 162 EE Publications: Periodicals, Broadcasts & Web Miscellanea Periodicals Magazine articles Print editions L ESM782 [AUTHOR] . A SG
2988 [TITLE] Article Title . T Quoted
2989 [PUBLICATION TITLE] Magazine T Italics
3011 [WEBSITE] Italics
3012 ( [URL (DIGITAL LOCATION)] :
3013 accessed [DATE ACCESSED] ),
3014 [LOCATION] [POSITION] Location on Page ;
3015 [CREDIT LINE] .
3016 163 EE Publications: Periodicals, Broadcasts & Web Miscellanea Periodicals Magazine articles Online reprints, random items S ESM783 [AUTHOR] , S
3017 [TITLE] Article Title , Quoted
3018 [LOCATION] [POSITION] Location on Page .
3019 164 EE Publications: Periodicals, Broadcasts & Web Miscellanea Periodicals Newsletter articles Print editions L ESM784 [AUTHOR] . A SG
3020 [TITLE] Article Title . T Quoted
3021 [PUBLICATION TITLE] Newsletter T Italics
3056 [EDITION]
3057 ( [URL (DIGITAL LOCATION)] :
3058 accessed [DATE ACCESSED] ),
3059 [LOCATION] [POSITION] Location on Page ;
3060 [CREDIT LINE] .
3061 166 EE Publications: Periodicals, Broadcasts & Web Miscellanea Periodicals Newspaper articles Online archives S ESM786 [AUTHOR] , S
3062 [TITLE] Article Title , Quoted
3063 [LOCATION] [POSITION] Location on Page .
3064 167 EE Publications: Periodicals, Broadcasts & Web Miscellanea Broadcasts & Web Miscellanea Blogs L ESM787 [AUTHOR] . A SG
3065 [TITLE] Article Title . T Quoted
3066 [CREATOR] Creator of Blog . P
3075 [ISSUE DATE] Posting Date
3076 ( [URL (DIGITAL LOCATION)] :
3077 accessed [DATE ACCESSED] ),
3078 [LOCATION] [POSITION] Location on Page .
3079 167 EE Publications: Periodicals, Broadcasts & Web Miscellanea Broadcasts & Web Miscellanea Blogs S ESM787 [AUTHOR] , S
3080 [TITLE] Article Title , Quoted
3081 [LOCATION] [POSITION] Location on Page .
3082 168 EE Publications: Periodicals, Broadcasts & Web Miscellanea Broadcasts & Web Miscellanea Discussion forums & lists L ESM788 [PUBLICATION TITLE] Name of Forum , T Italics
3083 [TYPE] Type of Forum , T
3084 [DATE RANGE] Date-span Read . T

35
gramps/gen/lib/srcattrtype.py
View File

@ -129,8 +129,8 @@ class SrcAttributeType(GrampsType):
CHAPTER_PAGES = 223
COLLECTION = 104
COLLECTION_SHORT_VERSION = 111
COLUMN = 240
COLUMN_SHORT_VERSION = 241
COLUMN = 241
COLUMN_SHORT_VERSION = 242
COMPILER = 166
COMPILER_SHORT_VERSION = 200
CREATION_DATE = 103
@ -175,8 +175,8 @@ class SrcAttributeType(GrampsType):
INSTITUTION_SHORT_VERSION = 178
INTERVIEWER = 161
ISSUE_DATE = 237
ISSUE_DATE_SHORT_VERSION = 243
ISSUE_RANGE = 239
ISSUE_DATE_SHORT_VERSION = 244
ISSUE_RANGE = 240
ITEM_OF_INTEREST = 122
ITEM_OF_INTEREST_SHORT_VERSION = 153
JURISDICTION = 183
@ -195,7 +195,8 @@ class SrcAttributeType(GrampsType):
PART = 231
PLACE_CREATED = 157
POSITION = 180
POSTING_DATE = 242
POSITION_SHORT_VERSION = 239
POSTING_DATE = 243
PROFESSIONAL_CREDENTIALS = 145
PROVENANCE = 167
PUBLICATION_FORMAT = 215
@ -205,7 +206,7 @@ class SrcAttributeType(GrampsType):
PUBLICATION_YEAR = 139
PUBLICATION_YEAR_SHORT_VERSION = 203
PUBLISHER = 138
PUB_INFO = 244
PUB_INFO = 245
RECIPIENT = 129
RECIPIENT_SHORT_VERSION = 133
RELATIONSHIP = 168
@ -308,6 +309,7 @@ class SrcAttributeType(GrampsType):
EDITOR_SHORT_VERSION,
ACT_SHORT_VERSION,
SESSION_SHORT_VERSION,
POSITION_SHORT_VERSION,
COLUMN_SHORT_VERSION,
ISSUE_DATE_SHORT_VERSION,
]
@ -397,6 +399,7 @@ class SrcAttributeType(GrampsType):
(PART, _("Part"), "Part"),
(PLACE_CREATED, _("Place created"), "Place created"),
(POSITION, _("Position"), "Position"),
(POSITION_SHORT_VERSION, _("Position (Short)"), "Position (Short)"),
(POSTING_DATE, _("Posting date"), "Posting date"),
(PROFESSIONAL_CREDENTIALS, _("Professional credentials"), "Professional credentials"),
(PROVENANCE, _("Provenance"), "Provenance"),
@ -7847,7 +7850,7 @@ class SrcAttributeType(GrampsType):
None, None),
('accessed', DATE_ACCESSED, _(''), '),', EMPTY, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
],
REF_TYPE_S: [
@ -7855,7 +7858,7 @@ class SrcAttributeType(GrampsType):
None, None),
('', TITLE, _('Article Title'), ',', STYLE_QUOTE, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
],
},
@ -7899,7 +7902,7 @@ class SrcAttributeType(GrampsType):
None, None),
('accessed', DATE_ACCESSED, _(''), '),', EMPTY, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
],
REF_TYPE_S: [
@ -7907,7 +7910,7 @@ class SrcAttributeType(GrampsType):
None, None),
('', TITLE, _('Article Title'), ',', STYLE_QUOTE, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
],
},
@ -7977,7 +7980,7 @@ class SrcAttributeType(GrampsType):
None, None),
('accessed', DATE_ACCESSED, _(''), '),', EMPTY, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), ';', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), ';', EMPTY, False, False, EMPTY, EMPTY,
None, None),
('', CREDIT_LINE, _(''), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
@ -7987,7 +7990,7 @@ class SrcAttributeType(GrampsType):
None, None),
('', TITLE, _('Article Title'), ',', STYLE_QUOTE, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
],
},
@ -8091,7 +8094,7 @@ class SrcAttributeType(GrampsType):
None, None),
('accessed', DATE_ACCESSED, _(''), '),', EMPTY, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), ';', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), ';', EMPTY, False, False, EMPTY, EMPTY,
None, None),
('', CREDIT_LINE, _(''), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
@ -8101,7 +8104,7 @@ class SrcAttributeType(GrampsType):
None, None),
('', TITLE, _('Article Title'), ',', STYLE_QUOTE, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
],
},
@ -8137,7 +8140,7 @@ class SrcAttributeType(GrampsType):
None, None),
('accessed', DATE_ACCESSED, _(''), '),', EMPTY, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
],
REF_TYPE_S: [
@ -8145,7 +8148,7 @@ class SrcAttributeType(GrampsType):
None, None),
('', TITLE, _('Article Title'), ',', STYLE_QUOTE, False, False, EMPTY, EMPTY,
None, None),
('', LOCATION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
('', POSITION, _('Location on Page'), '.', EMPTY, False, False, EMPTY, EMPTY,
None, None),
],
},

77
gramps/gen/lib/srctemplate.py
View File

@ -299,52 +299,37 @@ class SrcTemplate(object):
ref[-1] += ' ' + field[0].capitalize() + field[1:]
elif len(ref[-1]) and ref[-1][-1] in [',', ':', '-']:
ref[-1] += ' ' + field
elif len(ref[-1]) and ref[-1] != ' ':
ref[-1] += ' ' + field
else:
ref[-1] += field
#right delimiter
if ')' in rdel:
if len(ref[-1] [ref[-1].find('('):]) > 0 :
newval = ref[-1] + rdel
ref = ref[:-1]
fieldadded = fieldadded[:-1]
fieldadded[-1] = True
ref[-1] += newval
else:
#no data inside of delimiter, we remove it entirely
ref = ref[:-1]
fieldadded = fieldadded[:-1]
#if . at end of rdel, add it
if rdel[-1] == '.':
ref[-1] = ref[-1] + '.'
elif ']' in rdel:
if len(ref[-1] [ref[-1].find('['):]) > 0 :
newval = ref[-1] + rdel
ref = ref[:-1]
fieldadded = fieldadded[:-1]
fieldadded[-1] = True
ref[-1] += newval
else:
#no data inside of delimiter, we remove it entirely
ref = ref[:-1]
fieldadded = fieldadded[:-1]
#if . at end of rdel, add it
if rdel[-1] == '.':
ref[-1] = ref[-1] + '.'
elif '}' in rdel:
if len(ref[-1] [ref[-1].find('{'):]) > 0 :
newval = ref[-1] + rdel
ref = ref[:-1]
fieldadded = fieldadded[:-1]
fieldadded[-1] = True
ref[-1] += newval
else:
#no data inside of delimiter, we remove it entirely
ref = ref[:-1]
fieldadded = fieldadded[:-1]
#if . at end of rdel, add it
if rdel[-1] == '.':
ref[-1] = ref[-1] + '.'
else:
nobracket = True
for bracketl, bracketr in [('(', ')'), ('[',']'), ('{','}')]:
if bracketr in rdel:
nobracket = False
if len(ref[-1] [ref[-1].find(bracketl)+1:]) > 0 :
newval = ref[-1] + rdel
ref = ref[:-1]
fieldadded = fieldadded[:-1]
fieldadded[-1] = True
ref[-1] += newval
else:
#no data inside of delimiter, we remove it entirely
ref = ref[:-1]
fieldadded = fieldadded[:-1]
#if . at end of rdel, add it
if rdel[-1] == '.':
if ref[-1] and ref[-1][-1] in [',', '.']:
ref[-1] = ref[-1][:-1]
if ref[-1]:
ref[-1] = ref[-1] + '.'
elif rdel[-1] == ',':
if ref[-1] and ref[-1][-1] in [',', '.']:
pass
elif ref[-1]:
ref[-1] = ref[-1] + ','
if nobracket:
# we add rdel
if not ref[-1]:
#nothing there, don't add delimiter
@ -375,9 +360,11 @@ class SrcTemplate(object):
#we only add delimiters after this if new fields are added
fieldadded[-1] = False
ref = ''.join(ref)
ref = ' '.join(ref)
if ref:
return ref[0].capitalize() + ref[1:]
ref = ref[0].capitalize() + ref[1:]
ref.replace(' ', ' ')
return ref
else:
return ref

4
gramps/gui/editors/displaytabs/srctemplatetab.py
View File

@ -328,10 +328,10 @@ class TemplateFields(object):
parameter=srcattrtype)
def get_src_field(self, srcattrtype):
self.__get_field(srcattrtype, self.src)
return self.__get_field(srcattrtype, self.src)
def get_cite_field(self, srcattrtype):
self.__get_field(srcattrtype, self.cite)
return self.__get_field(srcattrtype, self.cite)
def __get_field(self, srcattrtype, obj):
"""

9
gramps/gui/editors/editsource.py
View File

@ -359,7 +359,12 @@ class EditSource(EditPrimary):
if self.obj.get_source_template()[0] != self.srctemp.get_template_key():
self.srctemp.set_template_key(self.obj.get_source_template()[0])
#set new attrlist in template
self.srctemp.set_attr_list(self.obj.get_attribute_list())
if self.citation_loaded:
citeattr = self.citation.get_attribute_list()
else:
citeattr = None
self.srctemp.set_attr_list(self.obj.get_attribute_list(), citeattr)
#set fields with the template
self.refL.set_text(self.srctemp.reference_L())
@ -395,7 +400,7 @@ class EditSource(EditPrimary):
Change in the citation part might lead to changes needed in the src GUI
section
"""
pass
self.update_template_data(False)
def update_notes(self, *par):
"""