Consider biblatex subtitles in bibliography preview

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index 6c48d961089da28dc0482ed0f8a612f8dfb09cf1..7a48a7bd25f3a221c62ce41193db81b90cb7f89d 100644 (file)
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -51,16 +51,19 @@ CiteFormat default
        !authoredit {%fullnames:author%[[%fullnames:author%, ]][[{%fullnames:editor%[[%fullnames:editor%, %!makeed%, ]]}]]}
        # "vol. 1, no.
        !volnum {%volume%[[ %B_voltext% %volume%, {%number%[[%B_numtext% %number%]]}]]}
-       !quotetitle "%title%"
-       !emphtitle {!<i>!}%title%{!</i>!}
-       !emphjournal {!<i>!}{%journal%[[%journal%]][[{%journaltitle%[[%journaltitle%]]}]]}{!</i>!}
+       !fulltitle %title%{%subtitle%[[: %subtitle%]]}
+       !fullbooktitle %booktitle%{%booksubtitle%[[: %booksubtitle%]]}
+       !fulljournaltitle %journaltitle%{%journalsubtitle%[[: %journalsubtitle%]]}
+       !quotetitle "%!fulltitle%"
+       !emphtitle {!<i>!}%!fulltitle%{!</i>!}
+       !emphjournal {!<i>!}{%journal%[[%journal%]][[{%journaltitle%[[%!fulljournaltitle%]]}]]}{!</i>!}
        !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%]]} (%!locpub%%year%)%!pages%{%note%[[. %note%]]}
+       !insomething %fullnames:author%, %!quotetitle%, %B_in%{%fullbynames:editor%[[ %fullbynames:editor%, %!makeed%,]]} {!<i>!}%!fullbooktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} (%!locpub%%year%)%!pages%{%note%[[. %note%]]}
 
        article %fullnames:author%, %!quotetitle%, %!emphjournal% {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%)%!pages%{%note%[[. %note%]]}
 
@@ -72,7 +75,7 @@ CiteFormat default
        incollection %!insomething%
        inproceedings %!insomething%
 
-       !theses %fullnames:author%, %title% (%!locinst%%year%){%note%[[. %note%]]}
+       !theses %fullnames:author%, %!fulltitle% (%!locinst%%year%){%note%[[. %note%]]}
        thesis %!theses%
        phdthesis %!theses%
        mastersthesis %!theses%