summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-27 01:30:49 +0000
committerKarl Berry <karl@freefriends.org>2009-11-27 01:30:49 +0000
commitfc5af52f05a1b38ceecdf30ba7a5cb0cd5b9dfb5 (patch)
tree31f59ecea61711810e8f1dbf717e146cc43a242c /Master/texmf-dist/source/latex
parent45a77effd223883b558d54a8a7cbd6a87aa01e16 (diff)
disser update (26nov09)
git-svn-id: svn://tug.org/texlive/trunk@16188 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/disser/Makefile17
-rw-r--r--Master/texmf-dist/source/latex/disser/disser.dtx6
-rw-r--r--Master/texmf-dist/source/latex/disser/gost705.dtx627
-rw-r--r--Master/texmf-dist/source/latex/disser/gost732.dtx11
-rw-r--r--Master/texmf-dist/source/latex/disser/sections.dtx10
5 files changed, 528 insertions, 143 deletions
diff --git a/Master/texmf-dist/source/latex/disser/Makefile b/Master/texmf-dist/source/latex/disser/Makefile
index fdc9261dd9a..26fcd09a5c4 100644
--- a/Master/texmf-dist/source/latex/disser/Makefile
+++ b/Master/texmf-dist/source/latex/disser/Makefile
@@ -4,7 +4,8 @@
#
TARGET := disser
-MAINDTX := disser gost732 gost705
+BST := gost705
+MAINDTX := disser gost732 $(BST)
MANUAL := manual
CLSFILES := *.cls *.rtx
@@ -72,7 +73,7 @@ reinstall: uninstall install
$(TARGET).dvi: $(TARGET).dtx
$(LATEX) $(LATEXFLAGS) $<
- $(MI) -r $(TARGET)
+ $(MI) $(MIFLAGS) $(TARGET)
$(LATEX) $(LATEXFLAGS) $<
$(LATEX) $(LATEXFLAGS) $<
@@ -82,6 +83,18 @@ $(TARGET).pdf: $(TARGET).dtx
$(PDFLATEX) $(PDFLATEXFLAGS) $<
$(PDFLATEX) $(PDFLATEXFLAGS) $<
+$(BST).dvi: $(BST).dtx
+ $(LATEX) $(LATEXFLAGS) $<
+ $(MI) $(MIFLAGS) $(BST)
+ $(LATEX) $(LATEXFLAGS) $<
+ $(LATEX) $(LATEXFLAGS) $<
+
+$(BST).pdf: $(BST).dtx
+ $(PDFLATEX) $(PDFLATEXFLAGS) $<
+ $(MI) $(MIFLAGS) $(BST)
+ $(PDFLATEX) $(PDFLATEXFLAGS) $<
+ $(PDFLATEX) $(PDFLATEXFLAGS) $<
+
%.cls: %.ins
$(LATEX) $^
diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx
index 50867c23199..38ff7592474 100644
--- a/Master/texmf-dist/source/latex/disser/disser.dtx
+++ b/Master/texmf-dist/source/latex/disser/disser.dtx
@@ -19,7 +19,7 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*driver>
-\ProvidesFile{disser.drv}[2009/11/05 1.1.3 Document class for dissertations]
+\ProvidesFile{disser.drv}[2009/11/20 1.1.4 Document class for dissertations]
\documentclass{ltxdoc}
\usepackage[a4paper, includeheadfoot, nohead, mag=1000,
@@ -181,7 +181,7 @@
%<*disser>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2009/11/05 1.1.3 Document class for dissertations]
+\ProvidesClass{disser}[2009/11/20 1.1.4 Document class for dissertations]
% \end{macrocode}
% Расширение файлов, включаемых в |disser.cls|.
@@ -442,8 +442,8 @@
% \end{macrocode}
% Выполнение пользовательских опций.
% \begin{macrocode}
-\ProcessOptions
\ProcessKeyvalOptions{Dis}
+\ProcessOptions
% \end{macrocode}
% Команды изменения регистра. Им самое место в ядре.
diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx
index a10b81cd27f..db917197217 100644
--- a/Master/texmf-dist/source/latex/disser/gost705.dtx
+++ b/Master/texmf-dist/source/latex/disser/gost705.dtx
@@ -22,12 +22,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*driver>
-\ProvidesFile{gost705.drv}[2009/10/27 1.1.3 Bibliography style for dissertations.]
+\ProvidesFile{gost705.drv}[2009/11/20 1.1.4 Bibliography style for dissertations.]
\documentclass{ltxdoc}
\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
left=5cm,right=1cm,top=1.5cm,bottom=1.5cm]{geometry}
-\usepackage{ifpdf,indentfirst,color}
+\usepackage{ifpdf,indentfirst,color,makeidx}
+
\definecolor{darkblue}{rgb}{0,0,.6}
\ifpdf
\usepackage[%
@@ -76,14 +77,45 @@
\def\pkg#1{\textsf{#1}}
\def\cmd#1{\texttt{#1}}
+\newcommand\DescribeBSTFunction[1]{
+ \DescribeMacro{#1}\index{Функции!\texttt{#1}}
+}
+\newcommand\DescribeBSTMacro[1]{
+ \DescribeMacro{#1}\index{Макросы!\texttt{#1}}
+}
+
+\makeatletter
+ \def\IndexParms{%
+ \parindent \z@
+ \columnsep 15pt
+ \parskip 0pt plus 1pt
+ \rightskip 15pt
+ \mathsurround \z@
+ \parfillskip=-15pt
+ \small
+ \def\@idxitem{\normalfont\par\hangindent 30pt\bfseries}%
+ \def\subitem{\normalfont\par\hangindent 30pt}%
+ \def\subsubitem{\normalfont\par\hangindent 30pt\hspace*{15pt}}%
+ \def\indexspace{\par\vspace{10pt plus 2pt minus 3pt}}%
+ }
+ \def\theindex{\@restonecoltrue\if@twocolumn\@restonecolfalse\fi
+ \columnseprule \z@ \columnsep 35\p@
+ \twocolumn[\index@prologue]%
+ \IndexParms \let\item\@idxitem \ignorespaces}
+ \def\endtheindex{\if@restonecol\onecolumn\else\clearpage\fi}
+\makeatother
+
\setlength\hfuzz{20pt}
\hbadness=10000
-\GetFileInfo{gost705.drv}
+\makeindex
+
\begin{document}
\sloppy
\PrintChanges
\DocInput{gost705.dtx}
+ \IndexPrologue{\section{Предметный указатель}}
+ \printindex
\end{document}
%</driver>
% \fi
@@ -152,8 +184,12 @@ ENTRY
INTEGERS { output.state before.all mid.sentence after.sentence after.block
after.dblslash after.slash after.column after.semicolumn }
+% \end{macrocode}
+% \DescribeBSTFunction{init.state.consts}
+% \begin{macrocode}
FUNCTION {init.state.consts}
-{ #0 'before.all :=
+{
+ #0 'before.all :=
#1 'mid.sentence :=
#2 'after.sentence :=
#3 'after.block :=
@@ -169,23 +205,27 @@ STRINGS { curlanguage }
% \end{macrocode}
% \subsection{Переключение языка}
+% \DescribeBSTFunction{change.language}
% \begin{macrocode}
FUNCTION {change.language}
-{ booklanguage empty$
- { "" }
- { booklanguage 'curlanguage :=
- "\selectlanguageifdefined{"
- curlanguage *
- "}" *
- }
+{
+ booklanguage empty$
+ { "" }
+ { booklanguage 'curlanguage :=
+ "\selectlanguageifdefined{"
+ curlanguage *
+ "}" *
+ }
if$
}
% \end{macrocode}
% \subsection{Вывод библиографической записи}
+% \DescribeBSTFunction{output.nonnull}
% \begin{macrocode}
FUNCTION {output.nonnull}
-{ swap$
+{
+ swap$
output.state mid.sentence =
{ ", " * write$ }
{ output.state after.block =
@@ -220,15 +260,23 @@ FUNCTION {output.nonnull}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{output}
+% \begin{macrocode}
FUNCTION {output}
-{ duplicate$ empty$
+{
+ duplicate$ empty$
'pop$
'output.nonnull
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{output.check}
+% \begin{macrocode}
FUNCTION {output.check}
-{ 't :=
+{
+ 't :=
duplicate$ empty$
{ pop$ "empty " t * " in " * cite$ * warning$ }
'output.nonnull
@@ -237,50 +285,76 @@ FUNCTION {output.check}
% \end{macrocode}
% \subsection{Вывод блоков и ограничителей}
+% \DescribeBSTFunction{fin.entry}
% \begin{macrocode}
FUNCTION {fin.entry}
-{ add.period$
+{
+ add.period$
write$
newline$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.block}
+% \begin{macrocode}
FUNCTION {new.block}
-{ output.state before.all =
+{
+ output.state before.all =
'skip$
{ after.block 'output.state := }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.dblslash}
+% \begin{macrocode}
FUNCTION {new.dblslash}
-{ output.state before.all =
+{
+ output.state before.all =
'skip$
{ after.dblslash 'output.state := }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.slash}
+% \begin{macrocode}
FUNCTION {new.slash}
-{ output.state before.all =
+{
+ output.state before.all =
'skip$
{ after.slash 'output.state := }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.column}
+% \begin{macrocode}
FUNCTION {new.column}
-{ output.state before.all =
+{
+ output.state before.all =
'skip$
{ after.column 'output.state := }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.semicolumn}
+% \begin{macrocode}
FUNCTION {new.semicolumn}
-{ output.state before.all =
+{
+ output.state before.all =
'skip$
{ after.semicolumn 'output.state := }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.sentence}
+% \begin{macrocode}
FUNCTION {new.sentence}
-{ output.state after.block =
+{
+ output.state after.block =
'skip$
{ output.state before.all =
'skip$
@@ -290,42 +364,68 @@ FUNCTION {new.sentence}
if$
}
-FUNCTION {add.blank}
-{ " " * before.all 'output.state := }
+% \end{macrocode}
+% \DescribeBSTFunction{add.blank}
+% \begin{macrocode}
+FUNCTION {add.blank} { " " * before.all 'output.state := }
+% \end{macrocode}
+% \DescribeBSTFunction{not}
+% \begin{macrocode}
FUNCTION {not}
-{ { #0 }
+{
+ { #0 }
{ #1 }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{and}
+% \begin{macrocode}
FUNCTION {and}
-{ 'skip$
+{
+ 'skip$
{ pop$ #0 }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{or}
+% \begin{macrocode}
FUNCTION {or}
-{ { pop$ #1 }
+{
+ { pop$ #1 }
'skip$
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{non.stop}
+% \begin{macrocode}
FUNCTION {non.stop}
-{ duplicate$
+{
+ duplicate$
"}" * add.period$
#-1 #1 substring$ "." =
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.block.checka}
+% \begin{macrocode}
FUNCTION {new.block.checka}
-{ empty$
+{
+ empty$
'skip$
'new.block
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.block.checkb}
+% \begin{macrocode}
FUNCTION {new.block.checkb}
-{ empty$
+{
+ empty$
swap$ empty$
and
'skip$
@@ -333,15 +433,23 @@ FUNCTION {new.block.checkb}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.sentence.checka}
+% \begin{macrocode}
FUNCTION {new.sentence.checka}
-{ empty$
+{
+ empty$
'skip$
'new.sentence
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{new.sentence.checkb}
+% \begin{macrocode}
FUNCTION {new.sentence.checkb}
-{ empty$
+{
+ empty$
swap$ empty$
and
'skip$
@@ -349,22 +457,32 @@ FUNCTION {new.sentence.checkb}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{field.or.null}
+% \begin{macrocode}
FUNCTION {field.or.null}
-{ duplicate$ empty$
+{
+ duplicate$ empty$
{ pop$ "" }
'skip$
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{emphasize}
+% \begin{macrocode}
FUNCTION {emphasize}
-{ duplicate$ empty$
+{
+ duplicate$ empty$
{ pop$ "" }
{ "\BibEmph{" swap$ * "}" * }
if$
}
-FUNCTION {space.word}
-{ " " swap$ * " " * }
+% \end{macrocode}
+% \DescribeBSTFunction{space.word}
+% \begin{macrocode}
+FUNCTION {space.word} { " " swap$ * " " * }
% \end{macrocode}
% \subsection{Общепринятые сокращения}
@@ -398,8 +516,8 @@ FUNCTION {bbl.edition} % { "\bbledition{}" }
curlanguage "english" =
{ "edition" }
{ curlanguage "russian" =
- {"{\cyr\cyri\cyrz\cyrd.}"}
- {"language is not defined: " language "edition" * * warning$ "edition"}
+ { "{\cyr\cyri\cyrz\cyrd.}" }
+ { "language is not defined: " language "edition" * * warning$ "edition" }
if$
}
if$
@@ -410,8 +528,8 @@ FUNCTION {bbl.vvolume} % { "\bblVolume{}" }
curlanguage "english" =
{ "Volume" }
{ curlanguage "russian" =
- {"\CYRT\cyro\cyrm"}
- {"language is not defined: " language "Volume" * * warning$ "Volume"}
+ { "{\cyr\CYRT\cyro\cyrm}" }
+ { "language is not defined: " language "Volume" * * warning$ "Volume" }
if$
}
if$
@@ -422,7 +540,7 @@ FUNCTION {bbl.vvol} % { "\bblVol{}" }
curlanguage "english" =
{ "Vol." }
{ curlanguage "russian" =
- { "\CYRT." }
+ { "{\cyr\CYRT.}" }
{ "language is not defined: " language "Vol." * * warning$ "Vol." }
if$
}
@@ -434,8 +552,8 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" }
curlanguage "english" =
{ "Issue" }
{ curlanguage "russian" =
- {"\CYRV\cyrery\cyrp\cyru\cyrs\cyrk"}
- {"language is not defined: " language * warning$ "Issue"}
+ { "{\cyr\CYRV\cyrery\cyrp\cyru\cyrs\cyrk}" }
+ { "language is not defined: " language * warning$ "Issue" }
if$
}
if$
@@ -446,8 +564,8 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" }
curlanguage "english" =
{"Iss."}
{ curlanguage "russian" =
- {"\CYRV\cyrery\cyrp."}
- {"language is not defined: " language * warning$ "Issue"}
+ { "{\cyr\CYRV\cyrery\cyrp.}" }
+ { "language is not defined: " language * warning$ "Issue" }
if$
}
if$
@@ -458,8 +576,8 @@ FUNCTION {bbl.of} % { "\bblof{}" }
curlanguage "english" =
{"of"}
{ curlanguage "russian" =
- {"{\cyr\cyri\cyrz}"}
- {"language is not defined: " language "of" * * warning$ "of"}
+ { "{\cyr\cyri\cyrz}" }
+ { "language is not defined: " language "of" * * warning$ "of" }
if$
}
if$
@@ -482,7 +600,7 @@ FUNCTION {bbl.nnumber} % { "\bblNumber{}" }
curlanguage "english" =
{ "Number" }
{ curlanguage "russian" =
- { "\CYRN\cyro\cyrm\cyre\cyrr"}
+ { "{\cyr\CYRN\cyro\cyrm\cyre\cyrr}" }
{ "language is not defined: " language "Number" * * warning$ "Number" }
if$
}
@@ -494,7 +612,7 @@ FUNCTION {bbl.number} % { "\bblnumber{}" }
curlanguage "english" =
{ "number" }
{ curlanguage "russian" =
- { "{\cyr\cyrn\cyro\cyrm\cyre\cyrr}"}
+ { "{\cyr\cyrn\cyro\cyrm\cyre\cyrr}" }
{ "language is not defined: " language "number" * * warning$ "number" }
if$
}
@@ -542,7 +660,7 @@ FUNCTION {bbl.iin} % { "\bblIn{}" }
curlanguage "english" =
{ "In" }
{ curlanguage "russian" =
- { "\CYRV" }
+ { "{\cyr\CYRV}" }
{ "language is not defined: " language "In" * * warning$ "In" }
if$
}
@@ -633,13 +751,17 @@ FUNCTION {bbl.phdthesis}
if$
}
+% \end{macrocode}
+% \subsection{Формат элементов библиографических ссылок}
+% \begin{macrocode}
INTEGERS { nameptr namesleft numnames }
% \end{macrocode}
-% \subsection{Формат элементов библиографических ссылок}
+% \DescribeBSTFunction{format.names}
% \begin{macrocode}
FUNCTION {format.names}
-{ 's :=
+{
+ 's :=
#1 'nameptr :=
s num.names$ 'numnames :=
numnames 'namesleft :=
@@ -658,8 +780,8 @@ FUNCTION {format.names}
{ ", " * t * }
{
t "others" =
- t "~others" =
- or
+ t "~others" =
+ or
{ " " * bbl.etal * }
{ ", " * t * }
if$
@@ -674,8 +796,12 @@ FUNCTION {format.names}
while$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.names.rev}
+% \begin{macrocode}
FUNCTION {format.names.rev}
-{ 's :=
+{
+ 's :=
#1 'nameptr :=
s num.names$ 'numnames :=
numnames 'namesleft :=
@@ -710,57 +836,89 @@ FUNCTION {format.names.rev}
while$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.authors}
+% \begin{macrocode}
FUNCTION {format.authors}
-{ author empty$
+{
+ author empty$
{ "" }
{ author format.names emphasize }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.bookauthors}
+% \begin{macrocode}
FUNCTION {format.bookauthors}
-{ bookauthor empty$
+{
+ bookauthor empty$
{ "" }
{ bookauthor format.names }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.authors.after}
+% \begin{macrocode}
FUNCTION {format.authors.after}
-{ author empty$
+{
+ author empty$
{ "" }
{ author format.names.rev }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.bookauthors.after}
+% \begin{macrocode}
FUNCTION {format.bookauthors.after}
-{ bookauthor empty$
+{
+ bookauthor empty$
{ "" }
{ bookauthor format.names.rev }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.editors.after}
+% \begin{macrocode}
FUNCTION {format.editors.after}
-{ editor empty$
+{
+ editor empty$
{ "" }
{ bbl.edby editor format.names.rev * }
if$
}
-FUNCTION { format.compiler.after }
-{ compiler empty$
+% \end{macrocode}
+% \DescribeBSTFunction{format.compiler.after}
+% \begin{macrocode}
+FUNCTION {format.compiler.after}
+{
+ compiler empty$
{ "" }
{ bbl.cmplr compiler format.names.rev * }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.title}
+% \begin{macrocode}
FUNCTION {format.title}
-{ title empty$
+{
+ title empty$
{ "" }
{ title }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.date}
+% \begin{macrocode}
FUNCTION {format.date}
-{ year empty$
+{
+ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
@@ -776,8 +934,12 @@ FUNCTION {format.date}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{output.address.publisher.date}
+% \begin{macrocode}
FUNCTION {output.address.publisher.date}
-{ address empty$
+{
+ address empty$
'skip$
{ address output
publisher empty$
@@ -790,8 +952,12 @@ FUNCTION {output.address.publisher.date}
format.date output
}
+% \end{macrocode}
+% \DescribeBSTFunction{output.bibitem}
+% \begin{macrocode}
FUNCTION {output.bibitem}
-{ newline$
+{
+ newline$
"\bibitem[" write$
"\BibPrefix" write$
label write$
@@ -811,8 +977,12 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+% \end{macrocode}
+% \DescribeBSTFunction{n.dashify}
+% \begin{macrocode}
FUNCTION {n.dashify}
-{ 't :=
+{
+ 't :=
""
{ t empty$ not }
{ t #1 #1 substring$ "-" =
@@ -836,35 +1006,50 @@ FUNCTION {n.dashify}
while$
}
-FUNCTION {word.in}
-{ bbl.iin
- " " * }
+% \end{macrocode}
+% \DescribeBSTFunction{word.in}
+% \begin{macrocode}
+FUNCTION {word.in} { bbl.iin " " * }
-FUNCTION {format.btitle}
-{ title }
+% \end{macrocode}
+% \DescribeBSTFunction{format.btitle}
+% \begin{macrocode}
+FUNCTION {format.btitle} { title }
+% \end{macrocode}
+% \DescribeBSTFunction{tie.or.space.connect}
+% \begin{macrocode}
FUNCTION {tie.or.space.connect}
-{ duplicate$ text.length$ #3 <
+{
+ duplicate$ text.length$ #3 <
{ "~" }
{ " " }
if$
swap$ * *
}
-FUNCTION {tie.connect}
-{"~"
-swap$ * *
-}
+% \end{macrocode}
+% \DescribeBSTFunction{tie.connect}
+% \begin{macrocode}
+FUNCTION {tie.connect} { "~" swap$ * * }
+% \end{macrocode}
+% \DescribeBSTFunction{either.or.check}
+% \begin{macrocode}
FUNCTION {either.or.check}
-{ empty$
+{
+ empty$
'pop$
{ "can't use both " swap$ * " fields in " * cite$ * warning$ }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.bvolume}
+% \begin{macrocode}
FUNCTION {format.bvolume}
-{ volume empty$
+{
+ volume empty$
{ "" }
{ bbl.vvol volume tie.connect
series empty$
@@ -876,8 +1061,12 @@ FUNCTION {format.bvolume}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.number.series}
+% \begin{macrocode}
FUNCTION {format.number.series}
-{ volume empty$
+{
+ volume empty$
{ number empty$
{ series field.or.null }
{ series empty$
@@ -898,14 +1087,22 @@ FUNCTION {format.number.series}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{is.num}
+% \begin{macrocode}
FUNCTION {is.num}
-{ chr.to.int$
+{
+ chr.to.int$
duplicate$ "0" chr.to.int$ < not
swap$ "9" chr.to.int$ > not and
}
+% \end{macrocode}
+% \DescribeBSTFunction{extract.num}
+% \begin{macrocode}
FUNCTION {extract.num}
-{ duplicate$ 't :=
+{
+ duplicate$ 't :=
"" 's :=
{ t empty$ not }
{ t #1 #1 substring$
@@ -922,11 +1119,17 @@ FUNCTION {extract.num}
if$
}
-FUNCTION {convert.edition}
-{ edition }
+% \end{macrocode}
+% \DescribeBSTFunction{convert.edition}
+% \begin{macrocode}
+FUNCTION {convert.edition} { edition }
+% \end{macrocode}
+% \DescribeBSTFunction{format.edition}
+% \begin{macrocode}
FUNCTION {format.edition}
-{ edition empty$
+{
+ edition empty$
{ "" }
{ output.state mid.sentence =
{ convert.edition "l" change.case$ " " * bbl.edition * }
@@ -938,8 +1141,12 @@ FUNCTION {format.edition}
INTEGERS { multiresult }
+% \end{macrocode}
+% \DescribeBSTFunction{multi.page.check}
+% \begin{macrocode}
FUNCTION {multi.page.check}
-{ 't :=
+{
+ 't :=
#0 'multiresult :=
{ multiresult not
t empty$ not
@@ -958,8 +1165,12 @@ FUNCTION {multi.page.check}
multiresult
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.pages}
+% \begin{macrocode}
FUNCTION {format.pages}
-{ pages empty$
+{
+ pages empty$
{ "" }
{ pages multi.page.check
{ bbl.ppages pages n.dashify tie.connect }
@@ -969,8 +1180,12 @@ FUNCTION {format.pages}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.pages.page}
+% \begin{macrocode}
FUNCTION {format.pages.page}
-{ pages empty$
+{
+ pages empty$
{ numpages empty$
{ "" }
{ numpages bbl.pages tie.connect }
@@ -980,8 +1195,12 @@ FUNCTION {format.pages.page}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.vol.num.pages}
+% \begin{macrocode}
FUNCTION {format.vol.num.pages}
-{ volume field.or.null
+{
+ volume field.or.null
number empty$
'skip$
{
@@ -1002,22 +1221,34 @@ FUNCTION {format.vol.num.pages}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.volume}
+% \begin{macrocode}
FUNCTION {format.volume}
-{ volume empty$
+{
+ volume empty$
{ "" }
{ bbl.vvol volume tie.or.space.connect }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.number}
+% \begin{macrocode}
FUNCTION {format.number}
-{ number empty$
+{
+ number empty$
{ "" }
{ bbl.nr number tie.or.space.connect }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{empty.misc.check}
+% \begin{macrocode}
FUNCTION {empty.misc.check}
-{ author empty$ title empty$ howpublished empty$
+{
+ author empty$ title empty$ howpublished empty$
month empty$ year empty$ note empty$
and and and and and
key empty$ not and
@@ -1026,8 +1257,12 @@ FUNCTION {empty.misc.check}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.thesis.type}
+% \begin{macrocode}
FUNCTION {format.thesis.type}
-{ type empty$
+{
+ type empty$
'skip$
{ pop$
type "t" change.case$
@@ -1035,8 +1270,12 @@ FUNCTION {format.thesis.type}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.tr.number}
+% \begin{macrocode}
FUNCTION {format.tr.number}
-{ type empty$
+{
+ type empty$
{ bbl.techrep }
'type
if$
@@ -1046,8 +1285,12 @@ FUNCTION {format.tr.number}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{author.before}
+% \begin{macrocode}
FUNCTION {author.before}
-{ author empty$
+{
+ author empty$
'skip$
{
format.authors output
@@ -1056,8 +1299,12 @@ FUNCTION {author.before}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bookauthor.before}
+% \begin{macrocode}
FUNCTION {bookauthor.before}
-{ bookauthor empty$
+{
+ bookauthor empty$
'skip$
{
format.bookauthors output
@@ -1066,8 +1313,12 @@ FUNCTION {bookauthor.before}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{author.after}
+% \begin{macrocode}
FUNCTION {author.after}
-{ author empty$
+{
+ author empty$
'skip$
{ author num.names$ #3 >
{ format.authors.after output
@@ -1079,8 +1330,12 @@ FUNCTION {author.after}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bookauthor.after}
+% \begin{macrocode}
FUNCTION {bookauthor.after}
-{ bookauthor empty$
+{
+ bookauthor empty$
'skip$
{ bookauthor num.names$ #3 >
{ format.bookauthors.after output
@@ -1092,8 +1347,12 @@ FUNCTION {bookauthor.after}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{editor.organization.after}
+% \begin{macrocode}
FUNCTION {editor.organization.after}
-{ compiler empty$
+{
+ compiler empty$
'skip$
{ format.compiler.after output
new.semicolumn
@@ -1113,15 +1372,23 @@ FUNCTION {editor.organization.after}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.url}
+% \begin{macrocode}
FUNCTION {format.url}
-{ url empty$
+{
+ url empty$
{ "" }
{ "\BibUrl{" url * "}" * }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.urldate}
+% \begin{macrocode}
FUNCTION {format.urldate}
-{ urldate empty$
+{
+ urldate empty$
{ "" }
{ add.blank
"\BibUrlDate{" urldate * "}" *
@@ -1129,8 +1396,12 @@ FUNCTION {format.urldate}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{output.url}
+% \begin{macrocode}
FUNCTION {output.url}
-{ url empty$
+{
+ url empty$
'skip$
{ format.url output
format.urldate output
@@ -1138,8 +1409,12 @@ FUNCTION {output.url}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{format.annote}
+% \begin{macrocode}
FUNCTION {format.annote}
-{ annote empty$
+{
+ annote empty$
{ "" }
{ after.sentence 'output.state :=
"\BibAnnote{" annote add.period$ * "}" *
@@ -1149,9 +1424,11 @@ FUNCTION {format.annote}
% \end{macrocode}
% \subsection{Описание типов библиографических ссылок}
+% \DescribeBSTFunction{article}
% \begin{macrocode}
FUNCTION {article}
-{ output.bibitem
+{
+ output.bibitem
author.before
format.title "title" output.check
new.dblslash
@@ -1171,8 +1448,12 @@ FUNCTION {article}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{book}
+% \begin{macrocode}
FUNCTION {book}
-{ output.bibitem
+{
+ output.bibitem
author.before
format.btitle "title" output.check
editor.organization.after
@@ -1194,8 +1475,12 @@ FUNCTION {book}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{booklet}
+% \begin{macrocode}
FUNCTION {booklet}
-{ output.bibitem
+{
+ output.bibitem
author.before
format.title "title" output.check
editor.organization.after
@@ -1211,8 +1496,12 @@ FUNCTION {booklet}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{inbook}
+% \begin{macrocode}
FUNCTION {inbook}
-{ output.bibitem
+{
+ output.bibitem
author.before
format.btitle "title" output.check
new.dblslash
@@ -1237,8 +1526,12 @@ FUNCTION {inbook}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{incollection}
+% \begin{macrocode}
FUNCTION {incollection}
-{ output.bibitem
+{
+ output.bibitem
author.before
new.sentence
format.title "title" output.check
@@ -1257,13 +1550,16 @@ FUNCTION {incollection}
note output
new.block
output.url
- new.block
format.annote output
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{inproceedings}
+% \begin{macrocode}
FUNCTION {inproceedings}
-{ output.bibitem
+{
+ output.bibitem
author.before
new.sentence
format.title "title" output.check
@@ -1295,10 +1591,17 @@ FUNCTION {inproceedings}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{conference}
+% \begin{macrocode}
FUNCTION {conference} { inproceedings }
+% \end{macrocode}
+% \DescribeBSTFunction{manual}
+% \begin{macrocode}
FUNCTION {manual}
-{ output.bibitem
+{
+ output.bibitem
author empty$
{ organization empty$
'skip$
@@ -1335,8 +1638,12 @@ FUNCTION {manual}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{mastersthesis}
+% \begin{macrocode}
FUNCTION {mastersthesis}
-{ output.bibitem
+{
+ output.bibitem
format.authors "author" output.check
new.block
format.btitle "title" output.check
@@ -1353,8 +1660,12 @@ FUNCTION {mastersthesis}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{phdthesis}
+% \begin{macrocode}
FUNCTION {misc}
-{ output.bibitem
+{
+ output.bibitem
format.authors "author" output.check
new.block
format.title "title" output.check
@@ -1370,8 +1681,12 @@ FUNCTION {misc}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{phdthesis}
+% \begin{macrocode}
FUNCTION {phdthesis}
-{ output.bibitem
+{
+ output.bibitem
format.authors "author" output.check
new.sentence
format.btitle "title" output.check
@@ -1390,8 +1705,12 @@ FUNCTION {phdthesis}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{proceedings}
+% \begin{macrocode}
FUNCTION {proceedings}
-{ output.bibitem
+{
+ output.bibitem
format.btitle "title" output.check
new.slash
editor.organization.after
@@ -1416,8 +1735,12 @@ FUNCTION {proceedings}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{techreport}
+% \begin{macrocode}
FUNCTION {techreport}
-{ output.bibitem
+{
+ output.bibitem
author.before
new.sentence
format.title "title" output.check
@@ -1437,8 +1760,12 @@ FUNCTION {techreport}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{unpublished}
+% \begin{macrocode}
FUNCTION {unpublished}
-{ output.bibitem
+{
+ output.bibitem
author.before
format.btitle "title" output.check
editor.organization.after
@@ -1450,6 +1777,9 @@ FUNCTION {unpublished}
fin.entry
}
+% \end{macrocode}
+% \DescribeBSTFunction{default.type}
+% \begin{macrocode}
FUNCTION {default.type} { misc }
% \end{macrocode}
@@ -1526,15 +1856,23 @@ READ
% \subsection{Функции для сортировки списка литературы по именам авторов и названиям}
% \begin{macrocode}
%<*gost705s>
+% \end{macrocode}
+% \DescribeBSTFunction{sortify}
+% \begin{macrocode}
FUNCTION {sortify}
-{ purify$
+{
+ purify$
"l" change.case$
}
INTEGERS { len }
+% \end{macrocode}
+% \DescribeBSTFunction{chop.word}
+% \begin{macrocode}
FUNCTION {chop.word}
-{ 's :=
+{
+ 's :=
'len :=
s #1 len substring$ =
{ s len #1 + global.max$ substring$ }
@@ -1542,8 +1880,12 @@ FUNCTION {chop.word}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{sort.format.names}
+% \begin{macrocode}
FUNCTION {sort.format.names}
-{ 's :=
+{
+ 's :=
#1 'nameptr :=
""
s num.names$ 'numnames :=
@@ -1566,8 +1908,12 @@ FUNCTION {sort.format.names}
while$
}
+% \end{macrocode}
+% \DescribeBSTFunction{sort.format.title}
+% \begin{macrocode}
FUNCTION {sort.format.title}
-{ 't :=
+{
+ 't :=
"A " #2
"An " #3
"The " #4 t chop.word
@@ -1577,8 +1923,12 @@ FUNCTION {sort.format.title}
#1 global.max$ substring$
}
+% \end{macrocode}
+% \DescribeBSTFunction{author.sort}
+% \begin{macrocode}
FUNCTION {author.sort}
-{ author empty$
+{
+ author empty$
{ key empty$
{ "to sort, need author or key in " cite$ * warning$
""
@@ -1587,13 +1937,17 @@ FUNCTION {author.sort}
if$
}
{
- author sort.format.names}
+ author sort.format.names
}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{author.title.sort}
+% \begin{macrocode}
FUNCTION {author.title.sort}
-{ author empty$
+{
+ author empty$
{ title empty$
{ key empty$
{ "to sort, need author, title, or key in " cite$ * warning$
@@ -1611,6 +1965,9 @@ FUNCTION {author.title.sort}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{presort}
+% \begin{macrocode}
FUNCTION {presort}
{
author.title.sort
@@ -1640,14 +1997,22 @@ STRINGS { longest.label }
INTEGERS { number.label longest.label.width }
+% \end{macrocode}
+% \DescribeBSTFunction{initialize.longest.label}
+% \begin{macrocode}
FUNCTION {initialize.longest.label}
-{ "" 'longest.label :=
+{
+ "" 'longest.label :=
#1 'number.label :=
#0 'longest.label.width :=
}
+% \end{macrocode}
+% \DescribeBSTFunction{longest.label.pass}
+% \begin{macrocode}
FUNCTION {longest.label.pass}
-{ number.label int.to.str$ 'label :=
+{
+ number.label int.to.str$ 'label :=
number.label #1 + 'number.label :=
label width$ longest.label.width >
{ label 'longest.label :=
@@ -1664,9 +2029,11 @@ ITERATE {longest.label.pass}
% \end{macrocode}
% \subsection{Формирование окружения thebibliography}
% \subsubsection{Преамбула}
+% \DescribeBSTFunction{begin.bib}
% \begin{macrocode}
FUNCTION {begin.bib}
-{ preamble$ empty$
+{
+ preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
if$
@@ -1703,7 +2070,7 @@ FUNCTION {begin.bib}
}
% \end{macrocode}
-% \subsubsection{Начало}
+% \subsubsection{Начало окружения}
% \begin{macrocode}
EXECUTE {begin.bib}
@@ -1712,10 +2079,12 @@ EXECUTE {init.state.consts}
ITERATE {call.type$}
% \end{macrocode}
-% \subsubsection{Конец}
+% \subsubsection{Конец окружения}
+% \DescribeBSTFunction{end.bib}
% \begin{macrocode}
FUNCTION {end.bib}
-{ newline$
+{
+ newline$
"\end{thebibliography}" write$ newline$
}
diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx
index 9fbb5e3c2f8..079ff7f9154 100644
--- a/Master/texmf-dist/source/latex/disser/gost732.dtx
+++ b/Master/texmf-dist/source/latex/disser/gost732.dtx
@@ -20,7 +20,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*driver>
-\ProvidesFile{gost732.drv}[2009/11/05 1.1.3 GOST 7.32-2001 implementation]
+\ProvidesFile{gost732.drv}[2009/11/20 1.1.4 GOST 7.32-2001 implementation]
\documentclass{ltxdoc}
\usepackage[a4paper, includeheadfoot, nohead, mag=1000,
@@ -113,7 +113,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{gost732}[2009/11/05 1.1.3 GOST 7.32-2001 implementation]
+\ProvidesClass{gost732}[2009/11/20 1.1.4 GOST 7.32-2001 implementation]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}}
\ProcessOptions\relax
@@ -154,13 +154,16 @@
% Изменение стандартных заголовков.
% \begin{macrocode}
\AtBeginDocument{\addto\captionsrussian{%
-\def\bibname{%
-\cyr\CYRS\CYRP\CYRI\CYRS\CYRO\CYRK\ %
+\def\bibname{\cyr\CYRS\CYRP\CYRI\CYRS\CYRO\CYRK\ %
\CYRI\CYRS\CYRP\CYRO\CYRL\CYRSFTSN\CYRZ\CYRO\CYRV\CYRA\CYRN\CYRN\CYRERY\CYRH\ %
\CYRI\CYRS\CYRT\CYRO\CYRCH\CYRN\CYRI\CYRK\CYRO\CYRV}
\def\figurename{\cyr\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}
\def\appendixname{\cyr\CYRP\CYRR\CYRI\CYRL\CYRO\CYRZH\CYRE\CYRN\CYRI\CYRE}
\def\contentsname{\cyr\CYRS\CYRO\CYRD\CYRE\CYRR\CYRZH\CYRA\CYRN\CYRI\CYRE}
+\def\listfigurename{\cyr\CYRS\CYRP\CYRI\CYRS\CYRO\CYRK\ %
+\CYRI\CYRL\CYRL\CYRYU\CYRS\CYRT\CYRR\CYRA\CYRC\CYRI\CYRISHRT}
+\def\listtablename{\cyr\CYRS\CYRP\CYRI\CYRS\CYRO\CYRK\ %
+\CYRT\CYRA\CYRB\CYRL\CYRI\CYRC}
}}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/sections.dtx b/Master/texmf-dist/source/latex/disser/sections.dtx
index 004f6da3607..9a12dec5633 100644
--- a/Master/texmf-dist/source/latex/disser/sections.dtx
+++ b/Master/texmf-dist/source/latex/disser/sections.dtx
@@ -36,7 +36,7 @@
% \DescribeMacro{\tocsectionnameindent}\index{Макросы!\verb*+\tocsectionnameindent+}
% Пробел после номера.
% \begin{macrocode}
-\providecommand\tocsectionnameindent{2.3em}
+\providecommand\tocsectionnameindent{2.6em}
% \end{macrocode}
% \paragraph{Параметры формата в тексте}
@@ -92,8 +92,8 @@
\providecommand\tocsubsectionfillfont{}
\providecommand\tocsubsectionnumfont{}
-\providecommand\tocsubsectionindent{3.8em}
-\providecommand\tocsubsectionnameindent{3.2em}
+\providecommand\tocsubsectionindent{4.1em}
+\providecommand\tocsubsectionnameindent{3.5em}
% \end{macrocode}
% \paragraph{Параметры формата в тексте}
@@ -139,8 +139,8 @@
\providecommand\tocsubsubsectionfillfont{}
\providecommand\tocsubsubsectionnumfont{}
-\providecommand\tocsubsubsectionindent{7.0em}
-\providecommand\tocsubsubsectionnameindent{4.1em}
+\providecommand\tocsubsubsectionindent{7.6em}
+\providecommand\tocsubsubsectionnameindent{4.7em}
% \end{macrocode}
% \paragraph{Параметры формата в тексте}