diff options
author | Karl Berry <karl@freefriends.org> | 2014-11-29 23:21:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-11-29 23:21:06 +0000 |
commit | 5d7d0b39855c235e84a3da60299a79e75fbc9755 (patch) | |
tree | 3f3719e5030df92a1eb5f05cce17832fe2701be0 /Master/texmf-dist/tex | |
parent | d3507c95db29f3c6502627edee0a10ca5bbd27a8 (diff) |
biblatex-gost (29nov14)
git-svn-id: svn://tug.org/texlive/trunk@35695 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
23 files changed, 35 insertions, 36 deletions
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 701e33ae76a..7b03cf5e232 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.1\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -437,7 +437,7 @@ \maps[datatype=bibtex]{ \map[overwrite]{ \step[fieldsource=author, - match=\regexp{(.+\s+and\s+){3,}}, + match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, final] \step[fieldsource=options, match=\regexp{(.+)}, @@ -448,13 +448,13 @@ } \map{ \step[fieldsource=author, - match=\regexp{(.+\s+and\s+){3,}}, + match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, final] \step[fieldset=options, fieldvalue={useauthor=false}] } \map[overwrite]{ \step[fieldsource=editor, - match=\regexp{(.+\s+and\s+){3,}}, + match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, final] \step[fieldsource=options, match=\regexp{(.+)}, @@ -465,7 +465,7 @@ } \map{ \step[fieldsource=editor, - match=\regexp{(.+\s+and\s+){3,}}, + match=\regexp{(.+\s+and\s+){3,}|and\s+others\s*$}, final] \step[fieldset=options, fieldvalue={useeditor=false}] } 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 391eba8277f..33e3297c432 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 8fa3874494c..ebcfc14bde9 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 ec3fe3d69b7..315ed15c02f 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 d078d3c13d8..7cf2a6d096a 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 bf1f1d86315..a9ddf442f69 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 6e695ac615d..3718a1e6150 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 2d8b97f9b4f..3c7fd287e44 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 32ac3acd803..c0d53401d6b 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.1\space biblatex-gost styles] \ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict, singletitle=false,labeldate,labeltitleyear,uniquename=init, @@ -20,8 +20,7 @@ \renewcommand*{\postnotedelim}{\addcomma\addspace} \renewcommand*{\nameyeardelim}{\addcomma\addspace} \renewcommand*{\compcitedelim}{\addsemicolon\space} -\renewcommand*{\bibleftparen}{\blx@postpunct\ifcitation{[\bibsentence}{(}} -\renewcommand*{\bibrightparen}{\blx@postpunct\ifcitation{]}{)}\midsentence} +\newcommand{\mkbibbracketssentence}[1]{\bibsentence\mkbibbrackets{#1}\midsentence} \DeclareFieldFormat*{citetitle}{\mkbibemph{#1}} \DeclareFieldFormat{extratitleyear}{% @@ -245,7 +244,7 @@ {} {\usebibmacro{cite:postnote}} -\DeclareCiteCommand{\parencite}[\mkbibparens] +\DeclareCiteCommand{\parencite}[\mkbibbracketssentence] {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% @@ -253,7 +252,7 @@ {} {\usebibmacro{cite:postnote}} -\DeclareCiteCommand*{\parencite}[\mkbibparens] +\DeclareCiteCommand*{\parencite}[\mkbibbracketssentence] {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% @@ -277,7 +276,7 @@ {} {\usebibmacro{cite:postnote}} -\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote] +\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibbracketssentence\mkbibfootnote] {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% @@ -323,13 +322,13 @@ \pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{} \DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} -\DeclareMultiCiteCommand{\parencites}[\mkbibparens] +\DeclareMultiCiteCommand{\parencites}[\mkbibbracketssentence] {\parencite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\footcites}[\mkbibfootnote] {\footcite}{\setunit{\multicitedelim}} \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext] {\footcitetext}{\setunit{\multicitedelim}} -\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote] +\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibbracketssentence\mkbibfootnote] {\smartcite}{\setunit{\multicitedelim}} \endinput 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 522971c7579..d016ab48a93 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 8e1d8d85921..c45da2e5fab 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 b493a976654..f5bc291625a 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 c42582c6e66..e787e198c7b 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 00ff3431c8a..db0a5e0542b 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 bd268146f13..ad25fa7926c 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 3629bc8b5ef..dddf211e6a3 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 472590e5806..367ec0764dc 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.1\space biblatex-gost styles] \DeclareLabelname [inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook] 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 555b8165143..9d6547f589c 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 edca114c6aa..b2114be7c7c 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 d061a4cf96d..c1d6dbc76ec 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 02153aeb1a4..c6d1187e382 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.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 7f8654348b3..1b7dc8c9fe4 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.1\space biblatex-gost styles] -\def\bbx@gost@date{2014/02/15} -\def\bbx@gost@version{1.0} +\def\bbx@gost@date{2014/11/28} +\def\bbx@gost@version{1.1} \@ifpackagelater{biblatex}{2013/11/21} {} 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 68fafd91b5a..ebd6e2ec3d3 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} -[2014/02/15\space v1.0\space biblatex-gost styles] +[2014/11/28\space v1.1\space biblatex-gost styles] \InheritBibliographyExtras{russian} |