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 1b75b30e6a4074e4b62ffd80ea466132f053c324..9ef2b78a97c6562c7d3a27dab88d86005c338381 100644 (file)
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -2,9 +2,9 @@
 #
 # Author: Richard Heck <rgheck@comcast.net>
 
-Format 31
+Format 62
 
-CiteFormat
+CiteFormat default
        # translatable bits
        _pptext pp.
        _edtext ed.
@@ -18,16 +18,23 @@ CiteFormat
        !volnum {%volume%[[ %_voltext% %volume%, {%number%[[%_numtext% %number%]]}]]}
        !quotetitle "%title%"
        !emphtitle {!<i>!}%title%{!</i>!}
-       !emphjournal {!<i>!}%journal%{!</i>!}
+       !emphjournal {!<i>!}{%journal%[[%journal%]][[{%journaltitle%[[%journaltitle%]]}]]}{!</i>!}
+       !location {%address%[[%address%: ]][[{%location%[[%location%: ]]}]]}
 
-       !insomething %author%, %!quotetitle%, %_in%{%editor%[[ %editor%, %_edtext%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[%edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%)%!pages%.{%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%]]}
-       
-       book %!authoredit%%!emphtitle%%!volnum%{%edition%[[%edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%).{%note%[[ %note%]]}
+
+       !booklike %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%).{%note%[[ %note%]]}
+       book %!booklike%
+       collection %!booklike%
+       proceedings %!booklike%
 
        incollection %!insomething%
        inproceedings %!insomething%
 
-       thesis %author%, %title% ({%address%[[%address%: ]]}%school%, %year%).{%note%[[ %note%]]}
+       !theses %author%, %title% (%!location%{%school%[[%school%]][[%institution%]]}, %year%).{%note%[[ %note%]]}
+       thesis %!theses%
+       phdthesis %!theses%
+       mastersthesis %!theses%
 End