From 28ceee86f87c2f6dc30500d0ab39fe47a93ee24d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Sep 2011 23:50:53 +0000 Subject: disser (19sep11) git-svn-id: svn://tug.org/texlive/trunk@24029 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/disser/gost705.bst | 11 +--- Master/texmf-dist/bibtex/bst/disser/gost705s.bst | 11 +--- Master/texmf-dist/doc/latex/disser/ChangeLog | 8 ++- Master/texmf-dist/doc/latex/disser/README | 19 +++---- Master/texmf-dist/doc/latex/disser/README.ru | 8 +-- .../texmf-dist/doc/latex/disser/include/latex.mk | 4 +- .../doc/latex/disser/include/latex.nmk.cmd | 4 +- Master/texmf-dist/doc/latex/disser/manual.tex | 21 +------ Master/texmf-dist/doc/latex/disser/nomake.cmd | 2 +- .../texmf-dist/doc/latex/disser/templates/Makefile | 66 +++++++++++----------- .../doc/latex/disser/templates/bachelor/1.tex | 5 +- .../doc/latex/disser/templates/bachelor/thesis.tex | 4 +- .../latex/disser/templates/candidate/autoref.tex | 5 +- .../latex/disser/templates/candidate/common.tex | 4 +- .../latex/disser/templates/candidate/thesis.tex | 12 ++-- .../doc/latex/disser/templates/doctor/autoref.tex | 5 +- .../doc/latex/disser/templates/doctor/common.tex | 4 +- .../doc/latex/disser/templates/doctor/thesis.tex | 11 ++-- .../doc/latex/disser/templates/master/thesis.tex | 4 +- .../doc/latex/disser/templates/nomake.cmd | 2 +- .../latex/disser/templates/specialist/thesis.tex | 4 +- .../texmf-dist/source/latex/disser/candidate.dtx | 2 +- Master/texmf-dist/source/latex/disser/chapter.dtx | 3 +- Master/texmf-dist/source/latex/disser/custom.dtx | 18 +++--- Master/texmf-dist/source/latex/disser/disser.dtx | 4 +- Master/texmf-dist/source/latex/disser/doctor.dtx | 2 +- Master/texmf-dist/source/latex/disser/gost705.dtx | 13 ++--- Master/texmf-dist/source/latex/disser/gost732.dtx | 4 +- Master/texmf-dist/tex/latex/disser/candidate.rtx | 2 +- Master/texmf-dist/tex/latex/disser/disser.cls | 23 +++++--- Master/texmf-dist/tex/latex/disser/doctor.rtx | 2 +- Master/texmf-dist/tex/latex/disser/gost732.cls | 2 +- 32 files changed, 138 insertions(+), 151 deletions(-) diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst index bcc97218bf2..76e3c2700e5 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst @@ -725,9 +725,7 @@ FUNCTION {output.address.publisher.date} FUNCTION {output.bibitem} { newline$ - "\bibitem[\BibPrefix" write$ - label write$ - "\BibPostfix]{" write$ + "\bibitem" "{" * write$ cite$ write$ "}" write$ newline$ @@ -1165,6 +1163,7 @@ FUNCTION {book} output.bibitem author.before format.btitle add.doi "title" output.check + new.slash editor.organization.after new.sentence format.number.series output @@ -1679,10 +1678,6 @@ FUNCTION {begin.bib} if$ "\makeatletter\renewcommand{\@biblabel}[1]{#1.}\makeatother" write$ newline$ - "\ifx\undefined\BibPrefix\def\BibPrefix{}\else\fi" - write$ newline$ - "\ifx\undefined\BibPostfix\def\BibPostfix{}\else\fi" - write$ newline$ "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" write$ newline$ "\ifx\undefined\href\def\href#1#2{#2}\else\fi" @@ -1701,7 +1696,7 @@ FUNCTION {begin.bib} write$ newline$ "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi" write$ newline$ - "\begin{thebibliography}{\BibPrefix" longest.label * "\BibPostfix}" * + "\begin{thebibliography}{" longest.label * "}" * write$ newline$ "\def\selectlanguageifdefined#1{" write$ newline$ diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst index 5bf7af3d437..ff41304025c 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst @@ -725,9 +725,7 @@ FUNCTION {output.address.publisher.date} FUNCTION {output.bibitem} { newline$ - "\bibitem[\BibPrefix" write$ - label write$ - "\BibPostfix]{" write$ + "\bibitem" "{" * write$ cite$ write$ "}" write$ newline$ @@ -1165,6 +1163,7 @@ FUNCTION {book} output.bibitem author.before format.btitle add.doi "title" output.check + new.slash editor.organization.after new.sentence format.number.series output @@ -1782,10 +1781,6 @@ FUNCTION {begin.bib} if$ "\makeatletter\renewcommand{\@biblabel}[1]{#1.}\makeatother" write$ newline$ - "\ifx\undefined\BibPrefix\def\BibPrefix{}\else\fi" - write$ newline$ - "\ifx\undefined\BibPostfix\def\BibPostfix{}\else\fi" - write$ newline$ "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" write$ newline$ "\ifx\undefined\href\def\href#1#2{#2}\else\fi" @@ -1804,7 +1799,7 @@ FUNCTION {begin.bib} write$ newline$ "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi" write$ newline$ - "\begin{thebibliography}{\BibPrefix" longest.label * "\BibPostfix}" * + "\begin{thebibliography}{" longest.label * "}" * write$ newline$ "\def\selectlanguageifdefined#1{" write$ newline$ diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog index 444a863b74c..f13ab1ace6b 100644 --- a/Master/texmf-dist/doc/latex/disser/ChangeLog +++ b/Master/texmf-dist/doc/latex/disser/ChangeLog @@ -1,7 +1,13 @@ disser changelog -Copyright (C) 2004-2010 Stanislav Kruchinin +Copyright (C) 2004-2012 Stanislav Kruchinin ------------------------------------------- +Summary of changes in version 1.1.8 (2010-09-11): +* Remove bibliography prefix support to solve the problem with citation compression. ++ Add compatibility with MathTime Professional II fonts. +* Miscellaneous small fixes. + + Summary of changes in version 1.1.7 (2010-11-21): + Add specialist titlepage and template. + Add support for titlepages in English to all templates. diff --git a/Master/texmf-dist/doc/latex/disser/README b/Master/texmf-dist/doc/latex/disser/README index 46b4ad3ea3d..65884468f6d 100644 --- a/Master/texmf-dist/doc/latex/disser/README +++ b/Master/texmf-dist/doc/latex/disser/README @@ -3,7 +3,7 @@ This package provides LaTeX classes, bibliography styles and document templates for typesetting dissertations and author's abstracts that would -satisfy the requirements of a dissertation councils and High Certification +satisfy the requirements of dissertation councils and High Certification Commission of Russian Federation. @@ -27,7 +27,7 @@ Ghostscript, epstool and sam2p. 3. Downloads and updates ------------------------ -'disser' is available on CTAN: +Disser is available on CTAN: http://www.ctan.org/tex-archive/macros/latex/contrib/disser/ Project page at Sourceforge: @@ -66,26 +66,25 @@ 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 +Here /path/to/texmf and disk:\path\to\texmf are paths to TeX directory tree. After installation you should update the filename database with the command mktexlsr -if you install the package to user's directory "%APPDATA%\MiKTeX\2.8" +if you install the package to user's directory "%APPDATA%\MiKTeX\2.9" or mktexlsr --admin if you install the package to one of the common directories, like -"%programfiles%\MiKTeX 2.8" or "%ALLUSERSPROFILE%\Application -Data\MiKTeX\2.8". +"%programfiles%\MiKTeX 2.9" or "%ALLUSERSPROFILE%\MiKTeX\2.9". -Examples of commands for MiKTeX 2.8. +Examples of commands for MiKTeX 2.9. Installation for all users: - set DESTDIR=%ALLUSERSPROFILE%\Application Data\MiKTeX\2.8 + set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9 nomake install mktexlsr --admin Installation for current user only: - set DESTDIR=%APPDATA%\MiKTeX\2.8 + set DESTDIR=%APPDATA%\MiKTeX\2.9 nomake install mktexlsr @@ -105,7 +104,7 @@ Example: 5. License ---------- -Copyright (c) 2004-2010 Stanislav Kruchinin +Copyright (c) 2004-2012 Stanislav Kruchinin It may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/disser/README.ru b/Master/texmf-dist/doc/latex/disser/README.ru index 9d4752fe476..0e4378175c6 100644 --- a/Master/texmf-dist/doc/latex/disser/README.ru +++ b/Master/texmf-dist/doc/latex/disser/README.ru @@ -68,15 +68,15 @@ ZIP- После установки следует обновить базу имен файлов с помощью команды mktexlsr -Примеры команд для дистрибутива MiKTeX версии 2.8. +Примеры команд для дистрибутива MiKTeX версии 2.9 и Windows 7. Установка для всех пользователей: - set DESTDIR=%ALLUSERSPROFILE%\Application Data\MiKTeX\2.8 + set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9 nomake install mktexlsr --admin Установка только для текущего пользователя: - set DESTDIR=%APPDATA%\MiKTeX\2.8 + set DESTDIR=%APPDATA%\MiKTeX\2.9 nomake install mktexlsr @@ -100,7 +100,7 @@ ZIP- 5. Лицензия ----------- -Цопыригхт (ц) 2004-2010 Станислав Кручинин +Цопыригхт (ц) 2004-2012 Станислав Кручинин Ит маы бе дистрибутед анд/ор модифиед ундер тхе цондитионс оф тхе ЛаТеХ Пройецт Публиц Лиценсе, еитхер версион 1.3 diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.mk b/Master/texmf-dist/doc/latex/disser/include/latex.mk index 535828969d4..dda0acfe291 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.mk +++ b/Master/texmf-dist/doc/latex/disser/include/latex.mk @@ -80,10 +80,10 @@ $(TARGET).dvi: *.tex *.bib @$(LATEX) $(TEXFLAGS) $(TARGET).tex ;\ if [ -f $(BIBFILE) ] ; then \ for f in *.aux; do $(BIBTEX) $(BIBTEXFLAGS) $$f; done ;\ - $(LATEX) $(TEXFLAGS) $(TARGET).tex ;\ else \ echo Warning: Bibliography file does not exist ;\ fi ;\ + $(LATEX) $(TEXFLAGS) $(TARGET).tex ;\ $(LATEX) $(TEXFLAGS) $(TARGET).tex $(TARGET).ps: $(TARGET).dvi @@ -100,10 +100,10 @@ $(TARGET).pdf: *.tex *.bib @$(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex ;\ if [ -f $(BIBFILE) ] ; then \ for f in *.aux ; do $(BIBTEX) $(BIBTEXFLAGS) $$f ; done ;\ - $(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex ;\ else \ echo "Warning: Bibliography file does not exist" ;\ fi ;\ + $(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex ;\ $(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex $(TARGET)_2on1.pdf: $(TARGET)_2on1.ps 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 e3a4ed959fc..7c601466261 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd +++ b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd @@ -72,11 +72,11 @@ goto :eof %latex% %latexflags% %target%.tex if exist %bibfile% ( for %%f in (*.aux) do %bibtex% %bibtexflags% %%f - %latex% %texflags% %target%.tex ) else ( echo Warning: Bibliography file does not exist ) %latex% %latexflags% %target%.tex + %latex% %latexflags% %target%.tex goto :eof :help @@ -113,11 +113,11 @@ goto :eof %pdflatex% %pdflatexflags% %target%.tex if exist %bibfile% ( for %%f in (*.aux) do %bibtex% %bibtexflags% %%f - %pdflatex% %pdflatexflags% %target%.tex ) else ( echo Warning: Bibliography file does not exist ) %pdflatex% %pdflatexflags% %target%.tex + %pdflatex% %pdflatexflags% %target%.tex goto :eof :pdf_2on1 diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex index 154f2a95287..d32811141bd 100644 --- a/Master/texmf-dist/doc/latex/disser/manual.tex +++ b/Master/texmf-dist/doc/latex/disser/manual.tex @@ -55,7 +55,7 @@ \let\makelabel\deflabel} }{\end{list}} -\def\fileversion{1.1.7} +\def\fileversion{1.1.8} \begin{document} \sloppy @@ -91,7 +91,7 @@ \section{Опции класса} -\textbf{Примечание:} полужирным начертанием выделены опции и значения, используемые по умолчанию. +\textbf{Примечание:} полужирным выделены опции и значения, используемые по умолчанию. \\ \extrarowheight=3pt \tabcolsep=6pt @@ -401,22 +401,7 @@ nomake ... \item Настраиваемые префикс и постфикс номера библиографической ссылки для оформления списка работ диссертанта в автореферате. \end{enumerate} -Стили позволяют менять префикс и постфикс номеров ссылок, т.\,е. использовать ссылки вида [A1] или [1a]. -Это необходимо для того, чтобы в автореферате различались ссылки на работы соискателя и на внешние источники. -Префикс и постфикс номера ссылки определяются макросами |\BibPrefix| и |\BibPostfix|, соответственно. -Их значения должны быть определены до использования команды |\bibliographystyle|. - -Пример: -\begin{verbatim} -\def\BibPrefix{A} -\bibliographystyle{disser} -\bibliography{thesis} -\end{verbatim} -В данном случае ссылки будут иметь вид [A$n$], где $n$ "--- номер. -К сожалению, пакет \pkg{natbib} не <<сжимает>> ссылки с нецифровыми символами, т.\,е. ссылки вида [A1, A2, A3, A4] не преобразуются к более компактной форме [A1--A4]. -Ведется работа над исправлением этого недостатка. - -Для включения выделения курсивом некоторых полей библиографической записи, в файле \file{thesis.tex} нужно добавить определение +Для выделения курсивом некоторых полей библиографической записи, в файле \file{thesis.tex} нужно добавить определение \begin{verbatim} \def\BibEmph#1{\emph{#1}} \end{verbatim} diff --git a/Master/texmf-dist/doc/latex/disser/nomake.cmd b/Master/texmf-dist/doc/latex/disser/nomake.cmd index a6253760980..10858f086d2 100644 --- a/Master/texmf-dist/doc/latex/disser/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/nomake.cmd @@ -22,7 +22,7 @@ set docfiles=%target%.pdf %subclass%.pdf %bst%.pdf %manual%.pdf set textfiles=..\README ..\README.ru ..\ChangeLog set srcfiles=*.dtx %target%.ins dtx.ist %manual%.tex Makefile nomake.cmd -if "!texmf!"=="" set texmf=%allusersprofile%\Application Data\MiKTeX\2.8 +if "!texmf!"=="" set texmf=%allusersprofile%\Application Data\MiKTeX\2.9 if "!destdir!"=="" set destdir=!texmf! if "!clsdir!"=="" set clsdir=!destdir!\tex\latex\%target% if "!bstdir!"=="" set bstdir=!destdir!\bibtex\bst\%target% diff --git a/Master/texmf-dist/doc/latex/disser/templates/Makefile b/Master/texmf-dist/doc/latex/disser/templates/Makefile index d2f0065d728..26d6545a84f 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/Makefile @@ -1,33 +1,33 @@ -# -# Makefile for documents and templates -# Author: Stanislav Kruchinin -# - -TARGET ?= thesis -TEXMF ?= /usr/share/texmf -DESTDIR ?= $(TEXMF) -DOCDIR ?= $(DESTDIR)/doc/latex/disser - -dvi clean figclean bmtoeps epstopdf fixbb pdftopng256 pdftotiffg4 ps ps_2on1 pdf pdf_2on1 html srcdist all allpdf: - @$(MAKE) -i -C bachelor $@ - @$(MAKE) -i -C specialist $@ - @$(MAKE) -i -C master $@ - @$(MAKE) -i -C candidate $@ - @$(MAKE) -i -C doctor $@ - -help: - @$(MAKE) -s -C candidate $@ ;\ - echo " install install templates" ;\ - echo " uninstall uninstall templates" ;\ - echo " reinstall reinstall templates" - -install: - cp -rf ../templates $(DOCDIR) ;\ - cp -rf ../include $(DOCDIR) - -uninstall: - -rm -rf $(DOCDIR)/templates - -rm -rf $(DOCDIR)/include - -rmdir $(DOCDIR) - -reinstall: uninstall install +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET ?= thesis +TEXMF ?= /usr/share/texmf +DESTDIR ?= $(TEXMF) +DOCDIR ?= $(DESTDIR)/doc/latex/disser + +dvi clean figclean bmtoeps epstopdf fixbb pdftopng256 pdftotiffg4 ps ps_2on1 pdf pdf_2on1 html srcdist all allpdf: + @$(MAKE) -i -C bachelor $@ + @$(MAKE) -i -C specialist $@ + @$(MAKE) -i -C master $@ + @$(MAKE) -i -C candidate $@ + @$(MAKE) -i -C doctor $@ + +help: + @$(MAKE) -s -C candidate $@ ;\ + echo " install install templates" ;\ + echo " uninstall uninstall templates" ;\ + echo " reinstall reinstall templates" + +install: + cp -rf ../templates $(DOCDIR) ;\ + cp -rf ../include $(DOCDIR) + +uninstall: + -rm -rf $(DOCDIR)/templates + -rm -rf $(DOCDIR)/include + -rmdir $(DOCDIR) + +reinstall: uninstall install 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 2cbaecb602b..a08747e814e 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex @@ -38,8 +38,9 @@ Perelman_2003_math:0307245,Nielsen_2010_1006.2735}. \caption{Пример таблицы}\label{t:InPSiO2} \begin{tabular}{l|ccc} \hline\hline - & \quad$\lambda \times 10^{-11}$,~$\text{дин}\times\text{см}^{-2}$\quad & - \quad$\mu \times 10^{-11}$,~$\text{дин}\times\text{см}^{-2}$ & \quad$\rho$, $\text{г}\times \text{см}^{-3}$\quad \\ + & \quad$\lambda \cdot 10^{-11}$,~$\text{дин}\cdot\text{см}^{-2}$ + & \quad$\mu \cdot 10^{-11}$,~$\text{дин}\cdot\text{см}^{-2}$ + & \quad$\rho$, $\text{г}\cdot\text{см}^{-3}$ \\ \hline InP & 3.82 & 1.69 & 4.14 \\ SiO$_{2}$ & 1.57 & 3.11 & 2.2 \\ diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex index 678f38042dc..e847f2417c4 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex @@ -1,6 +1,6 @@ \documentclass[bachelor,subf,href,colorlinks=true -%,fixint=false -%,times +%,times % шрифт Times как основной +%,fixint=false % отключить прямые знаки интегралов ]{disser} \usepackage[ diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex index def8c4cfd2d..972ccb91a56 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex @@ -1,4 +1,4 @@ -\documentclass[autoref,subf,href,facsimile +\documentclass[autoref,subf,href,facsimile,colorlinks=true %,fixint=false %,times %,classified @@ -162,14 +162,11 @@ % ---------------------------------------------------------------- \renewcommand\bibsection{\nsection{Список публикаций}} -% Префикс номеров ссылок на работы соискателя -\def\BibPrefix{A} \bibliographystylemy{gost705} \bibliographymy{thesis} \renewcommand\bibsection{\nsection{Цитированная литература}} -\def\BibPrefix{} \bibliographystyle{gost705} \bibliography{thesis} % ---------------------------------------------------------------- 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 49632efea20..f09a7327bab 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex @@ -64,6 +64,6 @@ Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ \mkcommonsect{struct}{Структура и объем диссертации}{% Диссертация состоит из введения, обзора литературы, $n$ глав, заключения и библиографии. -Общий объем диссертации $p_1$ страниц, из них $p_2$ страницы текста, включая $p_3$ рисунков. -Библиография включает $b_1$ наименований на $p_4$ страницах. +Общий объем диссертации $P$ страниц, из них $p_1$ страницы текста, включая $f$ рисунков. +Библиография включает $B$ наименований на $p_2$ страницах. } diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex index df9b7c9a23b..3885c022958 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex @@ -1,8 +1,9 @@ \documentclass[candidate,subf,href,colorlinks=true -%,fixint=false -%,times -%,facsimile -%,classified +%,times % шрифт Times как основной +%,fixint=false % отключить прямые знаки интегралов +%,classified % секретно +%,libcat % номер УДК +%,facsimile % факсимиле диссертанта ]{disser} \usepackage[ @@ -38,6 +39,9 @@ % класс доступа %\classlabel{Для служебного пользования} +% номер УДК +%\libcatnum{12345} + \title{ДИССЕРТАЦИЯ\\ на соискание ученой степени\\ кандидата физико-математических наук} diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex index 28cda484a7b..a6187c508bb 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex @@ -1,4 +1,4 @@ -\documentclass[14pt,autoref,href,facsimile +\documentclass[14pt,autoref,href,facsimile,colorlinks=true %,fixint=false %,times %,classified @@ -160,14 +160,11 @@ % ---------------------------------------------------------------- \renewcommand\bibsection{\nsection{Список публикаций}} -% Префикс номеров ссылок на работы соискателя -\def\BibPrefix{A} \bibliographystylemy{gost705} \bibliographymy{thesis} \renewcommand\bibsection{\nsection{Цитированная литература}} -\def\BibPrefix{} \bibliographystyle{gost705} \bibliography{thesis} % ---------------------------------------------------------------- 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 2621c58304b..bdfdc376cc5 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex @@ -61,6 +61,6 @@ Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ \mkcommonsect{struct}{Структура и объем диссертации}{% Диссертация состоит из введения, обзора литературы, $n$ глав, заключения и библиографии. -Общий объем диссертации $p_1$ страниц, из них $p_2$ страницы текста, включая $p_3$ рисунков. -Библиография включает $b_1$ наименований на $p_4$ страницах. +Общий объем диссертации $P$ страниц, из них $p_1$ страницы текста, включая $f$ рисунков. +Библиография включает $B$ наименований на $p_2$ страницах. } diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex index abbccd92005..0200abd6820 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex @@ -1,8 +1,8 @@ \documentclass[doctor,subf,href,colorlinks=true -%,fixint=false -%,times -%,facsimile -%,classified +%,fixint=false % отключить прямые знаки интегралов +%,classified % секретно +%,libcat % номер УДК +%,facsimile % факсимиле диссертанта ]{disser} \usepackage[ @@ -38,6 +38,9 @@ % класс доступа %\classlabel{Для служебного пользования} +% номер УДК +%\libcatnum{12345} + \title{ДИССЕРТАЦИЯ\\ на соискание ученой степени\\ доктора физико-математических наук} 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 7d25251ab66..cf08ac195e0 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex @@ -1,6 +1,6 @@ \documentclass[master,subf,href,colorlinks=true -%,fixint=false -%,times +%,times % шрифт Times как основной +%,fixint=false % отключить прямые знаки интегралов ]{disser} \usepackage[ diff --git a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd index ff6a09b4fb6..cdd0f68a627 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd @@ -11,7 +11,7 @@ if "%CMDEXTVERSION%"=="" ( setlocal enabledelayedexpansion set target=thesis -if "!texmf!"=="" set texmf=%programfiles%\miktex +if "!texmf!"=="" set texmf=%allusersprofile%\Application Data\MiKTeX\2.9 if "!destdir!"=="" set destdir=!texmf! if "!docdir!"=="" set docdir=!destdir!\doc\latex\disser if "!subdirs!"=="" set subdirs=bachelor ..\specialist ..\master ..\candidate ..\doctor diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex index 633ec7217e3..eed1e0ac00d 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex @@ -1,6 +1,6 @@ \documentclass[specialist,subf,href,colorlinks=true -%,fixint=false -%,times +%,times % шрифт Times как основной +%,fixint=false % отключить прямые знаки интегралов ]{disser} \usepackage[ diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index d3c18b108f8..ef1f07fb401 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -87,7 +87,7 @@ % \end{macrocode} % На правах рукописи % \begin{macrocode} - \asmanuscript + \asmanuscript\\ % \end{macrocode} % Факсимиле % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/chapter.dtx b/Master/texmf-dist/source/latex/disser/chapter.dtx index 464b72205ab..dd054126c89 100644 --- a/Master/texmf-dist/source/latex/disser/chapter.dtx +++ b/Master/texmf-dist/source/latex/disser/chapter.dtx @@ -49,7 +49,8 @@ \providecommand\chapterfont{\Large\bfseries} \providecommand\beforechapter{} \providecommand\afterchapter{\par\nobreak\vskip 20\p@} -\providecommand\chapterindent{0\p@} +\newlength{\chapterindent} +\setlength{\chapterindent}{0\p@} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx index c1ed00cde48..1d62e3e14ea 100644 --- a/Master/texmf-dist/source/latex/disser/custom.dtx +++ b/Master/texmf-dist/source/latex/disser/custom.dtx @@ -36,17 +36,21 @@ \let\Eng=\English } \ifDis@mtpro - \AtBeginDocument{% + \AtBeginDocument{% % \end{macrocode} % \DescribePackage{mtpro}\index{Пакеты!\verb*+mtpro+} % \begin{macrocode} - \IfFileExists{mtpro.sty}{ - \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro} - }{ - \PackageWarning{disser}% - {Unable to find mtpro package. Font is unchanged.} + \IfFileExists{mtpro2.sty}{ + \usepackage[subscriptcorrection,nofontinfo]{mtpro2} + }{ + \IfFileExists{mtpro.sty}{ + \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro} + }{ + \PackageWarning{disser}% + {Unable to find mtpro package. Font is unchanged.} + } + } } - } \else % \end{macrocode} % \DescribePackage{txfonts}\index{Пакеты!\verb*+txfonts+} diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index 18f9e1e8261..7b38f83fe7e 100644 --- a/Master/texmf-dist/source/latex/disser/disser.dtx +++ b/Master/texmf-dist/source/latex/disser/disser.dtx @@ -19,7 +19,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{disser.drv}[2010/11/21 1.1.7 Document class for dissertations] +\ProvidesFile{disser.drv}[2010/09/11 1.1.8 Document class for dissertations] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -180,7 +180,7 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2010/06/13 1.1.7 Document class for dissertations] +\ProvidesClass{disser}[2011/09/11 1.1.8 Document class for dissertations] % \end{macrocode} % Подключение пакета \pkg{kvoptions} для обработки опций в формате diff --git a/Master/texmf-dist/source/latex/disser/doctor.dtx b/Master/texmf-dist/source/latex/disser/doctor.dtx index ddeeee7ce9c..5af09f75735 100644 --- a/Master/texmf-dist/source/latex/disser/doctor.dtx +++ b/Master/texmf-dist/source/latex/disser/doctor.dtx @@ -81,7 +81,7 @@ % \end{macrocode} % На правах рукописи % \begin{macrocode} - \asmanuscript + \asmanuscript\\ % \end{macrocode} % Факсимиле % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index 97fd655650a..4db12a62141 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -155,7 +155,7 @@ and the derived files % %<*driver> \ProvidesFile{gost705.drv}% - [2010/11/21 1.1.7 Bibliography style for GOST R 7.0.5-2008.] + [2010/09/11 1.1.8 Bibliography style for GOST R 7.0.5-2008.] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -1167,9 +1167,7 @@ FUNCTION {output.address.publisher.date} FUNCTION {output.bibitem} { newline$ - "\bibitem[\BibPrefix" write$ - label write$ - "\BibPostfix]{" write$ + "\bibitem" "{" * write$ cite$ write$ "}" write$ newline$ @@ -1714,6 +1712,7 @@ FUNCTION {book} output.bibitem author.before format.btitle add.doi "title" output.check + new.slash editor.organization.after new.sentence format.number.series output @@ -2429,10 +2428,6 @@ FUNCTION {begin.bib} if$ "\makeatletter\renewcommand{\@biblabel}[1]{#1.}\makeatother" write$ newline$ - "\ifx\undefined\BibPrefix\def\BibPrefix{}\else\fi" - write$ newline$ - "\ifx\undefined\BibPostfix\def\BibPostfix{}\else\fi" - write$ newline$ "\ifx\undefined\BibEmph\def\BibEmph#1{#1}\else\fi" write$ newline$ "\ifx\undefined\href\def\href#1#2{#2}\else\fi" @@ -2451,7 +2446,7 @@ FUNCTION {begin.bib} write$ newline$ "\ifx\undefined\BibAnnote\long\def\BibAnnote#1{#1}\else\fi" write$ newline$ - "\begin{thebibliography}{\BibPrefix" longest.label * "\BibPostfix}" * + "\begin{thebibliography}{" longest.label * "}" * write$ newline$ "\def\selectlanguageifdefined#1{" write$ newline$ diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index 99e2ab13567..8d8f2a85683 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -20,7 +20,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %<*driver> -\ProvidesFile{gost732.drv}[2010/11/21 1.1.7 GOST 7.32-2001 implementation] +\ProvidesFile{gost732.drv}[2010/09/11 1.1.8 GOST 7.32-2001 implementation] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -112,7 +112,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2010/06/13 1.1.7 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2011/09/11 1.1.8 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index 673b0c1b42b..8a0a6dde30b 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -63,7 +63,7 @@ \vskip\firstskip \begin{flushright} \ifDis@classified\classify\fi - \asmanuscript + \asmanuscript\\ \ifDis@facsimile\facsimile\fi \ifDis@libcat\libcatname\ \@libcatnum\fi \end{flushright} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 0f11530d226..7eff6d5cf80 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,7 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2010/06/13 1.1.7 Document class for dissertations] +\ProvidesClass{disser}[2011/09/11 1.1.8 Document class for dissertations] \RequirePackage{kvoptions} @@ -491,7 +491,8 @@ \providecommand\chapterfont{\Large\bfseries} \providecommand\beforechapter{} \providecommand\afterchapter{\par\nobreak\vskip 20\p@} -\providecommand\chapterindent{0\p@} +\newlength{\chapterindent} +\setlength{\chapterindent}{0\p@} \newcommand*\chaptermark[1]{} @@ -1345,14 +1346,18 @@ \let\Eng=\English } \ifDis@mtpro - \AtBeginDocument{% - \IfFileExists{mtpro.sty}{ - \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro} - }{ - \PackageWarning{disser}% - {Unable to find mtpro package. Font is unchanged.} + \AtBeginDocument{% + \IfFileExists{mtpro2.sty}{ + \usepackage[subscriptcorrection,nofontinfo]{mtpro2} + }{ + \IfFileExists{mtpro.sty}{ + \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro} + }{ + \PackageWarning{disser}% + {Unable to find mtpro package. Font is unchanged.} + } + } } - } \else \AtEndOfPackage{% \IfFileExists{txfonts.sty}{ diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index 852faed2654..2aafc746afd 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -58,7 +58,7 @@ \vskip\firstskip\normalfont \begin{flushright} \ifDis@classified\classify\fi - \asmanuscript + \asmanuscript\\ \ifDis@facsimile\facsimile\fi \ifDis@libcat\libcatname\ \@libcatnum\fi \end{flushright} diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index f20f8dd3a29..93fe01b055d 100644 --- a/Master/texmf-dist/tex/latex/disser/gost732.cls +++ b/Master/texmf-dist/tex/latex/disser/gost732.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2010/06/13 1.1.7 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2011/09/11 1.1.8 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax -- cgit v1.2.3