RJournal template and layout: move ERTs to layout

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

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index a5e4dd97a0fb706596f3961b0073a093a58162f5..226d2b32fd704c6760229474b74ce84575ef064c 100644 (file)
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -2,9 +2,9 @@
 #
 # Author: Richard Heck <rgheck@comcast.net>
 
-Format 26
+Format 45
 
-CiteFormat
+CiteFormat default
        # translatable bits
        _pptext pp.
        _edtext ed.
@@ -15,16 +15,16 @@ CiteFormat
        # macros
        !pages {%pages%[[, %_pptext% %pages%]]}
        !authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %_edtext%, ]]}]]}
-       !volnum {%volume%[[ %_voltext% %volume%]][[{%number%[[%_numtext% %number%]]}]]}
+       !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%]]}
+       !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%]]}
+
+       book %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%).{%note%[[ %note%]]}
 
        incollection %!insomething%
        inproceedings %!insomething%