From b31f53c528600c224fbf75bf83673b514703f30f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 21 Dec 2011 23:46:23 +0000 Subject: disser (21dec11) git-svn-id: svn://tug.org/texlive/trunk@24903 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/disser/gost705.bst | 221 +++++++++++++------ Master/texmf-dist/bibtex/bst/disser/gost705s.bst | 221 +++++++++++++------ Master/texmf-dist/doc/latex/disser/ChangeLog | 9 +- Master/texmf-dist/doc/latex/disser/manual.tex | 20 +- .../doc/latex/disser/templates/bachelor/1.tex | 4 +- .../doc/latex/disser/templates/bachelor/thesis.tex | 3 + .../latex/disser/templates/candidate/thesis.tex | 3 + .../doc/latex/disser/templates/doctor/thesis.tex | 3 + .../doc/latex/disser/templates/master/thesis.tex | 3 + .../latex/disser/templates/specialist/thesis.tex | 3 + Master/texmf-dist/source/latex/disser/custom.dtx | 27 +++ Master/texmf-dist/source/latex/disser/disser.dtx | 6 +- Master/texmf-dist/source/latex/disser/gost705.dtx | 233 ++++++++++++++------- Master/texmf-dist/source/latex/disser/gost732.dtx | 153 ++++++++++++-- Master/texmf-dist/tex/latex/disser/disser.cls | 23 +- Master/texmf-dist/tex/latex/disser/gost732.cls | 24 +-- 16 files changed, 696 insertions(+), 260 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst index 76e3c2700e5..f6306837ade 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst @@ -286,11 +286,15 @@ FUNCTION {bbl.edby} % { "\bbledby{}" } { curlanguage "english" = { "Ed. by " } - { curlanguage "russian" = - { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" } - { "language is not defined: " language "edited by" * * - warning$ "edited by" } - if$ + { curlanguage "german" = + { "ed. " } + { curlanguage "russian" = + { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" } + { "language is not defined: " language "edited by" * * + warning$ "edited by" } + if$ + } + if$ } if$ } @@ -299,22 +303,30 @@ FUNCTION {bbl.cmplr} { curlanguage "english" = { "Compiler " } - { curlanguage "russian" = + { curlanguage "german" = + { "Hrsg. " } + { curlanguage "russian" = { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" } { "language is not defined: " language "compiler" * * warning$ "compiler" } if$ - } + } + if$ + } if$ } FUNCTION {bbl.edition} % { "\bbledition{}" } { curlanguage "english" = - { "edition" } - { curlanguage "russian" = - { "{\cyr\cyri\cyrz\cyrd.}" } - { "language is not defined: " language "edition" * * warning$ "edition" } - if$ + { "edition" } + { curlanguage "german" = + { "Aufl." } + { curlanguage "russian" = + { "{\cyr\cyri\cyrz\cyrd.}" } + { "language is not defined: " language "edition" * * warning$ "edition" } + if$ + } + if$ } if$ } @@ -323,9 +335,13 @@ FUNCTION {bbl.vvolume} % { "\bblVolume{}" } { curlanguage "english" = { "Volume" } - { curlanguage "russian" = - { "{\cyr\CYRT\cyro\cyrm}" } - { "language is not defined: " language "Volume" * * warning$ "Volume" } + { curlanguage "german" = + { "Band" } + { curlanguage "russian" = + { "{\cyr\CYRT\cyro\cyrm}" } + { "language is not defined: " language "Volume" * * warning$ "Volume" } + if$ + } if$ } if$ @@ -335,10 +351,14 @@ FUNCTION {bbl.vvol} % { "\bblVol{}" } { curlanguage "english" = { "Vol." } - { curlanguage "russian" = + { curlanguage "german" = + { "Bd." } + { curlanguage "russian" = { "{\cyr\CYRT.}" } { "language is not defined: " language "Vol." * * warning$ "Vol." } - if$ + if$ + } + if$ } if$ } @@ -347,10 +367,14 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" } { curlanguage "english" = { "Issue" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\CYRV\cyrery\cyrp\cyru\cyrs\cyrk}" } { "language is not defined: " language * warning$ "Issue" } if$ + } + if$ } if$ } @@ -359,10 +383,14 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" } { curlanguage "english" = { "Iss." } - { curlanguage "russian" = + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\CYRV\cyrery\cyrp.}" } - { "language is not defined: " language * warning$ "Issue" } + { "language is not defined: " language * warning$ "Iss." } if$ + } + if$ } if$ } @@ -371,10 +399,14 @@ FUNCTION {bbl.of} % { "\bblof{}" } { curlanguage "english" = { "of" } - { curlanguage "russian" = + { curlanguage "german" = + { "von" } + { curlanguage "russian" = { "{\cyr\cyri\cyrz}" } - { "language is not defined: " language "of" * * warning$ "of" } + { "language is not defined: " language * warning$ "of" } if$ + } + if$ } if$ } @@ -383,11 +415,15 @@ FUNCTION {bbl.etal} % { "\bblof{}" } { curlanguage "english" = { "et~al." } - { curlanguage "russian" = - { "{\cyr\cyri~\cyrd\cyrr.}" } - { "language is not defined: " language "at al" * * warning$ "at al." } - if$ - } + { curlanguage "german" = + { "u.~a." } + { curlanguage "russian" = + { "{\cyr\cyri~\cyrd\cyrr.}" } + { "language is not defined: " language * warning$ "etal" } + if$ + } + if$ + } if$ } @@ -395,10 +431,14 @@ FUNCTION {bbl.nnumber} % { "\bblNumber{}" } { curlanguage "english" = { "Number" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\CYRN\cyro\cyrm\cyre\cyrr}" } - { "language is not defined: " language "Number" * * warning$ "Number" } + { "language is not defined: " language * warning$ "Number" } if$ + } + if$ } if$ } @@ -407,10 +447,14 @@ FUNCTION {bbl.number} % { "\bblnumber{}" } { curlanguage "english" = { "number" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\cyrn\cyro\cyrm\cyre\cyrr}" } - { "language is not defined: " language "number" * * warning$ "number" } + { "language is not defined: " language * warning$ "number" } if$ + } + if$ } if$ } @@ -419,10 +463,14 @@ FUNCTION {bbl.nr} % { "\bblno{}" } { curlanguage "english" = { "no." } - { curlanguage "russian" = + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\textnumero}" } - { "language is not defined: " language "no." * * warning$ "no." } + { "language is not defined: " language * warning$ "no" } if$ + } + if$ } if$ } @@ -430,11 +478,15 @@ FUNCTION {bbl.nr} % { "\bblno{}" } FUNCTION {bbl.nnr} % { "\bblno{}" } { curlanguage "english" = - { "No." } - { curlanguage "russian" = + { "No." } + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\textnumero}" } - { "language is not defined: " language "No." * * warning$ "No." } + { "language is not defined: " language * warning$ "No" } if$ + } + if$ } if$ } @@ -443,10 +495,14 @@ FUNCTION {bbl.in} % { "\bblin{}" } { curlanguage "english" = { "in" } + { curlanguage "german" = + { "in" } { curlanguage "russian" = - { "{\cyr\cyrv}" } - { "language is not defined: " language "in" * * warning$ "in" } + { "{\cyr\cyrv}" } + { "language is not defined: " language * warning$ "in" } if$ + } + if$ } if$ } @@ -454,11 +510,15 @@ FUNCTION {bbl.in} % { "\bblin{}" } FUNCTION {bbl.iin} % { "\bblIn{}" } { curlanguage "english" = - { "In" } - { curlanguage "russian" = + { "In" } + { curlanguage "german" = + { "In" } + { curlanguage "russian" = { "{\cyr\CYRV}" } - { "language is not defined: " language "In" * * warning$ "In" } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -466,11 +526,15 @@ FUNCTION {bbl.iin} % { "\bblIn{}" } FUNCTION {bbl.pages} % { "\bblpp." } { curlanguage "english" = - { "pp." } - { curlanguage "russian" = + { "p." } + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\cyrs.}" } - { "language is not defined: " language "pp." * * warning$ "pp." } + { "language is not defined: " language * warning$ "p." } if$ + } + if$ } if$ } @@ -479,10 +543,14 @@ FUNCTION {bbl.page} % { "\bblp." } { curlanguage "english" = { "p." } - { curlanguage "russian" = + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\cyrs.}"} - { "language is not defined: " language "p." * * warning$ "p." } + { "language is not defined: " language * warning$ "p." } if$ + } + if$ } if$ } @@ -490,11 +558,15 @@ FUNCTION {bbl.page} % { "\bblp." } FUNCTION {bbl.ppages} % { "\bblPp." } { curlanguage "english" = - { "Pp." } - { curlanguage "russian" = + { "P." } + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\CYRS.}" } - { "language is not defined: " language "Pp." * * warning$ "Pp." } - if$ + { "language is not defined: " language * warning$ "P." } + if$ + } + if$ } if$ } @@ -503,10 +575,14 @@ FUNCTION {bbl.ppage} % { "\bblP." } { curlanguage "english" = { "P." } - { curlanguage "russian" = + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\CYRS.}" } - { "language is not defined: " language "P." * * warning$ "P." } + { "language is not defined: " language * warning$ "P." } if$ + } + if$ } if$ } @@ -514,11 +590,15 @@ FUNCTION {bbl.ppage} % { "\bblP." } FUNCTION {bbl.techrep} { curlanguage "english" = - { "Tech. Rep." } - { curlanguage "russian" = + { "Tech.~Rep." } + { curlanguage "german" = + { "Tech.~Bericht" } + { curlanguage "russian" = { "{\cyr\CYRT\cyre\cyrh.\ \cyrd\cyro\cyrk\cyrl\cyra\cyrd.}" } - { "language is not defined: " language "Tech. Rep." * * warning$ "P." } + { "language is not defined: " language * warning$ "Tech Rep" } if$ + } + if$ } if$ } @@ -527,11 +607,15 @@ FUNCTION {bbl.mthesis} { curlanguage "english" = { "Master's thesis" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Mag." } + { curlanguage "russian" = { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Master's thesis" * * warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -540,11 +624,15 @@ FUNCTION {bbl.phdthesis} { curlanguage "english" = { "Ph.\,D. thesis" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Ph.\,D." } + { curlanguage "russian" = { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Ph.\,D. thesis" * * warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -553,12 +641,15 @@ FUNCTION {bbl.docdisser} { curlanguage "english" = { "Dr.\,Sci. dissertation" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Dr." } + { curlanguage "russian" = { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Dr.\,Sci. dissertation" * * - warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -813,8 +904,8 @@ FUNCTION {format.number.series} bbl.nnr } { new.sentence - series - bbl.nr + bbl.iiss series tie.or.space.connect + ", " * bbl.nr tie.or.space.connect } if$ @@ -1676,8 +1767,6 @@ FUNCTION {begin.bib} 'skip$ { preamble$ write$ newline$ } if$ - "\makeatletter\renewcommand{\@biblabel}[1]{#1.}\makeatother" - write$ newline$ "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" write$ newline$ "\ifx\undefined\href\def\href#1#2{#2}\else\fi" diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst index ff41304025c..a4fa5ea1f5f 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst @@ -286,11 +286,15 @@ FUNCTION {bbl.edby} % { "\bbledby{}" } { curlanguage "english" = { "Ed. by " } - { curlanguage "russian" = - { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" } - { "language is not defined: " language "edited by" * * - warning$ "edited by" } - if$ + { curlanguage "german" = + { "ed. " } + { curlanguage "russian" = + { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" } + { "language is not defined: " language "edited by" * * + warning$ "edited by" } + if$ + } + if$ } if$ } @@ -299,22 +303,30 @@ FUNCTION {bbl.cmplr} { curlanguage "english" = { "Compiler " } - { curlanguage "russian" = + { curlanguage "german" = + { "Hrsg. " } + { curlanguage "russian" = { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" } { "language is not defined: " language "compiler" * * warning$ "compiler" } if$ - } + } + if$ + } if$ } FUNCTION {bbl.edition} % { "\bbledition{}" } { curlanguage "english" = - { "edition" } - { curlanguage "russian" = - { "{\cyr\cyri\cyrz\cyrd.}" } - { "language is not defined: " language "edition" * * warning$ "edition" } - if$ + { "edition" } + { curlanguage "german" = + { "Aufl." } + { curlanguage "russian" = + { "{\cyr\cyri\cyrz\cyrd.}" } + { "language is not defined: " language "edition" * * warning$ "edition" } + if$ + } + if$ } if$ } @@ -323,9 +335,13 @@ FUNCTION {bbl.vvolume} % { "\bblVolume{}" } { curlanguage "english" = { "Volume" } - { curlanguage "russian" = - { "{\cyr\CYRT\cyro\cyrm}" } - { "language is not defined: " language "Volume" * * warning$ "Volume" } + { curlanguage "german" = + { "Band" } + { curlanguage "russian" = + { "{\cyr\CYRT\cyro\cyrm}" } + { "language is not defined: " language "Volume" * * warning$ "Volume" } + if$ + } if$ } if$ @@ -335,10 +351,14 @@ FUNCTION {bbl.vvol} % { "\bblVol{}" } { curlanguage "english" = { "Vol." } - { curlanguage "russian" = + { curlanguage "german" = + { "Bd." } + { curlanguage "russian" = { "{\cyr\CYRT.}" } { "language is not defined: " language "Vol." * * warning$ "Vol." } - if$ + if$ + } + if$ } if$ } @@ -347,10 +367,14 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" } { curlanguage "english" = { "Issue" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\CYRV\cyrery\cyrp\cyru\cyrs\cyrk}" } { "language is not defined: " language * warning$ "Issue" } if$ + } + if$ } if$ } @@ -359,10 +383,14 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" } { curlanguage "english" = { "Iss." } - { curlanguage "russian" = + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\CYRV\cyrery\cyrp.}" } - { "language is not defined: " language * warning$ "Issue" } + { "language is not defined: " language * warning$ "Iss." } if$ + } + if$ } if$ } @@ -371,10 +399,14 @@ FUNCTION {bbl.of} % { "\bblof{}" } { curlanguage "english" = { "of" } - { curlanguage "russian" = + { curlanguage "german" = + { "von" } + { curlanguage "russian" = { "{\cyr\cyri\cyrz}" } - { "language is not defined: " language "of" * * warning$ "of" } + { "language is not defined: " language * warning$ "of" } if$ + } + if$ } if$ } @@ -383,11 +415,15 @@ FUNCTION {bbl.etal} % { "\bblof{}" } { curlanguage "english" = { "et~al." } - { curlanguage "russian" = - { "{\cyr\cyri~\cyrd\cyrr.}" } - { "language is not defined: " language "at al" * * warning$ "at al." } - if$ - } + { curlanguage "german" = + { "u.~a." } + { curlanguage "russian" = + { "{\cyr\cyri~\cyrd\cyrr.}" } + { "language is not defined: " language * warning$ "etal" } + if$ + } + if$ + } if$ } @@ -395,10 +431,14 @@ FUNCTION {bbl.nnumber} % { "\bblNumber{}" } { curlanguage "english" = { "Number" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\CYRN\cyro\cyrm\cyre\cyrr}" } - { "language is not defined: " language "Number" * * warning$ "Number" } + { "language is not defined: " language * warning$ "Number" } if$ + } + if$ } if$ } @@ -407,10 +447,14 @@ FUNCTION {bbl.number} % { "\bblnumber{}" } { curlanguage "english" = { "number" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\cyrn\cyro\cyrm\cyre\cyrr}" } - { "language is not defined: " language "number" * * warning$ "number" } + { "language is not defined: " language * warning$ "number" } if$ + } + if$ } if$ } @@ -419,10 +463,14 @@ FUNCTION {bbl.nr} % { "\bblno{}" } { curlanguage "english" = { "no." } - { curlanguage "russian" = + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\textnumero}" } - { "language is not defined: " language "no." * * warning$ "no." } + { "language is not defined: " language * warning$ "no" } if$ + } + if$ } if$ } @@ -430,11 +478,15 @@ FUNCTION {bbl.nr} % { "\bblno{}" } FUNCTION {bbl.nnr} % { "\bblno{}" } { curlanguage "english" = - { "No." } - { curlanguage "russian" = + { "No." } + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\textnumero}" } - { "language is not defined: " language "No." * * warning$ "No." } + { "language is not defined: " language * warning$ "No" } if$ + } + if$ } if$ } @@ -443,10 +495,14 @@ FUNCTION {bbl.in} % { "\bblin{}" } { curlanguage "english" = { "in" } + { curlanguage "german" = + { "in" } { curlanguage "russian" = - { "{\cyr\cyrv}" } - { "language is not defined: " language "in" * * warning$ "in" } + { "{\cyr\cyrv}" } + { "language is not defined: " language * warning$ "in" } if$ + } + if$ } if$ } @@ -454,11 +510,15 @@ FUNCTION {bbl.in} % { "\bblin{}" } FUNCTION {bbl.iin} % { "\bblIn{}" } { curlanguage "english" = - { "In" } - { curlanguage "russian" = + { "In" } + { curlanguage "german" = + { "In" } + { curlanguage "russian" = { "{\cyr\CYRV}" } - { "language is not defined: " language "In" * * warning$ "In" } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -466,11 +526,15 @@ FUNCTION {bbl.iin} % { "\bblIn{}" } FUNCTION {bbl.pages} % { "\bblpp." } { curlanguage "english" = - { "pp." } - { curlanguage "russian" = + { "p." } + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\cyrs.}" } - { "language is not defined: " language "pp." * * warning$ "pp." } + { "language is not defined: " language * warning$ "p." } if$ + } + if$ } if$ } @@ -479,10 +543,14 @@ FUNCTION {bbl.page} % { "\bblp." } { curlanguage "english" = { "p." } - { curlanguage "russian" = + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\cyrs.}"} - { "language is not defined: " language "p." * * warning$ "p." } + { "language is not defined: " language * warning$ "p." } if$ + } + if$ } if$ } @@ -490,11 +558,15 @@ FUNCTION {bbl.page} % { "\bblp." } FUNCTION {bbl.ppages} % { "\bblPp." } { curlanguage "english" = - { "Pp." } - { curlanguage "russian" = + { "P." } + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\CYRS.}" } - { "language is not defined: " language "Pp." * * warning$ "Pp." } - if$ + { "language is not defined: " language * warning$ "P." } + if$ + } + if$ } if$ } @@ -503,10 +575,14 @@ FUNCTION {bbl.ppage} % { "\bblP." } { curlanguage "english" = { "P." } - { curlanguage "russian" = + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\CYRS.}" } - { "language is not defined: " language "P." * * warning$ "P." } + { "language is not defined: " language * warning$ "P." } if$ + } + if$ } if$ } @@ -514,11 +590,15 @@ FUNCTION {bbl.ppage} % { "\bblP." } FUNCTION {bbl.techrep} { curlanguage "english" = - { "Tech. Rep." } - { curlanguage "russian" = + { "Tech.~Rep." } + { curlanguage "german" = + { "Tech.~Bericht" } + { curlanguage "russian" = { "{\cyr\CYRT\cyre\cyrh.\ \cyrd\cyro\cyrk\cyrl\cyra\cyrd.}" } - { "language is not defined: " language "Tech. Rep." * * warning$ "P." } + { "language is not defined: " language * warning$ "Tech Rep" } if$ + } + if$ } if$ } @@ -527,11 +607,15 @@ FUNCTION {bbl.mthesis} { curlanguage "english" = { "Master's thesis" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Mag." } + { curlanguage "russian" = { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Master's thesis" * * warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -540,11 +624,15 @@ FUNCTION {bbl.phdthesis} { curlanguage "english" = { "Ph.\,D. thesis" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Ph.\,D." } + { curlanguage "russian" = { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Ph.\,D. thesis" * * warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -553,12 +641,15 @@ FUNCTION {bbl.docdisser} { curlanguage "english" = { "Dr.\,Sci. dissertation" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Dr." } + { curlanguage "russian" = { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Dr.\,Sci. dissertation" * * - warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -813,8 +904,8 @@ FUNCTION {format.number.series} bbl.nnr } { new.sentence - series - bbl.nr + bbl.iiss series tie.or.space.connect + ", " * bbl.nr tie.or.space.connect } if$ @@ -1779,8 +1870,6 @@ FUNCTION {begin.bib} 'skip$ { preamble$ write$ newline$ } if$ - "\makeatletter\renewcommand{\@biblabel}[1]{#1.}\makeatother" - write$ newline$ "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" write$ newline$ "\ifx\undefined\href\def\href#1#2{#2}\else\fi" diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog index f13ab1ace6b..d6dc706a8a1 100644 --- a/Master/texmf-dist/doc/latex/disser/ChangeLog +++ b/Master/texmf-dist/doc/latex/disser/ChangeLog @@ -2,7 +2,14 @@ disser changelog Copyright (C) 2004-2012 Stanislav Kruchinin ------------------------------------------- -Summary of changes in version 1.1.8 (2010-09-11): +Summary of changes in version 1.1.9 (2011-11-29): ++ Add support for German language in gost705 style. Thanks to Alexander Petrov! +* gost705: display bbl.iiss before "series" field. +* Move \@biblabel redefinition to class. +* Miscellaneous small fixes. + + +Summary of changes in version 1.1.8 (2011-09-11): * Remove bibliography prefix support to solve the problem with citation compression. + Add compatibility with MathTime Professional II fonts. * Miscellaneous small fixes. diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex index d32811141bd..a8aa9e83769 100644 --- a/Master/texmf-dist/doc/latex/disser/manual.tex +++ b/Master/texmf-dist/doc/latex/disser/manual.tex @@ -55,7 +55,7 @@ \let\makelabel\deflabel} }{\end{list}} -\def\fileversion{1.1.8} +\def\fileversion{1.1.9} \begin{document} \sloppy @@ -87,9 +87,9 @@ Одной из основных целей создания \pkg{disser} являлось устранение общего недостатка стандартных классов: отсутствия возможности настройки формата элементов титульного листа, заголовков и записей в автоматически генерируемых списках. Для достижения этой цели была переопределена значительная часть команд, входящих в ядро \LaTeX{}, и введен ряд новых переменных, которые описаны в комментариях к исходным текстам. Это позволило значительно упростить разработку пользовательских классов, которые удовлетворяют специфическим требованиями учебных заведений и диссертационных советов. -Примером реализации этого подхода является класс \pkg{gost732}. +Примером реализации этого подхода является класс~\pkg{gost732}. -\section{Опции класса} +\section{Опции класса}\label{s:opts} \textbf{Примечание:} полужирным выделены опции и значения, используемые по умолчанию. \\ @@ -469,7 +469,6 @@ latex \subsection{Список работ диссертанта} В автореферате список работ диссертанта должен быть отделен от списка цитируемой литературы, а ссылки на них должны отличаться друг от друга. -В стилях \file{gost705.bst} и \file{gost705s.bst} введены макросы |\BibPrefix| и |\BibPostfix|, позволяющие задать префикс и постфикс номера ссылки. Для размещения в документе двух списков литературы с независимой нумерацией используется пакет \pkg{multibib}. Описание библиографических ссылок на работы диссертанта должно находиться в файле \file{thesis.bib} вместе с остальными ссылками. @@ -515,8 +514,17 @@ env TARGET=autoref make Для автоматической вставки графических файлов с подписями в классе предусмотрена опция \cmd{facsimile}. Эта опция по умолчанию включена только в шаблонах авторефератов. Факсимиле диссертанта находится в файле \file{./fig/facsimile.}, факсимиле ученого секретаря диссертационного совета "--- в файле \file{./fig/sec-facsimile.}. -Здесь \file{} "--- один из типов графических файлов, поддерживаемых в \LaTeX{} (\file{eps}) или в pdf\LaTeX{} (\file{pdf}, \file{tiff}, \file{png}). +Здесь \file{} "--- один из типов графических файлов, поддерживаемых в \LaTeX{} (\file{eps}) или в pdf\LaTeX{} (\file{pdf}, \file{tif}, \file{png}). Команда |\facsimile|, включающая файл с подписью диссертанта в документ, определена в файле \file{titledefs.dtx}. Команда, включающая файл с подписью ученого секретаря, находится в файле \file{autoref.tex}. -\end{document} \ No newline at end of file +\section{Настройка пакета под нестандартные требования диссертационных советов} + +Код, определяющий вид титульного листа, нумерацию объектов и другие параметры, находится в файлах, имена которых совпадают с соответствующими опциями класса (см. раздел~\ref{s:opts}): +\file{bachelor.dtx}, \file{master.dtx}, \file{candidate.dtx}, \file{autoref.dtx}, \file{doctor.dtx}. +После сборки класса из исходных текстов, они преобразуются в аналогичные файлы с расширением |rtx|. + +Для внесения изменений в файлы пакета с расширениями |bst|, |cls| и |rtx| следует создавать их копии в каталоге с документом. +При сборке документа \LaTeX{} ищет подключаемые файлы в каталоге компилируемого |tex|-файла, поэтому будет использована локальная копия файлов с вашими изменениями. + +\end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex index a08747e814e..dfdb48e91be 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex @@ -29,7 +29,7 @@ Perelman_2003_math:0307245,Nielsen_2010_1006.2735}. } \end{wrapfigure} -Если разность энергий электронно-дырочных уровней $E_2-E_1$ близка к энергии продольного оптического фонона $\hbar\Omega_{LO}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$. +Если разность энергий электронно-дырочных уровней $E_2-E_1$ близка к энергии продольного оптического фонона $\hbar\Omega_{\mathrm{LO}}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$. Волновые функции последних представляют собой следующие комбинации вырожденных состояний\footnote{Текст сноски}. Ссылка на таблицу~\ref{t:InPSiO2}. @@ -112,7 +112,7 @@ Perelman_2003_math:0307245,Nielsen_2010_1006.2735}. \newtheorem{lemm}{Лемма}[chapter] \def\thelemmstyle{\bfseries} -\def\oparglemmstyle{\itshape} +\def\oparglemmstyle{\slshape} \def\lemmstyle{} \def\preoparglemm{(} \def\postoparglemm{)} diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex index e847f2417c4..6bb05453d4a 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex @@ -17,6 +17,9 @@ %\pagestyle{headcenter} %\chapterpagestyle{empty} +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + % Использовать полужирное начертание для векторов \let\vec=\mathbf diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex index 3885c022958..461050b1e74 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex @@ -20,6 +20,9 @@ %\pagestyle{headcenter} %\chapterpagestyle{empty} +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + % Ссылки на работы соискателя включаются в общий список литературы \let\citemy=\cite diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex index 0200abd6820..6c3aa36bbf8 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex @@ -19,6 +19,9 @@ %\pagestyle{headcenter} %\chapterpagestyle{empty} +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + % Ссылки на работы соискателя включаются в общий список литературы \let\citemy=\cite diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex index cf08ac195e0..354b9edf952 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex @@ -17,6 +17,9 @@ %\pagestyle{headcenter} %\chapterpagestyle{empty} +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + % Использовать полужирное начертание для векторов \let\vec=\mathbf diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex index eed1e0ac00d..0ad08f387c2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex @@ -12,6 +12,9 @@ \usepackage[english,russian]{babel} \ifpdf\usepackage{epstopdf}\fi +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + % Использовать полужирное начертание для векторов \let\vec=\mathbf diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx index 1d62e3e14ea..c2557c11b2f 100644 --- a/Master/texmf-dist/source/latex/disser/custom.dtx +++ b/Master/texmf-dist/source/latex/disser/custom.dtx @@ -130,6 +130,33 @@ % \DescribeMacro{\bibsection}\index{Макросы!\verb*+\bibsection+} % \begin{macrocode} \renewcommand\bibsection{\nchapter{\bibname}} +\@ifundefined{chapter}{% + \renewcommand\bibsection{% + \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% +}{% + \@ifxundefined\NAT@sectionbib{% + \renewcommand\bibsection{% + \nchapter{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% + }{% + \renewcommand\bibsection{% + \nsection{\bibname\ifx\@mkboth\@gobbletwo\else\markright{\MakeUppercase{\bibname}}\fi}% + }% + }% +}% + +% \end{macrocode} +% Преамбула окружения |thebibliography|. +% \DescribeMacro{\bibpreamble}\index{Макросы!\verb*+\bibpreamble+} +% \begin{macrocode} +\renewcommand\bibpreamble{% +% \end{macrocode} +% Формат номера в списке литературы. +% \DescribeMacro{\@biblabel}\index{Макросы!\verb*+"\"@biblabel+} +% \begin{macrocode} + \renewcommand\@biblabel[1]{##1.}% +} % \end{macrocode} % Переопределение окружения |thebibliography| для создания корректной diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index 7b38f83fe7e..c154c1f6222 100644 --- a/Master/texmf-dist/source/latex/disser/disser.dtx +++ b/Master/texmf-dist/source/latex/disser/disser.dtx @@ -3,7 +3,7 @@ %% %% disser -- LaTeX document class for dissertations. %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin +%% Copyright (c) 2004-2012 Stanislav Kruchinin %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,7 +19,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{disser.drv}[2010/09/11 1.1.8 Document class for dissertations] +\ProvidesFile{disser.drv}[2012/11/29 1.1.9 Document class for dissertations] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -180,7 +180,7 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2011/09/11 1.1.8 Document class for dissertations] +\ProvidesClass{disser}[2011/11/29 1.1.9 Document class for dissertations] % \end{macrocode} % Подключение пакета \pkg{kvoptions} для обработки опций в формате diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index 4db12a62141..69dd971d9c2 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -16,7 +16,7 @@ % % bibtex8 -H -c .csf % -% Copyright (C) 2004-2010 by +% Copyright (C) 2004-2012 by % Stanislav Kruchinin % % This work may be distributed and/or modified under the @@ -47,7 +47,7 @@ % tex gost705.dtx % % Documentation: -% latex maik.dtx; ... +% latex gost705.dtx; ... % % Programm calls to get the documentation (example): % pdflatex gost705.dtx @@ -91,8 +91,8 @@ GOST R 7.0.5-2008 with some conventional modifications. Based on style gost71u.bst by Maksym Polyakov. -For the Russian bibliographic entries you need to create field - language = {russian}. +For the Russian or German bibliographic entries you need to create field + language = {russian} or language = {german}. Default language is English. Field numpages for books must contain number of pages. @@ -102,7 +102,7 @@ Requires 8-bit bibtex with switch -H and csf file supporting cyrillic. bibtex8 -H -c .csf -Copyright (C) 2004-2010 by +Copyright (C) 2004-2012 by Stanislav Kruchinin This work may be distributed and/or modified under the @@ -155,7 +155,7 @@ and the derived files % %<*driver> \ProvidesFile{gost705.drv}% - [2010/09/11 1.1.8 Bibliography style for GOST R 7.0.5-2008.] + [2011/11/29 1.1.9 Bibliography style for GOST R 7.0.5-2008.] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -623,11 +623,15 @@ FUNCTION {bbl.edby} % { "\bbledby{}" } { curlanguage "english" = { "Ed. by " } - { curlanguage "russian" = - { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" } - { "language is not defined: " language "edited by" * * - warning$ "edited by" } - if$ + { curlanguage "german" = + { "ed. " } + { curlanguage "russian" = + { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" } + { "language is not defined: " language "edited by" * * + warning$ "edited by" } + if$ + } + if$ } if$ } @@ -639,11 +643,15 @@ FUNCTION {bbl.cmplr} { curlanguage "english" = { "Compiler " } - { curlanguage "russian" = + { curlanguage "german" = + { "Hrsg. " } + { curlanguage "russian" = { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" } { "language is not defined: " language "compiler" * * warning$ "compiler" } if$ - } + } + if$ + } if$ } @@ -653,11 +661,15 @@ FUNCTION {bbl.cmplr} FUNCTION {bbl.edition} % { "\bbledition{}" } { curlanguage "english" = - { "edition" } - { curlanguage "russian" = - { "{\cyr\cyri\cyrz\cyrd.}" } - { "language is not defined: " language "edition" * * warning$ "edition" } - if$ + { "edition" } + { curlanguage "german" = + { "Aufl." } + { curlanguage "russian" = + { "{\cyr\cyri\cyrz\cyrd.}" } + { "language is not defined: " language "edition" * * warning$ "edition" } + if$ + } + if$ } if$ } @@ -669,9 +681,13 @@ FUNCTION {bbl.vvolume} % { "\bblVolume{}" } { curlanguage "english" = { "Volume" } - { curlanguage "russian" = - { "{\cyr\CYRT\cyro\cyrm}" } - { "language is not defined: " language "Volume" * * warning$ "Volume" } + { curlanguage "german" = + { "Band" } + { curlanguage "russian" = + { "{\cyr\CYRT\cyro\cyrm}" } + { "language is not defined: " language "Volume" * * warning$ "Volume" } + if$ + } if$ } if$ @@ -684,10 +700,14 @@ FUNCTION {bbl.vvol} % { "\bblVol{}" } { curlanguage "english" = { "Vol." } - { curlanguage "russian" = + { curlanguage "german" = + { "Bd." } + { curlanguage "russian" = { "{\cyr\CYRT.}" } { "language is not defined: " language "Vol." * * warning$ "Vol." } - if$ + if$ + } + if$ } if$ } @@ -699,10 +719,14 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" } { curlanguage "english" = { "Issue" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\CYRV\cyrery\cyrp\cyru\cyrs\cyrk}" } { "language is not defined: " language * warning$ "Issue" } if$ + } + if$ } if$ } @@ -714,10 +738,14 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" } { curlanguage "english" = { "Iss." } - { curlanguage "russian" = + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\CYRV\cyrery\cyrp.}" } - { "language is not defined: " language * warning$ "Issue" } + { "language is not defined: " language * warning$ "Iss." } if$ + } + if$ } if$ } @@ -729,10 +757,14 @@ FUNCTION {bbl.of} % { "\bblof{}" } { curlanguage "english" = { "of" } - { curlanguage "russian" = + { curlanguage "german" = + { "von" } + { curlanguage "russian" = { "{\cyr\cyri\cyrz}" } - { "language is not defined: " language "of" * * warning$ "of" } + { "language is not defined: " language * warning$ "of" } if$ + } + if$ } if$ } @@ -744,11 +776,15 @@ FUNCTION {bbl.etal} % { "\bblof{}" } { curlanguage "english" = { "et~al." } - { curlanguage "russian" = - { "{\cyr\cyri~\cyrd\cyrr.}" } - { "language is not defined: " language "at al" * * warning$ "at al." } - if$ - } + { curlanguage "german" = + { "u.~a." } + { curlanguage "russian" = + { "{\cyr\cyri~\cyrd\cyrr.}" } + { "language is not defined: " language * warning$ "etal" } + if$ + } + if$ + } if$ } @@ -759,10 +795,14 @@ FUNCTION {bbl.nnumber} % { "\bblNumber{}" } { curlanguage "english" = { "Number" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\CYRN\cyro\cyrm\cyre\cyrr}" } - { "language is not defined: " language "Number" * * warning$ "Number" } + { "language is not defined: " language * warning$ "Number" } if$ + } + if$ } if$ } @@ -774,10 +814,14 @@ FUNCTION {bbl.number} % { "\bblnumber{}" } { curlanguage "english" = { "number" } - { curlanguage "russian" = + { curlanguage "german" = + { "Heft" } + { curlanguage "russian" = { "{\cyr\cyrn\cyro\cyrm\cyre\cyrr}" } - { "language is not defined: " language "number" * * warning$ "number" } + { "language is not defined: " language * warning$ "number" } if$ + } + if$ } if$ } @@ -789,10 +833,14 @@ FUNCTION {bbl.nr} % { "\bblno{}" } { curlanguage "english" = { "no." } - { curlanguage "russian" = + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\textnumero}" } - { "language is not defined: " language "no." * * warning$ "no." } + { "language is not defined: " language * warning$ "no" } if$ + } + if$ } if$ } @@ -803,11 +851,15 @@ FUNCTION {bbl.nr} % { "\bblno{}" } FUNCTION {bbl.nnr} % { "\bblno{}" } { curlanguage "english" = - { "No." } - { curlanguage "russian" = + { "No." } + { curlanguage "german" = + { "H." } + { curlanguage "russian" = { "{\cyr\textnumero}" } - { "language is not defined: " language "No." * * warning$ "No." } + { "language is not defined: " language * warning$ "No" } if$ + } + if$ } if$ } @@ -819,10 +871,14 @@ FUNCTION {bbl.in} % { "\bblin{}" } { curlanguage "english" = { "in" } + { curlanguage "german" = + { "in" } { curlanguage "russian" = - { "{\cyr\cyrv}" } - { "language is not defined: " language "in" * * warning$ "in" } + { "{\cyr\cyrv}" } + { "language is not defined: " language * warning$ "in" } if$ + } + if$ } if$ } @@ -833,11 +889,15 @@ FUNCTION {bbl.in} % { "\bblin{}" } FUNCTION {bbl.iin} % { "\bblIn{}" } { curlanguage "english" = - { "In" } - { curlanguage "russian" = + { "In" } + { curlanguage "german" = + { "In" } + { curlanguage "russian" = { "{\cyr\CYRV}" } - { "language is not defined: " language "In" * * warning$ "In" } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -848,11 +908,15 @@ FUNCTION {bbl.iin} % { "\bblIn{}" } FUNCTION {bbl.pages} % { "\bblpp." } { curlanguage "english" = - { "pp." } - { curlanguage "russian" = + { "p." } + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\cyrs.}" } - { "language is not defined: " language "pp." * * warning$ "pp." } + { "language is not defined: " language * warning$ "p." } if$ + } + if$ } if$ } @@ -864,10 +928,14 @@ FUNCTION {bbl.page} % { "\bblp." } { curlanguage "english" = { "p." } - { curlanguage "russian" = + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\cyrs.}"} - { "language is not defined: " language "p." * * warning$ "p." } + { "language is not defined: " language * warning$ "p." } if$ + } + if$ } if$ } @@ -878,11 +946,15 @@ FUNCTION {bbl.page} % { "\bblp." } FUNCTION {bbl.ppages} % { "\bblPp." } { curlanguage "english" = - { "Pp." } - { curlanguage "russian" = + { "P." } + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\CYRS.}" } - { "language is not defined: " language "Pp." * * warning$ "Pp." } - if$ + { "language is not defined: " language * warning$ "P." } + if$ + } + if$ } if$ } @@ -894,10 +966,14 @@ FUNCTION {bbl.ppage} % { "\bblP." } { curlanguage "english" = { "P." } - { curlanguage "russian" = + { curlanguage "german" = + { "S." } + { curlanguage "russian" = { "{\cyr\CYRS.}" } - { "language is not defined: " language "P." * * warning$ "P." } + { "language is not defined: " language * warning$ "P." } if$ + } + if$ } if$ } @@ -908,11 +984,15 @@ FUNCTION {bbl.ppage} % { "\bblP." } FUNCTION {bbl.techrep} { curlanguage "english" = - { "Tech. Rep." } - { curlanguage "russian" = + { "Tech.~Rep." } + { curlanguage "german" = + { "Tech.~Bericht" } + { curlanguage "russian" = { "{\cyr\CYRT\cyre\cyrh.\ \cyrd\cyro\cyrk\cyrl\cyra\cyrd.}" } - { "language is not defined: " language "Tech. Rep." * * warning$ "P." } + { "language is not defined: " language * warning$ "Tech Rep" } if$ + } + if$ } if$ } @@ -924,11 +1004,15 @@ FUNCTION {bbl.mthesis} { curlanguage "english" = { "Master's thesis" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Mag." } + { curlanguage "russian" = { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Master's thesis" * * warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -940,11 +1024,15 @@ FUNCTION {bbl.phdthesis} { curlanguage "english" = { "Ph.\,D. thesis" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Ph.\,D." } + { curlanguage "russian" = { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Ph.\,D. thesis" * * warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -956,12 +1044,15 @@ FUNCTION {bbl.docdisser} { curlanguage "english" = { "Dr.\,Sci. dissertation" } - { curlanguage "russian" = + { curlanguage "german" = + { "Diss.~Dr." } + { curlanguage "russian" = { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Dr.\,Sci. dissertation" * * - warning$ "P." } + { "language is not defined: " language * warning$ "In" } if$ + } + if$ } if$ } @@ -1279,8 +1370,8 @@ FUNCTION {format.number.series} bbl.nnr } { new.sentence - series - bbl.nr + bbl.iiss series tie.or.space.connect + ", " * bbl.nr tie.or.space.connect } if$ @@ -2426,8 +2517,6 @@ FUNCTION {begin.bib} 'skip$ { preamble$ write$ newline$ } if$ - "\makeatletter\renewcommand{\@biblabel}[1]{#1.}\makeatother" - write$ newline$ "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" write$ newline$ "\ifx\undefined\href\def\href#1#2{#2}\else\fi" diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index 8d8f2a85683..e5dc47786d3 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -1,26 +1,131 @@ % \iffalse meta-comment -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% gost732 -- GOST 7.32-2001 implementation. -%% -%% Copyright (c) 2004-2010 Stanislav Kruchinin -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% This program is distributed in the hope that it will be useful, -%% but WITHOUT ANY WARRANTY; without even the implied warranty of -%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% gost732 -- GOST 7.32-2001 implementation. +% +% Copyright (c) 2004-2012 Stanislav Kruchinin +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any later +% version. This version of this license is in +% http://www.latex-project.org/lppl/lppl-1-3c.txt +% and the latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of +% LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% Current Maintainer of this work is Stanislav Kruchinin. +% +% This work consists of the main source file gost705.dtx +% and the derived files +% gost732.bst, gost732.pdf. +% +% Distribution: +% CTAN:macros/latex/contrib/disser/src/gost732.dtx +% +% Unpacking: +% (a) If disser.ins present: +% latex disser.ins +% (b) Without disser.ins: +% tex gost732.dtx +% +% Documentation: +% latex gost732.dtx; ... +% +% Programm calls to get the documentation (example): +% pdflatex gost732.dtx +% makeindex -r -s dtx.ist gost732 +% pdflatex gost732.dtx +% pdflatex gost732.dtx +% +% Installation: +% TDS:tex/latex/disser/ +% TDS:doc/latex/disser/ +% TDS:source/latex/disser/ +% +%<*ignore> +\begingroup + \catcode123=1 % + \catcode125=2 % + \def\x{LaTeX2e}% +\expandafter\endgroup +\ifcase 0\ifx\install y1\fi\expandafter + \ifx\csname processbatchFile\endcsname\relax\else1\fi + \ifx\fmtname\x\else 1\fi\relax +\else\csname fi\endcsname +% +%<*install> +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation} +\Msg{* gost732: GOST 7.32-2001 implementation} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\let\MetaPrefix\relax +\preamble + +This is a generated file. +This document class attempts to format LaTeX document according to +GOST 7.32-2001. + +Copyright (C) 2004-2012 by + Stanislav Kruchinin + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3c of this license or (at your option) any later +version. This version of this license is in + http://www.latex-project.org/lppl/lppl-1-3c.txt +and the latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of +LaTeX version 2005/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +Current Maintainer of this work is Stanislav Kruchinin. + +This work consists of the main source file gost705.dtx +and the derived files + gost732.bst gost732.pdf. + +\endpreamble +\let\MetaPrefix\DoubleperCent + +\generate{% + \usedir{tex/latex/disser}% + \file{gost732.cls}{\from{gost732.dtx}{gost732}}% +} + +\catcode32=13\relax% active space +\let =\space% +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* file into a directory searched by TeX:} +\Msg{*} +\Msg{* gost732.cls} +\Msg{*} +\Msg{* To produce the documentation run the file `gost732.dtx'} +\Msg{* through LaTeX or pdfLaTeX.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +% +%<*ignore> +\fi +% %<*driver> -\ProvidesFile{gost732.drv}[2010/09/11 1.1.8 GOST 7.32-2001 implementation] +\ProvidesFile{gost732.drv}[2011/11/29 1.1.9 GOST 7.32-2001 implementation] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -112,7 +217,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2011/09/11 1.1.8 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2011/11/29 1.1.9 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax @@ -235,6 +340,12 @@ \captionsetup[longtable]{justification=raggedright,singlelinecheck=false} \captionsetup[table]{justification=raggedright,singlelinecheck=false} +% \end{macrocode} +% \subsection{Цитирование} +% Точка с запятой в качестве разделителя номеров цитируемой литературы. +% \begin{macrocode} +\setcitestyle{semicolon} + % \end{macrocode} % % \subsection{Сноска} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 7eff6d5cf80..fd4314afa55 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -27,7 +27,7 @@ %% %% disser -- LaTeX document class for dissertations. %% -%% Copyright (c) 2004-2010 Stanislav Kruchinin +%% Copyright (c) 2004-2012 Stanislav Kruchinin %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2011/09/11 1.1.8 Document class for dissertations] +\ProvidesClass{disser}[2011/11/29 1.1.9 Document class for dissertations] \RequirePackage{kvoptions} @@ -1412,6 +1412,25 @@ \usepackage[square,comma,sort&compress,numbers]{natbib} \renewcommand\bibsection{\nchapter{\bibname}} +\@ifundefined{chapter}{% + \renewcommand\bibsection{% + \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% +}{% + \@ifxundefined\NAT@sectionbib{% + \renewcommand\bibsection{% + \nchapter{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}% + }% + }{% + \renewcommand\bibsection{% + \nsection{\bibname\ifx\@mkboth\@gobbletwo\else\markright{\MakeUppercase{\bibname}}\fi}% + }% + }% +}% + +\renewcommand\bibpreamble{% + \renewcommand\@biblabel[1]{##1.}% +} \renewenvironment{thebibliography}[1]{% \bibsection diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 93fe01b055d..f8054ea7afb 100644 --- a/Master/texmf-dist/tex/latex/disser/gost732.cls +++ b/Master/texmf-dist/tex/latex/disser/gost732.cls @@ -11,28 +11,8 @@ %% %% This file is part of the disser package. %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% gost732 -- GOST 7.32-2001 implementation. -%% -%% Copyright (c) 2004-2010 Stanislav Kruchinin -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% This program is distributed in the hope that it will be useful, -%% but WITHOUT ANY WARRANTY; without even the implied warranty of -%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2011/09/11 1.1.8 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2011/11/29 1.1.9 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax @@ -121,6 +101,8 @@ \captionsetup[longtable]{justification=raggedright,singlelinecheck=false} \captionsetup[table]{justification=raggedright,singlelinecheck=false} +\setcitestyle{semicolon} + \renewcommand\postthefootnote{$^)$} \endinput -- cgit v1.2.3