From 4173c34b74281e437b531eaaeb760d011ddac776 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 May 2017 21:28:45 +0000 Subject: biblatex-gost (3may17) git-svn-id: svn://tug.org/texlive/trunk@44172 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-gost/biblatex-gost.dbx | 2 +- .../tex/latex/biblatex-gost/biblatex-gost.def | 4 +- .../tex/latex/biblatex-gost/brazilian-gost.lbx | 11 +++ .../tex/latex/biblatex-gost/catalan-gost.lbx | 12 +++ .../tex/latex/biblatex-gost/croatian-gost.lbx | 12 +++ .../tex/latex/biblatex-gost/english-gost.lbx | 11 +++ .../latex/biblatex-gost/gost-alphabetic-min.bbx | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.cbx | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.bbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.cbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.dbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.bbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.cbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear.bbx | 12 +-- .../tex/latex/biblatex-gost/gost-authoryear.cbx | 8 +- .../tex/latex/biblatex-gost/gost-authoryear.dbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.bbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.cbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.dbx | 2 +- .../tex/latex/biblatex-gost/gost-inline-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-inline-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-inline-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-inline.bbx | 6 +- .../tex/latex/biblatex-gost/gost-inline.cbx | 12 +-- .../tex/latex/biblatex-gost/gost-inline.dbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric-min.dbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.bbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.cbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.dbx | 2 +- .../tex/latex/biblatex-gost/gost-standard.bbx | 89 +++++++++++++--------- .../tex/latex/biblatex-gost/greek-gost.lbx | 11 +++ .../tex/latex/biblatex-gost/icelandic-gost.lbx | 12 +++ .../tex/latex/biblatex-gost/italian-gost.lbx | 11 +++ .../tex/latex/biblatex-gost/portuguese-gost.lbx | 11 +++ .../tex/latex/biblatex-gost/russian-gost.lbx | 2 +- .../tex/latex/biblatex-gost/slovene-gost.lbx | 12 +++ .../tex/latex/biblatex-gost/spanish-gost.lbx | 12 +++ 44 files changed, 218 insertions(+), 84 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx index 38ec5c1eeae..faccdea6735 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] % Biblatex-GOST data model diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def index b7664414b26..8aea276d7db 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.def @@ -1,5 +1,5 @@ \ProvidesFile{biblatex-gost.def} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -103,7 +103,9 @@ requested,published,priority, docthesis,phdautoref,docautoref, } + \DeclareLanguageMapping{russian}{russian-gost} + % % Sorting Schemes % diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx new file mode 100644 index 00000000000..c1ec9aa4f5e --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/brazilian-gost.lbx @@ -0,0 +1,11 @@ +\ProvidesFile{brazilian-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{brazilian} + +\DeclareBibliographyStrings{% + inherit = {brazilian},%------------------------------------------------------------ + pages = {{p\'aginas}{p\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx new file mode 100644 index 00000000000..da2671f59e9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/catalan-gost.lbx @@ -0,0 +1,12 @@ +\ProvidesFile{catalan-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{catalan} + +\DeclareBibliographyStrings{% + inherit = {catalan},%------------------------------------------------------------ + page = {{p\`agina}{p\adddot}}, + pages = {{p\`agines}{p\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx new file mode 100644 index 00000000000..2dfe8f0f057 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/croatian-gost.lbx @@ -0,0 +1,12 @@ +\ProvidesFile{croatian-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{croatian} + +\DeclareBibliographyStrings{% + inherit = {croatian},%------------------------------------------------------------ + page = {{stranica}{s\adddot}}, + pages = {{stranice}{s\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx new file mode 100644 index 00000000000..260125e10cd --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/english-gost.lbx @@ -0,0 +1,11 @@ +\ProvidesFile{russian-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{english} + +\DeclareBibliographyStrings{% + inherit = {english},%------------------------------------------------------------ + pages = {{pages}{p\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx index a763d925b26..d97a639f623 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-alphabetic} \AtEveryBibitem{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx index 22fb0cbac68..2d9518ef7f1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireCitationStyle{gost-alphabetic} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx index 1846c0809da..b50fde99b86 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic-min.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx index caa1a390373..e0de0a7f955 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelalpha,sorting=anyvt} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx index ebc579ba131..e2ac53d56cd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireCitationStyle{alphabetic} \ExecuteBibliographyOptions{labelalpha,autocite=inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx index 5de6a1d610c..b4f744d629f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-alphabetic.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-alphabetic.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx index 39fc5b2dd53..aa26446ddf7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-authoryear} \AtEveryBibitem{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx index f74b2e94567..880b2b81687 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireCitationStyle{gost-authoryear} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx index ce0ac57b593..5001c336781 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear-min.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx index 0dc049a06f4..31e0a03c54e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} @@ -35,7 +35,7 @@ % label isn't taken into account since labeltitle is always provided \newbibmacro*{labeltitle:common}{% \blx@gost@ifneedsdate - {\printfield[title]{labeltitle}% + {\printtext[title]{\printfield[titlecase]{labeltitle}}% \clearfield{\thefield{labeltitlesource}}} {}} @@ -203,10 +203,10 @@ \iffieldundef{label} {% no label, so print labeltitle (always present) \blx@gost@ifneedsdate - {\printfield[citetitle]{labeltitle} + {\printtext[citetitle]{\printfield[titlecase]{labeltitle}} \setunit{\nameyeardelim}% \usebibmacro{cite:labelyear+extras}{}} - {\printfield[citetitle]{labeltitle}}} + {\printtext[citetitle]{\printfield[titlecase]{labeltitle}}}} {% label exists, print it \usebibmacro{cite:label+volume+parts}}}% {% labelname, no labelyear @@ -269,7 +269,9 @@ } {\usebibmacro{bbx:dashcheck} {\bibnamedash} - {\printnames[heading]{author}% + {\iftoggle{bbx:gostbibliography} + {\printnames[heading][1-1]{author}} + {\printnames[heading]{author}}% \setunit{\addcomma\space}% \usebibmacro{bbx:savehash}}% \usebibmacro{authorstrg}% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx index fe34990fe95..b5796b2b0db 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, dropdates=false, @@ -53,11 +53,11 @@ \iffieldundef{label} {% no label, so print labeltitle (always present) \blx@gost@ifneedsdate - {\printfield[citetitle]{labeltitle} + {\printtext[citetitle]{\printfield[titlecase]{labeltitle}} \setunit{\nameyeardelim}% \usebibmacro{cite:labelyear+extras}{bibhyperref}} {\printtext[bibhyperref]{% - \printfield[citetitle]{labeltitle}}}} + \printtext[citetitle]{\printfield[titlecase]{labeltitle}}}}} {% label exists, print it \usebibmacro{cite:label+volume+parts}}}% {% labelname, no labelyear @@ -190,7 +190,7 @@ \newbibmacro*{cite:label}{% \iffieldundef{label} - {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} + {\printtext[bibhyperref]{\printtext[citetitle]{\printfield[titlecase]{labeltitle}}}} {\printtext[bibhyperref]{\printfield{label}}}} \newbibmacro*{cite:labelyear+extrayear}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx index 100b0e4f7aa..fd8781d1a2d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-authoryear.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-authoryear.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx index e9fc9e23b0c..77611909d76 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline-min} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx index 4e8509527fa..f76c9490b40 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireCitationStyle{gost-footnote} \renewbibmacro*{cite:clearfields}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx index adc2f3ccf03..84654332317 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote-min.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx index e9615fd68b3..63f6431da08 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx index 80d8a4a0a74..cea225b581d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireCitationStyle{gost-inline} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx index 680539ae5f1..ba58cfdeb29 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-footnote.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-footnote.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx index 8069105d434..d5e7e5465af 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-inline} \AtEveryBibitem{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx index adf52dc41c4..ba62e982f35 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireCitationStyle{gost-inline} \renewbibmacro*{cite:clearfields}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx index 04cd264d002..8f0a605321b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline-min.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx index 4cea3cf60d4..8ff7fb12c30 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} @@ -38,9 +38,9 @@ \newbibmacro*{labeltitle}{% \iffieldundef{label} {\iffieldundef{shorttitle} - {\printfield{title}% + {\printtext[title]{\printfield[titlecase]{title}}% \clearfield{title}} - {\printfield[title]{shorttitle}}} + {\printtext[title]{\printfield[titlecase]{shorttitle}}}} {\printfield{label}}} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx index 5927692f3d2..e998e1e3d52 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] @@ -76,9 +76,9 @@ test {\ifnumequal{\value{citecount}}{\value{citetotal}}} and ( - not test {\iffieldundef{pages}} - or - not test {\iffieldundef{pagetotal}} + not test {\iffieldundef{pages}} + or + not test {\iffieldundef{pagetotal}} ) } {\usebibmacro{cite:postnote:pages}} @@ -406,7 +406,7 @@ {} {\setunit*{\labelnamepunct}% \printtext[bibhyperlink]{% - \printfield[citetitle]{labeltitle}}}% + \printtext[citetitle]{\printfield[titlecase]{labeltitle}}}}% \ifboolexpr{ ( test {\ifentrytype{book}} % do we use macro{volume+parts} ? or test {\ifentrytype{collection}} @@ -499,7 +499,7 @@ \newbibmacro*{textcite}{% \ifnameundef{labelname} - {\printfield[citetitle]{labeltitle}} + {\printtext[citetitle]{\printfield[titlecase]{labeltitle}}} {\printnames{labelname}}} \newbibmacro*{textcite:init}{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx index 62c72e64e7c..47d2905969d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-inline.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-inline.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx index 8d0b0bc8ccc..90bfa3d3294 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-numeric} \AtEveryBibitem{% diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx index 48e3a5cc155..08d262602bd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireCitationStyle{gost-numeric} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx index 658e1226b3e..93ea3d3713d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric-min.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric-min.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx index c9612fd54ff..57f86a65254 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} \ExecuteBibliographyOptions{labelnumber,bibisbn,biburl,bibdoi,bibeprint} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx index 3b985aeec12..71f5cddde06 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.cbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.cbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{dashed=false,citeisbn,citeurl,citedoi,citeeprint} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx index 0ba723eced9..0512e72d844 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-numeric.dbx @@ -1,5 +1,5 @@ \ProvidesFile{gost-numeric.dbx} -[2017/02/16\space v1.13\space biblatex-gost data model] +[2017/05/03\space v1.14\space biblatex-gost data model] \blx@inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx index 679902f5a8c..e5a48f92f65 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx @@ -1,8 +1,8 @@ \ProvidesFile{gost-standard.bbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] -\def\bbx@gost@date{2017/02/16} -\def\bbx@gost@version{1.13} +\def\bbx@gost@date{2017/05/03} +\def\bbx@gost@version{1.14} \@ifpackagelater{biblatex}{2016/09/07} {} @@ -46,6 +46,30 @@ % OPTIONS +\DeclareBibliographyOption{otherlangs}[true]{% + \ifstrequal{#1}{true} + {\DeclareLanguageMapping{brazilian}{brazilian-gost} + \DeclareLanguageMapping{catalan}{catalan-gost} + \DeclareLanguageMapping{croatian}{croatian-gost} + \DeclareLanguageMapping{english}{english-gost} + \DeclareLanguageMapping{greek}{greek-gost} + \DeclareLanguageMapping{icelandic}{icelandic-gost} + \DeclareLanguageMapping{italian}{italian-gost} + \DeclareLanguageMapping{portuguese}{portuguese-gost} + \DeclareLanguageMapping{slovene}{slovene-gost} + \DeclareLanguageMapping{spanish}{spanish-gost}} + {\DeclareLanguageMapping{brazilian}{brazilian} + \DeclareLanguageMapping{catalan}{catalan} + \DeclareLanguageMapping{croatian}{croatian} + \DeclareLanguageMapping{english}{english} + \DeclareLanguageMapping{greek}{greek} + \DeclareLanguageMapping{icelandic}{icelandic} + \DeclareLanguageMapping{italian}{italian} + \DeclareLanguageMapping{portuguese}{portuguese} + \DeclareLanguageMapping{slovene}{slovene} + \DeclareLanguageMapping{spanish}{spanish}} + } + \newbibmacro*{bbx:savehash}{% \savefield{fullhash}{\bbx@lasthash}} \DeclareBibliographyOption{dashed}[true]{% @@ -255,7 +279,8 @@ alldates=short, eventdate=comp, blockpunct=emdash, - doublevols=true} + doublevols=true, + otherlangs=true} \newbibmacro*{cbx:bookibid:check}[2]{#2} @@ -274,50 +299,36 @@ % volume etc % % helper for printing volume/book/number/part/issue -\newcommand{\printvol}[2]{% - \ifnumcomp{\rangelen{#2}}{=}{2} +% [prefix] +\newcommand{\printvol}[3][]{% + \ifnumcomp{\rangelen{#3}}{=}{2} {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}} {}% - \iffieldnums{#2} - {\ifbibstring{#2} - {\bibstring{#2}\addabbrvspace#1} - {#1}} - {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} + \iffieldnums{#3} + {\ifbibstring{#3} + {\bibstring{#3}\addabbrvspace#2} + {#1#2}} + {\ifcapital{\MakeCapital{#2}}{#2}\isdot}} \DeclareFieldFormat*{volume}{\printvol{#1}{volume}} \DeclareFieldFormat[article,periodical]{volume}{% - \ifnumcomp{\rangelen{volume}}{=}{2} - {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}} - {}% + \ifnumcomp{\rangelen{volume}}{=}{2}{% + \iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}% + }{}% \ifbibstring{volume} {\bibstring{jourvol}\addabbrvspace#1} {#1}} \DeclareFieldFormat*{book}{\printvol{#1}{book}} \DeclareFieldFormat*{part}{\printvol{#1}{part}} -\DeclareFieldFormat{seriesnumber}{#1}% -\DeclareFieldFormat*{number}{% - \ifnumcomp{\rangelen{number}}{=}{2} - {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}} - {}% - \iffieldnums{number} - {\ifbibstring{number} - {\bibsstring{number}\addabbrvspace#1} - {\unspace\adddot#1}}% - {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} +\DeclareFieldFormat*{issue}{\printvol{#1}{issue}} +\DeclareFieldFormat[article,periodical]{issue}{\printvol[\unspace\adddot]{#1}{issue}} +\DeclareFieldFormat*{number}{\printvol[\unspace\adddot]{#1}{number}} +% \DeclareFieldFormat*{number}{\printvol{#1}{number}} \DeclareFieldFormat[patent]{number}{#1}% \DeclareFieldFormat{requestnumber}{% \ifbibstring{number} {\bibsstring{number}\addnbspace#1} {#1}}% -\DeclareFieldFormat{issue}{\printvol{#1}{issue}} -\DeclareFieldFormat[article,periodical]{issue}{% - \ifnumcomp{\rangelen{issue}}{=}{2} - {\iftoggle{bbx:gost:doublevols}{\def\bibrangedash{\doublevolsdelim}}{}} - {}% - \iffieldnums{issue} - {\ifbibstring{issue}% - {\bibstring{issue}\addabbrvspace#1}% - {\unspace\adddot#1}}% - {\ifcapital{\MakeCapital{#1}}{#1}\isdot}} +\DeclareFieldFormat{seriesnumber}{#1}% % volumes etc, involumes etc % @@ -415,7 +426,9 @@ {\namepartgiven} {\namepartprefix} {\namepartsuffix}}% - \usebibmacro{name:andothers}} + \iftoggle{bbx:gostbibliography} + {} + {\usebibmacro{name:andothers}}} \newbibmacro*{headingname:family-given}[4]{% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% @@ -1855,7 +1868,7 @@ \iffieldundef{issuetitle} {} {\setunit{\addcolon\space}% - \printfield{issuetitle}}}% + \printtext[issuetitle]{\printfield[titlecase]{issuetitle}}}}% \newbibmacro*{jour:date}{% \usebibmacro{year}% @@ -2139,7 +2152,9 @@ } {\usebibmacro{bbx:dashcheck} {\bibnamedash} - {\printnames[heading]{author}% + {\iftoggle{bbx:gostbibliography} + {\printnames[heading][1-1]{author}} + {\printnames[heading]{author}}% \setunit{\addcomma\space}% \usebibmacro{bbx:savehash}}% \usebibmacro{authorstrg}} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx new file mode 100644 index 00000000000..14b9e8e991e --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/greek-gost.lbx @@ -0,0 +1,11 @@ +\ProvidesFile{greek-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{greek} + +\DeclareBibliographyStrings{% + inherit = {greek},%------------------------------------------------------------ + pages = {{σελίδες}{σ\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx new file mode 100644 index 00000000000..6f6807dc560 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/icelandic-gost.lbx @@ -0,0 +1,12 @@ +\ProvidesFile{icelandic-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{icelandic} + +\DeclareBibliographyStrings{% + inherit = {icelandic},%------------------------------------------------------------ + page = {{bla\dh{}s\'{\i}\dh{}a}{b\adddot}}, + pages = {{bla\dh{}s\'{\i}\dh{}ur}{b\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx new file mode 100644 index 00000000000..855fc77e596 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/italian-gost.lbx @@ -0,0 +1,11 @@ +\ProvidesFile{italian-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{italian} + +\DeclareBibliographyStrings{% + inherit = {italian},%------------------------------------------------------------ + pages = {{pagine}{p\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx new file mode 100644 index 00000000000..c5cb0771beb --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/portuguese-gost.lbx @@ -0,0 +1,11 @@ +\ProvidesFile{portuguese-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{portuguese} + +\DeclareBibliographyStrings{% + inherit = {portuguese},%------------------------------------------------------------ + pages = {{p\'aginas}{p\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx index 72be9d71061..263379f93cd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/russian-gost.lbx @@ -1,5 +1,5 @@ \ProvidesFile{russian-gost.lbx} -[2017/02/16\space v1.13\space biblatex-gost styles] +[2017/05/03\space v1.14\space biblatex-gost styles] \InheritBibliographyExtras{russian} diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx new file mode 100644 index 00000000000..aa27298338e --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/slovene-gost.lbx @@ -0,0 +1,12 @@ +\ProvidesFile{slovene-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{slovene} + +\DeclareBibliographyStrings{% + inherit = {slovene},%------------------------------------------------------------ + page = {{stran}{s\adddot}}, + pages = {{strani}{s\adddot}}, +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx b/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx new file mode 100644 index 00000000000..c8d969f94f0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-gost/spanish-gost.lbx @@ -0,0 +1,12 @@ +\ProvidesFile{spanish-gost.lbx} +[2017/05/03\space v1.14\space biblatex-gost styles] + +\InheritBibliographyExtras{spanish} + +\DeclareBibliographyStrings{% + inherit = {spanish},%------------------------------------------------------------ + page = {{p\'agina}{p\adddot}}, + pages = {{p\'aginas}{p\adddot}}, +} + +\endinput -- cgit v1.2.3