summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-gost/gost-standard.bbx
diff options
context:
space:
mode:
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.bbx105
1 files changed, 48 insertions, 57 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 e5a48f92f65..69182291aaf 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}
-[2017/05/03\space v1.14\space biblatex-gost styles]
+[2017/06/27\space v1.15\space biblatex-gost styles]
-\def\bbx@gost@date{2017/05/03}
-\def\bbx@gost@version{1.14}
+\def\bbx@gost@date{2017/06/27}
+\def\bbx@gost@version{1.15}
\@ifpackagelater{biblatex}{2016/09/07}
{}
@@ -483,7 +483,7 @@
\renewcommand*{\finalnamedelim}{\addcomma\space}
\renewcommand*{\finallistdelim}{\addcomma\space}
\renewcommand*{\bibpagespunct}{\addperiod\space}
-\renewcommand*{\subtitlepunct}{\addcolon\space}
+\renewcommand*{\subtitlepunct}{\addcolondelim}
\newcommand*{\respdelim}{\addnbspace/\space}% delimiter before "credits"
\newcommand*{\resppunct}{\addsemicolondelim}% between "credits" items
\newcommand*{\specialitydelim}{\addnbspace\textemdash\space}% between specialitycode and speciality
@@ -523,7 +523,10 @@
\newcommand*{\blx@gost@iflangundef}[3]{\iffieldundef{#1}{#2}{#3}}
\newcommand*{\blx@gost@iflangsequal}[4]{\iffieldsequal{#1}{#2}{#3}{#4}}
-\newbibmacro*{begentry}{}
+\newbibmacro*{begentry}{%
+ \csundef{savedclearedcredits}%
+ \csundef{savedclearededitor}%
+ \csundef{savedclearedtranslator}}
\newbibmacro*{finentry}{\finentry}
%
%----------- Drivers ----------------
@@ -593,8 +596,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{book}{%
@@ -638,8 +640,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{booklet}{%
@@ -677,8 +678,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{collection}{%
@@ -720,8 +720,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inbook}{%
@@ -786,8 +785,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{incollection}{%
@@ -850,8 +848,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inproceedings}{%
@@ -914,8 +911,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{manual}{%
@@ -965,8 +961,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{misc}{%
@@ -1000,8 +995,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{online}{%
@@ -1044,8 +1038,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{patent}{%
@@ -1107,8 +1100,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{periodical}{%
@@ -1146,8 +1138,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{proceedings}{%
@@ -1189,8 +1180,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{report}{%
@@ -1235,8 +1225,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{thesis}{%
@@ -1267,8 +1256,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{unpublished}{%
@@ -1300,8 +1288,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related:init}%
- \usebibmacro{related}%
+ \usebibmacro{relatedblock}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{shorthand}{%
@@ -2028,8 +2015,10 @@
\usebibmacro{media}%
\setunit*{\addcolondelim}}%
\printfield[titlecase]{subtitle}}%
+ \midsentence
\setunit*{\addcolondelim}%
\printfield{type}%
+ \midsentence
\setunit*{\addcolondelim}%
\printfield{specialitycode}%
\setunit*{\specialitydelim}%
@@ -2373,6 +2362,8 @@
\newbibmacro*{begrelated}{}
\newbibmacro*{endrelated}{}
+\newbibmacro*{begrelatedloop}{}
+\newbibmacro*{endrelatedloop}{}
\def\ifrelatedloop{%
\ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}}
@@ -2385,23 +2376,10 @@
\iffieldequalstr{relatedtype}{multivolume}
{\finentry}
{}%
- \ifboolexpr{
- ( test {\ifcitation}
- and
- not togl {bbx:related:cite}
- )
- or
- ( not test {\ifcitation}
- and
- not togl {bbx:related:bib}
- )
- or
- test {\iffieldundef{related}}
- or
- test {\ifrelatedloop}
- }
+ \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} }
{}
- {\def\bbx@tempa{}%
+ {\usebibmacro{begrelated}%
+ \def\bbx@tempa{}%
\setcounter{bbx:relatedtotal}{0}%
\def\do##1{%
\entrydata{##1}{%
@@ -2420,7 +2398,9 @@
\def\do{%
\stepcounter{bbx:relatedcount}%
\ifnumgreater{\value{bbx:relatedcount}}{1}
- {\printtext{\relateddelim}}
+ {\ifcsundef{relateddelim\strfield{relatedtype}}
+ {\printtext{\relateddelim}}
+ {\printtext{\csuse{relateddelim\strfield{relatedtype}}}}}
{}}%
\ifbibmacroundef{related:\strfield{relatedtype}}
{\appto{\do}{\usebibmacro{related:default}}}
@@ -2432,7 +2412,7 @@
{\def\bbx@tempb{relatedstring:default}}
{\def\bbx@tempb{relatedstring:\strfield{relatedtype}}}%
\printtext[\bbx@tempa]{%
- \usebibmacro{begrelated}%
+ \usebibmacro{begrelatedloop}%
\iffieldundef{relatedstring}
{\ifboolexpr{
test {\ifnumgreater{\value{bbx:relatedtotal}}{1}}
@@ -2450,8 +2430,19 @@
\bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}
{\printfield[\bbx@tempb]{relatedstring}}}%
\docsvfield{related}%
- \usebibmacro{endrelated}}}%
- {}}}
+ \usebibmacro{endrelatedloop}}}%
+ {}%
+ \usebibmacro{endrelated}}}
+
+\newbibmacro*{relatedblock}{%
+ \ifboolexpr{
+ ( test {\ifcitation} and togl {bbx:related:cite})
+ or
+ ( not test {\ifcitation} and togl {bbx:related:bib})
+ }
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}}
\newbibmacro*{setup:min}{%
\renewbibmacro*{series+number}{}%