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

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index a589cf0260..018d26b7b6 100644
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -11,7 +11,7 @@
 # Author: Richard Heck <rgheck@comcast.net>
 #         Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 68
+Format 80
 
 CiteFormat default
 	#
@@ -54,16 +54,17 @@ CiteFormat default
 	!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%, %B_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%
@@ -71,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%