[LyX/master] Fix suprious comma in book and thesis bib preview.

[Juergen Spitzmueller]

commit 399a4d7e718f7e6e88f6110aa1fd3d933ab59887
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Thu Sep 6 14:46:44 2018 +0200

    Fix suprious comma in book and thesis bib preview.
    
    Fixes: #11272
---
 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 895605e..f27cdf8 100644
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -54,16 +54,17 @@ CiteFormat default
        !quotetitle "%title%"
        !emphtitle {!<i>!}%title%{!</i>!}
        !emphjournal 
{!<i>!}{%journal%[[%journal%]][[{%journaltitle%[[%journaltitle%]]}]]}{!</i>!}
-       !location {%address%[[%address%: ]][[{%location%[[%location%: ]]}]]}
+       !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%]]} 
(%!location%%publisher%, %year%)%!pages%{%note%[[. %note%]]}
+       !insomething %fullnames:author%, %!quotetitle%, 
%B_in%{%fullbynames:editor%[[ %fullbynames:editor%, %!makeed%,]]} 
{!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} 
(%!locpub%%year%)%!pages%{%note%[[. %note%]]}
 
        article %fullnames:author%, %!quotetitle%, %!emphjournal% {%volume%[[ 
%volume%{%number%[[, %number%]]}]]} (%year%)%!pages%{%note%[[. %note%]]}
 
-       !booklike %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} 
(%!location%%publisher%, %year%){%note%[[. %note%]]}
+       !booklike %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} 
(%!locpub%%year%){%note%[[. %note%]]}
        book %!booklike%
        collection %!booklike%
        proceedings %!booklike%
@@ -71,7 +72,7 @@ CiteFormat default
        incollection %!insomething%
        inproceedings %!insomething%
 
-       !theses %fullnames:author%, %title% 
(%!location%{%school%[[%school%]][[%institution%]]}, %year%){%note%[[. %note%]]}
+       !theses %fullnames:author%, %title% (%!locinst%%year%){%note%[[. 
%note%]]}
        thesis %!theses%
        phdthesis %!theses%
        mastersthesis %!theses%