X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdciteformats.inc;h=226d2b32fd704c6760229474b74ce84575ef064c;hb=4beba4e8f87ca218473448caf10563b99faf7b21;hp=945106243aebd0f0f0e85a4c81972eedd788bee6;hpb=e392cff392dc8bd76ac9e05809b09510432702c3;p=lyx.git

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index 945106243a..226d2b32fd 100644
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -2,16 +2,32 @@
 #
 # Author: Richard Heck <rgheck@comcast.net>
 
-Format 26
+Format 45
 
-CiteFormat 
-	!pages {%pages%[[, pp. %pages%]]}
-	!edtext ed.
-	article %author%, "%title%", {!<i>!}%journal%{!</i>!} {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%)%!pages%.{%note%[[ %note%]]}
-	
-	book {%author%[[%author%, ]][[{%editor%[[%editor%, %ed_text%, ]]}]]}{!<i>!}%title%{!</i>!}{%volume%[[ vol. %volume%]][[{%number%[[no. %number%]]}]]}{%edition%[[%edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%).{%note%[[ %note%]]}
+CiteFormat default
+	# translatable bits
+	_pptext pp.
+	_edtext ed.
+	_voltext vol.
+	_numtext no.
+	_in in
 
-	incollection %author%, \"%title%\", in{%editor%[[ %editor%, %ed_text%,]]} {!<i>!}%booktitle%{!</i>!}{%volume%[[ vol. %volume%]][[{%number%[[no. %number%]]}]]}{%edition%[[%edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%){%pages%[[, pp. %pages%]]}.{%note%[[ %note%]]}
+	# macros
+	!pages {%pages%[[, %_pptext% %pages%]]}
+	!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %_edtext%, ]]}]]}
+	!volnum {%volume%[[ %_voltext% %volume%, {%number%[[%_numtext% %number%]]}]]}
+	!quotetitle "%title%"
+	!emphtitle {!<i>!}%title%{!</i>!}
+	!emphjournal {!<i>!}%journal%{!</i>!}
+
+	!insomething %author%, %!quotetitle%, %_in%{%editor%[[ %editor%, %_edtext%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%)%!pages%.{%note%[[ %note%]]}
+
+	article %author%, %!quotetitle%, %!emphjournal% {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%)%!pages%.{%note%[[ %note%]]}
+
+	book %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%).{%note%[[ %note%]]}
+
+	incollection %!insomething%
+	inproceedings %!insomething%
 
 	thesis %author%, %title% ({%address%[[%address%: ]]}%school%, %year%).{%note%[[ %note%]]}
 End