X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fciteengines%2Fbiblatex.citeengine;h=e6d6db60d28fd5f475c5309d4289b8c37550f687;hb=d4e30ad88f2967a2e464fd3a54a52feeb25e72f1;hp=657547e403649294afe1770de8f6470fad61b09f;hpb=327602d01d0760c4f801f128f8b6e636afe424b7;p=lyx.git

diff --git a/lib/citeengines/biblatex.citeengine b/lib/citeengines/biblatex.citeengine
index 657547e403..e6d6db60d2 100644
--- a/lib/citeengines/biblatex.citeengine
+++ b/lib/citeengines/biblatex.citeengine
@@ -8,7 +8,7 @@
 
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 63
+Format 64
 
 Requires biblatex
 
@@ -64,20 +64,22 @@ MaxCiteNames 3
 #   the '!' from the prefix (see below), e.g.:
 #   _stardesc Starred command label
 #   _stardesctooltip Tooltip for the starred command checkbox.
+# * A trailing $ indicates that a command features "qualified citation
+#   lists" (a specific Biblatex feature)
 
 #
 # CITE COMMAND DEFINITIONS for either engine type
 #
 CiteEngine authoryear
-	Cite|citealt,citealp[][]
-	Citet[][]=textcite
-	Citep[][]=parencite
+	Cite$|citealt,citealp[][]
+	Citet$[][]=textcite
+	Citep$[][]=parencite
 	Citeauthor*<!_citeauthorstar!_citeauthorstartooltip>[][]
 	citeyearpar[][]=parencite*
 	citeyear[][]=cite*
 	citebyear[][]=citeyear
-	Footcite[][]=smartcite
-	Autocite[][]
+	Footcite$[][]=smartcite
+	Autocite$[][]
 	citetitle*<!_citetitlestar!_citetitlestartooltip>[][]
 	fullcite[][]
 	footfullcite[][]
@@ -86,11 +88,11 @@ CiteEngine authoryear
 End
 
 CiteEngine numerical
-	cite|parencite,citep,citealt,citealp[][]
-	Citet[][]=textcite
+	cite$|parencite,citep,citealt,citealp[][]
+	Citet$[][]=textcite
 	supercite
-	Footcite[][]=smartcite
-	Autocite[][]
+	Footcite$[][]=smartcite
+	Autocite$[][]
 	Citeauthor*<!_citeauthorstar!_citeauthorstartooltip>[][]
 	citeyear|parencite*,citebyear[][]=citeyear*
 	citetitle*<!_citetitlestar!_citetitlestartooltip>[][]
@@ -112,6 +114,10 @@ End
 # There are common definitions (default) and specific definitions for
 # either cite engine type (which overwrite existing defaults.
 #
+
+# Input standard format definitions for the bibliography
+Input stdciteformats.inc
+
 CiteFormat default
 	#
 	# MACROS
@@ -182,6 +188,10 @@ CiteFormat default
 	!textbefore {%textbefore%[[%textbefore% ]]}
 	# ", postnote"
 	!textafter {%textafter%[[, %textafter%]]}
+	# "prenote " (for qualified lists)
+	!ctextbefore {%curpretext%[[%curpretext% ]]}
+	# ", postnote" (for qualified lists)
+	!ctextafter {%curposttext%[[, %curposttext%]]}
 	# Add a year if it exists (else "??") and possibly a modifier (as in 2017a)
 	!year {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]}
 	# Add a year if it exists (else "??") and indicate a possible modifier (as in 2017[a])
@@ -228,14 +238,14 @@ CiteFormat authoryear
 	!close )
 
 	# "cf. Author et. al Year..."
-	!makecite %!startlink%%!abbrvciteauthor% %!year%%!endlink%%!nextcite%
+	!makecite %!ctextbefore%%!startlink%%!abbrvciteauthor% %!year%%!endlink%%!ctextafter%%!nextcite%
 	# Author et al. (cf. Year...
-	!maketextcite %!startlink%%!abbrvciteauthor%%!endlink% %!open%%!textbefore%%!year%%!nexttextcite%
+	!maketextcite {%ifqualified%[[%!textbefore%]]}%!startlink%%!abbrvciteauthor%%!endlink% %!open%{%ifqualified%[[%!ctextbefore%]][[%!textbefore%]]}%!year%%!ctextafter%%!nexttextcite%
 
 	# "...; Nextauthor Year..."
 	!nextcite {%next%[[%!sep% %!makecite%]]}
 	# "...); Nextauthor (Year..."
-	!nexttextcite {%next%[[%!close%%!smartsep%%!startlink%%!abbrvciteauthor%%!endlink% %!open%%!year%%!nexttextcite%]]}
+	!nexttextcite {%next%[[%!close%%!smartsep%%!startlink%%!abbrvciteauthor%%!endlink% %!open%%!ctextbefore%%!year%%!ctextafter%%!nexttextcite%]]}
 
 	# Add a year if it exists (else title, else "??") and possibly a modifier (as in 2017a)
 	!yeartitle {%year%[[%year%{%modifier%[[%modifier%]][[{%export%[[]][[%!dummymod%]]}]]}]][[{%title%[[%title%]][[??]]}]]}
@@ -283,12 +293,12 @@ CiteFormat numerical
 	# "Author [cf. ID..."
 	!maketextcite %!abbrvciteauthor% %!open%%!textbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!nexttextcite%
 	# "ID"
-	!makekey {%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%%!nextkey%]]}
+	!makekey %!ctextbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!ctextafter%%!nextkey%
 
 	# "...); Nextauthor [ID..."
-	!nexttextcite {%next%[[%!close%%!smartsep%%!abbrvciteauthor% %!open%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!nexttextcite%]]}
+	!nexttextcite {%next%[[%!close%%!smartsep%%!abbrvciteauthor% %!open%%!ctextbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!nexttextcite%]]}
 	# "..., NextID..."
-	!nextkey {%next%[[%!sep% %!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%%!nextkey%]]}
+	!nextkey {%next%[[%!sep% %!ctextbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!ctextafter%%!nextkey%]]}
 
 	#
 	# ACTUAL STYLE DEFINITIONS