From 3c765a85506e5e370e6f349eb8fc66141a9f6c36 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Nov 2013 01:10:19 +0000 Subject: biblatex-gost (4nov13) git-svn-id: svn://tug.org/texlive/trunk@32072 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-gost/biblatex-gost.def | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.bbx | 2 +- .../latex/biblatex-gost/gost-alphabetic-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.bbx | 2 +- .../tex/latex/biblatex-gost/gost-alphabetic.cbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.bbx | 2 +- .../latex/biblatex-gost/gost-authoryear-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear.bbx | 2 +- .../tex/latex/biblatex-gost/gost-authoryear.cbx | 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.bbx | 2 +- .../tex/latex/biblatex-gost/gost-footnote.cbx | 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.bbx | 2 +- .../tex/latex/biblatex-gost/gost-inline.cbx | 12 ++++----- .../tex/latex/biblatex-gost/gost-numeric-min.bbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric-min.cbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.bbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.cbx | 2 +- .../tex/latex/biblatex-gost/gost-standard.bbx | 30 ++++++++++++---------- .../tex/latex/biblatex-gost/russian-gost.lbx | 2 +- 23 files changed, 44 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-gost') 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 5c08d2ebdee..e651a25392f 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ 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 cb77e55bb2a..3e04cfac4ff 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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 0781b33ca61..719eb1ccdf8 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireCitationStyle{gost-alphabetic} 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 9d169f7c462..0fdf52c3b14 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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 1cb4d2cce33..a7a1009ceea 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireCitationStyle{alphabetic} \ExecuteBibliographyOptions{labelalpha,autocite=inline} 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 912a0c193f4..91739b97393 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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 2b8bcfd9695..d69ee5bf3f4 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireCitationStyle{gost-authoryear} 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 35100eacc73..29c729a0a4d 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} 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 3546d7a9b5a..f2a0fbb145a 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, singletitle=false,labeldate,labeltitleyear,uniquename=init, 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 a0563d4515e..24d5de5260a 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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 1024069d533..a0c4d6bff67 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireCitationStyle{gost-footnote} \renewbibmacro*{cite:clearfields}{% 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 16bd50f82c2..b4089c919a5 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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 0cf4e03b322..6d54829fcc9 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireCitationStyle{gost-inline} 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 f23226eff2d..6661843ee4b 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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 1c2d123facf..27bbda7e0cb 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireCitationStyle{gost-inline} \renewbibmacro*{cite:clearfields}{% 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 b974ca55f79..fc946545777 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireBibliographyStyle{gost-standard} 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 1e01516a8ba..974b465fa78 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] @@ -105,7 +105,7 @@ % % xref ibidem tracker -\appto\blx@ibidtracker@gobal{% +\appto\blx@ibidtracker@global{% \ifbool{citetracker} {\blx@imc@iffieldundef{crossref} {\blx@imc@iffieldundef{xref} @@ -133,7 +133,7 @@ \global\undef\blx@lastxref@text% \global\undef\blx@lastxref@foot} -\appto\blx@ibidreset@gobal{% +\appto\blx@ibidreset@global{% \global\undef\blx@lastxref@text} \appto\blx@ibidreset@context{% @@ -249,7 +249,7 @@ % loccit tracker patching -\appto\blx@loccittracker@gobal{% +\appto\blx@loccittracker@global{% \ifbool{citetracker} {\blx@xrefloccit@tracker{text}} {}} @@ -404,7 +404,7 @@ {\printnames{labelname}}% \iffieldundef{labeltitle} {} - {\setunit*{\addspace}% + {\setunit*{\labelnamepunct}% \printtext[bibhyperlink]{% \printfield[citetitle]{labeltitle}}}% \ifboolexpr{ @@ -428,7 +428,7 @@ \ifnameundef{labelname} {\printfield{label}} {\printnames{labelname}}% - \newunit + \setunit*{\labelnamepunct}% \printtext[bibhyperlink]{% \bibstring[\mkibid]{opcit}}} 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 6d20f5e32a6..df43fa8aef7 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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 6917981cde6..115dba2500e 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \RequireCitationStyle{gost-numeric} 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 a9e876c87f9..eb3547a6429 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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 c70855dc23e..39378e27fa2 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\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-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx index 9f40ac74e1b..ded8d97005d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx @@ -1,14 +1,14 @@ \ProvidesFile{gost-standard.bbx} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] -\def\bbx@gost@date{2013/07/17} -\def\bbx@gost@version{0.9} +\def\bbx@gost@date{2013/11/04} +\def\bbx@gost@version{0.9.1} -\@ifpackagelater{biblatex}{2013/07/03} +\@ifpackagelater{biblatex}{2013/10/18} {} {\PackageError{biblatex} {Outdated 'biblatex' package} - {This version of 'biblatex-gost' requires biblatex v2.7 or later.\MessageBreak + {This version of 'biblatex-gost' requires biblatex v2.8 or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} @@ -279,12 +279,12 @@ \ifpunctmark{'}{}{\bibnamedelimc}}% \mkbibhdnamelast{#1}\isdot \ifblank{#4}{}{\bibnamedelimd\mkbibhdnameaffix{#4}\isdot}% - \ifblank{#2}{}{\addcomma\bibnamedelimd\mkbibhdnamefirst{#2}\isdot}} + \ifblank{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibhdnamefirst{#2}\isdot}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% \mkbibhdnamelast{#1}\isdot \ifblank{#4}{}{\bibnamedelimd\mkbibhdnameaffix{#4}\isdot}% - \ifblank{#2#3}{}{\addspace}% + \ifblank{#2#3}{}{\revsdnamepunct}% \ifblank{#2}{}{\bibnamedelimd\mkbibhdnamefirst{#2}\isdot}% \ifblank{#3}{}{\bibnamedelimd\mkbibhdnameprefix{#3}\isdot}}} \DeclareNameAlias{editor}{author} @@ -293,6 +293,8 @@ \DeclareNameAlias{editorc}{editor} \DeclareNameAlias{translator}{author} +\renewcommand*{\revsdnamepunct}{\addspace}% + \DeclareNameFormat{last-first:full}{% \begingroup% \renewcommand*{\revsdnamepunct}{\addspace}% @@ -319,7 +321,11 @@ \newcommand*{\blx@gost@endofstring}{\@\@\@\@\@} % end of string = \\\ \newcommand*{\blx@gost@setunit}{\newunit} -\@ifpackageloaded{babel} +\ifboolexpr{% + test {\@ifpackageloaded{babel}} + or + test {\@ifpackageloaded{polyglossia}} + } {\edef\gostmedialanguage{\csname bbl@main@language\endcsname}% \newcommand*{\select@medialanguage}{\select@language{\gostmedialanguage}}} {\edef\gostmedialanguage{russian}% @@ -1947,8 +1953,6 @@ % Related field -\renewcommand*{\relatedpunct}{\setunit{\addspace}} - \newcounter{bbx:relatedcount} \newcounter{bbx:relatedtotal} @@ -2077,15 +2081,15 @@ % changing the language of citations \gpreto\blx@hook@citekey{% - \ifdef\abx@field@hyphenation + \ifdef\abx@field@langid {\ifdef\blx@thelangenv {\edef\blx@temp@langenv{\noexpand\csname\blx@thelangenv\endcsname% - {\abx@field@hyphenation}}% + {\abx@field@langid}}% \blx@temp@langenv} {}}% {}} \apptocmd{\blx@citeprint}{% - \ifdef\abx@field@hyphenation + \ifdef\abx@field@langid {\ifdef\blx@thelangenv {\csname end\blx@thelangenv\endcsname} {}}% 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 37d114b3c86..8d55c508757 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} -[2013/07/17\space v0.9\space biblatex-gost styles] +[2013/11/04\space v0.9.1\space biblatex-gost styles] \InheritBibliographyExtras{russian} -- cgit v1.2.3