diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx | 122 |
1 files changed, 68 insertions, 54 deletions
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 |