From 5133026b017e609a442b6747037ee6db5812e6aa Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 6 Sep 2018 14:46:44 +0200 Subject: [PATCH] Fix suprious comma in book and thesis bib preview. Fixes: #11272 (cherry picked from commit 399a4d7e718f7e6e88f6110aa1fd3d933ab59887) --- lib/layouts/stdciteformats.inc | 9 +++++---- status.23x | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc index a2378ce917..4c8c5a4efd 100644 --- a/lib/layouts/stdciteformats.inc +++ b/lib/layouts/stdciteformats.inc @@ -54,16 +54,17 @@ CiteFormat default !quotetitle "%title%" !emphtitle {!!}%title%{!!} !emphjournal {!!}{%journal%[[%journal%]][[{%journaltitle%[[%journaltitle%]]}]]}{!!} - !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%,]]} {!!}%booktitle%{!!}%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%)%!pages%{%note%[[. %note%]]} + !insomething %fullnames:author%, %!quotetitle%, %B_in%{%fullbynames:editor%[[ %fullbynames:editor%, %!makeed%,]]} {!!}%booktitle%{!!}%!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% diff --git a/status.23x b/status.23x index 0a74e15432..654d099311 100644 --- a/status.23x +++ b/status.23x @@ -164,6 +164,8 @@ What's new - Allow adjustment of margin settings in InsetLayout (bug 10177). +- Fix suprious comma in book and thesis bib preview (bug 11272). + * INTERNALS -- 2.39.5