From 0962f3f1b18745856196b2e2d5c992b4d0138af9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 Nov 2013 23:24:37 +0000 Subject: biblatex-gost (30nov13) git-svn-id: svn://tug.org/texlive/trunk@32284 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-gost/biblatex-gost.dbx | 4 + .../tex/latex/biblatex-gost/biblatex-gost.def | 5 +- .../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 | 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.bbx | 2 +- .../tex/latex/biblatex-gost/gost-numeric.cbx | 2 +- .../tex/latex/biblatex-gost/gost-standard.bbx | 122 ++++++++++++--------- .../tex/latex/biblatex-gost/russian-gost.lbx | 2 +- 24 files changed, 96 insertions(+), 77 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-gost') 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 a1c7ee06599..0e5454b8378 100644 --- a/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-gost/biblatex-gost.dbx @@ -58,6 +58,10 @@ heading, } +\DeclareDatamodelEntryfields[article]{ + journalcredits, +} + \DeclareDatamodelEntryfields[book,collection,proceedings,reference]{ book, books,parts,issues, 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 e651a25392f..b9ca1541085 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\space biblatex-gost styles] % these declarations should be here, not in lbx, to be initialized for all languages \NewBibliographyString{ @@ -518,7 +518,8 @@ \DeclareDataInheritance{*}{*}{% \noinherit{heading}} \DeclareDataInheritance{periodical}{article}{% - \noinherit{endyear}\noinherit{endmonth}\noinherit{endday}} + \noinherit{endyear}\noinherit{endmonth}\noinherit{endday} + \inherit{credits}{journalcredits}} \DeclareDataInheritance{mvbook,mvcollection,mvproceedings} {book,collection,inbook,incollection,inproceedings}{% \noinherit{endyear}\noinherit{endmonth}\noinherit{endday}} 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 3e04cfac4ff..1dcb2b1752a 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 719eb1ccdf8..f8c987ccbae 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 0fdf52c3b14..c7ef68b274b 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 a7a1009ceea..8f815081104 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 91739b97393..ff5a1b38765 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 d69ee5bf3f4..3a6e2ee4d1e 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 29c729a0a4d..8cc58548d2c 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 f2a0fbb145a..96a2e3d6e95 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 24d5de5260a..5c734643f9f 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 a0c4d6bff67..1cbb193d381 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 b4089c919a5..379566ca96f 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 6d54829fcc9..429919074ee 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 6661843ee4b..27f341217b1 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 27bbda7e0cb..927c258c738 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 fc946545777..63fcc36a62b 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 974b465fa78..1b128ac612c 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 df43fa8aef7..08963a6901a 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 115dba2500e..96ef73b4461 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 eb3547a6429..d7257396a9d 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 39378e27fa2..67882c1714a 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\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 ded8d97005d..b018733c05e 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/11/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\space biblatex-gost styles] -\def\bbx@gost@date{2013/11/04} -\def\bbx@gost@version{0.9.1} +\def\bbx@gost@date{2013/11/30} +\def\bbx@gost@version{0.9.2} -\@ifpackagelater{biblatex}{2013/10/18} +\@ifpackagelater{biblatex}{2013/11/25} {} {\PackageError{biblatex} {Outdated 'biblatex' package} - {This version of 'biblatex-gost' requires biblatex v2.8 or later.\MessageBreak + {This version of 'biblatex-gost' requires biblatex v2.8a or later.\MessageBreak You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak This is a fatal error. I'm aborting now.}% \endinput} @@ -41,6 +41,8 @@ \newtoggle{cbx:eprint} \newtoggle{bbx:related:bib} \newtoggle{bbx:related:cite} +\newtoggle{bbx:gostbibliography} +\togglefalse{bbx:gostbibliography} \protected\def\blx@imc@printupdate{\csuse{mkbibrangeshort}{up}} \protected\def\blx@imc@printpubldate{\csuse{mkbibrangeshort}{publ}} @@ -257,10 +259,16 @@ % format for author is defined separately, because \mkbibnamelast, etc. cannot be % used, since they affect all names, not only headings \DeclareNameFormat{author}{% - \iffirstinits - {\usebibmacro{authorname:last-first}{#1}{#4}{#5}{#7}} - {\usebibmacro{authorname:last-first}{#1}{#3}{#5}{#7}}% - \usebibmacro{name:andothers}} + \iftoggle{bbx:gostbibliography} + {\ifnumequal{\value{listcount}}{1} + {\iffirstinits + {\usebibmacro{authorname:last-first}{#1}{#4}{#5}{#7}} + {\usebibmacro{authorname:last-first}{#1}{#3}{#5}{#7}}} + {}} + {\iffirstinits + {\usebibmacro{authorname:last-first}{#1}{#4}{#5}{#7}} + {\usebibmacro{authorname:last-first}{#1}{#3}{#5}{#7}}% + \usebibmacro{name:andothers}}} \newcommand*{\mkgostheading}[1]{\mkbibemph{#1}}%\nocorr}} \DeclareFieldFormat{heading}{% \mkgostheading{#1}\addperiod\space} @@ -366,6 +374,8 @@ \setunit{\respdelim}% \usebibmacro{byauthor}% \setunit*{\resppunct}% + \usebibmacro{credits}% + \setunit*{\resppunct}% \usebibmacro{bytranslator+others}% \setunit{\space}% \iffieldundef{journaltitle} % no journaltitle means electronic publication @@ -385,7 +395,7 @@ \usebibmacro{chapter+pages}} {\usebibmacro{journal}% \setunit{\respdelim}% - \usebibmacro{credits}% + \usebibmacro{jour:credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% \newunit\newblock @@ -424,10 +434,8 @@ \setunit*{\labelnamepunct}% \usebibmacro{maintitle+volumes+parts+title}% \setunit{\respdelim}% - \ifuseauthor - {} - {\usebibmacro{byauthor}% - \setunit*{\resppunct}}% + \usebibmacro{byauthor}% + \setunit*{\resppunct}% \usebibmacro{credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% @@ -471,10 +479,8 @@ \setunit{\subtitlepunct}% \printfield{type}% \setunit{\respdelim}% - \ifuseauthor - {} - {\usebibmacro{byauthor}% - \setunit*{\resppunct}}% + \usebibmacro{byauthor}% + \setunit*{\resppunct}% \usebibmacro{credits}% \setunit*{\resppunct}% \usebibmacro{byeditor}% @@ -570,10 +576,8 @@ \usebibmacro{chapter+pages}} {\usebibmacro{maintitle+volumes+parts+booktitle}% \setunit{\respdelim}% - \ifnamesequal{author}{bookauthor} - {} - {\usebibmacro{book:byauthor}% - \setunit*{\resppunct}}% + \usebibmacro{book:byauthor}% + \setunit*{\resppunct}% \usebibmacro{book:credits}% \setunit*{\resppunct}% \usebibmacro{book:byeditor}% @@ -781,10 +785,8 @@ \setunit{\subtitlepunct}% \printfield{type}% \setunit{\respdelim}% - \ifuseauthor - {} - {\usebibmacro{byauthor}% - \setunit*{\resppunct}}% + \usebibmacro{byauthor}% + \setunit*{\resppunct}% \usebibmacro{credits}% \newunit\newblock \printfield{version}% @@ -814,10 +816,8 @@ \setunit*{\labelnamepunct}% \usebibmacro{title}% \setunit{\respdelim}% - \ifuseauthor - {} - {\usebibmacro{byauthor}% - \setunit*{\resppunct}}% + \usebibmacro{byauthor}% + \setunit*{\resppunct}% \printlist{organization}% \setunit*{\resppunct}% \usebibmacro{credits}% @@ -1318,7 +1318,10 @@ \ifboolexpr{ test {\ifnameundef{book#1}} or - not test {\ifnamesequal{#1}{book#1}} + ( not test {\ifnamesequal{#1}{book#1}} + or + togl {bbx:gostbibliography} + ) } {#2} {#3}} @@ -1627,6 +1630,11 @@ \mkbibdatelong{}{endmonth}{endday}}}% } +\newbibmacro*{jour:credits}{% + \printlist[semicolondelim]{journalcredits}% + \clearlist{journalcredits}% +} + % processing volumes, books, parts, issues in the specified order \def\blx@gost@volsinorder#1#2{% @@ -1801,7 +1809,10 @@ \renewbibmacro*{byauthor}{% \ifboolexpr{ - test \ifuseauthor + ( test \ifuseauthor + and + not togl {bbx:gostbibliography} + ) or test {\ifnameundef{author}} } @@ -1812,7 +1823,10 @@ \ifboolexpr{ test {\ifnameundef{bookauthor}} or - test {\ifnamesequal{author}{bookauthor}} + ( test {\ifnamesequal{author}{bookauthor}} + and + not togl {bbx:gostbibliography} + ) } {} {\printnames[byauthor]{bookauthor}}} @@ -1871,7 +1885,9 @@ \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \savename{editor}{\savedclearededitor}% - \clearname{editor}} + \iftoggle{bbx:gostbibliography} + {} + {\clearname{editor}}} {\global\undef\bbx@lasthash}} \renewbibmacro*{translator}{% @@ -1891,7 +1907,9 @@ \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \savename{translator}{\savedclearedtranslator}% - \clearname{translator}} + \iftoggle{bbx:gostbibliography} + {} + {\clearname{translator}}} {\global\undef\bbx@lasthash}} \newbibmacro*{bbx:dashcheck}[2]{% @@ -2078,22 +2096,18 @@ \DeclareAutoCiteCommand{footnote}{\smartcite}{\smartcites} \DeclareAutoCiteCommand{superscript}{\supercite}{\supercites} -% changing the language of citations - -\gpreto\blx@hook@citekey{% - \ifdef\abx@field@langid - {\ifdef\blx@thelangenv - {\edef\blx@temp@langenv{\noexpand\csname\blx@thelangenv\endcsname% - {\abx@field@langid}}% - \blx@temp@langenv} - {}}% - {}} -\apptocmd{\blx@citeprint}{% - \ifdef\abx@field@langid - {\ifdef\blx@thelangenv - {\csname end\blx@thelangenv\endcsname} - {}}% - {}% -}{}{\blx@err@patch{citeprint command}} - -\endinput +\defbibenvironment{gostbibliography} + {\list + {} + {\toggletrue{bbx:gostbibliography}% + \renewcommand*{\revsdnamepunct}{\addcomma}% + \renewcommand*{\labelnamepunct}{\addperiod\space}% + \setlength{\bibitemsep}{0pt}% + \setlength{\leftmargin}{\bibhang}% + \setlength{\itemindent}{-\leftmargin}% + \setlength{\itemsep}{\bibitemsep}% + \setlength{\parsep}{\bibparsep}}} + {\endlist} + {\item} + +\endinput \ No newline at end of file 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 8d55c508757..667d42b51d5 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/04\space v0.9.1\space biblatex-gost styles] +[2013/11/30\space v0.9.2\space biblatex-gost styles] \InheritBibliographyExtras{russian} -- cgit v1.2.3