From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 20 Sep 2016 09:35:05 +0000 (+0200)
Subject: Improve info display for biblatex databases, part IV
X-Git-Tag: 2.3.0alpha1~980
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2267f4aef63422d2a4ca0a96319b06a262e394cb;p=lyx.git

Improve info display for biblatex databases, part IV

Consider biblatex's new field names: location (address),
journaltitle (journal), institution (school).

Biblatex provides alias for the legacy bibtex field names. Hence check
for the new names only if the legacy names are not used.
---

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index 245c45ce4e..07de74ba35 100644
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -18,16 +18,17 @@ CiteFormat default
 	!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%]]}
+	book %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%).{%note%[[ %note%]]}
 
 	incollection %!insomething%
 	inproceedings %!insomething%
 
-	thesis %author%, %title% ({%address%[[%address%: ]]}%school%, %year%).{%note%[[ %note%]]}
+	thesis %author%, %title% (%!location%{%school%[[%school%]][[%institution%]]}, %year%).{%note%[[ %note%]]}
 End