[LyX/master] Improve info display for biblatex databases, part IV

[Juergen Spitzmueller]

commit 2267f4aef63422d2a4ca0a96319b06a262e394cb
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Tue Sep 20 11:35:05 2016 +0200

    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.
---
 lib/layouts/stdciteformats.inc |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index 245c45c..07de74b 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