Unify wording for statistics

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

diff --git a/lib/citeengines/biblatex-natbib.citeengine b/lib/citeengines/biblatex-natbib.citeengine
index d994add5c0b67283ae914c6369750fa04bbcd54d..5342a57fba55b591f64f226ee091641bcfdbf8da 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 95
 
 Requires biblatex
 
@@ -84,7 +84,7 @@ CiteEngine authoryear
        Citealp*[][]
        Citeauthor*[][]
        citeyearpar[][]
-       citeyear=cite*
+       citeyear[][]=cite*
        citebyear[][]=citeyear
        Footcite$[][]=smartcite
        Autocite$[][]
@@ -192,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 "??")
@@ -208,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 ..." 
@@ -225,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]
@@ -255,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%