X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fciteengines%2Fbiblatex-natbib.citeengine;h=c33ff0e3c6c5945f587296ff84a2e154a101c276;hb=d4e30ad88f2967a2e464fd3a54a52feeb25e72f1;hp=0f8545e53165f776d8e8b38bf115cf218224dbb2;hpb=7f97ace83b723b5176aaa70518bdec07fb8e4357;p=lyx.git

diff --git a/lib/citeengines/biblatex-natbib.citeengine b/lib/citeengines/biblatex-natbib.citeengine
index 0f8545e531..c33ff0e3c6 100644
--- a/lib/citeengines/biblatex-natbib.citeengine
+++ b/lib/citeengines/biblatex-natbib.citeengine
@@ -10,7 +10,7 @@
 
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 63
+Format 64
 
 Requires biblatex
 
@@ -48,6 +48,8 @@ MaxCiteNames 3
 #
 # Note further:
 #
+# * The LyXName "keyonly" has a special meaning: only the citation key,
+#   without any latex command, is output.
 # * Capitalization indicates that the command also has a capitalized
 #   form (\Latexcmd vs. \latexcmd). These usually enforce upcasing of
 #   name prefixes (von Goethe => Von Goethe).
@@ -66,6 +68,8 @@ MaxCiteNames 3
 #   dropping 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
@@ -82,20 +86,21 @@ CiteEngine authoryear
 	citeyearpar[][]
 	citeyear=cite*
 	citebyear[][]=citeyear
-	Footcite[][]=smartcite
-	Autocite[][]
+	Footcite$[][]=smartcite
+	Autocite$[][]
 	citetitle*<!_citetitlestar!_citetitlestartooltip>[][]
 	fullcite[][]
 	footfullcite[][]
 	nocite
+	keyonly
 End
 
 CiteEngine numerical
 	Citep|citealp,citealt*[][]
 	Citet|textcite*[][]
 	supercite
-	Footcite[][]=smartcite
-	Autocite[][]
+	Footcite$[][]=smartcite
+	Autocite$[][]
 	Citeauthor[][]*
 	citeyearpar[][]
 	citeyear|citebyear[][]
@@ -103,6 +108,7 @@ CiteEngine numerical
 	fullcite[][]
 	footfullcite[][]
 	nocite
+	keyonly
 End
 
 
@@ -117,6 +123,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
@@ -126,6 +136,8 @@ CiteFormat default
 	#
 	_notcited not cited
 	_addtobib Add to bibliography only.
+	_keyonly Key only.
+	_key Key
 	_finaland , and 
 	_footnote Footnote
 	_foot Foot
@@ -171,6 +183,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)
 	!makeyear {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]}
 	# Add a year if it exists (else "??") and indicate a possible modifier (as in 2017[a])
@@ -221,6 +237,8 @@ CiteFormat default
 	footfullcite {%dialog%[[%_footnote%]][[%_foot%]]}: {%dialog%[[%_bibentry%]][[{%label%[[%!fullcite%]][[%key%%!nextkey% (%_fullcite%)]]}]]}
 	# "Add to bibliography only." (dialog) / "[ID] (not cited)" (button)
 	nocite {%dialog%[[%_addtobib%]][[%key%%!nextkey% (%_notcited%)]]}
+	# Output only the key
+	keyonly {%dialog%[[%_keyonly%]][[%_key%: %key%%!nextkey%]]}
 End
 
 CiteFormat authoryear
@@ -231,6 +249,8 @@ CiteFormat authoryear
 	!sep ;
 	!close )
 
+	# "cf. Author et. al Year..."
+	!makecite %!ctextbefore%%!startlink%%!abbrvciteauthor% %!makeyear%%!endlink%%!ctextafter%%!nextcite%
 	# "Author et al. (cf. Year..."
 	!makecitet %!startlink%%!makeauthor%%!endlink% %!open%%!textbefore%%!makeyear%%!nextcitet%
 	# "cf. Author et al. Year..."
@@ -238,6 +258,8 @@ CiteFormat authoryear
 	# "Author et al., Year..."
 	!makecitealp %!startlink%%!makeauthor%, %!makeyear%%!endlink%%!nextcitealp%
 
+	# "...; Nextauthor Year..."
+	!nextcite {%next%[[%!sep% %!makecite%]]}
 	# "...), [and] Nextauthor (Year..."
 	!nextcitet {%next%[[%!close%%!smartsep%%!startlink%%!makeauthor%%!endlink% %!open%%!makeyear%%!nextcitet%]]}
 	# "...; NextAuthor et al. Year..."
@@ -260,9 +282,9 @@ CiteFormat authoryear
 	# "cf. Author Year; NextAuthor Year, p. xx" [NB: textbefore position differs from real natbib!]
 	citealt %!makecitealt%%!textafter%
 	# "Footnote: cf. Author A Year; Author B Year, p. xx."
-	footcite {%dialog%[[%_footnote%]][[%_foot%]]}: %!textbefore%%!makecitealp%%!textafter%.
+	footcite {%dialog%[[%_footnote%]][[%_foot%]]}: %!textbefore%%!makecite%%!textafter%.
 	# "Auto: (cf. Author A Year; Author B Year, p. xx)"
-	autocite {%dialog%[[%_autocite%]][[%_auto%]]}: %!open%%!textbefore%%!makecitealp%%!textafter%%!close%
+	autocite {%dialog%[[%_autocite%]][[%_auto%]]}: %!open%%!textbefore%%!makecite%%!textafter%%!close%
 
 	# Fallback style: "Author A (cf. Year),[ and] Author B (Year, p. xx)"
 	cite %!makecitet%%!textafter%%!close%
@@ -290,6 +312,8 @@ CiteFormat numerical
 	!makecitealt {%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!nextcitealt%
 	# "ID..."
 	!hashkey {%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%%!nexthashkey%]]}
+	# "ID"
+	!makekey %!ctextbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!ctextafter%%!nextkey%
 
 	# "...], [and] NextAuthor [ID..."
 	!nextcitet {%next%[[%!close%%!smartsep%%!makeauthor% %!open%%!textbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!nextcitet%]]}
@@ -301,6 +325,8 @@ CiteFormat numerical
 	!nexthashkey {%next%[[%!sep% %!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%%!nexthashkey%]]}
 	# "...); Nextauthor [ID..."
 	!nextcitet {%next%[[%!close%%!smartsep%%!makeauthor% %!open%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!nextcitet%]]}
+	# "..., NextID..."
+	!nextkey {%next%[[%!sep% %!ctextbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!ctextafter%%!nextkey%]]}
 
 	#
 	# ACTUAL STYLE DEFINITIONS