DocBook: add test for the forest package.

[lyx.git] / lib / citeengines / biblatex-natbib.citeengine

diff --git a/lib/citeengines/biblatex-natbib.citeengine b/lib/citeengines/biblatex-natbib.citeengine
index edff500dbb0a2278ae73c2ec51414ad0cc595019..91cfc519a5907d8d31bbb7b467e2ba3bef535d7f 100644 (file)
--- 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 66
+Format 93
 
 Requires biblatex
 
@@ -84,7 +84,7 @@ CiteEngine authoryear
        Citealp*[][]
        Citeauthor*[][]
        citeyearpar[][]
-       citeyear=cite*
+       citeyear[][]=cite*
        citebyear[][]=citeyear
        Footcite$[][]=smartcite
        Autocite$[][]
@@ -131,14 +131,15 @@ CiteFormat default
        #
        # MACROS
        #
-       # 1. Translatable bits (need to be marked by _ prefix)
+       # 1. Translatable bits (need to be marked by _ prefix, if translated to the GUI language,
+       #    or B_, if translated to the buffer language)
        #    Note that preceding and trailing spaces matter.
        #
        _notcited not cited
        _addtobib Add to bibliography only.
        _keyonly Key only.
        _key Key
-       _finaland , and 
+       B_finaland , and 
        _footnote Footnote
        _foot Foot
        _fullcite bibliography entry
@@ -149,10 +150,10 @@ CiteFormat default
        _citetitlestar F&orce full title[[Possible substitute to All aut&hors]]
        _citetitlestartooltip Use full title even if shorttitle exists
        # The following are handled by BiblioInfo
-       _etal  et al.
-       _namesep , [[separate author names in citation, except for last name]]
-       _lastnamesep , and [[separate name of last author in citation]]
-       _pairnamesep  and [[separate two authors in citation]]
+       B_etal  et al.
+       B_namesep , [[separate author names in citation, except for last name]]
+       B_lastnamesep , and [[separate name of last author in citation]]
+       B_pairnamesep  and [[separate two authors in citation]]
 
        #
        # 2. Macros re-used in the style definitions
@@ -171,7 +172,7 @@ CiteFormat default
        !endlink {!</a>!}
 
        # Add " , and " before the last item (but " and " if there are only two), else ", "
-       !smartsep {%second%[[{%next%[[%_namesep%]][[%_pairnamesep%]]}]][[{%next%[[%_namesep%]][[%_lastnamesep%]]}]]}
+       !smartsep {%second%[[{%next%[[%B_namesep%]][[%B_pairnamesep%]]}]][[{%next%[[%B_namesep%]][[%B_lastnamesep%]]}]]}
 
        # "Author et al." or "??"
        !abbrvciteauthor {%abbrvciteauthor%[[%abbrvciteauthor%]][[??]]}
@@ -191,6 +192,8 @@ CiteFormat default
        !makeyear {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]}
        # Add a year if it exists (else "??") and indicate a possible modifier (as in 2017[a])
        !myear {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]][[{%export%[[]][[%!dummymod%]]}]]}
+       # Add a shorthand if it exists else myear (see above)
+       !shmyear {%shorthand%[[%shorthand%]][[%!myear%]]}
        # Add a year if it exists (else "??") without any modifier at all
        !byear {%year%[[%year%]][[??]]}
        # Add a shorttitle or title if it exists (else "??")
@@ -207,7 +210,7 @@ CiteFormat default
        # ".., Year..." (including extra label, as in 2017a)
        !nextyear {%next%[[%!sep% %!startlink%%!makeyear%%!endlink%%!nextyear%]]}
        # "...; Nextyear ..." (including emulated extra label, as in 2017[a])
-       !nextmyear {%next%[[%!sep% %!startlink%%!myear%%!endlink%%!nextmyear%]]}
+       !nextshmyear {%next%[[%!sep% %!startlink%%!shmyear%%!endlink%%!nextshmyear%]]}
        # "...; Nextyear ..." (without any extra label)
        !nextbyear {%next%[[%!sep% %!startlink%%!byear%%!endlink%%!nextbyear%]]}
        # "...; Nexttitle ..." 
@@ -224,7 +227,7 @@ CiteFormat default
        # "cf. Author; NextAuthor, p. xx"
        citeauthor %!textbefore%%!startlink%%!makeauthor%%!endlink%%!nextauthor%%!textafter%
        # "cf. Year; NextYear, S. xx" [Authoryear] / "cf. Year, NextYear, S. xx" [Numerical]
-       citeyear %!textbefore%%!startlink%%!myear%%!endlink%%!nextmyear%%!textafter%
+       citeyear %!textbefore%%!startlink%%!shmyear%%!endlink%%!nextshmyear%%!textafter%
        # "cf. Year; Nextyear, p. xx" (without any extra label)
        citebyear %!textbefore%%!startlink%%!byear%%!endlink%%!nextbyear%%!textafter%
        # "(cf. Year; NextYear, p. xx)" [Authoryear] / "(cf. Year, NextYear, p. xx)" [Numerical]
@@ -254,7 +257,7 @@ CiteFormat authoryear
        # "Author et al. (cf. Year..."
        !makecitet %!startlink%%!makeauthor%%!endlink% %!open%%!textbefore%%!makeyear%%!nextcitet%
        # "cf. Author et al. Year..."
-       !makecitealt  %!textbefore%%!startlink%%!makeauthor% %!makeyear%%!endlink%%!nextcitealt%
+       !makecitealt %!textbefore%%!startlink%%!makeauthor% %!makeyear%%!endlink%%!nextcitealt%
        # "Author et al., Year..."
        !makecitealp %!startlink%%!makeauthor%, %!makeyear%%!endlink%%!nextcitealp%
 
@@ -294,7 +297,8 @@ CiteFormat numerical
        #
        # MACROS
        #
-       # 1. Translatable bits (need to be marked by _ prefix)
+       # 1. Translatable bits (need to be marked by _ prefix, if translated to the GUI language,
+       #    or B_, if translated to the buffer language)
        #
        _super Super
        _superscript Superscript