From ba4b016c440ad55acf1438f0dbe4e33a262a9640 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Feb 2014 23:14:29 +0000 Subject: biblatex-gost git-svn-id: svn://tug.org/texlive/trunk@32980 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 | 6 +- .../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 | 7 +- .../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 | 257 +++++++++++++++------ .../tex/latex/biblatex-gost/russian-gost.lbx | 2 +- 23 files changed, 213 insertions(+), 97 deletions(-) (limited to 'Master/texmf-dist/tex') 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 b9ca1541085..701e33ae76a 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 1dcb2b1752a..391eba8277f 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 f8c987ccbae..8fa3874494c 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 c7ef68b274b..ec3fe3d69b7 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 8f815081104..d078d3c13d8 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 ff5a1b38765..bf1f1d86315 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 3a6e2ee4d1e..6e695ac615d 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 8cc58548d2c..2d8b97f9b4f 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 96a2e3d6e95..32ac3acd803 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, singletitle=false,labeldate,labeltitleyear,uniquename=init, @@ -38,8 +38,8 @@ \global\undef\cbx@lastyear} {\iffieldundef{prenote} {} - {\global\undef\cbx@lasthash - \global\undef\cbx@lastyear}}} + {\global\undef\cbx@lasthash% + \global\undef\cbx@lastyear}}} \newbibmacro*{cite:reinit}{% \global\undef\cbx@lasthash 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 5c734643f9f..522971c7579 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 1cbb193d381..8e1d8d85921 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 379566ca96f..b493a976654 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 429919074ee..c42582c6e66 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 27f341217b1..00ff3431c8a 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 927c258c738..bd268146f13 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 63fcc36a62b..3629bc8b5ef 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 1b128ac612c..472590e5806 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] @@ -82,7 +82,7 @@ ) } {\usebibmacro{cite:postnote:pages}} - {\usebibmacro{cite:postnote:ibidpage}}} + {\usebibmacro{cite:postnote:ibidpage}}}% \providebibmacro*{cite:postnote:pages}{% \setunit{\postnotedelim}% \bibstring{thiscite}% @@ -99,7 +99,7 @@ \DeclareFieldFormat*{citetitle}{#1} \renewcommand{\postnotedelim}{\addperiod\space} -\renewcommand{\multicitedelim}{\addsemicolondelim\space} +\renewcommand{\multicitedelim}{\setunit{\addsemicolondelim}} % two xref trackers below should go before the option execution % @@ -429,6 +429,7 @@ {\printfield{label}} {\printnames{labelname}}% \setunit*{\labelnamepunct}% + \bibsentence% \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 08963a6901a..555b8165143 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 96ef73b4461..edca114c6aa 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 d7257396a9d..d061a4cf96d 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 67882c1714a..02153aeb1a4 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\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 b018733c05e..7f8654348b3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx @@ -1,10 +1,10 @@ \ProvidesFile{gost-standard.bbx} -[2013/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\space biblatex-gost styles] -\def\bbx@gost@date{2013/11/30} -\def\bbx@gost@version{0.9.2} +\def\bbx@gost@date{2014/02/15} +\def\bbx@gost@version{1.0} -\@ifpackagelater{biblatex}{2013/11/25} +\@ifpackagelater{biblatex}{2013/11/21} {} {\PackageError{biblatex} {Outdated 'biblatex' package} @@ -371,7 +371,9 @@ \usebibmacro{author/translator+others}% \setunit*{\labelnamepunct}% \usebibmacro{title}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -379,7 +381,7 @@ \usebibmacro{bytranslator+others}% \setunit{\space}% \iffieldundef{journaltitle} % no journaltitle means electronic publication - {\newunit} + {\usebibmacro{doi+eprint+url+note}} {\usebibmacro{//}% \usebibmacro{cbx:bookibid:check} {\bibsentence\printtext{% @@ -394,7 +396,7 @@ \newunit\newblock \usebibmacro{chapter+pages}} {\usebibmacro{journal}% - \setunit{\respdelim}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{jour:credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% @@ -415,11 +417,11 @@ \newunit\newblock \usebibmacro{issn}% \newunit\newblock}% - \usebibmacro{doi+eprint+url+note}% - \newunit\newblock - \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock - \usebibmacro{pageref}}% + \usebibmacro{doi+eprint+url+note}}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% \newunit\newblock \usebibmacro{related:init}% \usebibmacro{related}% @@ -433,7 +435,9 @@ \usebibmacro{author/editor+others/translator+others}% \setunit*{\labelnamepunct}% \usebibmacro{maintitle+volumes+parts+title}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -478,7 +482,9 @@ \usebibmacro{title}% \setunit{\subtitlepunct}% \printfield{type}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -513,7 +519,9 @@ \usebibmacro{editor+others}% \setunit*{\labelnamepunct}% \usebibmacro{maintitle+volumes+parts+title}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% @@ -554,7 +562,9 @@ \usebibmacro{author/translator+others}% \setunit*{\labelnamepunct}% \usebibmacro{title}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -575,7 +585,9 @@ \newunit\newblock \usebibmacro{chapter+pages}} {\usebibmacro{maintitle+volumes+parts+booktitle}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{book:translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{book:byauthor}% \setunit*{\resppunct}% \usebibmacro{book:credits}% @@ -616,7 +628,9 @@ \usebibmacro{author/translator+others}% \setunit*{\labelnamepunct}% \usebibmacro{title}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -637,7 +651,9 @@ \newunit\newblock \usebibmacro{chapter+pages}} {\usebibmacro{maintitle+volumes+parts+booktitle}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{book:translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{book:credits}% \setunit*{\resppunct}% \usebibmacro{book:byeditor}% @@ -676,7 +692,9 @@ \usebibmacro{author/translator+others}% \setunit*{\labelnamepunct}% \usebibmacro{title}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -699,7 +717,9 @@ {\usebibmacro{maintitle+volumes+parts+booktitle}% \newunit \usebibmacro{event+venue+date}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{book:translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{book:credits}% \setunit*{\resppunct}% \usebibmacro{book:byeditor}% @@ -738,11 +758,16 @@ \usebibmacro{title}% \setunit{\subtitlepunct}% \printfield{type}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% - \printlist{organization}% - \setunit*{\resppunct}% + \iflistundef{organization} + {} + {\setrespdelim% + \printlist{organization}% + \setunit*{\resppunct}}% \usebibmacro{credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% @@ -784,7 +809,9 @@ \usebibmacro{title}% \setunit{\subtitlepunct}% \printfield{type}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -815,11 +842,16 @@ \usebibmacro{author/editor}% \setunit*{\labelnamepunct}% \usebibmacro{title}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% - \printlist{organization}% - \setunit*{\resppunct}% + \iflistundef{organization} + {} + {\setrespdelim% + \printlist{organization}% + \setunit*{\resppunct}}% \usebibmacro{credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% @@ -864,15 +896,21 @@ \printlist[][-\value{listtotal}]{location}}% \setunit{\addcolondelim}% \printfield{ipc}% - \setunit{\respdelim}% - \printnames[byauthor]{author}% - \iffieldundef{authortype} + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- + \ifnameundef{author} {} - {\setunit*{\addspace}% - \printfield[parens]{authortype}}% - \setunit*{\addsemicolondelim}% - \usebibmacro{byholder}% - \setunit*{\addsemicolondelim}% + {\setrespdelim% + \printnames[byauthor]{author}% + \iffieldundef{authortype} + {} + {\setunit*{\addspace}% + \printfield[parens]{authortype}}% + \setunit*{\addsemicolondelim}}% + \ifnameundef{holder} + {} + {\setrespdelim% + \usebibmacro{byholder}% + \setunit*{\addsemicolondelim}}% \usebibmacro{credits}% \newunit\newblock \printfield{reqnumber}% @@ -913,7 +951,9 @@ \usebibmacro{editor}% \setunit*{\labelnamepunct}% \usebibmacro{title} - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% @@ -952,7 +992,9 @@ \usebibmacro{maintitle+volumes+parts+title}% \newunit \usebibmacro{event+venue+date}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% @@ -993,11 +1035,16 @@ \usebibmacro{title}% \setunit{\subtitlepunct}% \printfield{type}% - \setunit{\respdelim}% + \setunit{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% - \printlist[semicolondelim]{institution}% - \setunit*{\resppunct}% + \iflistundef{institution} + {} + {\setrespdelim% + \printlist[semicolondelim]{institution}% + \setunit*{\resppunct}}% \usebibmacro{credits}% \newunit\newblock \printfield{version}% @@ -1061,7 +1108,9 @@ \usebibmacro{author}% \setunit*{\labelnamepunct}% \usebibmacro{title}% - \setunit{\respdelim}% + \setunit*{\addcolondelim}% + \usebibmacro{translation}% + \def\bbx@gost@respdelim{\setunit{\respdelim}}% ----- Resp starts ----- \usebibmacro{byauthor}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -1338,12 +1387,15 @@ {#3}} \newbibmacro*{credits}{% - \usebibmacro{checkbooklist}{credits} - {\printlist[semicolondelim]{credits}% - \savelist{credits}{\savedclearedcredits}% - \clearlist{credits}% - } - {}} + \iflistundef{credits} + {} + {\usebibmacro{checkbooklist}{credits} + {\setrespdelim% + \printlist[semicolondelim]{credits}% + \savelist{credits}{\savedclearedcredits}% + \clearlist{credits}% + } + {}}} \renewbibmacro*{byeditor+othersstrg}[1]{% \iffieldundef{#1type} @@ -1378,13 +1430,14 @@ \renewbibmacro*{byeditor}{% \ifnameundef{editor} {} - {\usebibmacro{byeditor+othersstrg}{editor}% - \setunit{\addspace}% - \printnames[byeditor]{editor}% - \savename{editor}{\savedclearededitor}% - \clearname{editor}% - \setunit*{\resppunct}% - \usebibmacro{byeditorx}}} + {\setrespdelim% + \usebibmacro{byeditor+othersstrg}{editor}% + \setunit{\addspace}% + \printnames[byeditor]{editor}% + \savename{editor}{\savedclearededitor}% + \clearname{editor}% + \setunit*{\resppunct}% + \usebibmacro{byeditorx}}} \renewbibmacro*{bytranslator+others}{% \ifnameundef{translator} @@ -1411,7 +1464,8 @@ not test {\blx@gost@iflangsequal{origlanguage}{bookoriglanguage}} ) } - {\usebibmacro{bytranslator+othersstrg}% + {\setrespdelim% + \usebibmacro{bytranslator+othersstrg}% \setunit*{\addspace}% \printnames[bytranslator]{translator}% \savename{translator}{\savedclearedtranslator}% @@ -1477,11 +1531,37 @@ \clearname{afterword}} {}} +\newbibmacro*{with+}[1]{% + \ifnameundef{#1} + {} + {\setrespdelim% + \bibstring{with#1}% + \setunit{\addspace}% + \printnames[with#1]{#1}}} + +\renewbibmacro*{withcommentator}{% + \usebibmacro{with+}{commentator}} + +\renewbibmacro*{withannotator}{% + \usebibmacro{with+}{annotator}} + +\renewbibmacro*{withintroduction}{% + \usebibmacro{with+}{introduction}} + +\renewbibmacro*{withforeword}{% + \usebibmacro{with+}{foreword}} + +\renewbibmacro*{withafterword}{% + \usebibmacro{with+}{afterword}} + % book:... macros \newbibmacro*{book:credits}{% - \printlist[semicolondelim]{bookcredits}% - \clearlist{bookcredits}% + \iflistundef{credits} + {} + {\setrespdelim% + \printlist[semicolondelim]{bookcredits}% + \clearlist{bookcredits}}% } \newbibmacro*{book:byeditor+othersstrg}[1]{% @@ -1517,18 +1597,20 @@ \newbibmacro*{book:byeditor}{% \ifnameundef{editor} {} - {\usebibmacro{book:byeditor+othersstrg}{editor}% - \setunit{\addspace}% - \printnames[byeditor]{editor}% - \savename{editor}{\savedclearededitor}% - \clearname{editor}% - \setunit*{\resppunct}% - \usebibmacro{book:byeditorx}}} + {\setrespdelim% + \usebibmacro{book:byeditor+othersstrg}{editor}% + \setunit{\addspace}% + \printnames[byeditor]{editor}% + \savename{editor}{\savedclearededitor}% + \clearname{editor}% + \setunit*{\resppunct}% + \usebibmacro{book:byeditorx}}} \newbibmacro*{book:bytranslator+others}{% \ifnameundef{booktranslator} {} - {\usebibmacro{book:bytranslator+othersstrg}% + {\setrespdelim% + \usebibmacro{book:bytranslator+othersstrg}% \setunit{\addspace}% \printnames[bytranslator]{booktranslator}% \clearname{booktranslator}% @@ -1584,7 +1666,8 @@ \newbibmacro*{book:with+}[1]{% \ifnameundef{book#1} {} - {\bibstring{with#1}% + {\setrespdelim% + \bibstring{with#1}% \setunit{\addspace}% \printnames[with#1]{book#1}}} @@ -1631,8 +1714,11 @@ } \newbibmacro*{jour:credits}{% - \printlist[semicolondelim]{journalcredits}% - \clearlist{journalcredits}% + \iflistundef{credits} + {} + {\setrespdelim% + \printlist[semicolondelim]{journalcredits}% + \clearlist{journalcredits}}% } % processing volumes, books, parts, issues in the specified order @@ -1704,6 +1790,31 @@ \setunit{\addcolondelim}% \printfield{booktitleaddon}} +\newbibmacro*{translation}{% + \ifnameundef{translator} + {\ifnameundef{booktranslator} + {\iffieldundef{origlanguage} + {} + {\bibstring{bytranslator}% + \clearfield{origlanguage}}} + {}}% + {}} + +\newbibmacro*{book:translation}{% + \ifnameundef{booktranslator} + {\iffieldundef{bookoriglanguage} + {} + {% temporarily redefining commands used in the bibstring + \savecommand\lbx@lfromlang% + \savecommand\lbx@sfromlang% + \renewcommand*{\lbx@lfromlang}{\lbx@gost@lfromlang{bookoriglanguage}}% + \renewcommand*{\lbx@sfromlang}{\lbx@gost@sfromlang{bookoriglanguage}}% + \bibstring{bytranslator}% + \restorecommand\lbx@lfromlang% + \restorecommand\lbx@sfromlang% + \clearfield{bookoriglanguage}}} + {}} + \renewbibmacro*{maintitle}{% \ifboolexpr{ test {\iffieldundef{maintitle}} @@ -1817,7 +1928,8 @@ test {\ifnameundef{author}} } {} - {\printnames[byauthor]{author}}} + {\setrespdelim% + \printnames[byauthor]{author}}} \newbibmacro*{book:byauthor}{% \ifboolexpr{ @@ -1829,7 +1941,8 @@ ) } {} - {\printnames[byauthor]{bookauthor}}} + {\setrespdelim% + \printnames[byauthor]{bookauthor}}} \renewbibmacro*{name:andothers}{% \ifboolexpr{ @@ -1969,6 +2082,8 @@ \newbibmacro*{heading}{% \printfield{heading}} +\newcommand*{\setrespdelim}{\bbx@gost@respdelim\def\bbx@gost@respdelim{}} + % Related field \newcounter{bbx:relatedcount} 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 667d42b51d5..68fafd91b5a 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/11/30\space v0.9.2\space biblatex-gost styles] +[2014/02/15\space v1.0\space biblatex-gost styles] \InheritBibliographyExtras{russian} -- cgit v1.2.3