From 337f95342602b4210601f6696f455e8c0d6372d4 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 24 Feb 2024 16:09:47 +0100
Subject: [PATCH] Consider biblatex subtitles in bibliography preview

---
 lib/layouts/stdciteformats.inc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index 6c48d96108..7a48a7bd25 100644
--- 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%