From 1a9e525f4cfeebc43345769293278fc86d237e0b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Nov 2010 23:53:45 +0000 Subject: disser 1.1.7 (22nov10) git-svn-id: svn://tug.org/texlive/trunk@20522 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/disser/gost705.bst | 101 +++-- Master/texmf-dist/bibtex/bst/disser/gost705s.bst | 101 +++-- Master/texmf-dist/doc/latex/disser/ChangeLog | 7 + Master/texmf-dist/doc/latex/disser/Makefile | 4 +- Master/texmf-dist/doc/latex/disser/README | 56 ++- Master/texmf-dist/doc/latex/disser/README.ru | 38 +- Master/texmf-dist/doc/latex/disser/manual.tex | 33 +- Master/texmf-dist/doc/latex/disser/nomake.cmd | 6 +- .../texmf-dist/doc/latex/disser/templates/Makefile | 65 +-- .../doc/latex/disser/templates/bachelor/1.tex | 29 +- .../doc/latex/disser/templates/bachelor/thesis.bib | 16 + .../doc/latex/disser/templates/bachelor/thesis.tex | 35 ++ .../latex/disser/templates/candidate/thesis.tex | 35 ++ .../doc/latex/disser/templates/doctor/thesis.tex | 32 ++ .../doc/latex/disser/templates/master/thesis.tex | 40 ++ .../doc/latex/disser/templates/nomake.cmd | 2 +- .../doc/latex/disser/templates/specialist/1.tex | 1 + .../doc/latex/disser/templates/specialist/Makefile | 18 + .../latex/disser/templates/specialist/app-a.tex | 1 + .../latex/disser/templates/specialist/concl.tex | 1 + .../latex/disser/templates/specialist/fig/Makefile | 1 + .../latex/disser/templates/specialist/fig/fig.eps | 490 +++++++++++++++++++++ .../disser/templates/specialist/fig/nomake.cmd | 1 + .../latex/disser/templates/specialist/intro.tex | 1 + .../latex/disser/templates/specialist/nomake.cmd | 29 ++ .../latex/disser/templates/specialist/thesis.bib | 60 +++ .../latex/disser/templates/specialist/thesis.tex | 103 +++++ Master/texmf-dist/makeindex/disser/disser.ist | 5 - Master/texmf-dist/makeindex/disser/dtx.ist | 5 + Master/texmf-dist/source/latex/disser/autoref.dtx | 1 + Master/texmf-dist/source/latex/disser/bachelor.dtx | 57 ++- .../texmf-dist/source/latex/disser/candidate.dtx | 61 ++- Master/texmf-dist/source/latex/disser/custom.dtx | 7 +- Master/texmf-dist/source/latex/disser/disser.dtx | 47 +- Master/texmf-dist/source/latex/disser/disser.ins | 1 + Master/texmf-dist/source/latex/disser/doctor.dtx | 35 +- Master/texmf-dist/source/latex/disser/gost705.dtx | 279 ++++++++++-- Master/texmf-dist/source/latex/disser/gost732.dtx | 7 +- Master/texmf-dist/source/latex/disser/master.dtx | 41 +- .../texmf-dist/source/latex/disser/specialist.dtx | 153 +++++++ .../texmf-dist/source/latex/disser/titledefs.dtx | 5 +- Master/texmf-dist/source/latex/disser/toc.dtx | 7 +- Master/texmf-dist/tex/latex/disser/bachelor.rtx | 54 ++- Master/texmf-dist/tex/latex/disser/candidate.rtx | 61 ++- Master/texmf-dist/tex/latex/disser/disser.cls | 40 +- Master/texmf-dist/tex/latex/disser/doctor.rtx | 35 +- Master/texmf-dist/tex/latex/disser/gost732.cls | 2 +- Master/texmf-dist/tex/latex/disser/master.rtx | 41 +- Master/texmf-dist/tex/latex/disser/specialist.rtx | 114 +++++ Master/texmf-dist/tex/latex/disser/titledefs.rtx | 5 +- 50 files changed, 1989 insertions(+), 380 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/concl.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/fig/Makefile create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/fig/fig.eps create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/fig/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/intro.tex create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib create mode 100644 Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex delete mode 100644 Master/texmf-dist/makeindex/disser/disser.ist create mode 100644 Master/texmf-dist/makeindex/disser/dtx.ist create mode 100644 Master/texmf-dist/source/latex/disser/specialist.dtx create mode 100644 Master/texmf-dist/tex/latex/disser/specialist.rtx (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst index 1722ecf65ae..bcc97218bf2 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst @@ -11,28 +11,6 @@ %% %% This file is part of the disser package. %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% This bibliography style attempts -%% to format bibliography according to -%% GOST 7.1-84 with some conventional modifications. -%% -%% Based on style gost71u.bst by Maksym Polyakov. -%% -%% For the Russian bibliographic entries -%% you need to create field -%% language = {russian}. -%% Default language is English. -%% Field numpages for books must contain number of pages. -%% Optional field url will format url (using hyperref, if loaded). -%% -%% Requires 8-bit bibtex with switch -B and csf file -%% supporting cyrillic. -%% -%% bibtex8 -B -c .csf -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - ENTRY @@ -68,6 +46,10 @@ ENTRY urldate isbn doi + archive + archivePrefix + primaryClass + eprint } {} { label } @@ -743,11 +725,9 @@ FUNCTION {output.address.publisher.date} FUNCTION {output.bibitem} { newline$ - "\bibitem[" write$ - "\BibPrefix" write$ + "\bibitem[\BibPrefix" write$ label write$ - "\BibPostfix" write$ - "]{" write$ + "\BibPostfix]{" write$ cite$ write$ "}" write$ newline$ @@ -1076,6 +1056,16 @@ FUNCTION {editor.organization.after} if$ } +FUNCTION {format.annote} +{ + annote empty$ + { "" } + { after.sentence 'output.state := + "\BibAnnote{" annote add.period$ * "}" * + } + if$ +} + FUNCTION {format.url} { url empty$ @@ -1104,16 +1094,6 @@ FUNCTION {output.url} if$ } -FUNCTION {format.annote} -{ - annote empty$ - { "" } - { after.sentence 'output.state := - "\BibAnnote{" annote add.period$ * "}" * - } - if$ -} - FUNCTION {format.isbn} { isbn empty$ @@ -1135,6 +1115,27 @@ FUNCTION {add.doi} if$ } +FUNCTION {format.eprint} +{ eprint empty$ + { "" } + { primaryClass empty$ + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * eprint * "}" * + } + { archivePrefix empty$ + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * primaryClass * "/" * eprint * "}" * + } + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" * + } + if$ + } + if$ +} + if$ +} + FUNCTION {article} { output.bibitem @@ -1152,6 +1153,8 @@ FUNCTION {article} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1178,6 +1181,8 @@ FUNCTION {book} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1196,6 +1201,8 @@ FUNCTION {booklet} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1225,6 +1232,8 @@ FUNCTION {inbook} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1250,6 +1259,8 @@ FUNCTION {incollection} new.block note output new.block + format.eprint output + new.block output.url format.annote output fin.entry @@ -1284,6 +1295,8 @@ FUNCTION {inproceedings} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1324,6 +1337,8 @@ FUNCTION {manual} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1343,6 +1358,8 @@ FUNCTION {mastersthesis} new.block note output new.block + format.eprint output + new.block output.url format.annote output fin.entry @@ -1361,6 +1378,8 @@ FUNCTION {misc} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1382,6 +1401,8 @@ FUNCTION {phdthesis} format.pages.page output note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1403,6 +1424,8 @@ FUNCTION {docdisser} format.pages.page output note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1430,6 +1453,8 @@ FUNCTION {proceedings} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1452,6 +1477,8 @@ FUNCTION {techreport} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1466,6 +1493,8 @@ FUNCTION {unpublished} new.block note "note" output.check new.sentence + format.eprint output + new.block output.url format.annote output fin.entry diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst index 372a9df5ee7..5bf7af3d437 100644 --- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst +++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst @@ -11,28 +11,6 @@ %% %% This file is part of the disser package. %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% This bibliography style attempts -%% to format bibliography according to -%% GOST 7.1-84 with some conventional modifications. -%% -%% Based on style gost71u.bst by Maksym Polyakov. -%% -%% For the Russian bibliographic entries -%% you need to create field -%% language = {russian}. -%% Default language is English. -%% Field numpages for books must contain number of pages. -%% Optional field url will format url (using hyperref, if loaded). -%% -%% Requires 8-bit bibtex with switch -B and csf file -%% supporting cyrillic. -%% -%% bibtex8 -B -c .csf -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - ENTRY @@ -68,6 +46,10 @@ ENTRY urldate isbn doi + archive + archivePrefix + primaryClass + eprint } {} { label } @@ -743,11 +725,9 @@ FUNCTION {output.address.publisher.date} FUNCTION {output.bibitem} { newline$ - "\bibitem[" write$ - "\BibPrefix" write$ + "\bibitem[\BibPrefix" write$ label write$ - "\BibPostfix" write$ - "]{" write$ + "\BibPostfix]{" write$ cite$ write$ "}" write$ newline$ @@ -1076,6 +1056,16 @@ FUNCTION {editor.organization.after} if$ } +FUNCTION {format.annote} +{ + annote empty$ + { "" } + { after.sentence 'output.state := + "\BibAnnote{" annote add.period$ * "}" * + } + if$ +} + FUNCTION {format.url} { url empty$ @@ -1104,16 +1094,6 @@ FUNCTION {output.url} if$ } -FUNCTION {format.annote} -{ - annote empty$ - { "" } - { after.sentence 'output.state := - "\BibAnnote{" annote add.period$ * "}" * - } - if$ -} - FUNCTION {format.isbn} { isbn empty$ @@ -1135,6 +1115,27 @@ FUNCTION {add.doi} if$ } +FUNCTION {format.eprint} +{ eprint empty$ + { "" } + { primaryClass empty$ + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * eprint * "}" * + } + { archivePrefix empty$ + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * primaryClass * "/" * eprint * "}" * + } + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" * + } + if$ + } + if$ +} + if$ +} + FUNCTION {article} { output.bibitem @@ -1152,6 +1153,8 @@ FUNCTION {article} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1178,6 +1181,8 @@ FUNCTION {book} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1196,6 +1201,8 @@ FUNCTION {booklet} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1225,6 +1232,8 @@ FUNCTION {inbook} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1250,6 +1259,8 @@ FUNCTION {incollection} new.block note output new.block + format.eprint output + new.block output.url format.annote output fin.entry @@ -1284,6 +1295,8 @@ FUNCTION {inproceedings} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1324,6 +1337,8 @@ FUNCTION {manual} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1343,6 +1358,8 @@ FUNCTION {mastersthesis} new.block note output new.block + format.eprint output + new.block output.url format.annote output fin.entry @@ -1361,6 +1378,8 @@ FUNCTION {misc} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1382,6 +1401,8 @@ FUNCTION {phdthesis} format.pages.page output note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1403,6 +1424,8 @@ FUNCTION {docdisser} format.pages.page output note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1430,6 +1453,8 @@ FUNCTION {proceedings} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1452,6 +1477,8 @@ FUNCTION {techreport} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1466,6 +1493,8 @@ FUNCTION {unpublished} new.block note "note" output.check new.sentence + format.eprint output + new.block output.url format.annote output fin.entry diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog index d85bd067860..444a863b74c 100644 --- a/Master/texmf-dist/doc/latex/disser/ChangeLog +++ b/Master/texmf-dist/doc/latex/disser/ChangeLog @@ -2,6 +2,13 @@ disser changelog Copyright (C) 2004-2010 Stanislav Kruchinin ------------------------------------------- +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. +* Fixed bug with \maketitle in titlepage of author's abstract. +* Fixed bug with end-of-line (EOL) characters in some files. ++ Add automatic fix of EOL characters to "tds" target of nomake.cmd script. + Summary of changes in version 1.1.6 (2010-05-22): diff --git a/Master/texmf-dist/doc/latex/disser/Makefile b/Master/texmf-dist/doc/latex/disser/Makefile index f7d0a416135..8d642574bdd 100644 --- a/Master/texmf-dist/doc/latex/disser/Makefile +++ b/Master/texmf-dist/doc/latex/disser/Makefile @@ -13,7 +13,7 @@ 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 \ +SRCFILES := *.dtx $(TARGET).ins dtx.ist $(MANUAL).tex Makefile \ nomake.cmd TEXMF ?= /usr/share/texmf @@ -34,7 +34,7 @@ MI ?= makeindex LATEXFLAGS ?= --src-specials PDFLATEXFLAGS ?= --shell-escape -MIFLAGS ?= -r -s disser.ist +MIFLAGS ?= -r -s dtx.ist all: package doc diff --git a/Master/texmf-dist/doc/latex/disser/README b/Master/texmf-dist/doc/latex/disser/README index c7119bebe51..46b4ad3ea3d 100644 --- a/Master/texmf-dist/doc/latex/disser/README +++ b/Master/texmf-dist/doc/latex/disser/README @@ -1,14 +1,14 @@ -Overview --------- +1. Introduction +--------------- -The "disser" package provides LaTeX classes, bibliography styles and document +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 Commission of Russian Federation. -Required packages and programs ------------------------------- +2. Required packages and programs +--------------------------------- For installation and working with documents you will need the following third-party packages: @@ -24,10 +24,10 @@ For automated processing of figures you should install the following programs: Ghostscript, epstool and sam2p. -Downloads and updates ---------------------- +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: @@ -38,22 +38,22 @@ ZIP file with sources can be downloaded at: ZIP file with compiled sources and documentation sorted in a TDS (TeX Directory Structure) tree is available on Sourceforge -(look for disser.tds.zip in Downloads section): +(look for disser-.tds.zip file in Downloads section): http://sourceforge.net/projects/disser/ -Source code repositories of disser: +Public source code repositories of this project: http://mercurial.intuxication.org/hg/disser/ http://bitbucket.org/sky/disser/ http://disser.hg.sourceforge.net/hgweb/disser/ -The latest revision of the package can be obtained by downloading +The latest revision of package source code can be obtained by downloading autogenerated archive from one of these mirrors: http://mercurial.intuxication.org/hg/disser/archive/tip.zip http://bitbucket.org/sky/disser/get/tip.zip -Installation ------------- +4. Installation +--------------- 1. Installation from sources @@ -70,28 +70,42 @@ 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 +if you install the package to user's directory "%APPDATA%\MiKTeX\2.8" +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". -Example of commands for MiKTeX version 2.8: - set DESTDIR=C:\Documents and Settings\All Users\Application Data\MiKTeX\2.8 +Examples of commands for MiKTeX 2.8. + +Installation for all users: + set DESTDIR=%ALLUSERSPROFILE%\Application Data\MiKTeX\2.8 + nomake install + mktexlsr --admin + +Installation for current user only: + set DESTDIR=%APPDATA%\MiKTeX\2.8 nomake install mktexlsr 2. Installation from ZIP archive in TDS format -The ZIP file disser.tds.zip contains files sorted in a TDS tree. This means -you can directly unpack this file inside directory with your TeX installation. +The ZIP file disser-.tds.zip contains files sorted in a TDS tree. +This means you can directly unpack this file inside directory with your TeX +installation. Example: cd /path/to/texmf - unzip /download/path/disser.tds.zip + unzip /download/path/disser-.tds.zip mktexlsr -License -------- +5. License +---------- -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 diff --git a/Master/texmf-dist/doc/latex/disser/README.ru b/Master/texmf-dist/doc/latex/disser/README.ru index 267759ab00b..9d4752fe476 100644 --- a/Master/texmf-dist/doc/latex/disser/README.ru +++ b/Master/texmf-dist/doc/latex/disser/README.ru @@ -1,12 +1,12 @@ -Введение --------- +1. Введение +----------- Пакет disser предназначен для верстки дипломов, диссертаций и авторефератов в соответствии с требованиями диссертационных советов и ВАК РФ. -Рекомендуемые пакеты и программы --------------------------------- +2. Рекомендуемые пакеты и программы +----------------------------------- Для корректной сборки документов в вашем дистрибутиве LaTeX должны быть установлены следующие пакеты: @@ -21,8 +21,8 @@ natbib, hyperref, subfig, wrapfig, nomake.cmd следует установить программы Ghostscript, epstool и sam2p. -Получение последней версии --------------------------- +3. Получение последней версии +----------------------------- Пакет disser доступен на CTAN: http://www.ctan.org/tex-archive/macros/latex/contrib/disser/ @@ -35,22 +35,22 @@ ZIP- ZIP-архив с готовыми файлами и документацией, которые размещены в соответствии со стандартной структурой каталогов TeX -(файл disser.tds.zip в разделе Download): +(см. файл disser-.tds.zip в разделе Download): http://sourceforge.net/projects/disser/ -Репозитории исходных текстов проекта: +Публичные репозитории исходных текстов проекта: http://mercurial.intuxication.org/hg/disser/ http://bitbucket.org/sky/disser/ http://disser.hg.sourceforge.net/hgweb/disser/ Наиболее свежую версию исходных текстов пакета можно получить, скачав -автоматически генерируемый архив с одного из зеркал +автоматически генерируемый архив с одного из репозиториев: http://mercurial.intuxication.org/hg/disser/archive/tip.zip http://bitbucket.org/sky/disser/get/tip.zip -Установка ---------- +4. Установка +------------ 1. Из исходных текстов @@ -68,11 +68,19 @@ ZIP- После установки следует обновить базу имен файлов с помощью команды mktexlsr -Пример команд для дистрибутива MiKTeX версии 2.8: +Примеры команд для дистрибутива MiKTeX версии 2.8. + +Установка для всех пользователей: set DESTDIR=%ALLUSERSPROFILE%\Application Data\MiKTeX\2.8 nomake install + mktexlsr --admin + +Установка только для текущего пользователя: + set DESTDIR=%APPDATA%\MiKTeX\2.8 + nomake install mktexlsr + 2. Из ZIP-архива со скомпилированными файлами Файл disser-.tds.zip содержит собранные файлы классов и @@ -89,10 +97,10 @@ ZIP- mktexlsr -Лицензия --------- +5. Лицензия +----------- -Цопыригхт (ц) 2004-2009 Станислав Кручинин +Цопыригхт (ц) 2004-2010 Станислав Кручинин Ит маы бе дистрибутед анд/ор модифиед ундер тхе цондитионс оф тхе ЛаТеХ Пройецт Публиц Лиценсе, еитхер версион 1.3 diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex index a1a7e5e1d7a..154f2a95287 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.6} +\def\fileversion{1.1.7} \begin{document} \sloppy @@ -416,6 +416,16 @@ nomake ... К сожалению, пакет \pkg{natbib} не <<сжимает>> ссылки с нецифровыми символами, т.\,е. ссылки вида [A1, A2, A3, A4] не преобразуются к более компактной форме [A1--A4]. Ведется работа над исправлением этого недостатка. +Для включения выделения курсивом некоторых полей библиографической записи, в файле \file{thesis.tex} нужно добавить определение +\begin{verbatim} +\def\BibEmph#1{\emph{#1}} +\end{verbatim} +перед следующим текстом +\begin{verbatim} +\bibliography{thesis} +\bibliographystyle{gost705} +\end{verbatim} + При описании русскоязычных источников следует явным образом присваивать полю |language| значение |russian|. Пример: \begin{verbatim} @@ -477,7 +487,7 @@ latex В стилях \file{gost705.bst} и \file{gost705s.bst} введены макросы |\BibPrefix| и |\BibPostfix|, позволяющие задать префикс и постфикс номера ссылки. Для размещения в документе двух списков литературы с независимой нумерацией используется пакет \pkg{multibib}. -Описание библиографических ссылок на работы диссертанта должно находиться в файле |thesis.bib| вместе с остальными ссылками. +Описание библиографических ссылок на работы диссертанта должно находиться в файле \file{thesis.bib} вместе с остальными ссылками. Полная сборка автореферата с двумя библиографиями выполняется следующей последовательностью команд. \begin{verbatim} @@ -488,8 +498,16 @@ latex autoref latex autoref \end{verbatim} -Операция полной сборки документов реализована в скриптах \file{Makefile} и \file{nomake.cmd}. -Сборка автореферата в Windows: +Операция полной сборки документов осуществляется командами вида: +\begin{verbatim} +nomake all +\end{verbatim} +в Windows или +\begin{verbatim} +make all +\end{verbatim} +в Unix-подобных окружениях. +Сборка только автореферата в Windows: \begin{verbatim} set target=autoref nomake @@ -500,7 +518,7 @@ set target=thesis nomake \end{verbatim} -Пример сборки автореферата в Unix-подобных окружениях: +Команда для сборки автореферата в Unix-подобных окружениях: \begin{verbatim} env TARGET=autoref make \end{verbatim} @@ -509,12 +527,11 @@ env TARGET=autoref make \subsection{Подписи диссертанта и ученого секретаря} Согласно требованиям ВАК, автореферат должен быть подписан диссертантом и ученым секретарем. -Поскольку экземпляров автореферата достаточно много, эту задачу необходимо автоматизировать. -Для этого в классе предусмотрена опция \cmd{facsimile}, позволяющая включать графические файлы с подписью (факсимиле) на титульном листе и внутренней стороне обложки. +Для автоматической вставки графических файлов с подписями в классе предусмотрена опция \cmd{facsimile}. Эта опция по умолчанию включена только в шаблонах авторефератов. Факсимиле диссертанта находится в файле \file{./fig/facsimile.}, факсимиле ученого секретаря диссертационного совета "--- в файле \file{./fig/sec-facsimile.}. Здесь \file{} "--- один из типов графических файлов, поддерживаемых в \LaTeX{} (\file{eps}) или в pdf\LaTeX{} (\file{pdf}, \file{tiff}, \file{png}). Команда |\facsimile|, включающая файл с подписью диссертанта в документ, определена в файле \file{titledefs.dtx}. -Команда, включающая файл с подписью ученого секретаря, находится в файле |autoref.tex|. +Команда, включающая файл с подписью ученого секретаря, находится в файле \file{autoref.tex}. \end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/nomake.cmd b/Master/texmf-dist/doc/latex/disser/nomake.cmd index dbb858104ac..a6253760980 100644 --- a/Master/texmf-dist/doc/latex/disser/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/nomake.cmd @@ -20,9 +20,9 @@ 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 +set srcfiles=*.dtx %target%.ins dtx.ist %manual%.tex Makefile nomake.cmd -if "!texmf!"=="" set texmf=%programfiles%\miktex +if "!texmf!"=="" set texmf=%allusersprofile%\Application Data\MiKTeX\2.8 if "!destdir!"=="" set destdir=!texmf! if "!clsdir!"=="" set clsdir=!destdir!\tex\latex\%target% if "!bstdir!"=="" set bstdir=!destdir!\bibtex\bst\%target% @@ -40,7 +40,7 @@ if "!mi!"=="" set mi=makeindex if "!latexflags!"=="" set latexflags=--src-specials if "!pdflatexflags!"=="" set pdflatexflags=--shell-escape -if "!miflags!"=="" set miflags=-r -s disser.ist +if "!miflags!"=="" set miflags=-r -s dtx.ist if "%1"=="" ( diff --git a/Master/texmf-dist/doc/latex/disser/templates/Makefile b/Master/texmf-dist/doc/latex/disser/templates/Makefile index 2f7c7d55226..d2f0065d728 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/Makefile @@ -1,32 +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 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 1c4d22e57e6..2cbaecb602b 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex @@ -4,18 +4,19 @@ Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$. Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,% -Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008}. Ссылка на формулу~\eqref{eq:e} -\begin{equation}\label{eq:e} +Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,% +Perelman_2003_math:0307245,Nielsen_2010_1006.2735}. Ссылка на формулу~\eqref{e:Coulomb} +\begin{equation}\label{e:Coulomb} \frac{1}{|\vec r_1 - \vec r_2|} = 4\pi \int \frac{d^3 q}{(2\pi)^3}\, \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}. \end{equation} -Ссылка на рис.~\ref{fig:f} +Ссылка на рис.~\ref{f:fig} \begin{figure}[!ht] \centering \includegraphics[width=4cm]{fig} -\caption{\label{fig:f}% +\caption{\label{f:fig}% Подпись к рисунку. } \end{figure} @@ -23,7 +24,7 @@ Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008}. \begin{wrapfigure}{r}{0.35\textwidth} \centering \includegraphics[width=4cm]{fig} -\caption{\label{fig:ff}% +\caption{\label{f:ff}% Рисунок <<в оборку>>. } \end{wrapfigure} @@ -31,10 +32,10 @@ Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008}. Если разность энергий электронно-дырочных уровней $E_2-E_1$ близка к энергии продольного оптического фонона $\hbar\Omega_{LO}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$. Волновые функции последних представляют собой следующие комбинации вырожденных состояний\footnote{Текст сноски}. -Ссылка на таблицу~\ref{tab:t1}. +Ссылка на таблицу~\ref{t:InPSiO2}. \begin{table}[!ht] \centering - \caption{Пример таблицы}\label{tab:t1} + \caption{Пример таблицы}\label{t:InPSiO2} \begin{tabular}{l|ccc} \hline\hline & \quad$\lambda \times 10^{-11}$,~$\text{дин}\times\text{см}^{-2}$\quad & @@ -81,18 +82,18 @@ Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008}. \caption{Рисунки с единым названием} \end{figure} -Ссылка на внутренний рисунок (рис.~\ref{fig:sub1}) +Ссылка на внутренний рисунок (рис.~\ref{f:sub1}) \begin{figure}[!ht] \centering - \subfloat[][]{\label{fig:sub1}\includegraphics[width=4cm]{fig}}\quad - \subfloat[][]{\label{fig:sub2}\includegraphics[width=4cm]{fig}}\quad - \subfloat[][]{\label{fig:sub3}\includegraphics[width=4cm]{fig}} + \subfloat[][]{\label{f:sub1}\includegraphics[width=4cm]{fig}}\quad + \subfloat[][]{\label{f:sub2}\includegraphics[width=4cm]{fig}}\quad + \subfloat[][]{\label{f:sub3}\includegraphics[width=4cm]{fig}} \caption[]{% Рисунки с единым названием и подчиненной нумерацией: - \subref{fig:sub1} ссылка 1, - \subref{fig:sub2} ссылка 2, - \subref{fig:sub3} ссылка 3. + \subref{f:sub1} ссылка 1, + \subref{f:sub2} ссылка 2, + \subref{f:sub3} ссылка 3. } \end{figure} 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 e4c225cdc29..78fa0928332 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib @@ -81,3 +81,19 @@ year = {2008}, language = {russian}, } + +% old-style arXiv reference +@ARTICLE{Perelman_2003_math:0307245, + author = {Grisha Perelman}, + title = {Finite extinction time for the solutions to the Ricci flow on certain three-manifolds}, + eprint = {math/0307245}, +} + +% new-style arXiv reference +@ARTICLE{Nielsen_2010_1006.2735, + title = {A configuration interaction analysis of exchange in double quantum dots}, + author = {Erik Nielsen and Richard P. Muller}, + archivePrefix = {arXiv}, + eprint = {1006.2735}, + primaryClass = {cond-mat}, +} 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 96e36e32161..678f38042dc 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex @@ -51,6 +51,41 @@ \date{\number\year} \maketitle + +%% +%% Titlepage in English +%% +% +%\institution{Name of Organization} +% +%% Approved by +%\apname{Professor S.\,S.~Sidorov} +% +%\title{Bachelor's Thesis} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} % Full Name +%\course{Physics} % Название специальности +% +%\group{} % Study Group +% +%% Scientific Advisor +%\sa {I.\,I.~Ivanov} +%\sastatus {Professor} +% +%% Reviewer +%\rev {P.\,P.~Petrov} +%\revstatus{Associate Professor} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + \tableofcontents \input{intro} \input{1} 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 5c9c5237b25..df9b7c9a23b 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex @@ -44,6 +44,41 @@ \maketitle +%% +%% Titlepage in English +%% +% +%\institution{Name of Organization} +% +%\title{PhD Thesis} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} +% +%\specnum{01.04.05} +%\spec{Optics} +% +%%\specsndnum{01.04.07} +%%\specsnd{Condensed matter physics} +% +%\sa{I.\,I.~Ivanov} +%\sastatus{Professor} +%%\sasnd{P.\,P.~Petrov} +%%\sasndstatus{Professor} +% +%% Scientific consultant +%%\scon{B.\,B.~Baranov} +%%\sconstatus{Professor} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + \tableofcontents \input{intro} 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 230faea0217..abbccd92005 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex @@ -44,6 +44,38 @@ \maketitle +%% +%% Titlepage in English +%% +% +%\institution{Name of Organization} +% +%\title{Doctoral Dissertation} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} +% +%\specnum{01.04.05} +%\spec{Optics} +% +%%\specsndnum{01.04.07} +%%\specsnd{Condensed matter physics} +% +%% Scientific consultants +%\scon{B.\,B.~Baranov} +%\sconstatus{Professor} +%%\sconsnd{P.\,P.~Petrov} +%%\sconsndstatus{Professor} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + \tableofcontents \input{intro} 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 20d760656cc..7d25251ab66 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex @@ -73,6 +73,46 @@ \maketitle +%% +%% Titlepage in English +%% +% +%\institution{Name of Organization} +% +%% Approved by +%\apname{Professor S.\,S.~Sidorov} +% +%\title{Master's Thesis} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} % Full Name +%\course{Physics} % Название специальности +% +%\group{} % Study Group +%\masterprog {Title of program} +% +%% Scientific Advisor +%\sa {I.\,I.~Ivanov} +%\sastatus {Professor} +% +%% Reviewer +%\rev {P.\,P.~Petrov} +%\revstatus{Associate Professor} +% +%% Consultant +%\con{} +%\conspec{} +%\constatus{} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + \tableofcontents \input{intro} diff --git a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd index 1bd384fb3e1..ff6a09b4fb6 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd @@ -14,7 +14,7 @@ set target=thesis if "!texmf!"=="" set texmf=%programfiles%\miktex if "!destdir!"=="" set destdir=!texmf! if "!docdir!"=="" set docdir=!destdir!\doc\latex\disser -if "!subdirs!"=="" set subdirs=bachelor ..\master ..\candidate ..\doctor +if "!subdirs!"=="" set subdirs=bachelor ..\specialist ..\master ..\candidate ..\doctor if "%1"=="help" ( diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex new file mode 100644 index 00000000000..4a5e5418401 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex @@ -0,0 +1 @@ +\chapter{Название главы} diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile b/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile new file mode 100644 index 00000000000..30faef4990e --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile @@ -0,0 +1,18 @@ +# +# Makefile for documents and templates +# Author: Stanislav Kruchinin +# + +TARGET?=thesis + + +include ../../include/latex.mk + +all: dvi + +allpdf: pdf + +help: .help + @echo " all alias for dvi target" ;\ + echo " allpdf alias for pdf target" ;\ + diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex new file mode 100644 index 00000000000..a7aba9c235e --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex @@ -0,0 +1 @@ +\chapter{Заголовок приложения} diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/concl.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/concl.tex new file mode 100644 index 00000000000..cd60e4f2708 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/concl.tex @@ -0,0 +1 @@ +\conclusion diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/Makefile new file mode 100644 index 00000000000..775b7fc3d88 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/Makefile @@ -0,0 +1 @@ +include ../../../include/latex.fig.mk \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/fig.eps b/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/fig.eps new file mode 100644 index 00000000000..9382ce4351e --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/fig.eps @@ -0,0 +1,490 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%BoundingBox: 235 371 361 470 +%%HiResBoundingBox: 236 371.521 360.901 469.38 +%................................. +%%Creator: MiKTeX GPL Ghostscript 860 (epswrite) +%%CreationDate: 2007/12/07 10:10:05 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%EndComments +%%BeginProlog +% This copyright applies to everything between here and the %%EndProlog: +% Copyright (C) 2007 Artifex Software, Inc. All rights reserved. +%%BeginResource: procset GS_epswrite_2_0_1001 1.001 0 +/GS_epswrite_2_0_1001 80 dict dup begin +/PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch +4 index eq and{ pop pop pop}{ PageSize dup 1 +5 -1 roll put 0 4 -1 roll put dup null eq {false} {dup where} ifelse{ exch get exec} +{ pop/setpagedevice where +{ pop 1 dict dup /PageSize PageSize put setpagedevice} +{ /setpage where{ pop PageSize aload pop pageparams 3 {exch pop} repeat +setpage}if}ifelse}ifelse}ifelse} bind def +/!{bind def}bind def/#{load def}!/N/counttomark # +/rG{3{3 -1 roll 255 div}repeat setrgbcolor}!/G{255 div setgray}!/K{0 G}! +/r6{dup 3 -1 roll rG}!/r5{dup 3 1 roll rG}!/r3{dup rG}! +/w/setlinewidth #/J/setlinecap # +/j/setlinejoin #/M/setmiterlimit #/d/setdash #/i/setflat # +/m/moveto #/l/lineto #/c/rcurveto # +/p{N 2 idiv{N -2 roll rlineto}repeat}! +/P{N 0 gt{N -2 roll moveto p}if}! +/h{p closepath}!/H{P closepath}! +/lx{0 rlineto}!/ly{0 exch rlineto}!/v{0 0 6 2 roll c}!/y{2 copy c}! +/re{4 -2 roll m exch dup lx exch ly neg lx h}! +/^{3 index neg 3 index neg}! +/f{P fill}!/f*{P eofill}!/s{H stroke}!/S{P stroke}! +/q/gsave #/Q/grestore #/rf{re fill}! +/Y{P clip newpath}!/Y*{P eoclip newpath}!/rY{re Y}! +/|={pop exch 4 1 roll 1 array astore cvx 3 array astore cvx exch 1 index def exec}! +/|{exch string readstring |=}! +/+{dup type/nametype eq{2 index 7 add -3 bitshift 2 index mul}if}! +/@/currentfile #/${+ @ |}! +/B{{2 copy string{readstring pop}aload pop 4 array astore cvx +3 1 roll}repeat pop pop true}! +/Ix{[1 0 0 1 11 -2 roll exch neg exch neg]exch}! +/,{true exch Ix imagemask}!/If{false exch Ix imagemask}!/I{exch Ix image}! +/Ic{exch Ix false 3 colorimage}! +/F{/Columns counttomark 3 add -2 roll/Rows exch/K -1/BlackIs1 true>> +/CCITTFaxDecode filter}!/FX{< + +set latexnmk=call ..\..\include\latex.nmk.cmd + +if "%1"=="" ( + %latexnmk% +) else ( + for %%f in (%*) do if "%%f"=="help" ( + call :%%f + ) else if "%%f"=="all" ( + %latexnmk% dvi + ) else if "%%f"=="allpdf" ( + %latexnmk% pdf + ) else ( + %latexnmk% %%f + ) +) + +exit /b + +:help + echo all alias for dvi target + echo allpdf alias for pdf target + %latexnmk% help +goto :eof + diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib new file mode 100644 index 00000000000..19f2cd1c771 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib @@ -0,0 +1,60 @@ +@ARTICLE{Yoffe_1993_AP_42_173, + author = {A. D. Yoffe}, + title = {Low-dimensional systems: quantum size effects and electronic + properties of semiconductor microcrystallites (zero-dimensional + systems) and some quasi-two-dimensional systems}, + journal = {Adv. Phys.}, + pages = {173--266}, + volume = {42}, + year = {1993} +} + +@ARTICLE{Efros_1982_FTP_16_7_1209, + author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос}, + title = {Межзонное поглощение света в полупроводниковом шаре}, + journal = {Физика и техника полупроводников}, + year = {1982}, + volume = {16}, + number = {7}, + pages = {1209--1214}, + language = {russian}, +} + +@BOOK{Anselm_1978, + author = {А. И. Ансельм}, + title = {Введение в теорию полупроводников}, + publisher = {Наука}, + address = {Москва}, + year = {1978}, + language = {russian} +} + +@INPROCEEDINGS{Segall_1968, + author = {B. Segall}, + year = {1968}, + editor = {S. M. Ryvkin}, + booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968}, + pages = {425}, + address = {Leningrad}, + publisher = {Nauka} +} + +@INBOOK{Agranovich_1983, + editor = {V. M. Agranovich and R. M. Hochstrasser}, + title = {Spectroscopy and Excitation Dynamics of Condensed Molecular Systems}, + chapter = {6}, + publisher = {North-Holland}, + year = {1983}, + series = {Modern Problems in Condensed Matter Sciences}, + address = {Amsterdam} +} + +@INCOLLECTION{InP, + 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} +} diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex new file mode 100644 index 00000000000..633ec7217e3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex @@ -0,0 +1,103 @@ +\documentclass[specialist,subf,href,colorlinks=true +%,fixint=false +%,times +]{disser} + +\usepackage[ + a4paper, mag=1000, includefoot, + left=3cm, right=1.5cm, top=2cm, bottom=2cm, headsep=1cm, footskip=1cm +]{geometry} +\usepackage[T2A]{fontenc} +\usepackage[cp1251]{inputenc} +\usepackage[english,russian]{babel} +\ifpdf\usepackage{epstopdf}\fi + +% Использовать полужирное начертание для векторов +\let\vec=\mathbf + +% Включать подсекции в оглавление +\setcounter{tocdepth}{2} + +\graphicspath{{fig/}} + +%---------------------------------------------------------------- +\begin{document} + +% +% Титульный лист на русском языке +% + +% Название организации +\institution{Название организации} + +% Имя лица, допускающего к защите (зав. кафедрой) +\apname{д.\,ф.-м.\,н., профессор С.\,C.~Сидоров} + +\title{Дипломная работа} + +% Тема +\topic{<<Тема работы>>} + +% Группа +\group{Студента группы} +% Автор +\author{ФИО автора} + +% Научный руководитель +\sa {И.\,И.~Иванов} +\sastatus {д.\,ф.-м.\,н., профессор} + +% Рецензент +\rev {П.\,П.~Петров} +\revstatus{к.\,ф.-м.\,н., доцент} + +% Город и год +\city{Санкт-Петербург} +\date{\number\year} + +\maketitle + +%% +%% Titlepage in English +%% +% +%\setlength\thirdskip{0pt} +% +%\institution{Name of Organization} +% +%% Approved by +%\apname{Professor S.\,S.~Sidorov} +% +%\title{Diploma Thesis} +% +%% Topic +%\topic{Dummy Title} +% +%% Author +%\author{Author's Name} % Full Name +%\group{} % Study Group +% +%% Scientific Advisor +%\sa {I.\,I.~Ivanov} +%\sastatus {Professor} +% +%% Reviewer +%\rev {P.\,P.~Petrov} +%\revstatus{Associate Professor} +% +%% City & Year +%\city{Saint Petersburg} +%\date{\number\year} +% +%\maketitle[en] + +\tableofcontents + +\input{intro} +\input{1} +\input{concl} + +\bibliography{thesis} +\bibliographystyle{gost705} +\end{document} + diff --git a/Master/texmf-dist/makeindex/disser/disser.ist b/Master/texmf-dist/makeindex/disser/disser.ist deleted file mode 100644 index 850e35ce921..00000000000 --- a/Master/texmf-dist/makeindex/disser/disser.ist +++ /dev/null @@ -1,5 +0,0 @@ -item_0 "\n \\vskip12pt \\item" -item_x1 "\n \\vskip6pt \\subitem" -delim_0 "\\hfill" -delim_1 "\\leaders\\hbox to 1em{\\hss.\\hss}\\hfill" -delim_2 "\\leaders\\hbox to 1em{\\hss.\\hss}\\hfill" diff --git a/Master/texmf-dist/makeindex/disser/dtx.ist b/Master/texmf-dist/makeindex/disser/dtx.ist new file mode 100644 index 00000000000..850e35ce921 --- /dev/null +++ b/Master/texmf-dist/makeindex/disser/dtx.ist @@ -0,0 +1,5 @@ +item_0 "\n \\vskip12pt \\item" +item_x1 "\n \\vskip6pt \\subitem" +delim_0 "\\hfill" +delim_1 "\\leaders\\hbox to 1em{\\hss.\\hss}\\hfill" +delim_2 "\\leaders\\hbox to 1em{\\hss.\\hss}\\hfill" diff --git a/Master/texmf-dist/source/latex/disser/autoref.dtx b/Master/texmf-dist/source/latex/disser/autoref.dtx index c6b2885dd70..e1c60419c1d 100644 --- a/Master/texmf-dist/source/latex/disser/autoref.dtx +++ b/Master/texmf-dist/source/latex/disser/autoref.dtx @@ -13,6 +13,7 @@ % \end{macrocode} % Титульный лист. +% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} \if@titlepage\renewcommand\maketitle{ % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/bachelor.dtx b/Master/texmf-dist/source/latex/disser/bachelor.dtx index f459296b9f5..2bad720861b 100644 --- a/Master/texmf-dist/source/latex/disser/bachelor.dtx +++ b/Master/texmf-dist/source/latex/disser/bachelor.dtx @@ -15,7 +15,28 @@ % Титульный лист. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} -\if@titlepage\renewcommand\maketitle{ +\if@titlepage\renewcommand\maketitle[1][]{ +% \end{macrocode} +% Переопределения некоторых полей титульного листа для англоязычной версии. +% \begin{macrocode} +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\topicname{Topic} + \def\coursename{Speciality} + \def\studentname{Student} + \def\studentlabel{\studentname\hspace{6cm}} +\fi + % \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} @@ -24,12 +45,12 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \begin{macrocode} -\deflength\firstskip{1.5cm} -\deflength\secondskip{1.5cm} -\deflength\thirdskip{1ex} -\deflength\fourthskip{1ex} -\deflength\fifthskip{2cm} -\deflength\sixthskip{1.5ex} +\ifundeflength\firstskip{1.5cm} +\ifundeflength\secondskip{1.5cm} +\ifundeflength\thirdskip{1ex} +\ifundeflength\fourthskip{1ex} +\ifundeflength\fifthskip{2cm} +\ifundeflength\sixthskip{1.5ex} % \end{macrocode} % Горизонтальный отступ перед чертой в текстовым поле для имени, ученой @@ -60,33 +81,33 @@ % \end{macrocode} % \paragraph{Название организации} % \begin{macrocode} -\begin{center} -\instfont\@institution\par +\begin{center}% + {\instfont\@institution} \end{center} % \end{macrocode} % Диссертация допущена к защите % \begin{macrocode} -\vskip\firstskip\normalfont -\@approved +\vskip\firstskip +{\@approved} \vskip\secondskip % \end{macrocode} % Заголовок, тема. % \begin{macrocode} -\begin{center} - {\titlefont\@title\par} - \vskip\thirdskip\normalfont +\begin{center}% + {\titlefont\@title\par}% + \vskip\thirdskip% {\topiclabelfont\topiclabel\ }% - {\topicfont\@topic\par} - \vskip\fourthskip\normalfont - \courselabel\ \@coursenum~--\ \@course + {\topicfont\@topic} + \vskip\fourthskip\normalfont% + \courselabel\ \@coursenum~--\ \@course% \end{center} % \end{macrocode} % Специальность, автор, руководитель. % \begin{macrocode} -\vskip\fifthskip\normalfont +\vskip\fifthskip \begin{tabbing} \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index b91dd36d0ee..d3c18b108f8 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -15,7 +15,22 @@ % Титульный лист. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} -\if@titlepage\renewcommand\maketitle{ +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\sconname{Scientific Consultant} + \def\sconlabel{\sconname} + \def\sconsndname{\sconname} + \def\sconsndlabel{\sconname} + \def\topicname{Topic} + \def\asmanuscript{As Manuscript} +\fi + % \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} @@ -26,17 +41,19 @@ % \DescribeMacro{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} % \DescribeMacro{\seventhskip}\index{Расстояния!\verb*+\seventhskip+} % \begin{macrocode} -\newlength\firstskip -\ifDis@libcat - \setlength\firstskip{2ex} -\else - \setlength\firstskip{4ex} +\ifx\firstskip\undefined + \newlength\firstskip + \ifDis@libcat + \setlength\firstskip{2ex} + \else + \setlength\firstskip{4ex} + \fi \fi -\deflength\secondskip{2cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} -\deflength\sixthskip{0cm} +\ifundeflength\secondskip{2cm} +\ifundeflength\thirdskip{1cm} +\ifundeflength\fourthskip{1cm} +\ifundeflength\fifthskip{1cm} +\ifundeflength\sixthskip{0cm} % \end{macrocode} % Шрифты элементов титульного листа. @@ -61,7 +78,7 @@ \instfont\@institution\par \end{center} -\vskip\firstskip\normalfont +\vskip\firstskip \begin{flushright} % \end{macrocode} % Гриф секретности @@ -84,17 +101,17 @@ % \end{macrocode} % Автор % \begin{macrocode} - \vskip\secondskip\normalfont + \vskip\secondskip {\authorfont\@author} % \end{macrocode} % Название диссертации % \begin{macrocode} - \vskip\thirdskip\normalfont + \vskip\thirdskip {\topicfont\@topic\par} % \end{macrocode} % Шифр и наименование специальности % \begin{macrocode} - \vskip\fourthskip\normalfont + \vskip\fourthskip {\specfont\@specnum~--\ \@spec}\\[-6pt] \ifx\@specsndnum\empty\else {\specfont\@specsndnum~--\ \@specsnd} @@ -102,30 +119,26 @@ % \end{macrocode} % Диссертация на соискание ученой степени... % \begin{macrocode} - \vskip\fifthskip\normalfont + \vskip\fifthskip {\titlefont\@title} \end{center} % \end{macrocode} % Научный руководитель % \begin{macrocode} \ifx\@sa\empty\else - \vskip\sixthskip\normalfont - \disserfield{sa} + \vskip\sixthskip\disserfield{sa} \fi \ifx\@sasnd\empty\else - \vskip\sixthskip\normalfont - \disserfield{sasnd} + \vskip\sixthskip\disserfield{sasnd} \fi % \end{macrocode} % Научный консультант % \begin{macrocode} \ifx\@scon\empty\else - \vskip\sixthskip\normalfont - \disserfield{scon} + \vskip\sixthskip\disserfield{scon} \fi \ifx\@sconsnd\empty\else - \vskip\sixthskip\normalfont - \disserfield{sconsnd} + \vskip\sixthskip\disserfield{sconsnd} \fi % \end{macrocode} % \paragraph{Город и год} diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx index 375e88e2b09..c1ed00cde48 100644 --- a/Master/texmf-dist/source/latex/disser/custom.dtx +++ b/Master/texmf-dist/source/latex/disser/custom.dtx @@ -149,7 +149,9 @@ \let\shortcite\cite \let\citeasnoun\cite }{% - \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}} + \def\@noitemerr{% + \PackageWarning{natbib}{Empty `thebibliography' environment}% + } \endlist\vskip-\lastskip% } @@ -233,7 +235,8 @@ \fi % \end{macrocode} -% Команда, создающая цель для гиперссылок над заголовками ненумеруемых разделов. +% Команда, создающая цель для гиперссылок над заголовками ненумеруемых +% разделов. % \DescribeMacro{\hrefphantom}\index{Макросы!\verb*+\hrefphantom+} % \begin{macrocode} \providecommand\hrefphantom[1]{% diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index ed5bb05472c..18f9e1e8261 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/05/22 1.1.6 Document class for dissertations] +\ProvidesFile{disser.drv}[2010/11/21 1.1.7 Document class for dissertations] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -36,8 +36,7 @@ \fi \hypersetup{ - pdfusetitle, - pdftitle = {Documented source code of the disser package}, + pdftitle = {Documented source code of disser class}, pdfauthor = {Stanislav Kruchinin}, pdfsubject = {disser}, pdfstartview = {FitH}, @@ -124,6 +123,7 @@ \DocInput{titledefs.dtx} \DocInput{titlepage.dtx} \DocInput{bachelor.dtx} + \DocInput{specialist.dtx} \DocInput{master.dtx} \DocInput{candidate.dtx} \DocInput{doctor.dtx} @@ -180,7 +180,7 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations] +\ProvidesClass{disser}[2010/06/13 1.1.7 Document class for dissertations] % \end{macrocode} % Подключение пакета \pkg{kvoptions} для обработки опций в формате @@ -197,6 +197,14 @@ % \begin{macrocode} \RequirePackage{ifpdf} +% \item подключение пакета \pkg{ifthen} для построчных сравнений. +% \DescribePackage{ifthen}\index{Пакеты!\verb*+ifthen+} +\RequirePackage{ifthen} + +% \end{macrocode} +% \item Англоязычная версия титульного листа. +% \begin{macrocode} +\newif\if@titlepage@en\@titlepage@enfalse % \end{macrocode} % \item Разрешено оставлять одну колонку при двухколонном наборе. % \begin{macrocode} @@ -213,6 +221,7 @@ % \item Типы документов (по умолчанию candidate). % \begin{macrocode} \newif\ifDis@bachelor\Dis@bachelorfalse +\newif\ifDis@specialist\Dis@specialistfalse \newif\ifDis@master\Dis@masterfalse \newif\ifDis@candidate\Dis@candidatetrue \newif\ifDis@doctor\Dis@doctorfalse @@ -387,6 +396,15 @@ % \begin{macrocode} \DeclareOption{bachelor}{% \Dis@bachelortrue + \Dis@specialistfalse + \Dis@masterfalse + \Dis@candidatefalse + \Dis@doctorfalse + \Dis@autoreffalse +} +\DeclareOption{specialist}{% + \Dis@bachelorfalse + \Dis@specialisttrue \Dis@masterfalse \Dis@candidatefalse \Dis@doctorfalse @@ -394,6 +412,7 @@ } \DeclareOption{master}{% \Dis@bachelorfalse + \Dis@specialistfalse \Dis@mastertrue \Dis@candidatefalse \Dis@doctorfalse @@ -451,11 +470,12 @@ % Файл с описанием разметки титульного листа по умолчанию. % \begin{macrocode} \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 + \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi + \ifDis@specialist \renewcommand*{\Dis@substylefile}{specialist.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} @@ -529,11 +549,13 @@ }{} \DeclareFontShape{OT1}{cmr}{bx}{sl}{% <5><6><7><8><9>% - <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxsl10% + <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>% + <51.59>cmbxsl10% }{} \DeclareFontShape{OT1}{cmr}{bx}{it}{% <5><6><7><8><9>% - <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxti10% + <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>% + <51.59>cmbxti10% }{} \input{size\@ptsize.clo} \RequirePackage{exscale} @@ -562,6 +584,9 @@ % \DescribeMacro{\deflength}\index{Макросы!\verb*+\deflength+} % \begin{macrocode} \providecommand\deflength[2]{\newlength{#1}\setlength{#1}{#2}} +\providecommand\ifundeflength[2]{% +\ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi +} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/disser/disser.ins b/Master/texmf-dist/source/latex/disser/disser.ins index b288a638077..7bc55cad32c 100644 --- a/Master/texmf-dist/source/latex/disser/disser.ins +++ b/Master/texmf-dist/source/latex/disser/disser.ins @@ -45,6 +45,7 @@ This file is part of the disser package. } \rtxfile{titledefs} \rtxfile{bachelor} + \rtxfile{specialist} \rtxfile{master} \rtxfile{candidate} \rtxfile{doctor} diff --git a/Master/texmf-dist/source/latex/disser/doctor.dtx b/Master/texmf-dist/source/latex/disser/doctor.dtx index aa0632090a9..ddeeee7ce9c 100644 --- a/Master/texmf-dist/source/latex/disser/doctor.dtx +++ b/Master/texmf-dist/source/latex/disser/doctor.dtx @@ -15,7 +15,18 @@ % Титульный лист. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} -\if@titlepage\renewcommand\maketitle{ +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\sconname{Scientific Consultant} + \def\sconlabel{\sconname} + \def\sconsndname{\sconname} + \def\sconsndlabel{\sconname} + \def\topicname{Topic} + \def\asmanuscript{As Manuscript} +\fi + % \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} @@ -25,17 +36,19 @@ % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \DescribeMacro{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} % \begin{macrocode} -\newlength\firstskip -\ifDis@libcat - \setlength\firstskip{1ex} -\else - \setlength\firstskip{4ex} +\ifx\firstskip\undefined + \newlength\firstskip + \ifDis@libcat + \setlength\firstskip{1ex} + \else + \setlength\firstskip{4ex} + \fi \fi -\deflength\secondskip{3cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} -\deflength\sixthskip{0cm} +\ifundeflength\secondskip{3cm} +\ifundeflength\thirdskip{1cm} +\ifundeflength\fourthskip{1cm} +\ifundeflength\fifthskip{1cm} +\ifundeflength\sixthskip{0cm} % \end{macrocode} % Шрифты элементов титульного листа. diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index 01dd4f1cd45..97fd655650a 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -1,34 +1,166 @@ % \iffalse meta-comment -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% This bibliography style attempts -%% to format bibliography according to -%% GOST 7.1-84 with some conventional modifications. -%% -%% Based on style gost71u.bst by Maksym Polyakov. -%% -%% For the Russian bibliographic entries -%% you need to create field -%% language = {russian}. -%% Default language is English. -%% Field numpages for books must contain number of pages. -%% Optional field url will format url (using hyperref, if loaded). -%% -%% Requires 8-bit bibtex with switch -B and csf file -%% supporting cyrillic. -%% -%% bibtex8 -B -c .csf -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - +% +% This bibliography style attempts to format bibliography according to +% GOST R 7.0.5-2008 with some conventional modifications. +% +% Based on style gost71u.bst by Maksym Polyakov. +% +% For the Russian bibliographic entries you need to create field +% language = {russian}. +% +% Default language is English. +% Field numpages for books must contain number of pages. +% Optional field url will format url (using hyperref, if loaded). +% +% Requires 8-bit bibtex with switch -H and csf file supporting cyrillic. +% +% bibtex8 -H -c .csf +% +% Copyright (C) 2004-2010 by +% Stanislav Kruchinin +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any later +% version. This version of this license is in +% http://www.latex-project.org/lppl/lppl-1-3c.txt +% and the latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of +% LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% Current Maintainer of this work is Stanislav Kruchinin. +% +% This work consists of the main source file gost705.dtx +% and the derived files +% gost705.bst, gost705s.bst, gost705.pdf. +% +% Distribution: +% CTAN:macros/latex/contrib/disser/src/gost705.dtx +% +% Unpacking: +% (a) If disser.ins present: +% latex disser.ins +% (b) Without disser.ins: +% tex gost705.dtx +% +% Documentation: +% latex maik.dtx; ... +% +% Programm calls to get the documentation (example): +% pdflatex gost705.dtx +% makeindex -r -s dtx.ist gost705 +% pdflatex gost705.dtx +% pdflatex gost705.dtx +% +% Installation: +% TDS:bibtex/bst/disser/ +% TDS:doc/latex/disser/ +% TDS:source/latex/disser/ +% +%<*ignore> +\begingroup + \catcode123=1 % + \catcode125=2 % + \def\x{LaTeX2e}% +\expandafter\endgroup +\ifcase 0\ifx\install y1\fi\expandafter + \ifx\csname processbatchFile\endcsname\relax\else1\fi + \ifx\fmtname\x\else 1\fi\relax +\else\csname fi\endcsname +% +%<*install> +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation} +\Msg{* gost705: Format bibliography according to GOST R 7.0.5-2008} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\let\MetaPrefix\relax +\preamble + +This is a generated file. + +This bibliography style attempts to format bibliography according to +GOST R 7.0.5-2008 with some conventional modifications. + +Based on style gost71u.bst by Maksym Polyakov. + +For the Russian bibliographic entries you need to create field + language = {russian}. + +Default language is English. +Field numpages for books must contain number of pages. +Optional field url will format url (using hyperref, if loaded). + +Requires 8-bit bibtex with switch -H and csf file supporting cyrillic. + +bibtex8 -H -c .csf + +Copyright (C) 2004-2010 by + Stanislav Kruchinin + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3c of this license or (at your option) any later +version. This version of this license is in + http://www.latex-project.org/lppl/lppl-1-3c.txt +and the latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of +LaTeX version 2005/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +Current Maintainer of this work is Stanislav Kruchinin. + +This work consists of the main source file gost705.dtx +and the derived files + gost705.bst gost705s.bst gost705.pdf. + +\endpreamble +\let\MetaPrefix\DoubleperCent + +\generate{% + \usedir{bibtex/bst/disser}% + \file{gost705.bst}{\from{gost705.dtx}{gost705}}% + \file{gost705s.bst}{\from{gost705.dtx}{gost705s}}% +} + +\catcode32=13\relax% active space +\let =\space% +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* file into a directory searched by TeX:} +\Msg{*} +\Msg{* gost705.bst gost705s.bst} +\Msg{*} +\Msg{* To produce the documentation run the file `gost705.dtx'} +\Msg{* through LaTeX or pdfLaTeX.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +% +%<*ignore> +\fi +% %<*driver> -\ProvidesFile{gost705.drv}[2010/05/22 1.1.6 Bibliography style for dissertations.] +\ProvidesFile{gost705.drv}% + [2010/11/21 1.1.7 Bibliography style for GOST R 7.0.5-2008.] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, left=5.5cm,right=1cm,top=1.5cm,bottom=1.5cm]{geometry} \usepackage{ifpdf,indentfirst,color,makeidx} - \definecolor{darkblue}{rgb}{0,0,.6} \ifpdf \usepackage[pdftex,hyperindex,unicode]{hyperref} @@ -38,10 +170,9 @@ \fi \hypersetup{ - pdfusetitle, - pdftitle = {Documented source code of disser package}, + pdftitle = {Documented source code of gost705 style}, pdfauthor = {Stanislav Kruchinin}, - pdfsubject = {disser}, + pdfsubject = {gost705}, pdfstartview = {FitH}, pdfborder = {0 0 0}, bookmarksopen = true, @@ -107,7 +238,6 @@ \makeindex -\GetFileInfo{gost705.drv} \begin{document} \sloppy \DocInput{gost705.dtx} @@ -117,7 +247,7 @@ % % \fi % -% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \GetFileInfo{gost705.drv} % % \title{\pkg{gost705} и \pkg{gost705s} "--- стили оформления библиографии % в соответствии с ГОСТ Р 7.0.5-2008} @@ -172,6 +302,10 @@ ENTRY urldate isbn doi + archive + archivePrefix + primaryClass + eprint } {} { label } @@ -1033,11 +1167,9 @@ FUNCTION {output.address.publisher.date} FUNCTION {output.bibitem} { newline$ - "\bibitem[" write$ - "\BibPrefix" write$ + "\bibitem[\BibPrefix" write$ label write$ - "\BibPostfix" write$ - "]{" write$ + "\BibPostfix]{" write$ cite$ write$ "}" write$ newline$ @@ -1445,6 +1577,20 @@ FUNCTION {editor.organization.after} } % \end{macrocode} +% \DescribeBSTFunction{format.annote} +% \begin{macrocode} +FUNCTION {format.annote} +{ + annote empty$ + { "" } + { after.sentence 'output.state := + "\BibAnnote{" annote add.period$ * "}" * + } + if$ +} + +% \end{macrocode} +% \subsection{Создание гиперссылок} % \DescribeBSTFunction{format.url} % \begin{macrocode} FUNCTION {format.url} @@ -1481,19 +1627,6 @@ FUNCTION {output.url} if$ } -% \end{macrocode} -% \DescribeBSTFunction{format.annote} -% \begin{macrocode} -FUNCTION {format.annote} -{ - annote empty$ - { "" } - { after.sentence 'output.state := - "\BibAnnote{" annote add.period$ * "}" * - } - if$ -} - % \end{macrocode} % \DescribeBSTFunction{format.isbn} % \begin{macrocode} @@ -1521,6 +1654,30 @@ FUNCTION {add.doi} if$ } +% \end{macrocode} +% \DescribeBSTFunction{format.eprint} +% \begin{macrocode} +FUNCTION {format.eprint} +{ eprint empty$ + { "" } + { primaryClass empty$ + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * eprint * "}" * + } + { archivePrefix empty$ + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * primaryClass * "/" * eprint * "}" * + } + { " \href{http://arxiv.org/abs/" eprint * "}" * + "{" * archivePrefix * ":" * primaryClass * "/" * eprint * "}" * + } + if$ + } + if$ + } + if$ +} + % \end{macrocode} % \subsection{Описание типов библиографических ссылок} % \DescribeBSTFunction{article} @@ -1542,6 +1699,8 @@ FUNCTION {article} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1571,6 +1730,8 @@ FUNCTION {book} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1592,6 +1753,8 @@ FUNCTION {booklet} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1624,6 +1787,8 @@ FUNCTION {inbook} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1652,6 +1817,8 @@ FUNCTION {incollection} new.block note output new.block + format.eprint output + new.block output.url format.annote output fin.entry @@ -1689,6 +1856,8 @@ FUNCTION {inproceedings} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1735,6 +1904,8 @@ FUNCTION {manual} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1757,6 +1928,8 @@ FUNCTION {mastersthesis} new.block note output new.block + format.eprint output + new.block output.url format.annote output fin.entry @@ -1778,6 +1951,8 @@ FUNCTION {misc} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1802,6 +1977,8 @@ FUNCTION {phdthesis} format.pages.page output note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1826,6 +2003,8 @@ FUNCTION {docdisser} format.pages.page output note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1856,6 +2035,8 @@ FUNCTION {proceedings} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1881,6 +2062,8 @@ FUNCTION {techreport} new.block note output new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -1898,6 +2081,8 @@ FUNCTION {unpublished} new.block note "note" output.check new.sentence + format.eprint output + new.block output.url format.annote output fin.entry @@ -2066,7 +2251,7 @@ MACRO {nl} {"Nano Lett."} READ % \end{macrocode} -% \subsection{Функции для сортировки списка литературы по именам авторов и названиям} +% \subsection{Сортировка списка литературы по именам авторов и названиям} % \begin{macrocode} %<*gost705s> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index 580d4c8cb27..99e2ab13567 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/05/22 1.1.6 GOST 7.32-2001 implementation] +\ProvidesFile{gost732.drv}[2010/11/21 1.1.7 GOST 7.32-2001 implementation] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -36,8 +36,7 @@ \fi \hypersetup{ - pdfusetitle, - pdftitle = {Documented source code of disser package}, + pdftitle = {Documented source code of gost732 class}, pdfauthor = {Stanislav Kruchinin}, pdfsubject = {disser}, pdfstartview = {FitH}, @@ -113,7 +112,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2010/05/22 1.1.6 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2010/06/13 1.1.7 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 84b16d85bc2..49fafe8d40d 100644 --- a/Master/texmf-dist/source/latex/disser/master.dtx +++ b/Master/texmf-dist/source/latex/disser/master.dtx @@ -15,7 +15,26 @@ % Титульный лист. % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} -\if@titlepage\renewcommand\maketitle{ +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\topicname{Topic} + \def\coursename{Speciality} + \def\studentname{Student} + \def\studentlabel{\studentname\hspace{6cm}} + \def\masterprogname{Master's Program} +\fi + % \end{macrocode} % Вертикальные интервалы между элементами титульного листа. % \DescribeMacro{\firstskip}\index{Расстояния!\verb*+\firstskip+} @@ -24,12 +43,12 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \begin{macrocode} -\deflength\firstskip{1ex} -\deflength\secondskip{1ex} -\deflength\thirdskip{1ex} -\deflength\fourthskip{-1cm} -\deflength\fifthskip{0ex} -\deflength\sixthskip{1.5ex} +\ifundeflength\firstskip{1ex} +\ifundeflength\secondskip{1ex} +\ifundeflength\thirdskip{1ex} +\ifundeflength\fourthskip{-1cm} +\ifundeflength\fifthskip{0ex} +\ifundeflength\sixthskip{1.5ex} % \end{macrocode} % Горизонтальный отступ перед чертой в текстовым поле для имени, ученой @@ -61,7 +80,7 @@ % \end{macrocode} % Диссертация допущена к защите % \begin{macrocode} -\vskip\firstskip\normalfont +\vskip\firstskip \@approved \vskip\secondskip \begin{center} @@ -69,14 +88,14 @@ % Заголовок. % \begin{macrocode} {\titlefont\@title} - \vskip\thirdskip\normalfont + \vskip\thirdskip % \end{macrocode} % Тема % \begin{macrocode} {\topiclabelfont\topiclabel} {\topicfont\@topic} \end{center} -\vskip\fourthskip\normalfont +\vskip\fourthskip \begin{tabbing} \phantom{\masterproglabel}\=\\ % \end{macrocode} @@ -88,7 +107,7 @@ % \begin{macrocode} \masterproglabel\>\ \@masterprognum\ --\ \@masterprog \end{tabbing} -\vskip\fifthskip\normalfont +\vskip\fifthskip \begin{tabbing} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/disser/specialist.dtx b/Master/texmf-dist/source/latex/disser/specialist.dtx new file mode 100644 index 00000000000..d59903499f5 --- /dev/null +++ b/Master/texmf-dist/source/latex/disser/specialist.dtx @@ -0,0 +1,153 @@ +% \begin{macrocode} + +%\ProvidesFile{specialist.rtx} + +%<*specialist> +% \end{macrocode} +% \subsubsection{Стиль работы специалиста} +% +% Нумерация. +% \begin{macrocode} +\newcommand\specialist@the{\default@the} +\specialist@the + +\def\diplomafield#1{% + \csname #1label\endcsname\\% + \csname @#1status\endcsname\ \csname @#1\endcsname +} + +% \end{macrocode} +% Титульный лист. +% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} +% \begin{macrocode} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} +\else + \def\appos{\CYRZ\cyra\cyrv\cyre\cyrd\cyru\cyryu\cyrshch\cyri\cyrishrt\ % + \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt} + \def\approved{<<\CYRD\cyro\cyrp\cyru\cyrs\cyrt\cyri\cyrt\cyrsftsn\ % + \cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre>>} +\fi + +% \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} +\ifundeflength\firstskip{1.5cm} +\ifundeflength\secondskip{1.5cm} +\ifundeflength\thirdskip{3ex} +\ifundeflength\fourthskip{1ex} +\ifundeflength\fifthskip{1ex} +\ifundeflength\sixthskip{2cm} +\ifundeflength\seventhskip{1ex} + +% \end{macrocode} +% Горизонтальный отступ перед чертой в текстовым поле для имени, ученой +% степени и звания научного руководителя и консультанта. +% \DescribeMacro{\fieldhshift}\index{Расстояния!\verb*+\fieldhshift+} +% \begin{macrocode} +\setlength\fieldhshift{8.5cm} + +% \end{macrocode} +% Шрифты элементов титульного листа. +% \DescribeMacro{\titlefont}\index{Макросы!\verb*+\titlefont+} +% \DescribeMacro{\topiclabelfont}\index{Макросы!\verb*+\topiclabelfont+} +% \DescribeMacro{\topicfont}\index{Макросы!\verb*+\topicfont+} +% \begin{macrocode} +\def\titlefont{\Large\bfseries} +\def\topiclabelfont{\large} +\def\topicfont{\large\bfseries} + +% \end{macrocode} +% Работа +% \DescribeMacro{\workname}\index{Макросы!\verb*+\topicfont+} +% \begin{macrocode} +\def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra} + +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} +% \end{macrocode} +% \paragraph{Название организации} +% \begin{macrocode} +\begin{center} + {\instfont\@institution} +\end{center} + +% \end{macrocode} +% Работа +% \DescribeMacro{\workname}\index{Макросы!\verb*+\topicfont+} +% \begin{macrocode} +\def\@approved{ +\hfill +\begin{minipage}{.5\linewidth} + {\approved}\hrulefill\\[9pt]% + \appos\\% + \@apname% +\end{minipage} +} + +% \end{macrocode} +% Допустить к защите +% \begin{macrocode} +\vskip\firstskip +{\@approved} +\vskip\secondskip +% \end{macrocode} +% Заголовок, тема, автор +% \begin{macrocode} +\begin{center} + {\titlefont\@title} + \vskip\thirdskip + {\@group} + \vskip\fourthskip + {\@author} + \vskip\fifthskip + {\topicfont\@topic} +\end{center} +\normalfont +% \end{macrocode} +% Руководитель, рецензент +% \begin{macrocode} +\vskip\sixthskip +\hfill +\begin{minipage}{.5\linewidth} + \ifx\@sa\empty\else + \vskip\seventhskip\diplomafield{sa} + \fi + \ifx\@sasnd\empty\else + \vskip\seventhskip\diplomafield{sasnd} + \fi + \ifx\@rev\empty\else + \vskip\seventhskip\diplomafield{rev} + \fi + \ifx\@revsnd\empty\else + \vskip\seventhskip\diplomafield{revsnd} + \fi +\end{minipage} +% \end{macrocode} +% \paragraph{Город и год} +% \begin{macrocode} +\vfill +\begin{center} + {\@city\cdsep\@date} +\end{center} +\normalfont\clearpage +}\fi +% +% \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/titledefs.dtx b/Master/texmf-dist/source/latex/disser/titledefs.dtx index 18e935047dc..25e47e07df5 100644 --- a/Master/texmf-dist/source/latex/disser/titledefs.dtx +++ b/Master/texmf-dist/source/latex/disser/titledefs.dtx @@ -15,7 +15,8 @@ % \DescribeMacro{\titlepagename}\index{Макросы!\verb+\titlepagename+} % Титульный лист % \begin{macrocode} -\def\titlepagename{\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ % +\def\titlepagename{% +\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ % \cyrl\cyri\cyrs\cyrt} % \end{macrocode} % \DescribeMacro{\keywordsname}\index{Макросы!\verb+\keywordsname+} @@ -85,7 +86,7 @@ % \begin{macrocode} \def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ % \cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt} -\def\studentlabel{\studentname\ \groupname\ \@group\hspace{2cm}} +\def\studentlabel{\studentname\ \groupname\ \@group\hspace{1.5cm}} % \end{macrocode} % \DescribeMacro{\saname}\index{Макросы!\verb+\saname+} % \DescribeMacro{\salabel}\index{Макросы!\verb+\salabel+} diff --git a/Master/texmf-dist/source/latex/disser/toc.dtx b/Master/texmf-dist/source/latex/disser/toc.dtx index 7ec27da000c..74f16a4a403 100644 --- a/Master/texmf-dist/source/latex/disser/toc.dtx +++ b/Master/texmf-dist/source/latex/disser/toc.dtx @@ -8,7 +8,8 @@ %<*toc> % \end{macrocode} % -% \subsection{Автоматически генерируемые списки (оглавление, предметный указатель и т.\,д.)} +% \subsection{Автоматически генерируемые списки (оглавление, предметный +% указатель и т.\,д.)} % % \subsubsection{Общие параметры} % @@ -43,6 +44,7 @@ % \end{macrocode} % \subsubsection{Оглавление} % +% Команда, создающая заголовок в тексте. % \DescribeMacro{\tocsection}\index{Макросы!\verb*+\tocsection+} % \begin{macrocode} \newcommand\tocsection{\chapter*{\contentsname}} @@ -64,6 +66,7 @@ % % \subsubsection{Список иллюстраций} % +% Команда, создающая заголовок в тексте. % \DescribeMacro{\lofsection}\index{Макросы!\verb*+\lofsection+} % \begin{macrocode} \newcommand\lofsection{\nchapter{\listfigurename}} @@ -89,6 +92,7 @@ % % \subsubsection{Список таблиц} % +% Команда, создающая заголовок в тексте. % \DescribeMacro{\lotsection}\index{Макросы!\verb*+\lotsection+} % \begin{macrocode} \newcommand\lotsection{\nchapter{\listtablename}} @@ -137,6 +141,7 @@ % % \subsubsection{Предметный указатель} % +% Команда, создающая заголовок в тексте. % \DescribeMacro{\indexsection}\index{Макросы!\verb*+\indexsection+} % \begin{macrocode} \providecommand\indexsection{\twocolumn[\@makeschapterhead{\indexname}]} diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index 7c73e819c65..c60628dd4a5 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -17,13 +17,31 @@ \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} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\topicname{Topic} + \def\coursename{Speciality} + \def\studentname{Student} + \def\studentlabel{\studentname\hspace{6cm}} +\fi + +\ifundeflength\firstskip{1.5cm} +\ifundeflength\secondskip{1.5cm} +\ifundeflength\thirdskip{1ex} +\ifundeflength\fourthskip{1ex} +\ifundeflength\fifthskip{2cm} +\ifundeflength\sixthskip{1.5ex} \setlength\fieldhshift{8.5cm} @@ -36,24 +54,24 @@ \thispagestyle{empty} \enlargethispage{2cm} \vspace*{-2cm} -\begin{center} -\instfont\@institution\par +\begin{center}% + {\instfont\@institution} \end{center} -\vskip\firstskip\normalfont -\@approved +\vskip\firstskip +{\@approved} \vskip\secondskip -\begin{center} - {\titlefont\@title\par} - \vskip\thirdskip\normalfont +\begin{center}% + {\titlefont\@title\par}% + \vskip\thirdskip% {\topiclabelfont\topiclabel\ }% - {\topicfont\@topic\par} - \vskip\fourthskip\normalfont - \courselabel\ \@coursenum~--\ \@course + {\topicfont\@topic} + \vskip\fourthskip\normalfont% + \courselabel\ \@coursenum~--\ \@course% \end{center} -\vskip\fifthskip\normalfont +\vskip\fifthskip \begin{tabbing} \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index 136fd656f41..673b0c1b42b 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -17,18 +17,35 @@ \newcommand\candidate@the{\default@the} \candidate@the -\if@titlepage\renewcommand\maketitle{ -\newlength\firstskip -\ifDis@libcat - \setlength\firstskip{2ex} -\else - \setlength\firstskip{4ex} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\sconname{Scientific Consultant} + \def\sconlabel{\sconname} + \def\sconsndname{\sconname} + \def\sconsndlabel{\sconname} + \def\topicname{Topic} + \def\asmanuscript{As Manuscript} \fi -\deflength\secondskip{2cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} -\deflength\sixthskip{0cm} + +\ifx\firstskip\undefined + \newlength\firstskip + \ifDis@libcat + \setlength\firstskip{2ex} + \else + \setlength\firstskip{4ex} + \fi +\fi +\ifundeflength\secondskip{2cm} +\ifundeflength\thirdskip{1cm} +\ifundeflength\fourthskip{1cm} +\ifundeflength\fifthskip{1cm} +\ifundeflength\sixthskip{0cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} @@ -43,7 +60,7 @@ \instfont\@institution\par \end{center} -\vskip\firstskip\normalfont +\vskip\firstskip \begin{flushright} \ifDis@classified\classify\fi \asmanuscript @@ -51,33 +68,29 @@ \ifDis@libcat\libcatname\ \@libcatnum\fi \end{flushright} \begin{center} - \vskip\secondskip\normalfont + \vskip\secondskip {\authorfont\@author} - \vskip\thirdskip\normalfont + \vskip\thirdskip {\topicfont\@topic\par} - \vskip\fourthskip\normalfont + \vskip\fourthskip {\specfont\@specnum~--\ \@spec}\\[-6pt] \ifx\@specsndnum\empty\else {\specfont\@specsndnum~--\ \@specsnd} \fi - \vskip\fifthskip\normalfont + \vskip\fifthskip {\titlefont\@title} \end{center} \ifx\@sa\empty\else - \vskip\sixthskip\normalfont - \disserfield{sa} + \vskip\sixthskip\disserfield{sa} \fi \ifx\@sasnd\empty\else - \vskip\sixthskip\normalfont - \disserfield{sasnd} + \vskip\sixthskip\disserfield{sasnd} \fi \ifx\@scon\empty\else - \vskip\sixthskip\normalfont - \disserfield{scon} + \vskip\sixthskip\disserfield{scon} \fi \ifx\@sconsnd\empty\else - \vskip\sixthskip\normalfont - \disserfield{sconsnd} + \vskip\sixthskip\disserfield{sconsnd} \fi \vfill \begin{center} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 120972cdcf5..0f11530d226 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,16 +44,20 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations] +\ProvidesClass{disser}[2010/06/13 1.1.7 Document class for dissertations] \RequirePackage{kvoptions} \RequirePackage{ifpdf} +\RequirePackage{ifthen} + +\newif\if@titlepage@en\@titlepage@enfalse \newif\if@restonecol \newif\if@titlepage\@titlepagetrue \newif\if@openright\@openrightfalse \newif\ifDis@bachelor\Dis@bachelorfalse +\newif\ifDis@specialist\Dis@specialistfalse \newif\ifDis@master\Dis@masterfalse \newif\ifDis@candidate\Dis@candidatetrue \newif\ifDis@doctor\Dis@doctorfalse @@ -136,6 +140,15 @@ \DeclareOption{bachelor}{% \Dis@bachelortrue + \Dis@specialistfalse + \Dis@masterfalse + \Dis@candidatefalse + \Dis@doctorfalse + \Dis@autoreffalse +} +\DeclareOption{specialist}{% + \Dis@bachelorfalse + \Dis@specialisttrue \Dis@masterfalse \Dis@candidatefalse \Dis@doctorfalse @@ -143,6 +156,7 @@ } \DeclareOption{master}{% \Dis@bachelorfalse + \Dis@specialistfalse \Dis@mastertrue \Dis@candidatefalse \Dis@doctorfalse @@ -184,11 +198,12 @@ \ProcessOptions \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 + \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi + \ifDis@specialist \renewcommand*{\Dis@substylefile}{specialist.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 \AtEndOfClass{\input{\Dis@substylefile}} @@ -249,11 +264,13 @@ }{} \DeclareFontShape{OT1}{cmr}{bx}{sl}{% <5><6><7><8><9>% - <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxsl10% + <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>% + <51.59>cmbxsl10% }{} \DeclareFontShape{OT1}{cmr}{bx}{it}{% <5><6><7><8><9>% - <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxti10% + <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>% + <51.59>cmbxti10% }{} \input{size\@ptsize.clo} \RequirePackage{exscale} @@ -269,6 +286,9 @@ \DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal} \providecommand\deflength[2]{\newlength{#1}\setlength{#1}{#2}} +\providecommand\ifundeflength[2]{% +\ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi +} \setlength\lineskip{1\p@} \setlength\normallineskip{1\p@} @@ -1405,7 +1425,9 @@ \let\shortcite\cite \let\citeasnoun\cite }{% - \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}} + \def\@noitemerr{% + \PackageWarning{natbib}{Empty `thebibliography' environment}% + } \endlist\vskip-\lastskip% } diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index 867652075c5..852faed2654 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -17,18 +17,31 @@ \newcommand\doctor@the{\default@the} \doctor@the -\if@titlepage\renewcommand\maketitle{ -\newlength\firstskip -\ifDis@libcat - \setlength\firstskip{1ex} -\else - \setlength\firstskip{4ex} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\sconname{Scientific Consultant} + \def\sconlabel{\sconname} + \def\sconsndname{\sconname} + \def\sconsndlabel{\sconname} + \def\topicname{Topic} + \def\asmanuscript{As Manuscript} \fi -\deflength\secondskip{3cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} -\deflength\sixthskip{0cm} + +\ifx\firstskip\undefined + \newlength\firstskip + \ifDis@libcat + \setlength\firstskip{1ex} + \else + \setlength\firstskip{4ex} + \fi +\fi +\ifundeflength\secondskip{3cm} +\ifundeflength\thirdskip{1cm} +\ifundeflength\fourthskip{1cm} +\ifundeflength\fifthskip{1cm} +\ifundeflength\sixthskip{0cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 4d2506570a3..f20f8dd3a29 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/05/22 1.1.6 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2010/06/13 1.1.7 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 78fdc88ec24..043208fcf02 100644 --- a/Master/texmf-dist/tex/latex/disser/master.rtx +++ b/Master/texmf-dist/tex/latex/disser/master.rtx @@ -17,13 +17,32 @@ \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} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\topicname{Topic} + \def\coursename{Speciality} + \def\studentname{Student} + \def\studentlabel{\studentname\hspace{6cm}} + \def\masterprogname{Master's Program} +\fi + +\ifundeflength\firstskip{1ex} +\ifundeflength\secondskip{1ex} +\ifundeflength\thirdskip{1ex} +\ifundeflength\fourthskip{-1cm} +\ifundeflength\fifthskip{0ex} +\ifundeflength\sixthskip{1.5ex} \setlength\fieldhshift{8.5cm} @@ -38,22 +57,22 @@ \instfont\@institution\par \end{center} -\vskip\firstskip\normalfont +\vskip\firstskip \@approved \vskip\secondskip \begin{center} {\titlefont\@title} - \vskip\thirdskip\normalfont + \vskip\thirdskip {\topiclabelfont\topiclabel} {\topicfont\@topic} \end{center} -\vskip\fourthskip\normalfont +\vskip\fourthskip \begin{tabbing} \phantom{\masterproglabel}\=\\ \courselabel\>\ \@coursenum\ --\ \@course\\ \masterproglabel\>\ \@masterprognum\ --\ \@masterprog \end{tabbing} -\vskip\fifthskip\normalfont +\vskip\fifthskip \begin{tabbing} \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi diff --git a/Master/texmf-dist/tex/latex/disser/specialist.rtx b/Master/texmf-dist/tex/latex/disser/specialist.rtx new file mode 100644 index 00000000000..6006dbde8de --- /dev/null +++ b/Master/texmf-dist/tex/latex/disser/specialist.rtx @@ -0,0 +1,114 @@ +%% +%% This is file `specialist.rtx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% specialist.dtx (with options: `specialist') +%% +%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% All rights reserved. +%% +%% This file is part of the disser package. +%% + +\ProvidesFile{specialist.rtx} + +\newcommand\specialist@the{\default@the} +\specialist@the + +\def\diplomafield#1{% + \csname #1label\endcsname\\% + \csname @#1status\endcsname\ \csname @#1\endcsname +} + +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} +\else + \def\appos{\CYRZ\cyra\cyrv\cyre\cyrd\cyru\cyryu\cyrshch\cyri\cyrishrt\ % + \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt} + \def\approved{<<\CYRD\cyro\cyrp\cyru\cyrs\cyrt\cyri\cyrt\cyrsftsn\ % + \cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre>>} +\fi + +\ifundeflength\firstskip{1.5cm} +\ifundeflength\secondskip{1.5cm} +\ifundeflength\thirdskip{3ex} +\ifundeflength\fourthskip{1ex} +\ifundeflength\fifthskip{1ex} +\ifundeflength\sixthskip{2cm} +\ifundeflength\seventhskip{1ex} + +\setlength\fieldhshift{8.5cm} + +\def\titlefont{\Large\bfseries} +\def\topiclabelfont{\large} +\def\topicfont{\large\bfseries} + +\def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra} + +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} +\begin{center} + {\instfont\@institution} +\end{center} + +\def\@approved{ +\hfill +\begin{minipage}{.5\linewidth} + {\approved}\hrulefill\\[9pt]% + \appos\\% + \@apname% +\end{minipage} +} + +\vskip\firstskip +{\@approved} +\vskip\secondskip +\begin{center} + {\titlefont\@title} + \vskip\thirdskip + {\@group} + \vskip\fourthskip + {\@author} + \vskip\fifthskip + {\topicfont\@topic} +\end{center} +\normalfont +\vskip\sixthskip +\hfill +\begin{minipage}{.5\linewidth} + \ifx\@sa\empty\else + \vskip\seventhskip\diplomafield{sa} + \fi + \ifx\@sasnd\empty\else + \vskip\seventhskip\diplomafield{sasnd} + \fi + \ifx\@rev\empty\else + \vskip\seventhskip\diplomafield{rev} + \fi + \ifx\@revsnd\empty\else + \vskip\seventhskip\diplomafield{revsnd} + \fi +\end{minipage} +\vfill +\begin{center} + {\@city\cdsep\@date} +\end{center} +\normalfont\clearpage +}\fi +\endinput +%% +%% End of file `specialist.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx index 61e5958c4ec..fe47de01536 100644 --- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx +++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx @@ -15,7 +15,8 @@ \ProvidesFile{titledefs.rtx} \def\abstractname{\cyr\CYRA\cyrn\cyrn\cyro\cyrt\cyra\cyrc\cyri\cyrya} -\def\titlepagename{\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ % +\def\titlepagename{% +\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ % \cyrl\cyri\cyrs\cyrt} \def\keywordsname{\cyr\CYRK\cyrk\cyryu\cyrch\cyre\cyrv\cyrery\cyre\ % \cyrs\cyrl\cyro\cyrv\cyra} @@ -38,7 +39,7 @@ \def\masterproglabel{\masterprogname:} \def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ % \cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt} -\def\studentlabel{\studentname\ \groupname\ \@group\hspace{2cm}} +\def\studentlabel{\studentname\ \groupname\ \@group\hspace{1.5cm}} \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} -- cgit v1.2.3