diff options
| author | Karl Berry <karl@freefriends.org> | 2010-05-30 23:00:30 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-05-30 23:00:30 +0000 |
| commit | 3654b5dd7fc3200a1b72bac39de9680bc74e3031 (patch) | |
| tree | 5251df97f8e5c6b309eaa363ca119863ab4a92ac /Master | |
| parent | 95a1ff3467d574b4d9a5cb6c3c6e11abcb8eef52 (diff) | |
disser update (30may10)
git-svn-id: svn://tug.org/texlive/trunk@18627 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
46 files changed, 1331 insertions, 373 deletions
diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst index e5ec00223c9..1722ecf65ae 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst @@ -6,7 +6,7 @@ %% %% gost705.dtx (with options: `gost705') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -557,11 +557,25 @@ FUNCTION {bbl.mthesis} FUNCTION {bbl.phdthesis} { curlanguage "english" = - { "Ph.D. thesis" } + { "Ph.\,D. thesis" } { curlanguage "russian" = { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Ph.D. thesis" * * warning$ "P." } + { "language is not defined: " language "Ph.\,D. thesis" * * warning$ "P." } + if$ + } + if$ +} + +FUNCTION {bbl.docdisser} +{ + curlanguage "english" = + { "Dr.\,Sci. dissertation" } + { curlanguage "russian" = + { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ " + "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } + { "language is not defined: " language "Dr.\,Sci. dissertation" * * + warning$ "P." } if$ } if$ @@ -1104,7 +1118,9 @@ FUNCTION {format.isbn} { isbn empty$ { "" } - { "ISBN~" isbn * } + { "ISBN:~\href{http://isbndb.com/search-all.html?kw=" isbn * + "}{" * isbn * "}" * + } if$ } @@ -1371,6 +1387,27 @@ FUNCTION {phdthesis} fin.entry } +FUNCTION {docdisser} +{ + output.bibitem + format.authors "author" output.check + new.sentence + format.btitle add.doi "title" output.check + new.column + bbl.docdisser format.thesis.type output.nonnull + new.slash + school "school" output.check + new.block + output.address.publisher.date + new.block + format.pages.page output + note output + new.sentence + output.url + format.annote output + fin.entry +} + FUNCTION {proceedings} { output.bibitem @@ -1487,6 +1524,7 @@ MACRO {irp} {"Infrared Phys."} MACRO {jap} {"J. Appl. Phys."} MACRO {jasa} {"J. Acoust. Soc. America"} MACRO {jcp} {"J. Comp. Phys."} +MACRO {jchp} {"J. Chem. Phys."} MACRO {jetp} {"Sov. Phys.--JETP"} MACRO {jfe} {"J. Fusion Energy"} MACRO {jfm} {"J. Fluid Mech."} @@ -1540,7 +1578,7 @@ MACRO {sam} {"Stud. Appl. Math."} MACRO {sjpp} {"Sov. J. Plasma Phys."} MACRO {spd} {"Sov. Phys.--Doklady"} MACRO {sptp} {"Sov. Phys.--Tech. Phys."} -MACRO {spu} {"Sov. Phys.--Uspeki"} +MACRO {spu} {"Sov. Phys.--Uspekhi"} MACRO {st} {"Sky and Telesc."} MACRO {appopt} {"Appl. Opt."} @@ -1572,6 +1610,7 @@ MACRO {zphd} {"Z. f. Physik~D"} MACRO {sse} {"Solid-State Electron."} MACRO {pss} {"Phys. Sol. State"} MACRO {sst} {"Semicond. Sci. Tech."} +MACRO {nl} {"Nano Lett."} READ @@ -1617,6 +1656,8 @@ FUNCTION {begin.bib} write$ newline$ "\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" diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst index 7e087d4bdd2..372a9df5ee7 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst @@ -6,7 +6,7 @@ %% %% gost705.dtx (with options: `gost705s') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -557,11 +557,25 @@ FUNCTION {bbl.mthesis} FUNCTION {bbl.phdthesis} { curlanguage "english" = - { "Ph.D. thesis" } + { "Ph.\,D. thesis" } { curlanguage "russian" = { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Ph.D. thesis" * * warning$ "P." } + { "language is not defined: " language "Ph.\,D. thesis" * * warning$ "P." } + if$ + } + if$ +} + +FUNCTION {bbl.docdisser} +{ + curlanguage "english" = + { "Dr.\,Sci. dissertation" } + { curlanguage "russian" = + { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ " + "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } + { "language is not defined: " language "Dr.\,Sci. dissertation" * * + warning$ "P." } if$ } if$ @@ -1104,7 +1118,9 @@ FUNCTION {format.isbn} { isbn empty$ { "" } - { "ISBN~" isbn * } + { "ISBN:~\href{http://isbndb.com/search-all.html?kw=" isbn * + "}{" * isbn * "}" * + } if$ } @@ -1371,6 +1387,27 @@ FUNCTION {phdthesis} fin.entry } +FUNCTION {docdisser} +{ + output.bibitem + format.authors "author" output.check + new.sentence + format.btitle add.doi "title" output.check + new.column + bbl.docdisser format.thesis.type output.nonnull + new.slash + school "school" output.check + new.block + output.address.publisher.date + new.block + format.pages.page output + note output + new.sentence + output.url + format.annote output + fin.entry +} + FUNCTION {proceedings} { output.bibitem @@ -1487,6 +1524,7 @@ MACRO {irp} {"Infrared Phys."} MACRO {jap} {"J. Appl. Phys."} MACRO {jasa} {"J. Acoust. Soc. America"} MACRO {jcp} {"J. Comp. Phys."} +MACRO {jchp} {"J. Chem. Phys."} MACRO {jetp} {"Sov. Phys.--JETP"} MACRO {jfe} {"J. Fusion Energy"} MACRO {jfm} {"J. Fluid Mech."} @@ -1540,7 +1578,7 @@ MACRO {sam} {"Stud. Appl. Math."} MACRO {sjpp} {"Sov. J. Plasma Phys."} MACRO {spd} {"Sov. Phys.--Doklady"} MACRO {sptp} {"Sov. Phys.--Tech. Phys."} -MACRO {spu} {"Sov. Phys.--Uspeki"} +MACRO {spu} {"Sov. Phys.--Uspekhi"} MACRO {st} {"Sky and Telesc."} MACRO {appopt} {"Appl. Opt."} @@ -1572,6 +1610,7 @@ MACRO {zphd} {"Z. f. Physik~D"} MACRO {sse} {"Solid-State Electron."} MACRO {pss} {"Phys. Sol. State"} MACRO {sst} {"Semicond. Sci. Tech."} +MACRO {nl} {"Nano Lett."} READ @@ -1720,6 +1759,8 @@ FUNCTION {begin.bib} write$ newline$ "\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" diff --git a/Master/texmf-dist/bibtex/csf/disser/cp1251lc.csf b/Master/texmf-dist/bibtex/csf/disser/cp1251lc.csf new file mode 100644 index 00000000000..b503b97c638 --- /dev/null +++ b/Master/texmf-dist/bibtex/csf/disser/cp1251lc.csf @@ -0,0 +1,275 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% CHARACTER SET: Cyrillic (CP 1251) +%% +%% SORTING ORDER: First Latin then Cyrillic +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% FILE FORMAT +%% +%% The codepage and sorting order (CS) file defines how BibTeX will treat an +%% 8-bit character set, specifically which characters are to be treated as +%% letters, the upper/lower case relationships between characters, and the +%% sorting order of characters. +%% +%% The CS file may contain a number of sections, each presented in the +%% form of a TeX macro: +%% +%% \section-name{ +%% <section definitions> +%% } +%% +%% Four sections are currently supported: \lowupcase, \lowercase, \uppercase +%% and \order. The syntax of the four supported sections is summarised below. +%% +%% 8-bit characters may be entered naturally, but to avoid problems with +%% character set translation or corruption, they can also be entered using +%% the TeX-style portable notation for character codes, i.e. ^^XX, where XX +%% is the hexadecimal value ofthe character code. +%% +%% Reading of the sections ends when the first '}' character is reached, so +%% '}' can't be included in a section. You can't use ^^7d either. +%% +%% The percent sign ('%') is used to introduce a trailing comment - it and +%% all remaining characters on a line are ignored. ^^25 has the same effect. +%% +%% +%% \lowupcase section +%% +%% The \lowupcase section of the CS file is used to define the lower +%% /upper and upper/lower case relationship of pairs of specified +%% characters. It is only used if the relationship is symmetrical - use +%% \lowercase or \upcase if it isn't. +%% +%% The syntax of the \lowupcase section is: +%% +%% \lowupcase{ +%% <LC-1> <UC-1> % Comment begins with a percent sign +%% <LC-2> <UC-2> +%% ... +%% <LC-N> <UC-N> +%% } +%% +%% Each <LC-n> <UC-n> pair of characters defines that the upper case +%% equivalent of <LC-n> is <UC-n> *and* the lower case equivalent of +%% <UC-n> is <LC-n>. +%% +%% You cannot redefine the lower or upper case equivalent of an ASCII +%% character (code < 128), so all instances of <LC-n> and <UC-n> +%% (i.e. both sides of the relationship) must have codes > 127. +%% +%% +%% \lowercase section +%% +%% The \lowercase section of the CS file is used to define the lower case +%% equivalent of specified characters. It should normally only be used +%% if the relationship isn't symmetrical - use \lowupcase if it is. +%% +%% The syntax of the \lowercase section is: +%% +%% \lowercase{ +%% <UC-1> <LC-1> % Comment begins with a percent sign +%% <UC-2> <LC-2> +%% ... +%% <UC-N> <LC-N> +%% } +%% +%% Each <LC-n> <UC-n> pair of characters defines that the lower case +%% equivalent of <UC-n> is <LC-n>. +%% +%% You cannot redefine the lower case equivalent of an ASCII character +%% (code < 128), so all instances of <UC-n> (i.e. the left hand side +%% of the relationship) must have codes > 127. +%% +%% +%% \uppercase section +%% +%% The \uppercase section of the CS file is used to define the upper case +%% equivalent of specified characters. It should normally only be used +%% if the relationship isn't symmetrical - use \lowupcase if it is. +%% +%% The syntax of the \uppercase section is: +%% +%% \uppercase{ +%% <LC-1> <UC-1> % Comment begins with a percent sign +%% <LC-2> <UC-2> +%% ... +%% <LC-N> <UC-N> +%% } +%% +%% Each <LC-n> <UC-n> pair of characters defines that the upper case +%% case equivalent of <LC-n> is <UC-n>. +%% +%% You cannot redefine the upper case equivalent of an ASCII character +%% (code < 128), so all instances of <LC-n> (i.e. the left hand side +%% of the relationship) must have codes > 127. +%% +%% +%% \order section +%% +%% The \order section of the CS file is used to define the order in which +%% characters are sorted. +%% +%% The syntax of the \order section is: +%% +%% \order{ +%% <char-1> % Comment begins with a percent sign +%% <char-2> <char-3> % whitespace between the chars +%% <char-4> - <char-5> % a hyphen between the chars +%% <char-4> _ <char-5> % an underscore between the chars +%% ... +%% <char-n> +%% } +%% +%% All characters on the same line are given the same sorting weight. +%% +%% The construct <char-1> <underscore> <char-2> is used to denote that +%% all characters in the range <char-1> to <char-2> should be given the +%% same sorting weight. For example, "A _ Z" would cause all ASCII +%% upper case alphabetical characters to have the same sorting weight +%% and would be equivalent to placing all 26 characters on the same line. +%% +%% The construct <char-1> <hyphen> <char-2> is used to denote that all +%% characters in the range <char-1> to <char-2> should be given an +%% ascending set of sorting weights, starting with <char-1> and ending +%% with <char-2>. For example, "A - Z" would cause all upper case ASCII +%% alphabetical characters to be sorted in ascending order and would be +%% equivalent to placing 'A' on the first line, 'B' on the second, +%% through to 'Z' on the 26th line. +%% +%% The characters at the beginning of the order section are given a lower +%% sorting weight than characters occuring later. When sorting +%% alphabetically, characters with the lowest weight come first. +%% +%% All characters not in the \order section (including ASCII characters) +%% are given the same very high sorting weight to ensure that they come +%% last when sorting alphabetically. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + +%% +%% CHARACTER SET +%% +\lowupcase{ + а А + б Б + в В + г Г + ґ Ґ + д Д + е Е + є Є + ё Ё + ж Ж + з З + и И + і І + ї Ї + й Й + к К + л Л + м М + н Н + о О + п П + р Р + с С + т Т + у У + ф Ф + х Х + ц Ц + ч Ч + ш Ш + щ Щ + ъ Ъ + ы Ы + ь Ь + э Э + ю Ю + я Я +} + + + +%% +%% SORTING ORDER +%% +%% +\order{ + 0-9 + A a + B b + C c + D d + E e + F f + G g + H h + I i + J j + K k + L l + M m + N n + O o + P p + Q q + R r + S s + T t + U u + V v + W w + X x + Y y + Z z + А а + Б б + В в + Г г + Ґ ґ + Д д + Е е + Є є + Ё ё + Ж ж + З з + И и + І і + Ї ї + Й й + К к + Л л + М м + Н н + О о + П п + Р р + С с + Т т + У у + Ф ф + Х х + Ц ц + Ч ч + Ш ш + Щ щ + Ъ ъ + Ы ы + Ь ь + Э э + Ю ю + Я я +} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% END OF FILE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog index f4c51a14415..d85bd067860 100644 --- a/Master/texmf-dist/doc/latex/disser/ChangeLog +++ b/Master/texmf-dist/doc/latex/disser/ChangeLog @@ -2,6 +2,23 @@ disser changelog Copyright (C) 2004-2010 Stanislav Kruchinin ------------------------------------------- + +Summary of changes in version 1.1.6 (2010-05-22): + +Classes and styles: ++ Add support for second speciality, scientific adviser and consultant. ++ Add cp1251.csf and cp1251lc.csf files to avoid dependencies on the obsolete + "gost" package. ++ Add support for Dr.Sci. dissertations to gost705 style. +* Rewrite code for titlepage fields. +* Move document-specific code to the substyle files. + +Templates: ++ Add commented examples of new fields: second speciality, scientific adviser + and consultant. ++ Add examples of bibliographic entries for Ph.D. and Dr.Sci. dissertations. + + Summary of changes in version 1.1.5 (2010-03-23): Classes and styles: diff --git a/Master/texmf-dist/source/latex/disser/Makefile b/Master/texmf-dist/doc/latex/disser/Makefile index 26fcd09a5c4..f7d0a416135 100644 --- a/Master/texmf-dist/source/latex/disser/Makefile +++ b/Master/texmf-dist/doc/latex/disser/Makefile @@ -5,20 +5,23 @@ TARGET := disser BST := gost705 -MAINDTX := disser gost732 $(BST) +MAINDTX := $(TARGET) $(BST) gost732 MANUAL := manual CLSFILES := *.cls *.rtx BSTFILES := gost705.bst gost705s.bst +CSFFILES := *.csf DOCFILES := $(addsuffix .pdf, $(MAINDTX) $(MANUAL)) TEXTFILES := ../README ../README.ru ../ChangeLog -SRCFILES := *.dtx $(TARGET).ins $(TARGET).ist $(MANUAL).tex Makefile nomake.cmd +SRCFILES := *.dtx $(TARGET).ins $(TARGET).ist $(MANUAL).tex Makefile \ + nomake.cmd TEXMF ?= /usr/share/texmf DESTDIR ?= $(TEXMF) CLSDIR ?= $(DESTDIR)/tex/latex/$(TARGET) DOCDIR ?= $(DESTDIR)/doc/latex/$(TARGET) BSTDIR ?= $(DESTDIR)/bibtex/bst/$(TARGET) +CSFDIR ?= $(DESTDIR)/bibtex/csf/$(TARGET) SRCDIR ?= $(DESTDIR)/source/latex/$(TARGET) CLEXT ?= *.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \ @@ -50,10 +53,12 @@ clean: install: all mkdir -p $(CLSDIR) ;\ mkdir -p $(BSTDIR) ;\ + mkdir -p $(CSFDIR) ;\ mkdir -p $(DOCDIR) ;\ mkdir -p $(SRCDIR) ;\ cp $(CLSFILES) $(CLSDIR) ;\ cp $(BSTFILES) $(BSTDIR) ;\ + cp $(CSFFILES) $(CSFDIR) ;\ cp $(DOCFILES) $(DOCDIR) ;\ cp $(TEXTFILES) $(DOCDIR) ;\ cp $(SRCFILES) $(SRCDIR) @@ -61,11 +66,13 @@ install: all uninstall: -rm $(addprefix $(CLSDIR)/, $(CLSFILES)) -rm $(addprefix $(BSTDIR)/, $(BSTFILES)) + -rm $(addprefix $(CSFDIR)/, $(CSFFILES)) -rm $(addprefix $(DOCDIR)/, $(DOCFILES)) -rm $(addprefix $(DOCDIR)/, $(notdir $(TEXTFILES))) -rm $(addprefix $(SRCDIR)/, $(SRCFILES)) -rmdir $(CLSDIR) -rmdir $(BSTDIR) + -rmdir $(CSFDIR) -rmdir $(DOCDIR) -rmdir $(SRCDIR) diff --git a/Master/texmf-dist/doc/latex/disser/README b/Master/texmf-dist/doc/latex/disser/README index 6cabff88b48..c7119bebe51 100644 --- a/Master/texmf-dist/doc/latex/disser/README +++ b/Master/texmf-dist/doc/latex/disser/README @@ -66,8 +66,9 @@ in Windows: set DESTDIR=disk:\path\to\texmf nomake install -Here /path/to/texmf and disk:\path\to\texmf are the paths to TeX directory tree. -After installation you should update the filename database with the command +Here /path/to/texmf and disk:\path\to\texmf are the paths to TeX directory +tree. After installation you should update the filename database with the +command mktexlsr Example of commands for MiKTeX version 2.8: diff --git a/Master/texmf-dist/doc/latex/disser/README.ru b/Master/texmf-dist/doc/latex/disser/README.ru index 291390b8c01..267759ab00b 100644 --- a/Master/texmf-dist/doc/latex/disser/README.ru +++ b/Master/texmf-dist/doc/latex/disser/README.ru @@ -8,16 +8,16 @@ Рекомендуемые пакеты и программы -------------------------------- -Для корректной сборки документов в вашем дистрибутиве LaTeX должны быть +Для корректной сборки документов в вашем дистрибутиве LaTeX должны быть установлены следующие пакеты: amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions, -natbib, hyperref, subfig, wrapfig, а также пакеты для поддержки +natbib, hyperref, subfig, wrapfig, а также пакеты для поддержки русского языка. -Для использования шрифта Times в текстовом режиме следует установить +Для использования шрифта Times в текстовом режиме следует установить пакет pscyr или cyrtimes, в математическом режиме --- txfonts или mtpro. -Для автоматизированной обработки рисунков с помощью скриптов Makefile и +Для автоматизированной обработки рисунков с помощью скриптов Makefile и nomake.cmd следует установить программы Ghostscript, epstool и sam2p. diff --git a/Master/texmf-dist/doc/latex/disser/cp1251.csf b/Master/texmf-dist/doc/latex/disser/cp1251.csf new file mode 100644 index 00000000000..6e6e360a34d --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/cp1251.csf @@ -0,0 +1,275 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% CHARACTER SET: Cyrillic (CP 1251) +%% +%% SORTING ORDER: First Cyrillic then Latin +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% +%% FILE FORMAT +%% +%% The codepage and sorting order (CS) file defines how BibTeX will treat an +%% 8-bit character set, specifically which characters are to be treated as +%% letters, the upper/lower case relationships between characters, and the +%% sorting order of characters. +%% +%% The CS file may contain a number of sections, each presented in the +%% form of a TeX macro: +%% +%% \section-name{ +%% <section definitions> +%% } +%% +%% Four sections are currently supported: \lowupcase, \lowercase, \uppercase +%% and \order. The syntax of the four supported sections is summarised below. +%% +%% 8-bit characters may be entered naturally, but to avoid problems with +%% character set translation or corruption, they can also be entered using +%% the TeX-style portable notation for character codes, i.e. ^^XX, where XX +%% is the hexadecimal value ofthe character code. +%% +%% Reading of the sections ends when the first '}' character is reached, so +%% '}' can't be included in a section. You can't use ^^7d either. +%% +%% The percent sign ('%') is used to introduce a trailing comment - it and +%% all remaining characters on a line are ignored. ^^25 has the same effect. +%% +%% +%% \lowupcase section +%% +%% The \lowupcase section of the CS file is used to define the lower +%% /upper and upper/lower case relationship of pairs of specified +%% characters. It is only used if the relationship is symmetrical - use +%% \lowercase or \upcase if it isn't. +%% +%% The syntax of the \lowupcase section is: +%% +%% \lowupcase{ +%% <LC-1> <UC-1> % Comment begins with a percent sign +%% <LC-2> <UC-2> +%% ... +%% <LC-N> <UC-N> +%% } +%% +%% Each <LC-n> <UC-n> pair of characters defines that the upper case +%% equivalent of <LC-n> is <UC-n> *and* the lower case equivalent of +%% <UC-n> is <LC-n>. +%% +%% You cannot redefine the lower or upper case equivalent of an ASCII +%% character (code < 128), so all instances of <LC-n> and <UC-n> +%% (i.e. both sides of the relationship) must have codes > 127. +%% +%% +%% \lowercase section +%% +%% The \lowercase section of the CS file is used to define the lower case +%% equivalent of specified characters. It should normally only be used +%% if the relationship isn't symmetrical - use \lowupcase if it is. +%% +%% The syntax of the \lowercase section is: +%% +%% \lowercase{ +%% <UC-1> <LC-1> % Comment begins with a percent sign +%% <UC-2> <LC-2> +%% ... +%% <UC-N> <LC-N> +%% } +%% +%% Each <LC-n> <UC-n> pair of characters defines that the lower case +%% equivalent of <UC-n> is <LC-n>. +%% +%% You cannot redefine the lower case equivalent of an ASCII character +%% (code < 128), so all instances of <UC-n> (i.e. the left hand side +%% of the relationship) must have codes > 127. +%% +%% +%% \uppercase section +%% +%% The \uppercase section of the CS file is used to define the upper case +%% equivalent of specified characters. It should normally only be used +%% if the relationship isn't symmetrical - use \lowupcase if it is. +%% +%% The syntax of the \uppercase section is: +%% +%% \uppercase{ +%% <LC-1> <UC-1> % Comment begins with a percent sign +%% <LC-2> <UC-2> +%% ... +%% <LC-N> <UC-N> +%% } +%% +%% Each <LC-n> <UC-n> pair of characters defines that the upper case +%% case equivalent of <LC-n> is <UC-n>. +%% +%% You cannot redefine the upper case equivalent of an ASCII character +%% (code < 128), so all instances of <LC-n> (i.e. the left hand side +%% of the relationship) must have codes > 127. +%% +%% +%% \order section +%% +%% The \order section of the CS file is used to define the order in which +%% characters are sorted. +%% +%% The syntax of the \order section is: +%% +%% \order{ +%% <char-1> % Comment begins with a percent sign +%% <char-2> <char-3> % whitespace between the chars +%% <char-4> - <char-5> % a hyphen between the chars +%% <char-4> _ <char-5> % an underscore between the chars +%% ... +%% <char-n> +%% } +%% +%% All characters on the same line are given the same sorting weight. +%% +%% The construct <char-1> <underscore> <char-2> is used to denote that +%% all characters in the range <char-1> to <char-2> should be given the +%% same sorting weight. For example, "A _ Z" would cause all ASCII +%% upper case alphabetical characters to have the same sorting weight +%% and would be equivalent to placing all 26 characters on the same line. +%% +%% The construct <char-1> <hyphen> <char-2> is used to denote that all +%% characters in the range <char-1> to <char-2> should be given an +%% ascending set of sorting weights, starting with <char-1> and ending +%% with <char-2>. For example, "A - Z" would cause all upper case ASCII +%% alphabetical characters to be sorted in ascending order and would be +%% equivalent to placing 'A' on the first line, 'B' on the second, +%% through to 'Z' on the 26th line. +%% +%% The characters at the beginning of the order section are given a lower +%% sorting weight than characters occuring later. When sorting +%% alphabetically, characters with the lowest weight come first. +%% +%% All characters not in the \order section (including ASCII characters) +%% are given the same very high sorting weight to ensure that they come +%% last when sorting alphabetically. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + +%% +%% CHARACTER SET +%% +\lowupcase{ + а А + б Б + в В + г Г + ґ Ґ + д Д + е Е + є Є + ё Ё + ж Ж + з З + и И + і І + ї Ї + й Й + к К + л Л + м М + н Н + о О + п П + р Р + с С + т Т + у У + ф Ф + х Х + ц Ц + ч Ч + ш Ш + щ Щ + ъ Ъ + ы Ы + ь Ь + э Э + ю Ю + я Я +} + + + +%% +%% SORTING ORDER +%% +%% +\order{ + 0-9 + А а + Б б + В в + Г г + Ґ ґ + Д д + Е е + Є є + Ё ё + Ж ж + З з + И и + І і + Ї ї + Й й + К к + Л л + М м + Н н + О о + П п + Р р + С с + Т т + У у + Ф ф + Х х + Ц ц + Ч ч + Ш ш + Щ щ + Ъ ъ + Ы ы + Ь ь + Э э + Ю ю + Я я + A a + B b + C c + D d + E e + F f + G g + H h + I i + J j + K k + L l + M m + N n + O o + P p + Q q + R r + S s + T t + U u + V v + W w + X x + Y y + Z z +} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% END OF FILE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd b/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd index 9f860cb49c8..2c8c8fbc282 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd +++ b/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd @@ -44,7 +44,7 @@ exit /b echo epstoeps alias for optimize target echo epstopdf convert EPS to PDF echo fixbb fix BoundingBox of EPS files - echo help ^(default^) show description of targets + echo help show description of targets echo optimize optimize EPS files ^(implies fixbb^) echo pdftopng256 convert PDF to PNG ^(256-color^) echo pdftotiffg4 convert PDF to TIFF ^(b/w CCITT Group 4^) diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.mk b/Master/texmf-dist/doc/latex/disser/include/latex.mk index e93fadcc4ab..535828969d4 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.mk +++ b/Master/texmf-dist/doc/latex/disser/include/latex.mk @@ -43,8 +43,7 @@ clean: -rm -f $(CLFILES) .help: - @$(MAKE) -s -C fig help ;\ - echo " dvi (default) build DVI" ;\ + @echo " dvi (default) build DVI" ;\ echo " figclean clean output files in figures directory" ;\ echo " html convert DVI to HTML" ;\ echo " pdf build PDF" ;\ @@ -54,7 +53,8 @@ clean: echo " ps_2on1 build PS with two A5 pages on one A4 ordered by number" ;\ echo " ps_book build PS booklet (two A5 on A4)" ;\ echo " rtf convert DVI to RTF" ;\ - echo " srcdist build source distribution" + echo " srcdist build source distribution" ;\ + $(MAKE) -s -C fig help html: $(TARGET).dvi $(L2H) $(L2HFLAGS) $(TARGET).tex 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 f5ede11db0b..e3a4ed959fc 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd +++ b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd @@ -80,10 +80,8 @@ goto :eof goto :eof :help - call ..\..\include\latex.fig.nmk.cmd echo dvi ^(default^) build DVI echo figclean clean output files in figures directory - echo help show description of targets echo html convert DVI to HTML echo pdf build PDF echo pdf_2on1 build PDF with two A5 pages on one A4 ordered by number @@ -93,6 +91,7 @@ goto :eof echo ps_book build PS booklet ^(two A5 on A4^) echo rtf convert DVI to RTF echo srcdist build source distribution + call ..\..\include\latex.fig.nmk.cmd goto :eof :html diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex index 6531a321885..a1a7e5e1d7a 100644 --- a/Master/texmf-dist/doc/latex/disser/manual.tex +++ b/Master/texmf-dist/doc/latex/disser/manual.tex @@ -1,7 +1,7 @@ \documentclass[a4paper,10pt]{article} \usepackage[a4paper,includehead,includefoot,mag=1000, left=3cm,right=2cm,top=1cm,bottom=2cm]{geometry} -\usepackage{doc,ifpdf,indentfirst,tabularx,color} +\usepackage{doc,ifpdf,indentfirst,ltxtable,color} \definecolor{darkblue}{rgb}{0,0,.6} \ifpdf @@ -12,7 +12,6 @@ \fi \hypersetup{ - pdfusetitle, pdftitle = {User manual for disser package}, pdfauthor = {Stanislav Kruchinin}, pdfsubject = {disser}, @@ -56,7 +55,7 @@ \let\makelabel\deflabel} }{\end{list}} -\def\fileversion{1.1.5} +\def\fileversion{1.1.6} \begin{document} \sloppy @@ -92,13 +91,13 @@ \section{Опции класса} -\textbf{Примечание:} полужирным начертанием выделены опции, используемые по умолчанию. -\\[2ex] +\textbf{Примечание:} полужирным начертанием выделены опции и значения, используемые по умолчанию. +\\ \extrarowheight=3pt \tabcolsep=6pt \arraycolsep=0pt -\newcolumntype{L}{>{\raggedright}p{4.5cm}} -\begin{tabularx}{\textwidth}{L|X} +\newcolumntype{L}{>{\raggedright}p{4cm}} +\begin{longtable}{L|p{10.5cm}} \hline\hline \multicolumn{2}{c}{\textbf{Стандартные опции}}\\ \hline @@ -159,9 +158,12 @@ libcat & Включает вывод номера УДК на титульном листе. \\\hline - titlepagefile = filename.rtx & - Файл с описанием разметки титульного листа. - По умолчанию имя файла определяется типом документа. + substylefile = filename.rtx & + Имя файла с описанием стиля документа (оформление титульного листа, нумерация формул, элементов списков и т.\,д.). + Опция предназначена для подключения собственных стилей документов, отличающихся от стандартных: \file{autoref.rtx}, + \file{bachelor.rtx}, \file{master.rtx}, + \file{candidate.rtx}, \file{doctor.rtx}. + Если данной опции не присвоено значение, то по умолчанию подключается файл, имя которого совпадает с названием типа документа. \\\hline \multicolumn{2}{c}{\textbf{Опции для подключения и настройки сторонних пакетов}} \\\hline @@ -182,7 +184,7 @@ Использование математических шрифтов MathTime Pro. При наличии опции \cmd{times} вместо пакета \pkg{txfonts} подключается пакет \pkg{mtpro}. \\\hline\hline -\end{tabularx} +\end{longtable} \section{Система сборки документов} @@ -329,7 +331,7 @@ nomake <target1> <target2> ... Псевдоним для \cmd{optimize}. \item[epstopdf] Конвертация EPS в PDF. - Используемая программа: \cmd{epstopdf} (входит в состав MiK\TeX{} и \TeX{}Live). + Используемая программа: \cmd{epstopdf} (входит в состав MiK\TeX{} и \TeX\ Live). Список файлов определяется переменной |E2PFILES|. По умолчанию обрабатываются все файлы с расширением \file{eps}. \item[fixbb] @@ -418,44 +420,48 @@ nomake <target1> <target2> ... Пример: \begin{verbatim} @BOOK{Anselm_1978, - author = {А. И. Ансельм}, - title = {Введение в теорию полупроводников}, - publisher = {Наука}, - address = {Москва}, - year = {1978}, - language = {russian} + author = {А. И. Ансельм}, + title = {Введение в теорию полупроводников}, + publisher = {Наука}, + address = {Москва}, + year = {1978}, + language = {russian}, } \end{verbatim} Для указания даты обращения к Интернет-ресурсам следует использовать поле |urldate|. Пример: \begin{verbatim} @INCOLLECTION{InP, - title = {InP Basic Parameters at 300 K}, - booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties}, + title = {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}, } \end{verbatim} Для работы с русскоязычными библиографическими ссылками необходимо использовать интерпретатор \cmd{bibtex8}, поддерживающий 8-битные символы. В зависимости от кодировки текста в bib-файле, необходимо подключать соответствующий csf-файл с описанием кодовой страницы и порядка сортировки, например, \file{cp1251.csf}. +По умолчанию в скриптах сборки используется файл \file{cp1251.csf}, сортирующий список литературы так, как указано в ГОСТ~7.0.5: сначала идут русскоязычные источники, названия которых набраны кириллицей, а затем иностранные, набранные латиницей. +Другой порядок (сначала латиница, потом кириллица) можно получить, указав файл \file{cp1251lc.csf}. + Последовательность команд, используемая для полной сборки документа с библиографией, имеет следующий вид: \begin{verbatim} latex <tex-file> -bibtex8 -H -c <csf-file> <tex-file-basename> +bibtex8 -H -c <csf-file> <aux-file> latex <tex-file> latex <tex-file> \end{verbatim} -Здесь |<tex-file>| "--- файл документа, |<tex-file-basename>| "--- имя файла документа без расширения, |<csf-file>| "--- файл описания кодовой страницы. +Здесь |<tex-file>| "--- файл документа, |<aux-file>| "--- имя aux-файла, который генерируется после первой этапа компиляции (совпадает с именем tex-файла), |<csf-file>| "--- файл описания кодовой страницы и порядка сортировки. \section{Авторефераты кандидатских и докторских диссертаций} \subsection{Общий текст} В соответствии с требованиями, раздел <<Общая характеристика работы>> автореферата и глава <<Введение>> диссертации должны совпадать. -Общие разделы создаются с помощью команды |\mkcommonsect| в файле |common.tex|, который подключается из |autoref.tex| и |thesis.tex|. +Общие разделы создаются с помощью команды |\mkcommonsect| в файле \file{common.tex}, который подключается из \file{autoref.tex} и \file{thesis.tex}. Пример: \begin{verbatim} @@ -481,17 +487,24 @@ bibtex8 -H -c cp1251 my latex autoref latex autoref \end{verbatim} -Данные операции выполняются автоматически при использовании скриптов |Makefile| и |nomake.cmd|. + +Операция полной сборки документов реализована в скриптах \file{Makefile} и \file{nomake.cmd}. Сборка автореферата в Windows: \begin{verbatim} set target=autoref nomake \end{verbatim} -В Unix-подобных окружениях: +Для возврата к сборке диссертации следует однократно присвоить переменной |TARGET| значение |thesis|: +\begin{verbatim} +set target=thesis +nomake +\end{verbatim} + +Пример сборки автореферата в Unix-подобных окружениях: \begin{verbatim} env TARGET=autoref make \end{verbatim} -Для возврата к сборке диссертации следует присвоить переменной |TARGET| значение |thesis|. + \subsection{Подписи диссертанта и ученого секретаря} diff --git a/Master/texmf-dist/doc/latex/disser/nomake.cmd b/Master/texmf-dist/doc/latex/disser/nomake.cmd index 5b42067fad2..dbb858104ac 100644 --- a/Master/texmf-dist/doc/latex/disser/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/nomake.cmd @@ -17,6 +17,7 @@ set manual=manual set clsfiles=*.cls *.rtx set bstfiles=gost705.bst gost705s.bst +set csffiles=*.csf set docfiles=%target%.pdf %subclass%.pdf %bst%.pdf %manual%.pdf set textfiles=..\README ..\README.ru ..\ChangeLog set srcfiles=*.dtx %target%.ins %target%.ist %manual%.tex Makefile nomake.cmd @@ -25,6 +26,7 @@ if "!texmf!"=="" set texmf=%programfiles%\miktex if "!destdir!"=="" set destdir=!texmf! if "!clsdir!"=="" set clsdir=!destdir!\tex\latex\%target% if "!bstdir!"=="" set bstdir=!destdir!\bibtex\bst\%target% +if "!csfdir!"=="" set csfdir=!destdir!\bibtex\csf\%target% if "!docdir!"=="" set docdir=!destdir!\doc\latex\%target% if "!srcdir!"=="" set srcdir=!destdir!\source\latex\%target% @@ -97,10 +99,12 @@ goto :eof if not exist %target%.cls call :all if not exist "!clsdir!" mkdir "!clsdir!" if not exist "!bstdir!" mkdir "!bstdir!" + if not exist "!csfdir!" mkdir "!csfdir!" if not exist "!docdir!" mkdir "!docdir!" if not exist "!srcdir!" mkdir "!srcdir!" for %%f in (%clsfiles%) do xcopy /y /i /f %%f "!clsdir!" for %%f in (%bstfiles%) do xcopy /y /i /f %%f "!bstdir!" + for %%f in (%csffiles%) do xcopy /y /i /f %%f "!csfdir!" for %%f in (%docfiles%) do xcopy /y /i /f %%f "!docdir!" for %%f in (%textfiles%) do xcopy /y /i /f %%f "!docdir!" for %%f in (%srcfiles%) do xcopy /y /i /f %%f "!srcdir!" @@ -136,6 +140,7 @@ goto :eof :uninstall rmdir /s /q "!clsdir!" rmdir /s /q "!bstdir!" + rmdir /s /q "!csfdir!" rmdir /s /q "!docdir!" rmdir /s /q "!srcdir!" goto :eof diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex index 1d21813106c..1c4d22e57e6 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex @@ -4,7 +4,7 @@ Внутритекстовая формула $\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}. Ссылка на формулу~\eqref{eq:e} +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008}. Ссылка на формулу~\eqref{eq:e} \begin{equation}\label{eq:e} \frac{1}{|\vec r_1 - \vec r_2|} = 4\pi \int \frac{d^3 q}{(2\pi)^3}\, 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 bdbf9e416e8..e4c225cdc29 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib @@ -50,7 +50,7 @@ year = {1983}, series = {Modern Problems in Condensed Matter Sciences}, address = {Amsterdam}, - isbn = {978-0444863133}, + isbn = {0444863133}, } @INCOLLECTION{InP, @@ -63,3 +63,21 @@ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, urldate = {01.11.2009}, } + +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + year = {1996}, + language = {russian}, +} + +@DOCDISSER{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических + системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + year = {2008}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex index 34108dc8233..49632efea20 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex @@ -5,11 +5,15 @@ \author{ФИО автора} -\specnum{11.11.11} -\spec{Специальность} +\specnum{01.04.05} +\spec{Оптика} +%\specsndnum{01.04.07} +%\specsnd{Физика конденсированного состояния} \sa{ФИО руководителя} \sastatus{д.~ф.-м.~н., проф.} +%\sasnd{ФИО второго руководителя} +%\sasndstatus{к.~ф.-м.~н., проф.} %\scon{ФИО консультанта} %\sconstatus{д.~ф.-м.~н., проф.} @@ -19,41 +23,47 @@ % Общие разделы автореферата и диссертации \mkcommonsect{actuality}{Актуальность работы}{% -Текст раздела. Ссылка~\cite{Yoffe_1993_AP_42_173}. +Текст об актуальности. Ссылка~\cite{Yoffe_1993_AP_42_173}. } \mkcommonsect{objective}{Цель диссертационной работы}{% -Текст раздела +состоит в ... + +Для достижения поставленных целей были решены следующие задачи: + } \mkcommonsect{novelty}{Научная новизна}{% -Текст раздела +Текст о новизне. } \mkcommonsect{value}{Практическая значимость}{% -Текст раздела +Результаты, изложенные в диссертации, могут быть использованы для ... } \mkcommonsect{results}{% На защиту выносятся следующие основные результаты и положения:}{% -Текст раздела +Текст о результатах. } \mkcommonsect{approbation}{Апробация работы}{% -Текст раздела +Основные результаты диссертации докладывались на следующих конференциях: } \mkcommonsect{pub}{Публикации.}{% -Материалы диссертации опубликованы в $N$ печатных работах, из них $n_1$ статей в -рецензируемых журналах~\citemy{Ivanov_1999_Journal_17_173, +Материалы диссертации опубликованы в $N$ печатных работах, из них $n_1$ +статей в рецензируемых журналах~\citemy{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_1$ страниц, из них $p_2$ страницы текста, включая $p_3$ рисунков. +Библиография включает $b_1$ наименований на $p_4$ страницах. } 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 dfe9fbfdb33..36b74356506 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib @@ -79,7 +79,7 @@ year = {1983}, series = {Modern Problems in Condensed Matter Sciences}, address = {Amsterdam}, - isbn = {978-0444863133}, + isbn = {0444863133}, } @INCOLLECTION{InP, @@ -92,3 +92,21 @@ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html}, urldate = {01.11.2009}, } + +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + year = {1996}, + language = {russian}, +} + +@DOCDISSER{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических + системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + year = {2008}, + language = {russian}, +} diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex index ff7c5dacf13..2621c58304b 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex @@ -4,52 +4,63 @@ \topic{Тема диссертации} \author{ФИО автора} -\specnum{11.11.11} -\spec{Специальность} + +\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}. +Текст об актуальности. Ссылка~\cite{Yoffe_1993_AP_42_173}. } \mkcommonsect{objective}{Цель диссертационной работы}{% -Текст раздела +состоит в ... + +Для достижения поставленных целей были решены следующие задачи: + } \mkcommonsect{novelty}{Научная новизна}{% -Текст раздела +Текст о новизне. } \mkcommonsect{value}{Практическая значимость}{% -Текст раздела +Результаты, изложенные в диссертации, могут быть использованы для ... } \mkcommonsect{results}{% На защиту выносятся следующие основные результаты и положения:}{% -Текст раздела +Текст о результатах. } \mkcommonsect{approbation}{Апробация работы}{% -Текст раздела +Основные результаты диссертации докладывались на следующих конференциях: } \mkcommonsect{pub}{Публикации.}{% -Материалы диссертации опубликованы в $N$ печатных работах, из них $n_1$ статей в -рецензируемых журналах~\citemy{Ivanov_1999_Journal_17_173, +Материалы диссертации опубликованы в $N$ печатных работах, из них $n_1$ +статей в рецензируемых журналах~\citemy{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_1$ страниц, из них $p_2$ страницы текста, включая $p_3$ рисунков. +Библиография включает $b_1$ наименований на $p_4$ страницах. } 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 772598038ca..36b74356506 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib @@ -79,7 +79,7 @@ year = {1983}, series = {Modern Problems in Condensed Matter Sciences}, address = {Amsterdam}, - isbn = {978-0444863133}, + isbn = {0444863133}, } @INCOLLECTION{InP, @@ -93,3 +93,20 @@ urldate = {01.11.2009}, } +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + year = {1996}, + language = {russian}, +} + +@DOCDISSER{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических + системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + year = {2008}, + language = {russian}, +} 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 ca96fb9e885..e4c225cdc29 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib @@ -50,7 +50,7 @@ year = {1983}, series = {Modern Problems in Condensed Matter Sciences}, address = {Amsterdam}, - isbn = {978-0444863133}, + isbn = {0444863133}, } @INCOLLECTION{InP, @@ -64,3 +64,20 @@ urldate = {01.11.2009}, } +@PHDTHESIS{Mishchenko_1996, + author = {Е. Ж. Мищенко}, + title = {Неупругое рассеяние света в системе взаимодействующих + электронов и фононов}, + school = {ИТФ им. Л.~Д.~Ландау}, + year = {1996}, + language = {russian}, +} + +@DOCDISSER{Skvortsov_2008, + author = {М. А. Скворцов}, + title = {Флуктуационные и интерференционные эффекты в мезоскопических + системах}, + school = {ИТФ им. Л.~Д.~Ландау}, + year = {2008}, + 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 0f72b327ecb..20d760656cc 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex @@ -47,15 +47,25 @@ % Научный руководитель \sa {ФИО руководителя} \sastatus{д.~ф.-м.~н., ст.~н.~с.} +% Второй научный руководитель +%\sasnd {ФИО руководителя} +%\sasndstatus{д.~ф.-м.~н., ст.~н.~с.} % Рецензент \rev {ФИО рецензента} \revstatus{д.~ф.-м.~н., в.~н.~с.} +% Второй рецензент +%\revsnd {ФИО рецензента} +%\revsndstatus{д.~т.~н., ст.~н.~с.} % Консультант -\conspec{вопросам\\охраны труда} \con{ФИО консультанта} +\conspec{вопросам\\охраны труда} \constatus{к.~т.~н., доц.} +% Второй консультант +%\consnd{ФИО консультанта} +%\consndspec{экономическим\\вопросам} +%\consndstatus{к.~э.~н., доц.} % Город и год \city{Санкт-Петербург} diff --git a/Master/texmf-dist/source/latex/disser/autoref.dtx b/Master/texmf-dist/source/latex/disser/autoref.dtx index da00aba6590..ea0d32f4aed 100644 --- a/Master/texmf-dist/source/latex/disser/autoref.dtx +++ b/Master/texmf-dist/source/latex/disser/autoref.dtx @@ -4,9 +4,24 @@ %<*autoref> % \end{macrocode} -% \subsubsection{Титульный лист автореферата} +% \subsubsection{Стиль автореферата} % +% Нумерация. +% \begin{macrocode} +\newcommand\autoref@the{\default@the} +\autoref@the + +% \end{macrocode} +% Титульный лист. +% \begin{macrocode} +\newcommand\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+} % \begin{macrocode} \deflength\firstskip{1cm} \deflength\secondskip{2cm} @@ -77,5 +92,7 @@ \vfill {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +} %</autoref> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/bachelor.dtx b/Master/texmf-dist/source/latex/disser/bachelor.dtx index 0c96c01273c..f459296b9f5 100644 --- a/Master/texmf-dist/source/latex/disser/bachelor.dtx +++ b/Master/texmf-dist/source/latex/disser/bachelor.dtx @@ -4,8 +4,19 @@ %<*bachelor> % \end{macrocode} -% \subsubsection{Титульный лист бакалаврской работы} +% \subsubsection{Стиль бакалаврской работы} % +% Нумерация. +% \begin{macrocode} +\newcommand\bachelor@the{\default@the} +\bachelor@the + +% \end{macrocode} +% Титульный лист. +% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} +% \begin{macrocode} +\if@titlepage\renewcommand\maketitle{ +% \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} % \DescribeMacro{\secondskip}\index{Расстояния!\verb*+\secondskip+} @@ -18,6 +29,14 @@ \deflength\thirdskip{1ex} \deflength\fourthskip{1ex} \deflength\fifthskip{2cm} +\deflength\sixthskip{1.5ex} + +% \end{macrocode} +% Горизонтальный отступ перед чертой в текстовым поле для имени, ученой +% степени и звания научного руководителя и консультанта. +% \DescribeMacro{\fieldhshift}\index{Расстояния!\verb*+\fieldhshift+} +% \begin{macrocode} +\setlength\fieldhshift{8.5cm} % \end{macrocode} % Шрифты элементов титульного листа. @@ -69,13 +88,12 @@ % \begin{macrocode} \vskip\fifthskip\normalfont \begin{tabbing} - \studentlabel\ \groupname\ \@group\hspace{2cm}\= - \makebox[8.5cm][l]{\hrulefill\ \@author} -\\[9pt] + \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] % \end{macrocode} % Научный руководитель. % \begin{macrocode} - \field{sa} + \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi + \ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi \end{tabbing} % \end{macrocode} % \paragraph{Город и год} @@ -84,5 +102,7 @@ \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi %</bachelor> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index ceb6e6573cc..b91dd36d0ee 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -4,8 +4,19 @@ %<*candidate> % \end{macrocode} -% \subsubsection{Титульный лист кандидатской диссертации} +% \subsubsection{Стиль кандидатской диссертации} % +% Нумерация. +% \begin{macrocode} +\newcommand\candidate@the{\default@the} +\candidate@the + +% \end{macrocode} +% Титульный лист. +% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} +% \begin{macrocode} +\if@titlepage\renewcommand\maketitle{ +% \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} % \DescribeMacro{\secondskip}\index{Расстояния!\verb*+\secondskip+} @@ -13,6 +24,7 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \DescribeMacro{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} +% \DescribeMacro{\seventhskip}\index{Расстояния!\verb*+\seventhskip+} % \begin{macrocode} \newlength\firstskip \ifDis@libcat @@ -25,13 +37,6 @@ \deflength\fourthskip{1cm} \deflength\fifthskip{1cm} \deflength\sixthskip{0cm} -\deflength\seventhskip{0cm} - -% \end{macrocode} -% Горизонтальный отступ перед описанием научного руководителя и консультанта. -% \DescribeMacro{\@sahshift}\index{Расстояния!\verb*+"\"@sahshift+} -% \begin{macrocode} -\deflength\@sahshift{8cm} % \end{macrocode} % Шрифты элементов титульного листа. @@ -90,7 +95,10 @@ % Шифр и наименование специальности % \begin{macrocode} \vskip\fourthskip\normalfont - {\specfont\@specnum~--\ \@spec} + {\specfont\@specnum~--\ \@spec}\\[-6pt] + \ifx\@specsndnum\empty\else + {\specfont\@specsndnum~--\ \@specsnd} + \fi % \end{macrocode} % Диссертация на соискание ученой степени... % \begin{macrocode} @@ -100,22 +108,24 @@ % \end{macrocode} % Научный руководитель % \begin{macrocode} -\vskip\sixthskip\normalfont -\begin{tabbing} - \hspace{\@sahshift}\={\saname}\\ - \>\@sastatus\\ - \>\@sa -\end{tabbing} +\ifx\@sa\empty\else + \vskip\sixthskip\normalfont + \disserfield{sa} +\fi +\ifx\@sasnd\empty\else + \vskip\sixthskip\normalfont + \disserfield{sasnd} +\fi % \end{macrocode} % Научный консультант % \begin{macrocode} \ifx\@scon\empty\else - \vskip\seventhskip\normalfont - \begin{tabbing} - \hspace{\@sahshift}\={\sconname}\\ - \>\@sconstatus\\ - \>\@scon - \end{tabbing} + \vskip\sixthskip\normalfont + \disserfield{scon} +\fi +\ifx\@sconsnd\empty\else + \vskip\sixthskip\normalfont + \disserfield{sconsnd} \fi % \end{macrocode} % \paragraph{Город и год} @@ -124,5 +134,7 @@ \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi %</candidate> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/chapter.dtx b/Master/texmf-dist/source/latex/disser/chapter.dtx index f78b06f0b0c..464b72205ab 100644 --- a/Master/texmf-dist/source/latex/disser/chapter.dtx +++ b/Master/texmf-dist/source/latex/disser/chapter.dtx @@ -83,9 +83,9 @@ \def\@chapter[#1]#2{ \ifnum \c@secnumdepth >\m@ne \refstepcounter{chapter}% - {\def\\{ }\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}% + {\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}% \else - {\def\\{ }\addcontentsline{toc}{chapter}{#1}}% + {\addcontentsline{toc}{chapter}{#1}}% \fi \chaptermark{#1}% \addtocontents{lof}{\protect\addvspace{10\p@}}% diff --git a/Master/texmf-dist/source/latex/disser/counters.dtx b/Master/texmf-dist/source/latex/disser/counters.dtx index 3c87acd965d..f976030e538 100644 --- a/Master/texmf-dist/source/latex/disser/counters.dtx +++ b/Master/texmf-dist/source/latex/disser/counters.dtx @@ -94,10 +94,10 @@ % \end{macrocode} % -% Схемы нумерации объектов для разных типов диссертаций. -% \DescribeMacro{\bachelor@the}\index{Макросы!\verb*+\bachelor"@the+} +% Схема нумерации объектов по умолчанию. +% \DescribeMacro{\default@the}\index{Макросы!\verb*+\default"@the+} % \begin{macrocode} -\newcommand\bachelor@the{% +\newcommand\default@the{% % \end{macrocode} % Нумерация сносок и формул начинается заново в каждой главе. % \begin{macrocode} @@ -126,22 +126,5 @@ \ifnum \c@chapter>\z@\thechapter.\fi% \@arabic\c@figure} } -% \end{macrocode} -% По умолчанию у всех одинаковая схема нумерации. -% \DescribeMacro{\master@the}\index{Макросы!\verb*+\master"@the+} -% \DescribeMacro{\candidate@the}\index{Макросы!\verb*+\candidate"@the+} -% \DescribeMacro{\doctor@the}\index{Макросы!\verb*+\doctor"@the+} -% \DescribeMacro{\autoref@the}\index{Макросы!\verb*+\autoref"@the+} -% \begin{macrocode} -\newcommand\master@the \bachelor@the -\newcommand\candidate@the\bachelor@the -\newcommand\doctor@the \candidate@the -\newcommand\autoref@the \candidate@the - -\ifDis@bachelor \bachelor@the \fi -\ifDis@master \master@the \fi -\ifDis@candidate\candidate@the \fi -\ifDis@doctor \doctor@the \fi -\ifDis@autoref \autoref@the \fi %</counters> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx index bb25f3f8d15..375e88e2b09 100644 --- a/Master/texmf-dist/source/latex/disser/custom.dtx +++ b/Master/texmf-dist/source/latex/disser/custom.dtx @@ -7,7 +7,7 @@ %<*custom> % \end{macrocode} -% \subsection{Подключение и настройка часто используемых пакетов} +% \subsection{Подключение и настройка сторонних пакетов} % % \DescribePackage{amsmath}\index{Пакеты!\verb*+amsmath+} % \DescribePackage{amssymb}\index{Пакеты!\verb*+amssymb+} @@ -121,14 +121,15 @@ \usepackage[square,comma,sort&compress,numbers]{natbib} % \end{macrocode} -% Переопределение |\bibsection| для включения ссылки на список литературы в оглавление. +% Переопределение |\bibsection| для включения ссылки на список литературы в +% оглавление. % \DescribeMacro{\bibsection}\index{Макросы!\verb*+\bibsection+} % \begin{macrocode} \renewcommand\bibsection{\nchapter{\bibname}} % \end{macrocode} -% Переопределение |thebibliography| для создания корректной PDF-закладки -% (основано на варианте из |natbib|). +% Переопределение окружения |thebibliography| для создания корректной +% PDF-закладки (основано на варианте из \pkg{natbib}). % \DescribeEnv{thebibliography}\index{Окружения!\verb*+thebibliography+} % \begin{macrocode} \renewenvironment{thebibliography}[1]{% @@ -147,10 +148,6 @@ \let\citeN\cite \let\shortcite\cite \let\citeasnoun\cite -% \end{macrocode} -% Убираем вертикальный интервал между библиографическими ссылками для автореферата. -% \begin{macrocode} - \ifDis@autoref\setlength\bibsep{0pt}\fi }{% \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}} \endlist\vskip-\lastskip% @@ -237,9 +234,9 @@ % \end{macrocode} % Команда, создающая цель для гиперссылок над заголовками ненумеруемых разделов. -% \DescribeMacro{\metaphantom}\index{Макросы!\verb*+\metaphantom+} +% \DescribeMacro{\hrefphantom}\index{Макросы!\verb*+\hrefphantom+} % \begin{macrocode} -\providecommand\metaphantom[1]{% +\providecommand\hrefphantom[1]{% \ifDis@href \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{#1*.\the\Hy@linkcounter}% @@ -263,23 +260,23 @@ \fi \thispagestyle{\@chapterpagestyle}% \global\@topnum\z@ - \metaphantom{chapter} - {\def\\{ }\addcontentsline{toc}{chapter}{#1}}% + \hrefphantom{chapter} + \addcontentsline{toc}{chapter}{#1}% \@afterindentfalse \@schapter{#1} } \newcommand\nsection[1]{% - \metaphantom{section}% + \hrefphantom{section}% \addcontentsline{toc}{section}{#1} \section*{#1} } \newcommand\nsubsection[1]{% - \metaphantom{subsection}% + \hrefphantom{subsection}% \addcontentsline{toc}{subsection}{#1} \subsection*{#1} } \newcommand\nsubsubsection[1]{% - \metaphantom{subsubsection}% + \hrefphantom{subsubsection}% \addcontentsline{toc}{subsubsection}{#1} \subsubsection*{#1} } diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index 30d6d2581ff..ed5bb05472c 100644 --- a/Master/texmf-dist/source/latex/disser/disser.dtx +++ b/Master/texmf-dist/source/latex/disser/disser.dtx @@ -3,7 +3,7 @@ %% %% disser -- LaTeX document class for dissertations. %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin +%% Copyright (c) 2004-2010 Stanislav Kruchinin %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,7 +19,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{disser.drv}[2009/03/23 1.1.5 Document class for dissertations] +\ProvidesFile{disser.drv}[2010/05/22 1.1.6 Document class for dissertations] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -121,13 +121,13 @@ \DocInput{floats.dtx} \DocInput{env.dtx} \DocInput{page.dtx} + \DocInput{titledefs.dtx} \DocInput{titlepage.dtx} \DocInput{bachelor.dtx} \DocInput{master.dtx} \DocInput{candidate.dtx} \DocInput{doctor.dtx} \DocInput{autoref.dtx} - \DocInput{titledefs.dtx} \DocInput{toc.dtx} \DocInput{custom.dtx} \IndexPrologue{\section{Предметный указатель}} @@ -180,7 +180,7 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2009/03/23 1.1.5 Document class for dissertations] +\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations] % \end{macrocode} % Подключение пакета \pkg{kvoptions} для обработки опций в формате @@ -435,7 +435,7 @@ % Создание цветных ссылок. % \begin{macrocode} \DeclareBoolOption[false]{colorlinks} -\DeclareStringOption{titlepagefile} +\DeclareStringOption{substylefile} % \end{macrocode} % Выполнение опций по умолчанию. @@ -450,30 +450,25 @@ % \end{macrocode} % Файл с описанием разметки титульного листа по умолчанию. % \begin{macrocode} -\ifx\Dis@titlepagefile\@empty - \ifDis@bachelor \renewcommand*{\Dis@titlepagefile}{bachelor.rtx}\fi - \ifDis@master \renewcommand*{\Dis@titlepagefile}{master.rtx}\fi - \ifDis@candidate\renewcommand*{\Dis@titlepagefile}{candidate.rtx}\fi - \ifDis@doctor \renewcommand*{\Dis@titlepagefile}{doctor.rtx}\fi - \ifDis@autoref \renewcommand*{\Dis@titlepagefile}{autoref.rtx}\fi +\ifx\Dis@substylefile\@empty + \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi + \ifDis@master \renewcommand*{\Dis@substylefile}{master.rtx}\fi + \ifDis@candidate\renewcommand*{\Dis@substylefile}{candidate.rtx}\fi + \ifDis@doctor \renewcommand*{\Dis@substylefile}{doctor.rtx}\fi + \ifDis@autoref \renewcommand*{\Dis@substylefile}{autoref.rtx}\fi \fi % \end{macrocode} -% Команды изменения регистра. -% \DescribeMacro{\MakeTextUppercase}\index{Макросы!\verb*+\MakeTextUppercase+} +% Подключение стиля документа. % \begin{macrocode} -\DeclareRobustCommand\MakeTextUppercase{% - \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase} - -\protected@edef\MakeTextUppercase#1{\MakeTextUppercase{#1}} +\AtEndOfClass{\input{\Dis@substylefile}} % \end{macrocode} -% \DescribeMacro{\MakeTextLowercase}\index{Макросы!\verb*+\MakeTextLowercase+} +% Определение команд изменения регистра |\MakeTextUppercase| +% и |\MakeTextLowercase|. +% \DescribeMacro{textcase}\index{Пакеты!\verb*+textcase+} % \begin{macrocode} -\DeclareRobustCommand\MakeTextLowercase{% - \@uclcnotmath{}{##2##1}\lowercase} - -\protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}} +\RequirePackage[overload]{textcase} % \end{macrocode} % \subsection{Настройка шрифтов} @@ -640,6 +635,12 @@ % \begin{macrocode} \lccode`\-=`\- \defaulthyphenchar=127 +% \end{macrocode} +% Пустое определение макроса для вывода сегодняшней даты (переопределяется +% в \pkg{babel}). +% \DescribeMacro{\today}\index{Макросы!\verb*+\today+} +% \begin{macrocode} +\newcommand\today{} %</disser> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/disser.ins b/Master/texmf-dist/source/latex/disser/disser.ins index 069565b51ae..b288a638077 100644 --- a/Master/texmf-dist/source/latex/disser/disser.ins +++ b/Master/texmf-dist/source/latex/disser/disser.ins @@ -12,7 +12,7 @@ \input docstrip \preamble -Copyright (c) 2004-2009 Stanislav Kruchinin. +Copyright (c) 2004-2010 Stanislav Kruchinin. All rights reserved. This file is part of the disser package. diff --git a/Master/texmf-dist/source/latex/disser/doctor.dtx b/Master/texmf-dist/source/latex/disser/doctor.dtx index 63cb124038e..aa0632090a9 100644 --- a/Master/texmf-dist/source/latex/disser/doctor.dtx +++ b/Master/texmf-dist/source/latex/disser/doctor.dtx @@ -4,14 +4,26 @@ %<*doctor> % \end{macrocode} -% \subsubsection{Титульный лист докторской диссертации} +% \subsubsection{Стиль докторской диссертации} % +% Нумерация. +% \begin{macrocode} +\newcommand\doctor@the{\default@the} +\doctor@the + +% \end{macrocode} +% Титульный лист. +% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} +% \begin{macrocode} +\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{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} % \begin{macrocode} \newlength\firstskip \ifDis@libcat @@ -26,12 +38,6 @@ \deflength\sixthskip{0cm} % \end{macrocode} -% Горизонтальный отступ перед описанием научного руководителя и консультанта. -% \DescribeMacro{\@sahshift}\index{Расстояния!\verb*+"\"@sahshift+} -% \begin{macrocode} -\deflength\@sahshift{8cm} - -% \end{macrocode} % Шрифты элементов титульного листа. % \DescribeMacro{\titlefont}\index{Макросы!\verb*+\titlefont+} % \DescribeMacro{\topicfont}\index{Макросы!\verb*+\topicfont+} @@ -87,7 +93,10 @@ % Шифр и наименование специальности % \begin{macrocode} \vskip\fourthskip\normalfont - {\specfont\@specnum~--\ \@spec} + {\specfont\@specnum~--\ \@spec}\\[-6pt] + \ifx\@specsndnum\empty\else + {\specfont\@specsndnum~--\ \@specsnd} + \fi % \end{macrocode} % Диссертация на соискание ученой степени... % \begin{macrocode} @@ -99,11 +108,11 @@ % \begin{macrocode} \ifx\@scon\empty\else \vskip\sixthskip\normalfont - \begin{tabbing} - \hspace{\@sahshift}\={\sconname}\\ - \>\@sconstatus\\ - \>\@scon - \end{tabbing} + \disserfield{scon} +\fi +\ifx\@sconsnd\empty\else + \vskip\sixthskip\normalfont + \disserfield{sconsnd} \fi % \end{macrocode} % \paragraph{Город и год} @@ -112,5 +121,7 @@ \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi %</doctor> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index 85ff7cc3da5..01dd4f1cd45 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -22,11 +22,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{gost705.drv}[2009/03/23 1.1.5 Bibliography style for dissertations.] +\ProvidesFile{gost705.drv}[2010/05/22 1.1.6 Bibliography style for dissertations.] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, - left=5cm,right=1cm,top=1.5cm,bottom=1.5cm]{geometry} + left=5.5cm,right=1cm,top=1.5cm,bottom=1.5cm]{geometry} \usepackage{ifpdf,indentfirst,color,makeidx} \definecolor{darkblue}{rgb}{0,0,.6} @@ -805,11 +805,28 @@ FUNCTION {bbl.mthesis} FUNCTION {bbl.phdthesis} { curlanguage "english" = - { "Ph.D. thesis" } + { "Ph.\,D. thesis" } { curlanguage "russian" = { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ " "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } - { "language is not defined: " language "Ph.D. thesis" * * warning$ "P." } + { "language is not defined: " language "Ph.\,D. thesis" * * warning$ "P." } + if$ + } + if$ +} + +% \end{macrocode} +% \DescribeBSTFunction{bbl.docdisser} +% \begin{macrocode} +FUNCTION {bbl.docdisser} +{ + curlanguage "english" = + { "Dr.\,Sci. dissertation" } + { curlanguage "russian" = + { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ " + "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * } + { "language is not defined: " language "Dr.\,Sci. dissertation" * * + warning$ "P." } if$ } if$ @@ -1484,7 +1501,9 @@ FUNCTION {format.isbn} { isbn empty$ { "" } - { "ISBN~" isbn * } + { "ISBN:~\href{http://isbndb.com/search-all.html?kw=" isbn * + "}{" * isbn * "}" * + } if$ } @@ -1789,6 +1808,30 @@ FUNCTION {phdthesis} } % \end{macrocode} +% \DescribeBSTFunction{docdisser} +% \begin{macrocode} +FUNCTION {docdisser} +{ + output.bibitem + format.authors "author" output.check + new.sentence + format.btitle add.doi "title" output.check + new.column + bbl.docdisser format.thesis.type output.nonnull + new.slash + school "school" output.check + new.block + output.address.publisher.date + new.block + format.pages.page output + note output + new.sentence + output.url + format.annote output + fin.entry +} + +% \end{macrocode} % \DescribeBSTFunction{proceedings} % \begin{macrocode} FUNCTION {proceedings} @@ -1925,6 +1968,7 @@ MACRO {irp} {"Infrared Phys."} MACRO {jap} {"J. Appl. Phys."} MACRO {jasa} {"J. Acoust. Soc. America"} MACRO {jcp} {"J. Comp. Phys."} +MACRO {jchp} {"J. Chem. Phys."} MACRO {jetp} {"Sov. Phys.--JETP"} MACRO {jfe} {"J. Fusion Energy"} MACRO {jfm} {"J. Fluid Mech."} @@ -1978,7 +2022,7 @@ MACRO {sam} {"Stud. Appl. Math."} MACRO {sjpp} {"Sov. J. Plasma Phys."} MACRO {spd} {"Sov. Phys.--Doklady"} MACRO {sptp} {"Sov. Phys.--Tech. Phys."} -MACRO {spu} {"Sov. Phys.--Uspeki"} +MACRO {spu} {"Sov. Phys.--Uspekhi"} MACRO {st} {"Sky and Telesc."} % \end{macrocode} @@ -2012,11 +2056,12 @@ MACRO {zphb} {"Z. f. Physik~B"} MACRO {zphd} {"Z. f. Physik~D"} % \end{macrocode} -% \subsubsection{Физика твердого тела} +% \subsubsection{Физика конденсированного состояния} % \begin{macrocode} MACRO {sse} {"Solid-State Electron."} MACRO {pss} {"Phys. Sol. State"} MACRO {sst} {"Semicond. Sci. Tech."} +MACRO {nl} {"Nano Lett."} READ @@ -2205,6 +2250,8 @@ FUNCTION {begin.bib} write$ newline$ "\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" diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index 71a2d040c3a..580d4c8cb27 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -3,7 +3,7 @@ %% %% gost732 -- GOST 7.32-2001 implementation. %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin +%% Copyright (c) 2004-2010 Stanislav Kruchinin %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{gost732.drv}[2009/03/23 1.1.5 GOST 7.32-2001 implementation] +\ProvidesFile{gost732.drv}[2010/05/22 1.1.6 GOST 7.32-2001 implementation] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -113,7 +113,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2009/03/23 1.1.5 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2010/05/22 1.1.6 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax diff --git a/Master/texmf-dist/source/latex/disser/master.dtx b/Master/texmf-dist/source/latex/disser/master.dtx index 45f902c30aa..84b16d85bc2 100644 --- a/Master/texmf-dist/source/latex/disser/master.dtx +++ b/Master/texmf-dist/source/latex/disser/master.dtx @@ -4,8 +4,19 @@ %<*master> % \end{macrocode} -% \subsubsection{Титульный лист магистерской диссертации} +% \subsubsection{Стиль магистерской диссертации} % +% Нумерация. +% \begin{macrocode} +\newcommand\master@the{\default@the} +\master@the + +% \end{macrocode} +% Титульный лист. +% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} +% \begin{macrocode} +\if@titlepage\renewcommand\maketitle{ +% \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} % \DescribeMacro{\secondskip}\index{Расстояния!\verb*+\secondskip+} @@ -18,6 +29,14 @@ \deflength\thirdskip{1ex} \deflength\fourthskip{-1cm} \deflength\fifthskip{0ex} +\deflength\sixthskip{1.5ex} + +% \end{macrocode} +% Горизонтальный отступ перед чертой в текстовым поле для имени, ученой +% степени и звания научного руководителя и консультанта. +% \DescribeMacro{\fieldhshift}\index{Расстояния!\verb*+\fieldhshift+} +% \begin{macrocode} +\setlength\fieldhshift{8.5cm} % \end{macrocode} % Шрифты элементов титульного листа. @@ -75,26 +94,25 @@ % % Выполнил студент гр. номер... % \begin{macrocode} - \studentlabel\ \groupname\ \@group\hspace{2cm}\= - \makebox[8.5cm][l]{\hrulefill\ \@author} -\\[9pt] + \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] % \end{macrocode} % % Научный руководитель % \begin{macrocode} - \field{sa} -\\[9pt] + \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi + \ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi % \end{macrocode} % % Рецензент % \begin{macrocode} - \field{rev} -\\[9pt] + \ifx\@rev\empty\else\diplomafield{rev}\\[\sixthskip]\fi + \ifx\@revsnd\empty\else\diplomafield{revsnd}\\[\sixthskip]\fi % \end{macrocode} % % Консультант % \begin{macrocode} - \ifdefined\@con\field{con}\fi + \ifx\@con\empty\else\diplomafield{con}\\[9pt]\fi + \ifx\@consnd\empty\else\diplomafield{consnd}\fi \end{tabbing} % \end{macrocode} % \paragraph{Город и год} @@ -103,5 +121,7 @@ \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi %</master> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/part.dtx b/Master/texmf-dist/source/latex/disser/part.dtx index df9a5cc90cf..8904b2a14a9 100644 --- a/Master/texmf-dist/source/latex/disser/part.dtx +++ b/Master/texmf-dist/source/latex/disser/part.dtx @@ -128,7 +128,7 @@ \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% % \end{macrocode} -% Здесь и далее команда |\def\\{ }| используется для корректного отображения +% Команда |\def\\{ }| используется для корректного отображения % заголовков с принудительными разрывами строк. % \begin{macrocode} {\def\\{ }\addcontentsline{toc}{part}{\@tocseccntformat{part} #1}} diff --git a/Master/texmf-dist/source/latex/disser/titledefs.dtx b/Master/texmf-dist/source/latex/disser/titledefs.dtx index 4e44b096527..18e935047dc 100644 --- a/Master/texmf-dist/source/latex/disser/titledefs.dtx +++ b/Master/texmf-dist/source/latex/disser/titledefs.dtx @@ -19,14 +19,12 @@ \cyrl\cyri\cyrs\cyrt} % \end{macrocode} % \DescribeMacro{\keywordsname}\index{Макросы!\verb+\keywordsname+} -% \DescribeMacro{\keywordssep}\index{Макросы!\verb+\keywordssep+} % \DescribeMacro{\keywordslabel}\index{Макросы!\verb+\keywordslabel+} % Ключевые слова % \begin{macrocode} \def\keywordsname{\cyr\CYRK\cyrk\cyryu\cyrch\cyre\cyrv\cyrery\cyre\ % \cyrs\cyrl\cyro\cyrv\cyra} -\def\keywordssep{:} -\def\keywordslabel{\keywordsname\keywordssep} +\def\keywordslabel{\keywordsname:} % \end{macrocode} % \DescribeMacro{\workname}\index{Макросы!\verb+\workname+} % Диссертация @@ -50,32 +48,26 @@ \def\groupname{\cyr\cyrg\cyrr.} % \end{macrocode} % \DescribeMacro{\topicname}\index{Макросы!\verb+\topicname+} -% \DescribeMacro{\topicsep}\index{Макросы!\verb+\topicsep+} % \DescribeMacro{\topiclabel}\index{Макросы!\verb+\topiclabel+} % Тема % \begin{macrocode} \def\topicname{\cyr\CYRT\cyre\cyrm\cyra} -\def\topicsep{:\ } -\def\topiclabel{\topicname\topicsep} +\def\topiclabel{\topicname:\ } % \end{macrocode} % \DescribeMacro{\coursename}\index{Макросы!\verb+\coursename+} -% \DescribeMacro{\coursesep}\index{Макросы!\verb+\coursesep+} % \DescribeMacro{\courselabel}\index{Макросы!\verb+\courselabel+} % Направление % \begin{macrocode} \def\coursename{\cyr\CYRN\cyra\cyrp\cyrr\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre} -\def\coursesep{:} -\def\courselabel{\coursename\coursesep} +\def\courselabel{\coursename:} % \end{macrocode} % \DescribeMacro{\specname}\index{Макросы!\verb+\specname+} -% \DescribeMacro{\specsep}\index{Макросы!\verb+\specsep+} % \DescribeMacro{\speclabel}\index{Макросы!\verb+\speclabel+} % Специальность % \begin{macrocode} \def\specname{% \cyr\CYRS\cyrp\cyre\cyrc\cyri\cyra\cyrl\cyrsftsn\cyrn\cyro\cyrs\cyrt\cyrsftsn} -\def\specsep{:} -\def\speclabel{\specname\specsep} +\def\speclabel{\specname:} % \end{macrocode} % \DescribeMacro{\masterprogname}\index{Макросы!\verb+\masterprogname+} % \DescribeMacro{\masterprogsep}\index{Макросы!\verb+\masterprogsep+} @@ -85,8 +77,7 @@ \def\masterprogname{% \cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ % \cyrp\cyrr\cyro\cyrg\cyrr\cyra\cyrm\cyrm\cyra} -\def\masterprogsep{:} -\def\masterproglabel{\masterprogname\masterprogsep} +\def\masterproglabel{\masterprogname:} % \end{macrocode} % \DescribeMacro{\studentname}\index{Макросы!\verb+\studentname+} % \DescribeMacro{\studentlabel}\index{Макросы!\verb+\studentlabel+} @@ -94,7 +85,7 @@ % \begin{macrocode} \def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ % \cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt} -\def\studentlabel{\studentname} +\def\studentlabel{\studentname\ \groupname\ \@group\hspace{2cm}} % \end{macrocode} % \DescribeMacro{\saname}\index{Макросы!\verb+\saname+} % \DescribeMacro{\salabel}\index{Макросы!\verb+\salabel+} @@ -102,29 +93,37 @@ % \begin{macrocode} \def\saname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ % \cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn} +\def\sasndname{\saname} \def\salabel{\saname} +\def\sasndlabel{\saname} % \end{macrocode} % \DescribeMacro{\scname}\index{Макросы!\verb+\scname+} % \DescribeMacro{\sclabel}\index{Макросы!\verb+\sclabel+} -% Научный консультант +% Научный консультант (для докторских диссертаций) % \begin{macrocode} \def\sconname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ % \cyrk\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt} +\def\sconsndname{\sconname} \def\sconlabel{\sconname} +\def\sconsndlabel{\sconsndname} % \end{macrocode} % \DescribeMacro{\revname}\index{Макросы!\verb+\revname+} % \DescribeMacro{\revlabel}\index{Макросы!\verb+\revlabel+} % Рецензент % \begin{macrocode} \def\revname{\cyr\CYRR\cyre\cyrc\cyre\cyrn\cyrz\cyre\cyrn\cyrt} +\def\revsndname{\revname} \def\revlabel{\revname} +\def\revsndlabel{\revsndname} % \end{macrocode} % \DescribeMacro{\conname}\index{Макросы!\verb+\conname+} % \DescribeMacro{\conlabel}\index{Макросы!\verb+\conlabel+} -% Консультант +% Консультант (для магистерских дипломов) % \begin{macrocode} \def\conname{\cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt} +\def\consndname{\conname} \def\conlabel{\conname\ \cyrp\cyro\ \@conspec} +\def\consndlabel{\consndname\ \cyrp\cyro\ \@consndspec} % \end{macrocode} % \DescribeMacro{\asmanuscript}\index{Макросы!\verb+\asmanuscript+} % На правах рукописи @@ -153,14 +152,20 @@ % \end{macrocode} % % \DescribeMacro{\spec}\index{Макросы!\verb*+\spec+} +% \DescribeMacro{\specsnd}\index{Макросы!\verb*+\specsnd+} % Название специальности % \begin{macrocode} \def\spec#1{\gdef\@spec{#1}}\spec{} +\def\specsnd#1{\gdef\@specsnd{#1}}\specsnd{} + % \end{macrocode} % \DescribeMacro{\specnum}\index{Макросы!\verb*+\specnum+} +% \DescribeMacro{\specsndnum}\index{Макросы!\verb*+\specsndnum+} % Номер специальности % \begin{macrocode} \def\specnum#1{\gdef\@specnum{#1}}\specnum{} +\def\specsndnum#1{\gdef\@specsndnum{#1}}\specsndnum{} + % \end{macrocode} % \DescribeMacro{\course}\index{Макросы!\verb*+\course+} % Название направления @@ -250,68 +255,87 @@ \def\postcommonsect{\ } % \end{macrocode} % -% \subsubsection{Научный руководитель} +% \subsubsection{Научные руководители} % \DescribeMacro{\sa}\index{Макросы!\verb*+\sa+} +% \DescribeMacro{\sasnd}\index{Макросы!\verb*+\sasnd+} % ФИО % \begin{macrocode} \def\sa#1{\gdef\@sa{#1}}\sa{} +\def\sasnd#1{\gdef\@sasnd{#1}}\sasnd{} + % \end{macrocode} % \DescribeMacro{\sastatus}\index{Макросы!\verb*+\sastatus+} +% \DescribeMacro{\sasndstatus}\index{Макросы!\verb*+\sasndstatus+} % Учёное звание % \begin{macrocode} \def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{} +\def\sasndstatus#1{\gdef\@sasndstatus{#1}}\sasndstatus{} + % \end{macrocode} % -% \subsubsection{Научный консультант} +% \subsubsection{Научные консультанты (для докторских диссертаций)} % \DescribeMacro{\scon}\index{Макросы!\verb*+\scon+} +% \DescribeMacro{\sconsnd}\index{Макросы!\verb*+\sconsnd+} % ФИО % \begin{macrocode} \def\scon#1{\gdef\@scon{#1}}\scon{} +\def\sconsnd#1{\gdef\@sconsnd{#1}}\sconsnd{} % \end{macrocode} % \DescribeMacro{\sconstatus}\index{Макросы!\verb*+\sconstatus+} +% \DescribeMacro{\sconsndstatus}\index{Макросы!\verb*+\sconsndstatus+} % Учёное звание % \begin{macrocode} \def\sconstatus#1{\gdef\@sconstatus{#1}}\sconstatus{} +\def\sconsndstatus#1{\gdef\@sconsndstatus{#1}}\sconsndstatus{} + % \end{macrocode} % -% \subsubsection{Рецензент} +% \subsubsection{Рецензенты} % \DescribeMacro{\rev}\index{Макросы!\verb*+\rev+} +% \DescribeMacro{\revsnd}\index{Макросы!\verb*+\revsnd+} % ФИО % \begin{macrocode} \def\rev#1{\gdef\@rev{#1}}\rev{} +\def\revsnd#1{\gdef\@revsnd{#1}}\revsnd{} % \end{macrocode} % \DescribeMacro{\revstatus}\index{Макросы!\verb*+\revstatus+} -% учёное звание +% \DescribeMacro{\revsndstatus}\index{Макросы!\verb*+\revsndstatus+} +% Учёное звание % \begin{macrocode} \def\revstatus#1{\gdef\@revstatus{#1}}\revstatus{} +\def\revsndstatus#1{\gdef\@revsndstatus{#1}}\revsndstatus{} + % \end{macrocode} % -% \subsubsection{Консультант} -% -% \DescribeMacro{\conspec}\index{Макросы!\verb*+\conspec+} -% Специальность -% \begin{macrocode} -\def\conspec#1{\gdef\@conspec{#1}} -% \end{macrocode} +% \subsubsection{Консультанты (для магистерских дипломов)} % \DescribeMacro{\con}\index{Макросы!\verb*+\con+} % ФИО % \begin{macrocode} -\def\con#1{\gdef\@con{#1}} +\def\con#1{\gdef\@con{#1}}\con{} +\def\consnd#1{\gdef\@consnd{#1}}\consnd{} +% \end{macrocode} +% \DescribeMacro{\conspec}\index{Макросы!\verb*+\conspec+} +% \DescribeMacro{\consndspec}\index{Макросы!\verb*+\consndspec+} +% Специальность +% \begin{macrocode} +\def\conspec#1{\gdef\@conspec{#1}}\conspec{} +\def\consndspec#1{\gdef\@consndspec{#1}}\consndspec{} % \end{macrocode} % \DescribeMacro{\constatus}\index{Макросы!\verb*+\constatus+} +% \DescribeMacro{\consndstatus}\index{Макросы!\verb*+\consndstatus+} % Учёное звание и степень % \begin{macrocode} -\def\constatus#1{\gdef\@constatus{#1}} +\def\constatus#1{\gdef\@constatus{#1}}\constatus{} +\def\consndstatus#1{\gdef\@consndstatus{#1}}\consndstatus{} % \end{macrocode} % -% \subsubsection{Названия ненумеруемых глав} -% +% \subsubsection{Названия стандартных ненумеруемых глав} % \begin{itemize} % \item Содержание % \DescribeMacro{\contentsname}\index{Макросы!\verb*+\contentsname+} % \begin{macrocode} -\AtBeginDocument{ +\AtBeginDocument{% \addto\captionsrussian{% \def\contentsname{\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre} } @@ -355,17 +379,34 @@ % \end{macrocode} % -% \subsubsection{Поля титульного листа} +% \subsubsection{Элементы титульного листа} % -% \DescribeMacro{\field}\index{Макросы!\verb*+\field+} -% Формат записей для научного руководителя, рецензента и консультанта % \begin{macrocode} -\providecommand\field[1]{% +\deflength\fieldhshift{8cm} + +% \end{macrocode} +% \DescribeMacro{\namefield}\index{Макросы!\verb*+\namefield+} +% Формат поля для подписи, имени, ученого звания и степени научных +% руководителей, рецензентов и консультанта для бакалаврского и магистерского +% дипломов. +% \begin{macrocode} +\providecommand\diplomafield[1]{% \csname #1label\endcsname,\\% \csname @#1status\endcsname\> - \makebox[8.5cm][l]{\hrulefill\ \csname @#1\endcsname} + \makebox[\fieldhshift][l]{\hrulefill\ \csname @#1\endcsname} } % \end{macrocode} +% Аналогичное поле для кандидатской и докторской диссертации. +% \begin{macrocode} +\providecommand\disserfield[1]{% + \begin{tabbing} + \hspace{\fieldhshift}\={\csname #1label\endcsname}\\ + \>\csname @#1status\endcsname\\ + \>\csname @#1\endcsname + \end{tabbing} +} + +% \end{macrocode} % % \DescribeMacro{\@approved}\index{Макросы!\verb+"\"@approved+} % Диссертация допущена к защите @@ -394,7 +435,8 @@ % \begin{macrocode} \providecommand\mkcommonsect[3]{% \@namedef{#1head}{#2} - \@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}\postcommonsect} + \@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}% + \postcommonsect} \@namedef{#1text}{#3} } \let\mkintrosect=\mkcommonsect diff --git a/Master/texmf-dist/source/latex/disser/titlepage.dtx b/Master/texmf-dist/source/latex/disser/titlepage.dtx index 0177b5addfc..e909b002639 100644 --- a/Master/texmf-dist/source/latex/disser/titlepage.dtx +++ b/Master/texmf-dist/source/latex/disser/titlepage.dtx @@ -5,12 +5,6 @@ % % \subsection{Титульный лист} % -% Пустое определение макроса для вывода сегодняшней даты (переопределяется в |babel|). -% \DescribeMacro{\today}\index{Макросы!\verb*+\today+} -% \begin{macrocode} -\newcommand\today{} - -% \end{macrocode} % Подключение констант и команд, используемых для верстки титульного листа. % \begin{macrocode} \input{titledefs.rtx} @@ -32,18 +26,9 @@ % \DescribeMacro{\cdsep}\index{Макросы!\verb*+\cdsep+} % \begin{macrocode} \newcommand\cdsep{~-- } - -% \end{macrocode} -% \subsubsection{Разметка титульного листа} -% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} -% \begin{macrocode} - \newcommand\maketitle{ - \makeatletter - \input{\Dis@titlepagefile} - \normalfont\clearpage - } % \newcommand\maketitle + \newcommand\maketitle{} \setcounter{footnote}{0} -\else %\if@titlepage +\else % \end{macrocode} % Заголовок без отдельного титульного листа. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx index 97dbe501e3c..b8a47714c54 100644 --- a/Master/texmf-dist/tex/latex/disser/autoref.rtx +++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx @@ -6,7 +6,7 @@ %% %% autoref.dtx (with options: `autoref') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -14,6 +14,10 @@ \ProvidesFile{autoref.rtx} +\newcommand\autoref@the{\default@the} +\autoref@the + +\newcommand\maketitle{ \deflength\firstskip{1cm} \deflength\secondskip{2cm} \deflength\thirdskip{1cm} @@ -52,6 +56,8 @@ \vfill {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +} \endinput %% %% End of file `autoref.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index 89d8d3f22f5..7c73e819c65 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -6,7 +6,7 @@ %% %% bachelor.dtx (with options: `bachelor') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -14,11 +14,18 @@ \ProvidesFile{bachelor.rtx} +\newcommand\bachelor@the{\default@the} +\bachelor@the + +\if@titlepage\renewcommand\maketitle{ \deflength\firstskip{1.5cm} \deflength\secondskip{1.5cm} \deflength\thirdskip{1ex} \deflength\fourthskip{1ex} \deflength\fifthskip{2cm} +\deflength\sixthskip{1.5ex} + +\setlength\fieldhshift{8.5cm} \def\titlefont{\Large\bfseries} \def\topiclabelfont{\large} @@ -48,15 +55,16 @@ \vskip\fifthskip\normalfont \begin{tabbing} - \studentlabel\ \groupname\ \@group\hspace{2cm}\= - \makebox[8.5cm][l]{\hrulefill\ \@author} -\\[9pt] - \field{sa} + \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] + \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi + \ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi \end{tabbing} \vfill \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi \endinput %% %% End of file `bachelor.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index b77557a5881..136fd656f41 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -6,7 +6,7 @@ %% %% candidate.dtx (with options: `candidate') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -14,6 +14,10 @@ \ProvidesFile{candidate.rtx} +\newcommand\candidate@the{\default@the} +\candidate@the + +\if@titlepage\renewcommand\maketitle{ \newlength\firstskip \ifDis@libcat \setlength\firstskip{2ex} @@ -25,9 +29,6 @@ \deflength\fourthskip{1cm} \deflength\fifthskip{1cm} \deflength\sixthskip{0cm} -\deflength\seventhskip{0cm} - -\deflength\@sahshift{8cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} @@ -55,28 +56,35 @@ \vskip\thirdskip\normalfont {\topicfont\@topic\par} \vskip\fourthskip\normalfont - {\specfont\@specnum~--\ \@spec} + {\specfont\@specnum~--\ \@spec}\\[-6pt] + \ifx\@specsndnum\empty\else + {\specfont\@specsndnum~--\ \@specsnd} + \fi \vskip\fifthskip\normalfont {\titlefont\@title} \end{center} -\vskip\sixthskip\normalfont -\begin{tabbing} - \hspace{\@sahshift}\={\saname}\\ - \>\@sastatus\\ - \>\@sa -\end{tabbing} +\ifx\@sa\empty\else + \vskip\sixthskip\normalfont + \disserfield{sa} +\fi +\ifx\@sasnd\empty\else + \vskip\sixthskip\normalfont + \disserfield{sasnd} +\fi \ifx\@scon\empty\else - \vskip\seventhskip\normalfont - \begin{tabbing} - \hspace{\@sahshift}\={\sconname}\\ - \>\@sconstatus\\ - \>\@scon - \end{tabbing} + \vskip\sixthskip\normalfont + \disserfield{scon} +\fi +\ifx\@sconsnd\empty\else + \vskip\sixthskip\normalfont + \disserfield{sconsnd} \fi \vfill \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi \endinput %% %% End of file `candidate.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 64fb2370b9f..120972cdcf5 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -18,7 +18,7 @@ %% toc.dtx (with options: `toc') %% custom.dtx (with options: `custom') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -27,7 +27,7 @@ %% %% disser -- LaTeX document class for dissertations. %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin +%% Copyright (c) 2004-2010 Stanislav Kruchinin %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2009/03/23 1.1.5 Document class for dissertations] +\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations] \RequirePackage{kvoptions} @@ -177,29 +177,23 @@ \DeclareBoolOption[true]{fixint} \DeclareBoolOption[false]{colorlinks} -\DeclareStringOption{titlepagefile} +\DeclareStringOption{substylefile} \ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany,candidate} \ProcessKeyvalOptions{Dis} \ProcessOptions -\ifx\Dis@titlepagefile\@empty - \ifDis@bachelor \renewcommand*{\Dis@titlepagefile}{bachelor.rtx}\fi - \ifDis@master \renewcommand*{\Dis@titlepagefile}{master.rtx}\fi - \ifDis@candidate\renewcommand*{\Dis@titlepagefile}{candidate.rtx}\fi - \ifDis@doctor \renewcommand*{\Dis@titlepagefile}{doctor.rtx}\fi - \ifDis@autoref \renewcommand*{\Dis@titlepagefile}{autoref.rtx}\fi +\ifx\Dis@substylefile\@empty + \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi + \ifDis@master \renewcommand*{\Dis@substylefile}{master.rtx}\fi + \ifDis@candidate\renewcommand*{\Dis@substylefile}{candidate.rtx}\fi + \ifDis@doctor \renewcommand*{\Dis@substylefile}{doctor.rtx}\fi + \ifDis@autoref \renewcommand*{\Dis@substylefile}{autoref.rtx}\fi \fi -\DeclareRobustCommand\MakeTextUppercase{% - \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase} +\AtEndOfClass{\input{\Dis@substylefile}} -\protected@edef\MakeTextUppercase#1{\MakeTextUppercase{#1}} - -\DeclareRobustCommand\MakeTextLowercase{% - \@uclcnotmath{}{##2##1}\lowercase} - -\protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}} +\RequirePackage[overload]{textcase} \def\EC@family#1#2#3#4#5{% \DeclareFontShape{#1}{#2}{#3}{#4}% @@ -301,6 +295,7 @@ \lccode`\-=`\- \defaulthyphenchar=127 +\newcommand\today{} %%% From File: counters.dtx @@ -340,7 +335,7 @@ \newcommand\toctheparagraph{\theparagraph} \newcommand\tocthesubparagraph{\thesubparagraph} -\newcommand\bachelor@the{% +\newcommand\default@the{% \@addtoreset{footnote}{chapter} \@addtoreset{equation}{chapter} @@ -354,16 +349,6 @@ \ifnum \c@chapter>\z@\thechapter.\fi% \@arabic\c@figure} } -\newcommand\master@the \bachelor@the -\newcommand\candidate@the\bachelor@the -\newcommand\doctor@the \candidate@the -\newcommand\autoref@the \candidate@the - -\ifDis@bachelor \bachelor@the \fi -\ifDis@master \master@the \fi -\ifDis@candidate\candidate@the \fi -\ifDis@doctor \doctor@the \fi -\ifDis@autoref \autoref@the \fi %%% From File: part.dtx @@ -505,9 +490,9 @@ \def\@chapter[#1]#2{ \ifnum \c@secnumdepth >\m@ne \refstepcounter{chapter}% - {\def\\{ }\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}% + {\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}% \else - {\def\\{ }\addcontentsline{toc}{chapter}{#1}}% + {\addcontentsline{toc}{chapter}{#1}}% \fi \chaptermark{#1}% \addtocontents{lof}{\protect\addvspace{10\p@}}% @@ -1208,8 +1193,6 @@ \fi -\newcommand\today{} - \input{titledefs.rtx} \if@titlepage @@ -1218,14 +1201,9 @@ \newcommand\topicfont{\large\bfseries} \newcommand\instfont{\normalfont} \newcommand\cdsep{~-- } - - \newcommand\maketitle{ - \makeatletter - \input{\Dis@titlepagefile} - \normalfont\clearpage - } % \newcommand\maketitle + \newcommand\maketitle{} \setcounter{footnote}{0} -\else %\if@titlepage +\else \newcommand\maketitle{% \global\let\thanks\relax \global\let\maketitle\relax @@ -1426,7 +1404,6 @@ \let\citeN\cite \let\shortcite\cite \let\citeasnoun\cite - \ifDis@autoref\setlength\bibsep{0pt}\fi }{% \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}} \endlist\vskip-\lastskip% @@ -1473,7 +1450,7 @@ \fi \fi -\providecommand\metaphantom[1]{% +\providecommand\hrefphantom[1]{% \ifDis@href \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{#1*.\the\Hy@linkcounter}% @@ -1489,23 +1466,23 @@ \fi \thispagestyle{\@chapterpagestyle}% \global\@topnum\z@ - \metaphantom{chapter} - {\def\\{ }\addcontentsline{toc}{chapter}{#1}}% + \hrefphantom{chapter} + \addcontentsline{toc}{chapter}{#1}% \@afterindentfalse \@schapter{#1} } \newcommand\nsection[1]{% - \metaphantom{section}% + \hrefphantom{section}% \addcontentsline{toc}{section}{#1} \section*{#1} } \newcommand\nsubsection[1]{% - \metaphantom{subsection}% + \hrefphantom{subsection}% \addcontentsline{toc}{subsection}{#1} \subsection*{#1} } \newcommand\nsubsubsection[1]{% - \metaphantom{subsubsection}% + \hrefphantom{subsubsection}% \addcontentsline{toc}{subsubsection}{#1} \subsubsection*{#1} } diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index b54bf6cd310..867652075c5 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -6,7 +6,7 @@ %% %% doctor.dtx (with options: `doctor') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -14,6 +14,10 @@ \ProvidesFile{doctor.rtx} +\newcommand\doctor@the{\default@the} +\doctor@the + +\if@titlepage\renewcommand\maketitle{ \newlength\firstskip \ifDis@libcat \setlength\firstskip{1ex} @@ -26,8 +30,6 @@ \deflength\fifthskip{1cm} \deflength\sixthskip{0cm} -\deflength\@sahshift{8cm} - \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} \def\authorfont{\large} @@ -53,22 +55,27 @@ \vskip\thirdskip\normalfont {\topicfont\@topic\par} \vskip\fourthskip\normalfont - {\specfont\@specnum~--\ \@spec} + {\specfont\@specnum~--\ \@spec}\\[-6pt] + \ifx\@specsndnum\empty\else + {\specfont\@specsndnum~--\ \@specsnd} + \fi \vskip\fifthskip\normalfont {\titlefont\@title} \end{center} \ifx\@scon\empty\else \vskip\sixthskip\normalfont - \begin{tabbing} - \hspace{\@sahshift}\={\sconname}\\ - \>\@sconstatus\\ - \>\@scon - \end{tabbing} + \disserfield{scon} +\fi +\ifx\@sconsnd\empty\else + \vskip\sixthskip\normalfont + \disserfield{sconsnd} \fi \vfill \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi \endinput %% %% End of file `doctor.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 635029c2055..4d2506570a3 100644 --- a/Master/texmf-dist/tex/latex/disser/gost732.cls +++ b/Master/texmf-dist/tex/latex/disser/gost732.cls @@ -6,7 +6,7 @@ %% %% gost732.dtx (with options: `gost732') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -15,7 +15,7 @@ %% %% gost732 -- GOST 7.32-2001 implementation. %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin +%% Copyright (c) 2004-2010 Stanislav Kruchinin %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2009/03/23 1.1.5 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2010/05/22 1.1.6 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 7e2ff5d74dd..78fdc88ec24 100644 --- a/Master/texmf-dist/tex/latex/disser/master.rtx +++ b/Master/texmf-dist/tex/latex/disser/master.rtx @@ -6,7 +6,7 @@ %% %% master.dtx (with options: `master') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -14,11 +14,18 @@ \ProvidesFile{master.rtx} +\newcommand\master@the{\default@the} +\master@the + +\if@titlepage\renewcommand\maketitle{ \deflength\firstskip{1ex} \deflength\secondskip{1ex} \deflength\thirdskip{1ex} \deflength\fourthskip{-1cm} \deflength\fifthskip{0ex} +\deflength\sixthskip{1.5ex} + +\setlength\fieldhshift{8.5cm} \def\titlefont{\Large\bfseries} \def\topiclabelfont{\large} @@ -48,19 +55,20 @@ \end{tabbing} \vskip\fifthskip\normalfont \begin{tabbing} - \studentlabel\ \groupname\ \@group\hspace{2cm}\= - \makebox[8.5cm][l]{\hrulefill\ \@author} -\\[9pt] - \field{sa} -\\[9pt] - \field{rev} -\\[9pt] - \ifdefined\@con\field{con}\fi + \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] + \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi + \ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi + \ifx\@rev\empty\else\diplomafield{rev}\\[\sixthskip]\fi + \ifx\@revsnd\empty\else\diplomafield{revsnd}\\[\sixthskip]\fi + \ifx\@con\empty\else\diplomafield{con}\\[9pt]\fi + \ifx\@consnd\empty\else\diplomafield{consnd}\fi \end{tabbing} \vfill \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi \endinput %% %% End of file `master.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx index 7b92d2e143a..61e5958c4ec 100644 --- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx +++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx @@ -6,7 +6,7 @@ %% %% titledefs.dtx (with options: `titledefs') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -19,41 +19,44 @@ \cyrl\cyri\cyrs\cyrt} \def\keywordsname{\cyr\CYRK\cyrk\cyryu\cyrch\cyre\cyrv\cyrery\cyre\ % \cyrs\cyrl\cyro\cyrv\cyra} -\def\keywordssep{:} -\def\keywordslabel{\keywordsname\keywordssep} +\def\keywordslabel{\keywordsname:} \def\workname{\cyr\CYRD\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya} \def\approved{\workname\ \cyrd\cyro\cyrp\cyru\cyrshch\cyre\cyrn\cyra\ % \cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre} \def\appos{\cyr\cyrz\cyra\cyrv.\ \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt} \def\groupname{\cyr\cyrg\cyrr.} \def\topicname{\cyr\CYRT\cyre\cyrm\cyra} -\def\topicsep{:\ } -\def\topiclabel{\topicname\topicsep} +\def\topiclabel{\topicname:\ } \def\coursename{\cyr\CYRN\cyra\cyrp\cyrr\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre} -\def\coursesep{:} -\def\courselabel{\coursename\coursesep} +\def\courselabel{\coursename:} \def\specname{% \cyr\CYRS\cyrp\cyre\cyrc\cyri\cyra\cyrl\cyrsftsn\cyrn\cyro\cyrs\cyrt\cyrsftsn} -\def\specsep{:} -\def\speclabel{\specname\specsep} +\def\speclabel{\specname:} \def\masterprogname{% \cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ % \cyrp\cyrr\cyro\cyrg\cyrr\cyra\cyrm\cyrm\cyra} -\def\masterprogsep{:} -\def\masterproglabel{\masterprogname\masterprogsep} +\def\masterproglabel{\masterprogname:} \def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ % \cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt} -\def\studentlabel{\studentname} +\def\studentlabel{\studentname\ \groupname\ \@group\hspace{2cm}} \def\saname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ % \cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn} +\def\sasndname{\saname} \def\salabel{\saname} +\def\sasndlabel{\saname} \def\sconname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ % \cyrk\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt} +\def\sconsndname{\sconname} \def\sconlabel{\sconname} +\def\sconsndlabel{\sconsndname} \def\revname{\cyr\CYRR\cyre\cyrc\cyre\cyrn\cyrz\cyre\cyrn\cyrt} +\def\revsndname{\revname} \def\revlabel{\revname} +\def\revsndlabel{\revsndname} \def\conname{\cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt} +\def\consndname{\conname} \def\conlabel{\conname\ \cyrp\cyro\ \@conspec} +\def\consndlabel{\consndname\ \cyrp\cyro\ \@consndspec} \def\asmanuscript{\cyr\CYRN\cyra\ \cyrp\cyrr\cyra\cyrv\cyra\cyrh\ % \cyrr\cyru\cyrk\cyro\cyrp\cyri\cyrs\cyri} \def\libcatname{\cyr\CYRU\CYRD\CYRK} @@ -61,7 +64,11 @@ \cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt\cyrery:} \def\institution#1{\gdef\@institution{#1}}\institution{} \def\spec#1{\gdef\@spec{#1}}\spec{} +\def\specsnd#1{\gdef\@specsnd{#1}}\specsnd{} + \def\specnum#1{\gdef\@specnum{#1}}\specnum{} +\def\specsndnum#1{\gdef\@specsndnum{#1}}\specsndnum{} + \def\course#1{\gdef\@course{#1}}\course{} \def\coursenum#1{\gdef\@coursenum{#1}}\coursenum{} \def\keywords#1{\gdef\@keywords{#1}}\keywords{} @@ -82,16 +89,29 @@ \let\commonsect=\textbf \def\postcommonsect{\ } \def\sa#1{\gdef\@sa{#1}}\sa{} +\def\sasnd#1{\gdef\@sasnd{#1}}\sasnd{} + \def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{} +\def\sasndstatus#1{\gdef\@sasndstatus{#1}}\sasndstatus{} + \def\scon#1{\gdef\@scon{#1}}\scon{} +\def\sconsnd#1{\gdef\@sconsnd{#1}}\sconsnd{} \def\sconstatus#1{\gdef\@sconstatus{#1}}\sconstatus{} +\def\sconsndstatus#1{\gdef\@sconsndstatus{#1}}\sconsndstatus{} + \def\rev#1{\gdef\@rev{#1}}\rev{} +\def\revsnd#1{\gdef\@revsnd{#1}}\revsnd{} \def\revstatus#1{\gdef\@revstatus{#1}}\revstatus{} -\def\conspec#1{\gdef\@conspec{#1}} -\def\con#1{\gdef\@con{#1}} -\def\constatus#1{\gdef\@constatus{#1}} +\def\revsndstatus#1{\gdef\@revsndstatus{#1}}\revsndstatus{} + +\def\con#1{\gdef\@con{#1}}\con{} +\def\consnd#1{\gdef\@consnd{#1}}\consnd{} +\def\conspec#1{\gdef\@conspec{#1}}\conspec{} +\def\consndspec#1{\gdef\@consndspec{#1}}\consndspec{} +\def\constatus#1{\gdef\@constatus{#1}}\constatus{} +\def\consndstatus#1{\gdef\@consndstatus{#1}}\consndstatus{} -\AtBeginDocument{ +\AtBeginDocument{% \addto\captionsrussian{% \def\contentsname{\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre} } @@ -114,11 +134,21 @@ \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} \providecommand*\review{\nchapter{\reviewname}} -\providecommand\field[1]{% +\deflength\fieldhshift{8cm} + +\providecommand\diplomafield[1]{% \csname #1label\endcsname,\\% \csname @#1status\endcsname\> - \makebox[8.5cm][l]{\hrulefill\ \csname @#1\endcsname} + \makebox[\fieldhshift][l]{\hrulefill\ \csname @#1\endcsname} } +\providecommand\disserfield[1]{% + \begin{tabbing} + \hspace{\fieldhshift}\={\csname #1label\endcsname}\\ + \>\csname @#1status\endcsname\\ + \>\csname @#1\endcsname + \end{tabbing} +} + \providecommand\@approved{ \begin{tabbing} \hspace{8cm}\={\approved}\\ @@ -134,7 +164,8 @@ \providecommand\mkcommonsect[3]{% \@namedef{#1head}{#2} - \@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}\postcommonsect} + \@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}% + \postcommonsect} \@namedef{#1text}{#3} } \let\mkintrosect=\mkcommonsect diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index e2d7043d0ef..aa7e201800a 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -18,6 +18,7 @@ my $tlpdb; my $Master; our %OPT; +# toptesi - reinstate after next upload, generated files out of sync # these packages should be up to date: my @TLP_working = qw( 12many 2up @@ -304,7 +305,7 @@ my @TLP_working = qw( titlefoot titlepages titlepic titleref titlesec titling tkz-doc tkz-linknodes tkz-orm tkz-tab tocbibind tocloft tocvsec2 todo todonotes - tokenizer toolbox tools toptesi totcount totpages tracking + tokenizer toolbox tools totcount totpages tracking trajan translator tree-dvips trfsigns trimspaces trivfloat trsym tufte-latex tugboat tugboat-plain turkmen turnstile twoinone twoup txfonts txfontsb type1cm typedref typehtml typogrid diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 4bc449390f0..84a2fae4a35 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1460,11 +1460,13 @@ $standardmp = '\.mp$'; %specialdvi = (); $standarddvi = 'NULL'; # rely on authors/CTAN making pdf's. -%specialcsf= (); # packages which need special BibTeX styles installed $standardcsf='\.csf'; +%specialcsf = ( + 'disser', 'cp1251lc.csf', # cp1251.csf dup with gost +); $standardbst='\.bst$'; -%specialbst= ( +%specialbst = ( 'umthesis', 'NULL', ); |