Revert "Fix Ticket #9741 misleading name for font-encoding setting "default"."

[lyx.git] / lib / layouts / stdciteformats.inc

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index 945106243aebd0f0f0e85a4c81972eedd788bee6..9ef2b78a97c6562c7d3a27dab88d86005c338381 100644 (file)
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -2,16 +2,39 @@
 #
 # Author: Richard Heck <rgheck@comcast.net>
 
-Format 26
+Format 62
 
-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%[[%journal%]][[{%journaltitle%[[%journaltitle%]]}]]}{!</i>!}
+       !location {%address%[[%address%: ]][[{%location%[[%location%: ]]}]]}
 
-       thesis %author%, %title% ({%address%[[%address%: ]]}%school%, %year%).{%note%[[ %note%]]}
+       !insomething %author%, %!quotetitle%, %_in%{%editor%[[ %editor%, %_edtext%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%)%!pages%.{%note%[[ %note%]]}
+
+       article %author%, %!quotetitle%, %!emphjournal% {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%)%!pages%.{%note%[[ %note%]]}
+
+       !booklike %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%).{%note%[[ %note%]]}
+       book %!booklike%
+       collection %!booklike%
+       proceedings %!booklike%
+
+       incollection %!insomething%
+       inproceedings %!insomething%
+
+       !theses %author%, %title% (%!location%{%school%[[%school%]][[%institution%]]}, %year%).{%note%[[ %note%]]}
+       thesis %!theses%
+       phdthesis %!theses%
+       mastersthesis %!theses%
 End