anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consider shorthand in biblatex cite display

Browse Source 
Fixes #11696

(cherry picked from commit 400706ad05)
This commit is contained in:
Juergen Spitzmueller 2019-11-12 13:52:05 +01:00
parent 2deabd0fbd
commit 00bdc20693
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/citeengines/biblatex-natbib.citeengine
View File

@ -192,6 +192,8 @@ CiteFormat default
!makeyear {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]} !makeyear {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]}
# Add a year if it exists (else "??") and indicate a possible modifier (as in 2017[a]) # Add a year if it exists (else "??") and indicate a possible modifier (as in 2017[a])
!myear {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]][[{%export%[[]][[%!dummymod%]]}]]} !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 # Add a year if it exists (else "??") without any modifier at all
!byear {%year%[[%year%]][[??]]} !byear {%year%[[%year%]][[??]]}
# Add a shorttitle or title if it exists (else "??") # Add a shorttitle or title if it exists (else "??")
@ -208,7 +210,7 @@ CiteFormat default
# ".., Year..." (including extra label, as in 2017a) # ".., Year..." (including extra label, as in 2017a)
!nextyear {%next%[[%!sep% %!startlink%%!makeyear%%!endlink%%!nextyear%]]} !nextyear {%next%[[%!sep% %!startlink%%!makeyear%%!endlink%%!nextyear%]]}
# "...; Nextyear ..." (including emulated extra label, as in 2017[a]) # "...; 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) # "...; Nextyear ..." (without any extra label)
!nextbyear {%next%[[%!sep% %!startlink%%!byear%%!endlink%%!nextbyear%]]} !nextbyear {%next%[[%!sep% %!startlink%%!byear%%!endlink%%!nextbyear%]]}
# "...; Nexttitle ..." # "...; Nexttitle ..."
@ -225,7 +227,7 @@ CiteFormat default
# "cf. Author; NextAuthor, p. xx" # "cf. Author; NextAuthor, p. xx"
citeauthor %!textbefore%%!startlink%%!makeauthor%%!endlink%%!nextauthor%%!textafter% citeauthor %!textbefore%%!startlink%%!makeauthor%%!endlink%%!nextauthor%%!textafter%
# "cf. Year; NextYear, S. xx" [Authoryear] / "cf. Year, NextYear, S. xx" [Numerical] # "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) # "cf. Year; Nextyear, p. xx" (without any extra label)
citebyear %!textbefore%%!startlink%%!byear%%!endlink%%!nextbyear%%!textafter% citebyear %!textbefore%%!startlink%%!byear%%!endlink%%!nextbyear%%!textafter%
# "(cf. Year; NextYear, p. xx)" [Authoryear] / "(cf. Year, NextYear, p. xx)" [Numerical] # "(cf. Year; NextYear, p. xx)" [Authoryear] / "(cf. Year, NextYear, p. xx)" [Numerical]

16
lib/citeengines/biblatex.citeengine
View File

@ -171,7 +171,7 @@ CiteFormat default
# "...; Nextyear ..." (including extra label, as in 2017a) # "...; Nextyear ..." (including extra label, as in 2017a)
!nextyear {%next%[[%!sep% %!startlink%%!year%%!endlink%%!nextyear%]]} !nextyear {%next%[[%!sep% %!startlink%%!year%%!endlink%%!nextyear%]]}
# "...; Nextyear ..." (including emulated extra label, as in 2017[a]) # "...; 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) # "...; Nextyear ..." (without any extra label)
!nextbyear {%next%[[%!sep% %!startlink%%!byear%%!endlink%%!nextbyear%]]} !nextbyear {%next%[[%!sep% %!startlink%%!byear%%!endlink%%!nextbyear%]]}
# "...; Nexttitle ..." # "...; Nexttitle ..."
@ -197,6 +197,8 @@ CiteFormat default
!year {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]} !year {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]}
# Add a year if it exists (else "??") and indicate a possible modifier (as in 2017[a]) # Add a year if it exists (else "??") and indicate a possible modifier (as in 2017[a])
!myear {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]][[{%export%[[]][[%!dummymod%]]}]]} !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 # Add a year if it exists (else "??") without any modifier at all
!byear {%year%[[%year%]][[??]]} !byear {%year%[[%year%]][[??]]}
# Add a shorttitle or title if it exists (else "??") # Add a shorttitle or title if it exists (else "??")
@ -215,7 +217,7 @@ CiteFormat default
# "cf. Author; Nextautor, p. xx" # "cf. Author; Nextautor, p. xx"
citeauthor %!textbefore%%!startlink%%!makeauthor%%!endlink%%!makenextauthor%%!textafter% citeauthor %!textbefore%%!startlink%%!makeauthor%%!endlink%%!makenextauthor%%!textafter%
# "cf. Year; Nextyear, p. xx" (including extra label, as in 2017a) # "cf. Year; Nextyear, p. xx" (including extra label, as in 2017a)
citeyear %!textbefore%%!startlink%%!myear%%!endlink%%!nextyear%%!textafter% citeyear %!textbefore%%!startlink%%!shmyear%%!endlink%%!nextshmyear%%!textafter%
# "cf. Year; Nextyear, p. xx" (without any extra label) # "cf. Year; Nextyear, p. xx" (without any extra label)
citebyear %!textbefore%%!startlink%%!byear%%!endlink%%!nextbyear%%!textafter% citebyear %!textbefore%%!startlink%%!byear%%!endlink%%!nextbyear%%!textafter%
# "cf. Year; Nextyear, p. xx" (without any extra label) # "cf. Year; Nextyear, p. xx" (without any extra label)
@ -250,8 +252,10 @@ CiteFormat authoryear
# Add a year if it exists (else title, else "??") and possibly a modifier (as in 2017a) # 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%]][[??]]}]]} !yeartitle {%year%[[%year%{%modifier%[[%modifier%]][[{%export%[[]][[%!dummymod%]]}]]}]][[{%title%[[%title%]][[??]]}]]}
# "...; Nextyear ..." (including extra label, as in 2017a) # Add a shorthand if it exists, else yeartitle (above)
!nextyeartitle {%next%[[%!sep% %!startlink%%!yeartitle%%!endlink%%!nextyeartitle%]]} !shyeartitle {%shorthand%[[%shorthand%]][[%!shyeartitle%]]}
# "...; Shorthand|Nextyear ..." (including extra label, as in 2017a)
!nextshyeartitle {%next%[[%!sep% %!startlink%%!yeartitle%%!endlink%%!nextshyeartitle%]]}
# #
# ACTUAL STYLE DEFINITIONS # ACTUAL STYLE DEFINITIONS
@ -266,9 +270,9 @@ CiteFormat authoryear
# "(cf. Author A Year; Author B Year, p. xx)" # "(cf. Author A Year; Author B Year, p. xx)"
citep %!open%%!textbefore%%!makecite%%!textafter%%!close% citep %!open%%!textbefore%%!makecite%%!textafter%%!close%
# This prints year or title, if year is missing # This prints year or title, if year is missing
citeyear %!textbefore%%!startlink%%!yeartitle%%!endlink%%!nextyeartitle%%!textafter% citeyear %!textbefore%%!startlink%%!shyeartitle%%!endlink%%!nextshyeartitle%%!textafter%
# "(cf. Year; Nextyear, p. xx)" # "(cf. Year; Nextyear, p. xx)"
citeyearpar %!open%%!textbefore%%!startlink%%!myear%%!endlink%%!nextmyear%%!textafter%%!close% citeyearpar %!open%%!textbefore%%!startlink%%!shmyear%%!endlink%%!nextshmyear%%!textafter%%!close%
# "Footnote: cf. Author A Year; Author B Year, p. xx." # "Footnote: cf. Author A Year; Author B Year, p. xx."
footcite {%dialog%[[%_footnote%]][[%_foot%]]}: %!textbefore%%!makecite%%!textafter%. footcite {%dialog%[[%_footnote%]][[%_foot%]]}: %!textbefore%%!makecite%%!textafter%.
# "Auto: (cf. Author A Year; Author B Year, p. xx)" # "Auto: (cf. Author A Year; Author B Year, p. xx)"

3
status.23x
View File

@ -53,6 +53,9 @@ What's new
- Fix display glith where the change tracking cue blinks with the cursor - Fix display glith where the change tracking cue blinks with the cursor
(bug 11684). (bug 11684).
- Consider shorthand in biblatex cite display (bug 11696).
* INTERNALS * INTERNALS