From e96ebef7fcb5a399544c72e789fda889859795c4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 Jul 2016 23:13:20 +0000 Subject: gost (26jul16) git-svn-id: svn://tug.org/texlive/trunk@41778 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/bibtex/gost/gost.dtx | 550 ++++++++++++++++++-------- Master/texmf-dist/source/bibtex/gost/gost.ins | 4 +- 2 files changed, 385 insertions(+), 169 deletions(-) (limited to 'Master/texmf-dist/source/bibtex') diff --git a/Master/texmf-dist/source/bibtex/gost/gost.dtx b/Master/texmf-dist/source/bibtex/gost/gost.dtx index 95b9af0a0e9..c8de693c51b 100644 --- a/Master/texmf-dist/source/bibtex/gost/gost.dtx +++ b/Master/texmf-dist/source/bibtex/gost/gost.dtx @@ -8,7 +8,7 @@ % GOST R 7.0.5-2008 with some conventional modifications. % % Copyright 2012-2016 Igor A. Kotelnikov. -% Version 1.2d +% Version 1.2g % % Copyright 1996-2005 Maksym Polyakov. % Version 2005.08.12 @@ -17,7 +17,7 @@ % to add the field % language = {russian}. % Ukrainian, German, French, Italian languages are -% also supported. Default language is English. +% also partially supported. Default language is English. % % Book entry should have the pagetotal field % showing total number of pages. Optional field @@ -52,7 +52,7 @@ % %<*driver> \ProvidesFile{gost.dtx}% - [2016/02/18 v.1.2d Bibliography styles for GOST R 7.0.5-2008.] + [2016/07/25 v.1.2g Bibliography styles for GOST R 7.0.5-2008.] \documentclass{ltxdoc} @@ -126,8 +126,11 @@ % % \fi % -% \CheckSum{508} +% \CheckSum{548} % +% \changes{v1.2g}{25 Jul 2016}{minor changes in documentation} +% \changes{v1.2f}{12 Jul 2016}{patent entry added} +% \changes{v1.2e}{07 Jul 2016}{bbl.url added to replace URL string} % \changes{v1.2d}{18 Feb 2016}{\cs{bbljan} e.t.c. macros removed} % \changes{v1.2c}{18 Jan 2015}{langid field added} % \changes{v1.2c}{18 Jan 2015}{eid field added} @@ -427,6 +430,36 @@ % {CTAN:pkg/gost}. % \end{enumerate} % +% +% \subsection{What's new in version 1.2g (2016.07.25)} +% +% \begin{enumerate} +% \item +% Minor changes in documentation. +% +% \end{enumerate} +% +% +% \subsection{What's new in version 1.2f (2016.07.12)} +% +% \begin{enumerate} +% \item +% Support for patent entry added (thanks to Stanislav Kruchinin). +% +% \item +% medium field renamed to media field. + +% \end{enumerate} +% +% \subsection{What's new in version 1.2e (2016.07.07)} +% +% \begin{enumerate} +% \item +% Hard coded "URL" string replaced with a language sensitive string +% (thanks to Roman Budnyi). +% +% \end{enumerate} +% % \subsection{What's new in version 1.2d (2015.02.18)} % % \begin{enumerate} @@ -608,7 +641,8 @@ ENTRY school series title - medium % new in v1.2. + %medium % new in v1.2; renamed to media. + media % new in v1.2f type volume year @@ -616,8 +650,9 @@ ENTRY langid % new in v1.2c booklanguage % \end{macrocode} -% Remaining entries are borrowed from biblatex. +% Entries borrowed from biblatex. % \begin{macrocode} + date % new in v1.2f; not implemented yet... pagetotal url urldate @@ -627,6 +662,29 @@ ENTRY eprinttype % = archivePrefix eprintclass % = primaryClass eprint +% \end{macrocode} +% Entries borrowed from disser.bst by S.Kruchinin. +% \begin{macrocode} + % new in v1.2f: + % appear in biblatex: + addendum + holder + location + subtitle + titleaddon + version + % Appear in biblatex-gost: + authorcountry % ?? + credits % statement of responsibility, other than provided in Biblatex + ipc % Code of the International Patent Classification + %media % General material designation NOTE: medium in the above + requestnumber % Registration number of the application to the patent document + publicationdate % Date of publication + publication % and information on the official gazette, which published patent + prioritydate % Information about the convention priority: the date of filing of the application, + prioritynumber % number and + prioritycountry % country name of convention priority. + requestdate % ?? } {} % { label } @@ -636,7 +694,7 @@ ENTRY % Declare internal variables and constants used in to format references. % \begin{macrocode} INTEGERS { output.state before.all mid.sentence after.sentence after.block -after.dblslash after.slash after.column after.semicolumn } +after.dblslash after.slash after.colon after.semicolon } % \end{macrocode} % \DescribeFunction{init.state.consts}% @@ -648,8 +706,8 @@ FUNCTION {init.state.consts} #3 'after.block := #4 'after.dblslash := #5 'after.slash := - #6 'after.column := - #7 'after.semicolumn := + #6 'after.colon := + #7 'after.semicolon := } STRINGS { s t } @@ -686,8 +744,7 @@ FUNCTION {output.nonnull} { ", " * write$ } { output.state after.block = { add.period$ write$ -% " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c -% " \BibDash " write$ + " \BibDash " write$ newline$ "\newblock " write$ } @@ -697,10 +754,10 @@ FUNCTION {output.nonnull} { "~//" * change.language * " " * write$ } { output.state after.slash = { "~/ " * write$ } - { output.state after.column = + { output.state after.colon = % { ": " * write$ } % { "~: " * write$ } - { output.state after.semicolumn = + { output.state after.semicolon = % { "; " * write$ } % { "~; " * write$ } { add.period$ " " * write$ } @@ -788,22 +845,22 @@ FUNCTION {new.slash} } % \end{macrocode} -% \DescribeFunction{new.column}% +% \DescribeFunction{new.colon}% % \begin{macrocode} -FUNCTION {new.column} +FUNCTION {new.colon} { output.state before.all = 'skip$ - { after.column 'output.state := } + { after.colon 'output.state := } if$ } % \end{macrocode} -% \DescribeFunction{new.semicolumn}% +% \DescribeFunction{new.semicolon}% % \begin{macrocode} -FUNCTION {new.semicolumn} +FUNCTION {new.semicolon} { output.state before.all = 'skip$ - { after.semicolumn 'output.state := } + { after.semicolon 'output.state := } if$ } @@ -963,30 +1020,9 @@ FUNCTION {emphasize} % \end{macrocode} % -% \DescribeFunction{enclose.square.brackets} -% New in v.1.2. -% Declare function to enclose last word in square brackets. It do so only -% for the |string| option. -% \begin{macrocode} -%<*!strict> -FUNCTION {enclose.square.brackets} { } -% -%<*strict> -FUNCTION {enclose.square.brackets} -{ duplicate$ empty$ - { pop$ "" } - { "[" swap$ * "]" * } - if$ -} -% - - % \DescribeFunction{bracify} -% \DescribeFunction{bracketise} -% \DescribeFunction{parenthesify} % New in v.1.2. An idea borrowed from apsrev4-1.bst. -% Declare function to enclose last word in braces, square brackets and -% parenthesis. +% Declare function to enclose last word by braces even if empty. % \begin{macrocode} FUNCTION {bracify} { duplicate$ empty$ @@ -994,20 +1030,30 @@ FUNCTION {bracify} { "{" swap$ * "}" * } if$ } -FUNCTION {bracketise} -{ duplicate$ empty$ - { pop$ "[]" } + +% \end{macrocode} +% \DescribeFunction{enclose.square.brackets} +% This and the next functions are used to enclose last word by brackets. +% \begin{macrocode} +FUNCTION {enclose.square.brackets} +{ + duplicate$ empty$ + { pop$ "" } { "[" swap$ * "]" * } if$ } -FUNCTION {parenthesify} -{ duplicate$ empty$ - { pop$ "()" } + +% \end{macrocode} +% \DescribeFunction{enclose.round.brackets} +% \begin{macrocode} +FUNCTION {enclose.round.brackets} +{ + duplicate$ empty$ + { pop$ "" } { "(" swap$ * ")" * } if$ } - % \end{macrocode} % % \DescribeFunction{space.word} @@ -1377,6 +1423,26 @@ FUNCTION {bbl.ppage} % { "\bblP." } if$} if$} +% \end{macrocode} +% Next function was added in version 2016.07.07. +% \DescribeFunction{bbl.url} +% \begin{macrocode} +FUNCTION {bbl.url} +{ curlanguage "english" = + {"Access mode"} + { curlanguage "ukrainian" = +% { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyru}" } +% { "{Режим доступу}" } + { curlanguage "russian" = +% { "{\CYRR\cyre\cyrzh\cyri\cyrm\ \cyrd\cyro\cyrs\cyrt\cyru\cyrp\cyra}" } +% { "{Режим доступа}" } + { curlanguage "german" = + { "{online; abgerufen}" } + { "language is not defined: " language "urldate" * * warning$ "online; accessed" } + if$} + if$} + if$} +if$} % \end{macrocode} % Next function was added in version 2012.01.15. % \DescribeFunction{bbl.urldate} @@ -1509,22 +1575,22 @@ FUNCTION {bbl.nnopublisher} if$} % \end{macrocode} -% \DescribeFunction{bbl.medium.text} +% \DescribeFunction{bbl.media.text} % \begin{macrocode} -FUNCTION {bbl.medium.text} +FUNCTION {bbl.media.text} { curlanguage "english" = { "Text" } { curlanguage "russian" = curlanguage "ukrainian" = or % { "{\cyr\CYRT\cyre\cyrk\cyrs\cyrt}" } % { "{Текст}" } - { "language is not defined: " language "medium" * * warning$ "Text" } + { "language is not defined: " language "media" * * warning$ "Text" } if$} if$} % \end{macrocode} -% \DescribeFunction{bbl.medium.elres} +% \DescribeFunction{bbl.media.elres} % \begin{macrocode} -FUNCTION {bbl.medium.elres} +FUNCTION {bbl.media.elres} { curlanguage "english" = { "Electronic resource" } { curlanguage "russian" = @@ -1533,12 +1599,11 @@ FUNCTION {bbl.medium.elres} { curlanguage "ukrainian" = % { "{\cyr\CYRE\cyrl\cyre\cyrk\cyrt\cyrr\cyro\cyrn\cyrn\cyri\cyrishrt\ \cyrr\cyre\cyrs\cyru\cyrr\cyrs}" } % { "{Електронний ресурс}" } - { "language is not defined: " language "medium" * * warning$ "Electronic resource" } + { "language is not defined: " language "media" * * warning$ "Electronic resource" } if$} if$} if$} - % \end{macrocode} % \DescribeFunction{bbl.chief} % \begin{macrocode} @@ -1568,20 +1633,80 @@ FUNCTION {bbl.executor} { curlanguage "ukrainian" = % { "{\cyr\cyrv\cyri\cyrk\cyro\cyrn\cyra\cyrv\cyre\cyrc\cyrsftsn}" } % { "{виконавець}" } - { "language is not defined: " language "medium" * * warning$ "Executor" } + { "language is not defined: " language "executor" * * warning$ "executor" } if$} if$} if$} % \end{macrocode} -% \DescribeFunction{bbl.medium} +% \DescribeFunction{bbl.media} % \begin{macrocode} -FUNCTION {bbl.medium} +FUNCTION {bbl.media} { type$ "online" = - { bbl.medium.elres } - { bbl.medium.text } + { bbl.media.elres } + { bbl.media.text } if$} +% \end{macrocode} +% \DescribeFunction{bbl.req} +% \begin{macrocode} +FUNCTION {bbl.req} +{ + curlanguage "english" = + { "req." } + { curlanguage "german" = + { "ang." } + { curlanguage "russian" = +% { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" } +% { "{заявл.}" } + { "language is not defined: " language "req" * * warning$ "req" } + if$ + } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeFunction{bbl.publ} +% \begin{macrocode} +FUNCTION {bbl.publ} +{ + curlanguage "english" = + { "publ." } + { curlanguage "german" = + { "ausg." } + { curlanguage "russian" = +% { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" } +% { "{опубл.}" } + { "language is not defined: " language "publication" * * warning$ "publication" } + if$ + } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeFunction{bbl.priority} +% \begin{macrocode} +FUNCTION {bbl.priority} +{ + curlanguage "english" = + { "priority" } + { curlanguage "german" = + { "Prioritat" } + { curlanguage "russian" = +% { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" } +% { "{приоритет}" } + { "language is not defined: " language "priority" * * warning$ "priority" } + if$ + } + if$ + } + if$ +} + % \end{macrocode} % % \subsection{Formatting functions} @@ -1944,7 +2069,7 @@ FUNCTION {format.title} % \end{macrocode} % \DescribeFunction{format.month} -% New in version 1.2d. This macro reeads month field and translate English names +% New in version 1.2d. This macro reads month field and translate English names % of months to Russian if current language is Russian. % \begin{macrocode} FUNCTION {format.month} @@ -2007,8 +2132,7 @@ FUNCTION {format.date} } { month empty$ 'year -% { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * } -% { year ". \BibDash " format.month * * } + { year ". \BibDash " format.month * * } if$ } if$ @@ -2027,7 +2151,7 @@ FUNCTION {output.address.publisher} { address output publisher empty$ 'skip$ - { new.column } + { new.colon } if$ } if$ @@ -2035,28 +2159,6 @@ FUNCTION {output.address.publisher} } % %<*strict> -%FUNCTION {output.address.publisher} -%{ -% address empty$ -% { -% bbl.nnoaddress -% publisher empty$ -% { "~: " * bbl.nopublisher * } -% { } -% if$ -% enclose.square.brackets -% } -% { -% address output -% new.column -% publisher empty$ -% { bbl.nopublisher enclose.square.brackets } -% { publisher } -% if$ -% } -% if$ -% output -%} FUNCTION {output.address.publisher} { address empty$ @@ -2069,7 +2171,7 @@ FUNCTION {output.address.publisher} } { address output - new.column + new.colon publisher empty$ { bbl.nopublisher enclose.square.brackets } { publisher } @@ -2098,20 +2200,6 @@ FUNCTION {output.address.publisher.date} % \DescribeFunction{output.bibitem} % \begin{macrocode} %<*!natbib> -%%FUNCTION {output.bibitem} -%%{ newline$ -%% "\bibitem" write$ -%% cite$ bracify write$ -%% newline$ -%% language empty$ -%% { "english" 'curlanguage := } -%% { language 'curlanguage := } -%% if$ -%% "\selectlanguageifdefined" curlanguage bracify * write$ -%% newline$ -%% "" -%% before.all 'output.state := -%%} FUNCTION {output.bibitem} { newline$ "\bibitem" write$ @@ -2791,7 +2879,7 @@ FUNCTION {author.after} author empty$ 'skip$ {format.authors.after output - new.semicolumn } + new.semicolon } if$ } % @@ -2803,7 +2891,7 @@ FUNCTION {author.after} 'skip$ {author num.names$ #3 > {format.authors.after output - new.semicolumn } + new.semicolon } 'skip$ if$} if$ @@ -2824,7 +2912,7 @@ FUNCTION {bookauthor.after} bookauthor empty$ 'skip$ {format.bookauthors.after output - new.semicolumn } + new.semicolon } if$ } @@ -2836,19 +2924,19 @@ FUNCTION {editor.organization.after} compiler empty$ {} { format.compiler.after output - new.semicolumn + new.semicolon } if$ editor empty$ {} { format.editors.after output - new.semicolumn + new.semicolon } if$ organization empty$ {} {organization output - new.semicolumn + new.semicolon } if$ } @@ -2861,7 +2949,7 @@ FUNCTION {format.url} { "" } { % "\BibUrl{ " url * "}" * -% "URL: \BibUrl{" url * "}" * +% bbl.url ": \BibUrl{" * url * "}" * urldate empty$ { "" } { " (" bbl.urldate * ": " * urldate * ")" * } @@ -2870,6 +2958,17 @@ FUNCTION {format.url} if$ } +% \end{macrocode} +% \DescribeFunction{output.url} +% \begin{macrocode} +FUNCTION {output.url} +{ + url empty$ + 'skip$ + { format.url output } + if$ +} + % \end{macrocode} % \DescribeFunction{format.annote} % \begin{macrocode} @@ -2929,21 +3028,21 @@ FUNCTION {add.doi} { } % % \end{macrocode} -% \DescribeFunction{add.medium} -% New in version 2. +% \DescribeFunction{add.media} +% New in version 2. Adds media field if |strict| options is in effect. % \begin{macrocode} %<*!strict> -FUNCTION {add.medium} { } +FUNCTION {add.media} { } % %<*strict> -FUNCTION {add.medium} +FUNCTION {add.media} { duplicate$ empty$ 'skip$ - { medium empty$ - { " " * bbl.medium enclose.square.brackets * } - { " " * medium enclose.square.brackets * } -%% { bbl.medium enclose.square.brackets * } -%% { medium enclose.square.brackets * } + { media empty$ + { " " * bbl.media enclose.square.brackets * } + { " " * media enclose.square.brackets * } +%% { bbl.media enclose.square.brackets * } +%% { media enclose.square.brackets * } if$ } if$ @@ -3050,6 +3149,65 @@ FUNCTION {output.eprint.url} } % +% \end{macrocode} +% +% Functions added in v1.2f to format patent entry (thanks to Stanislav Kruchinin). +% +% \DescribeFunction{add.number} +% \begin{macrocode} +FUNCTION {add.number} +{ duplicate$ empty$ + { "" } + { bbl.nr swap$ tie.or.space.connect } + if$ +} + +% \end{macrocode} +% \DescribeFunction{format.type.number} +% \begin{macrocode} +FUNCTION {format.type.number} +{ + type empty$ + { "" } + { + number empty$ + { "" } + { type number tie.or.space.connect } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeFunction{format.requestdate} +% \begin{macrocode} +FUNCTION {format.requestdate} +{ requestdate empty$ + { "" } + { bbl.req requestdate tie.or.space.connect } + if$ +} + +% \end{macrocode} +% \DescribeFunction{format.publicationdate} +% \begin{macrocode} +FUNCTION {format.publicationdate} +{ publicationdate empty$ + { "" } + { bbl.publ publicationdate tie.or.space.connect } + if$ +} + +% \end{macrocode} +% \DescribeFunction{format.prioritydate} +% \begin{macrocode} +FUNCTION {format.prioritydate} +{ prioritydate empty$ + { "" } + { bbl.priority prioritydate tie.or.space.connect } + if$ +} + % \end{macrocode} % % \subsection{Entry types} @@ -3094,7 +3252,7 @@ FUNCTION {article} output.bibitem author.before % author format.key output - format.title add.medium "title" output.check + format.title add.media "title" output.check new.slash author.after new.dblslash @@ -3135,7 +3293,7 @@ FUNCTION {book} output.bibitem author.before % author format.key output - format.btitle add.doi add.medium "title" output.check + format.btitle add.doi add.media "title" output.check new.slash author.after editor.organization.after @@ -3179,7 +3337,7 @@ FUNCTION {booklet} output.bibitem author.before % author format.key output - format.title add.doi add.medium "title" output.check + format.title add.doi add.media "title" output.check new.slash author.after editor.organization.after @@ -3215,7 +3373,7 @@ FUNCTION {inbook} output.bibitem author.before % author format.key output - format.btitle add.doi add.medium "title" output.check + format.btitle add.doi add.media "title" output.check new.slash author.after new.dblslash @@ -3267,7 +3425,7 @@ FUNCTION {incollection} author.before % author format.key output new.sentence - format.title add.doi add.medium "title" output.check + format.title add.doi add.media "title" output.check new.slash author.after new.dblslash @@ -3310,7 +3468,7 @@ FUNCTION {proceedings} { output.bibitem % editor format.key output - format.btitle add.doi add.medium "title" output.check + format.btitle add.doi add.media "title" output.check new.slash editor.organization.after new.block @@ -3355,7 +3513,7 @@ FUNCTION {inproceedings} author.before % author format.key output new.sentence - format.title add.doi add.medium "title" output.check + format.title add.doi add.media "title" output.check new.slash author.after new.dblslash @@ -3371,7 +3529,7 @@ FUNCTION {inproceedings} % format.date "year" output.check % } % { address output.nonnull -% new.column +% new.colon % publisher output % format.date "year" output.check % } @@ -3415,7 +3573,7 @@ FUNCTION {manual} if$ % author format.key output new.block - format.btitle add.doi add.medium "title" output.check + format.btitle add.doi add.media "title" output.check author empty$ { organization empty$ { @@ -3442,6 +3600,63 @@ FUNCTION {manual} fin.entry } +% \end{macrocode} +% \DescribeFunction{patent} +% A patent or patent request. The number or record token is given in the number +% field. Use the |type| field to specify the type and the |location| field to +% indicate the scope of the patent, if different from the scope implied by the +% type. Note that the location field is treated as a key list with this entry +% type. +% +% Required fields: author, title, number, year/date. +% +% Optional fields: holder, subtitle, titleaddon, type, version, location, note, +% date, month, year, addendum, pubstate, doi, eprint, eprint class, eprint type, +% url, urldate. +% \begin{macrocode} +FUNCTION {patent} +{ + output.bibitem +% title output.nonnull + title add.media output.nonnull +% add.blank +% media enclose.square.brackets output % S.Kruchinin's version + new.colon + format.type.number output + add.blank + location output + new.colon + ipc output + new.slash + format.authors.after "author" output.check + add.blank + authorcountry enclose.round.brackets output.nonnull +% author format.key output + new.semicolon + holder output.nonnull + new.semicolon + credits output.nonnull + new.block + requestnumber add.number output + new.semicolon + format.requestdate output + new.semicolon + format.publicationdate output + publication output + new.semicolon + format.prioritydate output + prioritynumber output + prioritycountry enclose.round.brackets output + new.block + note output + new.sentence + output.url + format.annote output + new.block + pagetotal output + fin.entry +} + % \end{macrocode} % \DescribeFunction{misc} % A fallback type for entries which do not fit into any other category. Use the field @@ -3455,7 +3670,7 @@ FUNCTION {misc} format.authors output % author format.key output title howpublished new.sentence.checkb - format.title add.medium output + format.title add.media output howpublished new.block.checka howpublished output new.block @@ -3517,10 +3732,11 @@ FUNCTION {online} format.authors output % author format.key output title howpublished new.sentence.checkb - format.title add.doi add.medium "title" output.check + format.title add.doi add.media "title" output.check % howpublished new.block.checka howpublished new.dblslash.checka - howpublished enclose.square.brackets output +% howpublished output +% howpublished enclose.square.brackets output editor.organization.after new.sentence new.block @@ -3569,7 +3785,7 @@ FUNCTION {thesis} % author format.key output new.sentence format.btitle "title" output.check - new.column + new.colon bbl.phdthesis format.thesis.type output.nonnull new.slash school "school" output.check @@ -3590,15 +3806,15 @@ FUNCTION {thesis} format.authors "author" output.check % author format.key output new.sentence - format.btitle add.doi add.medium "title" output.check - new.column + format.btitle add.doi add.media "title" output.check + new.colon % bbl.phdthesis format.thesis.type output.nonnull type "type" output.check - new.column + new.colon number output new.slash format.authors.after output - new.semicolumn + new.semicolon school "school" output.check new.block output.address.publisher @@ -3635,8 +3851,8 @@ FUNCTION {thesis} % output.bibitem % author.before % new.sentence -% format.title add.doi add.medium "title" output.check -% new.column +% format.title add.doi add.media "title" output.check +% new.colon %% format.techrep.type.number output.nonnull % type "type" output.check % new.slash @@ -3644,7 +3860,7 @@ FUNCTION {thesis} % editor.organization.after % new.block % address output -% new.column +% new.colon % institution "institution" output.check % format.date "year" output.check % new.block @@ -3662,24 +3878,24 @@ FUNCTION {report} output.bibitem % author.before % new.sentence - format.title add.doi add.medium "title" output.check + format.title add.doi add.media "title" output.check % title format.key output - new.column + new.colon % format.techrep.type.number output.nonnull % type "type" output.check % format.report.type.number "type" output.check type "type" output.check - new.column + new.colon number output new.slash institution "institution" output.check - new.semicolumn + new.semicolon format.chief.after output % from editor field - new.semicolumn + new.semicolon format.executor.after output % from author field new.block address output - new.column + new.colon organization output format.date "year" output.check new.block % v.2 @@ -3711,7 +3927,7 @@ FUNCTION {phdthesis} format.authors "author" output.check new.sentence format.btitle "title" output.check - new.column + new.colon bbl.phdthesis format.thesis.type output.nonnull new.slash school "school" output.check @@ -3732,14 +3948,14 @@ FUNCTION {phdthesis} format.authors "author" output.check % author format.key output new.sentence - format.btitle add.doi add.medium "title" output.check - new.column + format.btitle add.doi add.media "title" output.check + new.colon bbl.phdthesis format.thesis.type output.nonnull - new.column + new.colon number output new.slash format.authors.after output - new.semicolumn + new.semicolon school "school" output.check new.block output.address.publisher @@ -3768,7 +3984,7 @@ FUNCTION {masterthesis} % author format.key output new.sentence format.btitle "title" output.check - new.column + new.colon bbl.mthesis format.thesis.type output.nonnull new.slash school "school" output.check @@ -3789,14 +4005,14 @@ FUNCTION {masterthesis} format.authors "author" output.check % author format.key output new.sentence - format.btitle add.doi add.medium "title" output.check - new.column + format.btitle add.doi add.media "title" output.check + new.colon bbl.mthesis format.thesis.type output.nonnull - new.column + new.colon number output new.slash format.authors.after output - new.semicolumn + new.semicolon school "school" output.check new.block output.address.publisher @@ -3825,7 +4041,7 @@ FUNCTION {dscithesis} % author format.key output new.sentence format.btitle "title" output.check - new.column + new.colon bbl.dscithesis format.thesis.type output.nonnull new.slash school "school" output.check @@ -3846,14 +4062,14 @@ FUNCTION {dscithesis} format.authors "author" output.check % author format.key output new.sentence - format.btitle add.doi add.medium "title" output.check - new.column + format.btitle add.doi add.media "title" output.check + new.colon bbl.dscithesis format.thesis.type output.nonnull - new.column + new.colon number output new.slash format.authors.after output - new.semicolumn + new.semicolon school "school" output.check new.block output.address.publisher @@ -3887,15 +4103,15 @@ FUNCTION {conference} { inproceedings } % output.bibitem % author.before % new.sentence -% format.title add.doi add.medium "title" output.check -% new.column +% format.title add.doi add.media "title" output.check +% new.colon % format.techrep.type.number output.nonnull % new.slash % author.after % editor.organization.after % new.block % address output -% new.column +% new.colon % institution "institution" output.check % format.date "year" output.check % new.block @@ -3914,25 +4130,25 @@ FUNCTION {techreport} output.bibitem % author.before % new.sentence - format.title add.doi add.medium "title" output.check + format.title add.doi add.media "title" output.check % title format.key output - new.column + new.colon % format.techrep.type.number output.nonnull % type "type" output.check % format.report.type.number "type" output.check % type output format.techreport.type output - new.column + new.colon number output new.slash institution "institution" output.check - new.semicolumn + new.semicolon format.chief.after output % from editor field - new.semicolumn + new.semicolon format.executor.after output % from author field new.block address output - new.column + new.colon organization output format.date "year" output.check new.block % v.2 diff --git a/Master/texmf-dist/source/bibtex/gost/gost.ins b/Master/texmf-dist/source/bibtex/gost/gost.ins index 2bbac658937..98c842a63bf 100644 --- a/Master/texmf-dist/source/bibtex/gost/gost.ins +++ b/Master/texmf-dist/source/bibtex/gost/gost.ins @@ -15,7 +15,7 @@ version 2005/12/01 or later. This file has the LPPL maintenance status "maintained". Maintained by Igor A. Kotelnikov. -Current version: 1.2d, 2016.02.18 +Current version: 1.2g, 2016.07.25 Please, send bug report via e-mail: kia999 at mail dot ru @@ -49,7 +49,7 @@ or % \file{gost2008s.bst} {\from{gost.dtx} {bst,modern,eprint,sort}} \file{gost2008ls.bst} {\from{gost.dtx} {bst,modern,eprint,long,sort}} -% +% ` % ----------------------------------------------------------------------------------------- % Unicode BST styles that mimics obsolete version of GOST 7.8.0 for bibliographic *records* % \file{ugost780.bst} {\from{gost.dtx} {bst,utf8}} -- cgit v1.2.3