summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/bibtex/bst/disser/gost705.bst101
-rw-r--r--Master/texmf-dist/bibtex/bst/disser/gost705s.bst101
-rw-r--r--Master/texmf-dist/doc/latex/disser/ChangeLog7
-rw-r--r--Master/texmf-dist/doc/latex/disser/Makefile4
-rw-r--r--Master/texmf-dist/doc/latex/disser/README56
-rw-r--r--Master/texmf-dist/doc/latex/disser/README.ru38
-rw-r--r--Master/texmf-dist/doc/latex/disser/manual.tex33
-rw-r--r--Master/texmf-dist/doc/latex/disser/nomake.cmd6
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/Makefile65
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex29
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib16
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex35
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex35
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex32
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex40
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/nomake.cmd2
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex1
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/Makefile18
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex1
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/concl.tex1
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/fig/Makefile1
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/fig/fig.eps490
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/fig/nomake.cmd1
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/intro.tex1
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd29
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib60
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex103
-rw-r--r--Master/texmf-dist/makeindex/disser/dtx.ist (renamed from Master/texmf-dist/makeindex/disser/disser.ist)0
-rw-r--r--Master/texmf-dist/source/latex/disser/autoref.dtx1
-rw-r--r--Master/texmf-dist/source/latex/disser/bachelor.dtx57
-rw-r--r--Master/texmf-dist/source/latex/disser/candidate.dtx61
-rw-r--r--Master/texmf-dist/source/latex/disser/custom.dtx7
-rw-r--r--Master/texmf-dist/source/latex/disser/disser.dtx47
-rw-r--r--Master/texmf-dist/source/latex/disser/disser.ins1
-rw-r--r--Master/texmf-dist/source/latex/disser/doctor.dtx35
-rw-r--r--Master/texmf-dist/source/latex/disser/gost705.dtx279
-rw-r--r--Master/texmf-dist/source/latex/disser/gost732.dtx7
-rw-r--r--Master/texmf-dist/source/latex/disser/master.dtx41
-rw-r--r--Master/texmf-dist/source/latex/disser/specialist.dtx153
-rw-r--r--Master/texmf-dist/source/latex/disser/titledefs.dtx5
-rw-r--r--Master/texmf-dist/source/latex/disser/toc.dtx7
-rw-r--r--Master/texmf-dist/tex/latex/disser/bachelor.rtx54
-rw-r--r--Master/texmf-dist/tex/latex/disser/candidate.rtx61
-rw-r--r--Master/texmf-dist/tex/latex/disser/disser.cls40
-rw-r--r--Master/texmf-dist/tex/latex/disser/doctor.rtx35
-rw-r--r--Master/texmf-dist/tex/latex/disser/gost732.cls2
-rw-r--r--Master/texmf-dist/tex/latex/disser/master.rtx41
-rw-r--r--Master/texmf-dist/tex/latex/disser/specialist.rtx114
-rw-r--r--Master/texmf-dist/tex/latex/disser/titledefs.rtx5
49 files changed, 1984 insertions, 375 deletions
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 <encoding>.csf <your_document>
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
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 <encoding>.csf <your_document>
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
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-<version>.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-<version>.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-<version>.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-<version>.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-<version>.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 <target1> <target2> ...
К сожалению, пакет \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 <tex-file>
В стилях \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.<type>}, факсимиле ученого секретаря диссертационного совета "--- в файле \file{./fig/sec-facsimile.<type>}.
Здесь \file{<type>} "--- один из типов графических файлов, поддерживаемых в \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 <stanislav.kruchinin@gmail.com>
-#
-
-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 <stanislav.kruchinin@gmail.com>
+#
+
+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 <stanislav.kruchinin@gmail.com>
+#
+
+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{<</EndOfBlock false F}!
+/X{/ASCII85Decode filter}!/@X{@ X}!/&2{2 index 2 index}!
+/@F{@ &2<<F}!/@C{@X &2 FX}!
+/$X{+ @X |}!/&4{4 index 4 index}!/$F{+ @ &4<<F |}!/$C{+ @X &4 FX |}!
+/IC{3 1 roll 10 dict begin 1{/ImageType/Interpolate/Decode/DataSource
+/ImageMatrix/BitsPerComponent/Height/Width}{exch def}forall
+currentdict end image}!
+/~{@ read {pop} if}!
+end def
+%%EndResource
+/pagesave null def
+%%EndProlog
+%%Page: 1 1
+%%BeginPageSetup
+GS_epswrite_2_0_1001 begin
+/pagesave save store 197 dict begin
+0.1 0.1 scale
+%%EndPageSetup
+gsave mark
+Q q
+0 0 250000 250000 re
+Y
+20 w
+4 M
+K
+2360 4631.09 626.66 0 S
+2360 3784.43 620 0 S
+255 G
+2503.71 3882.92 23.24 -86.02 23.24 86.02 -46.48 0 f
+2549.62 4534.78 -23.23 86.03 -23.24 -86.03 46.48 0 f
+10 w
+K
+2526.66 4550.5 0 -683.29 S
+2503.71 3882.92 23.24 -86.02 23.24 86.02 -46.48 0 f
+2549.62 4534.78 -23.23 86.03 -23.24 -86.03 46.48 0 f
+255 G
+2806.11 4621.76 0 -754.26 f
+2783.14 3883.11 23.23 -85.35 23.24 85.35 -46.48 0 f
+K
+2806.11 4621.76 0 -754.26 S
+2783.14 3883.11 23.23 -85.35 23.24 85.35 -46.48 0 f
+2947.11 4232 m
+-4 -7.01 -7.66 -14.05 -10.98 -21.13 c
+-3.32 -7.08 -6.26 -14.27 -8.82 -21.54 c
+-0.24 -3.36 -0.66 -6.75 -1.26 -10.15 c
+-0.6 -3.39 -1.34 -6.77 -2.22 -10.13 c
+-0.16 -0.64 -0.42 -1.68 -0.78 -3.12 c
+-0.36 -1.44 -0.82 -2.89 -1.38 -4.37 c
+-0.56 -1.48 -1.26 -2.79 -2.1 -3.96 c
+-0.84 -1.15 -1.79 -1.74 -2.82 -1.74 c
+-1.45 0 -2.31 0.7 -2.59 2.11 c
+-0.28 1.39 -0.32 2.96 -0.12 4.68 c
+0.21 1.72 0.52 3.32 0.96 4.8 c
+0.44 1.48 0.66 2.3 0.66 2.46 c
+0.88 3.36 1.82 6.7 2.82 10.02 c
+1 3.32 2.06 6.66 3.18 10.02 c
+0.32 3.84 0.3 7.55 -0.06 11.16 c
+-0.36 3.6 -1.1 7.08 -2.21 10.44 c
+-1.28 3.76 -3.76 6.51 -7.45 8.23 c
+-3.68 1.72 -7.92 2.58 -12.71 2.58 c
+-2.16 0 -4.31 -0.18 -6.43 -0.54 c
+-2.12 -0.36 -4.02 -0.9 -5.7 -1.62 c
+-1.68 -0.72 -3.12 -1.66 -4.32 -2.82 c
+-1.2 -1.16 -2 -2.54 -2.39 -4.14 c
+-0.24 -0.8 -0.8 -1.2 -1.68 -1.2 c
+-2.28 0 p
+-1.12 0 -1.68 0.52 -1.68 1.56 c
+0 0.48 p
+0.72 2.96 1.98 5.73 3.78 8.33 c
+1.8 2.59 3.92 4.86 6.36 6.81 c
+2.44 1.95 5.1 3.48 7.98 4.59 c
+2.88 1.11 5.84 1.67 8.89 1.67 c
+3.27 0 6.16 -0.64 8.64 -1.91 c
+2.48 -1.28 4.64 -2.93 6.48 -4.95 c
+1.84 -2.03 3.4 -4.34 4.68 -6.93 c
+1.28 -2.59 2.4 -5.21 3.36 -7.85 c
+0.56 -1.6 1.02 -3.21 1.38 -4.86 c
+0.36 -1.64 0.66 -3.3 0.9 -4.98 c
+4.24 10.08 9.12 19.93 14.64 29.57 c
+0.32 0.55 0.8 0.84 1.44 0.84 c
+2.4 0 p
+0.4 0 0.68 -0.04 0.84 -0.12 c
+0.56 -0.4 0.84 -0.88 0.84 -1.44 c
+0 -0.23 -0.08 -0.52 -0.24 -0.83 c
+f
+2947.67 4156.32 0 2.48 P
+0.69 0 1.44 0 2.24 0 c
+0.8 0 1.57 0.02 2.32 0.04 c
+0.75 0.03 1.46 0.08 2.12 0.16 c
+0.67 0.08 1.21 0.17 1.64 0.27 c
+0.54 0.11 0.95 0.39 1.24 0.84 c
+0.29 0.46 0.44 0.98 0.44 1.56 c
+0 42.5 p
+-1.54 -0.75 -3.21 -1.29 -5 -1.61 c
+-1.79 -0.32 -3.61 -0.48 -5.48 -0.48 c
+0 2.5 p
+2.72 0 5.36 0.37 7.92 1.11 c
+2.57 0.74 4.78 2.09 6.65 4.04 c
+0.97 0 p
+0.59 0 0.88 -0.29 0.88 -0.89 c
+0 -47.17 p
+0 -0.59 0.14 -1.11 0.44 -1.56 c
+0.29 -0.45 0.71 -0.73 1.24 -0.84 c
+0.43 -0.11 0.96 -0.2 1.61 -0.27 c
+0.64 -0.09 1.34 -0.14 2.12 -0.16 c
+0.77 -0.02 1.56 -0.04 2.36 -0.04 c
+0.8 0 1.54 0 2.24 0 c
+0 -2.48 p
+-8.64 0.32 -17.29 0.32 -25.94 0 c
+f
+3209.61 4414.5 m
+-4 -7 -7.67 -14.04 -10.98 -21.12 c
+-3.32 -7.08 -6.26 -14.26 -8.82 -21.54 c
+-0.23 -3.36 -0.66 -6.74 -1.26 -10.14 c
+-0.6 -3.4 -1.34 -6.78 -2.22 -10.14 c
+-0.16 -0.64 -0.42 -1.68 -0.78 -3.12 c
+-0.36 -1.43 -0.82 -2.9 -1.39 -4.38 c
+-0.55 -1.48 -1.25 -2.8 -2.09 -3.96 c
+-0.84 -1.16 -1.79 -1.74 -2.82 -1.74 c
+-1.45 0 -2.31 0.7 -2.59 2.1 c
+-0.27 1.4 -0.31 2.96 -0.12 4.68 c
+0.21 1.72 0.53 3.32 0.96 4.8 c
+0.45 1.48 0.66 2.29 0.66 2.46 c
+0.88 3.36 1.82 6.7 2.82 10.02 c
+1 3.32 2.06 6.66 3.18 10.02 c
+0.32 3.84 0.3 7.56 -0.06 11.16 c
+-0.36 3.6 -1.09 7.08 -2.21 10.44 c
+-1.28 3.76 -3.76 6.5 -7.45 8.22 c
+-3.68 1.72 -7.92 2.58 -12.71 2.58 c
+-2.16 0 -4.31 -0.18 -6.43 -0.54 c
+-2.12 -0.36 -4.02 -0.9 -5.7 -1.62 c
+-1.68 -0.72 -3.12 -1.66 -4.33 -2.82 c
+-1.2 -1.16 -2 -2.54 -2.39 -4.14 c
+-0.25 -0.8 -0.8 -1.2 -1.68 -1.2 c
+-2.29 0 p
+-1.12 0 -1.68 0.52 -1.68 1.56 c
+0 0.48 p
+0.72 2.96 1.97 5.73 3.78 8.32 c
+1.8 2.59 3.92 4.86 6.36 6.81 c
+2.44 1.95 5.1 3.48 7.98 4.59 c
+2.88 1.11 5.84 1.67 8.89 1.67 c
+3.27 0 6.16 -0.64 8.64 -1.91 c
+2.48 -1.27 4.63 -2.93 6.47 -4.95 c
+1.85 -2.04 3.4 -4.34 4.68 -6.93 c
+1.28 -2.6 2.4 -5.21 3.36 -7.86 c
+0.57 -1.6 1.02 -3.22 1.39 -4.86 c
+0.35 -1.64 0.65 -3.3 0.9 -4.98 c
+4.24 10.08 9.12 19.94 14.64 29.57 c
+0.32 0.55 0.8 0.84 1.44 0.84 c
+2.4 0 p
+0.4 0 0.68 -0.04 0.84 -0.12 c
+0.57 -0.4 0.84 -0.87 0.84 -1.43 c
+0 -0.25 -0.08 -0.52 -0.23 -0.84 c
+f
+3235.98 4328.81 m
+-0.59 -2.19 -0.81 -4.04 -0.64 -5.53 c
+0.16 -1.5 0.91 -2.24 2.23 -2.24 c
+0.65 0 1.23 0.27 1.77 0.8 c
+0.53 0.53 1.01 1.28 1.43 2.23 c
+0.42 0.96 0.83 2.08 1.2 3.36 c
+0.37 1.28 0.74 2.7 1.11 4.24 c
+0.12 0.48 0.43 0.72 0.97 0.72 c
+0.88 0 p
+0.54 0 0.74 -0.24 0.63 -0.72 c
+-0.31 -1.23 -0.66 -2.57 -1.04 -4 c
+-0.37 -1.45 -0.88 -2.78 -1.52 -4 c
+-0.63 -1.23 -1.43 -2.25 -2.36 -3.1 c
+-0.93 -0.84 -2.09 -1.26 -3.48 -1.26 c
+-1.86 0 -3.36 0.53 -4.47 1.6 c
+-1.12 1.06 -1.82 2.43 -2.09 4.07 c
+-1.22 -1.49 -2.68 -2.81 -4.39 -3.95 c
+-1.71 -1.15 -3.5 -1.72 -5.36 -1.72 c
+-1.97 0 -3.62 0.51 -4.96 1.52 c
+-1.33 1.02 -2.37 2.3 -3.12 3.86 c
+-0.91 1.88 -1.39 3.91 -1.45 6.11 c
+-0.05 2.2 0.21 4.42 0.8 6.67 c
+0.59 2.25 1.45 4.47 2.56 6.67 c
+1.13 2.2 2.59 4.23 4.41 6.11 c
+1.49 1.55 3.18 2.85 5.08 3.89 c
+1.89 1.05 3.8 1.57 5.72 1.57 c
+1.65 0 3 -0.46 4.03 -1.36 c
+1.05 -0.91 1.86 -2 2.44 -3.27 c
+4.48 17.79 p
+0.21 0.84 0.33 1.49 0.36 1.94 c
+0.02 0.45 -0.1 0.78 -0.36 0.99 c
+-0.32 0.26 -0.93 0.43 -1.84 0.51 c
+-0.91 0.08 -1.93 0.12 -3.04 0.12 c
+-0.59 0 -0.83 0.3 -0.72 0.9 c
+0.23 0.66 p
+0.11 0.49 0.46 0.79 1.04 0.9 c
+7.45 0.66 2.79 0.23 p
+0.26 0.06 0.46 -0.01 0.61 -0.2 c
+0.13 -0.19 0.16 -0.42 0.11 -0.68 c
+-11.51 -46.11 h
+3234.89 4347.82 m
+-0.09 0.51 -0.21 1.04 -0.36 1.57 c
+-0.43 1.29 -1.05 2.38 -1.87 3.27 c
+-0.83 0.89 -1.89 1.34 -3.16 1.34 c
+-1.17 0 -2.32 -0.43 -3.44 -1.3 c
+-1.12 -0.86 -2.14 -1.94 -3.05 -3.23 c
+-1.28 -1.83 -2.24 -3.75 -2.87 -5.74 c
+-0.64 -1.99 -1.23 -4.07 -1.77 -6.22 c
+-0.54 -2.11 -0.97 -4.16 -1.32 -6.18 c
+-0.35 -2.02 -0.33 -3.92 0.04 -5.7 c
+0.27 -1.29 0.73 -2.39 1.41 -3.28 c
+0.66 -0.89 1.61 -1.33 2.83 -1.33 c
+1.28 0 2.55 0.45 3.81 1.37 c
+1.25 0.92 2.4 2.02 3.48 3.32 c
+0.42 0.54 0.82 1.05 1.19 1.54 c
+0.38 0.48 0.72 1.02 1.05 1.61 c
+4.32 17.38 p
+-0.12 0.54 -0.2 1.06 -0.28 1.57 c
+f
+5.821 w
+10 M
+2 J
+8 i
+3040 4690 0 -117.65 S
+3132.49 4690 24.41 -58.83 S
+3156.9 4631.17 -24.41 -58.82 S
+1 i
+3111.7 4592.94 -45.72 0 0 2.47 P
+0 0.16 0.08 0.39 0.25 0.7 c
+18.68 19.89 p
+2.3 2.43 4.59 4.92 6.86 7.47 c
+2.27 2.55 4.32 5.14 6.13 7.76 c
+1.81 2.63 3.28 5.38 4.39 8.24 c
+1.12 2.86 1.67 5.86 1.67 9 c
+0 2.59 -0.35 5.04 -1.05 7.36 c
+-0.7 2.31 -1.73 4.36 -3.09 6.12 c
+-1.36 1.77 -3.05 3.18 -5.07 4.23 c
+-2.02 1.07 -4.39 1.59 -7.12 1.59 c
+-3.95 0 -7.46 -1.16 -10.5 -3.47 c
+-3.05 -2.32 -5.19 -5.23 -6.42 -8.77 c
+0.91 0.23 1.86 0.29 2.83 0.18 c
+1 -0.12 1.88 -0.43 2.66 -0.94 c
+0.78 -0.51 1.43 -1.2 1.97 -2.06 c
+0.53 -0.87 0.8 -1.89 0.8 -3.06 c
+0 -2.04 -0.68 -3.59 -2.04 -4.65 c
+-1.36 -1.06 -2.86 -1.59 -4.5 -1.59 c
+-1.57 0 -3.03 0.53 -4.39 1.59 c
+-1.35 1.05 -2.03 2.61 -2.03 4.65 c
+0 2.98 0.59 5.8 1.78 8.47 c
+1.19 2.66 2.81 4.98 4.86 6.94 c
+2.04 1.95 4.45 3.5 7.25 4.62 c
+2.78 1.12 5.73 1.68 8.85 1.68 c
+3.85 0 7.39 -0.57 10.63 -1.71 c
+3.24 -1.13 6 -2.74 8.3 -4.81 c
+2.29 -2.08 4.07 -4.51 5.34 -7.3 c
+1.27 -2.79 1.9 -5.82 1.9 -9.11 c
+0 -3.76 -0.86 -7.19 -2.59 -10.29 c
+-1.73 -3.1 -3.89 -5.98 -6.48 -8.64 c
+-2.59 -2.66 -5.34 -5.17 -8.26 -7.52 c
+-2.91 -2.35 -5.57 -4.63 -7.95 -6.82 c
+-14.18 -13.17 12.46 0 p
+1.8 0 3.9 0 6.28 0 c
+2.38 0 4.62 0.02 6.72 0.06 c
+2.1 0.04 3.91 0.12 5.43 0.23 c
+1.52 0.12 2.36 0.25 2.53 0.41 c
+0.32 0.31 0.63 0.88 0.92 1.71 c
+0.29 0.82 0.55 1.74 0.8 2.77 c
+0.25 1.02 0.47 2.08 0.68 3.17 c
+0.2 1.11 0.39 2.12 0.55 3.06 c
+3.37 0 -3.47 -20.48 p f
+8 i
+3488.31 4131.69 0 -117.66 S
+3580.8 4131.69 24.41 -58.83 S
+3605.21 4072.86 -24.41 -58.83 S
+1 i
+3562.3 4045.85 m
+-1.36 -2.82 -3.21 -5.25 -5.59 -7.3 c
+-2.54 -2.2 -5.38 -3.85 -8.55 -4.94 c
+-3.15 -1.1 -6.46 -1.65 -9.91 -1.65 c
+-3.12 0 -6.18 0.39 -9.19 1.16 c
+-3 0.78 -5.66 1.96 -8.01 3.55 c
+-2.34 1.58 -4.22 3.54 -5.61 5.85 c
+-1.41 2.32 -2.1 4.96 -2.1 7.94 c
+0 2.2 0.71 3.83 2.16 4.88 c
+1.43 1.06 2.98 1.59 4.62 1.59 c
+1.73 0 3.31 -0.53 4.75 -1.59 c
+1.43 -1.05 2.16 -2.69 2.16 -4.88 c
+0 -1.25 -0.24 -2.32 -0.74 -3.18 c
+-0.49 -0.87 -1.12 -1.57 -1.9 -2.12 c
+-0.78 -0.55 -1.67 -0.92 -2.65 -1.11 c
+-1 -0.2 -1.93 -0.21 -2.84 -0.06 c
+1.64 -2.83 4.23 -5.04 7.77 -6.65 c
+3.54 -1.61 7.4 -2.41 11.59 -2.41 c
+2.05 0 3.94 0.5 5.67 1.48 c
+1.72 1 3.16 2.32 4.32 3.98 c
+1.39 2.06 2.33 4.31 2.82 6.72 c
+0.49 2.42 0.73 4.9 0.73 7.44 c
+0 2.54 -0.24 5.02 -0.73 7.43 c
+-0.49 2.42 -1.43 4.66 -2.82 6.73 c
+-1.15 1.66 -2.6 3.01 -4.32 4.04 c
+-1.73 1.02 -3.62 1.54 -5.67 1.54 c
+-8.39 0 p
+-0.73 0 -1.1 0.34 -1.1 1.02 c
+0 0.34 p
+-0.09 0.3 0 0.56 0.24 0.8 c
+0.25 0.23 0.54 0.34 0.86 0.34 c
+1.15 0.16 2.3 0.23 3.46 0.23 c
+1.15 0 2.3 0.08 3.46 0.23 c
+2.13 0.16 4 0.8 5.61 1.94 c
+1.6 1.14 2.93 2.61 4 4.41 c
+1.07 1.8 1.88 3.86 2.4 6.17 c
+0.54 2.31 0.8 4.68 0.8 7.12 c
+0 1.81 -0.18 3.51 -0.55 5.12 c
+-0.37 1.61 -1.13 3.04 -2.29 4.29 c
+-2.21 2.52 -5.04 3.77 -8.49 3.77 c
+-3.61 0 -6.92 -0.66 -9.91 -2 c
+-3.01 -1.33 -5.25 -3.14 -6.72 -5.41 c
+1.72 0.39 3.43 0.08 5.12 -0.95 c
+1.68 -1.02 2.52 -2.66 2.52 -4.93 c
+0 -1.96 -0.64 -3.44 -1.95 -4.41 c
+-1.31 -0.99 -2.73 -1.48 -4.3 -1.48 c
+-1.54 0 -2.98 0.49 -4.29 1.48 c
+-1.3 0.98 -1.96 2.45 -1.96 4.41 c
+0 2.51 0.62 4.76 1.85 6.77 c
+1.23 2 2.84 3.7 4.85 5.12 c
+2.01 1.41 4.3 2.5 6.88 3.24 c
+2.58 0.76 5.22 1.13 7.93 1.13 c
+2.86 0 5.64 -0.37 8.35 -1.12 c
+2.7 -0.75 5.19 -1.91 7.49 -3.47 c
+1.96 -1.34 3.61 -2.99 4.91 -4.95 c
+1.31 -1.96 1.96 -4.16 1.96 -6.59 c
+0 -2.51 -0.45 -4.86 -1.35 -7.06 c
+-0.9 -2.2 -2.1 -4.2 -3.61 -6.01 c
+-1.52 -1.8 -3.32 -3.38 -5.41 -4.71 c
+-2.09 -1.34 -4.36 -2.39 -6.82 -3.18 c
+2.38 -0.4 4.66 -1.06 6.82 -2.01 c
+2.18 -0.94 4.2 -2.19 6.09 -3.76 c
+2.37 -1.96 4.23 -4.3 5.59 -7 c
+1.36 -2.71 2.03 -5.56 2.03 -8.54 c
+0 -3.07 -0.67 -6.01 -2.03 -8.83 c
+f
+8 i
+3040 3836.67 0 -117.66 S
+3132.49 3836.67 24.41 -58.83 S
+3156.9 3777.84 -24.41 -58.83 S
+1 i
+3071.72 3739.66 0 3.64 P
+1.06 0 2.22 0 3.45 0 c
+1.23 0 2.42 0.02 3.57 0.06 c
+1.16 0.04 2.24 0.12 3.27 0.23 c
+1.03 0.12 1.87 0.25 2.53 0.41 c
+0.82 0.16 1.45 0.57 1.9 1.24 c
+0.45 0.66 0.68 1.43 0.68 2.29 c
+0 62.53 p
+-2.38 -1.11 -4.95 -1.91 -7.7 -2.4 c
+-2.75 -0.47 -5.58 -0.71 -8.45 -0.71 c
+0 3.59 p
+4.19 0 8.26 0.55 12.2 1.65 c
+3.93 1.1 7.34 3.1 10.2 6 c
+1.47 0 p
+0.9 0 1.35 -0.43 1.35 -1.29 c
+0 -69.36 p
+0 -0.87 0.23 -1.63 0.67 -2.29 c
+0.45 -0.68 1.09 -1.09 1.91 -1.24 c
+0.66 -0.16 1.48 -0.29 2.46 -0.41 c
+0.99 -0.12 2.08 -0.2 3.27 -0.23 c
+1.19 -0.04 2.4 -0.06 3.63 -0.06 c
+1.23 0 2.38 0 3.46 0 c
+0 -3.64 p
+-13.3 0.47 -26.59 0.47 -39.88 0 c
+f
+255 G
+3210.16 4148.94 87.98 -69.68 -41.36 104.34 -46.62 -34.66 f
+10 w
+4 M
+0 J
+K
+2887.5 4631.09 357.5 -480.95 S
+3210.16 4148.94 87.98 -69.68 -41.36 104.34 -46.62 -34.66 f
+1 J
+1 j
+3150 4076.09 60 0 S
+3262.5 4076.09 60 0 S
+3375 4076.09 60 0 S
+2470.47 4203 m
+-0.16 -0.72 -0.6 -1.16 -1.32 -1.32 c
+-1.32 0 p
+-0.72 0 -1.08 0.36 -1.08 1.09 c
+0.64 3.91 0.8 7.66 0.48 11.22 c
+-0.32 3.55 -1.18 6.7 -2.58 9.41 c
+-1.4 2.73 -3.3 4.9 -5.7 6.54 c
+-2.4 1.64 -5.32 2.46 -8.76 2.46 c
+-4.16 0 -8.32 -1.05 -12.48 -3.12 c
+-4.16 -2.09 -7.92 -4.85 -11.28 -8.29 c
+-3.93 -4.09 -6.98 -8.59 -9.19 -13.52 c
+-2.2 -4.93 -3.94 -9.95 -5.22 -15.08 c
+-1.36 -5.2 -2.14 -10.25 -2.34 -15.15 c
+-0.2 -4.88 0.66 -9.36 2.58 -13.46 c
+1.68 -3.52 4.12 -6.33 7.32 -8.41 c
+3.2 -2.08 6.96 -3.12 11.28 -3.12 c
+2.32 0 4.63 0.32 6.91 0.95 c
+2.28 0.65 4.36 1.55 6.24 2.75 c
+1.88 1.18 3.5 2.62 4.86 4.29 c
+1.36 1.66 2.28 3.48 2.76 5.46 c
+2.52 10.24 p
+0.48 1.9 0.29 3.05 -0.59 3.46 c
+-0.88 0.39 -2.36 0.63 -4.45 0.71 c
+-2.08 0.08 -4.2 0.12 -6.36 0.12 c
+-0.4 0 -0.7 0.13 -0.9 0.38 c
+-0.21 0.25 -0.22 0.6 -0.06 1.04 c
+0.24 1.15 p
+0.08 0.43 0.28 0.77 0.6 1.02 c
+0.32 0.24 0.68 0.37 1.08 0.37 c
+5.6 -0.25 11.32 -0.36 17.16 -0.36 c
+3.76 0 7.53 0.12 11.29 0.36 c
+0.4 0 0.7 -0.13 0.9 -0.37 c
+0.2 -0.25 0.22 -0.59 0.06 -1.02 c
+-0.24 -1.15 p
+-0.16 -0.95 -0.72 -1.42 -1.68 -1.42 c
+-1.36 0 -2.54 -0.04 -3.54 -0.12 c
+-1 -0.09 -1.75 -0.29 -2.22 -0.59 c
+-0.48 -0.25 -1 -1.43 -1.56 -3.57 c
+-6 -23.47 p
+0 -0.23 -0.16 -0.52 -0.48 -0.83 c
+-0.24 -0.24 -0.56 -0.36 -0.96 -0.36 c
+-0.32 0 -0.57 0.13 -0.72 0.36 c
+-0.88 1.04 -1.68 2.12 -2.4 3.27 c
+-0.72 1.15 -1.28 2.4 -1.68 3.76 c
+-2.64 -3.27 -6.12 -5.74 -10.44 -7.45 c
+-4.32 -1.71 -8.64 -2.56 -12.96 -2.56 c
+-5.28 0 -9.98 1.14 -14.1 3.42 c
+-4.12 2.28 -7.46 5.42 -10.02 9.43 c
+-2.63 4.32 -4.21 9.11 -4.73 14.39 c
+-0.52 5.27 -0.1 10.76 1.26 16.43 c
+1.43 5.68 3.76 11.16 6.96 16.44 c
+3.2 5.28 7.2 10.08 12 14.4 c
+4.48 3.92 9.36 7.04 14.64 9.36 c
+5.28 2.32 10.56 3.48 15.84 3.48 c
+4.16 0 7.7 -0.94 10.62 -2.82 c
+2.92 -1.87 5.22 -4.37 6.9 -7.5 c
+8.52 9.72 p
+0.24 0.4 0.6 0.6 1.08 0.6 c
+0.48 0 p
+0.71 0 1 -0.39 0.84 -1.16 c
+-8.04 -31.84 p f
+cleartomark end end pagesave restore
+ showpage
+%%PageTrailer
+%%Trailer
+%%Pages: 1
diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/nomake.cmd
new file mode 100644
index 00000000000..d5b89784882
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/fig/nomake.cmd
@@ -0,0 +1 @@
+@call ..\..\..\include\latex.fig.nmk.cmd %* \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/intro.tex b/Master/texmf-dist/doc/latex/disser/templates/specialist/intro.tex
new file mode 100644
index 00000000000..8b7194aafe7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/intro.tex
@@ -0,0 +1 @@
+\intro
diff --git a/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd
new file mode 100644
index 00000000000..d3bc974cf93
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/disser/templates/specialist/nomake.cmd
@@ -0,0 +1,29 @@
+@echo off
+
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+
+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/dtx.ist
index 850e35ce921..850e35ce921 100644
--- a/Master/texmf-dist/makeindex/disser/disser.ist
+++ b/Master/texmf-dist/makeindex/disser/dtx.ist
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 <encoding>.csf <your_document>
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%
+% 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 <encoding>.csf <your_document>
+%
+% Copyright (C) 2004-2010 by
+% Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+%
+% 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
+%</ignore>
+%<*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 <encoding>.csf <your_document>
+
+Copyright (C) 2004-2010 by
+ Stanislav Kruchinin <stanislav.kruchinin at gmail.com>
+
+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
+%</install>
+%<*ignore>
+\fi
+%</ignore>
%<*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 @@
%</driver>
% \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}
@@ -1482,19 +1628,6 @@ FUNCTION {output.url}
}
% \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}
FUNCTION {format.isbn}
@@ -1522,6 +1655,30 @@ FUNCTION {add.doi}
}
% \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}
% \begin{macrocode}
@@ -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}
+
+%<specialist>\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
+%</specialist>
+% \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}