From eadac6a4b811db258d2b4d5dd4dec4fb0551ca4d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Jul 2016 21:39:30 +0000 Subject: disser (5jul16) git-svn-id: svn://tug.org/texlive/trunk@41635 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/disser/gost705.bst | 68 +-- Master/texmf-dist/bibtex/bst/disser/gost705s.bst | 68 +-- Master/texmf-dist/doc/latex/disser/ChangeLog | 24 +- .../texmf-dist/doc/latex/disser/include/latex.mk | 22 +- .../doc/latex/disser/include/latex.nmk.cmd | 12 +- Master/texmf-dist/doc/latex/disser/manual.tex | 64 +-- .../doc/latex/disser/templates-utf8/Makefile | 32 ++ .../doc/latex/disser/templates-utf8/bachelor/1.tex | 152 +++++++ .../latex/disser/templates-utf8/bachelor/Makefile | 21 + .../latex/disser/templates-utf8/bachelor/app-a.tex | 2 + .../latex/disser/templates-utf8/bachelor/concl.tex | 1 + .../disser/templates-utf8/bachelor/fig/Makefile | 1 + .../disser/templates-utf8/bachelor/fig/fig.eps | 490 +++++++++++++++++++++ .../disser/templates-utf8/bachelor/fig/nomake.cmd | 1 + .../latex/disser/templates-utf8/bachelor/intro.tex | 1 + .../disser/templates-utf8/bachelor/nomake.cmd | 35 ++ .../disser/templates-utf8/bachelor/thesis.bib | 173 ++++++++ .../disser/templates-utf8/bachelor/thesis.tex | 130 ++++++ .../latex/disser/templates-utf8/candidate/1.tex | 3 + .../latex/disser/templates-utf8/candidate/Makefile | 30 ++ .../disser/templates-utf8/candidate/app-a.tex | 1 + .../disser/templates-utf8/candidate/autoref.tex | 216 +++++++++ .../disser/templates-utf8/candidate/common.tex | 77 ++++ .../disser/templates-utf8/candidate/concl.tex | 1 + .../latex/disser/templates-utf8/candidate/defs.tex | 9 + .../latex/disser/templates-utf8/candidate/dict.tex | 4 + .../disser/templates-utf8/candidate/fig/Makefile | 1 + .../templates-utf8/candidate/fig/facsimile.eps | 260 +++++++++++ .../disser/templates-utf8/candidate/fig/nomake.cmd | 1 + .../templates-utf8/candidate/fig/sec-facsimile.eps | 260 +++++++++++ .../disser/templates-utf8/candidate/intro.tex | 41 ++ .../disser/templates-utf8/candidate/nomake.cmd | 46 ++ .../disser/templates-utf8/candidate/review.tex | 1 + .../disser/templates-utf8/candidate/thesis.bib | 173 ++++++++ .../disser/templates-utf8/candidate/thesis.tex | 141 ++++++ .../doc/latex/disser/templates-utf8/doctor/1.tex | 3 + .../latex/disser/templates-utf8/doctor/Makefile | 30 ++ .../latex/disser/templates-utf8/doctor/app-a.tex | 1 + .../latex/disser/templates-utf8/doctor/autoref.tex | 213 +++++++++ .../latex/disser/templates-utf8/doctor/common.tex | 72 +++ .../latex/disser/templates-utf8/doctor/concl.tex | 1 + .../latex/disser/templates-utf8/doctor/defs.tex | 9 + .../latex/disser/templates-utf8/doctor/dict.tex | 4 + .../disser/templates-utf8/doctor/fig/Makefile | 1 + .../disser/templates-utf8/doctor/fig/facsimile.eps | 260 +++++++++++ .../disser/templates-utf8/doctor/fig/nomake.cmd | 1 + .../templates-utf8/doctor/fig/sec-facsimile.eps | 260 +++++++++++ .../latex/disser/templates-utf8/doctor/intro.tex | 49 +++ .../latex/disser/templates-utf8/doctor/nomake.cmd | 45 ++ .../latex/disser/templates-utf8/doctor/review.tex | 1 + .../latex/disser/templates-utf8/doctor/thesis.bib | 173 ++++++++ .../latex/disser/templates-utf8/doctor/thesis.tex | 138 ++++++ .../doc/latex/disser/templates-utf8/master/1.tex | 1 + .../latex/disser/templates-utf8/master/Makefile | 21 + .../latex/disser/templates-utf8/master/app-a.tex | 1 + .../latex/disser/templates-utf8/master/concl.tex | 1 + .../disser/templates-utf8/master/fig/Makefile | 1 + .../disser/templates-utf8/master/fig/nomake.cmd | 1 + .../latex/disser/templates-utf8/master/intro.tex | 5 + .../latex/disser/templates-utf8/master/nomake.cmd | 34 ++ .../latex/disser/templates-utf8/master/thesis.bib | 173 ++++++++ .../latex/disser/templates-utf8/master/thesis.tex | 156 +++++++ .../doc/latex/disser/templates-utf8/nomake.cmd | 55 +++ .../latex/disser/templates-utf8/specialist/1.tex | 1 + .../disser/templates-utf8/specialist/Makefile | 21 + .../disser/templates-utf8/specialist/app-a.tex | 1 + .../disser/templates-utf8/specialist/concl.tex | 1 + .../disser/templates-utf8/specialist/fig/Makefile | 1 + .../disser/templates-utf8/specialist/fig/fig.eps | 490 +++++++++++++++++++++ .../templates-utf8/specialist/fig/nomake.cmd | 1 + .../disser/templates-utf8/specialist/intro.tex | 5 + .../disser/templates-utf8/specialist/nomake.cmd | 35 ++ .../disser/templates-utf8/specialist/thesis.bib | 173 ++++++++ .../disser/templates-utf8/specialist/thesis.tex | 136 ++++++ .../texmf-dist/doc/latex/disser/templates/Makefile | 5 +- .../doc/latex/disser/templates/bachelor/Makefile | 13 +- .../doc/latex/disser/templates/bachelor/nomake.cmd | 9 +- .../doc/latex/disser/templates/bachelor/thesis.bib | 36 +- .../doc/latex/disser/templates/bachelor/thesis.tex | 22 +- .../doc/latex/disser/templates/candidate/Makefile | 14 +- .../latex/disser/templates/candidate/autoref.tex | 10 +- .../latex/disser/templates/candidate/nomake.cmd | 23 +- .../latex/disser/templates/candidate/thesis.bib | 66 ++- .../latex/disser/templates/candidate/thesis.tex | 29 +- .../doc/latex/disser/templates/doctor/Makefile | 14 +- .../doc/latex/disser/templates/doctor/autoref.tex | 8 +- .../doc/latex/disser/templates/doctor/nomake.cmd | 8 +- .../doc/latex/disser/templates/doctor/thesis.bib | 66 ++- .../doc/latex/disser/templates/doctor/thesis.tex | 29 +- .../doc/latex/disser/templates/master/Makefile | 13 +- .../doc/latex/disser/templates/master/nomake.cmd | 10 +- .../doc/latex/disser/templates/master/thesis.bib | 95 +++- .../doc/latex/disser/templates/master/thesis.tex | 22 +- .../doc/latex/disser/templates/nomake.cmd | 1 + .../doc/latex/disser/templates/specialist/Makefile | 13 +- .../latex/disser/templates/specialist/nomake.cmd | 9 +- .../latex/disser/templates/specialist/thesis.bib | 194 ++++++-- .../latex/disser/templates/specialist/thesis.tex | 23 +- Master/texmf-dist/source/latex/disser/autoref.dtx | 10 +- Master/texmf-dist/source/latex/disser/bachelor.dtx | 28 +- .../texmf-dist/source/latex/disser/candidate.dtx | 18 +- Master/texmf-dist/source/latex/disser/counters.dtx | 38 +- Master/texmf-dist/source/latex/disser/custom.dtx | 47 +- Master/texmf-dist/source/latex/disser/disser.dtx | 82 ++-- Master/texmf-dist/source/latex/disser/doctor.dtx | 14 +- Master/texmf-dist/source/latex/disser/floats.dtx | 10 +- Master/texmf-dist/source/latex/disser/gost705.dtx | 359 +++++++-------- Master/texmf-dist/source/latex/disser/gost732.dtx | 17 +- Master/texmf-dist/source/latex/disser/lists.dtx | 12 +- Master/texmf-dist/source/latex/disser/master.dtx | 27 +- .../texmf-dist/source/latex/disser/specialist.dtx | 9 +- Master/texmf-dist/tex/latex/disser/bachelor.rtx | 15 +- Master/texmf-dist/tex/latex/disser/candidate.rtx | 18 +- Master/texmf-dist/tex/latex/disser/disser.cls | 40 +- Master/texmf-dist/tex/latex/disser/doctor.rtx | 14 +- Master/texmf-dist/tex/latex/disser/gost732.cls | 2 +- Master/texmf-dist/tex/latex/disser/master.rtx | 9 +- 117 files changed, 5930 insertions(+), 708 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/intro.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/sec-facsimile.eps create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/sec-facsimile.eps create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib create mode 100644 Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst index 3764b36fb69..712ca4f16c0 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst @@ -69,7 +69,7 @@ ENTRY { label } INTEGERS { output.state before.all mid.sentence after.sentence after.block -after.dblslash after.slash after.colon after.semicolon after.dash } +after.dblslash after.slash after.colon after.semicolon } FUNCTION {init.state.consts} { @@ -81,7 +81,6 @@ FUNCTION {init.state.consts} #5 'after.slash := #6 'after.colon := #7 'after.semicolon := - #8 'after.dash := } STRINGS { s t } @@ -106,7 +105,8 @@ FUNCTION {output.nonnull} output.state mid.sentence = { ", " * write$ } { output.state after.block = - { add.period$ " " * write$ + { add.period$ write$ + " \BibDash " write$ newline$ "\newblock " write$ } @@ -120,11 +120,7 @@ FUNCTION {output.nonnull} { ": " * write$ } { output.state after.semicolon = { "; " * write$ } - { output.state after.dash = - { "~--- " * write$ } - { add.period$ " " * write$ } - if$ - } + { add.period$ " " * write$ } if$ } if$ @@ -205,14 +201,6 @@ FUNCTION {new.semicolon} if$ } -FUNCTION {new.dash} -{ - output.state before.all = - 'skip$ - { after.dash 'output.state := } - if$ -} - FUNCTION {new.sentence} { output.state after.block = @@ -664,7 +652,7 @@ FUNCTION {bbl.phdthesis} if$ } -FUNCTION {bbl.docdisser} +FUNCTION {bbl.dscithesis} { curlanguage "english" = { "Dr.\,Sci. dissertation" } @@ -1633,14 +1621,14 @@ FUNCTION {phdthesis} fin.entry } -FUNCTION {docdisser} +FUNCTION {dscithesis} { output.bibitem format.authors "author" output.check new.sentence format.btitle add.doi.url "title" output.check new.colon - bbl.docdisser format.thesis.type output.nonnull + bbl.dscithesis format.thesis.type output.nonnull new.slash school "school" output.check new.block @@ -1729,7 +1717,7 @@ FUNCTION {patent} holder output.nonnull new.semicolon credits output.nonnull - new.dash + new.block reqnumber add.number output new.semicolon format.reqdate output @@ -1943,32 +1931,20 @@ FUNCTION {begin.bib} 'skip$ { preamble$ write$ newline$ } if$ - "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" - write$ newline$ - "\ifx\undefined\href\def\href#1#2{#2}\else\fi" - write$ newline$ - "\ifx\undefined\url\def\url#1{\texttt{#1}}\else\fi" - write$ newline$ - "\ifx\undefined\urlprefix\def\urlprefix{URL: }\else\fi" - write$ newline$ - "\ifx\undefined\BibUrl\def\BibUrl#1{\urlprefix\url{#1}}\else\fi" - write$ newline$ - "\ifx\undefined\BibUrlDate\long\def\BibUrlDate#1{({%" - write$ newline$ - "\cyr\cyrd\cyra\cyrt\cyra\ %" - write$ newline$ - "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}\else\fi" - write$ newline$ - "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi" - write$ newline$ - "\begin{thebibliography}{" longest.label * "}" * - write$ newline$ - "\def\selectlanguageifdefined#1{" - write$ newline$ - "\expandafter\ifx\csname date#1\endcsname\relax" - write$ newline$ - "\else\language\csname l@#1\endcsname\fi}" - write$ newline$ + "\providecommand*\BibEmph[1]{#1}" write$ newline$ + "\providecommand*\BibDash{}" write$ newline$ + "\providecommand*\href[2]{#2}" write$ newline$ + "\providecommand*\url[1]{\texttt{#1}}" write$ newline$ + "\providecommand*\urlprefix{URL: }" write$ newline$ + "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$ + "\providecommand*\BibUrlDate[1]{({%" write$ newline$ + "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$ + "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$ + "\providecommand*\BibAnnote[1]{#1}" write$ newline$ + "\begin{thebibliography}{" longest.label * "}" * write$ newline$ + "\def\selectlanguageifdefined#1{" write$ newline$ + "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$ + "\else\language\csname l@#1\endcsname\fi}" write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst index 69c939513e7..a9a8dbb995d 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst @@ -69,7 +69,7 @@ ENTRY { label } INTEGERS { output.state before.all mid.sentence after.sentence after.block -after.dblslash after.slash after.colon after.semicolon after.dash } +after.dblslash after.slash after.colon after.semicolon } FUNCTION {init.state.consts} { @@ -81,7 +81,6 @@ FUNCTION {init.state.consts} #5 'after.slash := #6 'after.colon := #7 'after.semicolon := - #8 'after.dash := } STRINGS { s t } @@ -106,7 +105,8 @@ FUNCTION {output.nonnull} output.state mid.sentence = { ", " * write$ } { output.state after.block = - { add.period$ " " * write$ + { add.period$ write$ + " \BibDash " write$ newline$ "\newblock " write$ } @@ -120,11 +120,7 @@ FUNCTION {output.nonnull} { ": " * write$ } { output.state after.semicolon = { "; " * write$ } - { output.state after.dash = - { "~--- " * write$ } - { add.period$ " " * write$ } - if$ - } + { add.period$ " " * write$ } if$ } if$ @@ -205,14 +201,6 @@ FUNCTION {new.semicolon} if$ } -FUNCTION {new.dash} -{ - output.state before.all = - 'skip$ - { after.dash 'output.state := } - if$ -} - FUNCTION {new.sentence} { output.state after.block = @@ -664,7 +652,7 @@ FUNCTION {bbl.phdthesis} if$ } -FUNCTION {bbl.docdisser} +FUNCTION {bbl.dscithesis} { curlanguage "english" = { "Dr.\,Sci. dissertation" } @@ -1633,14 +1621,14 @@ FUNCTION {phdthesis} fin.entry } -FUNCTION {docdisser} +FUNCTION {dscithesis} { output.bibitem format.authors "author" output.check new.sentence format.btitle add.doi.url "title" output.check new.colon - bbl.docdisser format.thesis.type output.nonnull + bbl.dscithesis format.thesis.type output.nonnull new.slash school "school" output.check new.block @@ -1729,7 +1717,7 @@ FUNCTION {patent} holder output.nonnull new.semicolon credits output.nonnull - new.dash + new.block reqnumber add.number output new.semicolon format.reqdate output @@ -2046,32 +2034,20 @@ FUNCTION {begin.bib} 'skip$ { preamble$ write$ newline$ } if$ - "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" - write$ newline$ - "\ifx\undefined\href\def\href#1#2{#2}\else\fi" - write$ newline$ - "\ifx\undefined\url\def\url#1{\texttt{#1}}\else\fi" - write$ newline$ - "\ifx\undefined\urlprefix\def\urlprefix{URL: }\else\fi" - write$ newline$ - "\ifx\undefined\BibUrl\def\BibUrl#1{\urlprefix\url{#1}}\else\fi" - write$ newline$ - "\ifx\undefined\BibUrlDate\long\def\BibUrlDate#1{({%" - write$ newline$ - "\cyr\cyrd\cyra\cyrt\cyra\ %" - write$ newline$ - "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}\else\fi" - write$ newline$ - "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi" - write$ newline$ - "\begin{thebibliography}{" longest.label * "}" * - write$ newline$ - "\def\selectlanguageifdefined#1{" - write$ newline$ - "\expandafter\ifx\csname date#1\endcsname\relax" - write$ newline$ - "\else\language\csname l@#1\endcsname\fi}" - write$ newline$ + "\providecommand*\BibEmph[1]{#1}" write$ newline$ + "\providecommand*\BibDash{}" write$ newline$ + "\providecommand*\href[2]{#2}" write$ newline$ + "\providecommand*\url[1]{\texttt{#1}}" write$ newline$ + "\providecommand*\urlprefix{URL: }" write$ newline$ + "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$ + "\providecommand*\BibUrlDate[1]{({%" write$ newline$ + "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$ + "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$ + "\providecommand*\BibAnnote[1]{#1}" write$ newline$ + "\begin{thebibliography}{" longest.label * "}" * write$ newline$ + "\def\selectlanguageifdefined#1{" write$ newline$ + "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$ + "\else\language\csname l@#1\endcsname\fi}" write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog index 2fdaaed42d1..c9b2433b2c8 100644 --- a/Master/texmf-dist/doc/latex/disser/ChangeLog +++ b/Master/texmf-dist/doc/latex/disser/ChangeLog @@ -2,6 +2,26 @@ disser changelog Copyright (C) Stanislav Kruchinin ------------------------------------------- +Summary of changes in version 1.4.0 (2016-07-03): + +Classes and styles: +* Fix compatibility issues with biblatex. +* Fix index entries in documentation. +* Improve compatibility with 'gost' styles. ++ Add check of non-empty \libcatnum. +- Remove the deprecated 'libcat' option. + +Templates: ++ Add new templates with UTF-8 encoding and biblatex support. ++ Add citations to master and specialist templates. +* Use 'biblatex-gost' style in UTF-8 templates. +* Synchronize the bib-files in all templates. +* Enable \libcatnum by default. + +Makefiles: ++ Add Biber support. + + Summary of changes in version 1.3.4 (2016-01-27): Classes and styles: @@ -10,7 +30,7 @@ Classes and styles: Templates: + bachelor: add test for nested enumerated lists. * doctor: update the opponents list. - + Summary of changes in version 1.3.3 (2015-10-18): @@ -33,7 +53,7 @@ Summary of changes in version 1.3.1 (2015-01-03): Classes and styles: * Fix bug due to undefined \@Asbuk in recent 'babel' package. + Package 'natbib' is now optional. -* Use more recent package 'subcaption' for subfigure captions and +* Use more recent package 'subcaption' for subfigure captions and references instead of the obsolete 'subfig'. Templates: diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.mk b/Master/texmf-dist/doc/latex/disser/include/latex.mk index 2d95bbb0b69..feaf55e67a7 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.mk +++ b/Master/texmf-dist/doc/latex/disser/include/latex.mk @@ -32,21 +32,27 @@ PSNUPFLAGS ?= -2 -pA4 PDFLATEXFLAGS ?= --shell-escape --synctex=1 CLEXT ?= *.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \ - *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz + *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf CLFILES ?= $(CLEXT) $(ARCHIVE) SRCFILES ?= * +pdf: $(TARGET).pdf + +pdf_2on1: $(TARGET)_2on1.pdf + +pdf_book: $(TARGET)_book.pdf + dvi: $(TARGET).dvi clean: -rm -f $(CLFILES) .help: - @echo " dvi (default) build DVI" ;\ + @echo " dvi build DVI" ;\ echo " figclean clean output files in figures directory" ;\ echo " html convert DVI to HTML" ;\ - echo " pdf build PDF" ;\ + echo " pdf (default) build PDF" ;\ echo " pdf_2on1 build PDF with two A5 pages on one A4 ordered by number" ;\ echo " pdf_book build PDF booklet (two A5 on A4)" ;\ echo " ps build PS" ;\ @@ -59,12 +65,6 @@ clean: html: $(TARGET).dvi $(L2H) $(L2HFLAGS) $(TARGET).tex -pdf: $(TARGET).pdf - -pdf_2on1: $(TARGET)_2on1.pdf - -pdf_book: $(TARGET)_book.pdf - ps: $(TARGET).ps ps_2on1: $(TARGET)_2on1.ps @@ -79,7 +79,7 @@ srcdist: clean figclean $(TARGET).dvi: *.tex *.bib @$(LATEX) $(TEXFLAGS) $(TARGET).tex ;\ if [ -f $(BIBFILE) ] ; then \ - for f in *.aux; do $(BIBTEX) $(BIBTEXFLAGS) $$f; done ;\ + for f in *.aux; do $(BIBTEX) $(BIBTEXFLAGS) $${f%.*} ; done ;\ else \ echo Warning: Bibliography file does not exist ;\ fi ;\ @@ -99,7 +99,7 @@ $(TARGET)_book.ps: $(TARGET).ps $(TARGET).pdf: *.tex *.bib @$(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex ;\ if [ -f $(BIBFILE) ] ; then \ - for f in *.aux ; do $(BIBTEX) $(BIBTEXFLAGS) $$f ; done ;\ + for f in *.aux ; do $(BIBTEX) $(BIBTEXFLAGS) $${f%.*} ; done ;\ else \ echo "Warning: Bibliography file does not exist" ;\ fi ;\ diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd index fefdb440a16..d19bcc767c4 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd +++ b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd @@ -44,14 +44,14 @@ if "%psnupflags%"=="" set psnupflags=-2 -pA4 if "%pdflatexflags%"=="" set pdflatexflags=--shell-escape --synctex=1 if "%clext%"=="" set clext=*.bbl *.bak *.aux *.blg *.out *.toc *.log ^ - *.dvi *.tmp *.ps *.pdf *.synctex *.synctex.gz + *.dvi *.tmp *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf if "%clfiles%"=="" set clfiles=!clext! %archive% if "%srcfiles%"=="" set srcfiles=* if "%prereq%"=="" set prereq=*.tex *.bib if "%1"=="" ( - call :dvi + call :pdf ) else ( for %%f in (%*) do call :%%f ) @@ -71,7 +71,7 @@ goto :eof ) %latex% %latexflags% %target%.tex if exist %bibfile% ( - for %%f in (*.aux) do %bibtex% %bibtexflags% %%f + for %%f in (*.aux) do %bibtex% %bibtexflags% %%~nf ) else ( echo Warning: Bibliography file does not exist ) @@ -80,10 +80,10 @@ goto :eof goto :eof :help - echo dvi ^(default^) build DVI + echo dvi build DVI echo figclean clean output files in figures directory echo html convert DVI to HTML - echo pdf build PDF + echo pdf ^(default^) build PDF echo pdf_2on1 build PDF with two A5 pages on one A4 ordered by number echo pdf_book build PDF booklet ^(two A5 on A4^) echo ps build PS @@ -112,7 +112,7 @@ goto :eof ) %pdflatex% %pdflatexflags% %target%.tex if exist %bibfile% ( - for %%f in (*.aux) do %bibtex% %bibtexflags% %%f + for %%f in (*.aux) do %bibtex% %bibtexflags% %%~nf ) else ( echo Warning: Bibliography file does not exist ) diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex index 8e5181fd92f..e1f6a63f8b0 100644 --- a/Master/texmf-dist/doc/latex/disser/manual.tex +++ b/Master/texmf-dist/doc/latex/disser/manual.tex @@ -25,17 +25,6 @@ menucolor = darkblue, urlcolor = darkblue } -\IfFileExists{pscyr.sty}{% - \usepackage{pscyr} - \renewcommand\ttdefault{cmtt} - \renewcommand\rmdefault{ftm} -}{ - \IfFileExists{cyrtimes.sty}{% - \renewcommand\ttdefault{cmtt} - \renewcommand\rmdefault{ftm} - }{} -} - \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} @@ -55,7 +44,7 @@ \let\makelabel\deflabel} }{\end{list}} -\def\fileversion{1.3.4} +\def\fileversion{1.4.0} \sloppy \begin{document} @@ -94,7 +83,7 @@ , : \begin{itemize} \item \href{http://protect.gost.ru/document.aspx?control=8&id=171831}{ 7.0.11--2011 << . >>}; -\item \href{http://protect.gost.ru/document.aspx?control=7&id=130946}{~7.32--2001 << - . >>}; +\item \href{http://protect.gost.ru/document.aspx?control=7&id=130946}{ 7.32--2001 << - . >>}; \item \href{http://protect.gost.ru/document.aspx?control=7&id=128845}{ 7.0.4--2006 <<. . >>}; \item \href{http://protect.gost.ru/document.aspx?control=7&id=173511}{ 7.0.5--2008 << . >>}. \end{itemize} @@ -152,20 +141,15 @@ classified & . \\\hline - colorlinks = \{true$\,\vert\,$\textbf{false}\} & - . - \pkg{hyperref}. + colorlinks & + . \pkg{hyperref}. \\\hline facsimile & ( ). . \\\hline - fixint = \{\textbf{true}$\,\vert\,$false\} & - ( - \pkg{euler}). -\\\hline - libcat & - . + fixint & + ( \pkg{euler}). \\\hline substylefile = filename.rtx & ( , , .\,.). @@ -194,9 +178,15 @@ \\\hline\hline \end{longtable} +\section{ } + + . + \file{templates} CP-1251, \BibTeX{}8 \pkg{gost705}, \pkg{natbib} \pkg{multibib}. + \file{templates-utf8} UTF-8, Biber Bib\LaTeX{} \pkg{biblatex-gost}. + \section{ } - : \file{Makefile}, GNU Make, \file{nomake.cmd}, \file{cmd.exe} Windows 2000 . + : \file{Makefile}, GNU Make, \file{nomake.cmd}, \file{cmd.exe} Windows 2000 . (targets). Unix- : \begin{verbatim} @@ -274,11 +264,11 @@ nomake ... \file{templates/<->}} \begin{deflist}{\longestlabel} -\item[dvi] - DVI-. . \item[clean] , . |CLFILES|. +\item[dvi] + DVI-. \item[figclean] \cmd{clean} \file{fig}. \item[help] @@ -287,7 +277,7 @@ nomake ... DVI HTML- . : \href{http://www.latex2html.org/}{\cmd{latex2html}}. \item[pdf] - PDF-. + PDF-. . \item[pdf\_2on1] PDF- A4 . \item[pdf\_book] @@ -299,7 +289,7 @@ nomake ... \item[ps\_book] PostScript- A4 . \item[rtf] - DVI RTF. + DVI RTF. \item[srcdist] . \end{deflist} @@ -409,16 +399,6 @@ nomake ... \item . \end{enumerate} - , \file{thesis.tex} -\begin{verbatim} -\def\BibEmph#1{\emph{#1}} -\end{verbatim} - -\begin{verbatim} -\bibliography{thesis} -\bibliographystyle{gost705} -\end{verbatim} - |language| |russian|. : \begin{verbatim} @@ -476,12 +456,12 @@ latex \subsection{ } - , . - \pkg{multibib}. - + . + \pkg{multibib}, UTF-8 --- Bib\LaTeX{}. \file{thesis.bib} . - . + UTF-8 . + \pkg{multibib} |aux|- , CP-1251 : \begin{verbatim} latex autoref bibtex8 -H -c cp1251 autoref @@ -490,7 +470,7 @@ latex autoref latex autoref \end{verbatim} - : + : \begin{verbatim} nomake all \end{verbatim} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile new file mode 100644 index 00000000000..733d70078f5 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile @@ -0,0 +1,32 @@ +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET ?= thesis +TEXMF ?= /usr/share/texmf +DESTDIR ?= $(TEXMF) +DOCDIR ?= $(DESTDIR)/doc/latex/disser + +dvi clean figclean bmtoeps epstopdf fixbb pdftopng256 pdftotiffg4 ps ps_2on1 pdf pdf_2on1 html srcdist all allpdf: + @$(MAKE) -i -C bachelor $@ + @$(MAKE) -i -C specialist $@ + @$(MAKE) -i -C master $@ + @$(MAKE) -i -C candidate $@ + @$(MAKE) -i -C doctor $@ + +help: + @$(MAKE) -s -C candidate $@ ;\ + echo " install install templates" ;\ + echo " uninstall uninstall templates" ;\ + echo " reinstall reinstall templates" + +install: + cp -rf ../templates $(DOCDIR) ;\ + cp -rf ../templates-utf8 $(DOCDIR) ;\ + cp -rf ../include $(DOCDIR) + +uninstall: + -rm -rf $(DOCDIR) + +reinstall: uninstall install diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex new file mode 100644 index 00000000000..fd4f619bc28 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/1.tex @@ -0,0 +1,152 @@ +\chapter{Название главы} +\section{Название секции} + +Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. +Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$. +Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. Ссылка на формулу~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} + \frac{1}{|\vec r_1 - \vec r_2|} = + 4\pi \int \frac{d^3 q}{(2\pi)^3}\, + \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}. +\end{equation} + +Ссылка на рис.~\ref{f:fig} +\begin{figure}[!ht] + \centering + \includegraphics[width=4cm]{fig} + \caption{\label{f:fig}% + Подпись к рисунку. + } +\end{figure} + +\begin{wrapfigure}{r}{0.35\textwidth} +\centering +\includegraphics[width=4cm]{fig} +\caption{\label{f:ff}% +Рисунок <<в оборку>>. +} +\end{wrapfigure} + +Если разность энергий электронно-дырочных уровней $E_2 - E_1$ близка к энергии продольного оптического фонона $\hbar\Omega_{\mathrm{LO}}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$. +Волновые функции последних представляют собой следующие комбинации вырожденных состояний\footnote{Текст сноски}. + +Ссылка на таблицу~\ref{t:InPSiO2}. +\begin{table}[!ht] + \centering + \caption{Пример таблицы}\label{t:InPSiO2} + \begin{tabular}{l|ccc} + \hline\hline + & \quad$\lambda \cdot 10^{-11}$,~$\text{дин}\cdot\text{см}^{-2}$ + & \quad$\mu \cdot 10^{-11}$,~$\text{дин}\cdot\text{см}^{-2}$ + & \quad$\rho$, $\text{г}\cdot\text{см}^{-3}$ \\ + \hline + InP & 3.82 & 1.69 & 4.14 \\ + SiO$_{2}$ & 1.57 & 3.11 & 2.2 \\ + \hline\hline + \end{tabular} +\end{table} + +\begin{figure}[!ht] + \centering + \begin{minipage}{5cm} + \centering + \includegraphics[width=4cm]{fig} + \caption{Рисунок с отдельным названием} + \end{minipage} + \quad + \begin{minipage}{5cm} + \centering + \includegraphics[width=4cm]{fig} + \caption{Рисунок с отдельным названием} + \end{minipage} + \quad + \begin{minipage}{5cm} + \centering + \includegraphics[width=4cm]{fig} + \caption{Рисунок с отдельным названием} + \end{minipage} +\end{figure} + +\begin{figure}[!ht] + \centering + \begin{minipage}{5cm} + \includegraphics[width=4cm]{fig} + \end{minipage} + \begin{minipage}{5cm} + \includegraphics[width=4cm]{fig} + \end{minipage} + \caption{Рисунки с единым названием} +\end{figure} + +Ссылка на внутренний рисунок (рис.~\ref{f:sub1}). + +\begin{figure}[!ht] +\centering + \begin{minipage}{5cm} + \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub1} + \end{minipage} + \begin{minipage}{5cm} + \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub2} + \end{minipage} + \begin{minipage}{5cm} + \includegraphics[width=4cm]{fig}\subcaption{}\label{f:sub3} + \end{minipage} + \caption[]{% + Рисунки с единым названием и подчиненной нумерацией: + \subref{f:sub1} ссылка 1, + \subref{f:sub2} ссылка 2, + \subref{f:sub3} ссылка 3. + } +\end{figure} + +\subsection{Название подсекции} +Текст подсекции +\subsubsection{Название под-подсекции} +Текст под-подсекции +\paragraph{Название параграфа.} +Текст параграфа +\subparagraph{Название подпараграфа.} +Текст подпараграфа + +Нумеруемый список: +\begin{enumerate} + \item Первый уровень вложенности. + \begin{enumerate} + \item Второй уровень вложенности. + \begin{enumerate} + \item Третий уровень вложенности. + \end{enumerate} + \end{enumerate} +\end{enumerate} + +Демонстрация полностью настраиваемых окружений типа <<теорема>>. + +\newtheorem{theorem}{Теорема}[chapter] +\def\theoremstyle{} +\def\postthetheorem{:} + +\newtheorem{lemm}{Лемма}[chapter] +\def\thelemmstyle{\bfseries} +\def\oparglemmstyle{} +\def\lemmstyle{} +\def\preoparglemm{(} +\def\postoparglemm{):} + +\newtheorem{remark}{Примечание}[chapter] +\def\remarkstyle{\itshape} +\def\theremarkstyle{} +\def\posttheremark{:} + +\begin{lemm}[Шура] +Квадратная матрица, коммутирующая со всеми матрицами неприводимого представления, кратна единичной. +\end{lemm} + +\begin{theorem} +Гомоморфный образ группы изоморфен фактор-группе по ядру гомоморфизма. +\end{theorem} + +\begin{remark} +Текст примечания. +\end{remark} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile new file mode 100644 index 00000000000..ef775e6d4f7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/Makefile @@ -0,0 +1,21 @@ +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET ?= thesis +BIBTEX := biber +BIBTEXFLAGS := + +include ../../include/latex.mk + +all: pdf + +allpdf: pdf + +alldvi: dvi + +help: .help + @echo " all alias for pdf target" ;\ + echo " allpdf alias for pdf target" ;\ + echo " alldvi alias for dvi target" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex new file mode 100644 index 00000000000..791bc0e8453 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex @@ -0,0 +1,2 @@ +\appendix +\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex new file mode 100644 index 00000000000..cd60e4f2708 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/concl.tex @@ -0,0 +1 @@ +\conclusion diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile new file mode 100644 index 00000000000..775b7fc3d88 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/Makefile @@ -0,0 +1 @@ +include ../../../include/latex.fig.mk \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps new file mode 100644 index 00000000000..9382ce4351e --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/fig/fig.eps @@ -0,0 +1,490 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%BoundingBox: 235 371 361 470 +%%HiResBoundingBox: 236 371.521 360.901 469.38 +%................................. +%%Creator: MiKTeX GPL Ghostscript 860 (epswrite) +%%CreationDate: 2007/12/07 10:10:05 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%EndComments +%%BeginProlog +% This copyright applies to everything between here and the %%EndProlog: +% Copyright (C) 2007 Artifex Software, Inc. All rights reserved. +%%BeginResource: procset GS_epswrite_2_0_1001 1.001 0 +/GS_epswrite_2_0_1001 80 dict dup begin +/PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch +4 index eq and{ pop pop pop}{ PageSize dup 1 +5 -1 roll put 0 4 -1 roll put dup null eq {false} {dup where} ifelse{ exch get exec} +{ pop/setpagedevice where +{ pop 1 dict dup /PageSize PageSize put setpagedevice} +{ /setpage where{ pop PageSize aload pop pageparams 3 {exch pop} repeat +setpage}if}ifelse}ifelse}ifelse} bind def +/!{bind def}bind def/#{load def}!/N/counttomark # +/rG{3{3 -1 roll 255 div}repeat setrgbcolor}!/G{255 div setgray}!/K{0 G}! +/r6{dup 3 -1 roll rG}!/r5{dup 3 1 roll rG}!/r3{dup rG}! +/w/setlinewidth #/J/setlinecap # +/j/setlinejoin #/M/setmiterlimit #/d/setdash #/i/setflat # +/m/moveto #/l/lineto #/c/rcurveto # +/p{N 2 idiv{N -2 roll rlineto}repeat}! +/P{N 0 gt{N -2 roll moveto p}if}! +/h{p closepath}!/H{P closepath}! +/lx{0 rlineto}!/ly{0 exch rlineto}!/v{0 0 6 2 roll c}!/y{2 copy c}! +/re{4 -2 roll m exch dup lx exch ly neg lx h}! +/^{3 index neg 3 index neg}! +/f{P fill}!/f*{P eofill}!/s{H stroke}!/S{P stroke}! +/q/gsave #/Q/grestore #/rf{re fill}! +/Y{P clip newpath}!/Y*{P eoclip newpath}!/rY{re Y}! +/|={pop exch 4 1 roll 1 array astore cvx 3 array astore cvx exch 1 index def exec}! +/|{exch string readstring |=}! +/+{dup type/nametype eq{2 index 7 add -3 bitshift 2 index mul}if}! +/@/currentfile #/${+ @ |}! +/B{{2 copy string{readstring pop}aload pop 4 array astore cvx +3 1 roll}repeat pop pop true}! +/Ix{[1 0 0 1 11 -2 roll exch neg exch neg]exch}! +/,{true exch Ix imagemask}!/If{false exch Ix imagemask}!/I{exch Ix image}! +/Ic{exch Ix false 3 colorimage}! +/F{/Columns counttomark 3 add -2 roll/Rows exch/K -1/BlackIs1 true>> +/CCITTFaxDecode filter}!/FX{< + +chcp 1251 > nul +set bibtex=biber +set bibtexflags= +set latexnmk=call ..\..\include\latex.nmk.cmd + +if "%1"=="" ( + %latexnmk% +) else ( + for %%f in (%*) do if "%%f"=="help" ( + call :%%f + ) else if "%%f"=="all" ( + %latexnmk% pdf + ) else if "%%f"=="allpdf" ( + %latexnmk% pdf + ) else if "%%f"=="alldvi" ( + %latexnmk% dvi + ) else ( + %latexnmk% %%f + ) +) + +exit /b + +:help + echo all alias for pdf target + echo allpdf alias for pdf target + echo alldvi alias for dvi target + %latexnmk% help +goto :eof + diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib new file mode 100644 index 00000000000..ea2e0c361fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib @@ -0,0 +1,173 @@ +@ARTICLE{Ivanov_1999_Journal_17_173, + author = {И. И. Иванов and П. П. Петров and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {17}, + pages = {173--180}, + year = {1999}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Petrov_2001_Journal_23_12321, + author = {П. П. Петров and И. И. Иванов and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {23}, + pages = {12321--12328}, + year = {2001}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Sidorov_2002_Journal_32_1531, + author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov}, + title = {Article Title}, + journal = {Journal Name}, + volume = {32}, + pages = {1531--1540}, + year = {2002}, + keywords = {own}, +} + +@ARTICLE{Yoffe_1993_AP_42_173, + author = {A. D. Yoffe}, + title = {Low-dimensional systems: quantum size effects and electronic + properties of semiconductor microcrystallites (zero-dimensional + systems) and some quasi-two-dimensional systems}, + journal = {Adv. Phys.}, + pages = {173--266}, + volume = {42}, + year = {1993}, + doi = {10.1080/00018739300101484}, +} + +@ARTICLE{Efros_1982_FTP_16_7_1209, + author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос}, + title = {Межзонное поглощение света в полупроводниковом шаре}, + journal = {Физика и техника полупроводников}, + year = {1982}, + volume = {16}, + number = {7}, + pages = {1209--1214}, + language = {russian}, +} + +@BOOK{Anselm_1978, + author = {А. И. Ансельм}, + title = {Введение в теорию полупроводников}, + publisher = {Наука}, + address = {Москва}, + year = {1978}, + language = {russian}, +} + +@INPROCEEDINGS{Segall_1968, + author = {B. Segall}, + year = {1968}, + editor = {S. M. Ryvkin}, + booktitle = {Proceedings of IXth Conference on the Physics of + Semiconductors, Moscow, 1968}, + pages = {425}, + address = {Leningrad}, + publisher = {Nauka}, +} + +@INBOOK{Agranovich_1983, + editor = {V. M. Agranovich and R. M. Hochstrasser}, + title = {Spectroscopy and Excitation Dynamics of Condensed Molecular + Systems}, + chapter = {6}, + publisher = {North-Holland}, + year = {1983}, + series = {Modern Problems in Condensed Matter Sciences}, + address = {Amsterdam}, + isbn = {0444863133}, +} + +@INCOLLECTION{InP, + title = {{\relax InP} Basic Parameters at 300 K}, + booktitle = {Electronic archive New Semiconductor Materials. + Characteristics and Properties}, + organization = {Ioffe Physico-Technical Institute}, + address = {St. Petersburg}, + year = {2001}, + url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, + urldate = {01.11.2009}, +} + +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. канд. физ.-мат. наук}, + year = {1996}, + language = {russian}, +} + +@DSCITHESIS{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. д-ра физ.-мат. наук}, + year = {2008}, + language = {russian}, +} + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {Э. В. Тернер}, + authortype = {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, +} + +@PATENT{patent2, + author = {В. И. Чугаева}, + authortype = {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex new file mode 100644 index 00000000000..b8f40840826 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex @@ -0,0 +1,130 @@ +\documentclass[% +bachelor, % тип документа +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок +colorlinks, % цветные гиперссылки +%times, % шрифт Times как основной +%fixint, % включить прямые знаки интегралов +]{disser} + +\usepackage[ + a4paper, mag=1000, + left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm +]{geometry} +\usepackage[T2A]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english,russian]{babel} +\ifpdf\usepackage{epstopdf}\fi + +\usepackage[style=gost-numeric, + backend=biber, + language=auto, + hyperref=auto, + autolang=other, + sorting=none +]{biblatex} + +\addbibresource{thesis.bib} + +% Плавающие рисунки "в оборку". +\usepackage{wrapfig} + +% Номера страниц снизу и по центру +%\pagestyle{footcenter} +%\chapterpagestyle{footcenter} + +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + +% Использовать полужирное начертание для векторов +\let\vec=\mathbf + +% Включать подсекции в оглавление +\setcounter{tocdepth}{2} + +\graphicspath{{fig/}} + +\begin{document} + +% Переопределение стандартных заголовков +%\def\contentsname{Содержание} +%\def\conclusionname{Выводы} +%\def\bibname{Литература} + +\institution{Название организации} + +% Имя лица, допускающего к защите (зав. кафедрой) +\apname{ФИО зав. кафедрой} + +\title{ВЫПУСКНАЯ РАБОТА\\БАКАЛАВРА} + +\topic{Тема работы} + +% Автор +\author{ФИО студента} % ФИО +\group{1111/1} % Группа +\coursenum{111111} % Номер специальности +\course{Физика} % Название специальности + +% Научный руководитель +\sa {ФИО руководителя} +\sastatus{д.~ф.-м.~н., ст.~н.~с.} + +% Город и год +\city{Санкт-Петербург} +\date{\number\year} + +\maketitle + +%% +%% Titlepage in English +%% +% +%\institution{Name of Organization} +% +%% Approved by +%\apname{Professor S.\,S.~Sidorov} +% +%\title{Bachelor's Thesis} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} % Full Name +%\course{Physics} % Название специальности +% +%\group{} % Study Group +% +%% Scientific Advisor +%\sa {I.\,I.~Ivanov} +%\sastatus {Professor} +% +%% Reviewer +%\rev {P.\,P.~Petrov} +%\revstatus{Associate Professor} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + +% Содержание +\tableofcontents + +% Введение +\input{intro} + +% Глава 1 +\input{1} +% Глава 2 +%\input{2} + +% Заключение +\input{concl} + +% Список литературы +\printbibliography[heading=bibintoc] + +\end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex new file mode 100644 index 00000000000..a7f621e9c69 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex @@ -0,0 +1,3 @@ +\chapter{Название главы} +\section{Название секции} +\section{Выводы к первой главе} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile new file mode 100644 index 00000000000..f74054616ea --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/Makefile @@ -0,0 +1,30 @@ +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET ?= thesis +BIBTEX := biber +BIBTEXFLAGS := + +include ../../include/latex.mk + +all: + @env TARGET=thesis $(MAKE) ;\ + env TARGET=autoref $(MAKE) ;\ + eval unset TARGET + +allpdf: + @env TARGET=thesis $(MAKE) pdf ;\ + env TARGET=autoref $(MAKE) pdf ;\ + eval unset TARGET + +alldvi: + @env TARGET=thesis $(MAKE) dvi ;\ + env TARGET=autoref $(MAKE) dvi ;\ + eval unset TARGET + +help: .help + @echo " all build PDF of autoref and thesis" ;\ + echo " allpdf build PDF of autoref and thesis" ;\ + echo " alldvi build DVI of autoref and thesis" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex new file mode 100644 index 00000000000..362b35263b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex @@ -0,0 +1 @@ +\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex new file mode 100644 index 00000000000..a5213b86373 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex @@ -0,0 +1,216 @@ +\documentclass[% +autoref, % тип документа +href, % использовать пакет hyperref для создания гиперссылок +facsimile, % отображать факсимиле диссертанта и ученого секретаря +colorlinks, % цветные гиперссылки +%fixint, % отключить прямые знаки интегралов +%times, % шрифт Times как основной +%classified, % гриф секретности +]{disser} + +\usepackage[ + a4paper, mag=1000, + left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm +]{geometry} +\usepackage[T2A]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english,russian]{babel} +\usepackage{tabularx} +\ifpdf\usepackage{epstopdf}\fi + +\usepackage[style=gost-numeric, + backend=biber, + language=auto, + hyperref=auto, + autolang=other, + defernumbers, + sorting=none +]{biblatex} + +\addbibresource{thesis.bib} + +% Номера страниц снизу и по центру +%\pagestyle{footcenter} +%\chapterpagestyle{footcenter} + +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + +% Путь к файлам с иллюстрациями +\graphicspath{{fig/}} + +\begin{document} +% Включение файла с общим текстом диссертации и автореферата +% (текст титульного листа и характеристика работы). +\input{common} + +% номер копии для грифа секретности +%\copynum{1} +% класс доступа +%\classlabel{Для служебного пользования} + +\title{АВТОРЕФЕРАТ\\ +диссертации на соискание ученой степени\\ +кандидата физико-математических наук} + +\maketitle + +% Внутренняя сторона обложки +\thispagestyle{empty} +\vspace*{-2cm} +\noindent +\begin{center} +Работа выполнена в \emph{название организации}. +\end{center} +\vskip1ex +\begin{tabularx}{\linewidth}{lp{1cm}X} +Научный руководитель: & & \emph{ученая степень}, \\ + & & \emph{ученое звание}, \\ + & & \emph{фамилия имя отчество} +\\ +Официальные оппоненты: & & \emph{ученая степень}, \\ + & & \emph{ученое звание}, \\ + & & \emph{фамилия имя отчество}\\ + & & \emph{ученая степень}, \\ + & & \emph{ученое звание}, \\ + & & \emph{фамилия имя отчество} +\\ +Ведущая организация: & & \emph{название организации}\\ +\end{tabularx} + +\vskip2ex\noindent +Защита состоится \datefield{} в \rule[0pt]{1cm}{0.5pt} часов +на заседании диссертационного совета \emph{шифр совета} при \emph{название +организации, при которой создан совет}, расположенном по адресу: +\emph{адрес} + +\vskip1ex\noindent +С диссертацией можно ознакомиться в библиотеке +\emph{название организации}. + +\vskip1ex\noindent +Автореферат разослан \datefield{} + +\vskip2ex\noindent +Отзывы и замечания по автореферату в двух экземплярах, заверенные +печатью, просьба высылать по вышеуказанному адресу на имя ученого секретаря +диссертационного совета. + +\vfill\noindent +\begin{minipage}[b]{0.4\linewidth} + Ученый секретарь\\ + диссертационного совета,\\ + \emph{ученая степень}, \emph{ученое звание} +\end{minipage} +\hfill +% вставка файла, содержащего факсимиле ученого секретаря +\makeatletter +\ifDis@facsimile + \includegraphics[width=3cm]{sec-facsimile}\hfill +\fi% +\makeatother% +\emph{фамилия и. о.} + +\clearpage + +\nsection{Общая характеристика работы} + +% Актуальность работы +\actualitysection +\actualitytext + +% Степень разработанности темы исследования +\developmentsection +\developmenttext + +% Цели и задачи диссертационной работы +\objectivesection +\objectivetext + +% Научная новизна +\noveltysection +\noveltytext + +% Теоретическая и практическая значимость +\valuesection +\valuetext + +% Методология и методы исследования +\methodssection +\methodstext + +% Положения, выносимые на защиту +\resultssection +\resultstext + +% Степень достоверности и апробация результатов +\approbationsection +\approbationtext + +% Публикации +\pubsection +\pubtext + +% Личный вклад автора +\contribsection +\contribtext + +% Структура и объем диссертации +\structsection +\structtext + +\nsection{Содержание работы} + +\textbf{Во Введении} обоснована актуальность диссертационной работы, сформулирована цель и аргументирована научная новизна исследований, показана практическая значимость полученных результатов, представлены выносимые на защиту научные положения. + +\textbf{В первой главе} ... + +Содержание первой главы. + +Результаты первой главы опубликованы в работе~\cite{Ivanov_1999_Journal_17_173}. + +\textbf{Во второй главе} ... + +Содержание второй главы. + +Результаты второй главы опубликованы в работе~\cite{Petrov_2001_Journal_23_12321}. + +\textbf{В третьей главе} ... + +Содержание третьей главы. + +Результаты третьей главы опубликованы в работе~\cite{Sidorov_2002_Journal_32_1531}. + +\textbf{В Заключении} + +% ---------------------------------------------------------------- +\printbibliography[keyword=own,title={Основные публикации по теме диссертации}] +\printbibliography[notkeyword=own,title={Цитированная литература}] + +% ---------------------------------------------------------------- +% Выходные данные +\clearpage +\thispagestyle{empty} +\normalfont\selectfont +\vspace*{2cm} +\begin{center} +\textit{Научное издание}\\ +\vskip 2cm +\makeatletter +\@author +\vskip 1.5cm +\@title{} на тему:\\ +\@topic\\ +\makeatother +\end{center} +\vfill +Подписано в печать~25.01.2011. +Формат~$60 \times 90$~1/16. +Тираж~100~экз. +Заказ~256.\\[2ex] +\noindent +Санкт-Петербургская издательская фирма <<Наука>> РАН. +199034, Санкт-Петербург, Менделеевская линия, 1, +\href{http://www.naukaspb.spb.ru}{http://www.naukaspb.spb.ru} + +\end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex new file mode 100644 index 00000000000..8fcc9a5f508 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/common.tex @@ -0,0 +1,77 @@ +% Общие поля титульного листа диссертации и автореферата +\institution{Название организации} + +\topic{Тема диссертации} + +\author{ФИО автора} + +\specnum{01.04.05} +\spec{Оптика} +%\specsndnum{01.04.07} +%\specsnd{Физика конденсированного состояния} + +\sa{ФИО руководителя} +\sastatus{д.~ф.-м.~н., проф.} +%\sasnd{ФИО второго руководителя} +%\sasndstatus{к.~ф.-м.~н., проф.} + +%\scon{ФИО консультанта} +%\sconstatus{д.~ф.-м.~н., проф.} +%\sconsnd{ФИО второго консультанта} +%\sconsndstatus{д.~ф.-м.~н., проф.} + +\city{Санкт-Петербург} +\date{\number\year} + +% Общие разделы автореферата и диссертации +\mkcommonsect{actuality}{Актуальность темы исследования.}{% +Текст об актуальности. Ссылка~\cite{Yoffe_1993_AP_42_173}. +} + +\mkcommonsect{development}{Степень разработанности темы исследования.}{ +Текст о степени разработанности темы. +} + +\mkcommonsect{objective}{Цели и задачи диссертационной работы:}{% +Список целей. + +Для достижения поставленных целей были решены следующие задачи: +} + +\mkcommonsect{novelty}{Научная новизна.}{% +Текст о новизне. +} + +\mkcommonsect{value}{Теоретическая и практическая значимость.}{% +Результаты, изложенные в диссертации, могут быть использованы для ... +} + +\mkcommonsect{methods}{Методология и методы исследования.}{% +Текст о методах исследования. +} + +\mkcommonsect{results}{Положения, выносимые на защиту:}{% +Текст о положениях и результатах. +} + +\mkcommonsect{approbation}{Степень достоверности и апробация результатов.}{% +Основные результаты диссертации докладывались на следующих конференциях: +} + +\mkcommonsect{pub}{Публикации.}{% +Материалы диссертации опубликованы в $N$ печатных работах, из них $n_1$ +статей в рецензируемых журналах~\cite{Ivanov_1999_Journal_17_173, +Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ статей в +сборниках трудов конференций и $n_3$ тезисов докладов. +} + +\mkcommonsect{contrib}{Личный вклад автора.}{% +Содержание диссертации и основные положения, выносимые на защиту, отражают персональный вклад автора в опубликованные работы. +Подготовка к публикации полученных результатов проводилась совместно с соавторами, причем вклад диссертанта был определяющим. Все представленные в диссертации результаты получены лично автором. +} + +\mkcommonsect{struct}{Структура и объем диссертации.}{% +Диссертация состоит из введения, обзора литературы, $n$ глав, заключения и библиографии. +Общий объем диссертации $P$ страниц, из них $p_1$ страницы текста, включая $f$ рисунков. +Библиография включает $B$ наименований на $p_2$ страницах. +} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex new file mode 100644 index 00000000000..cd60e4f2708 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/concl.tex @@ -0,0 +1 @@ +\conclusion diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex new file mode 100644 index 00000000000..827832111b1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex @@ -0,0 +1,9 @@ +% Список сокращений и условных обозначений +\defs + +\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}} +$\vec A$ & --- & векторный потенциал\\ +$I$ & --- & интенсивность света\\ +$j_l$ & --- & сферическая функция Бесселя первого рода\\ +$Y_{lm}$ & --- & сферическая гармоника\\ +\end{longtable} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex new file mode 100644 index 00000000000..3a55f5b54c2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/dict.tex @@ -0,0 +1,4 @@ +% Словарь терминов +\dict + +\textbf{Термин} "--- определение. diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile new file mode 100644 index 00000000000..775b7fc3d88 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/Makefile @@ -0,0 +1 @@ +include ../../../include/latex.fig.mk \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps new file mode 100644 index 00000000000..9a944f547aa --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/fig/facsimile.eps @@ -0,0 +1,260 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%BoundingBox: 7 14 78 29 +%%HiResBoundingBox: 7.818750 14.902032 77.220003 28.578282 +%........................................... +%%Creator: GPL Ghostscript 815 (epswrite) +%%CreationDate: 2008/12/01 04:15:45 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%EndComments +%%BeginProlog +% This copyright applies to everything between here and the %%EndProlog: +% Copyright (C) 2004 artofcode LLC, Benicia, CA. All rights reserved. +%%BeginResource: procset GS_epswrite_2_0_1001 +/GS_epswrite_2_0_1001 80 dict dup begin +/PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch +4 index eq and{ pop pop pop}{ PageSize dup 1 +5 -1 roll put 0 4 -1 roll put dup null eq {false} {dup where} ifelse{ exch get exec} +{ pop/setpagedevice where +{ pop 1 dict dup /PageSize PageSize put setpagedevice} +{ /setpage where{ pop PageSize aload pop pageparams 3 {exch pop} repeat +setpage}if}ifelse}ifelse}ifelse} bind def +/!{bind def}bind def/#{load def}!/N/counttomark # +/rG{3{3 -1 roll 255 div}repeat setrgbcolor}!/G{255 div setgray}!/K{0 G}! +/r6{dup 3 -1 roll rG}!/r5{dup 3 1 roll rG}!/r3{dup rG}! +/w/setlinewidth #/J/setlinecap # +/j/setlinejoin #/M/setmiterlimit #/d/setdash #/i/setflat # +/m/moveto #/l/lineto #/c/rcurveto # +/p{N 2 idiv{N -2 roll rlineto}repeat}! +/P{N 0 gt{N -2 roll moveto p}if}! +/h{p closepath}!/H{P closepath}! +/lx{0 rlineto}!/ly{0 exch rlineto}!/v{0 0 6 2 roll c}!/y{2 copy c}! +/re{4 -2 roll m exch dup lx exch ly neg lx h}! +/^{3 index neg 3 index neg}! +/f{P fill}!/f*{P eofill}!/s{H stroke}!/S{P stroke}! +/q/gsave #/Q/grestore #/rf{re fill}! +/Y{P clip newpath}!/Y*{P eoclip newpath}!/rY{re Y}! +/|={pop exch 4 1 roll 1 array astore cvx 3 array astore cvx exch 1 index def exec}! +/|{exch string readstring |=}! +/+{dup type/nametype eq{2 index 7 add -3 bitshift 2 index mul}if}! +/@/currentfile #/${+ @ |}! +/B{{2 copy string{readstring pop}aload pop 4 array astore cvx +3 1 roll}repeat pop pop true}! +/Ix{[1 0 0 1 11 -2 roll exch neg exch neg]exch}! +/,{true exch Ix imagemask}!/If{false exch Ix imagemask}!/I{exch Ix image}! +/Ic{exch Ix false 3 colorimage}! +/F{/Columns counttomark 3 add -2 roll/Rows exch/K -1/BlackIs1 true>> +/CCITTFaxDecode filter}!/FX{<> +/CCITTFaxDecode filter}!/FX{< + +chcp 1251 > nul +set bibtex=biber +set bibtexflags= +set latexnmk=call ..\..\include\latex.nmk.cmd + +if "%1"=="" ( + %latexnmk% +) else ( + for %%f in (%*) do if "%%f"=="help" ( + call :%%f + ) else if "%%f"=="all" ( + call :allpdf + ) else if "%%f"=="allpdf" ( + call :%%f + ) else if "%%f"=="alldvi" ( + call :%%f + ) else ( + %latexnmk% %%f + ) +) + +exit /b + +:help + echo all build PDF of autoref and thesis + echo allpdf build PDF of autoref and thesis + echo alldvi build DVI of autoref and thesis + %latexnmk% help +goto :eof + +:allpdf + set target=thesis & %latexnmk% pdf + set target=autoref & %latexnmk% pdf + set target= +goto :eof + +:alldvi + set target=thesis & %latexnmk% dvi + set target=autoref & %latexnmk% dvi + set target= +goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex new file mode 100644 index 00000000000..59a92856e0d --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/review.tex @@ -0,0 +1 @@ +\review diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib new file mode 100644 index 00000000000..ea2e0c361fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib @@ -0,0 +1,173 @@ +@ARTICLE{Ivanov_1999_Journal_17_173, + author = {И. И. Иванов and П. П. Петров and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {17}, + pages = {173--180}, + year = {1999}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Petrov_2001_Journal_23_12321, + author = {П. П. Петров and И. И. Иванов and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {23}, + pages = {12321--12328}, + year = {2001}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Sidorov_2002_Journal_32_1531, + author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov}, + title = {Article Title}, + journal = {Journal Name}, + volume = {32}, + pages = {1531--1540}, + year = {2002}, + keywords = {own}, +} + +@ARTICLE{Yoffe_1993_AP_42_173, + author = {A. D. Yoffe}, + title = {Low-dimensional systems: quantum size effects and electronic + properties of semiconductor microcrystallites (zero-dimensional + systems) and some quasi-two-dimensional systems}, + journal = {Adv. Phys.}, + pages = {173--266}, + volume = {42}, + year = {1993}, + doi = {10.1080/00018739300101484}, +} + +@ARTICLE{Efros_1982_FTP_16_7_1209, + author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос}, + title = {Межзонное поглощение света в полупроводниковом шаре}, + journal = {Физика и техника полупроводников}, + year = {1982}, + volume = {16}, + number = {7}, + pages = {1209--1214}, + language = {russian}, +} + +@BOOK{Anselm_1978, + author = {А. И. Ансельм}, + title = {Введение в теорию полупроводников}, + publisher = {Наука}, + address = {Москва}, + year = {1978}, + language = {russian}, +} + +@INPROCEEDINGS{Segall_1968, + author = {B. Segall}, + year = {1968}, + editor = {S. M. Ryvkin}, + booktitle = {Proceedings of IXth Conference on the Physics of + Semiconductors, Moscow, 1968}, + pages = {425}, + address = {Leningrad}, + publisher = {Nauka}, +} + +@INBOOK{Agranovich_1983, + editor = {V. M. Agranovich and R. M. Hochstrasser}, + title = {Spectroscopy and Excitation Dynamics of Condensed Molecular + Systems}, + chapter = {6}, + publisher = {North-Holland}, + year = {1983}, + series = {Modern Problems in Condensed Matter Sciences}, + address = {Amsterdam}, + isbn = {0444863133}, +} + +@INCOLLECTION{InP, + title = {{\relax InP} Basic Parameters at 300 K}, + booktitle = {Electronic archive New Semiconductor Materials. + Characteristics and Properties}, + organization = {Ioffe Physico-Technical Institute}, + address = {St. Petersburg}, + year = {2001}, + url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, + urldate = {01.11.2009}, +} + +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. канд. физ.-мат. наук}, + year = {1996}, + language = {russian}, +} + +@DSCITHESIS{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. д-ра физ.-мат. наук}, + year = {2008}, + language = {russian}, +} + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {Э. В. Тернер}, + authortype = {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, +} + +@PATENT{patent2, + author = {В. И. Чугаева}, + authortype = {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex new file mode 100644 index 00000000000..7b10e3716e3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex @@ -0,0 +1,141 @@ +\documentclass[% +candidate, % тип документа +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок +colorlinks, % цветные гиперссылки +%times, % шрифт Times как основной +%fixint, % включить прямые знаки интегралов +%classified, % гриф секретности +%facsimile, % отображать факсимиле диссертанта +]{disser} + +\usepackage[ + a4paper, mag=1000, + left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm +]{geometry} +\usepackage[T2A]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english,russian]{babel} +\ifpdf\usepackage{epstopdf}\fi + +\usepackage[style=gost-numeric, + backend=biber, + language=auto, + hyperref=auto, + autolang=other, + sorting=none +]{biblatex} + +\addbibresource{thesis.bib} + +% Номера страниц снизу и по центру +%\pagestyle{footcenter} +%\chapterpagestyle{footcenter} + +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + +% Ссылки на работы соискателя включаются в общий список литературы +\let\citemy=\cite + +% Использовать полужирное начертание для векторов +\let\vec=\mathbf + +% Путь к файлам с иллюстрациями +\graphicspath{{fig/}} + +\begin{document} + +% Переопределение стандартных заголовков +%\def\contentsname{Содержание} +%\def\conclusionname{Выводы} +%\def\bibname{Литература} + +% Включение файла с общим текстом диссертации и автореферата +% (текст титульного листа и характеристика работы). +\input{common} + +% номер копии для грифа секретности +%\copynum{1} +% класс доступа +%\classlabel{Для служебного пользования} + +% номер УДК +\libcatnum{12345} + +\title{ДИССЕРТАЦИЯ\\ +на соискание ученой степени\\ +кандидата физико-математических наук} + +\maketitle + +%% +%% Titlepage in English +%% +% +%\institution{Name of Organization} +% +%\title{PhD Thesis} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} +% +%\specnum{01.04.05} +%\spec{Optics} +% +%%\specsndnum{01.04.07} +%%\specsnd{Condensed matter physics} +% +%\sa{I.\,I.~Ivanov} +%\sastatus{Professor} +%%\sasnd{P.\,P.~Petrov} +%%\sasndstatus{Professor} +% +%% Scientific consultant +%%\scon{B.\,B.~Baranov} +%%\sconstatus{Professor} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + +% Содержание +\tableofcontents + +% Введение +\input{intro} + +% Обзор литературы +%\input{review} + +% Основная часть +%% Глава 1 +\input{1} +%% Глава 2 +%\input{2} + +% Заключение +\input{concl} + +% Список сокращений и условных обозначений +%\input{defs} + +% Словарь терминов +%\input{dict} + +% Список литературы +\printbibliography[heading=bibintoc] + +% Список иллюстративного материала +%\listoffigures + +% Приложения +%\appendix +%\input{app-a} + +\end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex new file mode 100644 index 00000000000..a7f621e9c69 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex @@ -0,0 +1,3 @@ +\chapter{Название главы} +\section{Название секции} +\section{Выводы к первой главе} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile new file mode 100644 index 00000000000..f74054616ea --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/Makefile @@ -0,0 +1,30 @@ +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET ?= thesis +BIBTEX := biber +BIBTEXFLAGS := + +include ../../include/latex.mk + +all: + @env TARGET=thesis $(MAKE) ;\ + env TARGET=autoref $(MAKE) ;\ + eval unset TARGET + +allpdf: + @env TARGET=thesis $(MAKE) pdf ;\ + env TARGET=autoref $(MAKE) pdf ;\ + eval unset TARGET + +alldvi: + @env TARGET=thesis $(MAKE) dvi ;\ + env TARGET=autoref $(MAKE) dvi ;\ + eval unset TARGET + +help: .help + @echo " all build PDF of autoref and thesis" ;\ + echo " allpdf build PDF of autoref and thesis" ;\ + echo " alldvi build DVI of autoref and thesis" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex new file mode 100644 index 00000000000..362b35263b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex @@ -0,0 +1 @@ +\chapter{Название приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex new file mode 100644 index 00000000000..22230031108 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex @@ -0,0 +1,213 @@ +\documentclass[% +autoref, % тип документа +href, % использовать пакет hyperref для создания гиперссылок +facsimile, % отображать факсимиле диссертанта и ученого секретаря +colorlinks, % цветные гиперссылки +%fixint, % отключить прямые знаки интегралов +%times, % шрифт Times как основной +%classified, % гриф секретности +]{disser} + +\usepackage[ + a4paper, mag=1000, + left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm +]{geometry} +\usepackage[T2A]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english,russian]{babel} +\usepackage{tabularx} +\ifpdf\usepackage{epstopdf}\fi + +\usepackage[style=gost-numeric, + backend=biber, + language=auto, + hyperref=auto, + autolang=other, + defernumbers, + sorting=none +]{biblatex} + +\addbibresource{thesis.bib} + +% Номера страниц снизу и по центру +%\pagestyle{footcenter} +%\chapterpagestyle{footcenter} + +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + +% Путь к файлам с иллюстрациями +\graphicspath{{fig/}} + +\begin{document} +% Включение файла с общим текстом диссертации и автореферата +% (текст титульного листа и характеристика работы). +\input{common} + +% номер копии для грифа секретности +%\copynum{1} +% класс доступа +%\classlabel{Для служебного пользования} + +\title{АВТОРЕФЕРАТ\\ +диссертации на соискание ученой степени\\ +доктора физико-математических наук} + +\maketitle + +% Внутренняя сторона обложки +\thispagestyle{empty} +\vspace*{-2cm} +\noindent +\begin{center} +Работа выполнена в \emph{название организации}. +\end{center} +\vskip1ex\noindent +\begin{tabularx}{\linewidth}{@{}lX@{}} + \textbf{Научный консультант:} & \textbf{фамилия имя отчество}\\ + & ученая степень, ученое звание\\[6pt] + \textbf{Официальные оппоненты:} & \textbf{фамилия имя отчество}\\ + & ученая степень, ученое звание\\[6pt] + & \textbf{фамилия имя отчество}\\ + & ученая степень, ученое звание\\[6pt] + & \textbf{фамилия имя отчество}\\ + & ученая степень, ученое звание\\[6pt] + \textbf{Ведущая организация:} & название организации +\end{tabularx} + +\vskip2ex\noindent +Защита состоится \datefield{} в \rule[0pt]{1cm}{0.5pt} часов +на заседании диссертационного совета \emph{шифр совета} при \emph{название +организации, при которой создан совет}, расположенном по адресу: +\emph{адрес} + +\vskip1ex\noindent +С диссертацией можно ознакомиться в библиотеке +\emph{название организации}. + +\vskip1ex\noindent +Автореферат разослан \datefield{} + +\vskip2ex\noindent +Отзывы и замечания по автореферату в двух экземплярах, заверенные +печатью, просьба высылать по вышеуказанному адресу на имя ученого секретаря +диссертационного совета. + +\vfill\noindent +\begin{minipage}[b]{0.4\linewidth} + Ученый секретарь\\ + диссертационного совета,\\ + \emph{ученая степень}, \emph{ученое звание} +\end{minipage} +\hfill +% вставка файла, содержащего факсимиле ученого секретаря +\makeatletter +\ifDis@facsimile + \includegraphics[width=3cm]{sec-facsimile}\hfill +\fi% +\makeatother% +\emph{фамилия и. о.} + +\clearpage + +\nsection{Общая характеристика работы} + +% Актуальность работы +\actualitysection +\actualitytext + +% Степень разработанности темы исследования +\developmentsection +\developmenttext + +% Цели и задачи диссертационной работы +\objectivesection +\objectivetext + +% Научная новизна +\noveltysection +\noveltytext + +% Теоретическая и практическая значимость +\valuesection +\valuetext + +% Методология и методы исследования +\methodssection +\methodstext + +% Положения, выносимые на защиту +\resultssection +\resultstext + +% Степень достоверности и апробация результатов +\approbationsection +\approbationtext + +% Публикации +\pubsection +\pubtext + +% Личный вклад автора +\contribsection +\contribtext + +% Структура и объем диссертации +\structsection +\structtext + +\nsection{Содержание работы} + +\textbf{Во Введении} обоснована актуальность диссертационной работы, сформулирована цель и аргументирована научная новизна исследований, показана практическая значимость полученных результатов, представлены выносимые на защиту научные положения. + +\textbf{В первой главе} ... + +Содержание первой главы. + +Результаты первой главы опубликованы в работе~\cite{Ivanov_1999_Journal_17_173}. + +\textbf{Во второй главе} ... + +Содержание второй главы. + +Результаты второй главы опубликованы в работе~\cite{Petrov_2001_Journal_23_12321}. + +\textbf{В третьей главе} ... + +Содержание третьей главы. + +Результаты третьей главы опубликованы в работе~\cite{Sidorov_2002_Journal_32_1531}. + +\textbf{В Заключении} + +% ---------------------------------------------------------------- +\printbibliography[keyword=own,title={Основные публикации по теме диссертации}] +\printbibliography[notkeyword=own,title={Цитированная литература}] + +% ---------------------------------------------------------------- +% Выходные данные +\clearpage +\thispagestyle{empty} +\normalfont\selectfont +\vspace*{2cm} +\begin{center} +\textit{Научное издание}\\ +\vskip 2cm +\makeatletter +\@author +\vskip 1.5cm +\@title{} на тему:\\ +\@topic\\ +\makeatother +\end{center} +\vfill +Подписано в печать~25.01.2011. +Формат~$60 \times 90$~1/16. +Тираж~100~экз. +Заказ~256.\\[2ex] +\noindent +Санкт-Петербургская издательская фирма <<Наука>> РАН. +199034, Санкт-Петербург, Менделеевская линия, 1, +\href{http://www.naukaspb.spb.ru}{http://www.naukaspb.spb.ru} + +\end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex new file mode 100644 index 00000000000..c1f53f2da95 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/common.tex @@ -0,0 +1,72 @@ +% Общие поля титульного листа диссертации и автореферата +\institution{Название организации} + +\topic{Тема диссертации} + +\author{ФИО автора} + +\specnum{01.04.05} +\spec{Оптика} +%\specsndnum{01.04.07} +%\specsnd{Физика конденсированного состояния} + +\scon{ФИО консультанта} +\sconstatus{д.~ф.-м.~н., проф.} +%\sconsnd{ФИО второго консультанта} +%\sconsndstatus{д.~ф.-м.~н., проф.} + +\city{Санкт-Петербург} +\date{\number\year} + +% Общие разделы автореферата и диссертации +\mkcommonsect{actuality}{Актуальность темы исследования.}{% +Текст об актуальности. Ссылка~\cite{Yoffe_1993_AP_42_173}. +} + +\mkcommonsect{development}{Степень разработанности темы исследования.}{ +Текст о степени разработанности темы. +} + +\mkcommonsect{objective}{Цели и задачи диссертационной работы:}{% +Список целей. + +Для достижения поставленных целей были решены следующие задачи: +} + +\mkcommonsect{novelty}{Научная новизна.}{% +Текст о новизне. +} + +\mkcommonsect{value}{Теоретическая и практическая значимость.}{% +Результаты, изложенные в диссертации, могут быть использованы для ... +} + +\mkcommonsect{methods}{Методология и методы исследования.}{% +Текст о методах исследования. +} + +\mkcommonsect{results}{Положения, выносимые на защиту:}{% +Текст о положениях и результатах. +} + +\mkcommonsect{approbation}{Степень достоверности и апробация результатов.}{% +Основные результаты диссертации докладывались на следующих конференциях: +} + +\mkcommonsect{pub}{Публикации.}{% +Материалы диссертации опубликованы в $N$ печатных работах, из них $n_1$ +статей в рецензируемых журналах~\cite{Ivanov_1999_Journal_17_173, +Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ статей в +сборниках трудов конференций и $n_3$ тезисов докладов. +} + +\mkcommonsect{contrib}{Личный вклад автора.}{% +Содержание диссертации и основные положения, выносимые на защиту, отражают персональный вклад автора в опубликованные работы. +Подготовка к публикации полученных результатов проводилась совместно с соавторами, причем вклад диссертанта был определяющим. Все представленные в диссертации результаты получены лично автором. +} + +\mkcommonsect{struct}{Структура и объем диссертации.}{% +Диссертация состоит из введения, обзора литературы, $n$ глав, заключения и библиографии. +Общий объем диссертации $P$ страниц, из них $p_1$ страницы текста, включая $f$ рисунков. +Библиография включает $B$ наименований на $p_2$ страницах. +} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex new file mode 100644 index 00000000000..cd60e4f2708 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/concl.tex @@ -0,0 +1 @@ +\conclusion diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex new file mode 100644 index 00000000000..827832111b1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex @@ -0,0 +1,9 @@ +% Список сокращений и условных обозначений +\defs + +\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}} +$\vec A$ & --- & векторный потенциал\\ +$I$ & --- & интенсивность света\\ +$j_l$ & --- & сферическая функция Бесселя первого рода\\ +$Y_{lm}$ & --- & сферическая гармоника\\ +\end{longtable} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex new file mode 100644 index 00000000000..3a55f5b54c2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/dict.tex @@ -0,0 +1,4 @@ +% Словарь терминов +\dict + +\textbf{Термин} "--- определение. diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile new file mode 100644 index 00000000000..775b7fc3d88 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/Makefile @@ -0,0 +1 @@ +include ../../../include/latex.fig.mk \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps new file mode 100644 index 00000000000..9a944f547aa --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/fig/facsimile.eps @@ -0,0 +1,260 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%BoundingBox: 7 14 78 29 +%%HiResBoundingBox: 7.818750 14.902032 77.220003 28.578282 +%........................................... +%%Creator: GPL Ghostscript 815 (epswrite) +%%CreationDate: 2008/12/01 04:15:45 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%EndComments +%%BeginProlog +% This copyright applies to everything between here and the %%EndProlog: +% Copyright (C) 2004 artofcode LLC, Benicia, CA. All rights reserved. +%%BeginResource: procset GS_epswrite_2_0_1001 +/GS_epswrite_2_0_1001 80 dict dup begin +/PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch +4 index eq and{ pop pop pop}{ PageSize dup 1 +5 -1 roll put 0 4 -1 roll put dup null eq {false} {dup where} ifelse{ exch get exec} +{ pop/setpagedevice where +{ pop 1 dict dup /PageSize PageSize put setpagedevice} +{ /setpage where{ pop PageSize aload pop pageparams 3 {exch pop} repeat +setpage}if}ifelse}ifelse}ifelse} bind def +/!{bind def}bind def/#{load def}!/N/counttomark # +/rG{3{3 -1 roll 255 div}repeat setrgbcolor}!/G{255 div setgray}!/K{0 G}! +/r6{dup 3 -1 roll rG}!/r5{dup 3 1 roll rG}!/r3{dup rG}! +/w/setlinewidth #/J/setlinecap # +/j/setlinejoin #/M/setmiterlimit #/d/setdash #/i/setflat # +/m/moveto #/l/lineto #/c/rcurveto # +/p{N 2 idiv{N -2 roll rlineto}repeat}! +/P{N 0 gt{N -2 roll moveto p}if}! +/h{p closepath}!/H{P closepath}! +/lx{0 rlineto}!/ly{0 exch rlineto}!/v{0 0 6 2 roll c}!/y{2 copy c}! +/re{4 -2 roll m exch dup lx exch ly neg lx h}! +/^{3 index neg 3 index neg}! +/f{P fill}!/f*{P eofill}!/s{H stroke}!/S{P stroke}! +/q/gsave #/Q/grestore #/rf{re fill}! +/Y{P clip newpath}!/Y*{P eoclip newpath}!/rY{re Y}! +/|={pop exch 4 1 roll 1 array astore cvx 3 array astore cvx exch 1 index def exec}! +/|{exch string readstring |=}! +/+{dup type/nametype eq{2 index 7 add -3 bitshift 2 index mul}if}! +/@/currentfile #/${+ @ |}! +/B{{2 copy string{readstring pop}aload pop 4 array astore cvx +3 1 roll}repeat pop pop true}! +/Ix{[1 0 0 1 11 -2 roll exch neg exch neg]exch}! +/,{true exch Ix imagemask}!/If{false exch Ix imagemask}!/I{exch Ix image}! +/Ic{exch Ix false 3 colorimage}! +/F{/Columns counttomark 3 add -2 roll/Rows exch/K -1/BlackIs1 true>> +/CCITTFaxDecode filter}!/FX{<> +/CCITTFaxDecode filter}!/FX{< + +chcp 1251 > nul +set bibtex=biber +set bibtexflags= +set latexnmk=call ..\..\include\latex.nmk.cmd + +if "%1"=="" ( + %latexnmk% +) else ( + for %%f in (%*) do if "%%f"=="help" ( + call :%%f + ) else if "%%f"=="all" ( + call :allpdf + ) else if "%%f"=="allpdf" ( + call :%%f + ) else if "%%f"=="alldvi" ( + call :%%f + ) else ( + %latexnmk% %%f + ) +) + +exit /b + +:help + echo all build DVI of autoref and thesis + echo allpdf build PDF of autoref and thesis + %latexnmk% help +goto :eof + +:alldvi + set target=thesis & %latexnmk% dvi + set target=autoref & %latexnmk% dvi + set target= +goto :eof + +:allpdf + set target=thesis & %latexnmk% pdf + set target=autoref & %latexnmk% pdf + set target= +goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex new file mode 100644 index 00000000000..59a92856e0d --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/review.tex @@ -0,0 +1 @@ +\review diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib new file mode 100644 index 00000000000..ea2e0c361fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib @@ -0,0 +1,173 @@ +@ARTICLE{Ivanov_1999_Journal_17_173, + author = {И. И. Иванов and П. П. Петров and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {17}, + pages = {173--180}, + year = {1999}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Petrov_2001_Journal_23_12321, + author = {П. П. Петров and И. И. Иванов and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {23}, + pages = {12321--12328}, + year = {2001}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Sidorov_2002_Journal_32_1531, + author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov}, + title = {Article Title}, + journal = {Journal Name}, + volume = {32}, + pages = {1531--1540}, + year = {2002}, + keywords = {own}, +} + +@ARTICLE{Yoffe_1993_AP_42_173, + author = {A. D. Yoffe}, + title = {Low-dimensional systems: quantum size effects and electronic + properties of semiconductor microcrystallites (zero-dimensional + systems) and some quasi-two-dimensional systems}, + journal = {Adv. Phys.}, + pages = {173--266}, + volume = {42}, + year = {1993}, + doi = {10.1080/00018739300101484}, +} + +@ARTICLE{Efros_1982_FTP_16_7_1209, + author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос}, + title = {Межзонное поглощение света в полупроводниковом шаре}, + journal = {Физика и техника полупроводников}, + year = {1982}, + volume = {16}, + number = {7}, + pages = {1209--1214}, + language = {russian}, +} + +@BOOK{Anselm_1978, + author = {А. И. Ансельм}, + title = {Введение в теорию полупроводников}, + publisher = {Наука}, + address = {Москва}, + year = {1978}, + language = {russian}, +} + +@INPROCEEDINGS{Segall_1968, + author = {B. Segall}, + year = {1968}, + editor = {S. M. Ryvkin}, + booktitle = {Proceedings of IXth Conference on the Physics of + Semiconductors, Moscow, 1968}, + pages = {425}, + address = {Leningrad}, + publisher = {Nauka}, +} + +@INBOOK{Agranovich_1983, + editor = {V. M. Agranovich and R. M. Hochstrasser}, + title = {Spectroscopy and Excitation Dynamics of Condensed Molecular + Systems}, + chapter = {6}, + publisher = {North-Holland}, + year = {1983}, + series = {Modern Problems in Condensed Matter Sciences}, + address = {Amsterdam}, + isbn = {0444863133}, +} + +@INCOLLECTION{InP, + title = {{\relax InP} Basic Parameters at 300 K}, + booktitle = {Electronic archive New Semiconductor Materials. + Characteristics and Properties}, + organization = {Ioffe Physico-Technical Institute}, + address = {St. Petersburg}, + year = {2001}, + url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, + urldate = {01.11.2009}, +} + +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. канд. физ.-мат. наук}, + year = {1996}, + language = {russian}, +} + +@DSCITHESIS{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. д-ра физ.-мат. наук}, + year = {2008}, + language = {russian}, +} + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {Э. В. Тернер}, + authortype = {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, +} + +@PATENT{patent2, + author = {В. И. Чугаева}, + authortype = {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex new file mode 100644 index 00000000000..b6dac9d7cdb --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex @@ -0,0 +1,138 @@ +\documentclass[% +doctor, % тип документа +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок +colorlinks, % цветные гиперссылки +%times, % шрифт Times как основной +%fixint, % включить прямые знаки интегралов +%classified, % гриф секретности +%facsimile, % отображать факсимиле диссертанта +]{disser} + +\usepackage[ + a4paper, mag=1000, + left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm +]{geometry} +\usepackage[T2A]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english,russian]{babel} +\ifpdf\usepackage{epstopdf}\fi + +\usepackage[style=gost-numeric, + backend=biber, + language=auto, + hyperref=auto, + autolang=other, + sorting=none +]{biblatex} + +\addbibresource{thesis.bib} + +% Номера страниц снизу и по центру +%\pagestyle{footcenter} +%\chapterpagestyle{footcenter} + +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + +% Ссылки на работы соискателя включаются в общий список литературы +\let\citemy=\cite + +% Использовать полужирное начертание для векторов +\let\vec=\mathbf + +% Путь к файлам с иллюстрациями +\graphicspath{{fig/}} + +\begin{document} + +% Переопределение стандартных заголовков +%\def\contentsname{Содержание} +%\def\conclusionname{Выводы} +%\def\bibname{Литература} + +% Включение файла с общим текстом диссертации и автореферата +% (текст титульного листа и характеристика работы). +\input{common} + +% номер копии для грифа секретности +%\copynum{1} +% класс доступа +%\classlabel{Для служебного пользования} + +% номер УДК +\libcatnum{12345} + +\title{ДИССЕРТАЦИЯ\\ +на соискание ученой степени\\ +доктора физико-математических наук} + +\maketitle + +%% +%% Titlepage in English +%% +% +%\institution{Name of Organization} +% +%\title{Doctoral Dissertation} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} +% +%\specnum{01.04.05} +%\spec{Optics} +% +%%\specsndnum{01.04.07} +%%\specsnd{Condensed matter physics} +% +%% Scientific consultants +%\scon{B.\,B.~Baranov} +%\sconstatus{Professor} +%%\sconsnd{P.\,P.~Petrov} +%%\sconsndstatus{Professor} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + +% Содержание +\tableofcontents + +% Введение +\input{intro} + +% Обзор литературы +%\input{review} + +% Основная часть +%% Глава 1 +\input{1} +%% Глава 2 +%\input{2} + +% Заключение +\input{concl} + +% Список сокращений и условных обозначений +%\input{defs} + +% Словарь терминов +%\input{dict} + +% Список литературы +\printbibliography[heading=bibintoc] + +% Список иллюстративного материала +%\listoffigures + +% Приложения +%\appendix +%\input{app-a} + +\end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex new file mode 100644 index 00000000000..d2d7f251b17 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex @@ -0,0 +1 @@ +\chapter{Название главы} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile new file mode 100644 index 00000000000..ef775e6d4f7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/Makefile @@ -0,0 +1,21 @@ +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET ?= thesis +BIBTEX := biber +BIBTEXFLAGS := + +include ../../include/latex.mk + +all: pdf + +allpdf: pdf + +alldvi: dvi + +help: .help + @echo " all alias for pdf target" ;\ + echo " allpdf alias for pdf target" ;\ + echo " alldvi alias for dvi target" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex new file mode 100644 index 00000000000..7e35d8529e6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex @@ -0,0 +1 @@ +\chapter{Заголовок приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex new file mode 100644 index 00000000000..cd60e4f2708 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/concl.tex @@ -0,0 +1 @@ +\conclusion diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile new file mode 100644 index 00000000000..775b7fc3d88 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/Makefile @@ -0,0 +1 @@ +include ../../../include/latex.fig.mk \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd new file mode 100644 index 00000000000..d5b89784882 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/fig/nomake.cmd @@ -0,0 +1 @@ +@call ..\..\..\include\latex.fig.nmk.cmd %* \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex new file mode 100644 index 00000000000..9266d88ac1a --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex @@ -0,0 +1,5 @@ +\intro + +Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd new file mode 100644 index 00000000000..5bcc7c95bc2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/nomake.cmd @@ -0,0 +1,34 @@ +@echo off + +rem Makefile for documents and templates +rem Author: Stanislav Kruchinin + +chcp 1251 > nul +set bibtex=biber +set bibtexflags= +set latexnmk=call ..\..\include\latex.nmk.cmd + +if "%1"=="" ( + %latexnmk% +) else ( + for %%f in (%*) do if "%%f"=="help" ( + call :%%f + ) else if "%%f"=="all" ( + %latexnmk% pdf + ) else if "%%f"=="allpdf" ( + %latexnmk% pdf + ) else if "%%f"=="alldvi" ( + %latexnmk% dvi + ) else ( + %latexnmk% %%f + ) +) + +exit /b + +:help + echo all alias for pdf target + echo allpdf alias for pdf target + echo alldvi alias for dvi target + %latexnmk% help +goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib new file mode 100644 index 00000000000..ea2e0c361fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib @@ -0,0 +1,173 @@ +@ARTICLE{Ivanov_1999_Journal_17_173, + author = {И. И. Иванов and П. П. Петров and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {17}, + pages = {173--180}, + year = {1999}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Petrov_2001_Journal_23_12321, + author = {П. П. Петров and И. И. Иванов and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {23}, + pages = {12321--12328}, + year = {2001}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Sidorov_2002_Journal_32_1531, + author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov}, + title = {Article Title}, + journal = {Journal Name}, + volume = {32}, + pages = {1531--1540}, + year = {2002}, + keywords = {own}, +} + +@ARTICLE{Yoffe_1993_AP_42_173, + author = {A. D. Yoffe}, + title = {Low-dimensional systems: quantum size effects and electronic + properties of semiconductor microcrystallites (zero-dimensional + systems) and some quasi-two-dimensional systems}, + journal = {Adv. Phys.}, + pages = {173--266}, + volume = {42}, + year = {1993}, + doi = {10.1080/00018739300101484}, +} + +@ARTICLE{Efros_1982_FTP_16_7_1209, + author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос}, + title = {Межзонное поглощение света в полупроводниковом шаре}, + journal = {Физика и техника полупроводников}, + year = {1982}, + volume = {16}, + number = {7}, + pages = {1209--1214}, + language = {russian}, +} + +@BOOK{Anselm_1978, + author = {А. И. Ансельм}, + title = {Введение в теорию полупроводников}, + publisher = {Наука}, + address = {Москва}, + year = {1978}, + language = {russian}, +} + +@INPROCEEDINGS{Segall_1968, + author = {B. Segall}, + year = {1968}, + editor = {S. M. Ryvkin}, + booktitle = {Proceedings of IXth Conference on the Physics of + Semiconductors, Moscow, 1968}, + pages = {425}, + address = {Leningrad}, + publisher = {Nauka}, +} + +@INBOOK{Agranovich_1983, + editor = {V. M. Agranovich and R. M. Hochstrasser}, + title = {Spectroscopy and Excitation Dynamics of Condensed Molecular + Systems}, + chapter = {6}, + publisher = {North-Holland}, + year = {1983}, + series = {Modern Problems in Condensed Matter Sciences}, + address = {Amsterdam}, + isbn = {0444863133}, +} + +@INCOLLECTION{InP, + title = {{\relax InP} Basic Parameters at 300 K}, + booktitle = {Electronic archive New Semiconductor Materials. + Characteristics and Properties}, + organization = {Ioffe Physico-Technical Institute}, + address = {St. Petersburg}, + year = {2001}, + url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, + urldate = {01.11.2009}, +} + +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. канд. физ.-мат. наук}, + year = {1996}, + language = {russian}, +} + +@DSCITHESIS{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. д-ра физ.-мат. наук}, + year = {2008}, + language = {russian}, +} + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {Э. В. Тернер}, + authortype = {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, +} + +@PATENT{patent2, + author = {В. И. Чугаева}, + authortype = {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex new file mode 100644 index 00000000000..aafac7072ec --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex @@ -0,0 +1,156 @@ +\documentclass[% +master, % тип документа +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок +colorlinks, % цветные гиперссылки +%times, % шрифт Times как основной +%fixint, % включить прямые знаки интегралов +]{disser} + +\usepackage[ + a4paper, mag=1000, + left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm +]{geometry} +\usepackage[T2A]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english,russian]{babel} +\ifpdf\usepackage{epstopdf}\fi + +\usepackage[style=gost-numeric, + backend=biber, + language=auto, + hyperref=auto, + autolang=other, + sorting=none +]{biblatex} + +\addbibresource{thesis.bib} + +% Номера страниц снизу и по центру +%\pagestyle{footcenter} +%\chapterpagestyle{footcenter} + +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + +% Использовать полужирное начертание для векторов +\let\vec=\mathbf + +% Включать подсекции в оглавление +\setcounter{tocdepth}{2} + +\graphicspath{{fig/}} + +\begin{document} + +% Переопределение стандартных заголовков +%\def\contentsname{Содержание} +%\def\conclusionname{Выводы} +%\def\bibname{Литература} + +\institution{Название организации} + +% Имя лица, допускающего к защите (зав. кафедрой) +\apname{ФИО зав. кафедрой} + +\title{ДИССЕРТАЦИЯ\\[-14pt]на соискание ученой степени\\МАГИСТРА} + +\topic{Тема диссертации} + +% Автор +\author {ФИО автора} % ФИО +\group {1111/1} % Группа +\coursenum {111111} % Номер направления +\course {Название направления} +\masterprognum{111111} % Номер магистерской программы +\masterprog {Название программы} + +% Научный руководитель +\sa {ФИО руководителя} +\sastatus{д.~ф.-м.~н., ст.~н.~с.} +% Второй научный руководитель +%\sasnd {ФИО руководителя} +%\sasndstatus{д.~ф.-м.~н., ст.~н.~с.} + +% Рецензент +\rev {ФИО рецензента} +\revstatus{д.~ф.-м.~н., в.~н.~с.} +% Второй рецензент +%\revsnd {ФИО рецензента} +%\revsndstatus{д.~т.~н., ст.~н.~с.} + +% Консультант +\con{ФИО консультанта} +\conspec{вопросам\\охраны труда} +\constatus{к.~т.~н., доц.} +% Второй консультант +%\consnd{ФИО консультанта} +%\consndspec{экономическим\\вопросам} +%\consndstatus{к.~э.~н., доц.} + +% Город и год +\city{Санкт-Петербург} +\date{\number\year} + +\maketitle + +%% +%% Titlepage in English +%% +% +%\institution{Name of Organization} +% +%% Approved by +%\apname{Professor S.\,S.~Sidorov} +% +%\title{Master's Thesis} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} % Full Name +%\course{Physics} % Название специальности +% +%\group{} % Study Group +%\masterprog {Title of program} +% +%% Scientific Advisor +%\sa {I.\,I.~Ivanov} +%\sastatus {Professor} +% +%% Reviewer +%\rev {P.\,P.~Petrov} +%\revstatus{Associate Professor} +% +%% Consultant +%\con{} +%\conspec{} +%\constatus{} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + +% Содержание +\tableofcontents +% Введение +\input{intro} +% Глава 1 +\input{1} +% Глава 2 +%\input{2} + +% Заключение +\input{concl} + +% Список литературы +\printbibliography[heading=bibintoc] + +% Приложения +\appendix +\input{app-a} + +\end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd new file mode 100644 index 00000000000..a65aab97a2b --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/nomake.cmd @@ -0,0 +1,55 @@ +@echo off + +rem nomake script for LaTeX projects +rem Author: Stanislav Kruchinin + +if "%CMDEXTVERSION%"=="" ( + echo This script requires command interpreter from Windows 2000 or above. + goto :eof +) + +setlocal enabledelayedexpansion + +set target=thesis +if "!texmf!"=="" set texmf=%allusersprofile%\Application Data\MiKTeX\2.9 +if "!destdir!"=="" set destdir=!texmf! +if "!docdir!"=="" set docdir=!destdir!\doc\latex\disser +if "!subdirs!"=="" set subdirs=bachelor ..\specialist ..\master ..\candidate ..\doctor + + +if "%1"=="help" ( + call :%1 +) else if "%1"=="install" ( + call :%1 +) else if "%1"=="uninstall" ( + call :%1 +) else if "%1"=="reinstall" ( + call :%1 +) else ( + for %%i in (%subdirs%) do @cd %%i & call nomake %* +) + +exit /b + +:help + cd candidate & call nomake help & cd .. + echo install install templates to TeX tree + echo uninstall uninstall templates + echo reinstall reinstall templates +goto :eof + +:install + if not exist "!docdir!" mkdir "!docdir!" + xcopy /y /e /i /f ..\templates "!docdir!\templates" + xcopy /y /e /i /f ..\templates-utf8 "!docdir!\templates-utf8" + xcopy /y /e /i /f ..\include "!docdir!\include" +goto :eof + +:uninstall + rmdir /s /q "!docdir!" +goto :eof + +:reinstall + call :uninstall + call :install +goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex new file mode 100644 index 00000000000..d2d7f251b17 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex @@ -0,0 +1 @@ +\chapter{Название главы} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile new file mode 100644 index 00000000000..ef775e6d4f7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/Makefile @@ -0,0 +1,21 @@ +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET ?= thesis +BIBTEX := biber +BIBTEXFLAGS := + +include ../../include/latex.mk + +all: pdf + +allpdf: pdf + +alldvi: dvi + +help: .help + @echo " all alias for pdf target" ;\ + echo " allpdf alias for pdf target" ;\ + echo " alldvi alias for dvi target" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex new file mode 100644 index 00000000000..7e35d8529e6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex @@ -0,0 +1 @@ +\chapter{Заголовок приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex new file mode 100644 index 00000000000..cd60e4f2708 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/concl.tex @@ -0,0 +1 @@ +\conclusion diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile new file mode 100644 index 00000000000..775b7fc3d88 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/Makefile @@ -0,0 +1 @@ +include ../../../include/latex.fig.mk \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps new file mode 100644 index 00000000000..9382ce4351e --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/fig/fig.eps @@ -0,0 +1,490 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%BoundingBox: 235 371 361 470 +%%HiResBoundingBox: 236 371.521 360.901 469.38 +%................................. +%%Creator: MiKTeX GPL Ghostscript 860 (epswrite) +%%CreationDate: 2007/12/07 10:10:05 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%EndComments +%%BeginProlog +% This copyright applies to everything between here and the %%EndProlog: +% Copyright (C) 2007 Artifex Software, Inc. All rights reserved. +%%BeginResource: procset GS_epswrite_2_0_1001 1.001 0 +/GS_epswrite_2_0_1001 80 dict dup begin +/PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch +4 index eq and{ pop pop pop}{ PageSize dup 1 +5 -1 roll put 0 4 -1 roll put dup null eq {false} {dup where} ifelse{ exch get exec} +{ pop/setpagedevice where +{ pop 1 dict dup /PageSize PageSize put setpagedevice} +{ /setpage where{ pop PageSize aload pop pageparams 3 {exch pop} repeat +setpage}if}ifelse}ifelse}ifelse} bind def +/!{bind def}bind def/#{load def}!/N/counttomark # +/rG{3{3 -1 roll 255 div}repeat setrgbcolor}!/G{255 div setgray}!/K{0 G}! +/r6{dup 3 -1 roll rG}!/r5{dup 3 1 roll rG}!/r3{dup rG}! +/w/setlinewidth #/J/setlinecap # +/j/setlinejoin #/M/setmiterlimit #/d/setdash #/i/setflat # +/m/moveto #/l/lineto #/c/rcurveto # +/p{N 2 idiv{N -2 roll rlineto}repeat}! +/P{N 0 gt{N -2 roll moveto p}if}! +/h{p closepath}!/H{P closepath}! +/lx{0 rlineto}!/ly{0 exch rlineto}!/v{0 0 6 2 roll c}!/y{2 copy c}! +/re{4 -2 roll m exch dup lx exch ly neg lx h}! +/^{3 index neg 3 index neg}! +/f{P fill}!/f*{P eofill}!/s{H stroke}!/S{P stroke}! +/q/gsave #/Q/grestore #/rf{re fill}! +/Y{P clip newpath}!/Y*{P eoclip newpath}!/rY{re Y}! +/|={pop exch 4 1 roll 1 array astore cvx 3 array astore cvx exch 1 index def exec}! +/|{exch string readstring |=}! +/+{dup type/nametype eq{2 index 7 add -3 bitshift 2 index mul}if}! +/@/currentfile #/${+ @ |}! +/B{{2 copy string{readstring pop}aload pop 4 array astore cvx +3 1 roll}repeat pop pop true}! +/Ix{[1 0 0 1 11 -2 roll exch neg exch neg]exch}! +/,{true exch Ix imagemask}!/If{false exch Ix imagemask}!/I{exch Ix image}! +/Ic{exch Ix false 3 colorimage}! +/F{/Columns counttomark 3 add -2 roll/Rows exch/K -1/BlackIs1 true>> +/CCITTFaxDecode filter}!/FX{< + +chcp 1251 > nul +set bibtex=biber +set bibtexflags= +set latexnmk=call ..\..\include\latex.nmk.cmd + +if "%1"=="" ( + %latexnmk% +) else ( + for %%f in (%*) do if "%%f"=="help" ( + call :%%f + ) else if "%%f"=="all" ( + %latexnmk% pdf + ) else if "%%f"=="allpdf" ( + %latexnmk% pdf + ) else if "%%f"=="alldvi" ( + %latexnmk% dvi + ) else ( + %latexnmk% %%f + ) +) + +exit /b + +:help + echo all alias for pdf target + echo allpdf alias for pdf target + echo alldvi alias for dvi target + %latexnmk% help +goto :eof + diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib new file mode 100644 index 00000000000..ea2e0c361fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib @@ -0,0 +1,173 @@ +@ARTICLE{Ivanov_1999_Journal_17_173, + author = {И. И. Иванов and П. П. Петров and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {17}, + pages = {173--180}, + year = {1999}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Petrov_2001_Journal_23_12321, + author = {П. П. Петров and И. И. Иванов and С. С. Сидоров}, + title = {Название статьи}, + journal = {Название журнала}, + volume = {23}, + pages = {12321--12328}, + year = {2001}, + language = {russian}, + keywords = {own}, +} + +@ARTICLE{Sidorov_2002_Journal_32_1531, + author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov}, + title = {Article Title}, + journal = {Journal Name}, + volume = {32}, + pages = {1531--1540}, + year = {2002}, + keywords = {own}, +} + +@ARTICLE{Yoffe_1993_AP_42_173, + author = {A. D. Yoffe}, + title = {Low-dimensional systems: quantum size effects and electronic + properties of semiconductor microcrystallites (zero-dimensional + systems) and some quasi-two-dimensional systems}, + journal = {Adv. Phys.}, + pages = {173--266}, + volume = {42}, + year = {1993}, + doi = {10.1080/00018739300101484}, +} + +@ARTICLE{Efros_1982_FTP_16_7_1209, + author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос}, + title = {Межзонное поглощение света в полупроводниковом шаре}, + journal = {Физика и техника полупроводников}, + year = {1982}, + volume = {16}, + number = {7}, + pages = {1209--1214}, + language = {russian}, +} + +@BOOK{Anselm_1978, + author = {А. И. Ансельм}, + title = {Введение в теорию полупроводников}, + publisher = {Наука}, + address = {Москва}, + year = {1978}, + language = {russian}, +} + +@INPROCEEDINGS{Segall_1968, + author = {B. Segall}, + year = {1968}, + editor = {S. M. Ryvkin}, + booktitle = {Proceedings of IXth Conference on the Physics of + Semiconductors, Moscow, 1968}, + pages = {425}, + address = {Leningrad}, + publisher = {Nauka}, +} + +@INBOOK{Agranovich_1983, + editor = {V. M. Agranovich and R. M. Hochstrasser}, + title = {Spectroscopy and Excitation Dynamics of Condensed Molecular + Systems}, + chapter = {6}, + publisher = {North-Holland}, + year = {1983}, + series = {Modern Problems in Condensed Matter Sciences}, + address = {Amsterdam}, + isbn = {0444863133}, +} + +@INCOLLECTION{InP, + title = {{\relax InP} Basic Parameters at 300 K}, + booktitle = {Electronic archive New Semiconductor Materials. + Characteristics and Properties}, + organization = {Ioffe Physico-Technical Institute}, + address = {St. Petersburg}, + year = {2001}, + url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, + urldate = {01.11.2009}, +} + +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. канд. физ.-мат. наук}, + year = {1996}, + language = {russian}, +} + +@DSCITHESIS{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + type = {дисс. д-ра физ.-мат. наук}, + year = {2008}, + language = {russian}, +} + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {Э. В. Тернер}, + authortype = {США}, + title = {Одноразовая ракета-носитель}, + media = {Текст}, + type = {заявка}, + number = {1095735}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} B 64 G 1/00}, + holder = {заявитель Спейс Системз/Лорал, инк.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {Бюл. № 7 (I ч.)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {США}, + pagetotal = {5 с.~: ил.}, + language = {russian}, +} + +@PATENT{patent2, + author = {В. И. Чугаева}, + authortype = {РФ}, + title = {Приемопередающее устройство}, + media = {Текст}, + type = {пат.}, + number = {2000131736/09}, + location = {Рос. Федерация}, + ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00}, + holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.}, + credits = {патент. поверенный Егорова Г. Б.}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {Бюл. № 23 (II ч.)}, + pagetotal = {2 с.~: ил.}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex new file mode 100644 index 00000000000..f32df4d6a45 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex @@ -0,0 +1,136 @@ +\documentclass[% +specialist, % тип документа +subf, % использовать пакет subcaption для вложенной нумерации рисунков +href, % использовать пакет hyperref для создания гиперссылок +colorlinks, % цветные гиперссылки +%times, % шрифт Times как основной +%fixint, % включить прямые знаки интегралов +]{disser} + +\usepackage[ + a4paper, mag=1000, + left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm +]{geometry} +\usepackage[T2A]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english,russian]{babel} +\ifpdf\usepackage{epstopdf}\fi + +\usepackage[style=gost-numeric, + backend=biber, + language=auto, + hyperref=auto, + autolang=other, + sorting=none +]{biblatex} + +\addbibresource{thesis.bib} + +% Номера страниц снизу и по центру +%\pagestyle{footcenter} +%\chapterpagestyle{footcenter} + +% Точка с запятой в качестве разделителя между номерами цитирований +%\setcitestyle{semicolon} + +% Использовать полужирное начертание для векторов +\let\vec=\mathbf + +% Включать подсекции в оглавление +\setcounter{tocdepth}{2} + +\graphicspath{{fig/}} + +\begin{document} + +% Переопределение стандартных заголовков +%\def\contentsname{Содержание} +%\def\conclusionname{Выводы} +%\def\bibname{Литература} + +% +% Титульный лист на русском языке +% + +% Название организации +\institution{Название организации} + +% Имя лица, допускающего к защите (зав. кафедрой) +\apname{д.\,ф.-м.\,н., профессор С.\,C.~Сидоров} + +\title{Дипломная работа} + +% Тема +\topic{<<Тема работы>>} + +% Группа +\group{Студента группы} +% Автор +\author{ФИО автора} + +% Научный руководитель +\sa {И.\,И.~Иванов} +\sastatus {д.\,ф.-м.\,н., профессор} + +% Рецензент +\rev {П.\,П.~Петров} +\revstatus{к.\,ф.-м.\,н., доцент} + +% Город и год +\city{Санкт-Петербург} +\date{\number\year} + +\maketitle + +%% +%% Titlepage in English +%% +% +%\setlength\thirdskip{0pt} +% +%\institution{Name of Organization} +% +%% Approved by +%\apname{Professor S.\,S.~Sidorov} +% +%\title{Diploma Thesis} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} % Full Name +%\group{} % Study Group +% +%% Scientific Advisor +%\sa {I.\,I.~Ivanov} +%\sastatus {Professor} +% +%% Reviewer +%\rev {P.\,P.~Petrov} +%\revstatus{Associate Professor} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + +% Содержание +\tableofcontents + +% Введение +\input{intro} + +% Глава 1 +\input{1} +% Глава 2 +%\input{2} + +% Заключение +\input{concl} + +% Список литературы +\printbibliography[heading=bibintoc] + +\end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates/Makefile b/Master/texmf-dist/doc/latex/disser/templates/Makefile index 26d6545a84f..61f1434bfff 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/Makefile @@ -23,11 +23,10 @@ help: install: cp -rf ../templates $(DOCDIR) ;\ + cp -rf ../templates-utf8 $(DOCDIR) ;\ cp -rf ../include $(DOCDIR) uninstall: - -rm -rf $(DOCDIR)/templates - -rm -rf $(DOCDIR)/include - -rmdir $(DOCDIR) + -rm -rf $(DOCDIR) reinstall: uninstall install diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile b/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile index 30faef4990e..105e4055c17 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile @@ -3,16 +3,19 @@ # Author: Stanislav Kruchinin # -TARGET?=thesis - +TARGET ?= thesis +BIBTEX ?= bibtex8 +BIBTEXFLAGS ?= -H -c cp1251 include ../../include/latex.mk -all: dvi +all: pdf allpdf: pdf +alldvi: dvi + help: .help - @echo " all alias for dvi target" ;\ + @echo " all alias for pdf target" ;\ echo " allpdf alias for pdf target" ;\ - + echo " alldvi alias for dvi target" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd index d3bc974cf93..0278f9061ba 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd @@ -3,6 +3,8 @@ rem Makefile for documents and templates rem Author: Stanislav Kruchinin +set bibtex=bibtex8 +set bibtexflags=-H -c cp1251 set latexnmk=call ..\..\include\latex.nmk.cmd if "%1"=="" ( @@ -11,9 +13,11 @@ if "%1"=="" ( for %%f in (%*) do if "%%f"=="help" ( call :%%f ) else if "%%f"=="all" ( - %latexnmk% dvi + %latexnmk% pdf ) else if "%%f"=="allpdf" ( %latexnmk% pdf + ) else if "%%f"=="alldvi" ( + %latexnmk% dvi ) else ( %latexnmk% %%f ) @@ -22,8 +26,9 @@ if "%1"=="" ( exit /b :help - echo all alias for dvi target + echo all alias for pdf target echo allpdf alias for pdf target + echo alldvi alias for dvi target %latexnmk% help goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib index 73c0c0e6620..268d9e817b8 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib @@ -1,3 +1,32 @@ +@ARTICLE{Ivanov_1999_Journal_17_173, + author = {. . and . . and . . }, + title = { }, + journal = { }, + volume = {17}, + pages = {173--180}, + year = {1999}, + language = {russian}, +} + +@ARTICLE{Petrov_2001_Journal_23_12321, + author = {. . and . . and . . }, + title = { }, + journal = { }, + volume = {23}, + pages = {12321--12328}, + year = {2001}, + language = {russian}, +} + +@ARTICLE{Sidorov_2002_Journal_32_1531, + author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov}, + title = {Article Title}, + journal = {Journal Name}, + volume = {32}, + pages = {1531--1540}, + year = {2002}, +} + @ARTICLE{Yoffe_1993_AP_42_173, author = {A. D. Yoffe}, title = {Low-dimensional systems: quantum size effects and electronic @@ -54,7 +83,7 @@ } @INCOLLECTION{InP, - title = {InP Basic Parameters at 300 K}, + title = {{\relax InP} Basic Parameters at 300 K}, booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties}, organization = {Ioffe Physico-Technical Institute}, @@ -74,10 +103,9 @@ language = {russian}, } -@PHDTHESIS{Skvortsov_2008, +@DSCITHESIS{Skvortsov_2008, author = {. . }, - title = { - }, + title = { }, school = { . .~.~}, type = {. - .-. }, year = {2008}, 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 43ea6535bf4..f21cd3a0a57 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex @@ -1,11 +1,11 @@ \documentclass[% -bachelor, % -natbib, % natbib "" -subf, % subcaption -href, % hyperref -colorlinks=true % -%,fixint=false % -%,times % Times +bachelor, % +natbib, % natbib "" +subf, % subcaption +href, % hyperref +colorlinks, % +%times, % Times +%fixint, % ]{disser} \usepackage[ @@ -15,7 +15,6 @@ colorlinks=true % \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} -%\usepackage{tabularx,longtable} \ifpdf\usepackage{epstopdf}\fi % " ". @@ -116,8 +115,13 @@ colorlinks=true % % \input{concl} +% +\newcommand\BibDash{"---} +% +\let\BibEmph=\emph +\bibliographystyle{gost705} + % \bibliography{thesis} -\bibliographystyle{gost705} \end{document} diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile b/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile index cd39aa8987d..578ab2bec3e 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile @@ -3,8 +3,9 @@ # Author: Stanislav Kruchinin # -TARGET?=thesis - +TARGET ?= thesis +BIBTEX ?= bibtex8 +BIBTEXFLAGS ?= -H -c cp1251 include ../../include/latex.mk @@ -18,7 +19,12 @@ allpdf: env TARGET=autoref $(MAKE) pdf ;\ eval unset TARGET +alldvi: + @env TARGET=thesis $(MAKE) dvi ;\ + env TARGET=autoref $(MAKE) dvi ;\ + eval unset TARGET + help: .help - @echo " all build DVI of autoref and thesis" ;\ + @echo " all build PDF of autoref and thesis" ;\ echo " allpdf build PDF of autoref and thesis" ;\ - + echo " alldvi build DVI of autoref and thesis" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex index e0f7b3b69bf..93822f189ce 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex @@ -182,12 +182,18 @@ colorlinks=true % % ---------------------------------------------------------------- \renewcommand\bibsection{\nsection{ }} -\bibliographystylemy{gost705} +% . +%\newcommand\BibDash{--- } +% . +%\newcommand\BibEmph[1]{\emph{#1}} +\bibliographystylemy{gost705} \bibliographymy{thesis} \renewcommand\bibsection{\nsection{ }} -\bibliographystyle{gost705} +% . +%\newcommand\BibDash{} +\bibliographystyle{gost2008} \bibliography{thesis} % ---------------------------------------------------------------- % diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd index 39d5656ea50..9e522a8ae92 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd @@ -3,6 +3,8 @@ rem Makefile for documents and templates rem Author: Stanislav Kruchinin +set bibtex=bibtex8 +set bibtexflags=-H -c cp1251 set latexnmk=call ..\..\include\latex.nmk.cmd if "%1"=="" ( @@ -11,9 +13,11 @@ if "%1"=="" ( for %%f in (%*) do if "%%f"=="help" ( call :%%f ) else if "%%f"=="all" ( - call :%%f + call :allpdf ) else if "%%f"=="allpdf" ( call :%%f + ) else if "%%f"=="alldvi" ( + call :%%f ) else ( %latexnmk% %%f ) @@ -22,19 +26,20 @@ if "%1"=="" ( exit /b :help - echo all build DVI of autoref and thesis - echo allpdf build PDF of autoref and thesis + echo all build PDF of autoref and thesis + echo allpdf build PDF of autoref and thesis + echo alldvi build DVI of autoref and thesis %latexnmk% help goto :eof -:all - set target=thesis & %latexnmk% dvi - set target=autoref & %latexnmk% dvi - set target= -goto :eof - :allpdf set target=thesis & %latexnmk% pdf set target=autoref & %latexnmk% pdf set target= goto :eof + +:alldvi + set target=thesis & %latexnmk% dvi + set target=autoref & %latexnmk% dvi + set target= +goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib index 36b74356506..268d9e817b8 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib @@ -83,7 +83,7 @@ } @INCOLLECTION{InP, - title = {InP Basic Parameters at 300 K}, + title = {{\relax InP} Basic Parameters at 300 K}, booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties}, organization = {Ioffe Physico-Technical Institute}, @@ -98,15 +98,73 @@ title = { }, school = { . .~.~}, + type = {. . .-. }, year = {1996}, language = {russian}, } -@DOCDISSER{Skvortsov_2008, +@DSCITHESIS{Skvortsov_2008, author = {. . }, - title = { - }, + title = { }, school = { . .~.~}, + type = {. - .-. }, year = {2008}, language = {russian}, } + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {. . }, + authortype = {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {. 7 (I .)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, +} + +@PATENT{patent2, + author = {. . }, + authortype = {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, +} 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 2b52725c9f7..2be40465ced 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex @@ -1,14 +1,13 @@ \documentclass[% -candidate, % -natbib, % natbib "" -subf, % subcaption -href, % hyperref -colorlinks=true % -%,times % Times -%,fixint=false % -%,classified % -%,libcat % -%,facsimile % +candidate, % +natbib, % natbib "" +subf, % subcaption +href, % hyperref +colorlinks, % +%times, % Times +%fixint, % +%classified, % +%facsimile, % ]{disser} \usepackage[ @@ -18,7 +17,6 @@ colorlinks=true % \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} -%\usepackage{tabularx,longtable} \ifpdf\usepackage{epstopdf}\fi % @@ -54,7 +52,7 @@ colorlinks=true % %\classlabel{ } % -%\libcatnum{12345} +\libcatnum{12345} \title{\\ \\ @@ -121,9 +119,14 @@ colorlinks=true % % %\input{dict} +% +\newcommand\BibDash{"---} +% +\let\BibEmph=\emph +\bibliographystyle{gost705} + % \bibliography{thesis} -\bibliographystyle{gost705} % %\listoffigures diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile b/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile index cd39aa8987d..04887a49c6e 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile @@ -3,8 +3,9 @@ # Author: Stanislav Kruchinin # -TARGET?=thesis - +TARGET ?= thesis +BIBTEX ?= bibtex8 +BIBTEXFLAGS ?= -H -c cp1251 include ../../include/latex.mk @@ -18,7 +19,12 @@ allpdf: env TARGET=autoref $(MAKE) pdf ;\ eval unset TARGET +alldvi + @env TARGET=thesis $(MAKE) dvi ;\ + env TARGET=autoref $(MAKE) dvi ;\ + eval unset TARGET + help: .help - @echo " all build DVI of autoref and thesis" ;\ + @echo " all build PDF of autoref and thesis" ;\ echo " allpdf build PDF of autoref and thesis" ;\ - + echo " alldvi build DVI of autoref and thesis" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex index 0edaf739c81..76dc6b15f3f 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex @@ -177,12 +177,16 @@ colorlinks=true % % ---------------------------------------------------------------- \renewcommand\bibsection{\nsection{ }} -\bibliographystylemy{gost705} +% . +%\newcommand\BibDash{} +\bibliographystylemy{gost2008} \bibliographymy{thesis} \renewcommand\bibsection{\nsection{ }} -\bibliographystyle{gost705} +% . +%\newcommand\BibDash{} +\bibliographystyle{gost2008} \bibliography{thesis} % ---------------------------------------------------------------- % diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd index 39d5656ea50..30d8351c6ed 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd @@ -3,6 +3,8 @@ rem Makefile for documents and templates rem Author: Stanislav Kruchinin +set bibtex=bibtex8 +set bibtexflags=-H -c cp1251 set latexnmk=call ..\..\include\latex.nmk.cmd if "%1"=="" ( @@ -11,9 +13,11 @@ if "%1"=="" ( for %%f in (%*) do if "%%f"=="help" ( call :%%f ) else if "%%f"=="all" ( - call :%%f + call :allpdf ) else if "%%f"=="allpdf" ( call :%%f + ) else if "%%f"=="alldvi" ( + call :%%f ) else ( %latexnmk% %%f ) @@ -27,7 +31,7 @@ exit /b %latexnmk% help goto :eof -:all +:alldvi set target=thesis & %latexnmk% dvi set target=autoref & %latexnmk% dvi set target= diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib index 36b74356506..268d9e817b8 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib @@ -83,7 +83,7 @@ } @INCOLLECTION{InP, - title = {InP Basic Parameters at 300 K}, + title = {{\relax InP} Basic Parameters at 300 K}, booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties}, organization = {Ioffe Physico-Technical Institute}, @@ -98,15 +98,73 @@ title = { }, school = { . .~.~}, + type = {. . .-. }, year = {1996}, language = {russian}, } -@DOCDISSER{Skvortsov_2008, +@DSCITHESIS{Skvortsov_2008, author = {. . }, - title = { - }, + title = { }, school = { . .~.~}, + type = {. - .-. }, year = {2008}, language = {russian}, } + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {. . }, + authortype = {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {. 7 (I .)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, +} + +@PATENT{patent2, + author = {. . }, + authortype = {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, +} 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 8d3804aa249..1696b123c35 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex @@ -1,14 +1,13 @@ \documentclass[% -doctor, % -natbib, % natbib "" -subf, % subcaption -href, % hyperref -colorlinks=true % -%,times % Times -%,fixint=false % -%,classified % -%,libcat % -%,facsimile % +doctor, % +natbib, % natbib "" +subf, % subcaption +href, % hyperref +colorlinks, % +%times, % Times +%fixint, % +%classified, % +%facsimile, % ]{disser} \usepackage[ @@ -18,7 +17,6 @@ colorlinks=true % \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} -%\usepackage{tabularx,longtable} \ifpdf\usepackage{epstopdf}\fi % @@ -54,7 +52,7 @@ colorlinks=true % %\classlabel{ } % -%\libcatnum{12345} +\libcatnum{12345} \title{\\ \\ @@ -118,9 +116,14 @@ colorlinks=true % % %\input{dict} +% +\newcommand\BibDash{"---} +% +\let\BibEmph=\emph +\bibliographystyle{gost705} + % \bibliography{thesis} -\bibliographystyle{gost705} % %\listoffigures diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/Makefile b/Master/texmf-dist/doc/latex/disser/templates/master/Makefile index 30faef4990e..105e4055c17 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/master/Makefile @@ -3,16 +3,19 @@ # Author: Stanislav Kruchinin # -TARGET?=thesis - +TARGET ?= thesis +BIBTEX ?= bibtex8 +BIBTEXFLAGS ?= -H -c cp1251 include ../../include/latex.mk -all: dvi +all: pdf allpdf: pdf +alldvi: dvi + help: .help - @echo " all alias for dvi target" ;\ + @echo " all alias for pdf target" ;\ echo " allpdf alias for pdf target" ;\ - + echo " alldvi alias for dvi target" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd index d3bc974cf93..dbadd220a2b 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd @@ -3,6 +3,8 @@ rem Makefile for documents and templates rem Author: Stanislav Kruchinin +set bibtex=bibtex8 +set bibtexflags=-H -c cp1251 set latexnmk=call ..\..\include\latex.nmk.cmd if "%1"=="" ( @@ -11,9 +13,11 @@ if "%1"=="" ( for %%f in (%*) do if "%%f"=="help" ( call :%%f ) else if "%%f"=="all" ( - %latexnmk% dvi + %latexnmk% pdf ) else if "%%f"=="allpdf" ( %latexnmk% pdf + ) else if "%%f"=="alldvi" ( + %latexnmk% dvi ) else ( %latexnmk% %%f ) @@ -22,8 +26,8 @@ if "%1"=="" ( exit /b :help - echo all alias for dvi target + echo all alias for pdf target echo allpdf alias for pdf target + echo alldvi alias for dvi target %latexnmk% help goto :eof - diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib index e4c225cdc29..268d9e817b8 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib @@ -1,3 +1,32 @@ +@ARTICLE{Ivanov_1999_Journal_17_173, + author = {. . and . . and . . }, + title = { }, + journal = { }, + volume = {17}, + pages = {173--180}, + year = {1999}, + language = {russian}, +} + +@ARTICLE{Petrov_2001_Journal_23_12321, + author = {. . and . . and . . }, + title = { }, + journal = { }, + volume = {23}, + pages = {12321--12328}, + year = {2001}, + language = {russian}, +} + +@ARTICLE{Sidorov_2002_Journal_32_1531, + author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov}, + title = {Article Title}, + journal = {Journal Name}, + volume = {32}, + pages = {1531--1540}, + year = {2002}, +} + @ARTICLE{Yoffe_1993_AP_42_173, author = {A. D. Yoffe}, title = {Low-dimensional systems: quantum size effects and electronic @@ -54,7 +83,7 @@ } @INCOLLECTION{InP, - title = {InP Basic Parameters at 300 K}, + title = {{\relax InP} Basic Parameters at 300 K}, booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties}, organization = {Ioffe Physico-Technical Institute}, @@ -69,15 +98,73 @@ title = { }, school = { . .~.~}, + type = {. . .-. }, year = {1996}, language = {russian}, } -@DOCDISSER{Skvortsov_2008, +@DSCITHESIS{Skvortsov_2008, author = {. . }, - title = { - }, + title = { }, school = { . .~.~}, + type = {. - .-. }, year = {2008}, language = {russian}, } + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {. . }, + authortype = {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {. 7 (I .)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, +} + +@PATENT{patent2, + author = {. . }, + authortype = {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, +} 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 9f31bf48d52..1460e6ca401 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex @@ -1,11 +1,11 @@ \documentclass[% -master, % -natbib, % natbib "" -subf, % subcaption -href, % hyperref -colorlinks=true % -%,fixint=false % -%,times % Times +master, % +natbib, % natbib "" +subf, % subcaption +href, % hyperref +colorlinks, % +%times, % Times +%fixint, % ]{disser} \usepackage[ @@ -15,7 +15,6 @@ colorlinks=true % \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} -%\usepackage{tabularx,longtable} \ifpdf\usepackage{epstopdf}\fi % @@ -138,9 +137,14 @@ colorlinks=true % % \input{concl} +% +\newcommand\BibDash{"---} +% +\let\BibEmph=\emph +\bibliographystyle{gost705} + % \bibliography{thesis} -\bibliographystyle{gost705} % \appendix diff --git a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd index b3ef1b9847e..a65aab97a2b 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd @@ -41,6 +41,7 @@ goto :eof :install if not exist "!docdir!" mkdir "!docdir!" xcopy /y /e /i /f ..\templates "!docdir!\templates" + xcopy /y /e /i /f ..\templates-utf8 "!docdir!\templates-utf8" xcopy /y /e /i /f ..\include "!docdir!\include" goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile b/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile index 30faef4990e..105e4055c17 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile @@ -3,16 +3,19 @@ # Author: Stanislav Kruchinin # -TARGET?=thesis - +TARGET ?= thesis +BIBTEX ?= bibtex8 +BIBTEXFLAGS ?= -H -c cp1251 include ../../include/latex.mk -all: dvi +all: pdf allpdf: pdf +alldvi: dvi + help: .help - @echo " all alias for dvi target" ;\ + @echo " all alias for pdf target" ;\ echo " allpdf alias for pdf target" ;\ - + echo " alldvi alias for dvi target" ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd index d3bc974cf93..0278f9061ba 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd @@ -3,6 +3,8 @@ rem Makefile for documents and templates rem Author: Stanislav Kruchinin +set bibtex=bibtex8 +set bibtexflags=-H -c cp1251 set latexnmk=call ..\..\include\latex.nmk.cmd if "%1"=="" ( @@ -11,9 +13,11 @@ if "%1"=="" ( for %%f in (%*) do if "%%f"=="help" ( call :%%f ) else if "%%f"=="all" ( - %latexnmk% dvi + %latexnmk% pdf ) else if "%%f"=="allpdf" ( %latexnmk% pdf + ) else if "%%f"=="alldvi" ( + %latexnmk% dvi ) else ( %latexnmk% %%f ) @@ -22,8 +26,9 @@ if "%1"=="" ( exit /b :help - echo all alias for dvi target + echo all alias for pdf target echo allpdf alias for pdf target + echo alldvi alias for dvi target %latexnmk% help goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib index 19f2cd1c771..268d9e817b8 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib @@ -1,60 +1,170 @@ +@ARTICLE{Ivanov_1999_Journal_17_173, + author = {. . and . . and . . }, + title = { }, + journal = { }, + volume = {17}, + pages = {173--180}, + year = {1999}, + language = {russian}, +} + +@ARTICLE{Petrov_2001_Journal_23_12321, + author = {. . and . . and . . }, + title = { }, + journal = { }, + volume = {23}, + pages = {12321--12328}, + year = {2001}, + language = {russian}, +} + +@ARTICLE{Sidorov_2002_Journal_32_1531, + author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov}, + title = {Article Title}, + journal = {Journal Name}, + volume = {32}, + pages = {1531--1540}, + year = {2002}, +} + @ARTICLE{Yoffe_1993_AP_42_173, - author = {A. D. Yoffe}, - title = {Low-dimensional systems: quantum size effects and electronic - properties of semiconductor microcrystallites (zero-dimensional - systems) and some quasi-two-dimensional systems}, - journal = {Adv. Phys.}, - pages = {173--266}, - volume = {42}, - year = {1993} + author = {A. D. Yoffe}, + title = {Low-dimensional systems: quantum size effects and electronic + properties of semiconductor microcrystallites (zero-dimensional + systems) and some quasi-two-dimensional systems}, + journal = {Adv. Phys.}, + pages = {173--266}, + volume = {42}, + year = {1993}, + doi = {10.1080/00018739300101484}, } @ARTICLE{Efros_1982_FTP_16_7_1209, - author = {{\relax }. . and . . }, - title = { }, - journal = { }, - year = {1982}, - volume = {16}, - number = {7}, - pages = {1209--1214}, - language = {russian}, + author = {{\relax }. . and . . }, + title = { }, + journal = { }, + year = {1982}, + volume = {16}, + number = {7}, + pages = {1209--1214}, + language = {russian}, } @BOOK{Anselm_1978, - author = {. . }, - title = { }, - publisher = {}, - address = {}, - year = {1978}, - language = {russian} + author = {. . }, + title = { }, + publisher = {}, + address = {}, + year = {1978}, + language = {russian}, } @INPROCEEDINGS{Segall_1968, - author = {B. Segall}, - year = {1968}, - editor = {S. M. Ryvkin}, - booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968}, - pages = {425}, - address = {Leningrad}, - publisher = {Nauka} + author = {B. Segall}, + year = {1968}, + editor = {S. M. Ryvkin}, + booktitle = {Proceedings of IXth Conference on the Physics of + Semiconductors, Moscow, 1968}, + pages = {425}, + address = {Leningrad}, + publisher = {Nauka}, } @INBOOK{Agranovich_1983, - editor = {V. M. Agranovich and R. M. Hochstrasser}, - title = {Spectroscopy and Excitation Dynamics of Condensed Molecular Systems}, - chapter = {6}, - publisher = {North-Holland}, - year = {1983}, - series = {Modern Problems in Condensed Matter Sciences}, - address = {Amsterdam} + editor = {V. M. Agranovich and R. M. Hochstrasser}, + title = {Spectroscopy and Excitation Dynamics of Condensed Molecular + Systems}, + chapter = {6}, + publisher = {North-Holland}, + year = {1983}, + series = {Modern Problems in Condensed Matter Sciences}, + address = {Amsterdam}, + isbn = {0444863133}, } @INCOLLECTION{InP, - title = {InP Basic Parameters at 300 K}, - booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties}, + title = {{\relax InP} Basic Parameters at 300 K}, + booktitle = {Electronic archive New Semiconductor Materials. + Characteristics and Properties}, organization = {Ioffe Physico-Technical Institute}, - address = {St. Petersburg}, - year = {2001}, - url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, - urldate = {01.11.2009} + address = {St. Petersburg}, + year = {2001}, + url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, + urldate = {01.11.2009}, +} + +@PHDTHESIS{Mishchenko_1996, + author = {. . }, + title = { + }, + school = { . .~.~}, + type = {. . .-. }, + year = {1996}, + language = {russian}, +} + +@DSCITHESIS{Skvortsov_2008, + author = {. . }, + title = { }, + school = { . .~.~}, + type = {. - .-. }, + year = {2008}, + language = {russian}, +} + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} + +@PATENT{patent1, + author = {. . }, + authortype = {}, + title = { -}, + media = {}, + type = {}, + number = {1095735}, + location = {. }, + ipc = {\ensuremath{^7} B 64 G 1/00}, + holder = { /, .}, + credits = {. . .}, + reqnumber = {000108705/28}, + reqdate = {07.04.2000}, + pubdate = {10.03.2001}, + publication = {. 7 (I .)}, + prdate = {09.04.1999}, + prnumber = {09/289, 037}, + prcountry = {}, + pagetotal = {5 .~: .}, + language = {russian}, +} + +@PATENT{patent2, + author = {. . }, + authortype = {}, + title = { }, + media = {}, + type = {.}, + number = {2000131736/09}, + location = {. }, + ipc = {\ensuremath{^7} H 04 1/38, 04 J 13/00}, + holder = { . .-. - .}, + credits = {. . .}, + reqnumber = {000108705/28}, + date = {18.12.2000}, + publdate = {20.08.2002}, + publication = {. 23 (II .)}, + pagetotal = {2 .~: .}, + language = {russian}, } 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 3f7410090e3..72d90bae195 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex @@ -1,11 +1,11 @@ \documentclass[% -specialist, % -natbib, % natbib "" -subf, % subcaption -href, % hyperref -colorlinks=true % -%,fixint=false % -%,times % Times +specialist, % +natbib, % natbib "" +subf, % subcaption +href, % hyperref +colorlinks, % +%times, % Times +%fixint, % ]{disser} \usepackage[ @@ -15,7 +15,6 @@ colorlinks=true % \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} -%\usepackage{tabularx,longtable} \ifpdf\usepackage{epstopdf}\fi % @@ -33,7 +32,6 @@ colorlinks=true % \graphicspath{{fig/}} -%---------------------------------------------------------------- \begin{document} % @@ -123,8 +121,13 @@ colorlinks=true % % \input{concl} +% +\newcommand\BibDash{"---} +% +\let\BibEmph=\emph +\bibliographystyle{gost705} + % \bibliography{thesis} -\bibliographystyle{gost705} \end{document} diff --git a/Master/texmf-dist/source/latex/disser/autoref.dtx b/Master/texmf-dist/source/latex/disser/autoref.dtx index 6fcc9195b99..0b0f590d204 100644 --- a/Master/texmf-dist/source/latex/disser/autoref.dtx +++ b/Master/texmf-dist/source/latex/disser/autoref.dtx @@ -18,11 +18,11 @@ \if@titlepage\renewcommand\maketitle{ % \end{macrocode} % . -% \DescribeMacro{\firstskip}\index{ !\verb*+\firstskip+} -% \DescribeMacro{\secondskip}\index{ !\verb*+\secondskip+} -% \DescribeMacro{\thirdskip}\index{ !\verb*+\thirdskip+} -% \DescribeMacro{\fourthskip}\index{ !\verb*+\fourthskip+} -% \DescribeMacro{\fifthskip}\index{ !\verb*+\fifthskip+} +% \DescribeMacro{\firstskip}\index{!\verb*+\firstskip+} +% \DescribeMacro{\secondskip}\index{!\verb*+\secondskip+} +% \DescribeMacro{\thirdskip}\index{!\verb*+\thirdskip+} +% \DescribeMacro{\fourthskip}\index{!\verb*+\fourthskip+} +% \DescribeMacro{\fifthskip}\index{!\verb*+\fifthskip+} % \begin{macrocode} \ifundeflength\firstskip{1cm} \ifundeflength\secondskip{3cm} diff --git a/Master/texmf-dist/source/latex/disser/bachelor.dtx b/Master/texmf-dist/source/latex/disser/bachelor.dtx index 76877531a04..41ddcaf9688 100644 --- a/Master/texmf-dist/source/latex/disser/bachelor.dtx +++ b/Master/texmf-dist/source/latex/disser/bachelor.dtx @@ -4,7 +4,7 @@ %<*bachelor> % \end{macrocode} -% \subsubsection{ } +% \subsubsection{ } % % . % \begin{macrocode} @@ -81,27 +81,29 @@ % \end{macrocode} % \paragraph{ } % \begin{macrocode} -\begin{center}% +\begin{center} {\instfont\@institution} \end{center} % \end{macrocode} -% +% % \begin{macrocode} \vskip\firstskip {\@approved} \vskip\secondskip - % \end{macrocode} -% , . +% +% \begin{macrocode} +\begin{center} + {\titlefont\@title} + \vskip\thirdskip +% \end{macrocode} +% % \begin{macrocode} -\begin{center}% - {\titlefont\@title\par}% - \vskip\thirdskip% - {\topiclabelfont\topiclabel\ }% + {\topiclabelfont\topiclabel\ } {\topicfont\@topic} - \vskip\fourthskip\normalfont% - \courselabel\ \@coursenum~--\ \@course% + \vskip\fourthskip\normalfont + {\courselabel\ \@coursenum~--\ \@course} \end{center} % \end{macrocode} @@ -109,6 +111,10 @@ % \begin{macrocode} \vskip\fifthskip \begin{tabbing} +% \end{macrocode} +% +% . ... +% \begin{macrocode} \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] % \end{macrocode} % . diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index 6964a6a80f3..73f09869162 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -26,7 +26,7 @@ \def\sconname{Scientific Consultant} \def\sconlabel{\sconname} \def\sconsndname{\sconname} - \def\sconsndlabel{\sconsndname} + \def\sconsndlabel{\sconname} \def\topicname{Topic} \def\asmanuscript{As Manuscript} \fi @@ -44,10 +44,10 @@ % \begin{macrocode} \ifx\firstskip\undefined \newlength\firstskip - \ifDis@libcat - \setlength\firstskip{2ex} - \else + \ifx\@libcatnum\empty \setlength\firstskip{4ex} + \else + \setlength\firstskip{2ex} \fi \fi \ifundeflength\secondskip{2cm} @@ -55,6 +55,7 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\libcatskip{0cm} \ifundeflength\specskip{-6pt} \ifundeflength\saskip{0pt} @@ -88,7 +89,7 @@ % \end{macrocode} % % \begin{macrocode} - \asmanuscript%\\ %avoid no line to end error + \asmanuscript % \end{macrocode} % % \begin{macrocode} @@ -96,7 +97,10 @@ % \end{macrocode} % % \begin{macrocode} - \ifDis@libcat\libcatname\ \@libcatnum\fi + \ifx\@libcatnum\empty\else + \vskip\libcatskip + {\libcatname\ \@libcatnum} + \fi \end{flushright} \begin{center} % \end{macrocode} @@ -116,7 +120,7 @@ {\specfont\@specnum~--\ \@spec} \ifx\@specsndnum\empty\else \vskip\specskip - {\specfont\@specsndnum~--\ \@specsnd} + {\specfont\@specsndnum~--\ \@specsnd} \fi % \end{macrocode} % ... diff --git a/Master/texmf-dist/source/latex/disser/counters.dtx b/Master/texmf-dist/source/latex/disser/counters.dtx index a429c8aed1d..b1deb46a13c 100644 --- a/Master/texmf-dist/source/latex/disser/counters.dtx +++ b/Master/texmf-dist/source/latex/disser/counters.dtx @@ -12,25 +12,25 @@ % % , % ( |\part|, |\chapter| |\section|). -% \DescribeMacro{tocdepth}\index{!\verb*+tocdepth+} +% \DescribeCounter{tocdepth} % \begin{macrocode} \setcounter{tocdepth}{1} % \end{macrocode} % % ( |\part|, |\chapter|, |\section| |\subsection|). -% \DescribeMacro{secnumdepth}\index{!\verb*+secnumdepth+} +% \DescribeCounter{secnumdepth} % \begin{macrocode} \setcounter{secnumdepth}{2} % \end{macrocode} % -% \DescribeMacro{part}\index{!\verb*+part+} -% \DescribeMacro{chapter}\index{!\verb*+chapter+} -% \DescribeMacro{section}\index{!\verb*+section+} -% \DescribeMacro{subsection}\index{!\verb*+subsection+} -% \DescribeMacro{subsubsection}\index{!\verb*+subsubsection+} -% \DescribeMacro{paragraph}\index{!\verb*+paragraph+} -% \DescribeMacro{subparagraph}\index{!\verb*+subparagraph+} +% \DescribeCounter{part} +% \DescribeCounter{chapter} +% \DescribeCounter{section} +% \DescribeCounter{subsection} +% \DescribeCounter{subsubsection} +% \DescribeCounter{paragraph} +% \DescribeCounter{subparagraph} % \begin{macrocode} \newcounter{part} \newcounter{chapter} @@ -42,8 +42,8 @@ % \end{macrocode} % -% \DescribeMacro{figure}\index{!\verb*+figure+} -% \DescribeMacro{table}\index{!\verb*+table+} +% \DescribeCounter{figure} +% \DescribeCounter{table} % \begin{macrocode} \newcounter{figure}[chapter] \newcounter{table}[chapter] @@ -84,14 +84,14 @@ % \DescribeMacro{\toctheparagraph}\index{!\verb*+\toctheparagraph+} % \DescribeMacro{\tocthesubparagraph}\index{!\verb*+\tocthesubparagraph+} % \begin{macrocode} -\newcommand\tocthepart{\thepart} -\newcommand\tocthechapter{\thechapter} -\newcommand\toctheappendix{\theappendix} -\newcommand\tocthesection{\thesection} -\newcommand\tocthesubsection{\thesubsection} -\newcommand\tocthesubsubsection{\thesubsubsection} -\newcommand\toctheparagraph{\theparagraph} -\newcommand\tocthesubparagraph{\thesubparagraph} +\providecommand\tocthepart{\thepart} +\providecommand\tocthechapter{\thechapter} +\providecommand\toctheappendix{\theappendix} +\providecommand\tocthesection{\thesection} +\providecommand\tocthesubsection{\thesubsection} +\providecommand\tocthesubsubsection{\thesubsubsection} +\providecommand\toctheparagraph{\theparagraph} +\providecommand\tocthesubparagraph{\thesubparagraph} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx index 6410d7762a4..3bdcb1e3840 100644 --- a/Master/texmf-dist/source/latex/disser/custom.dtx +++ b/Master/texmf-dist/source/latex/disser/custom.dtx @@ -9,9 +9,9 @@ % \end{macrocode} % \subsection{ } % -% \DescribePackage{amsmath}\index{!\verb*+amsmath+} -% \DescribePackage{amssymb}\index{!\verb*+amssymb+} -% \DescribePackage{amsfonts}\index{!\verb*+amsfonts+} +% \DescribePackage{amsmath} +% \DescribePackage{amssymb} +% \DescribePackage{amsfonts} % \begin{macrocode} \ifDis@ams \usepackage[intlimits]{amsmath} @@ -38,26 +38,27 @@ \ifDis@mtpro \AtBeginDocument{% % \end{macrocode} -% \DescribePackage{mtpro}\index{!\verb*+mtpro+} +% \DescribePackage{mtpro2} % \begin{macrocode} \IfFileExists{mtpro2.sty}{ \usepackage[subscriptcorrection,nofontinfo]{mtpro2} }{ +% \DescribePackage{mtpro} \IfFileExists{mtpro.sty}{ \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro} }{ \PackageWarning{disser}% - {Unable to find mtpro package. Font is unchanged.} + {Unable to find mtpro2 or mtpro package. Math font is unchanged.} } } } \else % \end{macrocode} -% \DescribePackage{txfonts}\index{!\verb*+txfonts+} +% \DescribePackage{newtxmath} % \begin{macrocode} \AtEndOfPackage{% - \IfFileExists{txfonts.sty}{ - \usepackage{txfonts} + \IfFileExists{newtxmath.sty}{ + \usepackage[varg,cmbraces,cmintegrals]{newtxmath} }{ \PackageWarning{disser}% {Unable to find txfonts package. Font is unchanged.} @@ -67,7 +68,7 @@ \AtEndOfPackage{% \IfFileExists{pscyr.sty}{ % \end{macrocode} -% \DescribePackage{pscyr}\index{!\verb*+pscyr+} +% \DescribePackage{pscyr} % Times , % . % \begin{macrocode} @@ -77,7 +78,7 @@ }{ \IfFileExists{cyrtimes.sty}{ % \end{macrocode} -% \DescribePackage{cyrtimes}\index{!\verb*+cyrtimes+} +% \DescribePackage{cyrtimes} % \pkg{pscyr} \pkg{cyrtimes}, % \TeX Live. % \begin{macrocode} @@ -120,7 +121,7 @@ % \end{macrocode} % \subsubsection{ } -% \DescribePackage{natbib}\index{!\verb*+natbib+} +% \DescribePackage{natbib} % \begin{macrocode} \ifDis@natbib \usepackage[square,comma,sort&compress,numbers]{natbib} @@ -130,13 +131,11 @@ % \DescribeMacro{\bibsection}\index{!\verb*+\bibsection+} % \DescribeMacro{\bibpreamble}\index{!\verb*+\bibpreamble+} % \DescribeMacro{\bibpostamble}\index{!\verb*+\bibpostamble+} -% \DescribeMacro{\bibfont}\index{!\verb*+\bibfont+} % \DescribeMacro{\bibsep}\index{!\verb*+\bibsep+} % \begin{macrocode} - \newcommand\bibsection{} - \newcommand\bibpreamble{} - \newcommand\bibpostamble{} - \newcommand\bibfont{\normalfont\selectfont} + \providecommand*\bibsection{} + \providecommand*\bibpreamble{} + \providecommand*\bibpostamble{} \newlength\bibsep \fi @@ -187,7 +186,7 @@ \renewenvironment{thebibliography}[1]{ \bibsection \parindent\z@ - \bibpreamble\bibfont + \bibpreamble\normalfont\selectfont \list{\@biblabel{\@arabic\c@enumiv}}{\settowidth\labelwidth{\@biblabel{#1}}% \setlength{\itemsep}{\bibsep} \setlength{\parsep}{\bibsep} @@ -212,8 +211,8 @@ % % \pkg{caption} \pkg{subcaption} % . -% \DescribePackage{caption}\index{!\verb*+caption+} -% \DescribePackage{subcaption}\index{!\verb*+subcaption+} +% \DescribePackage{caption} +% \DescribePackage{subcaption} % \begin{macrocode} \ifDis@subf \usepackage[config,font=small,labelsep=period]{caption} @@ -237,7 +236,7 @@ \ifpdf \ifDis@href % \end{macrocode} -% \DescribePackage{hyperref}\index{!\verb*+hyperref+} +% \DescribePackage{hyperref} % \begin{macrocode} \usepackage[pdftex,unicode]{hyperref} \hypersetup{ @@ -251,20 +250,20 @@ \pdfcompresslevel = 9 \fi % \end{macrocode} -% \DescribePackage{graphicx}\index{!\verb*+graphicx+} -% \DescribePackage{cmap}\index{!\verb*+cmap+} +% \DescribePackage{graphicx} +% \DescribePackage{cmap} % \begin{macrocode} \usepackage[pdftex]{graphicx} \usepackage{cmap} \else \ifDis@href % \end{macrocode} -% \DescribePackage{hyperref}\index{!\verb*+hyperref+} +% \DescribePackage{hyperref} % \begin{macrocode} \usepackage[hypertex,colorlinks=false]{hyperref} \fi % \end{macrocode} -% \DescribePackage{graphicx}\index{!\verb*+graphicx+} +% \DescribePackage{graphicx} % \begin{macrocode} \usepackage{graphicx} \fi diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index f5e4da9f82b..25652a8f366 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}[2016/01/27 1.3.4 Document class for dissertations] +\ProvidesFile{disser.drv}[2016/06/26 1.4.0 Document class for dissertations] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -49,16 +49,6 @@ menucolor = darkblue, urlcolor = darkblue } -\IfFileExists{pscyr.sty}{% - \usepackage{pscyr} - \renewcommand\ttdefault{cmtt} - \renewcommand\rmdefault{ftm} -}{ - \IfFileExists{cyrtimes.sty}{% - \renewcommand\ttdefault{cmtt} - \renewcommand\rmdefault{ftm} - }{} -} \IfFileExists{url.sty}{\usepackage{url}}{\newcommand\url{\texttt}} \usepackage[T2A]{fontenc} @@ -82,7 +72,17 @@ \let\makelabel\deflabel} }{\end{list}} -\let\DescribePackage=\DescribeEnv +\newcommand\DescribePackage[1]{% + \DescribeEnv{#1}\index{!\texttt{#1}} +} + +\newcommand\DescribeCounter[1]{% + \DescribeMacro{#1}\index{!\texttt{#1}} +} + +\newcommand\DescribeOption[1]{ + \DescribeMacro{#1}\index{!\texttt{#1}} +} \makeatletter \def\IndexParms{% @@ -111,6 +111,7 @@ \makeindex \GetFileInfo{disser.drv} + \begin{document} \sloppy \DocInput{disser.dtx} @@ -182,13 +183,12 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2015/07/25 1.3.2 % - Document class for dissertations] +\ProvidesClass{disser}[2016/06/26 1.4.0 Document class for dissertations] % \end{macrocode} % \pkg{kvoptions} % << = >>. -% \DescribePackage{kvoptions}\index{!\verb*+kvoptions+} +% \DescribePackage{kvoptions} % \begin{macrocode} \RequirePackage{kvoptions} @@ -196,12 +196,14 @@ % : % \begin{itemize} % \item \pkg{ifpdf}, |\ifpdf|. -% \DescribePackage{ifpdf}\index{!\verb*+ifpdf+} +% \DescribePackage{ifpdf} % \begin{macrocode} \RequirePackage{ifpdf} +% \end{macrocode} % \item \pkg{ifthen} . -% \DescribePackage{ifthen}\index{!\verb*+ifthen+} +% \DescribePackage{ifthen} +% \begin{macrocode} \RequirePackage{ifthen} % \end{macrocode} @@ -267,6 +269,14 @@ % \begin{macrocode} \newif\ifDis@natbib\Dis@natbibfalse % \end{macrocode} +% \item (). +% \begin{macrocode} +\newif\ifDis@colorlinks\Dis@colorlinksfalse +% \end{macrocode} +% \item (). +% \begin{macrocode} +\newif\ifDis@fixint\Dis@fixintfalse +% \end{macrocode} % \end{itemize} % % \subsection{ } @@ -299,6 +309,14 @@ % \begin{macrocode} \DeclareOption{natbib}{\Dis@natbibtrue} % \end{macrocode} +% . +% \begin{macrocode} +\DeclareOption{fixint}{\Dis@fixinttrue} +% \end{macrocode} +% . +% \begin{macrocode} +\DeclareOption{colorlinks}{\Dis@colorlinkstrue} +% \end{macrocode} % . % \begin{macrocode} \DeclareOption{a4paper}{% @@ -386,8 +404,8 @@ % \begin{macrocode} \DeclareOption{mtpro}{\Dis@mtprotrue} % \end{macrocode} -% , -% . +% , +% . % \begin{macrocode} \DeclareOption{openbib}{% \AtEndOfPackage{% @@ -450,20 +468,14 @@ \Dis@autoreftrue } +% \end{macrocode} +% <<->>. +% \begin{macrocode} \SetupKeyvalOptions{ family=Dis, prefix=Dis@ } -% \end{macrocode} -% -% . -% \begin{macrocode} -\DeclareBoolOption[true]{fixint} -% \end{macrocode} -% . -% \begin{macrocode} -\DeclareBoolOption[false]{colorlinks} \DeclareStringOption{substylefile} % \end{macrocode} @@ -494,9 +506,9 @@ \AtEndOfClass{\input{\Dis@substylefile}} % \end{macrocode} -% |\MakeTextUppercase| -% |\MakeTextLowercase|. -% \DescribeMacro{textcase}\index{!\verb*+textcase+} +% |\MakeTextUppercase| +% |\MakeTextLowercase|. +% \DescribePackage{textcase} % \begin{macrocode} \RequirePackage[overload]{textcase} @@ -591,7 +603,7 @@ % \end{macrocode} % , |\newlength| |\setlength|. -% \DescribeMacro{\Dis@deflength}\index{!\verb*+\Dis@deflength+} +% \DescribeMacro{\Dis@deflength}\index{!\verb*+\Dis"@deflength+} % \begin{macrocode} \providecommand\Dis@deflength[2]{\newlength{#1}\setlength{#1}{#2}} \providecommand\ifundeflength[2]{% @@ -612,9 +624,9 @@ \setlength\normallineskip{1\p@} % \end{macrocode} -% \DescribeMacro{\Dis@singlespacing} \index{!\verb*+\Dis@singlespacing+} -% \DescribeMacro{\Dis@onehalfspacing}\index{!\verb*+\Dis@onehalfspacing+} -% \DescribeMacro{\Dis@doublespacing} \index{!\verb*+\Dis@doublespacing+} +% \DescribeMacro{\Dis@singlespacing} \index{!\verb*+\Dis"@singlespacing+} +% \DescribeMacro{\Dis@onehalfspacing}\index{!\verb*+\Dis"@onehalfspacing+} +% \DescribeMacro{\Dis@doublespacing} \index{!\verb*+\Dis"@doublespacing+} % . % \begin{macrocode} \newcommand\Dis@singlespacing {\renewcommand\baselinestretch{1}\normalsize} diff --git a/Master/texmf-dist/source/latex/disser/doctor.dtx b/Master/texmf-dist/source/latex/disser/doctor.dtx index e8571ebe9f0..e528782e1a4 100644 --- a/Master/texmf-dist/source/latex/disser/doctor.dtx +++ b/Master/texmf-dist/source/latex/disser/doctor.dtx @@ -39,10 +39,10 @@ % \begin{macrocode} \ifx\firstskip\undefined \newlength\firstskip - \ifDis@libcat - \setlength\firstskip{1ex} - \else + \ifx\@libcatnum\empty \setlength\firstskip{4ex} + \else + \setlength\firstskip{2ex} \fi \fi \ifundeflength\secondskip{3cm} @@ -50,6 +50,7 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\libcatskip{0cm} \ifundeflength\specskip{-6pt} % \end{macrocode} @@ -82,7 +83,7 @@ % \end{macrocode} % % \begin{macrocode} - \asmanuscript\\ + \asmanuscript % \end{macrocode} % % \begin{macrocode} @@ -90,7 +91,10 @@ % \end{macrocode} % % \begin{macrocode} - \ifDis@libcat\libcatname\ \@libcatnum\fi + \ifx\@libcatnum\empty\else + \vskip\libcatskip + {\libcatname\ \@libcatnum} + \fi \end{flushright} \begin{center} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/floats.dtx b/Master/texmf-dist/source/latex/disser/floats.dtx index 30fc8bfe4e0..0fff4ca0b14 100644 --- a/Master/texmf-dist/source/latex/disser/floats.dtx +++ b/Master/texmf-dist/source/latex/disser/floats.dtx @@ -14,19 +14,19 @@ % \begin{itemize} % \item , % ( --- ). -% \DescribeMacro{topnumber}\index{!\verb*+topnumber+} +% \DescribeCounter{topnumber} % \begin{macrocode} \setcounter{topnumber}{2} % \end{macrocode} % \item , % ( --- ). -% \DescribeMacro{bottomnumber}\index{!\verb*+bottomnumber+} +% \DescribeCounter{bottomnumber} % \begin{macrocode} \setcounter{bottomnumber}{1} % \end{macrocode} % \item , % ( --- ). -% \DescribeMacro{totalnumber}\index{!\verb*+totalnumber+} +% \DescribeCounter{totalnumber} % \begin{macrocode} \setcounter{totalnumber}{3} % \end{macrocode} @@ -83,12 +83,12 @@ % % \subsubsection{ } % -% \DescribeMacro{\abovecaptionskip}\index{!\verb*+\abovecaptionskip+} +% \DescribeMacro{\abovecaptionskip}\index{!\verb*+\abovecaptionskip+} % . % \begin{macrocode} \Dis@deflength\abovecaptionskip{10\p@} % \end{macrocode} -% \DescribeMacro{\belowcaptionskip}\index{!\verb*+\belowcaptionskip+} +% \DescribeMacro{\belowcaptionskip}\index{!\verb*+\belowcaptionskip+} % . % \begin{macrocode} \Dis@deflength\belowcaptionskip{0\p@} diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index a8439bd0347..eef65bff23b 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % This bibliography style attempts to format bibliography according to -% GOST R 7.0.5-2008 with some conventional modifications. +% GOST R 7.0.5-2008 with some modifications. % % Based on style gost71u.bst by Maksym Polyakov. % @@ -16,8 +16,7 @@ % % bibtex8 -H -c .csf % -% Copyright (C) 2004-2014 by -% Stanislav Kruchinin +% Copyright (C) Stanislav Kruchinin % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -155,7 +154,7 @@ and the derived files % %<*driver> \ProvidesFile{gost705.drv}% - [2013/12/25 1.3.0 Bibliography style for GOST R 7.0.5-2008] + [2016/06/18 1.4.0 Bibliography style for GOST R 7.0.5-2008] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -183,18 +182,6 @@ and the derived files menucolor = darkblue, urlcolor = darkblue } -\IfFileExists{pscyr.sty}{% - \usepackage{pscyr} - \renewcommand\ttdefault{cmtt} - \renewcommand\rmdefault{ftm} -}{ - \IfFileExists{cyrtimes.sty}{% - \renewcommand\ttdefault{cmtt} - \renewcommand\rmdefault{ftm} - }{} -} -\IfFileExists{url.sty}{\RequirePackage{url}}{\newcommand\url{\texttt}} - \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} @@ -205,11 +192,8 @@ and the derived files \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}} +\newcommand\DescribeFunction[1]{ + \DescribeMacro{#1}\index{\texttt{#1}} } \makeatletter @@ -328,10 +312,10 @@ ENTRY % \subsection{ } % \begin{macrocode} INTEGERS { output.state before.all mid.sentence after.sentence after.block -after.dblslash after.slash after.colon after.semicolon after.dash } +after.dblslash after.slash after.colon after.semicolon } % \end{macrocode} -% \DescribeBSTFunction{init.state.consts} +% \DescribeFunction{init.state.consts} % \begin{macrocode} FUNCTION {init.state.consts} { @@ -343,7 +327,6 @@ FUNCTION {init.state.consts} #5 'after.slash := #6 'after.colon := #7 'after.semicolon := - #8 'after.dash := } STRINGS { s t } @@ -352,7 +335,7 @@ STRINGS { curlanguage } % \end{macrocode} % \subsection{ } -% \DescribeBSTFunction{change.language} +% \DescribeFunction{change.language} % \begin{macrocode} FUNCTION {change.language} { @@ -368,7 +351,7 @@ FUNCTION {change.language} % \end{macrocode} % \subsection{ } -% \DescribeBSTFunction{output.nonnull} +% \DescribeFunction{output.nonnull} % \begin{macrocode} FUNCTION {output.nonnull} { @@ -376,7 +359,8 @@ FUNCTION {output.nonnull} output.state mid.sentence = { ", " * write$ } { output.state after.block = - { add.period$ " " * write$ + { add.period$ write$ + " \BibDash " write$ newline$ "\newblock " write$ } @@ -390,11 +374,7 @@ FUNCTION {output.nonnull} { ": " * write$ } { output.state after.semicolon = { "; " * write$ } - { output.state after.dash = - { "~--- " * write$ } - { add.period$ " " * write$ } - if$ - } + { add.period$ " " * write$ } if$ } if$ @@ -412,7 +392,7 @@ FUNCTION {output.nonnull} } % \end{macrocode} -% \DescribeBSTFunction{output} +% \DescribeFunction{output} % \begin{macrocode} FUNCTION {output} { @@ -423,7 +403,7 @@ FUNCTION {output} } % \end{macrocode} -% \DescribeBSTFunction{output.check} +% \DescribeFunction{output.check} % \begin{macrocode} FUNCTION {output.check} { @@ -436,7 +416,7 @@ FUNCTION {output.check} % \end{macrocode} % \subsection{ } -% \DescribeBSTFunction{fin.entry} +% \DescribeFunction{fin.entry} % \begin{macrocode} FUNCTION {fin.entry} { @@ -446,7 +426,7 @@ FUNCTION {fin.entry} } % \end{macrocode} -% \DescribeBSTFunction{new.block} +% \DescribeFunction{new.block} % \begin{macrocode} FUNCTION {new.block} { @@ -457,7 +437,7 @@ FUNCTION {new.block} } % \end{macrocode} -% \DescribeBSTFunction{new.dblslash} +% \DescribeFunction{new.dblslash} % \begin{macrocode} FUNCTION {new.dblslash} { @@ -468,7 +448,7 @@ FUNCTION {new.dblslash} } % \end{macrocode} -% \DescribeBSTFunction{new.slash} +% \DescribeFunction{new.slash} % \begin{macrocode} FUNCTION {new.slash} { @@ -479,7 +459,7 @@ FUNCTION {new.slash} } % \end{macrocode} -% \DescribeBSTFunction{new.colon} +% \DescribeFunction{new.colon} % \begin{macrocode} FUNCTION {new.colon} { @@ -490,7 +470,7 @@ FUNCTION {new.colon} } % \end{macrocode} -% \DescribeBSTFunction{new.semicolon} +% \DescribeFunction{new.semicolon} % \begin{macrocode} FUNCTION {new.semicolon} { @@ -501,18 +481,7 @@ FUNCTION {new.semicolon} } % \end{macrocode} -% \DescribeBSTFunction{new.dash} -% \begin{macrocode} -FUNCTION {new.dash} -{ - output.state before.all = - 'skip$ - { after.dash 'output.state := } - if$ -} - -% \end{macrocode} -% \DescribeBSTFunction{new.sentence} +% \DescribeFunction{new.sentence} % \begin{macrocode} FUNCTION {new.sentence} { @@ -527,12 +496,12 @@ FUNCTION {new.sentence} } % \end{macrocode} -% \DescribeBSTFunction{add.blank} +% \DescribeFunction{add.blank} % \begin{macrocode} FUNCTION {add.blank} { " " * before.all 'output.state := } % \end{macrocode} -% \DescribeBSTFunction{not} +% \DescribeFunction{not} % \begin{macrocode} FUNCTION {not} { @@ -542,7 +511,7 @@ FUNCTION {not} } % \end{macrocode} -% \DescribeBSTFunction{and} +% \DescribeFunction{and} % \begin{macrocode} FUNCTION {and} { @@ -552,7 +521,7 @@ FUNCTION {and} } % \end{macrocode} -% \DescribeBSTFunction{or} +% \DescribeFunction{or} % \begin{macrocode} FUNCTION {or} { @@ -562,7 +531,7 @@ FUNCTION {or} } % \end{macrocode} -% \DescribeBSTFunction{non.stop} +% \DescribeFunction{non.stop} % \begin{macrocode} FUNCTION {non.stop} { @@ -572,7 +541,7 @@ FUNCTION {non.stop} } % \end{macrocode} -% \DescribeBSTFunction{new.block.checka} +% \DescribeFunction{new.block.checka} % \begin{macrocode} FUNCTION {new.block.checka} { @@ -583,7 +552,7 @@ FUNCTION {new.block.checka} } % \end{macrocode} -% \DescribeBSTFunction{new.block.checkb} +% \DescribeFunction{new.block.checkb} % \begin{macrocode} FUNCTION {new.block.checkb} { @@ -596,7 +565,7 @@ FUNCTION {new.block.checkb} } % \end{macrocode} -% \DescribeBSTFunction{new.sentence.checka} +% \DescribeFunction{new.sentence.checka} % \begin{macrocode} FUNCTION {new.sentence.checka} { @@ -607,7 +576,7 @@ FUNCTION {new.sentence.checka} } % \end{macrocode} -% \DescribeBSTFunction{new.sentence.checkb} +% \DescribeFunction{new.sentence.checkb} % \begin{macrocode} FUNCTION {new.sentence.checkb} { @@ -620,7 +589,7 @@ FUNCTION {new.sentence.checkb} } % \end{macrocode} -% \DescribeBSTFunction{field.or.null} +% \DescribeFunction{field.or.null} % \begin{macrocode} FUNCTION {field.or.null} { @@ -631,7 +600,7 @@ FUNCTION {field.or.null} } % \end{macrocode} -% \DescribeBSTFunction{emphasize} +% \DescribeFunction{emphasize} % \begin{macrocode} FUNCTION {emphasize} { @@ -642,7 +611,7 @@ FUNCTION {emphasize} } % \end{macrocode} -% \DescribeBSTFunction{space.word} +% \DescribeFunction{space.word} % \begin{macrocode} FUNCTION {space.word} { " " swap$ * " " * } @@ -667,7 +636,7 @@ FUNCTION {bbl.edby} % { "\bbledby{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.cmplr} +% \DescribeFunction{bbl.cmplr} % \begin{macrocode} FUNCTION {bbl.cmplr} { @@ -686,7 +655,7 @@ FUNCTION {bbl.cmplr} } % \end{macrocode} -% \DescribeBSTFunction{bbl.edition} +% \DescribeFunction{bbl.edition} % \begin{macrocode} FUNCTION {bbl.edition} % { "\bbledition{}" } { @@ -705,7 +674,7 @@ FUNCTION {bbl.edition} % { "\bbledition{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.vvolume} +% \DescribeFunction{bbl.vvolume} % \begin{macrocode} FUNCTION {bbl.vvolume} % { "\bblVolume{}" } { @@ -724,7 +693,7 @@ FUNCTION {bbl.vvolume} % { "\bblVolume{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.vvol} +% \DescribeFunction{bbl.vvol} % \begin{macrocode} FUNCTION {bbl.vvol} % { "\bblVol{}" } { @@ -743,7 +712,7 @@ FUNCTION {bbl.vvol} % { "\bblVol{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.iissue} +% \DescribeFunction{bbl.iissue} % \begin{macrocode} FUNCTION {bbl.iissue} % { "\bblIssue{}" } { @@ -762,7 +731,7 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.iiss} +% \DescribeFunction{bbl.iiss} % \begin{macrocode} FUNCTION {bbl.iiss} % { "\bblIss{}" } { @@ -781,7 +750,7 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.of} +% \DescribeFunction{bbl.of} % \begin{macrocode} FUNCTION {bbl.of} % { "\bblof{}" } { @@ -800,7 +769,7 @@ FUNCTION {bbl.of} % { "\bblof{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.etal} +% \DescribeFunction{bbl.etal} % \begin{macrocode} FUNCTION {bbl.etal} % { "\bblof{}" } { @@ -819,7 +788,7 @@ FUNCTION {bbl.etal} % { "\bblof{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.nnumber} +% \DescribeFunction{bbl.nnumber} % \begin{macrocode} FUNCTION {bbl.nnumber} % { "\bblNumber{}" } { @@ -838,7 +807,7 @@ FUNCTION {bbl.nnumber} % { "\bblNumber{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.number} +% \DescribeFunction{bbl.number} % \begin{macrocode} FUNCTION {bbl.number} % { "\bblnumber{}" } { @@ -857,7 +826,7 @@ FUNCTION {bbl.number} % { "\bblnumber{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.nr} +% \DescribeFunction{bbl.nr} % \begin{macrocode} FUNCTION {bbl.nr} % { "\bblno{}" } { @@ -876,7 +845,7 @@ FUNCTION {bbl.nr} % { "\bblno{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.nnr} +% \DescribeFunction{bbl.nnr} % \begin{macrocode} FUNCTION {bbl.nnr} % { "\bblno{}" } { @@ -895,7 +864,7 @@ FUNCTION {bbl.nnr} % { "\bblno{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.in} +% \DescribeFunction{bbl.in} % \begin{macrocode} FUNCTION {bbl.in} % { "\bblin{}" } { @@ -914,7 +883,7 @@ FUNCTION {bbl.in} % { "\bblin{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.iin} +% \DescribeFunction{bbl.iin} % \begin{macrocode} FUNCTION {bbl.iin} % { "\bblIn{}" } { @@ -933,7 +902,7 @@ FUNCTION {bbl.iin} % { "\bblIn{}" } } % \end{macrocode} -% \DescribeBSTFunction{bbl.pages} +% \DescribeFunction{bbl.pages} % \begin{macrocode} FUNCTION {bbl.pages} % { "\bblpp." } { @@ -952,7 +921,7 @@ FUNCTION {bbl.pages} % { "\bblpp." } } % \end{macrocode} -% \DescribeBSTFunction{bbl.page} +% \DescribeFunction{bbl.page} % \begin{macrocode} FUNCTION {bbl.page} % { "\bblp." } { @@ -971,7 +940,7 @@ FUNCTION {bbl.page} % { "\bblp." } } % \end{macrocode} -% \DescribeBSTFunction{bbl.ppages} +% \DescribeFunction{bbl.ppages} % \begin{macrocode} FUNCTION {bbl.ppages} % { "\bblPp." } { @@ -990,7 +959,7 @@ FUNCTION {bbl.ppages} % { "\bblPp." } } % \end{macrocode} -% \DescribeBSTFunction{bbl.ppage} +% \DescribeFunction{bbl.ppage} % \begin{macrocode} FUNCTION {bbl.ppage} % { "\bblP." } { @@ -1009,7 +978,7 @@ FUNCTION {bbl.ppage} % { "\bblP." } } % \end{macrocode} -% \DescribeBSTFunction{bbl.techrep} +% \DescribeFunction{bbl.techrep} % \begin{macrocode} FUNCTION {bbl.techrep} { @@ -1028,7 +997,7 @@ FUNCTION {bbl.techrep} } % \end{macrocode} -% \DescribeBSTFunction{bbl.mthesis} +% \DescribeFunction{bbl.mthesis} % \begin{macrocode} FUNCTION {bbl.mthesis} { @@ -1048,7 +1017,7 @@ FUNCTION {bbl.mthesis} } % \end{macrocode} -% \DescribeBSTFunction{bbl.phdthesis} +% \DescribeFunction{bbl.phdthesis} % \begin{macrocode} FUNCTION {bbl.phdthesis} { @@ -1068,9 +1037,9 @@ FUNCTION {bbl.phdthesis} } % \end{macrocode} -% \DescribeBSTFunction{bbl.docdisser} +% \DescribeFunction{bbl.dscithesis} % \begin{macrocode} -FUNCTION {bbl.docdisser} +FUNCTION {bbl.dscithesis} { curlanguage "english" = { "Dr.\,Sci. dissertation" } @@ -1088,7 +1057,7 @@ FUNCTION {bbl.docdisser} } % \end{macrocode} -% \DescribeBSTFunction{bbl.req} +% \DescribeFunction{bbl.req} % \begin{macrocode} FUNCTION {bbl.req} { @@ -1107,7 +1076,7 @@ FUNCTION {bbl.req} } % \end{macrocode} -% \DescribeBSTFunction{bbl.publ} +% \DescribeFunction{bbl.publ} % \begin{macrocode} FUNCTION {bbl.publ} { @@ -1126,7 +1095,7 @@ FUNCTION {bbl.publ} } % \end{macrocode} -% \DescribeBSTFunction{bbl.prio} +% \DescribeFunction{bbl.prio} % \begin{macrocode} FUNCTION {bbl.prio} { @@ -1150,7 +1119,7 @@ FUNCTION {bbl.prio} INTEGERS { nameptr namesleft numnames } % \end{macrocode} -% \DescribeBSTFunction{format.names} +% \DescribeFunction{format.names} % \begin{macrocode} FUNCTION {format.names} { @@ -1188,7 +1157,7 @@ FUNCTION {format.names} } % \end{macrocode} -% \DescribeBSTFunction{format.names.rev} +% \DescribeFunction{format.names.rev} % \begin{macrocode} FUNCTION {format.names.rev} { @@ -1226,7 +1195,7 @@ FUNCTION {format.names.rev} } % \end{macrocode} -% \DescribeBSTFunction{format.authors} +% \DescribeFunction{format.authors} % \begin{macrocode} FUNCTION {format.authors} { @@ -1237,7 +1206,7 @@ FUNCTION {format.authors} } % \end{macrocode} -% \DescribeBSTFunction{format.bookauthors} +% \DescribeFunction{format.bookauthors} % \begin{macrocode} FUNCTION {format.bookauthors} { @@ -1248,7 +1217,7 @@ FUNCTION {format.bookauthors} } % \end{macrocode} -% \DescribeBSTFunction{format.authors.after} +% \DescribeFunction{format.authors.after} % \begin{macrocode} FUNCTION {format.authors.after} { @@ -1259,7 +1228,7 @@ FUNCTION {format.authors.after} } % \end{macrocode} -% \DescribeBSTFunction{format.bookauthors.after} +% \DescribeFunction{format.bookauthors.after} % \begin{macrocode} FUNCTION {format.bookauthors.after} { @@ -1270,7 +1239,7 @@ FUNCTION {format.bookauthors.after} } % \end{macrocode} -% \DescribeBSTFunction{format.editors.after} +% \DescribeFunction{format.editors.after} % \begin{macrocode} FUNCTION {format.editors.after} { @@ -1281,7 +1250,7 @@ FUNCTION {format.editors.after} } % \end{macrocode} -% \DescribeBSTFunction{format.compiler.after} +% \DescribeFunction{format.compiler.after} % \begin{macrocode} FUNCTION {format.compiler.after} { @@ -1292,7 +1261,7 @@ FUNCTION {format.compiler.after} } % \end{macrocode} -% \DescribeBSTFunction{format.title} +% \DescribeFunction{format.title} % \begin{macrocode} FUNCTION {format.title} { @@ -1303,7 +1272,7 @@ FUNCTION {format.title} } % \end{macrocode} -% \DescribeBSTFunction{format.date} +% \DescribeFunction{format.date} % \begin{macrocode} FUNCTION {format.date} { @@ -1322,7 +1291,7 @@ FUNCTION {format.date} } % \end{macrocode} -% \DescribeBSTFunction{output.address.publisher.date} +% \DescribeFunction{output.address.publisher.date} % \begin{macrocode} FUNCTION {output.address.publisher.date} { @@ -1340,7 +1309,7 @@ FUNCTION {output.address.publisher.date} } % \end{macrocode} -% \DescribeBSTFunction{output.bibitem} +% \DescribeFunction{output.bibitem} % \begin{macrocode} FUNCTION {output.bibitem} { @@ -1361,7 +1330,7 @@ FUNCTION {output.bibitem} } % \end{macrocode} -% \DescribeBSTFunction{n.dashify} +% \DescribeFunction{n.dashify} % \begin{macrocode} FUNCTION {n.dashify} { @@ -1390,17 +1359,17 @@ FUNCTION {n.dashify} } % \end{macrocode} -% \DescribeBSTFunction{word.in} +% \DescribeFunction{word.in} % \begin{macrocode} FUNCTION {word.in} { bbl.iin " " * } % \end{macrocode} -% \DescribeBSTFunction{format.btitle} +% \DescribeFunction{format.btitle} % \begin{macrocode} FUNCTION {format.btitle} { title } % \end{macrocode} -% \DescribeBSTFunction{tie.or.space.connect} +% \DescribeFunction{tie.or.space.connect} % \begin{macrocode} FUNCTION {tie.or.space.connect} { @@ -1412,12 +1381,12 @@ FUNCTION {tie.or.space.connect} } % \end{macrocode} -% \DescribeBSTFunction{tie.connect} +% \DescribeFunction{tie.connect} % \begin{macrocode} FUNCTION {tie.connect} { "~" swap$ * * } % \end{macrocode} -% \DescribeBSTFunction{either.or.check} +% \DescribeFunction{either.or.check} % \begin{macrocode} FUNCTION {either.or.check} { @@ -1428,7 +1397,7 @@ FUNCTION {either.or.check} } % \end{macrocode} -% \DescribeBSTFunction{format.bvolume} +% \DescribeFunction{format.bvolume} % \begin{macrocode} FUNCTION {format.bvolume} { @@ -1445,7 +1414,7 @@ FUNCTION {format.bvolume} } % \end{macrocode} -% \DescribeBSTFunction{format.number.series} +% \DescribeFunction{format.number.series} % \begin{macrocode} FUNCTION {format.number.series} { @@ -1471,7 +1440,7 @@ FUNCTION {format.number.series} } % \end{macrocode} -% \DescribeBSTFunction{is.num} +% \DescribeFunction{is.num} % \begin{macrocode} FUNCTION {is.num} { @@ -1481,7 +1450,7 @@ FUNCTION {is.num} } % \end{macrocode} -% \DescribeBSTFunction{extract.num} +% \DescribeFunction{extract.num} % \begin{macrocode} FUNCTION {extract.num} { @@ -1503,12 +1472,12 @@ FUNCTION {extract.num} } % \end{macrocode} -% \DescribeBSTFunction{convert.edition} +% \DescribeFunction{convert.edition} % \begin{macrocode} FUNCTION {convert.edition} { edition } % \end{macrocode} -% \DescribeBSTFunction{format.edition} +% \DescribeFunction{format.edition} % \begin{macrocode} FUNCTION {format.edition} { @@ -1525,7 +1494,7 @@ FUNCTION {format.edition} INTEGERS { multiresult } % \end{macrocode} -% \DescribeBSTFunction{multi.page.check} +% \DescribeFunction{multi.page.check} % \begin{macrocode} FUNCTION {multi.page.check} { @@ -1549,7 +1518,7 @@ FUNCTION {multi.page.check} } % \end{macrocode} -% \DescribeBSTFunction{format.pages} +% \DescribeFunction{format.pages} % \begin{macrocode} FUNCTION {format.pages} { @@ -1564,7 +1533,7 @@ FUNCTION {format.pages} } % \end{macrocode} -% \DescribeBSTFunction{format.pages.page} +% \DescribeFunction{format.pages.page} % \begin{macrocode} FUNCTION {format.pages.page} { @@ -1579,7 +1548,7 @@ FUNCTION {format.pages.page} } % \end{macrocode} -% \DescribeBSTFunction{format.vol.num.pages} +% \DescribeFunction{format.vol.num.pages} % \begin{macrocode} FUNCTION {format.vol.num.pages} { @@ -1604,7 +1573,7 @@ FUNCTION {format.vol.num.pages} } % \end{macrocode} -% \DescribeBSTFunction{format.volume} +% \DescribeFunction{format.volume} % \begin{macrocode} FUNCTION {format.volume} { @@ -1615,7 +1584,7 @@ FUNCTION {format.volume} } % \end{macrocode} -% \DescribeBSTFunction{format.number} +% \DescribeFunction{format.number} % \begin{macrocode} FUNCTION {format.number} { number empty$ @@ -1625,7 +1594,7 @@ FUNCTION {format.number} } % \end{macrocode} -% \DescribeBSTFunction{empty.misc.check} +% \DescribeFunction{empty.misc.check} % \begin{macrocode} FUNCTION {empty.misc.check} { @@ -1639,7 +1608,7 @@ FUNCTION {empty.misc.check} } % \end{macrocode} -% \DescribeBSTFunction{format.thesis.type} +% \DescribeFunction{format.thesis.type} % \begin{macrocode} FUNCTION {format.thesis.type} { @@ -1652,7 +1621,7 @@ FUNCTION {format.thesis.type} } % \end{macrocode} -% \DescribeBSTFunction{format.tr.number} +% \DescribeFunction{format.tr.number} % \begin{macrocode} FUNCTION {format.tr.number} { @@ -1667,7 +1636,7 @@ FUNCTION {format.tr.number} } % \end{macrocode} -% \DescribeBSTFunction{author.before} +% \DescribeFunction{author.before} % \begin{macrocode} FUNCTION {author.before} { @@ -1680,7 +1649,7 @@ FUNCTION {author.before} } % \end{macrocode} -% \DescribeBSTFunction{bookauthor.before} +% \DescribeFunction{bookauthor.before} % \begin{macrocode} FUNCTION {bookauthor.before} { @@ -1693,7 +1662,7 @@ FUNCTION {bookauthor.before} } % \end{macrocode} -% \DescribeBSTFunction{author.after} +% \DescribeFunction{author.after} % \begin{macrocode} FUNCTION {author.after} { @@ -1710,7 +1679,7 @@ FUNCTION {author.after} } % \end{macrocode} -% \DescribeBSTFunction{bookauthor.after} +% \DescribeFunction{bookauthor.after} % \begin{macrocode} FUNCTION {bookauthor.after} { @@ -1727,7 +1696,7 @@ FUNCTION {bookauthor.after} } % \end{macrocode} -% \DescribeBSTFunction{editor.organization.after} +% \DescribeFunction{editor.organization.after} % \begin{macrocode} FUNCTION {editor.organization.after} { @@ -1752,7 +1721,7 @@ FUNCTION {editor.organization.after} } % \end{macrocode} -% \DescribeBSTFunction{format.annote} +% \DescribeFunction{format.annote} % \begin{macrocode} FUNCTION {format.annote} { @@ -1766,7 +1735,7 @@ FUNCTION {format.annote} % \end{macrocode} % \subsection{ } -% \DescribeBSTFunction{format.url} +% \DescribeFunction{format.url} % \begin{macrocode} FUNCTION {format.url} { @@ -1777,7 +1746,7 @@ FUNCTION {format.url} } % \end{macrocode} -% \DescribeBSTFunction{format.urldate} +% \DescribeFunction{format.urldate} % \begin{macrocode} FUNCTION {format.urldate} { @@ -1790,7 +1759,7 @@ FUNCTION {format.urldate} } % \end{macrocode} -% \DescribeBSTFunction{output.url} +% \DescribeFunction{output.url} % \begin{macrocode} FUNCTION {output.url} { @@ -1803,7 +1772,7 @@ FUNCTION {output.url} } % \end{macrocode} -% \DescribeBSTFunction{format.isbn} +% \DescribeFunction{format.isbn} % \begin{macrocode} FUNCTION {format.isbn} { @@ -1816,7 +1785,7 @@ FUNCTION {format.isbn} } % \end{macrocode} -% \DescribeBSTFunction{add.doi.url} +% \DescribeFunction{add.doi.url} % \begin{macrocode} FUNCTION {add.doi.url} { duplicate$ empty$ @@ -1834,7 +1803,7 @@ FUNCTION {add.doi.url} } % \end{macrocode} -% \DescribeBSTFunction{format.eprint} +% \DescribeFunction{format.eprint} % \begin{macrocode} FUNCTION {format.eprint} { eprint empty$ @@ -1858,7 +1827,7 @@ FUNCTION {format.eprint} } % \end{macrocode} -% \DescribeBSTFunction{add.number} +% \DescribeFunction{add.number} % \begin{macrocode} FUNCTION {add.number} { duplicate$ empty$ @@ -1868,7 +1837,7 @@ FUNCTION {add.number} } % \end{macrocode} -% \DescribeBSTFunction{in.square.brackets} +% \DescribeFunction{in.square.brackets} % \begin{macrocode} FUNCTION {in.square.brackets} { @@ -1879,7 +1848,7 @@ FUNCTION {in.square.brackets} } % \end{macrocode} -% \DescribeBSTFunction{in.round.brackets} +% \DescribeFunction{in.round.brackets} % \begin{macrocode} FUNCTION {in.round.brackets} { @@ -1890,7 +1859,7 @@ FUNCTION {in.round.brackets} } % \end{macrocode} -% \DescribeBSTFunction{format.type.number} +% \DescribeFunction{format.type.number} % \begin{macrocode} FUNCTION {format.type.number} { @@ -1906,7 +1875,7 @@ FUNCTION {format.type.number} } % \end{macrocode} -% \DescribeBSTFunction{format.reqdate} +% \DescribeFunction{format.reqdate} % \begin{macrocode} FUNCTION {format.reqdate} { reqdate empty$ @@ -1916,7 +1885,7 @@ FUNCTION {format.reqdate} } % \end{macrocode} -% \DescribeBSTFunction{format.pubdate} +% \DescribeFunction{format.pubdate} % \begin{macrocode} FUNCTION {format.pubdate} { pubdate empty$ @@ -1926,7 +1895,7 @@ FUNCTION {format.pubdate} } % \end{macrocode} -% \DescribeBSTFunction{format.prdate} +% \DescribeFunction{format.prdate} % \begin{macrocode} FUNCTION {format.prdate} { prdate empty$ @@ -1937,7 +1906,7 @@ FUNCTION {format.prdate} % \end{macrocode} % \subsection{ } -% \DescribeBSTFunction{article} +% \DescribeFunction{article} % \begin{macrocode} FUNCTION {article} { @@ -1964,7 +1933,7 @@ FUNCTION {article} } % \end{macrocode} -% \DescribeBSTFunction{book} +% \DescribeFunction{book} % \begin{macrocode} FUNCTION {book} { @@ -1996,7 +1965,7 @@ FUNCTION {book} } % \end{macrocode} -% \DescribeBSTFunction{booklet} +% \DescribeFunction{booklet} % \begin{macrocode} FUNCTION {booklet} { @@ -2019,7 +1988,7 @@ FUNCTION {booklet} } % \end{macrocode} -% \DescribeBSTFunction{inbook} +% \DescribeFunction{inbook} % \begin{macrocode} FUNCTION {inbook} { @@ -2053,7 +2022,7 @@ FUNCTION {inbook} } % \end{macrocode} -% \DescribeBSTFunction{incollection} +% \DescribeFunction{incollection} % \begin{macrocode} FUNCTION {incollection} { @@ -2083,7 +2052,7 @@ FUNCTION {incollection} } % \end{macrocode} -% \DescribeBSTFunction{inproceedings} +% \DescribeFunction{inproceedings} % \begin{macrocode} FUNCTION {inproceedings} { @@ -2122,12 +2091,12 @@ FUNCTION {inproceedings} } % \end{macrocode} -% \DescribeBSTFunction{conference} +% \DescribeFunction{conference} % \begin{macrocode} FUNCTION {conference} { inproceedings } % \end{macrocode} -% \DescribeBSTFunction{manual} +% \DescribeFunction{manual} % \begin{macrocode} FUNCTION {manual} { @@ -2170,7 +2139,7 @@ FUNCTION {manual} } % \end{macrocode} -% \DescribeBSTFunction{mastersthesis} +% \DescribeFunction{mastersthesis} % \begin{macrocode} FUNCTION {mastersthesis} { @@ -2194,7 +2163,7 @@ FUNCTION {mastersthesis} } % \end{macrocode} -% \DescribeBSTFunction{misc} +% \DescribeFunction{misc} % \begin{macrocode} FUNCTION {misc} { @@ -2217,7 +2186,7 @@ FUNCTION {misc} } % \end{macrocode} -% \DescribeBSTFunction{phdthesis} +% \DescribeFunction{phdthesis} % \begin{macrocode} FUNCTION {phdthesis} { @@ -2243,16 +2212,16 @@ FUNCTION {phdthesis} } % \end{macrocode} -% \DescribeBSTFunction{docdisser} +% \DescribeFunction{dscithesis} % \begin{macrocode} -FUNCTION {docdisser} +FUNCTION {dscithesis} { output.bibitem format.authors "author" output.check new.sentence format.btitle add.doi.url "title" output.check new.colon - bbl.docdisser format.thesis.type output.nonnull + bbl.dscithesis format.thesis.type output.nonnull new.slash school "school" output.check new.block @@ -2269,7 +2238,7 @@ FUNCTION {docdisser} } % \end{macrocode} -% \DescribeBSTFunction{proceedings} +% \DescribeFunction{proceedings} % \begin{macrocode} FUNCTION {proceedings} { @@ -2301,7 +2270,7 @@ FUNCTION {proceedings} } % \end{macrocode} -% \DescribeBSTFunction{techreport} +% \DescribeFunction{techreport} % \begin{macrocode} FUNCTION {techreport} { @@ -2328,7 +2297,7 @@ FUNCTION {techreport} } % \end{macrocode} -% \DescribeBSTFunction{patent} +% \DescribeFunction{patent} % \begin{macrocode} FUNCTION {patent} { @@ -2350,7 +2319,7 @@ FUNCTION {patent} holder output.nonnull new.semicolon credits output.nonnull - new.dash + new.block reqnumber add.number output new.semicolon format.reqdate output @@ -2372,7 +2341,7 @@ FUNCTION {patent} } % \end{macrocode} -% \DescribeBSTFunction{unpublished} +% \DescribeFunction{unpublished} % \begin{macrocode} FUNCTION {unpublished} { @@ -2391,7 +2360,7 @@ FUNCTION {unpublished} } % \end{macrocode} -% \DescribeBSTFunction{default.type} +% \DescribeFunction{default.type} % \begin{macrocode} FUNCTION {default.type} { misc } @@ -2414,8 +2383,8 @@ MACRO {dec} {"\bbldec{}"} % \end{macrocode} % \subsection{ } % \subsubsection{ } -% \file{physjour.mbs} -% \pkg{custom-bib}. +% \file{physjour.mbs} +% \pkg{custom-bib}. % \begin{macrocode} MACRO {aa}{"Astron. \& Astrophys."} MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."} @@ -2557,7 +2526,7 @@ READ % \begin{macrocode} %<*gost705s> % \end{macrocode} -% \DescribeBSTFunction{sortify} +% \DescribeFunction{sortify} % \begin{macrocode} FUNCTION {sortify} { @@ -2568,7 +2537,7 @@ FUNCTION {sortify} INTEGERS { len } % \end{macrocode} -% \DescribeBSTFunction{chop.word} +% \DescribeFunction{chop.word} % \begin{macrocode} FUNCTION {chop.word} { @@ -2581,7 +2550,7 @@ FUNCTION {chop.word} } % \end{macrocode} -% \DescribeBSTFunction{sort.format.names} +% \DescribeFunction{sort.format.names} % \begin{macrocode} FUNCTION {sort.format.names} { @@ -2609,7 +2578,7 @@ FUNCTION {sort.format.names} } % \end{macrocode} -% \DescribeBSTFunction{sort.format.title} +% \DescribeFunction{sort.format.title} % \begin{macrocode} FUNCTION {sort.format.title} { @@ -2624,7 +2593,7 @@ FUNCTION {sort.format.title} } % \end{macrocode} -% \DescribeBSTFunction{author.sort} +% \DescribeFunction{author.sort} % \begin{macrocode} FUNCTION {author.sort} { @@ -2639,7 +2608,7 @@ FUNCTION {author.sort} } % \end{macrocode} -% \DescribeBSTFunction{author.title.sort} +% \DescribeFunction{author.title.sort} % \begin{macrocode} FUNCTION {author.title.sort} { @@ -2658,7 +2627,7 @@ FUNCTION {author.title.sort} } % \end{macrocode} -% \DescribeBSTFunction{presort} +% \DescribeFunction{presort} % \begin{macrocode} FUNCTION {presort} { @@ -2690,7 +2659,7 @@ STRINGS { longest.label } INTEGERS { number.label longest.label.width } % \end{macrocode} -% \DescribeBSTFunction{initialize.longest.label} +% \DescribeFunction{initialize.longest.label} % \begin{macrocode} FUNCTION {initialize.longest.label} { @@ -2700,7 +2669,7 @@ FUNCTION {initialize.longest.label} } % \end{macrocode} -% \DescribeBSTFunction{longest.label.pass} +% \DescribeFunction{longest.label.pass} % \begin{macrocode} FUNCTION {longest.label.pass} { @@ -2721,7 +2690,7 @@ ITERATE {longest.label.pass} % \end{macrocode} % \subsection{ thebibliography} % \subsubsection{} -% \DescribeBSTFunction{begin.bib} +% \DescribeFunction{begin.bib} % \begin{macrocode} FUNCTION {begin.bib} { @@ -2729,32 +2698,20 @@ FUNCTION {begin.bib} 'skip$ { preamble$ write$ newline$ } if$ - "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" - write$ newline$ - "\ifx\undefined\href\def\href#1#2{#2}\else\fi" - write$ newline$ - "\ifx\undefined\url\def\url#1{\texttt{#1}}\else\fi" - write$ newline$ - "\ifx\undefined\urlprefix\def\urlprefix{URL: }\else\fi" - write$ newline$ - "\ifx\undefined\BibUrl\def\BibUrl#1{\urlprefix\url{#1}}\else\fi" - write$ newline$ - "\ifx\undefined\BibUrlDate\long\def\BibUrlDate#1{({%" - write$ newline$ - "\cyr\cyrd\cyra\cyrt\cyra\ %" - write$ newline$ - "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}\else\fi" - write$ newline$ - "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi" - write$ newline$ - "\begin{thebibliography}{" longest.label * "}" * - write$ newline$ - "\def\selectlanguageifdefined#1{" - write$ newline$ - "\expandafter\ifx\csname date#1\endcsname\relax" - write$ newline$ - "\else\language\csname l@#1\endcsname\fi}" - write$ newline$ + "\providecommand*\BibEmph[1]{#1}" write$ newline$ + "\providecommand*\BibDash{}" write$ newline$ + "\providecommand*\href[2]{#2}" write$ newline$ + "\providecommand*\url[1]{\texttt{#1}}" write$ newline$ + "\providecommand*\urlprefix{URL: }" write$ newline$ + "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$ + "\providecommand*\BibUrlDate[1]{({%" write$ newline$ + "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$ + "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$ + "\providecommand*\BibAnnote[1]{#1}" write$ newline$ + "\begin{thebibliography}{" longest.label * "}" * write$ newline$ + "\def\selectlanguageifdefined#1{" write$ newline$ + "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$ + "\else\language\csname l@#1\endcsname\fi}" write$ newline$ } % \end{macrocode} @@ -2768,7 +2725,7 @@ ITERATE {call.type$} % \end{macrocode} % \subsubsection{ } -% \DescribeBSTFunction{end.bib} +% \DescribeFunction{end.bib} % \begin{macrocode} FUNCTION {end.bib} { diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index dda10f265dd..002106bedc1 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -74,8 +74,7 @@ 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 +Copyright (C) Stanislav Kruchinin This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -125,7 +124,7 @@ and the derived files \fi % %<*driver> -\ProvidesFile{gost732.drv}[2016/01/27 1.3.4 GOST 7.32-2001 implementation] +\ProvidesFile{gost732.drv}[2016/06/26 1.4.0 GOST 7.32-2001 implementation] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -154,16 +153,6 @@ and the derived files menucolor = darkblue, urlcolor = darkblue } -\IfFileExists{pscyr.sty}{% - \usepackage{pscyr} - \renewcommand\ttdefault{cmtt} - \renewcommand\rmdefault{ftm} -}{ - \IfFileExists{cyrtimes.sty}{% - \renewcommand\ttdefault{cmtt} - \renewcommand\rmdefault{ftm} - }{} -} \IfFileExists{url.sty}{\RequirePackage{url}}{\newcommand\url{\texttt}} \usepackage[T2A]{fontenc} @@ -205,7 +194,7 @@ and the derived files % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2013/12/30 1.3.0 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2016/07/03 1.4.0 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax diff --git a/Master/texmf-dist/source/latex/disser/lists.dtx b/Master/texmf-dist/source/latex/disser/lists.dtx index adfa495ded9..ec84f5ff5d9 100644 --- a/Master/texmf-dist/source/latex/disser/lists.dtx +++ b/Master/texmf-dist/source/latex/disser/lists.dtx @@ -10,12 +10,12 @@ % % \subsection{} % -% \DescribeMacro{\leftmargini}\index{!\verb*+\leftmargini+} -% \DescribeMacro{\leftmarginii}\index{!\verb*+\leftmarginii+} -% \DescribeMacro{\leftmarginiii}\index{!\verb*+\leftmarginiii+} -% \DescribeMacro{\leftmarginiv}\index{!\verb*+\leftmarginiv+} -% \DescribeMacro{\leftmarginv}\index{!\verb*+\leftmarginv+} -% \DescribeMacro{\leftmarginvi}\index{!\verb*+\leftmarginvi+} +% \DescribeMacro{\leftmargini}\index{!\verb*+\leftmargini+} +% \DescribeMacro{\leftmarginii}\index{!\verb*+\leftmarginii+} +% \DescribeMacro{\leftmarginiii}\index{!\verb*+\leftmarginiii+} +% \DescribeMacro{\leftmarginiv}\index{!\verb*+\leftmarginiv+} +% \DescribeMacro{\leftmarginv}\index{!\verb*+\leftmarginv+} +% \DescribeMacro{\leftmarginvi}\index{!\verb*+\leftmarginvi+} % % % . diff --git a/Master/texmf-dist/source/latex/disser/master.dtx b/Master/texmf-dist/source/latex/disser/master.dtx index 92f427833c4..48844d2cc74 100644 --- a/Master/texmf-dist/source/latex/disser/master.dtx +++ b/Master/texmf-dist/source/latex/disser/master.dtx @@ -4,7 +4,7 @@ %<*master> % \end{macrocode} -% \subsubsection{ } +% \subsubsection{ } % % . % \begin{macrocode} @@ -40,11 +40,11 @@ % \end{macrocode} % . -% \DescribeMacro{\firstskip}\index{!\verb*+\firstskip+} -% \DescribeMacro{\secondskip}\index{!\verb*+\secondskip+} -% \DescribeMacro{\thirdskip}\index{!\verb*+\thirdskip+} -% \DescribeMacro{\fourthskip}\index{!\verb*+\fourthskip+} -% \DescribeMacro{\fifthskip}\index{!\verb*+\fifthskip+} +% \DescribeMacro{\firstskip}\index{!\verb*+\firstskip+} +% \DescribeMacro{\secondskip}\index{!\verb*+\secondskip+} +% \DescribeMacro{\thirdskip}\index{!\verb*+\thirdskip+} +% \DescribeMacro{\fourthskip}\index{!\verb*+\fourthskip+} +% \DescribeMacro{\fifthskip}\index{!\verb*+\fifthskip+} % \begin{macrocode} \ifundeflength\firstskip{1ex} \ifundeflength\secondskip{1ex} @@ -56,7 +56,7 @@ % \end{macrocode} % , % . -% \DescribeMacro{\fieldhshift}\index{!\verb*+\fieldhshift+} +% \DescribeMacro{\fieldhshift}\index{!\verb*+\fieldhshift+} % \begin{macrocode} \setlength\fieldhshift{8.5cm} @@ -77,28 +77,29 @@ % \paragraph{ } % \begin{macrocode} \begin{center} -\instfont\@institution\par + {\instfont\@institution} \end{center} % \end{macrocode} % % \begin{macrocode} \vskip\firstskip -\@approved +{\@approved} \vskip\secondskip -\begin{center} % \end{macrocode} -% . +% % \begin{macrocode} +\begin{center} {\titlefont\@title} \vskip\thirdskip % \end{macrocode} % % \begin{macrocode} - {\topiclabelfont\topiclabel} + {\topiclabelfont\topiclabel\ } {\topicfont\@topic} + \vskip\fourthskip\normalfont \end{center} -\vskip\fourthskip + \begin{tabbing} \phantom{\masterproglabel}\=\\ % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/specialist.dtx b/Master/texmf-dist/source/latex/disser/specialist.dtx index deeec27da10..6b22accf635 100644 --- a/Master/texmf-dist/source/latex/disser/specialist.dtx +++ b/Master/texmf-dist/source/latex/disser/specialist.dtx @@ -21,6 +21,9 @@ % \DescribeMacro{\maketitle}\index{!\verb*+\maketitle+} % \begin{macrocode} \if@titlepage\renewcommand\maketitle[1][]{ +% \end{macrocode} +% . +% \begin{macrocode} \ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} \if@titlepage@en \def\appos{Head of Department} @@ -89,10 +92,6 @@ {\instfont\@institution} \end{center} -% \end{macrocode} -% -% \DescribeMacro{\workname}\index{!\verb*+\topicfont+} -% \begin{macrocode} \def\@approved{ \hfill \begin{minipage}{.5\linewidth} @@ -109,7 +108,7 @@ {\@approved} \vskip\secondskip % \end{macrocode} -% , , +% , , % \begin{macrocode} \begin{center} {\titlefont\@title} diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index 40c9b84e570..a8dc21546fa 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -54,21 +54,20 @@ \thispagestyle{empty} \enlargethispage{1cm} \vspace*{-2cm} -\begin{center}% +\begin{center} {\instfont\@institution} \end{center} \vskip\firstskip {\@approved} \vskip\secondskip - -\begin{center}% - {\titlefont\@title\par}% - \vskip\thirdskip% - {\topiclabelfont\topiclabel\ }% +\begin{center} + {\titlefont\@title} + \vskip\thirdskip + {\topiclabelfont\topiclabel\ } {\topicfont\@topic} - \vskip\fourthskip\normalfont% - \courselabel\ \@coursenum~--\ \@course% + \vskip\fourthskip\normalfont + {\courselabel\ \@coursenum~--\ \@course} \end{center} \vskip\fifthskip diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index bb70e2d8cef..3923107675e 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -28,17 +28,17 @@ \def\sconname{Scientific Consultant} \def\sconlabel{\sconname} \def\sconsndname{\sconname} - \def\sconsndlabel{\sconsndname} + \def\sconsndlabel{\sconname} \def\topicname{Topic} \def\asmanuscript{As Manuscript} \fi \ifx\firstskip\undefined \newlength\firstskip - \ifDis@libcat - \setlength\firstskip{2ex} - \else + \ifx\@libcatnum\empty \setlength\firstskip{4ex} + \else + \setlength\firstskip{2ex} \fi \fi \ifundeflength\secondskip{2cm} @@ -46,6 +46,7 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\libcatskip{0cm} \ifundeflength\specskip{-6pt} \ifundeflength\saskip{0pt} @@ -63,9 +64,12 @@ \vskip\firstskip \begin{flushright} \ifDis@classified\classify\fi - \asmanuscript%\\ %avoid no line to end error + \asmanuscript \ifDis@facsimile\facsimile\fi - \ifDis@libcat\libcatname\ \@libcatnum\fi + \ifx\@libcatnum\empty\else + \vskip\libcatskip + {\libcatname\ \@libcatnum} + \fi \end{flushright} \begin{center} \vskip\secondskip @@ -76,7 +80,7 @@ {\specfont\@specnum~--\ \@spec} \ifx\@specsndnum\empty\else \vskip\specskip -{\specfont\@specsndnum~--\ \@specsnd} + {\specfont\@specsndnum~--\ \@specsnd} \fi \vskip\fifthskip {\titlefont\@title} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index c76c0438dd7..4153eecd01a 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,8 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2015/07/25 1.3.2 % - Document class for dissertations] +\ProvidesClass{disser}[2016/06/26 1.4.0 Document class for dissertations] \RequirePackage{kvoptions} @@ -72,6 +71,8 @@ \newif\ifDis@times\Dis@timesfalse \newif\ifDis@mtpro\Dis@mtprofalse \newif\ifDis@natbib\Dis@natbibfalse +\newif\ifDis@colorlinks\Dis@colorlinksfalse +\newif\ifDis@fixint\Dis@fixintfalse \DeclareOption{href}{\Dis@hreftrue} \DeclareOption{subf}{\Dis@subftrue} \DeclareOption{libcat}{\Dis@libcattrue} @@ -79,6 +80,8 @@ \DeclareOption{facsimile}{\Dis@facsimiletrue} \DeclareOption{noams}{\Dis@amsfalse} \DeclareOption{natbib}{\Dis@natbibtrue} +\DeclareOption{fixint}{\Dis@fixinttrue} +\DeclareOption{colorlinks}{\Dis@colorlinkstrue} \DeclareOption{a4paper}{% \setlength\paperheight{297mm} \setlength\paperwidth {210mm} @@ -191,8 +194,6 @@ prefix=Dis@ } -\DeclareBoolOption[true]{fixint} -\DeclareBoolOption[false]{colorlinks} \DeclareStringOption{substylefile} \ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany,candidate} @@ -349,14 +350,14 @@ \renewcommand\theparagraph{\arabic{paragraph}} \renewcommand\thesubparagraph{\theparagraph.\arabic{subparagraph}} -\newcommand\tocthepart{\thepart} -\newcommand\tocthechapter{\thechapter} -\newcommand\toctheappendix{\theappendix} -\newcommand\tocthesection{\thesection} -\newcommand\tocthesubsection{\thesubsection} -\newcommand\tocthesubsubsection{\thesubsubsection} -\newcommand\toctheparagraph{\theparagraph} -\newcommand\tocthesubparagraph{\thesubparagraph} +\providecommand\tocthepart{\thepart} +\providecommand\tocthechapter{\thechapter} +\providecommand\toctheappendix{\theappendix} +\providecommand\tocthesection{\thesection} +\providecommand\tocthesubsection{\thesubsection} +\providecommand\tocthesubsubsection{\thesubsubsection} +\providecommand\toctheparagraph{\theparagraph} +\providecommand\tocthesubparagraph{\thesubparagraph} \newcommand\default@the{% \@addtoreset{footnote}{chapter} @@ -1358,14 +1359,14 @@ \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro} }{ \PackageWarning{disser}% - {Unable to find mtpro package. Font is unchanged.} + {Unable to find mtpro2 or mtpro package. Math font is unchanged.} } } } \else \AtEndOfPackage{% - \IfFileExists{txfonts.sty}{ - \usepackage{txfonts} + \IfFileExists{newtxmath.sty}{ + \usepackage[varg,cmbraces,cmintegrals]{newtxmath} }{ \PackageWarning{disser}% {Unable to find txfonts package. Font is unchanged.} @@ -1416,10 +1417,9 @@ \ifDis@natbib \usepackage[square,comma,sort&compress,numbers]{natbib} \else - \newcommand\bibsection{} - \newcommand\bibpreamble{} - \newcommand\bibpostamble{} - \newcommand\bibfont{\normalfont\selectfont} + \providecommand*\bibsection{} + \providecommand*\bibpreamble{} + \providecommand*\bibpostamble{} \newlength\bibsep \fi @@ -1455,7 +1455,7 @@ \renewenvironment{thebibliography}[1]{ \bibsection \parindent\z@ - \bibpreamble\bibfont + \bibpreamble\normalfont\selectfont \list{\@biblabel{\@arabic\c@enumiv}}{\settowidth\labelwidth{\@biblabel{#1}}% \setlength{\itemsep}{\bibsep} \setlength{\parsep}{\bibsep} diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index 6465a3d7596..71150c3f984 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -31,10 +31,10 @@ \ifx\firstskip\undefined \newlength\firstskip - \ifDis@libcat - \setlength\firstskip{1ex} - \else + \ifx\@libcatnum\empty \setlength\firstskip{4ex} + \else + \setlength\firstskip{2ex} \fi \fi \ifundeflength\secondskip{3cm} @@ -42,6 +42,7 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\libcatskip{0cm} \ifundeflength\specskip{-6pt} \def\titlefont{\normalsize} @@ -58,9 +59,12 @@ \vskip\firstskip \begin{flushright} \ifDis@classified\classify\fi - \asmanuscript\\ + \asmanuscript \ifDis@facsimile\facsimile\fi - \ifDis@libcat\libcatname\ \@libcatnum\fi + \ifx\@libcatnum\empty\else + \vskip\libcatskip + {\libcatname\ \@libcatnum} + \fi \end{flushright} \begin{center} \vskip\secondskip diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 5798b4481a9..8d8ba6ed28d 100644 --- a/Master/texmf-dist/tex/latex/disser/gost732.cls +++ b/Master/texmf-dist/tex/latex/disser/gost732.cls @@ -12,7 +12,7 @@ %% This file is part of the disser package. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2013/12/30 1.3.0 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2016/07/03 1.4.0 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx index d6f8e7e60e0..81fec860b43 100644 --- a/Master/texmf-dist/tex/latex/disser/master.rtx +++ b/Master/texmf-dist/tex/latex/disser/master.rtx @@ -54,19 +54,20 @@ \enlargethispage{1cm} \vspace*{-2cm} \begin{center} -\instfont\@institution\par + {\instfont\@institution} \end{center} \vskip\firstskip -\@approved +{\@approved} \vskip\secondskip \begin{center} {\titlefont\@title} \vskip\thirdskip - {\topiclabelfont\topiclabel} + {\topiclabelfont\topiclabel\ } {\topicfont\@topic} + \vskip\fourthskip\normalfont \end{center} -\vskip\fourthskip + \begin{tabbing} \phantom{\masterproglabel}\=\\ \courselabel\>\ \@coursenum\ --\ \@course\\ -- cgit v1.2.3