X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdciteformats.inc;h=018d26b7b629669448e288d2bdc0783dd7aff049;hb=9c97021623b6db5239715eb543d65a5e779084b6;hp=a27bcf83c56c98a04f068121f4f0f9fbc3a9e4ba;hpb=7489cab6c93c0085f02db28fb6b4304e667e8867;p=lyx.git

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index a27bcf83c5..018d26b7b6 100644
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -11,55 +11,60 @@
 # Author: Richard Heck <rgheck@comcast.net>
 #         Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 63
+Format 80
 
 CiteFormat default
 	#
-	# Translatable bits
+	# Translatable bits (need to be marked by _ prefix, if translated to the GUI language,
+	# or B_, if translated to the buffer language)
+	# Note that preceding and trailing spaces matter.
 	#
-	_pptext pp.
-	_edtext ed.
-	_edstext eds.
-	_voltext vol.
-	_numtext no.
-	_in in
+	B_pptext pp.
+	B_edtext ed.
+	B_edstext eds.
+	B_voltext vol.
+	B_numtext no.
+	B_in in
 	# The following are handled by BiblioInfo. Note that preceding and trailing spaces matter
-	_namesep , [[separate author names in citation, except for last name]]
-	_lastnamesep , and [[separate name of last author in citation]]
-	_pairnamesep  and [[separate two authors in citation]]
+	B_namesep , [[separate author names in citation, except for last name]]
+	B_lastnamesep , and [[separate name of last author in citation]]
+	B_pairnamesep  and [[separate two authors in citation]]
 
 	#
 	# Macros
 	#
 	# Scheme of the first author in the bibliography
-	!firstnameform %surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
+	!firstnameform {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
 	# Scheme of other authors in the bibliography
-	!othernameform %surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
+	!othernameform {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
 	# Scheme of the first name in later parts (such as book editor)
-	!firstbynameform %prename% %surname%{%suffix%[[, %suffix%]]}
+	!firstbynameform %prename% {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}
 	# Scheme of other authors in later parts (such as book editor)
-	!otherbynameform %prename% %surname%{%suffix%[[, %suffix%]]}
+	!otherbynameform %prename% {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}
+	# Scheme of authors in citation references
+	!citenameform {%prefix%[[%prefix% ]]}%surname%
 	# pagination
-	!pages {%pages%[[, %_pptext% %pages%]]}
+	!pages {%pages%[[, %B_pptext% %pages%]]}
 	# ed. or eds.
-	!makeed {%ifmultiple:editor%[[%_edstext%]][[%_edtext%]]}
+	!makeed {%ifmultiple:editor%[[%B_edstext%]][[%B_edtext%]]}
 	# author or editor, as fullnames, following the schemes above
 	!authoredit {%fullnames:author%[[%fullnames:author%, ]][[{%fullnames:editor%[[%fullnames:editor%, %!makeed%, ]]}]]}
 	# "vol. 1, no.
-	!volnum {%volume%[[ %_voltext% %volume%, {%number%[[%_numtext% %number%]]}]]}
+	!volnum {%volume%[[ %B_voltext% %volume%, {%number%[[%B_numtext% %number%]]}]]}
 	!quotetitle "%title%"
 	!emphtitle {!<i>!}%title%{!</i>!}
 	!emphjournal {!<i>!}{%journal%[[%journal%]][[{%journaltitle%[[%journaltitle%]]}]]}{!</i>!}
-	!location {%address%[[%address%: ]][[{%location%[[%location%: ]]}]]}
+	!locpub {%publisher%[[{%address%[[%address%: ]][[{%location%[[%location%: ]]}]]}%publisher%, ]][[{%address%[[%address%, ]][[{%location%[[%location%, ]]}]]}]]}
+	!locinst {%school%[[{%address%[[%address%: ]][[{%location%[[%location%: ]]}]]}%school%, ]][[{%institution%[[{%address%[[%address%: ]][[{%location%[[%location%: ]]}]]}%institution%, ]][[{%address%[[%address%, ]][[{%location%[[%location%, ]]}]]}]]}]]}
 
 	#
 	# Entry types. Note that final punctuation will be added later, if needed.
 	#
-	!insomething %fullnames:author%, %!quotetitle%, %_in%{%fullbynames:editor%[[ %fullbynames:editor%, %!makeed%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%)%!pages%{%note%[[. %note%]]}
+	!insomething %fullnames:author%, %!quotetitle%, %B_in%{%fullbynames:editor%[[ %fullbynames:editor%, %!makeed%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} (%!locpub%%year%)%!pages%{%note%[[. %note%]]}
 
 	article %fullnames:author%, %!quotetitle%, %!emphjournal% {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%)%!pages%{%note%[[. %note%]]}
 
-	!booklike %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%){%note%[[. %note%]]}
+	!booklike %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} (%!locpub%%year%){%note%[[. %note%]]}
 	book %!booklike%
 	collection %!booklike%
 	proceedings %!booklike%
@@ -67,7 +72,7 @@ CiteFormat default
 	incollection %!insomething%
 	inproceedings %!insomething%
 
-	!theses %fullnames:author%, %title% (%!location%{%school%[[%school%]][[%institution%]]}, %year%){%note%[[. %note%]]}
+	!theses %fullnames:author%, %title% (%!locinst%%year%){%note%[[. %note%]]}
 	thesis %!theses%
 	phdthesis %!theses%
 	mastersthesis %!theses%