texlive[43400] Master/texmf-dist: disser (5mar17)
commits+karl at tug.org
commits+karl at tug.org
Sun Mar 5 22:37:27 CET 2017
Revision: 43400
http://tug.org/svn/texlive?view=revision&revision=43400
Author: karl
Date: 2017-03-05 22:37:27 +0100 (Sun, 05 Mar 2017)
Log Message:
-----------
disser (5mar17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/disser/ChangeLog
trunk/Master/texmf-dist/doc/latex/disser/Makefile
trunk/Master/texmf-dist/doc/latex/disser/include/latex.mk
trunk/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
trunk/Master/texmf-dist/doc/latex/disser/manual.tex
trunk/Master/texmf-dist/doc/latex/disser/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/master/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex
trunk/Master/texmf-dist/source/latex/disser/chapter.dtx
trunk/Master/texmf-dist/source/latex/disser/custom.dtx
trunk/Master/texmf-dist/source/latex/disser/disser.dtx
trunk/Master/texmf-dist/source/latex/disser/disser.ins
trunk/Master/texmf-dist/source/latex/disser/gost732.dtx
trunk/Master/texmf-dist/source/latex/disser/titledefs.dtx
trunk/Master/texmf-dist/tex/latex/disser/disser.cls
trunk/Master/texmf-dist/tex/latex/disser/gost732.cls
trunk/Master/texmf-dist/tex/latex/disser/titledefs.rtx
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/disser/README-ru.md
trunk/Master/texmf-dist/doc/latex/disser/README.md
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/master/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/a.tex
Removed Paths:
-------------
trunk/Master/texmf-dist/bibtex/bst/disser/
trunk/Master/texmf-dist/bibtex/csf/disser/
trunk/Master/texmf-dist/doc/latex/disser/README
trunk/Master/texmf-dist/doc/latex/disser/README.ru
trunk/Master/texmf-dist/doc/latex/disser/cp1251.csf
trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/defs.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/defs.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex
trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex
trunk/Master/texmf-dist/source/latex/disser/gost705.dtx
Modified: trunk/Master/texmf-dist/doc/latex/disser/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/ChangeLog 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/ChangeLog 2017-03-05 21:37:27 UTC (rev 43400)
@@ -2,6 +2,25 @@
Copyright (C) Stanislav Kruchinin
-------------------------------------------
+Summary of changes in version 1.5.0 (2017-03-03):
+
+Classes and styles:
++ Add compatibility with nomencl package.
+- Remove gost705 from package.
+- Remove obsolete class options: noams, times, mtpro.
+
+Templates:
++ Use AMS packages by default.
++ Packages for Times font (disabled by default).
++ Automated generation of nomenclature with nomencl package.
+* Use gost2008 bibliography style instead of gost705.
+* Update bibliography examples.
+
+Makefiles:
++ Add compatibility with nomencl package.
+- Remove installation of gost705 and csf-files.
+
+
Summary of changes in version 1.4.0 (2016-07-03):
Classes and styles:
Modified: trunk/Master/texmf-dist/doc/latex/disser/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/Makefile 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/Makefile 2017-03-05 21:37:27 UTC (rev 43400)
@@ -4,14 +4,11 @@
#
TARGET := disser
-BST := gost705
-MAINDTX := $(TARGET) $(BST) gost732
+DTXFILES := $(TARGET) gost732
MANUAL := manual
CLSFILES := *.cls *.rtx
-BSTFILES := gost705.bst gost705s.bst
-CSFFILES := *.csf
-DOCFILES := $(addsuffix .pdf, $(MAINDTX) $(MANUAL))
+DOCFILES := $(addsuffix .pdf, $(DTXFILES) $(MANUAL))
TEXTFILES := ../README ../README.ru ../ChangeLog
SRCFILES := *.dtx $(TARGET).ins dtx.ist $(MANUAL).tex Makefile \
nomake.cmd
@@ -20,8 +17,6 @@
DESTDIR ?= $(TEXMF)
CLSDIR ?= $(DESTDIR)/tex/latex/$(TARGET)
DOCDIR ?= $(DESTDIR)/doc/latex/$(TARGET)
-BSTDIR ?= $(DESTDIR)/bibtex/bst/$(TARGET)
-CSFDIR ?= $(DESTDIR)/bibtex/csf/$(TARGET)
SRCDIR ?= $(DESTDIR)/source/latex/$(TARGET)
CLEXT ?= *.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \
@@ -36,6 +31,7 @@
PDFLATEXFLAGS ?= --shell-escape --synctex=1
MIFLAGS ?= -r -s dtx.ist
+.PHONY: all package doc dvi pdf clean install uninstall reinstall help
all: package doc
@@ -43,7 +39,7 @@
doc: pdf
-dvi: $(addsuffix .dvi, $(MAINDTX) $(MANUAL))
+dvi: $(addsuffix .dvi, $(DTXFILES) $(MANUAL))
pdf: $(DOCFILES)
@@ -57,8 +53,6 @@
mkdir -p $(DOCDIR) ;\
mkdir -p $(SRCDIR) ;\
cp $(CLSFILES) $(CLSDIR) ;\
- cp $(BSTFILES) $(BSTDIR) ;\
- cp $(CSFFILES) $(CSFDIR) ;\
cp $(DOCFILES) $(DOCDIR) ;\
cp $(TEXTFILES) $(DOCDIR) ;\
cp $(SRCFILES) $(SRCDIR)
@@ -65,14 +59,10 @@
uninstall:
-rm $(addprefix $(CLSDIR)/, $(CLSFILES))
- -rm $(addprefix $(BSTDIR)/, $(BSTFILES))
- -rm $(addprefix $(CSFDIR)/, $(CSFFILES))
-rm $(addprefix $(DOCDIR)/, $(DOCFILES))
-rm $(addprefix $(DOCDIR)/, $(notdir $(TEXTFILES)))
-rm $(addprefix $(SRCDIR)/, $(SRCFILES))
-rmdir $(CLSDIR)
- -rmdir $(BSTDIR)
- -rmdir $(CSFDIR)
-rmdir $(DOCDIR)
-rmdir $(SRCDIR)
@@ -90,18 +80,6 @@
$(PDFLATEX) $(PDFLATEXFLAGS) $<
$(PDFLATEX) $(PDFLATEXFLAGS) $<
-$(BST).dvi: $(BST).dtx
- $(LATEX) $(LATEXFLAGS) $<
- $(MI) $(MIFLAGS) $(BST)
- $(LATEX) $(LATEXFLAGS) $<
- $(LATEX) $(LATEXFLAGS) $<
-
-$(BST).pdf: $(BST).dtx
- $(PDFLATEX) $(PDFLATEXFLAGS) $<
- $(MI) $(MIFLAGS) $(BST)
- $(PDFLATEX) $(PDFLATEXFLAGS) $<
- $(PDFLATEX) $(PDFLATEXFLAGS) $<
-
%.cls: %.ins
$(LATEX) $^
Deleted: trunk/Master/texmf-dist/doc/latex/disser/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/README 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/README 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,115 +0,0 @@
-1. Introduction
----------------
-
-This package provides LaTeX classes, bibliography styles and document
-templates for typesetting dissertations and author's abstracts that satisfy
-the requirements of dissertation councils and High Certification Commission of
-Russian Federation.
-
-
-2. Required packages and programs
----------------------------------
-For installation from sources and compilation of the documents you will need
-the following third-party packages:
-amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions, natbib,
-hyperref, hypernat, subcaption, wrapfig, and packages for russian language support
-in LaTeX.
-
-For typesetting documents using Times font family you should install the
-following packages: pscyr or cyrtimes (text fonts), txfonts or mtpro (math
-fonts).
-
-For automated processing of figures you should install the following programs:
-Ghostscript, epstool and sam2p.
-
-
-3. Downloads and updates
-------------------------
-Package 'disser' is available on CTAN:
- http://www.ctan.org/tex-archive/macros/latex/contrib/disser/
-
-Project page at Sourceforge:
- http://sourceforge.net/projects/disser/
-
-ZIP file with sources can be downloaded from
- http://www.ctan.org/get/macros/latex/contrib/disser.zip
-
-ZIP file with compiled sources and documentation sorted in a TDS (TeX
-Directory Structure) tree is available on Sourceforge (see
-disser-<version>.tds.zip file in Downloads section):
- http://sourceforge.net/projects/disser/
-
-Public source code repositories of this project:
- http://bitbucket.org/sky/disser/
- http://disser.hg.sourceforge.net/hgweb/disser/
-
-The latest revision of package source code can be obtained by downloading
-autogenerated archive from one of these mirrors:
- http://bitbucket.org/sky/disser/get/tip.zip
-
-
-4. Installation
----------------
-
-4.1. Installation from ZIP archive in TDS format
-
-This is the easiest and recommended way to install the package. The ZIP file
-disser-<version>.tds.zip contains files sorted in a TDS tree, so you can
-directly unpack this file to directory with your TeX installation.
-
-Example:
- cd /path/to/texmf
- unzip /download/path/disser-<version>.tds.zip
- mktexlsr
-
-4.2. Installation from sources
-
-Enter the following commands in the command prompt
-
-in a Unix-like environment:
- env DESTDIR=/path/to/texmf make install
-
-in Windows command line prompt:
- set DESTDIR=disk:\path\to\texmf
- nomake install
-
-Here /path/to/texmf and disk:\path\to\texmf are paths to your local 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.9"
-or
- mktexlsr --admin
-
-if you install the package to one of the common directories, like
-"%programfiles%\MiKTeX 2.9" or "%ALLUSERSPROFILE%\MiKTeX\2.9".
-
-Examples of commands for MiKTeX 2.9.
-
-Installation for all users:
- set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9
- nomake install
- mktexlsr --admin
-
-Installation for current user only:
- set DESTDIR=%APPDATA%\MiKTeX\2.9
- nomake install
- mktexlsr
-
-5. License
-----------
-
-Copyright (c) Stanislav Kruchinin
-
-It may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
-of this license or (at your option) any later version.
-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 2003/12/01 or later.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
\ No newline at end of file
Added: trunk/Master/texmf-dist/doc/latex/disser/README-ru.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/README-ru.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/README-ru.md 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1,97 @@
+# 1. \xC2\xE2\xE5\xE4\xE5\xED\xE8\xE5
+
+\xCF\xE0\xEA\xE5\xF2 disser \xEF\xF0\xE5\xE4\xED\xE0\xE7\xED\xE0\xF7\xE5\xED \xE4\xEB\xFF \xE2\xE5\xF0\xF1\xF2\xEA\xE8 \xE4\xE8\xEF\xEB\xEE\xEC\xEE\xE2, \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE9 \xE8 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xEE\xE2
+\xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF\xEC\xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xEE\xED\xED\xFB\xF5 \xF1\xEE\xE2\xE5\xF2\xEE\xE2 \xE8 \xC2\xC0\xCA \xD0\xD4.
+
+# 2. \xD0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xEC\xFB\xE5 \xEF\xE0\xEA\xE5\xF2\xFB \xE8 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xFB
+
+\xC4\xEB\xFF \xEA\xEE\xF0\xF0\xE5\xEA\xF2\xED\xEE\xE9 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xE2 \xE2\xE0\xF8\xE5\xEC \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE5 LaTeX \xE4\xEE\xEB\xE6\xED\xFB \xE1\xFB\xF2\xFC
+\xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xFB \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xFB:
+amsfonts, amsmath, amssymb, caption, cmap, gost, graphicx, ifpdf, kvoptions,
+natbib, hyperref, subcaption, wrapfig, \xE0 \xF2\xE0\xEA\xE6\xE5 \xEF\xE0\xEA\xE5\xF2\xFB \xE4\xEB\xFF \xEF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE8
+\xF0\xF3\xF1\xF1\xEA\xEE\xE3\xEE \xFF\xE7\xFB\xEA\xE0 \xE8 \xF8\xF0\xE8\xF4\xF2\xEE\xE2.
+
+\xC4\xEB\xFF \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xFF \xF8\xF0\xE8\xF4\xF2\xE0 Times \xE2 \xF2\xE5\xEA\xF1\xF2\xEE\xE2\xEE\xEC \xF0\xE5\xE6\xE8\xEC\xE5 \xF1\xEB\xE5\xE4\xF3\xE5\xF2 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC
+\xEF\xE0\xEA\xE5\xF2 tempora \xE8\xEB\xE8 cyrtimes, \xE2 \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xEE\xEC \xF0\xE5\xE6\xE8\xEC\xE5 --- newtxmath \xE8\xEB\xE8 mtpro.
+
+\xC4\xEB\xFF \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xEE\xE9 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2 \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xF1\xEA\xF0\xE8\xEF\xF2\xEE\xE2 Makefile \xE8
+nomake.cmd \xF1\xEB\xE5\xE4\xF3\xE5\xF2 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xFB Ghostscript, epstool \xE8 sam2p.
+
+# 3. \xCF\xEE\xEB\xF3\xF7\xE5\xED\xE8\xE5 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xE9 \xE2\xE5\xF0\xF1\xE8\xE8
+
+- \xCF\xE0\xEA\xE5\xF2 disser \xE4\xEE\xF1\xF2\xF3\xEF\xE5\xED \xED\xE0 CTAN: http://www.ctan.org/tex-archive/macros/latex/contrib/disser/
+- \xD1\xF2\xF0\xE0\xED\xE8\xF6\xE0 \xEF\xF0\xEE\xE5\xEA\xF2\xE0 \xED\xE0 Sourceforge: http://sourceforge.net/projects/disser/
+- \xCF\xF3\xE1\xEB\xE8\xF7\xED\xFB\xE5 \xF0\xE5\xEF\xEE\xE7\xE8\xF2\xEE\xF0\xE8\xE8 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xF5 \xF2\xE5\xEA\xF1\xF2\xEE\xE2 \xEF\xF0\xEE\xE5\xEA\xF2\xE0:
+ - https://github.org/polariton/disser/
+ - https://bitbucket.org/sky/disser/
+ - https://sourceforge.net/p/disser/disser.git
+
+ZIP-\xE0\xF0\xF5\xE8\xE2 \xF1 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xEC\xE8 \xF2\xE5\xEA\xF1\xF2\xE0\xEC\xE8: http://www.ctan.org/get/macros/latex/contrib/disser.zip
+ZIP-\xE0\xF0\xF5\xE8\xE2 \xF1 \xE3\xEE\xF2\xEE\xE2\xFB\xEC\xE8 \xF4\xE0\xE9\xEB\xE0\xEC\xE8 \xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xE8\xE5\xE9, \xEA\xEE\xF2\xEE\xF0\xFB\xE5 \xF0\xE0\xE7\xEC\xE5\xF9\xE5\xED\xFB \xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1\xEE \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xEE\xE9 \xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xEE\xE9 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xEE\xE2 TeX (\xF1\xEC. disser-<version>.tds.zip \xE2 \xF0\xE0\xE7\xE4\xE5\xEB\xE5 Download).
+
+# 4. \xD3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE0
+## 4.1. \xC8\xE7 ZIP-\xE0\xF0\xF5\xE8\xE2\xE0 \xF1\xEE \xF1\xEA\xEE\xEC\xEF\xE8\xEB\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xEC\xE8 \xF4\xE0\xE9\xEB\xE0\xEC\xE8
+
+\xDD\xF2\xEE\xF2 \xF1\xEF\xEE\xF1\xEE\xE1 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xED\xE0\xE8\xE1\xEE\xEB\xE5\xE5 \xEF\xF0\xEE\xF1\xF2 \xE8 \xFF\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xF0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xEC\xFB\xEC.
+\xD4\xE0\xE9\xEB disser-<version>.tds.zip \xF1\xEE\xE4\xE5\xF0\xE6\xE8\xF2 \xF1\xEE\xE1\xF0\xE0\xED\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xEA\xEB\xE0\xF1\xF1\xEE\xE2 \xE8
+\xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xE8\xE8, \xEF\xEE\xFD\xF2\xEE\xEC\xF3 \xE5\xE3\xEE \xEC\xEE\xE6\xED\xEE \xEF\xF0\xEE\xF1\xF2\xEE \xF0\xE0\xF1\xEF\xE0\xEA\xEE\xE2\xE0\xF2\xFC \xE2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3 TeX.
+
+\xCF\xF0\xE8\xEC\xE5\xF0 \xE4\xEB\xFF Unix-\xEF\xEE\xE4\xEE\xE1\xED\xFB\xF5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xE9:
+```sh
+$ cd /\xEF\xF3\xF2\xFC/\xEA/texmf
+$ unzip /\xEF\xF3\xF2\xFC/\xEA/\xF4\xE0\xE9\xEB\xF3/disser-<version>.tds.zip
+$ mktexlsr
+```
+
+\xCF\xF0\xE8\xEC\xE5\xF0 \xE4\xEB\xFF Windows:
+```sh
+$ cd \xE4\xE8\xF1\xEA:\\xEF\xF3\xF2\xFC\\xEA\texmf
+$ unzip \xE4\xE8\xF1\xEA:\\xEF\xF3\xF2\xFC\\xEA\\xF4\xE0\xE9\xEB\xF3\disser-<version>.tds.zip
+$ mktexlsr
+```
+
+## 4.2. \xC8\xE7 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xF5 \xF2\xE5\xEA\xF1\xF2\xEE\xE2
+
+\xC4\xEB\xFF \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xEF\xE5\xF0\xE5\xE9\xF2\xE8 \xE2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3 \xF1 \xF0\xE0\xF1\xEF\xE0\xEA\xEE\xE2\xE0\xED\xED\xFB\xEC\xE8 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xEC\xE8
+\xF2\xE5\xEA\xF1\xF2\xE0\xEC\xE8 \xE8 \xE2\xFB\xEF\xEE\xEB\xED\xE8\xF2\xFC \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE5 \xEA\xEE\xEC\xE0\xED\xE4\xFB
+
+- \xE2 Unix-\xEF\xEE\xE4\xEE\xE1\xED\xFB\xF5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF\xF5:
+```sh
+$ env DESTDIR=/\xEF\xF3\xF2\xFC/\xEA/texmf make install
+```
+
+- \xE2 Windows:
+```sh
+$ set DESTDIR=\xE4\xE8\xF1\xEA:\\xEF\xF3\xF2\xFC\\xEA\texmf
+$ nomake install
+```
+
+\xC7\xE4\xE5\xF1\xFC /\xEF\xF3\xF2\xFC/\xEA/texmf \xE8 \xE4\xE8\xF1\xEA:\\xEF\xF3\xF2\xFC\\xEA\texmf -- \xEF\xF3\xF2\xE8 \xEA \xE4\xE5\xF0\xE5\xE2\xF3 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xEE\xE2 TeX.
+\xCF\xEE\xF1\xEB\xE5 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xF1\xEB\xE5\xE4\xF3\xE5\xF2 \xEE\xE1\xED\xEE\xE2\xE8\xF2\xFC \xE1\xE0\xE7\xF3 \xE8\xEC\xE5\xED \xF4\xE0\xE9\xEB\xEE\xE2 \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xEA\xEE\xEC\xE0\xED\xE4\xFB
+```sh
+$ mktexlsr
+```
+
+\xCF\xF0\xE8\xEC\xE5\xF0\xFB \xEA\xEE\xEC\xE0\xED\xE4 \xE4\xEB\xFF \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 MiKTeX \xE2\xE5\xF0\xF1\xE8\xE8 2.9 \xE8 Windows 7.
+
+- \xD3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE0 \xE4\xEB\xFF \xE2\xF1\xE5\xF5 \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xE5\xE9:
+```sh
+$ set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9
+$ nomake install
+$ mktexlsr --admin
+```
+
+- \xD3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE0 \xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF2\xE5\xEA\xF3\xF9\xE5\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF:
+```sh
+$ set DESTDIR=%APPDATA%\MiKTeX\2.9
+$ nomake install
+$ mktexlsr
+```
+
+# 5. \xCB\xE8\xF6\xE5\xED\xE7\xE8\xFF
+
+\xD6\xEE\xEF\xFB\xF0\xE8\xE3\xF5\xF2 (\xF6) \xD1\xF2\xE0\xED\xE8\xF1\xEB\xE0\xE2 \xCA\xF0\xF3\xF7\xE8\xED\xE8\xED
+
+\xC8\xF2 \xEC\xE0\xFB \xE1\xE5 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE5\xE4 \xE0\xED\xE4/\xEE\xF0 \xEC\xEE\xE4\xE8\xF4\xE8\xE5\xE4 \xF3\xED\xE4\xE5\xF0 \xF2\xF5\xE5 \xF6\xEE\xED\xE4\xE8\xF2\xE8\xEE\xED\xF1 \xEE\xF4 \xF2\xF5\xE5 \xCB\xE0\xD2\xE5\xD5 \xCF\xF0\xEE\xE9\xE5\xF6\xF2 \xCF\xF3\xE1\xEB\xE8\xF6 \xCB\xE8\xF6\xE5\xED\xF1\xE5, \xE5\xE8\xF2\xF5\xE5\xF0 \xE2\xE5\xF0\xF1\xE8\xEE\xED 1.3 \xEE\xF4 \xF2\xF5\xE8\xF1 \xEB\xE8\xF6\xE5\xED\xF1\xE5 \xEE\xF0 (\xE0\xF2 \xB8\xF3\xF0 \xEE\xEF\xF2\xE8\xEE\xED) \xE0\xED\xFB \xEB\xE0\xF2\xE5\xF0 \xE2\xE5\xF0\xF1\xE8\xEE\xED. \xD2\xF5\xE5 \xEB\xE0\xF2\xE5\xF1\xF2 \xE2\xE5\xF0\xF1\xE8\xEE\xED \xEE\xF4 \xF2\xF5\xE8\xF1 \xEB\xE8\xF6\xE5\xED\xF1\xE5 \xE8\xF1 \xE8\xED \xF5\xF2\xF2\xEF://\xE2\xE2\xE2.\xEB\xE0\xF2\xE5\xF5-\xEF\xF0\xEE\xE9\xE5\xF6\xF2.\xEE\xF0\xE3/\xEB\xEF\xEF\xEB.\xF2\xF5\xF2 \xE0\xED\xE4 \xE2\xE5\xF0\xF1\xE8\xEE\xED 1.3 \xEE\xF0 \xEB\xE0\xF2\xE5\xF0 \xE8\xF1 \xEF\xE0\xF0\xF2 \xEE\xF4 \xE0\xEB\xEB \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xEE\xED\xF1 \xEE\xF4 \xCB\xE0\xD2\xE5\xD5 \xE2\xE5\xF0\xF1\xE8\xEE\xED 2003/12/01 \xEE\xF0 \xEB\xE0\xF2\xE5\xF0.
+
+\xD2\xF5\xE8\xF1 \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xE8\xF1 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE5\xE4 \xE8\xED \xF2\xF5\xE5 \xF5\xEE\xEF\xE5 \xF2\xF5\xE0\xF2 \xE8\xF2 \xE2\xE8\xEB\xEB \xE1\xE5 \xF3\xF1\xE5\xF4\xF3\xEB, \xE1\xF3\xF2 \xC2\xC8\xD2\xD5\xCE\xD3\xD2 \xC0\xCD\xDB \xC2\xC0\xD0\xD0\xC0\xCD\xD2\xDB; \xE2\xE8\xF2\xF5\xEE\xF3\xF2 \xE5\xE2\xE5\xED \xF2\xF5\xE5 \xE8\xEC\xEF\xEB\xE8\xE5\xE4 \xE2\xE0\xF0\xF0\xE0\xED\xF2\xFB \xEE\xF4 \xCC\xC5\xD0\xD7\xC0\xCD\xD2\xC0\xC1\xC8\xCB\xC8\xD2\xDB \xEE\xF0 \xD4\xC8\xD2\xCD\xC5\xD1\xD1 \xD4\xCE\xD0 \xC0 \xCF\xC0\xD0\xD2\xC8\xD6\xD3\xCB\xC0\xD0 \xCF\xD3\xD0\xCF\xCE\xD1\xC5.
Added: trunk/Master/texmf-dist/doc/latex/disser/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/README.md 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1,79 @@
+# 1. Introduction
+
+This package provides LaTeX classes, bibliography styles and document templates for typesetting dissertations and author's abstracts that satisfy the requirements of dissertation councils and High Certification Commission of Russian Federation.
+
+# 2. Required packages and programs
+
+For installation from sources and compilation of the documents you will need the following third-party packages: `amsfonts`, `amsmath`, `amssymb`, `caption`, `cmap`, `graphicx`, `ifpdf`, `natbib`, `hyperref`, `hypernat`, `subcaption`, `wrapfig`, and packages for russian language support in LaTeX.
+
+For typesetting documents using Times font family you should install the following packages: `pscyr` or `cyrtimes` (text fonts), `newtxmath` or `mtpro2` (math fonts).
+
+For automated processing of figures you should install the following programs: `Ghostscript`, `epstool` and `sam2p`.
+
+# 3. Downloads and updates
+
+- CTAN directory: http://www.ctan.org/tex-archive/macros/latex/contrib/disser/
+- Project at Sourceforge: http://sourceforge.net/projects/disser/
+- Public source code repositories of this project:
+ - https://github.org/polariton/disser/
+ - https://bitbucket.org/sky/disser/
+ - https://sourceforge.net/p/disser/disser.git
+
+ZIP file with sources can be downloaded from http://www.ctan.org/get/macros/latex/contrib/disser.zip
+ZIP file with compiled sources and documentation sorted in a TDS (TeX Directory Structure) tree is available on Sourceforge (see `disser-<version>.tds.zip` file in Downloads section).
+
+# 4. Installation
+## 4.1. Installation from ZIP archive in TDS format
+
+This is the easiest and recommended way to install the package. The ZIP file `disser-<version>.tds.zip` contains files sorted in a TDS tree, so you can directly unpack this file to directory with your TeX installation.
+Example:
+```sh
+$ cd /path/to/texmf
+$ unzip /download/path/disser-<version>.tds.zip
+$ mktexlsr
+```
+
+## 4.2. Installation from sources
+
+Enter the following commands in the command prompt:
+- in a Unix-like environment:
+```sh
+$ env DESTDIR=/path/to/texmf make install
+```
+- in Windows command line prompt:
+```sh
+$ set DESTDIR=disk:\path\to\texmf
+$ nomake install
+```
+Here `/path/to/texmf` and `disk:\path\to\texmf` are paths to your local TeX directory tree. After installation you should update the filename database with the command
+```sh
+$ mktexlsr
+```
+if you install the package to user's directory `"%APPDATA%\MiKTeX\2.9"` or
+```sh
+$ mktexlsr --admin
+```
+if you install the package to one of the common directories, like `"%programfiles%\MiKTeX 2.9"` or `"%ALLUSERSPROFILE%\MiKTeX\2.9"`.
+
+Examples of commands for MiKTeX 2.9.
+
+- Installation for all users:
+```sh
+$ set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9
+$ nomake install
+$ mktexlsr --admin
+```
+- Installation for current user only:
+```sh
+$ set DESTDIR=%APPDATA%\MiKTeX\2.9
+$ nomake install
+$ mktexlsr
+```
+
+# 5. License
+
+Copyright (c) Stanislav Kruchinin
+
+It may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. 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 2003/12/01 or later.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
\ No newline at end of file
Deleted: trunk/Master/texmf-dist/doc/latex/disser/README.ru
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/README.ru 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/README.ru 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,112 +0,0 @@
-1. \xC2\xE2\xE5\xE4\xE5\xED\xE8\xE5
------------
-\xCF\xE0\xEA\xE5\xF2 disser \xEF\xF0\xE5\xE4\xED\xE0\xE7\xED\xE0\xF7\xE5\xED \xE4\xEB\xFF \xE2\xE5\xF0\xF1\xF2\xEA\xE8 \xE4\xE8\xEF\xEB\xEE\xEC\xEE\xE2, \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE9 \xE8 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xEE\xE2
-\xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF\xEC\xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xEE\xED\xED\xFB\xF5 \xF1\xEE\xE2\xE5\xF2\xEE\xE2 \xE8 \xC2\xC0\xCA \xD0\xD4.
-
-
-2. \xD0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xEC\xFB\xE5 \xEF\xE0\xEA\xE5\xF2\xFB \xE8 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xFB
------------------------------------
-\xC4\xEB\xFF \xEA\xEE\xF0\xF0\xE5\xEA\xF2\xED\xEE\xE9 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xE2 \xE2\xE0\xF8\xE5\xEC \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE5 LaTeX \xE4\xEE\xEB\xE6\xED\xFB \xE1\xFB\xF2\xFC
-\xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xFB \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xFB:
-amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions,
-natbib, hyperref, subcaption, wrapfig, \xE0 \xF2\xE0\xEA\xE6\xE5 \xEF\xE0\xEA\xE5\xF2\xFB \xE4\xEB\xFF \xEF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE8
-\xF0\xF3\xF1\xF1\xEA\xEE\xE3\xEE \xFF\xE7\xFB\xEA\xE0.
-
-\xC4\xEB\xFF \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xFF \xF8\xF0\xE8\xF4\xF2\xE0 Times \xE2 \xF2\xE5\xEA\xF1\xF2\xEE\xE2\xEE\xEC \xF0\xE5\xE6\xE8\xEC\xE5 \xF1\xEB\xE5\xE4\xF3\xE5\xF2 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC
-\xEF\xE0\xEA\xE5\xF2 pscyr \xE8\xEB\xE8 cyrtimes, \xE2 \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xEE\xEC \xF0\xE5\xE6\xE8\xEC\xE5 --- txfonts \xE8\xEB\xE8 mtpro.
-
-\xC4\xEB\xFF \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE8\xF0\xEE\xE2\xE0\xED\xED\xEE\xE9 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2 \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xF1\xEA\xF0\xE8\xEF\xF2\xEE\xE2 Makefile \xE8
-nomake.cmd \xF1\xEB\xE5\xE4\xF3\xE5\xF2 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xFB Ghostscript, epstool \xE8 sam2p.
-
-
-3. \xCF\xEE\xEB\xF3\xF7\xE5\xED\xE8\xE5 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xE9 \xE2\xE5\xF0\xF1\xE8\xE8
------------------------------
-\xCF\xE0\xEA\xE5\xF2 disser \xE4\xEE\xF1\xF2\xF3\xEF\xE5\xED \xED\xE0 CTAN:
- http://www.ctan.org/tex-archive/macros/latex/contrib/disser/
-
-\xD1\xF2\xF0\xE0\xED\xE8\xF6\xE0 \xEF\xF0\xEE\xE5\xEA\xF2\xE0 \xED\xE0 Sourceforge:
- http://sourceforge.net/projects/disser/
-
-ZIP-\xE0\xF0\xF5\xE8\xE2 \xF1 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xEC\xE8 \xF2\xE5\xEA\xF1\xF2\xE0\xEC\xE8:
- http://www.ctan.org/get/macros/latex/contrib/disser.zip
-
-ZIP-\xE0\xF0\xF5\xE8\xE2 \xF1 \xE3\xEE\xF2\xEE\xE2\xFB\xEC\xE8 \xF4\xE0\xE9\xEB\xE0\xEC\xE8 \xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xE8\xE5\xE9, \xEA\xEE\xF2\xEE\xF0\xFB\xE5 \xF0\xE0\xE7\xEC\xE5\xF9\xE5\xED\xFB \xE2
-\xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1\xEE \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xEE\xE9 \xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xEE\xE9 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xEE\xE2 TeX
-(\xF1\xEC. \xF4\xE0\xE9\xEB disser-<version>.tds.zip \xE2 \xF0\xE0\xE7\xE4\xE5\xEB\xE5 Download):
- http://sourceforge.net/projects/disser/
-
-\xCF\xF3\xE1\xEB\xE8\xF7\xED\xFB\xE5 \xF0\xE5\xEF\xEE\xE7\xE8\xF2\xEE\xF0\xE8\xE8 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xF5 \xF2\xE5\xEA\xF1\xF2\xEE\xE2 \xEF\xF0\xEE\xE5\xEA\xF2\xE0:
- http://mercurial.intuxication.org/hg/disser/
- http://bitbucket.org/sky/disser/
- http://disser.hg.sourceforge.net/hgweb/disser/
-
-\xCD\xE0\xE8\xE1\xEE\xEB\xE5\xE5 \xF1\xE2\xE5\xE6\xF3\xFE \xE2\xE5\xF0\xF1\xE8\xFE \xE8\xF1\xF5\xEE\xE4\xED\xFB\xF5 \xF2\xE5\xEA\xF1\xF2\xEE\xE2 \xEF\xE0\xEA\xE5\xF2\xE0 \xEC\xEE\xE6\xED\xEE \xEF\xEE\xEB\xF3\xF7\xE8\xF2\xFC, \xF1\xEA\xE0\xF7\xE0\xE2
-\xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8 \xE3\xE5\xED\xE5\xF0\xE8\xF0\xF3\xE5\xEC\xFB\xE9 \xE0\xF0\xF5\xE8\xE2 \xF1 \xEE\xE4\xED\xEE\xE3\xEE \xE8\xE7 \xF0\xE5\xEF\xEE\xE7\xE8\xF2\xEE\xF0\xE8\xE5\xE2:
- http://mercurial.intuxication.org/hg/disser/archive/tip.zip
- http://bitbucket.org/sky/disser/get/tip.zip
-
-
-4. \xD3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE0
-------------
-
-4.1. \xC8\xE7 ZIP-\xE0\xF0\xF5\xE8\xE2\xE0 \xF1\xEE \xF1\xEA\xEE\xEC\xEF\xE8\xEB\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xEC\xE8 \xF4\xE0\xE9\xEB\xE0\xEC\xE8
-
-\xDD\xF2\xEE\xF2 \xF1\xEF\xEE\xF1\xEE\xE1 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xED\xE0\xE8\xE1\xEE\xEB\xE5\xE5 \xEF\xF0\xEE\xF1\xF2 \xE8 \xFF\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xF0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xEC\xFB\xEC.
-\xD4\xE0\xE9\xEB disser-<version>.tds.zip \xF1\xEE\xE4\xE5\xF0\xE6\xE8\xF2 \xF1\xEE\xE1\xF0\xE0\xED\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xEA\xEB\xE0\xF1\xF1\xEE\xE2 \xE8
-\xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xE8\xE8, \xEF\xEE\xFD\xF2\xEE\xEC\xF3 \xE5\xE3\xEE \xEC\xEE\xE6\xED\xEE \xEF\xF0\xEE\xF1\xF2\xEE \xF0\xE0\xF1\xEF\xE0\xEA\xEE\xE2\xE0\xF2\xFC \xE2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3 TeX.
-
-\xCF\xF0\xE8\xEC\xE5\xF0 \xE4\xEB\xFF Unix-\xEF\xEE\xE4\xEE\xE1\xED\xFB\xF5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xE9:
- cd /\xEF\xF3\xF2\xFC/\xEA/texmf
- unzip /\xEF\xF3\xF2\xFC/\xEA/\xF4\xE0\xE9\xEB\xF3/disser-<version>.tds.zip
- mktexlsr
-
-\xCF\xF0\xE8\xEC\xE5\xF0 \xE4\xEB\xFF Windows:
- cd \xE4\xE8\xF1\xEA:\\xEF\xF3\xF2\xFC\\xEA\texmf
- unzip \xE4\xE8\xF1\xEA:\\xEF\xF3\xF2\xFC\\xEA\\xF4\xE0\xE9\xEB\xF3\disser-<version>.tds.zip
- mktexlsr
-
-4.2. \xC8\xE7 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xF5 \xF2\xE5\xEA\xF1\xF2\xEE\xE2
-
-\xC4\xEB\xFF \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xEF\xE5\xF0\xE5\xE9\xF2\xE8 \xE2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3 \xF1 \xF0\xE0\xF1\xEF\xE0\xEA\xEE\xE2\xE0\xED\xED\xFB\xEC\xE8 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xEC\xE8
-\xF2\xE5\xEA\xF1\xF2\xE0\xEC\xE8 \xE8 \xE2\xFB\xEF\xEE\xEB\xED\xE8\xF2\xFC \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE5 \xEA\xEE\xEC\xE0\xED\xE4\xFB
-
-\xE2 Unix-\xEF\xEE\xE4\xEE\xE1\xED\xFB\xF5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF\xF5:
- env DESTDIR=/\xEF\xF3\xF2\xFC/\xEA/texmf make install
-
-\xE2 Windows:
- set DESTDIR=\xE4\xE8\xF1\xEA:\\xEF\xF3\xF2\xFC\\xEA\texmf
- nomake install
-
-\xC7\xE4\xE5\xF1\xFC /\xEF\xF3\xF2\xFC/\xEA/texmf \xE8 \xE4\xE8\xF1\xEA:\\xEF\xF3\xF2\xFC\\xEA\texmf -- \xEF\xF3\xF2\xE8 \xEA \xE4\xE5\xF0\xE5\xE2\xF3 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xEE\xE2 TeX.
-\xCF\xEE\xF1\xEB\xE5 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xF1\xEB\xE5\xE4\xF3\xE5\xF2 \xEE\xE1\xED\xEE\xE2\xE8\xF2\xFC \xE1\xE0\xE7\xF3 \xE8\xEC\xE5\xED \xF4\xE0\xE9\xEB\xEE\xE2 \xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE \xEA\xEE\xEC\xE0\xED\xE4\xFB
- mktexlsr
-
-\xCF\xF0\xE8\xEC\xE5\xF0\xFB \xEA\xEE\xEC\xE0\xED\xE4 \xE4\xEB\xFF \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 MiKTeX \xE2\xE5\xF0\xF1\xE8\xE8 2.9 \xE8 Windows 7.
-
-\xD3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE0 \xE4\xEB\xFF \xE2\xF1\xE5\xF5 \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xE5\xE9:
- set DESTDIR=%ALLUSERSPROFILE%\MiKTeX\2.9
- nomake install
- mktexlsr --admin
-
-\xD3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE0 \xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF2\xE5\xEA\xF3\xF9\xE5\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF:
- set DESTDIR=%APPDATA%\MiKTeX\2.9
- nomake install
- mktexlsr
-
-
-5. \xCB\xE8\xF6\xE5\xED\xE7\xE8\xFF
------------
-
-\xD6\xEE\xEF\xFB\xF0\xE8\xE3\xF5\xF2 (\xF6) 2004-2015 \xD1\xF2\xE0\xED\xE8\xF1\xEB\xE0\xE2 \xCA\xF0\xF3\xF7\xE8\xED\xE8\xED
-
-\xC8\xF2 \xEC\xE0\xFB \xE1\xE5 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE5\xE4 \xE0\xED\xE4/\xEE\xF0 \xEC\xEE\xE4\xE8\xF4\xE8\xE5\xE4 \xF3\xED\xE4\xE5\xF0 \xF2\xF5\xE5
-\xF6\xEE\xED\xE4\xE8\xF2\xE8\xEE\xED\xF1 \xEE\xF4 \xF2\xF5\xE5 \xCB\xE0\xD2\xE5\xD5 \xCF\xF0\xEE\xE9\xE5\xF6\xF2 \xCF\xF3\xE1\xEB\xE8\xF6 \xCB\xE8\xF6\xE5\xED\xF1\xE5, \xE5\xE8\xF2\xF5\xE5\xF0 \xE2\xE5\xF0\xF1\xE8\xEE\xED 1.3
-\xEE\xF4 \xF2\xF5\xE8\xF1 \xEB\xE8\xF6\xE5\xED\xF1\xE5 \xEE\xF0 (\xE0\xF2 \xB8\xF3\xF0 \xEE\xEF\xF2\xE8\xEE\xED) \xE0\xED\xFB \xEB\xE0\xF2\xE5\xF0 \xE2\xE5\xF0\xF1\xE8\xEE\xED.
-\xD2\xF5\xE5 \xEB\xE0\xF2\xE5\xF1\xF2 \xE2\xE5\xF0\xF1\xE8\xEE\xED \xEE\xF4 \xF2\xF5\xE8\xF1 \xEB\xE8\xF6\xE5\xED\xF1\xE5 \xE8\xF1 \xE8\xED
- \xF5\xF2\xF2\xEF://\xE2\xE2\xE2.\xEB\xE0\xF2\xE5\xF5-\xEF\xF0\xEE\xE9\xE5\xF6\xF2.\xEE\xF0\xE3/\xEB\xEF\xEF\xEB.\xF2\xF5\xF2
-\xE0\xED\xE4 \xE2\xE5\xF0\xF1\xE8\xEE\xED 1.3 \xEE\xF0 \xEB\xE0\xF2\xE5\xF0 \xE8\xF1 \xEF\xE0\xF0\xF2 \xEE\xF4 \xE0\xEB\xEB \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xEE\xED\xF1 \xEE\xF4 \xCB\xE0\xD2\xE5\xD5
-\xE2\xE5\xF0\xF1\xE8\xEE\xED 2003/12/01 \xEE\xF0 \xEB\xE0\xF2\xE5\xF0.
-
-\xD2\xF5\xE8\xF1 \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xE8\xF1 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE5\xE4 \xE8\xED \xF2\xF5\xE5 \xF5\xEE\xEF\xE5 \xF2\xF5\xE0\xF2 \xE8\xF2 \xE2\xE8\xEB\xEB \xE1\xE5 \xF3\xF1\xE5\xF4\xF3\xEB,
-\xE1\xF3\xF2 \xC2\xC8\xD2\xD5\xCE\xD3\xD2 \xC0\xCD\xDB \xC2\xC0\xD0\xD0\xC0\xCD\xD2\xDB; \xE2\xE8\xF2\xF5\xEE\xF3\xF2 \xE5\xE2\xE5\xED \xF2\xF5\xE5 \xE8\xEC\xEF\xEB\xE8\xE5\xE4 \xE2\xE0\xF0\xF0\xE0\xED\xF2\xFB \xEE\xF4
-\xCC\xC5\xD0\xD7\xC0\xCD\xD2\xC0\xC1\xC8\xCB\xC8\xD2\xDB \xEE\xF0 \xD4\xC8\xD2\xCD\xC5\xD1\xD1 \xD4\xCE\xD0 \xC0 \xCF\xC0\xD0\xD2\xC8\xD6\xD3\xCB\xC0\xD0 \xCF\xD3\xD0\xCF\xCE\xD1\xC5.
\ No newline at end of file
Deleted: trunk/Master/texmf-dist/doc/latex/disser/cp1251.csf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/cp1251.csf 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/cp1251.csf 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,275 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% CHARACTER SET: Cyrillic (CP 1251)
-%%
-%% SORTING ORDER: First Cyrillic then Latin
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% FILE FORMAT
-%%
-%% The codepage and sorting order (CS) file defines how BibTeX will treat an
-%% 8-bit character set, specifically which characters are to be treated as
-%% letters, the upper/lower case relationships between characters, and the
-%% sorting order of characters.
-%%
-%% The CS file may contain a number of sections, each presented in the
-%% form of a TeX macro:
-%%
-%% \section-name{
-%% <section definitions>
-%% }
-%%
-%% Four sections are currently supported: \lowupcase, \lowercase, \uppercase
-%% and \order. The syntax of the four supported sections is summarised below.
-%%
-%% 8-bit characters may be entered naturally, but to avoid problems with
-%% character set translation or corruption, they can also be entered using
-%% the TeX-style portable notation for character codes, i.e. ^^XX, where XX
-%% is the hexadecimal value ofthe character code.
-%%
-%% Reading of the sections ends when the first '}' character is reached, so
-%% '}' can't be included in a section. You can't use ^^7d either.
-%%
-%% The percent sign ('%') is used to introduce a trailing comment - it and
-%% all remaining characters on a line are ignored. ^^25 has the same effect.
-%%
-%%
-%% \lowupcase section
-%%
-%% The \lowupcase section of the CS file is used to define the lower
-%% /upper and upper/lower case relationship of pairs of specified
-%% characters. It is only used if the relationship is symmetrical - use
-%% \lowercase or \upcase if it isn't.
-%%
-%% The syntax of the \lowupcase section is:
-%%
-%% \lowupcase{
-%% <LC-1> <UC-1> % Comment begins with a percent sign
-%% <LC-2> <UC-2>
-%% ...
-%% <LC-N> <UC-N>
-%% }
-%%
-%% Each <LC-n> <UC-n> pair of characters defines that the upper case
-%% equivalent of <LC-n> is <UC-n> *and* the lower case equivalent of
-%% <UC-n> is <LC-n>.
-%%
-%% You cannot redefine the lower or upper case equivalent of an ASCII
-%% character (code < 128), so all instances of <LC-n> and <UC-n>
-%% (i.e. both sides of the relationship) must have codes > 127.
-%%
-%%
-%% \lowercase section
-%%
-%% The \lowercase section of the CS file is used to define the lower case
-%% equivalent of specified characters. It should normally only be used
-%% if the relationship isn't symmetrical - use \lowupcase if it is.
-%%
-%% The syntax of the \lowercase section is:
-%%
-%% \lowercase{
-%% <UC-1> <LC-1> % Comment begins with a percent sign
-%% <UC-2> <LC-2>
-%% ...
-%% <UC-N> <LC-N>
-%% }
-%%
-%% Each <LC-n> <UC-n> pair of characters defines that the lower case
-%% equivalent of <UC-n> is <LC-n>.
-%%
-%% You cannot redefine the lower case equivalent of an ASCII character
-%% (code < 128), so all instances of <UC-n> (i.e. the left hand side
-%% of the relationship) must have codes > 127.
-%%
-%%
-%% \uppercase section
-%%
-%% The \uppercase section of the CS file is used to define the upper case
-%% equivalent of specified characters. It should normally only be used
-%% if the relationship isn't symmetrical - use \lowupcase if it is.
-%%
-%% The syntax of the \uppercase section is:
-%%
-%% \uppercase{
-%% <LC-1> <UC-1> % Comment begins with a percent sign
-%% <LC-2> <UC-2>
-%% ...
-%% <LC-N> <UC-N>
-%% }
-%%
-%% Each <LC-n> <UC-n> pair of characters defines that the upper case
-%% case equivalent of <LC-n> is <UC-n>.
-%%
-%% You cannot redefine the upper case equivalent of an ASCII character
-%% (code < 128), so all instances of <LC-n> (i.e. the left hand side
-%% of the relationship) must have codes > 127.
-%%
-%%
-%% \order section
-%%
-%% The \order section of the CS file is used to define the order in which
-%% characters are sorted.
-%%
-%% The syntax of the \order section is:
-%%
-%% \order{
-%% <char-1> % Comment begins with a percent sign
-%% <char-2> <char-3> % whitespace between the chars
-%% <char-4> - <char-5> % a hyphen between the chars
-%% <char-4> _ <char-5> % an underscore between the chars
-%% ...
-%% <char-n>
-%% }
-%%
-%% All characters on the same line are given the same sorting weight.
-%%
-%% The construct <char-1> <underscore> <char-2> is used to denote that
-%% all characters in the range <char-1> to <char-2> should be given the
-%% same sorting weight. For example, "A _ Z" would cause all ASCII
-%% upper case alphabetical characters to have the same sorting weight
-%% and would be equivalent to placing all 26 characters on the same line.
-%%
-%% The construct <char-1> <hyphen> <char-2> is used to denote that all
-%% characters in the range <char-1> to <char-2> should be given an
-%% ascending set of sorting weights, starting with <char-1> and ending
-%% with <char-2>. For example, "A - Z" would cause all upper case ASCII
-%% alphabetical characters to be sorted in ascending order and would be
-%% equivalent to placing 'A' on the first line, 'B' on the second,
-%% through to 'Z' on the 26th line.
-%%
-%% The characters at the beginning of the order section are given a lower
-%% sorting weight than characters occuring later. When sorting
-%% alphabetically, characters with the lowest weight come first.
-%%
-%% All characters not in the \order section (including ASCII characters)
-%% are given the same very high sorting weight to ensure that they come
-%% last when sorting alphabetically.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-%%
-%% CHARACTER SET
-%%
-\lowupcase{
- \xE0 \xC0
- \xE1 \xC1
- \xE2 \xC2
- \xE3 \xC3
- \xB4 \xA5
- \xE4 \xC4
- \xE5 \xC5
- \xBA \xAA
- \xB8 \xA8
- \xE6 \xC6
- \xE7 \xC7
- \xE8 \xC8
- \xB3 \xB2
- \xBF \xAF
- \xE9 \xC9
- \xEA \xCA
- \xEB \xCB
- \xEC \xCC
- \xED \xCD
- \xEE \xCE
- \xEF \xCF
- \xF0 \xD0
- \xF1 \xD1
- \xF2 \xD2
- \xF3 \xD3
- \xF4 \xD4
- \xF5 \xD5
- \xF6 \xD6
- \xF7 \xD7
- \xF8 \xD8
- \xF9 \xD9
- \xFA \xDA
- \xFB \xDB
- \xFC \xDC
- \xFD \xDD
- \xFE \xDE
- \xFF \xDF
-}
-
-
-
-%%
-%% SORTING ORDER
-%%
-%%
-\order{
- 0-9
- \xC0 \xE0
- \xC1 \xE1
- \xC2 \xE2
- \xC3 \xE3
- \xA5 \xB4
- \xC4 \xE4
- \xC5 \xE5
- \xAA \xBA
- \xA8 \xB8
- \xC6 \xE6
- \xC7 \xE7
- \xC8 \xE8
- \xB2 \xB3
- \xAF \xBF
- \xC9 \xE9
- \xCA \xEA
- \xCB \xEB
- \xCC \xEC
- \xCD \xED
- \xCE \xEE
- \xCF \xEF
- \xD0 \xF0
- \xD1 \xF1
- \xD2 \xF2
- \xD3 \xF3
- \xD4 \xF4
- \xD5 \xF5
- \xD6 \xF6
- \xD7 \xF7
- \xD8 \xF8
- \xD9 \xF9
- \xDA \xFA
- \xDB \xFB
- \xDC \xFC
- \xDD \xFD
- \xDE \xFE
- \xDF \xFF
- A a
- B b
- C c
- D d
- E e
- F f
- G g
- H h
- I i
- J j
- K k
- L l
- M m
- N n
- O o
- P p
- Q q
- R r
- S s
- T t
- U u
- V v
- W w
- X x
- Y y
- Z z
-}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% END OF FILE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/doc/latex/disser/include/latex.mk
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/include/latex.mk 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/include/latex.mk 2017-03-05 21:37:27 UTC (rev 43400)
@@ -16,6 +16,7 @@
PS2PDF ?= gs
PSBOOK ?= psbook
PSNUP ?= psnup
+MAKEINDEX ?= makeindex
ARCHEXT ?= zip
ARCHFLAGS ?= a -t$(ARCHEXT)
@@ -32,7 +33,7 @@
PDFLATEXFLAGS ?= --shell-escape --synctex=1
CLEXT ?= *.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \
- *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf
+ *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf *.nlo *.nls
CLFILES ?= $(CLEXT) $(ARCHIVE)
SRCFILES ?= *
@@ -83,6 +84,9 @@
else \
echo Warning: Bibliography file does not exist ;\
fi ;\
+ if [ -f $(TARGET).nlo ] ; then \
+ $(MAKEINDEX) $(TARGET).nlo -s nomencl.ist -o $(TARGET).nls
+ fi ;\
$(LATEX) $(TEXFLAGS) $(TARGET).tex ;\
$(LATEX) $(TEXFLAGS) $(TARGET).tex
@@ -103,6 +107,9 @@
else \
echo "Warning: Bibliography file does not exist" ;\
fi ;\
+ if [ -f $(TARGET).nlo ] ; then \
+ $(MAKEINDEX) $(TARGET).nlo -s nomencl.ist -o $(TARGET).nls ;\
+ fi ;\
$(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex ;\
$(PDFLATEX) $(PDFLATEXFLAGS) $(TARGET).tex
@@ -115,9 +122,11 @@
$(TARGET).rtf: $(TARGET).dvi
$(L2RTF) $(L2RTFFLAGS) -a $(TARGET).aux -b $(TARGET).bbl $(TARGET).tex
+%.nls: %.nlo
+ $(MAKEINDEX) $< -s nomencl.ist -o $@
+
bmtoeps epstoeps epstopdf fixbb optimize pdftopng256 pdftotiffg4:
@$(MAKE) -C fig $@
figclean:
@$(MAKE) -C fig clean
-
Modified: trunk/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd 2017-03-05 21:37:27 UTC (rev 43400)
@@ -13,17 +13,18 @@
if "%target%"=="" set target=thesis
if "%bibfile%"=="" set bibfile=thesis.bib
-if "%arch%"=="" set arch=7z
-if "%bibtex%"=="" set bibtex=bibtex8
-if "%dvips%"=="" set dvips=dvips
-if "%l2h%"=="" set l2h=latex2html
-if "%l2rtf%"=="" set l2rtf=latex2rtf
-if "%latex%"=="" set latex=latex
-if "%mktexlsr%"=="" set mktexlsr=mktexlsr
-if "%pdflatex%"=="" set pdflatex=pdflatex
-if "%ps2pdf%"=="" set ps2pdf=gswin32c
-if "%psbook%"=="" set psbook=psbook
-if "%psnup%"=="" set psnup=psnup
+if "%arch%"=="" set arch=7z
+if "%bibtex%"=="" set bibtex=bibtex8
+if "%dvips%"=="" set dvips=dvips
+if "%l2h%"=="" set l2h=latex2html
+if "%l2rtf%"=="" set l2rtf=latex2rtf
+if "%latex%"=="" set latex=latex
+if "%mktexlsr%"=="" set mktexlsr=mktexlsr
+if "%pdflatex%"=="" set pdflatex=pdflatex
+if "%ps2pdf%"=="" set ps2pdf=gswin32c
+if "%psbook%"=="" set psbook=psbook
+if "%psnup%"=="" set psnup=psnup
+if "%makeindex%"=="" set makeindex=makeindex
if "%archext%"=="" set archext=zip
if "%archflags%"=="" set archflags=a -t%archext%
@@ -43,8 +44,8 @@
if "%psnupflags%"=="" set psnupflags=-2 -pA4
if "%pdflatexflags%"=="" set pdflatexflags=--shell-escape --synctex=1
-if "%clext%"=="" set clext=*.bbl *.bak *.aux *.blg *.out *.toc *.log ^
- *.dvi *.tmp *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf
+if "%clext%"=="" set clext=*.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol ^
+ *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz *.run.xml *.bcf *.nlo *.nls
if "%clfiles%"=="" set clfiles=!clext! %archive%
if "%srcfiles%"=="" set srcfiles=*
if "%prereq%"=="" set prereq=*.tex *.bib
@@ -75,6 +76,9 @@
) else (
echo Warning: Bibliography file does not exist
)
+ if exist %target%.nlo (
+ %makeindex% %target%.nlo -s nomencl.ist -o %target%.nls
+ )
%latex% %latexflags% %target%.tex
%latex% %latexflags% %target%.tex
goto :eof
@@ -116,6 +120,9 @@
) else (
echo Warning: Bibliography file does not exist
)
+ if exist %target%.nlo (
+ %makeindex% %target%.nlo -s nomencl.ist -o %target%.nls
+ )
%pdflatex% %pdflatexflags% %target%.tex
%pdflatex% %pdflatexflags% %target%.tex
goto :eof
Modified: trunk/Master/texmf-dist/doc/latex/disser/manual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/manual.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/manual.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -44,12 +44,11 @@
\let\makelabel\deflabel}
}{\end{list}}
-\def\fileversion{1.4.0}
+\def\fileversion{1.5.0}
\sloppy
\begin{document}
-\title{\xCF\xE0\xEA\xE5\xF2 \pkg{disser}: \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF
-}
+\title{\xCF\xE0\xEA\xE5\xF2 \pkg{disser}: \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF}
\date{\xC2\xE5\xF0\xF1\xE8\xFF \fileversion}
\author{\xD1\xF2\xE0\xED\xE8\xF1\xEB\xE0\xE2 \xCA\xF0\xF3\xF7\xE8\xED\xE8\xED\\[6pt]
\normalsize E-mail:
@@ -61,8 +60,7 @@
\begin{abstract}\noindent
\xC4\xE0\xED\xED\xFB\xE9 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2 \xF1\xEE\xE4\xE5\xF0\xE6\xE8\xF2 \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE \xEF\xEE \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xFE \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{disser}.
\xC8\xED\xF1\xF2\xF0\xF3\xEA\xF6\xE8\xE8 \xEF\xEE \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE5 \xE8 \xEE\xE1\xED\xEE\xE2\xEB\xE5\xED\xE8\xFE \xF1\xEC\xEE\xF2\xF0\xE8\xF2\xE5 \xE2 \xF4\xE0\xE9\xEB\xE0\xF5 \file{README} \xE8 \file{README.ru}.
-\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xF5 \xF2\xE5\xEA\xF1\xF2\xEE\xE2 \xF1\xEE\xE4\xE5\xF0\xE6\xE8\xF2\xF1\xFF \xE2 \xF4\xE0\xE9\xEB\xE0\xF5 \href{file:disser.pdf}{\file{disser.pdf}}, \href{file:gost732.pdf}{\file{gost732.pdf}} \xE8
-\href{file:gost705.pdf}{\file{gost705.pdf}}.
+\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xE8\xF1\xF5\xEE\xE4\xED\xFB\xF5 \xF2\xE5\xEA\xF1\xF2\xEE\xE2 \xF1\xEE\xE4\xE5\xF0\xE6\xE8\xF2\xF1\xFF \xE2 \xF4\xE0\xE9\xEB\xE0\xF5 \href{file:disser.pdf}{\file{disser.pdf}}, \href{file:gost732.pdf}{\file{gost732.pdf}}.
\end{abstract}
\tableofcontents
@@ -70,7 +68,7 @@
\section{\xC2\xE2\xE5\xE4\xE5\xED\xE8\xE5}
\xCF\xE0\xEA\xE5\xF2 \pkg{disser} \xEF\xF0\xE5\xE4\xED\xE0\xE7\xED\xE0\xF7\xE5\xED \xE4\xEB\xFF \xE2\xE5\xF0\xF1\xF2\xEA\xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE9 \xE8 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xEE\xE2 \xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF\xEC\xE8 \xC3\xCE\xD1\xD2~7.0.11--2011 \xE8 \xC2\xC0\xCA.
-\xC2 \xF1\xEE\xF1\xF2\xE0\xE2 \xEF\xE0\xEA\xE5\xF2\xE0 \xE2\xF5\xEE\xE4\xFF\xF2 \xEA\xEB\xE0\xF1\xF1\xFB \file{disser.cls} \xE8 \file{gost732.cls}, \xF1\xF2\xE8\xEB\xE8 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8 \file{gost705.bst}, \file{gost705s.bst}, \xE0 \xF2\xE0\xEA\xE6\xE5 \xF1\xEA\xF0\xE8\xEF\xF2\xFB \xE4\xEB\xFF \xF1\xE1\xEE\xF0\xEA\xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 (\file{Makefile}, \file{nomake.cmd}, \xF4\xE0\xE9\xEB\xFB \xF1 \xF0\xE0\xF1\xF8\xE8\xF0\xE5\xED\xE8\xFF\xEC\xE8 \file{mk} \xE8 \file{cmd} \xE2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE5 \file{include}).
+\xC2 \xF1\xEE\xF1\xF2\xE0\xE2 \xEF\xE0\xEA\xE5\xF2\xE0 \xE2\xF5\xEE\xE4\xFF\xF2 \xEA\xEB\xE0\xF1\xF1\xFB \file{disser.cls} \xE8 \file{gost732.cls}, \xE0 \xF2\xE0\xEA\xE6\xE5 \xF1\xEA\xF0\xE8\xEF\xF2\xFB \xE4\xEB\xFF \xF1\xE1\xEE\xF0\xEA\xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 (\file{Makefile}, \file{nomake.cmd}, \xF4\xE0\xE9\xEB\xFB \xF1 \xF0\xE0\xF1\xF8\xE8\xF0\xE5\xED\xE8\xFF\xEC\xE8 \file{mk} \xE8 \file{cmd} \xE2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE5 \file{include}).
\xCF\xEE\xF1\xEA\xEE\xEB\xFC\xEA\xF3 \xE4\xE8\xEF\xEB\xEE\xEC\xFB \xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8 \xE8\xEC\xE5\xFE\xF2 \xF4\xE8\xEA\xF1\xE8\xF0\xEE\xE2\xE0\xED\xED\xF3\xFE \xF1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xF3, \xE2 \xEF\xE0\xEA\xE5\xF2 \xF2\xE0\xEA\xE6\xE5 \xE2\xEA\xEB\xFE\xF7\xE5\xED\xFB \xE8\xF5 \xF8\xE0\xE1\xEB\xEE\xED\xFB (\xEA\xE0\xF2\xE0\xEB\xEE\xE3 \file{templates}), \xEA\xEE\xF2\xEE\xF0\xFB\xE5 \xF0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xF2\xF1\xFF \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xF1\xE2\xEE\xE8\xF5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2.
\xCE\xE4\xED\xEE\xE9 \xE8\xE7 \xEE\xF1\xED\xEE\xE2\xED\xFB\xF5 \xF6\xE5\xEB\xE5\xE9 \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xEF\xE0\xEA\xE5\xF2\xE0~\pkg{disser} \xFF\xE2\xEB\xFF\xEB\xEE\xF1\xFC \xF3\xF1\xF2\xF0\xE0\xED\xE5\xED\xE8\xE5 \xEE\xE1\xF9\xE5\xE3\xEE \xED\xE5\xE4\xEE\xF1\xF2\xE0\xF2\xEA\xE0 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xF5 \xEA\xEB\xE0\xF1\xF1\xEE\xE2: \xEE\xF2\xF1\xF3\xF2\xF1\xF2\xE2\xE8\xFF \xE2\xEE\xE7\xEC\xEE\xE6\xED\xEE\xF1\xF2\xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF4\xEE\xF0\xEC\xE0\xF2\xE0 \xFD\xEB\xE5\xEC\xE5\xED\xF2\xEE\xE2 \xF2\xE8\xF2\xF3\xEB\xFC\xED\xEE\xE3\xEE \xEB\xE8\xF1\xF2\xE0, \xE7\xE0\xE3\xEE\xEB\xEE\xE2\xEA\xEE\xE2 \xE8 \xE7\xE0\xEF\xE8\xF1\xE5\xE9 \xE2 \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8 \xE3\xE5\xED\xE5\xF0\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xF1\xEF\xE8\xF1\xEA\xE0\xF5.
@@ -162,19 +160,8 @@
href &
\xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{hyperref} \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA.
\\\hline
- noams &
- \xCD\xE5 \xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2\xFB \pkg{amsmath}, \pkg{amssymb} \xE8 \pkg{amsfonts} \xE8\xE7 \xEA\xEB\xE0\xF1\xF1\xE0.
-\\\hline
subf &
\xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{subcaption} \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2.
-\\\hline
- times &
- \xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xE5 \xE3\xE0\xF0\xED\xE8\xF2\xF3\xF0\xFB Times \xE2 \xF2\xE5\xEA\xF1\xF2\xE5 \xE8 \xF4\xEE\xF0\xEC\xF3\xEB\xE0\xF5.
- \xCD\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC \xEF\xE0\xEA\xE5\xF2\xFB \pkg{pscyr} \xE8\xEB\xE8 \pkg{cyrtimes} (\xE4\xEB\xFF \xF2\xE5\xEA\xF1\xF2\xE0), \pkg{txfonts} \xE8\xEB\xE8 \pkg{mtpro} (\xE4\xEB\xFF \xF4\xEE\xF0\xEC\xF3\xEB).
-\\\hline
- mtpro &
- \xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xE5 \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF8\xF0\xE8\xF4\xF2\xEE\xE2 MathTime Pro.
- \xCF\xF0\xE8 \xED\xE0\xEB\xE8\xF7\xE8\xE8 \xEE\xEF\xF6\xE8\xE8 \cmd{times} \xE2\xEC\xE5\xF1\xF2\xEE \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{txfonts} \xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE0\xE5\xF2\xF1\xFF \xEF\xE0\xEA\xE5\xF2 \pkg{mtpro}.
\\\hline\hline
\end{longtable}
@@ -181,12 +168,12 @@
\section{\xD8\xE0\xE1\xEB\xEE\xED\xFB \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2}
\xC2\xEE\xE7\xEC\xEE\xE6\xED\xEE\xF1\xF2\xE8 \xEF\xE0\xEA\xE5\xF2\xE0 \xE4\xE5\xEC\xEE\xED\xF1\xF2\xF0\xE8\xF0\xF3\xFE\xF2\xF1\xFF \xED\xE0 \xEF\xF0\xE8\xEC\xE5\xF0\xE5 \xF8\xE0\xE1\xEB\xEE\xED\xEE\xE2 \xE4\xE8\xEF\xEB\xEE\xEC\xEE\xE2 \xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE9.
-\xC2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE5 \file{templates} \xF1\xEE\xE4\xE5\xF0\xE6\xE0\xF2\xF1\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xFB \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 CP-1251, \xE4\xEB\xFF \xE2\xE5\xF0\xF1\xF2\xEA\xE8 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xFE\xF2\xF1\xFF \BibTeX{}8 \xF1\xEE \xF1\xF2\xE8\xEB\xE5\xEC \pkg{gost705}, \xEF\xE0\xEA\xE5\xF2\xFB \pkg{natbib} \xE8 \pkg{multibib}.
+\xC2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE5 \file{templates} \xF1\xEE\xE4\xE5\xF0\xE6\xE0\xF2\xF1\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xFB \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 CP-1251, \xE4\xEB\xFF \xE2\xE5\xF0\xF1\xF2\xEA\xE8 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xFE\xF2\xF1\xFF \BibTeX{}8 \xF1\xEE \xF1\xF2\xE8\xEB\xE5\xEC \pkg{gost2008}, \xEF\xE0\xEA\xE5\xF2\xFB \pkg{natbib} \xE8 \pkg{multibib}.
\xC2 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE5 \file{templates-utf8} \xF1\xEE\xE4\xE5\xF0\xE6\xE0\xF2\xF1\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xFB \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8, \xE4\xEB\xFF \xE2\xE5\xF0\xF1\xF2\xEA\xE8 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xFE\xF2\xF1\xFF Biber \xE8 \xEF\xE0\xEA\xE5\xF2 Bib\LaTeX{} \xF1\xEE \xF1\xF2\xE8\xEB\xE5\xEC \pkg{biblatex-gost}.
\section{\xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2}
-\xC4\xEB\xFF \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE0\xF6\xE8\xE8 \xF1\xE1\xEE\xF0\xEA\xE8 \xE8 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xE2 \xF1\xEE\xF1\xF2\xE0\xE2 \xEF\xE0\xEA\xE5\xF2\xE0 \xE2\xF5\xEE\xE4\xFF\xF2 \xE4\xE2\xE5 \xF1\xE8\xF1\xF2\xE5\xEC\xFB \xF1\xEA\xF0\xE8\xEF\xF2\xEE\xE2: \xF4\xE0\xE9\xEB\xFB \file{Makefile}, \xF1\xEE\xE2\xEC\xE5\xF1\xF2\xE8\xEC\xFB\xE5 \xF1 GNU Make, \xE8 \xF4\xE0\xE9\xEB\xFB \file{nomake.cmd}, \xED\xE0\xEF\xE8\xF1\xE0\xED\xED\xFB\xE5 \xED\xE0 \xFF\xE7\xFB\xEA\xE5 \xEA\xEE\xEC\xE0\xED\xE4\xED\xEE\xE3\xEE \xE8\xED\xF2\xE5\xF0\xEF\xF0\xE5\xF2\xE0\xF2\xEE\xF0\xE0 \file{cmd.exe} \xCE\xD1 Windows 2000 \xE8 \xE2\xFB\xF8\xE5.
+\xC4\xEB\xFF \xE0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xE7\xE0\xF6\xE8\xE8 \xF1\xE1\xEE\xF0\xEA\xE8 \xE8 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xE2 \xF1\xEE\xF1\xF2\xE0\xE2 \xEF\xE0\xEA\xE5\xF2\xE0 \xE2\xF5\xEE\xE4\xFF\xF2 \xE4\xE2\xE5 \xF1\xE8\xF1\xF2\xE5\xEC\xFB \xF1\xEA\xF0\xE8\xEF\xF2\xEE\xE2: \xF4\xE0\xE9\xEB\xFB \file{Makefile}, \xF1\xEE\xE2\xEC\xE5\xF1\xF2\xE8\xEC\xFB\xE5 \xF1 GNU Make, \xE8 \xF4\xE0\xE9\xEB\xFB \file{nomake.cmd}, \xED\xE0\xEF\xE8\xF1\xE0\xED\xED\xFB\xE5 \xED\xE0 \xFF\xE7\xFB\xEA\xE5 \xEA\xEE\xEC\xE0\xED\xE4\xED\xEE\xE3\xEE \xE8\xED\xF2\xE5\xF0\xEF\xF0\xE5\xF2\xE0\xF2\xEE\xF0\xE0 \file{cmd.exe} (Windows 2000 \xE8 \xE2\xFB\xF8\xE5).
\xD1\xEA\xF0\xE8\xEF\xF2\xFB \xEF\xEE\xE4\xE4\xE5\xF0\xE6\xE8\xE2\xE0\xFE\xF2 \xEE\xE4\xE8\xED\xE0\xEA\xEE\xE2\xFB\xE9 \xED\xE0\xE1\xEE\xF0 \xF6\xE5\xEB\xE5\xE9 (targets).
\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xE5 \xE2 Unix-\xEF\xEE\xE4\xEE\xE1\xED\xFB\xF5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF\xF5:
\begin{verbatim}
@@ -385,20 +372,8 @@
\section{\xCE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xE5 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8}
-\xC4\xEB\xFF \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xF1\xFB\xEB\xEE\xEA \xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xC3\xCE\xD1\xD2 \xD0 7.0.5-2008 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xFE\xF2\xF1\xFF \xF1\xF2\xE8\xEB\xE8 \file{gost705.bst} \xE8 \file{gost705s.bst}.
-\xCE\xED\xE8 \xEF\xF0\xE5\xE4\xF1\xF2\xE0\xE2\xEB\xFF\xFE\xF2 \xF1\xEE\xE1\xEE\xE9 \xE4\xEE\xF0\xE0\xE1\xEE\xF2\xE0\xED\xED\xFB\xE5 \xE2\xE5\xF0\xF1\xE8\xE8 \file{gost71u.bst} \xE8 \file{gost71s.bst} \xE8\xE7 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{gost}, \xED\xE0\xEF\xE8\xF1\xE0\xED\xED\xEE\xE3\xEE \xCC\xE0\xEA\xF1\xE8\xEC\xEE\xEC \xCF\xEE\xEB\xFF\xEA\xEE\xE2\xFB\xEC.
-\xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xFD\xF2\xE8\xF5 \xF1\xF2\xE8\xEB\xE5\xE9 \xEE\xE1\xF3\xF1\xEB\xEE\xE2\xEB\xE5\xED\xEE \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xEC\xE8 \xEF\xF0\xE8\xF7\xE8\xED\xE0\xEC\xE8: \xEF\xE0\xEA\xE5\xF2 \pkg{gost} \xE1\xEE\xEB\xE5\xE5 \xED\xE5 \xEF\xEE\xE4\xE4\xE5\xF0\xE6\xE8\xE2\xE0\xE5\xF2\xF1\xFF \xE0\xE2\xF2\xEE\xF0\xEE\xEC, \xE0 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xFF, \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xED\xE0\xFF \xF1 \xE5\xE3\xEE \xEF\xEE\xEC\xEE\xF9\xFC\xFE, \xEF\xF0\xEE\xF2\xE8\xE2\xEE\xF0\xE5\xF7\xE8\xF2 \xED\xE5\xEA\xEE\xF2\xEE\xF0\xFB\xEC \xF2\xF0\xE5\xE1\xEE\xE2\xE0\xED\xE8\xFF\xEC \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xEE\xED\xED\xFB\xF5 \xF1\xEE\xE2\xE5\xF2\xEE\xE2.
-\xD1\xF2\xE8\xEB\xFC \file{gost705s.bst} \xE0\xED\xE0\xEB\xEE\xE3\xE8\xF7\xE5\xED \file{gost705.bst}, \xED\xEE \xF1\xEE\xF0\xF2\xE8\xF0\xF3\xE5\xF2 \xE7\xE0\xEF\xE8\xF1\xE8 \xE2 \xE0\xEB\xF4\xE0\xE2\xE8\xF2\xED\xEE\xEC \xEF\xEE\xF0\xFF\xE4\xEA\xE5.
+\xC4\xEB\xFF \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xF1\xFB\xEB\xEE\xEA \xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xC3\xCE\xD1\xD2 \xD0 7.0.5-2008 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xFE\xF2\xF1\xFF \xF1\xF2\xE8\xEB\xE8 \file{gost2008.bst} \xE8 \file{gost2008s.bst}.
-\xCE\xF1\xED\xEE\xE2\xED\xFB\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xFF \file{gost705.bst} \xEE\xF2 \file{gost71u.bst}:
-\begin{enumerate}
-\item \xC8\xED\xE8\xF6\xE8\xE0\xEB\xFB \xE0\xE2\xF2\xEE\xF0\xEE\xE2 \xE2\xF1\xE5\xE3\xE4\xE0 \xEF\xE5\xF7\xE0\xF2\xE0\xFE\xF2\xF1\xFF \xEF\xEE\xF1\xEB\xE5 \xF4\xE0\xEC\xE8\xEB\xE8\xE8.
-\item \xC0\xE2\xF2\xEE\xF0\xFB, \xED\xE5\xE7\xE0\xE2\xE8\xF1\xE8\xEC\xEE \xEE\xF2 \xE8\xF5 \xEA\xEE\xEB\xE8\xF7\xE5\xF1\xF2\xE2\xE0, \xE2\xF1\xE5\xE3\xE4\xE0 \xEF\xE5\xF7\xE0\xF2\xE0\xFE\xF2\xF1\xFF \xEF\xE5\xF0\xE5\xE4 \xED\xE0\xE7\xE2\xE0\xED\xE8\xE5\xEC \xE8\xF1\xF2\xEE\xF7\xED\xE8\xEA\xE0.
-\item \xC8\xEC\xE5\xED\xE0 \xE0\xE2\xF2\xEE\xF0\xEE\xE2 \xED\xE5 \xE2\xFB\xE4\xE5\xEB\xFF\xFE\xF2\xF1\xFF \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC.
-\item \xC2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xE5\xE9 \xEC\xE5\xE6\xE4\xF3 \xE1\xEB\xEE\xEA\xE0\xEC\xE8 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xFE\xF2\xF1\xFF \xF2\xEE\xF7\xEA\xE8.
-\item \xCD\xE0\xF1\xF2\xF0\xE0\xE8\xE2\xE0\xE5\xEC\xFB\xE5 \xEF\xF0\xE5\xF4\xE8\xEA\xF1 \xE8 \xEF\xEE\xF1\xF2\xF4\xE8\xEA\xF1 \xED\xEE\xEC\xE5\xF0\xE0 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE9 \xF1\xF1\xFB\xEB\xEA\xE8 \xE4\xEB\xFF \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xF1\xEF\xE8\xF1\xEA\xE0 \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE2 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE5.
-\end{enumerate}
-
\xCF\xF0\xE8 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE8 \xF0\xF3\xF1\xF1\xEA\xEE\xFF\xE7\xFB\xF7\xED\xFB\xF5 \xE8\xF1\xF2\xEE\xF7\xED\xE8\xEA\xEE\xE2 \xF1\xEB\xE5\xE4\xF3\xE5\xF2 \xFF\xE2\xED\xFB\xEC \xEE\xE1\xF0\xE0\xE7\xEE\xEC \xEF\xF0\xE8\xF1\xE2\xE0\xE8\xE2\xE0\xF2\xFC \xEF\xEE\xEB\xFE |language| \xE7\xED\xE0\xF7\xE5\xED\xE8\xE5 |russian|.
\xCF\xF0\xE8\xEC\xE5\xF0:
\begin{verbatim}
@@ -426,19 +401,25 @@
\end{verbatim}
\xC4\xEB\xFF \xF0\xE0\xE1\xEE\xF2\xFB \xF1 \xF0\xF3\xF1\xF1\xEA\xEE\xFF\xE7\xFB\xF7\xED\xFB\xEC\xE8 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xEC\xE8 \xF1\xF1\xFB\xEB\xEA\xE0\xEC\xE8 \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE8\xED\xF2\xE5\xF0\xEF\xF0\xE5\xF2\xE0\xF2\xEE\xF0 \cmd{bibtex8}, \xEF\xEE\xE4\xE4\xE5\xF0\xE6\xE8\xE2\xE0\xFE\xF9\xE8\xE9 8-\xE1\xE8\xF2\xED\xFB\xE5 \xF1\xE8\xEC\xE2\xEE\xEB\xFB.
-\xC2 \xE7\xE0\xE2\xE8\xF1\xE8\xEC\xEE\xF1\xF2\xE8 \xEE\xF2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE8 \xF2\xE5\xEA\xF1\xF2\xE0 \xE2 bib-\xF4\xE0\xE9\xEB\xE5, \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE0\xF2\xFC \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xE9 csf-\xF4\xE0\xE9\xEB \xF1 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE5\xEC \xEA\xEE\xE4\xEE\xE2\xEE\xE9 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xFB \xE8 \xEF\xEE\xF0\xFF\xE4\xEA\xE0 \xF1\xEE\xF0\xF2\xE8\xF0\xEE\xE2\xEA\xE8, \xED\xE0\xEF\xF0\xE8\xEC\xE5\xF0, \file{cp1251.csf}.
-\xCF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE \xE2 \xF1\xEA\xF0\xE8\xEF\xF2\xE0\xF5 \xF1\xE1\xEE\xF0\xEA\xE8 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xF2\xF1\xFF \xF4\xE0\xE9\xEB \file{cp1251.csf}, \xF1\xEE\xF0\xF2\xE8\xF0\xF3\xFE\xF9\xE8\xE9 \xF1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xF2\xE0\xEA, \xEA\xE0\xEA \xF3\xEA\xE0\xE7\xE0\xED\xEE \xE2 \xC3\xCE\xD1\xD2~7.0.5: \xF1\xED\xE0\xF7\xE0\xEB\xE0 \xE8\xE4\xF3\xF2 \xF0\xF3\xF1\xF1\xEA\xEE\xFF\xE7\xFB\xF7\xED\xFB\xE5 \xE8\xF1\xF2\xEE\xF7\xED\xE8\xEA\xE8, \xED\xE0\xE7\xE2\xE0\xED\xE8\xFF \xEA\xEE\xF2\xEE\xF0\xFB\xF5 \xED\xE0\xE1\xF0\xE0\xED\xFB \xEA\xE8\xF0\xE8\xEB\xEB\xE8\xF6\xE5\xE9, \xE0 \xE7\xE0\xF2\xE5\xEC \xE8\xED\xEE\xF1\xF2\xF0\xE0\xED\xED\xFB\xE5, \xED\xE0\xE1\xF0\xE0\xED\xED\xFB\xE5 \xEB\xE0\xF2\xE8\xED\xE8\xF6\xE5\xE9.
-\xC4\xF0\xF3\xE3\xEE\xE9 \xEF\xEE\xF0\xFF\xE4\xEE\xEA (\xF1\xED\xE0\xF7\xE0\xEB\xE0 \xEB\xE0\xF2\xE8\xED\xE8\xF6\xE0, \xEF\xEE\xF2\xEE\xEC \xEA\xE8\xF0\xE8\xEB\xEB\xE8\xF6\xE0) \xEC\xEE\xE6\xED\xEE \xEF\xEE\xEB\xF3\xF7\xE8\xF2\xFC, \xF3\xEA\xE0\xE7\xE0\xE2 \xF4\xE0\xE9\xEB \file{cp1251lc.csf}.
+\xC2 \xE7\xE0\xE2\xE8\xF1\xE8\xEC\xEE\xF1\xF2\xE8 \xEE\xF2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE8 \xF2\xE5\xEA\xF1\xF2\xE0 \xE2 bib-\xF4\xE0\xE9\xEB\xE5, \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE0\xF2\xFC \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xE9 csf-\xF4\xE0\xE9\xEB \xF1 \xEE\xEF\xE8\xF1\xE0\xED\xE8\xE5\xEC \xEA\xEE\xE4\xEE\xE2\xEE\xE9 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xFB \xE8 \xEF\xEE\xF0\xFF\xE4\xEA\xE0 \xF1\xEE\xF0\xF2\xE8\xF0\xEE\xE2\xEA\xE8, \xED\xE0\xEF\xF0\xE8\xEC\xE5\xF0, \file{cp1251.csf} \xE8\xE7 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{gost}.
-\xCF\xEE\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xF2\xE5\xEB\xFC\xED\xEE\xF1\xF2\xFC \xEA\xEE\xEC\xE0\xED\xE4, \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xEC\xE0\xFF \xE4\xEB\xFF \xEF\xEE\xEB\xED\xEE\xE9 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE5\xE9, \xE8\xEC\xE5\xE5\xF2 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xE2\xE8\xE4:
+\xCF\xEE\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xF2\xE5\xEB\xFC\xED\xEE\xF1\xF2\xFC \xEA\xEE\xEC\xE0\xED\xE4, \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xEC\xE0\xFF \xE4\xEB\xFF \xEF\xEE\xEB\xED\xEE\xE9 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE5\xE9 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 CP-1251, \xE8\xEC\xE5\xE5\xF2 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xE2\xE8\xE4:
\begin{verbatim}
-latex <tex-file>
+pdflatex <tex-file>
bibtex8 -H -c <csf-file> <aux-file>
-latex <tex-file>
-latex <tex-file>
+pdflatex <tex-file>
+pdflatex <tex-file>
\end{verbatim}
\xC7\xE4\xE5\xF1\xFC |<tex-file>| "--- \xF4\xE0\xE9\xEB \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0, |<aux-file>| "--- \xE8\xEC\xFF aux-\xF4\xE0\xE9\xEB\xE0, \xEA\xEE\xF2\xEE\xF0\xFB\xE9 \xE3\xE5\xED\xE5\xF0\xE8\xF0\xF3\xE5\xF2\xF1\xFF \xEF\xEE\xF1\xEB\xE5 \xEF\xE5\xF0\xE2\xEE\xE9 \xFD\xF2\xE0\xEF\xE0 \xEA\xEE\xEC\xEF\xE8\xEB\xFF\xF6\xE8\xE8 (\xF1\xEE\xE2\xEF\xE0\xE4\xE0\xE5\xF2 \xF1 \xE8\xEC\xE5\xED\xE5\xEC tex-\xF4\xE0\xE9\xEB\xE0), |<csf-file>| "--- \xF4\xE0\xE9\xEB \xEE\xEF\xE8\xF1\xE0\xED\xE8\xFF \xEA\xEE\xE4\xEE\xE2\xEE\xE9 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xFB \xE8 \xEF\xEE\xF0\xFF\xE4\xEA\xE0 \xF1\xEE\xF0\xF2\xE8\xF0\xEE\xE2\xEA\xE8.
+\xD1\xE1\xEE\xF0\xEA\xE0 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8:
+\begin{verbatim}
+pdflatex <tex-file>
+biber <bcf-file>
+pdflatex <tex-file>
+pdflatex <tex-file>
+\end{verbatim}
+
\section{\xC0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xFB \xEA\xE0\xED\xE4\xE8\xE4\xE0\xF2\xF1\xEA\xE8\xF5 \xE8 \xE4\xEE\xEA\xF2\xEE\xF0\xF1\xEA\xE8\xF5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE9}
\subsection{\xCE\xE1\xF9\xE8\xE9 \xF2\xE5\xEA\xF1\xF2}
@@ -457,18 +438,19 @@
\subsection{\xD1\xEF\xE8\xF1\xEE\xEA \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0}
\xC2 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE5 \xF1\xEF\xE8\xF1\xEE\xEA \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE4\xEE\xEB\xE6\xE5\xED \xE1\xFB\xF2\xFC \xEE\xF2\xE4\xE5\xEB\xE5\xED \xEE\xF2 \xF1\xEF\xE8\xF1\xEA\xE0 \xF6\xE8\xF2\xE8\xF0\xF3\xE5\xEC\xEE\xE9 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB.
-\xC4\xEB\xFF \xFD\xF2\xEE\xE3\xEE \xE2 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF5 \xF1 \xEE\xE4\xED\xEE\xE1\xE0\xE9\xF2\xEE\xE2\xEE\xE9 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xEE\xE9 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xF2\xF1\xFF \xEF\xE0\xEA\xE5\xF2 \pkg{multibib}, \xE0 \xE4\xEB\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8 --- \xEF\xE0\xEA\xE5\xF2 Bib\LaTeX{}.
+\xC4\xEB\xFF \xFD\xF2\xEE\xE3\xEE \xE2 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF5 \xF1 \xEE\xE4\xED\xEE\xE1\xE0\xE9\xF2\xEE\xE2\xEE\xE9 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xEE\xE9 \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xF2\xF1\xFF \xEF\xE0\xEA\xE5\xF2 \pkg{multibib}, \xE0 \xE4\xEB\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8 "--- \xEF\xE0\xEA\xE5\xF2 Bib\LaTeX{}.
\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xF1\xFB\xEB\xEE\xEA \xED\xE0 \xF0\xE0\xE1\xEE\xF2\xFB \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE4\xEE\xEB\xE6\xED\xEE \xED\xE0\xF5\xEE\xE4\xE8\xF2\xFC\xF1\xFF \xE2 \xF4\xE0\xE9\xEB\xE5 \file{thesis.bib} \xE2\xEC\xE5\xF1\xF2\xE5 \xF1 \xEE\xF1\xF2\xE0\xEB\xFC\xED\xFB\xEC\xE8 \xF1\xF1\xFB\xEB\xEA\xE0\xEC\xE8.
\xD1\xE1\xEE\xF0\xEA\xE0 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE0 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8 \xEE\xF1\xF3\xF9\xE5\xF1\xF2\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xEC \xF1\xEF\xEE\xF1\xEE\xE1\xEE\xEC.
\xCF\xEE\xF1\xEA\xEE\xEB\xFC\xEA\xF3 \xEF\xE0\xEA\xE5\xF2 \pkg{multibib} \xF1\xEE\xE7\xE4\xE0\xE5\xF2 \xEE\xF2\xE4\xE5\xEB\xFC\xED\xFB\xE5 |aux|-\xF4\xE0\xE9\xEB\xFB \xE4\xEB\xFF \xEA\xE0\xE6\xE4\xEE\xE9 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8, \xEF\xEE\xEB\xED\xE0\xFF \xF1\xE1\xEE\xF0\xEA\xE0 \xE0\xE2\xF2\xEE\xF0\xE5\xF4\xE5\xF0\xE0\xF2\xE0 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 CP-1251 \xE2\xFB\xEF\xEE\xEB\xED\xFF\xE5\xF2\xF1\xFF \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE9 \xEF\xEE\xF1\xEB\xE5\xE4\xEE\xE2\xE0\xF2\xE5\xEB\xFC\xED\xEE\xF1\xF2\xFC\xFE \xEA\xEE\xEC\xE0\xED\xE4:
\begin{verbatim}
-latex autoref
+pdflatex autoref
bibtex8 -H -c cp1251 autoref
bibtex8 -H -c cp1251 my
-latex autoref
-latex autoref
+pdflatex autoref
+pdflatex autoref
\end{verbatim}
+\xC2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE5 UTF-8 \xF1\xE1\xEE\xF0\xEA\xE0 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE4\xE2\xF3\xEC\xFF \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xFF\xEC\xE8 \xED\xE5 \xEE\xF2\xEB\xE8\xF7\xE0\xE5\xF2\xF1\xFF \xEE\xF2 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xEE\xE9.
\xCE\xEF\xE5\xF0\xE0\xF6\xE8\xFF \xEF\xEE\xEB\xED\xEE\xE9 \xF1\xE1\xEE\xF0\xEA\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xEE\xF1\xF3\xF9\xE5\xF1\xF2\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xEA\xEE\xEC\xE0\xED\xE4\xEE\xE9:
\begin{verbatim}
Modified: trunk/Master/texmf-dist/doc/latex/disser/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/nomake.cmd 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/nomake.cmd 2017-03-05 21:37:27 UTC (rev 43400)
@@ -12,12 +12,9 @@
set target=disser
set subclass=gost732
-set bst=gost705
set manual=manual
set clsfiles=*.cls *.rtx
-set bstfiles=gost705.bst gost705s.bst
-set csffiles=*.csf
set docfiles=%target%.pdf %subclass%.pdf %bst%.pdf %manual%.pdf
set textfiles=..\README ..\README.ru ..\ChangeLog
set srcfiles=*.dtx %target%.ins dtx.ist %manual%.tex Makefile nomake.cmd
@@ -25,14 +22,12 @@
if "!texmf!"=="" set texmf=%allusersprofile%\Application Data\MiKTeX\2.9
if "!destdir!"=="" set destdir=!texmf!
if "!clsdir!"=="" set clsdir=!destdir!\tex\latex\%target%
-if "!bstdir!"=="" set bstdir=!destdir!\bibtex\bst\%target%
-if "!csfdir!"=="" set csfdir=!destdir!\bibtex\csf\%target%
if "!docdir!"=="" set docdir=!destdir!\doc\latex\%target%
if "!srcdir!"=="" set srcdir=!destdir!\source\latex\%target%
if "!clext!"=="" set clext=*.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof ^
*.lot *.lol *.bbl *.blg *.bak *.dvi *.ps *.pdf *.synctex *.synctex.gz
-if "!clfiles!"=="" set clfiles=!clext! %clsfiles% %bstfiles%
+if "!clfiles!"=="" set clfiles=!clext! %clsfiles%
if "!latex!"=="" set latex=latex
if "!pdflatex!"=="" set pdflatex=pdflatex
@@ -98,13 +93,9 @@
:install
if not exist %target%.cls call :all
if not exist "!clsdir!" mkdir "!clsdir!"
- if not exist "!bstdir!" mkdir "!bstdir!"
- if not exist "!csfdir!" mkdir "!csfdir!"
if not exist "!docdir!" mkdir "!docdir!"
if not exist "!srcdir!" mkdir "!srcdir!"
for %%f in (%clsfiles%) do xcopy /y /i /f %%f "!clsdir!"
- for %%f in (%bstfiles%) do xcopy /y /i /f %%f "!bstdir!"
- for %%f in (%csffiles%) do xcopy /y /i /f %%f "!csfdir!"
for %%f in (%docfiles%) do xcopy /y /i /f %%f "!docdir!"
for %%f in (%textfiles%) do xcopy /y /i /f %%f "!docdir!"
for %%f in (%srcfiles%) do xcopy /y /i /f %%f "!srcdir!"
@@ -123,11 +114,6 @@
!pdflatex! !pdflatexflags! %subclass%.dtx
!pdflatex! !pdflatexflags! %subclass%.dtx
- !pdflatex! !pdflatexflags! %bst%.dtx
- !mi! !miflags! %bst%
- !pdflatex! !pdflatexflags! %bst%.dtx
- !pdflatex! !pdflatexflags! %bst%.dtx
-
!pdflatex! !pdflatexflags! %manual%.tex
!pdflatex! !pdflatexflags! %manual%.tex
goto :eof
@@ -139,8 +125,6 @@
:uninstall
rmdir /s /q "!clsdir!"
- rmdir /s /q "!bstdir!"
- rmdir /s /q "!csfdir!"
rmdir /s /q "!docdir!"
rmdir /s /q "!srcdir!"
goto :eof
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/Makefile 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/Makefile 2017-03-05 21:37:27 UTC (rev 43400)
@@ -8,6 +8,8 @@
DESTDIR ?= $(TEXMF)
DOCDIR ?= $(DESTDIR)/doc/latex/disser
+.PHONY: help install uninstall reinstall
+
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 $@
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -5,7 +5,8 @@
\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 \xE2 \xF1\xF2\xE8\xEB\xE5 \xE2\xFB\xE4\xE5\xEB\xE5\xED\xED\xEE\xE9 $\dfrac{1}{\epsilon_\infty}$.
\xD1\xF1\xFB\xEB\xEA\xE8 \xED\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xF3~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
-Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}. \xD1\xF1\xFB\xEB\xEA\xE0 \xED\xE0 \xF4\xEE\xF0\xEC\xF3\xEB\xF3~\eqref{e:Coulomb}
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+\xD1\xF1\xFB\xEB\xEA\xE0 \xED\xE0 \xF4\xEE\xF0\xEC\xF3\xEB\xF3~\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}\,
Added: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,2 +0,0 @@
-\appendix
-\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -6,6 +6,7 @@
pages = {173--180},
year = {1999},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Petrov_2001_Journal_23_12321,
@@ -16,6 +17,7 @@
pages = {12321--12328},
year = {2001},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Sidorov_2002_Journal_32_1531,
@@ -25,6 +27,7 @@
volume = {32},
pages = {1531--1540},
year = {2002},
+ keywords = {own},
}
@ARTICLE{Yoffe_1993_AP_42_173,
@@ -103,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
@@ -121,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
- authortype = {\xD1\xD8\xC0},
- title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xE7\xE0\xFF\xE2\xEA\xE0},
- number = {1095735},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {\xD1\xD8\xC0},
- pagetotal = {5 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authorcountry= {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
@PATENT{patent2,
- author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
- authortype = {\xD0\xD4},
- title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xEF\xE0\xF2.},
- number = {2000131736/09},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
- pagetotal = {2 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authorcountry= {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -4,7 +4,6 @@
subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
]{disser}
@@ -12,11 +11,26 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF2\xE5\xEA\xF1\xF2\xE5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage{tempora}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2 \xE8\xE7 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 TeX Live
+%\usepackage{cyrtimes}
+
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF4\xEE\xF0\xEC\xF3\xEB\xE0\xF5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
% \xCF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xE5 \xF0\xE8\xF1\xF3\xED\xEA\xE8 "\xE2 \xEE\xE1\xEE\xF0\xEA\xF3".
\usepackage{wrapfig}
@@ -42,6 +56,10 @@
%\def\conclusionname{\xC2\xFB\xE2\xEE\xE4\xFB}
%\def\bibname{\xCB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xE0}
+%
+% \xD2\xE8\xF2\xF3\xEB\xFC\xED\xFB\xE9 \xEB\xE8\xF1\xF2 \xED\xE0 \xF0\xF3\xF1\xF1\xEA\xEE\xEC \xFF\xE7\xFB\xEA\xE5
+%
+
\institution{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8}
% \xC8\xEC\xFF \xEB\xE8\xF6\xE0, \xE4\xEE\xEF\xF3\xF1\xEA\xE0\xFE\xF9\xE5\xE3\xEE \xEA \xE7\xE0\xF9\xE8\xF2\xE5 (\xE7\xE0\xE2. \xEA\xE0\xF4\xE5\xE4\xF0\xEE\xE9)
@@ -52,10 +70,13 @@
\topic{\xD2\xE5\xEC\xE0 \xF0\xE0\xE1\xEE\xF2\xFB}
% \xC0\xE2\xF2\xEE\xF0
-\author{\xD4\xC8\xCE \xF1\xF2\xF3\xE4\xE5\xED\xF2\xE0} % \xD4\xC8\xCE
-\group{1111/1} % \xC3\xF0\xF3\xEF\xEF\xE0
-\coursenum{111111} % \xCD\xEE\xEC\xE5\xF0 \xF1\xEF\xE5\xF6\xE8\xE0\xEB\xFC\xED\xEE\xF1\xF2\xE8
-\course{\xD4\xE8\xE7\xE8\xEA\xE0} % \xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xEF\xE5\xF6\xE8\xE0\xEB\xFC\xED\xEE\xF1\xF2\xE8
+\author{\xD4\xC8\xCE \xE0\xE2\xF2\xEE\xF0\xE0}
+% \xC3\xF0\xF3\xEF\xEF\xE0
+\group{1111/1}
+% \xCD\xEE\xEC\xE5\xF0 \xF1\xEF\xE5\xF6\xE8\xE0\xEB\xFC\xED\xEE\xF1\xF2\xE8
+\coursenum{111111}
+% \xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xEF\xE5\xF6\xE8\xE0\xEB\xFC\xED\xEE\xF1\xF2\xE8
+\course{\xD4\xE8\xE7\xE8\xEA\xE0}
% \xCD\xE0\xF3\xF7\xED\xFB\xE9 \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFC
\sa {\xD4\xC8\xCE \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFF}
@@ -83,7 +104,7 @@
%
%% Author
%\author{Author's Name} % Full Name
-%\course{Physics} % \xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xEF\xE5\xF6\xE8\xE0\xEB\xFC\xED\xEE\xF1\xF2\xE8
+%\course{Physics} % Specialization
%
%\group{} % Study Group
%
@@ -95,6 +116,11 @@
%\rev {P.\,P.~Petrov}
%\revstatus{Associate Professor}
%
+%% Consultant
+%\con{}
+%\conspec{}
+%\constatus{}
+%
%% City & Year
%\city{Saint Petersburg}
%\date{\number\year}
@@ -115,13 +141,17 @@
% \xC7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5
\input{concl}
-% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
-\newcommand\BibDash{"---}
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+%\newcommand\BibDash{}
% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
\let\BibEmph=\emph
-\bibliographystyle{gost705}
+\bibliographystyle{gost2008}
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
+% \xCF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF
+%\appendix
+%\input{a}
+
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,3 +1,19 @@
\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE3\xEB\xE0\xE2\xFB}
\section{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xE5\xEA\xF6\xE8\xE8}
+
+\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
+\nomenclature{$\epsilon_\infty$}{\xE2\xFB\xF1\xEE\xEA\xEE\xF7\xE0\xF1\xF2\xEE\xF2\xED\xE0\xFF \xE4\xE8\xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xEF\xF0\xEE\xED\xE8\xF6\xE0\xE5\xEC\xEE\xF1\xF2\xFC}
+\nomenclature{$\epsilon_0$}{\xF1\xF2\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xE4\xE8\xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xEF\xF0\xEE\xED\xE8\xF6\xE0\xE5\xEC\xEE\xF1\xF2\xFC}
+\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 \xE2 \xF1\xF2\xE8\xEB\xE5 \xE2\xFB\xE4\xE5\xEB\xE5\xED\xED\xEE\xE9 $\dfrac{1}{\epsilon_\infty}$.
+\xD1\xF1\xFB\xEB\xEA\xE8 \xED\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xF3~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
+Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+\xD1\xF1\xFB\xEB\xEA\xE0 \xED\xE0 \xF4\xEE\xF0\xEC\xF3\xEB\xF3~\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}
+\xE3\xE4\xE5 \nomencl{$\vec r_i$}{\xEA\xEE\xEE\xF0\xE4\xE8\xED\xE0\xF2\xE0 $i$-\xE9 \xF7\xE0\xF1\xF2\xE8\xF6\xFB}.
+
\section{\xC2\xFB\xE2\xEE\xE4\xFB \xEA \xEF\xE5\xF0\xE2\xEE\xE9 \xE3\xEB\xE0\xE2\xE5}
\ No newline at end of file
Added: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +0,0 @@
-\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,12 +1,12 @@
\documentclass[%
-autoref, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
-natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
-href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
-facsimile, % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE8 \xF3\xF7\xE5\xED\xEE\xE3\xEE \xF1\xE5\xEA\xF0\xE5\xF2\xE0\xF0\xFF
-colorlinks=true % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%,fixint=false % \xEE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
-%,times % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
-%,classified % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
+autoref, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
+natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
+href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
+colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
+%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
+%classified, % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
+facsimile, % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE8 \xF3\xF7\xE5\xED\xEE\xE3\xEE \xF1\xE5\xEA\xF0\xE5\xF2\xE0\xF0\xFF
]{disser}
\usepackage[
@@ -13,6 +13,11 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+\usepackage[autostyle]{csquotes}
+
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
@@ -29,8 +34,8 @@
% \xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xED\xE5\xF1\xEA\xEE\xEB\xFC\xEA\xE8\xF5 \xF1\xEF\xE8\xF1\xEA\xEE\xE2 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xE2 \xEE\xE4\xED\xEE\xEC \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE5
\usepackage{multibib}
% \xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xEA\xEE\xEC\xE0\xED\xE4 \xE4\xEB\xFF \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xF1\xEE\xE1\xF1\xF2\xE2\xE5\xED\xED\xFB\xF5 \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0
-% \xE2 \xEE\xF2\xE4\xE5\xEB\xFC\xED\xEE\xEC \xF0\xE0\xE7\xE4\xE5\xEB\xE5. \xC2 \xE4\xE0\xED\xED\xEE\xEC \xF1\xEB\xF3\xF7\xE0\xE5 \xF1\xF1\xFB\xEB\xEA\xE0 \xE1\xF3\xE4\xE5\xF2 \xE8\xEC\xE5\xF2\xFC \xE2\xE8\xE4 \citemy{...}.
-\newcites{my}{\xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE9}
+% \xE2 \xEE\xF2\xE4\xE5\xEB\xFC\xED\xEE\xEC \xF0\xE0\xE7\xE4\xE5\xEB\xE5. \xC2 \xE4\xE0\xED\xED\xEE\xEC \xF1\xEB\xF3\xF7\xE0\xE5 \xF1\xF1\xFB\xEB\xEA\xE0 \xE1\xF3\xE4\xE5\xF2 \xE8\xEC\xE5\xF2\xFC \xE2\xE8\xE4 \citeown{...}.
+\newcites{own}{\xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE9}
% \xCF\xF3\xF2\xFC \xEA \xF4\xE0\xE9\xEB\xE0\xEC \xF1 \xE8\xEB\xEB\xFE\xF1\xF2\xF0\xE0\xF6\xE8\xFF\xEC\xE8
\graphicspath{{fig/}}
@@ -58,20 +63,17 @@
\begin{center}
\xD0\xE0\xE1\xEE\xF2\xE0 \xE2\xFB\xEF\xEE\xEB\xED\xE5\xED\xE0 \xE2 \emph{\xED\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8}.
\end{center}
-\vskip1ex
-\begin{tabularx}{\linewidth}{lp{1cm}X}
-\xCD\xE0\xF3\xF7\xED\xFB\xE9 \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFC: & & \emph{\xF3\xF7\xE5\xED\xE0\xFF \xF1\xF2\xE5\xEF\xE5\xED\xFC}, \\
- & & \emph{\xF3\xF7\xE5\xED\xEE\xE5 \xE7\xE2\xE0\xED\xE8\xE5}, \\
- & & \emph{\xF4\xE0\xEC\xE8\xEB\xE8\xFF \xE8\xEC\xFF \xEE\xF2\xF7\xE5\xF1\xF2\xE2\xEE}
-\\
-\xCE\xF4\xE8\xF6\xE8\xE0\xEB\xFC\xED\xFB\xE5 \xEE\xEF\xEF\xEE\xED\xE5\xED\xF2\xFB: & & \emph{\xF3\xF7\xE5\xED\xE0\xFF \xF1\xF2\xE5\xEF\xE5\xED\xFC}, \\
- & & \emph{\xF3\xF7\xE5\xED\xEE\xE5 \xE7\xE2\xE0\xED\xE8\xE5}, \\
- & & \emph{\xF4\xE0\xEC\xE8\xEB\xE8\xFF \xE8\xEC\xFF \xEE\xF2\xF7\xE5\xF1\xF2\xE2\xEE}\\
- & & \emph{\xF3\xF7\xE5\xED\xE0\xFF \xF1\xF2\xE5\xEF\xE5\xED\xFC}, \\
- & & \emph{\xF3\xF7\xE5\xED\xEE\xE5 \xE7\xE2\xE0\xED\xE8\xE5}, \\
- & & \emph{\xF4\xE0\xEC\xE8\xEB\xE8\xFF \xE8\xEC\xFF \xEE\xF2\xF7\xE5\xF1\xF2\xE2\xEE}
-\\
-\xC2\xE5\xE4\xF3\xF9\xE0\xFF \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xFF: & & \emph{\xED\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8}\\
+\vskip1ex\noindent
+\begin{tabularx}{\linewidth}{@{}lX@{}}
+ \textbf{\xCD\xE0\xF3\xF7\xED\xFB\xE9 \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFC:} & \textbf{\xF4\xE0\xEC\xE8\xEB\xE8\xFF \xE8\xEC\xFF \xEE\xF2\xF7\xE5\xF1\xF2\xE2\xEE}\\
+ & \xF3\xF7\xE5\xED\xE0\xFF \xF1\xF2\xE5\xEF\xE5\xED\xFC, \xF3\xF7\xE5\xED\xEE\xE5 \xE7\xE2\xE0\xED\xE8\xE5\\[6pt]
+ \textbf{\xCE\xF4\xE8\xF6\xE8\xE0\xEB\xFC\xED\xFB\xE5 \xEE\xEF\xEF\xEE\xED\xE5\xED\xF2\xFB:} & \textbf{\xF4\xE0\xEC\xE8\xEB\xE8\xFF \xE8\xEC\xFF \xEE\xF2\xF7\xE5\xF1\xF2\xE2\xEE}\\
+ & \xF3\xF7\xE5\xED\xE0\xFF \xF1\xF2\xE5\xEF\xE5\xED\xFC, \xF3\xF7\xE5\xED\xEE\xE5 \xE7\xE2\xE0\xED\xE8\xE5\\[6pt]
+ & \textbf{\xF4\xE0\xEC\xE8\xEB\xE8\xFF \xE8\xEC\xFF \xEE\xF2\xF7\xE5\xF1\xF2\xE2\xEE}\\
+ & \xF3\xF7\xE5\xED\xE0\xFF \xF1\xF2\xE5\xEF\xE5\xED\xFC, \xF3\xF7\xE5\xED\xEE\xE5 \xE7\xE2\xE0\xED\xE8\xE5\\[6pt]
+ & \textbf{\xF4\xE0\xEC\xE8\xEB\xE8\xFF \xE8\xEC\xFF \xEE\xF2\xF7\xE5\xF1\xF2\xE2\xEE}\\
+ & \xF3\xF7\xE5\xED\xE0\xFF \xF1\xF2\xE5\xEF\xE5\xED\xFC, \xF3\xF7\xE5\xED\xEE\xE5 \xE7\xE2\xE0\xED\xE8\xE5\\[6pt]
+ \textbf{\xC2\xE5\xE4\xF3\xF9\xE0\xFF \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xFF:} & \xED\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8
\end{tabularx}
\vskip2ex\noindent
@@ -163,19 +165,19 @@
\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5 \xEF\xE5\xF0\xE2\xEE\xE9 \xE3\xEB\xE0\xE2\xFB.
-\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xEF\xE5\xF0\xE2\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citemy{Ivanov_1999_Journal_17_173}.
+\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xEF\xE5\xF0\xE2\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citeown{Ivanov_1999_Journal_17_173}.
\textbf{\xC2\xEE \xE2\xF2\xEE\xF0\xEE\xE9 \xE3\xEB\xE0\xE2\xE5} ...
\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5 \xE2\xF2\xEE\xF0\xEE\xE9 \xE3\xEB\xE0\xE2\xFB.
-\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xE2\xF2\xEE\xF0\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citemy{Petrov_2001_Journal_23_12321}.
+\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xE2\xF2\xEE\xF0\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citeown{Petrov_2001_Journal_23_12321}.
\textbf{\xC2 \xF2\xF0\xE5\xF2\xFC\xE5\xE9 \xE3\xEB\xE0\xE2\xE5} ...
\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5 \xF2\xF0\xE5\xF2\xFC\xE5\xE9 \xE3\xEB\xE0\xE2\xFB.
-\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xF2\xF0\xE5\xF2\xFC\xE5\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citemy{Sidorov_2002_Journal_32_1531}.
+\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xF2\xF0\xE5\xF2\xFC\xE5\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citeown{Sidorov_2002_Journal_32_1531}.
\textbf{\xC2 \xC7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE8}
@@ -182,12 +184,10 @@
% ----------------------------------------------------------------
\renewcommand\bibsection{\nsection{\xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE9}}
-% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF.
-%\newcommand\BibDash{--- }
-% \xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xE2\xFB\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC.
-%\newcommand\BibEmph[1]{\emph{#1}}
-\bibliographystylemy{gost705}
-\bibliographymy{thesis}
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF.
+%\newcommand\BibDash{}
+\bibliographystyleown{gost2008}
+\bibliographyown{thesis}
\renewcommand\bibsection{\nsection{\xD6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xED\xE0\xFF \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xE0}}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -60,7 +60,7 @@
\mkcommonsect{pub}{\xCF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE8.}{%
\xCC\xE0\xF2\xE5\xF0\xE8\xE0\xEB\xFB \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8 \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 $N$ \xEF\xE5\xF7\xE0\xF2\xED\xFB\xF5 \xF0\xE0\xE1\xEE\xF2\xE0\xF5, \xE8\xE7 \xED\xE8\xF5 $n_1$
-\xF1\xF2\xE0\xF2\xE5\xE9 \xE2 \xF0\xE5\xF6\xE5\xED\xE7\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xE6\xF3\xF0\xED\xE0\xEB\xE0\xF5~\citemy{Ivanov_1999_Journal_17_173,
+\xF1\xF2\xE0\xF2\xE5\xE9 \xE2 \xF0\xE5\xF6\xE5\xED\xE7\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xE6\xF3\xF0\xED\xE0\xEB\xE0\xF5~\citeown{Ivanov_1999_Journal_17_173,
Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ \xF1\xF2\xE0\xF2\xE5\xE9 \xE2
\xF1\xE1\xEE\xF0\xED\xE8\xEA\xE0\xF5 \xF2\xF0\xF3\xE4\xEE\xE2 \xEA\xEE\xED\xF4\xE5\xF0\xE5\xED\xF6\xE8\xE9 \xE8 $n_3$ \xF2\xE5\xE7\xE8\xF1\xEE\xE2 \xE4\xEE\xEA\xEB\xE0\xE4\xEE\xE2.
}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/defs.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/defs.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/defs.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,9 +0,0 @@
-% \xD1\xEF\xE8\xF1\xEE\xEA \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xE9 \xE8 \xF3\xF1\xEB\xEE\xE2\xED\xFB\xF5 \xEE\xE1\xEE\xE7\xED\xE0\xF7\xE5\xED\xE8\xE9
-\defs
-
-\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}}
-$\vec A$ & --- & \xE2\xE5\xEA\xF2\xEE\xF0\xED\xFB\xE9 \xEF\xEE\xF2\xE5\xED\xF6\xE8\xE0\xEB\\
-$I$ & --- & \xE8\xED\xF2\xE5\xED\xF1\xE8\xE2\xED\xEE\xF1\xF2\xFC \xF1\xE2\xE5\xF2\xE0\\
-$j_l$ & --- & \xF1\xF4\xE5\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xF4\xF3\xED\xEA\xF6\xE8\xFF \xC1\xE5\xF1\xF1\xE5\xEB\xFF \xEF\xE5\xF0\xE2\xEE\xE3\xEE \xF0\xEE\xE4\xE0\\
-$Y_{lm}$ & --- & \xF1\xF4\xE5\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xE3\xE0\xF0\xEC\xEE\xED\xE8\xEA\xE0\\
-\end{longtable}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -8,7 +8,7 @@
\actualitysection
\actualitytext
-% \xD6\xE5\xEB\xFC \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xEE\xED\xED\xEE\xE9 \xF0\xE0\xE1\xEE\xF2\xFB
+% \xD6\xE5\xEB\xE8 \xE8 \xE7\xE0\xE4\xE0\xF7\xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xEE\xED\xED\xEE\xE9 \xF0\xE0\xE1\xEE\xF2\xFB
\objectivesection
\objectivetext
@@ -16,7 +16,7 @@
\noveltysection
\noveltytext
-% \xCF\xF0\xE0\xEA\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xF6\xE5\xED\xED\xEE\xF1\xF2\xFC
+% \xD2\xE5\xEE\xF0\xE5\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xE8 \xEF\xF0\xE0\xEA\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xE7\xED\xE0\xF7\xE8\xEC\xEE\xF1\xF2\xFC
\valuesection
\valuetext
@@ -24,7 +24,7 @@
\resultssection
\resultstext
-% \xC0\xEF\xF0\xEE\xE1\xE0\xF6\xE8\xFF \xF0\xE0\xE1\xEE\xF2\xFB
+% \xD1\xF2\xE5\xEF\xE5\xED\xFC \xE4\xEE\xF1\xF2\xEE\xE2\xE5\xF0\xED\xEE\xF1\xF2\xE8 \xE8 \xE0\xEF\xF0\xEE\xE1\xE0\xF6\xE8\xFF \xF0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xEE\xE2
\approbationsection
\approbationtext
@@ -38,4 +38,4 @@
% \xD1\xF2\xF0\xF3\xEA\xF2\xF3\xF0\xE0 \xE8 \xEE\xE1\xFA\xE5\xEC \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8
\structsection
-\structtext
\ No newline at end of file
+\structtext
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -6,6 +6,7 @@
pages = {173--180},
year = {1999},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Petrov_2001_Journal_23_12321,
@@ -16,6 +17,7 @@
pages = {12321--12328},
year = {2001},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Sidorov_2002_Journal_32_1531,
@@ -25,6 +27,7 @@
volume = {32},
pages = {1531--1540},
year = {2002},
+ keywords = {own},
}
@ARTICLE{Yoffe_1993_AP_42_173,
@@ -103,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
@@ -121,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
- authortype = {\xD1\xD8\xC0},
- title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xE7\xE0\xFF\xE2\xEA\xE0},
- number = {1095735},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {\xD1\xD8\xC0},
- pagetotal = {5 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authorcountry= {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
@PATENT{patent2,
- author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
- authortype = {\xD0\xD4},
- title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xEF\xE0\xF2.},
- number = {2000131736/09},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
- pagetotal = {2 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authorcountry= {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -4,7 +4,6 @@
subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
%classified, % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
%facsimile, % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0
@@ -14,11 +13,37 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% \xD1\xEF\xE8\xF1\xEE\xEA \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xE9 \xE8 \xF3\xF1\xEB\xEE\xE2\xED\xFB\xF5 \xEE\xE1\xEE\xE7\xED\xE0\xF7\xE5\xED\xE8\xE9
+\usepackage[intoc,nocfg,russian]{nomencl}
+\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}}
+\setlength{\nomlabelwidth}{3em}
+\setlength{\nomitemsep}{-\parsep}
+\renewcommand{\nomlabel}[1]{#1 ---}
+\makenomenclature
+
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF2\xE5\xEA\xF1\xF2\xE5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage{tempora}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2 \xE8\xE7 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 TeX Live
+%\usepackage{cyrtimes}
+
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF4\xEE\xF0\xEC\xF3\xEB\xE0\xF5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
+% \xCF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xE5 \xF0\xE8\xF1\xF3\xED\xEA\xE8 "\xE2 \xEE\xE1\xEE\xF0\xEA\xF3".
+\usepackage{wrapfig}
+
% \xCD\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6 \xF1\xED\xE8\xE7\xF3 \xE8 \xEF\xEE \xF6\xE5\xED\xF2\xF0\xF3
%\pagestyle{footcenter}
%\chapterpagestyle{footcenter}
@@ -27,7 +52,7 @@
%\setcitestyle{semicolon}
% \xD1\xF1\xFB\xEB\xEA\xE8 \xED\xE0 \xF0\xE0\xE1\xEE\xF2\xFB \xF1\xEE\xE8\xF1\xEA\xE0\xF2\xE5\xEB\xFF \xE2\xEA\xEB\xFE\xF7\xE0\xFE\xF2\xF1\xFF \xE2 \xEE\xE1\xF9\xE8\xE9 \xF1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
-\let\citemy=\cite
+\let\citeown=\cite
% \xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xEE\xEB\xF3\xE6\xE8\xF0\xED\xEE\xE5 \xED\xE0\xF7\xE5\xF0\xF2\xE0\xED\xE8\xE5 \xE4\xEB\xFF \xE2\xE5\xEA\xF2\xEE\xF0\xEE\xE2
\let\vec=\mathbf
@@ -114,16 +139,16 @@
\input{concl}
% \xD1\xEF\xE8\xF1\xEE\xEA \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xE9 \xE8 \xF3\xF1\xEB\xEE\xE2\xED\xFB\xF5 \xEE\xE1\xEE\xE7\xED\xE0\xF7\xE5\xED\xE8\xE9
-%\input{defs}
+\printnomenclature
% \xD1\xEB\xEE\xE2\xE0\xF0\xFC \xF2\xE5\xF0\xEC\xE8\xED\xEE\xE2
%\input{dict}
-% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
-\newcommand\BibDash{"---}
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+%\newcommand\BibDash{}
% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
\let\BibEmph=\emph
-\bibliographystyle{gost705}
+\bibliographystyle{gost2008}
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
@@ -133,6 +158,6 @@
% \xCF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF
%\appendix
-%\input{app-a}
+%\input{a}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,3 +1,19 @@
\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE3\xEB\xE0\xE2\xFB}
\section{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xE5\xEA\xF6\xE8\xE8}
+
+\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
+\nomenclature{$\epsilon_\infty$}{\xE2\xFB\xF1\xEE\xEA\xEE\xF7\xE0\xF1\xF2\xEE\xF2\xED\xE0\xFF \xE4\xE8\xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xEF\xF0\xEE\xED\xE8\xF6\xE0\xE5\xEC\xEE\xF1\xF2\xFC}
+\nomenclature{$\epsilon_0$}{\xF1\xF2\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xE4\xE8\xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xEF\xF0\xEE\xED\xE8\xF6\xE0\xE5\xEC\xEE\xF1\xF2\xFC}
+\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 \xE2 \xF1\xF2\xE8\xEB\xE5 \xE2\xFB\xE4\xE5\xEB\xE5\xED\xED\xEE\xE9 $\dfrac{1}{\epsilon_\infty}$.
+\xD1\xF1\xFB\xEB\xEA\xE8 \xED\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xF3~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
+Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+\xD1\xF1\xFB\xEB\xEA\xE0 \xED\xE0 \xF4\xEE\xF0\xEC\xF3\xEB\xF3~\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}
+\xE3\xE4\xE5 \nomencl{$\vec r_i$}{\xEA\xEE\xEE\xF0\xE4\xE8\xED\xE0\xF2\xE0 $i$-\xE9 \xF7\xE0\xF1\xF2\xE8\xF6\xFB}.
+
\section{\xC2\xFB\xE2\xEE\xE4\xFB \xEA \xEF\xE5\xF0\xE2\xEE\xE9 \xE3\xEB\xE0\xE2\xE5}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile 2017-03-05 21:37:27 UTC (rev 43400)
@@ -19,7 +19,7 @@
env TARGET=autoref $(MAKE) pdf ;\
eval unset TARGET
-alldvi
+alldvi:
@env TARGET=thesis $(MAKE) dvi ;\
env TARGET=autoref $(MAKE) dvi ;\
eval unset TARGET
Added: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +0,0 @@
-\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,12 +1,12 @@
\documentclass[%
-autoref, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
-natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
-href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
-facsimile, % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE8 \xF3\xF7\xE5\xED\xEE\xE3\xEE \xF1\xE5\xEA\xF0\xE5\xF2\xE0\xF0\xFF
-colorlinks=true % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%,fixint=false % \xEE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
-%,times % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
-%,classified % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
+autoref, % \xF2\xE8\xEF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0
+natbib, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 natbib \xE4\xEB\xFF "\xF1\xE6\xE0\xF2\xE8\xFF" \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE9
+href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
+colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
+%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
+%classified, % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
+facsimile, % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0 \xE8 \xF3\xF7\xE5\xED\xEE\xE3\xEE \xF1\xE5\xEA\xF0\xE5\xF2\xE0\xF0\xFF
]{disser}
\usepackage[
@@ -13,6 +13,11 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+\usepackage[autostyle]{csquotes}
+
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
@@ -29,8 +34,8 @@
% \xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xED\xE5\xF1\xEA\xEE\xEB\xFC\xEA\xE8\xF5 \xF1\xEF\xE8\xF1\xEA\xEE\xE2 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xE2 \xEE\xE4\xED\xEE\xEC \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE5
\usepackage{multibib}
% \xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xEA\xEE\xEC\xE0\xED\xE4 \xE4\xEB\xFF \xF6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF \xF1\xEE\xE1\xF1\xF2\xE2\xE5\xED\xED\xFB\xF5 \xF0\xE0\xE1\xEE\xF2 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0
-% \xE2 \xEE\xF2\xE4\xE5\xEB\xFC\xED\xEE\xEC \xF0\xE0\xE7\xE4\xE5\xEB\xE5. \xC2 \xE4\xE0\xED\xED\xEE\xEC \xF1\xEB\xF3\xF7\xE0\xE5 \xF1\xF1\xFB\xEB\xEA\xE0 \xE1\xF3\xE4\xE5\xF2 \xE8\xEC\xE5\xF2\xFC \xE2\xE8\xE4 \citemy{...}.
-\newcites{my}{\xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE9}
+% \xE2 \xEE\xF2\xE4\xE5\xEB\xFC\xED\xEE\xEC \xF0\xE0\xE7\xE4\xE5\xEB\xE5. \xC2 \xE4\xE0\xED\xED\xEE\xEC \xF1\xEB\xF3\xF7\xE0\xE5 \xF1\xF1\xFB\xEB\xEA\xE0 \xE1\xF3\xE4\xE5\xF2 \xE8\xEC\xE5\xF2\xFC \xE2\xE8\xE4 \citeown{...}.
+\newcites{own}{\xD1\xEF\xE8\xF1\xEE\xEA \xEF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE9}
% \xCF\xF3\xF2\xFC \xEA \xF4\xE0\xE9\xEB\xE0\xEC \xF1 \xE8\xEB\xEB\xFE\xF1\xF2\xF0\xE0\xF6\xE8\xFF\xEC\xE8
\graphicspath{{fig/}}
@@ -54,6 +59,7 @@
% \xC2\xED\xF3\xF2\xF0\xE5\xED\xED\xFF\xFF \xF1\xF2\xEE\xF0\xEE\xED\xE0 \xEE\xE1\xEB\xEE\xE6\xEA\xE8
\thispagestyle{empty}
\vspace*{-2cm}
+\noindent
\begin{center}
\xD0\xE0\xE1\xEE\xF2\xE0 \xE2\xFB\xEF\xEE\xEB\xED\xE5\xED\xE0 \xE2 \emph{\xED\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8}.
\end{center}
@@ -69,6 +75,7 @@
& \xF3\xF7\xE5\xED\xE0\xFF \xF1\xF2\xE5\xEF\xE5\xED\xFC, \xF3\xF7\xE5\xED\xEE\xE5 \xE7\xE2\xE0\xED\xE8\xE5\\[6pt]
\textbf{\xC2\xE5\xE4\xF3\xF9\xE0\xFF \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xFF:} & \xED\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8
\end{tabularx}
+
\vskip2ex\noindent
\xC7\xE0\xF9\xE8\xF2\xE0 \xF1\xEE\xF1\xF2\xEE\xE8\xF2\xF1\xFF \datefield{} \xE2 \rule[0pt]{1cm}{0.5pt} \xF7\xE0\xF1\xEE\xE2
\xED\xE0 \xE7\xE0\xF1\xE5\xE4\xE0\xED\xE8\xE8 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xEE\xED\xED\xEE\xE3\xEE \xF1\xEE\xE2\xE5\xF2\xE0 \emph{\xF8\xE8\xF4\xF0 \xF1\xEE\xE2\xE5\xF2\xE0} \xEF\xF0\xE8 \emph{\xED\xE0\xE7\xE2\xE0\xED\xE8\xE5
@@ -158,19 +165,19 @@
\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5 \xEF\xE5\xF0\xE2\xEE\xE9 \xE3\xEB\xE0\xE2\xFB.
-\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xEF\xE5\xF0\xE2\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citemy{Ivanov_1999_Journal_17_173}.
+\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xEF\xE5\xF0\xE2\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citeown{Ivanov_1999_Journal_17_173}.
\textbf{\xC2\xEE \xE2\xF2\xEE\xF0\xEE\xE9 \xE3\xEB\xE0\xE2\xE5} ...
\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5 \xE2\xF2\xEE\xF0\xEE\xE9 \xE3\xEB\xE0\xE2\xFB.
-\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xE2\xF2\xEE\xF0\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citemy{Petrov_2001_Journal_23_12321}.
+\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xE2\xF2\xEE\xF0\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citeown{Petrov_2001_Journal_23_12321}.
\textbf{\xC2 \xF2\xF0\xE5\xF2\xFC\xE5\xE9 \xE3\xEB\xE0\xE2\xE5} ...
\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5 \xF2\xF0\xE5\xF2\xFC\xE5\xE9 \xE3\xEB\xE0\xE2\xFB.
-\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xF2\xF0\xE5\xF2\xFC\xE5\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citemy{Sidorov_2002_Journal_32_1531}.
+\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xF2\xF0\xE5\xF2\xFC\xE5\xE9 \xE3\xEB\xE0\xE2\xFB \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 \xF0\xE0\xE1\xEE\xF2\xE5~\citeown{Sidorov_2002_Journal_32_1531}.
\textbf{\xC2 \xC7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE8}
@@ -179,8 +186,8 @@
% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF.
%\newcommand\BibDash{}
-\bibliographystylemy{gost2008}
-\bibliographymy{thesis}
+\bibliographystyleown{gost2008}
+\bibliographyown{thesis}
\renewcommand\bibsection{\nsection{\xD6\xE8\xF2\xE8\xF0\xEE\xE2\xE0\xED\xED\xE0\xFF \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xE0}}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -55,7 +55,7 @@
\mkcommonsect{pub}{\xCF\xF3\xE1\xEB\xE8\xEA\xE0\xF6\xE8\xE8.}{%
\xCC\xE0\xF2\xE5\xF0\xE8\xE0\xEB\xFB \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8 \xEE\xEF\xF3\xE1\xEB\xE8\xEA\xEE\xE2\xE0\xED\xFB \xE2 $N$ \xEF\xE5\xF7\xE0\xF2\xED\xFB\xF5 \xF0\xE0\xE1\xEE\xF2\xE0\xF5, \xE8\xE7 \xED\xE8\xF5 $n_1$
-\xF1\xF2\xE0\xF2\xE5\xE9 \xE2 \xF0\xE5\xF6\xE5\xED\xE7\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xE6\xF3\xF0\xED\xE0\xEB\xE0\xF5~\citemy{Ivanov_1999_Journal_17_173,
+\xF1\xF2\xE0\xF2\xE5\xE9 \xE2 \xF0\xE5\xF6\xE5\xED\xE7\xE8\xF0\xF3\xE5\xEC\xFB\xF5 \xE6\xF3\xF0\xED\xE0\xEB\xE0\xF5~\citeown{Ivanov_1999_Journal_17_173,
Petrov_2001_Journal_23_12321,Sidorov_2002_Journal_32_1531}, $n_2$ \xF1\xF2\xE0\xF2\xE5\xE9 \xE2
\xF1\xE1\xEE\xF0\xED\xE8\xEA\xE0\xF5 \xF2\xF0\xF3\xE4\xEE\xE2 \xEA\xEE\xED\xF4\xE5\xF0\xE5\xED\xF6\xE8\xE9 \xE8 $n_3$ \xF2\xE5\xE7\xE8\xF1\xEE\xE2 \xE4\xEE\xEA\xEB\xE0\xE4\xEE\xE2.
}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/defs.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/defs.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/defs.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,9 +0,0 @@
-% \xD1\xEF\xE8\xF1\xEE\xEA \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xE9 \xE8 \xF3\xF1\xEB\xEE\xE2\xED\xFB\xF5 \xEE\xE1\xEE\xE7\xED\xE0\xF7\xE5\xED\xE8\xE9
-\defs
-
-\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}}
-$\vec A$ & --- & \xE2\xE5\xEA\xF2\xEE\xF0\xED\xFB\xE9 \xEF\xEE\xF2\xE5\xED\xF6\xE8\xE0\xEB\\
-$I$ & --- & \xE8\xED\xF2\xE5\xED\xF1\xE8\xE2\xED\xEE\xF1\xF2\xFC \xF1\xE2\xE5\xF2\xE0\\
-$j_l$ & --- & \xF1\xF4\xE5\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xF4\xF3\xED\xEA\xF6\xE8\xFF \xC1\xE5\xF1\xF1\xE5\xEB\xFF \xEF\xE5\xF0\xE2\xEE\xE3\xEE \xF0\xEE\xE4\xE0\\
-$Y_{lm}$ & --- & \xF1\xF4\xE5\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xE3\xE0\xF0\xEC\xEE\xED\xE8\xEA\xE0\\
-\end{longtable}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -28,7 +28,7 @@
\methodssection
\methodstext
-% \xCF\xEE\xEB\xEE\xE6\xE5\xED\xE8\xFF, \xE2\xFB\xED\xEE\xF1\xE8\xEC\xFB\xE5 \xED\xE0 \xE7\xE0\xF9\xE8\xF2\xF3
+% \xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xFB \xE8 \xEF\xEE\xEB\xEE\xE6\xE5\xED\xE8\xFF, \xE2\xFB\xED\xEE\xF1\xE8\xEC\xFB\xE5 \xED\xE0 \xE7\xE0\xF9\xE8\xF2\xF3
\resultssection
\resultstext
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd 2017-03-05 21:37:27 UTC (rev 43400)
@@ -26,19 +26,20 @@
exit /b
:help
- echo all build DVI of autoref and thesis
- echo allpdf build PDF of autoref and thesis
+ echo all build PDF of autoref and thesis
+ echo allpdf build PDF of autoref and thesis
+ echo alldvi build DVI of autoref and thesis
%latexnmk% help
goto :eof
+:allpdf
+ set target=thesis & %latexnmk% pdf
+ set target=autoref & %latexnmk% pdf
+ set target=
+goto :eof
+
:alldvi
set target=thesis & %latexnmk% dvi
set target=autoref & %latexnmk% dvi
set target=
goto :eof
-
-:allpdf
- set target=thesis & %latexnmk% pdf
- set target=autoref & %latexnmk% pdf
- set target=
-goto :eof
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -6,6 +6,7 @@
pages = {173--180},
year = {1999},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Petrov_2001_Journal_23_12321,
@@ -16,6 +17,7 @@
pages = {12321--12328},
year = {2001},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Sidorov_2002_Journal_32_1531,
@@ -25,6 +27,7 @@
volume = {32},
pages = {1531--1540},
year = {2002},
+ keywords = {own},
}
@ARTICLE{Yoffe_1993_AP_42_173,
@@ -103,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
@@ -121,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
- authortype = {\xD1\xD8\xC0},
- title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xE7\xE0\xFF\xE2\xEA\xE0},
- number = {1095735},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {\xD1\xD8\xC0},
- pagetotal = {5 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authorcountry= {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
@PATENT{patent2,
- author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
- authortype = {\xD0\xD4},
- title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xEF\xE0\xF2.},
- number = {2000131736/09},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
- pagetotal = {2 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authorcountry= {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -4,7 +4,6 @@
subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
%classified, % \xE3\xF0\xE8\xF4 \xF1\xE5\xEA\xF0\xE5\xF2\xED\xEE\xF1\xF2\xE8
%facsimile, % \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xF4\xE0\xEA\xF1\xE8\xEC\xE8\xEB\xE5 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xED\xF2\xE0
@@ -14,11 +13,34 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% \xD1\xEF\xE8\xF1\xEE\xEA \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xE9 \xE8 \xF3\xF1\xEB\xEE\xE2\xED\xFB\xF5 \xEE\xE1\xEE\xE7\xED\xE0\xF7\xE5\xED\xE8\xE9
+\usepackage[intoc,nocfg,russian]{nomencl}
+\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}}
+\setlength{\nomlabelwidth}{3em}
+\setlength{\nomitemsep}{-\parsep}
+\renewcommand{\nomlabel}[1]{#1 ---}
+\makenomenclature
+
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF2\xE5\xEA\xF1\xF2\xE5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage{tempora}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2 \xE8\xE7 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 TeX Live
+%\usepackage{cyrtimes}
+
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF4\xEE\xF0\xEC\xF3\xEB\xE0\xF5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
% \xCD\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6 \xF1\xED\xE8\xE7\xF3 \xE8 \xEF\xEE \xF6\xE5\xED\xF2\xF0\xF3
%\pagestyle{footcenter}
%\chapterpagestyle{footcenter}
@@ -27,7 +49,7 @@
%\setcitestyle{semicolon}
% \xD1\xF1\xFB\xEB\xEA\xE8 \xED\xE0 \xF0\xE0\xE1\xEE\xF2\xFB \xF1\xEE\xE8\xF1\xEA\xE0\xF2\xE5\xEB\xFF \xE2\xEA\xEB\xFE\xF7\xE0\xFE\xF2\xF1\xFF \xE2 \xEE\xE1\xF9\xE8\xE9 \xF1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
-\let\citemy=\cite
+\let\citeown=\cite
% \xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xEE\xEB\xF3\xE6\xE8\xF0\xED\xEE\xE5 \xED\xE0\xF7\xE5\xF0\xF2\xE0\xED\xE8\xE5 \xE4\xEB\xFF \xE2\xE5\xEA\xF2\xEE\xF0\xEE\xE2
\let\vec=\mathbf
@@ -111,16 +133,16 @@
\input{concl}
% \xD1\xEF\xE8\xF1\xEE\xEA \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xE9 \xE8 \xF3\xF1\xEB\xEE\xE2\xED\xFB\xF5 \xEE\xE1\xEE\xE7\xED\xE0\xF7\xE5\xED\xE8\xE9
-%\input{defs}
+\printnomenclature
% \xD1\xEB\xEE\xE2\xE0\xF0\xFC \xF2\xE5\xF0\xEC\xE8\xED\xEE\xE2
%\input{dict}
-% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
-\newcommand\BibDash{"---}
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+%\newcommand\BibDash{}
% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
\let\BibEmph=\emph
-\bibliographystyle{gost705}
+\bibliographystyle{gost2008}
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
@@ -130,6 +152,6 @@
% \xCF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF
%\appendix
-%\input{app-a}
+%\input{a}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/master/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +1,17 @@
\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE3\xEB\xE0\xE2\xFB}
+\section{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xE5\xEA\xF6\xE8\xE8}
+
+\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
+\nomenclature{$\epsilon_\infty$}{\xE2\xFB\xF1\xEE\xEA\xEE\xF7\xE0\xF1\xF2\xEE\xF2\xED\xE0\xFF \xE4\xE8\xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xEF\xF0\xEE\xED\xE8\xF6\xE0\xE5\xEC\xEE\xF1\xF2\xFC}
+\nomenclature{$\epsilon_0$}{\xF1\xF2\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xE4\xE8\xFD\xEB\xE5\xEA\xF2\xF0\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xEF\xF0\xEE\xED\xE8\xF6\xE0\xE5\xEC\xEE\xF1\xF2\xFC}
+\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 \xE2 \xF1\xF2\xE8\xEB\xE5 \xE2\xFB\xE4\xE5\xEB\xE5\xED\xED\xEE\xE9 $\dfrac{1}{\epsilon_\infty}$.
+\xD1\xF1\xFB\xEB\xEA\xE8 \xED\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xF3~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
+Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+\xD1\xF1\xFB\xEB\xEA\xE0 \xED\xE0 \xF4\xEE\xF0\xEC\xF3\xEB\xF3~\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}
+\xE3\xE4\xE5 \nomencl{$\vec r_i$}{\xEA\xEE\xEE\xF0\xE4\xE8\xED\xE0\xF2\xE0 $i$-\xE9 \xF7\xE0\xF1\xF2\xE8\xF6\xFB}.
Added: trunk/Master/texmf-dist/doc/latex/disser/templates/master/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +0,0 @@
-\chapter{\xC7\xE0\xE3\xEE\xEB\xEE\xE2\xEE\xEA \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -6,6 +6,7 @@
pages = {173--180},
year = {1999},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Petrov_2001_Journal_23_12321,
@@ -16,6 +17,7 @@
pages = {12321--12328},
year = {2001},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Sidorov_2002_Journal_32_1531,
@@ -25,6 +27,7 @@
volume = {32},
pages = {1531--1540},
year = {2002},
+ keywords = {own},
}
@ARTICLE{Yoffe_1993_AP_42_173,
@@ -103,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
@@ -121,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
- authortype = {\xD1\xD8\xC0},
- title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xE7\xE0\xFF\xE2\xEA\xE0},
- number = {1095735},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {\xD1\xD8\xC0},
- pagetotal = {5 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authorcountry= {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
@PATENT{patent2,
- author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
- authortype = {\xD0\xD4},
- title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xEF\xE0\xF2.},
- number = {2000131736/09},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
- pagetotal = {2 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authorcountry= {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -4,7 +4,6 @@
subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
]{disser}
@@ -12,11 +11,37 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% \xD1\xEF\xE8\xF1\xEE\xEA \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xE9 \xE8 \xF3\xF1\xEB\xEE\xE2\xED\xFB\xF5 \xEE\xE1\xEE\xE7\xED\xE0\xF7\xE5\xED\xE8\xE9
+\usepackage[intoc,nocfg,russian]{nomencl}
+\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}}
+\setlength{\nomlabelwidth}{3em}
+\setlength{\nomitemsep}{-\parsep}
+\renewcommand{\nomlabel}[1]{#1 ---}
+\makenomenclature
+
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF2\xE5\xEA\xF1\xF2\xE5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage{tempora}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2 \xE8\xE7 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 TeX Live
+%\usepackage{cyrtimes}
+
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF4\xEE\xF0\xEC\xF3\xEB\xE0\xF5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
+% \xCF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xE5 \xF0\xE8\xF1\xF3\xED\xEA\xE8 "\xE2 \xEE\xE1\xEE\xF0\xEA\xF3".
+\usepackage{wrapfig}
+
% \xCD\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6 \xF1\xED\xE8\xE7\xF3 \xE8 \xEF\xEE \xF6\xE5\xED\xF2\xF0\xF3
%\pagestyle{footcenter}
%\chapterpagestyle{footcenter}
@@ -27,11 +52,12 @@
% \xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xEE\xEB\xF3\xE6\xE8\xF0\xED\xEE\xE5 \xED\xE0\xF7\xE5\xF0\xF2\xE0\xED\xE8\xE5 \xE4\xEB\xFF \xE2\xE5\xEA\xF2\xEE\xF0\xEE\xE2
\let\vec=\mathbf
+% \xCF\xF3\xF2\xFC \xEA \xF4\xE0\xE9\xEB\xE0\xEC \xF1 \xE8\xEB\xEB\xFE\xF1\xF2\xF0\xE0\xF6\xE8\xFF\xEC\xE8
+\graphicspath{{fig/}}
+
% \xC2\xEA\xEB\xFE\xF7\xE0\xF2\xFC \xEF\xEE\xE4\xF1\xE5\xEA\xF6\xE8\xE8 \xE2 \xEE\xE3\xEB\xE0\xE2\xEB\xE5\xED\xE8\xE5
\setcounter{tocdepth}{2}
-\graphicspath{{fig/}}
-
\begin{document}
% \xCF\xE5\xF0\xE5\xEE\xEF\xF0\xE5\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xF5 \xE7\xE0\xE3\xEE\xEB\xEE\xE2\xEA\xEE\xE2
@@ -39,6 +65,10 @@
%\def\conclusionname{\xC2\xFB\xE2\xEE\xE4\xFB}
%\def\bibname{\xCB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xE0}
+%
+% \xD2\xE8\xF2\xF3\xEB\xFC\xED\xFB\xE9 \xEB\xE8\xF1\xF2 \xED\xE0 \xF0\xF3\xF1\xF1\xEA\xEE\xEC \xFF\xE7\xFB\xEA\xE5
+%
+
\institution{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8}
% \xC8\xEC\xFF \xEB\xE8\xF6\xE0, \xE4\xEE\xEF\xF3\xF1\xEA\xE0\xFE\xF9\xE5\xE3\xEE \xEA \xE7\xE0\xF9\xE8\xF2\xE5 (\xE7\xE0\xE2. \xEA\xE0\xF4\xE5\xE4\xF0\xEE\xE9)
@@ -49,11 +79,14 @@
\topic{\xD2\xE5\xEC\xE0 \xE4\xE8\xF1\xF1\xE5\xF0\xF2\xE0\xF6\xE8\xE8}
% \xC0\xE2\xF2\xEE\xF0
-\author {\xD4\xC8\xCE \xE0\xE2\xF2\xEE\xF0\xE0} % \xD4\xC8\xCE
-\group {1111/1} % \xC3\xF0\xF3\xEF\xEF\xE0
-\coursenum {111111} % \xCD\xEE\xEC\xE5\xF0 \xED\xE0\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xFF
-\course {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xED\xE0\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xFF}
-\masterprognum{111111} % \xCD\xEE\xEC\xE5\xF0 \xEC\xE0\xE3\xE8\xF1\xF2\xE5\xF0\xF1\xEA\xEE\xE9 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xFB
+\author{\xD4\xC8\xCE \xE0\xE2\xF2\xEE\xF0\xE0}
+% \xC3\xF0\xF3\xEF\xEF\xE0
+\group{1111/1}
+% \xCD\xEE\xEC\xE5\xF0 \xED\xE0\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xFF
+\coursenum{111111}
+\course{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xED\xE0\xEF\xF0\xE0\xE2\xEB\xE5\xED\xE8\xFF}
+% \xCD\xEE\xEC\xE5\xF0 \xEC\xE0\xE3\xE8\xF1\xF2\xE5\xF0\xF1\xEA\xEE\xE9 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xFB
+\masterprognum{111111}
\masterprog {\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xFB}
% \xCD\xE0\xF3\xF7\xED\xFB\xE9 \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFC
@@ -101,7 +134,7 @@
%
%% Author
%\author{Author's Name} % Full Name
-%\course{Physics} % \xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xEF\xE5\xF6\xE8\xE0\xEB\xFC\xED\xEE\xF1\xF2\xE8
+%\course{Physics} % Specialization
%
%\group{} % Study Group
%\masterprog {Title of program}
@@ -127,27 +160,33 @@
% \xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5
\tableofcontents
+
% \xC2\xE2\xE5\xE4\xE5\xED\xE8\xE5
\input{intro}
-% \xC3\xEB\xE0\xE2\xE0 1
+
+% \xCE\xF1\xED\xEE\xE2\xED\xE0\xFF \xF7\xE0\xF1\xF2\xFC
+%% \xC3\xEB\xE0\xE2\xE0 1
\input{1}
-% \xC3\xEB\xE0\xE2\xE0 2
+%% \xC3\xEB\xE0\xE2\xE0 2
%\input{2}
% \xC7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5
\input{concl}
-% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
-\newcommand\BibDash{"---}
+% \xD1\xEF\xE8\xF1\xEE\xEA \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xE9 \xE8 \xF3\xF1\xEB\xEE\xE2\xED\xFB\xF5 \xEE\xE1\xEE\xE7\xED\xE0\xF7\xE5\xED\xE8\xE9
+\printnomenclature
+
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+%\newcommand\BibDash{}
% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
\let\BibEmph=\emph
-\bibliographystyle{gost705}
+\bibliographystyle{gost2008}
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
% \xCF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF
-\appendix
-\input{app-a}
+%\appendix
+%\input{a}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +1,15 @@
\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xE3\xEB\xE0\xE2\xFB}
+\section{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xF1\xE5\xEA\xF6\xE8\xE8}
+
+\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
+\xC2\xED\xF3\xF2\xF0\xE8\xF2\xE5\xEA\xF1\xF2\xEE\xE2\xE0\xFF \xF4\xEE\xF0\xEC\xF3\xEB\xE0 \xE2 \xF1\xF2\xE8\xEB\xE5 \xE2\xFB\xE4\xE5\xEB\xE5\xED\xED\xEE\xE9 $\dfrac{1}{\epsilon_\infty}$.
+\xD1\xF1\xFB\xEB\xEA\xE8 \xED\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xF3~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
+Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+\xD1\xF1\xFB\xEB\xEA\xE0 \xED\xE0 \xF4\xEE\xF0\xEC\xF3\xEB\xF3~\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}
+
Added: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +0,0 @@
-\chapter{\xC7\xE0\xE3\xEE\xEB\xEE\xE2\xEE\xEA \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -6,6 +6,7 @@
pages = {173--180},
year = {1999},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Petrov_2001_Journal_23_12321,
@@ -16,6 +17,7 @@
pages = {12321--12328},
year = {2001},
language = {russian},
+ keywords = {own},
}
@ARTICLE{Sidorov_2002_Journal_32_1531,
@@ -25,6 +27,7 @@
volume = {32},
pages = {1531--1540},
year = {2002},
+ keywords = {own},
}
@ARTICLE{Yoffe_1993_AP_42_173,
@@ -103,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {\xCC. \xC0. \xD1\xEA\xE2\xEE\xF0\xF6\xEE\xE2},
title = {\xD4\xEB\xF3\xEA\xF2\xF3\xE0\xF6\xE8\xEE\xED\xED\xFB\xE5 \xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xF0\xE5\xED\xF6\xE8\xEE\xED\xED\xFB\xE5 \xFD\xF4\xF4\xE5\xEA\xF2\xFB \xE2 \xEC\xE5\xE7\xEE\xF1\xEA\xEE\xEF\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF5},
school = {\xC8\xD2\xD4 \xE8\xEC. \xCB.~\xC4.~\xCB\xE0\xED\xE4\xE0\xF3},
@@ -121,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
- authortype = {\xD1\xD8\xC0},
- title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xE7\xE0\xFF\xE2\xEA\xE0},
- number = {1095735},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {\xD1\xD8\xC0},
- pagetotal = {5 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xDD. \xC2. \xD2\xE5\xF0\xED\xE5\xF0},
+ authorcountry= {\xD1\xD8\xC0},
+ title = {\xCE\xE4\xED\xEE\xF0\xE0\xE7\xEE\xE2\xE0\xFF \xF0\xE0\xEA\xE5\xF2\xE0-\xED\xEE\xF1\xE8\xF2\xE5\xEB\xFC},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xE7\xE0\xFF\xE2\xEA\xE0},
+ number = {1095735},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} B 64 G 1/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xD1\xEF\xE5\xE9\xF1 \xD1\xE8\xF1\xF2\xE5\xEC\xE7/\xCB\xEE\xF0\xE0\xEB, \xE8\xED\xEA.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {\xC1\xFE\xEB. \xB9 7 (I \xF7.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {\xD1\xD8\xC0},
+ pagetotal = {5 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
@PATENT{patent2,
- author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
- authortype = {\xD0\xD4},
- title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
- media = {\xD2\xE5\xEA\xF1\xF2},
- type = {\xEF\xE0\xF2.},
- number = {2000131736/09},
- location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
- ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
- holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
- credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
- pagetotal = {2 \xF1.~: \xE8\xEB.},
- language = {russian},
+ author = {\xC2. \xC8. \xD7\xF3\xE3\xE0\xE5\xE2\xE0},
+ authorcountry= {\xD0\xD4},
+ title = {\xCF\xF0\xE8\xE5\xEC\xEE\xEF\xE5\xF0\xE5\xE4\xE0\xFE\xF9\xE5\xE5 \xF3\xF1\xF2\xF0\xEE\xE9\xF1\xF2\xE2\xEE},
+ media = {\xD2\xE5\xEA\xF1\xF2},
+ type = {\xEF\xE0\xF2.},
+ number = {2000131736/09},
+ location = {\xD0\xEE\xF1. \xD4\xE5\xE4\xE5\xF0\xE0\xF6\xE8\xFF},
+ ipc = {\xCC\xCF\xCA\ensuremath{^7} H 04 \xC2 1/38, \xCD 04 J 13/00},
+ holder = {\xE7\xE0\xFF\xE2\xE8\xF2\xE5\xEB\xFC \xE8 \xEF\xE0\xF2\xE5\xED\xF2\xEE\xEE\xE1\xEB\xE0\xE4\xE0\xF2\xE5\xEB\xFC \xC2\xEE\xF0\xEE\xED\xE5\xE6. \xED\xE0\xF3\xF7.-\xE8\xF1\xEB\xE5\xE4. \xE8\xED-\xF2 \xF1\xE2\xFF\xE7\xE8.},
+ credits = {\xEF\xE0\xF2\xE5\xED\xF2. \xEF\xEE\xE2\xE5\xF0\xE5\xED\xED\xFB\xE9 \xC5\xE3\xEE\xF0\xEE\xE2\xE0 \xC3. \xC1.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {\xC1\xFE\xEB. \xB9 23 (II \xF7.)},
+ pagetotal = {2 \xF1.~: \xE8\xEB.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates/specialist/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -4,7 +4,6 @@
subf, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 subcaption \xE4\xEB\xFF \xE2\xEB\xEE\xE6\xE5\xED\xED\xEE\xE9 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE8 \xF0\xE8\xF1\xF3\xED\xEA\xEE\xE2
href, % \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2 hyperref \xE4\xEB\xFF \xF1\xEE\xE7\xE4\xE0\xED\xE8\xFF \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA
colorlinks, % \xF6\xE2\xE5\xF2\xED\xFB\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEA\xE8
-%times, % \xF8\xF0\xE8\xF4\xF2 Times \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
%fixint, % \xE2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEF\xF0\xFF\xEC\xFB\xE5 \xE7\xED\xE0\xEA\xE8 \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2
]{disser}
@@ -12,11 +11,29 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF2\xE5\xEA\xF1\xF2\xE5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage{tempora}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2 \xE8\xE7 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 TeX Live
+%\usepackage{cyrtimes}
+
+% \xD8\xF0\xE8\xF4\xF2 Times \xE2 \xF4\xEE\xF0\xEC\xF3\xEB\xE0\xF5 \xEA\xE0\xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xE9
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% \xE0\xEB\xFC\xF2\xE5\xF0\xED\xE0\xF2\xE8\xE2\xED\xFB\xE9 \xEF\xE0\xEA\xE5\xF2
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
+% \xCF\xEB\xE0\xE2\xE0\xFE\xF9\xE8\xE5 \xF0\xE8\xF1\xF3\xED\xEA\xE8 "\xE2 \xEE\xE1\xEE\xF0\xEA\xF3".
+\usepackage{wrapfig}
+
% \xCD\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6 \xF1\xED\xE8\xE7\xF3 \xE8 \xEF\xEE \xF6\xE5\xED\xF2\xF0\xF3
%\pagestyle{footcenter}
%\chapterpagestyle{footcenter}
@@ -43,25 +60,23 @@
% \xD2\xE8\xF2\xF3\xEB\xFC\xED\xFB\xE9 \xEB\xE8\xF1\xF2 \xED\xE0 \xF0\xF3\xF1\xF1\xEA\xEE\xEC \xFF\xE7\xFB\xEA\xE5
%
-% \xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8
\institution{\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5 \xEE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xE8}
% \xC8\xEC\xFF \xEB\xE8\xF6\xE0, \xE4\xEE\xEF\xF3\xF1\xEA\xE0\xFE\xF9\xE5\xE3\xEE \xEA \xE7\xE0\xF9\xE8\xF2\xE5 (\xE7\xE0\xE2. \xEA\xE0\xF4\xE5\xE4\xF0\xEE\xE9)
-\apname{\xE4.\,\xF4.-\xEC.\,\xED., \xEF\xF0\xEE\xF4\xE5\xF1\xF1\xEE\xF0 \xD1.\,C.~\xD1\xE8\xE4\xEE\xF0\xEE\xE2}
+\apname{\xD4\xC8\xCE \xE7\xE0\xE2. \xEA\xE0\xF4\xE5\xE4\xF0\xEE\xE9}
\title{\xC4\xE8\xEF\xEB\xEE\xEC\xED\xE0\xFF \xF0\xE0\xE1\xEE\xF2\xE0}
-% \xD2\xE5\xEC\xE0
\topic{<<\xD2\xE5\xEC\xE0 \xF0\xE0\xE1\xEE\xF2\xFB>>}
+% \xC0\xE2\xF2\xEE\xF0
+\author{\xD4\xC8\xCE \xE0\xE2\xF2\xEE\xF0\xE0}
% \xC3\xF0\xF3\xEF\xEF\xE0
\group{\xD1\xF2\xF3\xE4\xE5\xED\xF2\xE0 \xE3\xF0\xF3\xEF\xEF\xFB}
-% \xC0\xE2\xF2\xEE\xF0
-\author{\xD4\xC8\xCE \xE0\xE2\xF2\xEE\xF0\xE0}
% \xCD\xE0\xF3\xF7\xED\xFB\xE9 \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFC
-\sa {\xC8.\,\xC8.~\xC8\xE2\xE0\xED\xEE\xE2}
-\sastatus {\xE4.\,\xF4.-\xEC.\,\xED., \xEF\xF0\xEE\xF4\xE5\xF1\xF1\xEE\xF0}
+\sa {\xD4\xC8\xCE \xF0\xF3\xEA\xEE\xE2\xEE\xE4\xE8\xF2\xE5\xEB\xFF}
+\sastatus{\xE4.~\xF4.-\xEC.~\xED., \xF1\xF2.~\xED.~\xF1.}
% \xD0\xE5\xF6\xE5\xED\xE7\xE5\xED\xF2
\rev {\xCF.\,\xCF.~\xCF\xE5\xF2\xF0\xEE\xE2}
@@ -101,6 +116,11 @@
%\rev {P.\,P.~Petrov}
%\revstatus{Associate Professor}
%
+%% Consultant
+%\con{}
+%\conspec{}
+%\constatus{}
+%
%% City & Year
%\city{Saint Petersburg}
%\date{\number\year}
@@ -121,13 +141,17 @@
% \xC7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5
\input{concl}
-% \xC4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
-\newcommand\BibDash{"---}
+% \xCD\xE5 \xE4\xEE\xE1\xE0\xE2\xEB\xFF\xF2\xFC \xE4\xEB\xE8\xED\xED\xEE\xE5 \xF2\xE8\xF0\xE5 \xE2 \xEA\xE0\xF7\xE5\xF1\xF2\xE2\xE5 \xF0\xE0\xE7\xE4\xE5\xEB\xE8\xF2\xE5\xEB\xFF
+%\newcommand\BibDash{}
% \xC2\xFB\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xF3\xF0\xF1\xE8\xE2\xEE\xEC
\let\BibEmph=\emph
-\bibliographystyle{gost705}
+\bibliographystyle{gost2008}
% \xD1\xEF\xE8\xF1\xEE\xEA \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB
\bibliography{thesis}
+% \xCF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xFF
+%\appendix
+%\input{a}
+
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/Makefile 2017-03-05 21:37:27 UTC (rev 43400)
@@ -8,6 +8,8 @@
DESTDIR ?= $(TEXMF)
DOCDIR ?= $(DESTDIR)/doc/latex/disser
+.PHONY: help install uninstall reinstall
+
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 $@
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{Название приложения}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,2 +0,0 @@
-\appendix
-\chapter{Название приложения}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -106,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {М. А. Скворцов},
title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
school = {ИТФ им. Л.~Д.~Ландау},
@@ -124,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {Э. В. Тернер},
- authortype = {США},
- title = {Одноразовая ракета-носитель},
- media = {Текст},
- type = {заявка},
- number = {1095735},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} B 64 G 1/00},
- holder = {заявитель Спейс Системз/Лорал, инк.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {Бюл. № 7 (I ч.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {США},
- pagetotal = {5 с.~: ил.},
- language = {russian},
+ author = {Э. В. Тернер},
+ authorcountry= {США},
+ title = {Одноразовая ракета-носитель},
+ media = {Текст},
+ type = {заявка},
+ number = {1095735},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} B 64 G 1/00},
+ holder = {заявитель Спейс Системз/Лорал, инк.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {Бюл. № 7 (I ч.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {США},
+ pagetotal = {5 с.~: ил.},
+ language = {russian},
}
@PATENT{patent2,
- author = {В. И. Чугаева},
- authortype = {РФ},
- title = {Приемопередающее устройство},
- media = {Текст},
- type = {пат.},
- number = {2000131736/09},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
- holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {Бюл. № 23 (II ч.)},
- pagetotal = {2 с.~: ил.},
- language = {russian},
+ author = {В. И. Чугаева},
+ authorcountry= {РФ},
+ title = {Приемопередающее устройство},
+ media = {Текст},
+ type = {пат.},
+ number = {2000131736/09},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
+ holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {Бюл. № 23 (II ч.)},
+ pagetotal = {2 с.~: ил.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/bachelor/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,9 +1,9 @@
\documentclass[%
bachelor, % тип документа
+%natbib, % использовать пакет natbib для "сжатия" цитирований
subf, % использовать пакет subcaption для вложенной нумерации рисунков
href, % использовать пакет hyperref для создания гиперссылок
colorlinks, % цветные гиперссылки
-%times, % шрифт Times как основной
%fixint, % включить прямые знаки интегралов
]{disser}
@@ -11,12 +11,28 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
-\usepackage[style=gost-numeric,
+% Шрифт Times в тексте как основной
+%\usepackage{tempora}
+% альтернативный пакет из дистрибутива TeX Live
+%\usepackage{cyrtimes}
+
+% Шрифт Times в формулах как основной
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% альтернативный пакет
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
+\usepackage[%
+ style=gost-numeric,
backend=biber,
language=auto,
hyperref=auto,
@@ -51,6 +67,10 @@
%\def\conclusionname{Выводы}
%\def\bibname{Литература}
+%
+% Титульный лист на русском языке
+%
+
\institution{Название организации}
% Имя лица, допускающего к защите (зав. кафедрой)
@@ -61,10 +81,13 @@
\topic{Тема работы}
% Автор
-\author{ФИО студента} % ФИО
-\group{1111/1} % Группа
-\coursenum{111111} % Номер специальности
-\course{Физика} % Название специальности
+\author{ФИО автора}
+% Группа
+\group{1111/1}
+% Номер специальности
+\coursenum{111111}
+% Название специальности
+\course{Физика}
% Научный руководитель
\sa {ФИО руководителя}
@@ -92,7 +115,7 @@
%
%% Author
%\author{Author's Name} % Full Name
-%\course{Physics} % Название специальности
+%\course{Physics} % Specialization
%
%\group{} % Study Group
%
@@ -104,6 +127,11 @@
%\rev {P.\,P.~Petrov}
%\revstatus{Associate Professor}
%
+%% Consultant
+%\con{}
+%\conspec{}
+%\constatus{}
+%
%% City & Year
%\city{Saint Petersburg}
%\date{\number\year}
@@ -127,4 +155,8 @@
% Список литературы
\printbibliography[heading=bibintoc]
+% Приложения
+\appendix
+\input{a}
+
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,3 +1,19 @@
\chapter{Название главы}
\section{Название секции}
+
+Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
+\nomenclature{$\epsilon_\infty$}{высокочастотная диэлектрическая проницаемость}
+\nomenclature{$\epsilon_0$}{статическая диэлектрическая проницаемость}
+Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$.
+Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
+Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+Ссылка на формулу~\eqref{e:Coulomb}
+\begin{equation}\label{e:Coulomb}
+ \frac{1}{|\vec r_1 - \vec r_2|} =
+ 4\pi \int \frac{d^3 q}{(2\pi)^3}\,
+ \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2},
+\end{equation}
+где \nomencl{$\vec r_i$}{координата $i$-й частицы}.
+
\section{Выводы к первой главе}
\ No newline at end of file
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{Название приложения}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +0,0 @@
-\chapter{Название приложения}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/autoref.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,11 +1,12 @@
\documentclass[%
autoref, % тип документа
+%natbib, % использовать пакет natbib для "сжатия" цитирований
href, % использовать пакет hyperref для создания гиперссылок
-facsimile, % отображать факсимиле диссертанта и ученого секретаря
colorlinks, % цветные гиперссылки
-%fixint, % отключить прямые знаки интегралов
%times, % шрифт Times как основной
+%fixint, % включить прямые знаки интегралов
%classified, % гриф секретности
+facsimile, % отображать факсимиле диссертанта и ученого секретаря
]{disser}
\usepackage[
@@ -12,6 +13,11 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+\usepackage[autostyle]{csquotes}
+
\usepackage[T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[english,russian]{babel}
@@ -62,20 +68,17 @@
\begin{center}
Работа выполнена в \emph{название организации}.
\end{center}
-\vskip1ex
-\begin{tabularx}{\linewidth}{lp{1cm}X}
-Научный руководитель: & & \emph{ученая степень}, \\
- & & \emph{ученое звание}, \\
- & & \emph{фамилия имя отчество}
-\\
-Официальные оппоненты: & & \emph{ученая степень}, \\
- & & \emph{ученое звание}, \\
- & & \emph{фамилия имя отчество}\\
- & & \emph{ученая степень}, \\
- & & \emph{ученое звание}, \\
- & & \emph{фамилия имя отчество}
-\\
-Ведущая организация: & & \emph{название организации}\\
+\vskip1ex\noindent
+\begin{tabularx}{\linewidth}{@{}lX@{}}
+ \textbf{Научный руководитель:} & \textbf{фамилия имя отчество}\\
+ & ученая степень, ученое звание\\[6pt]
+ \textbf{Официальные оппоненты:} & \textbf{фамилия имя отчество}\\
+ & ученая степень, ученое звание\\[6pt]
+ & \textbf{фамилия имя отчество}\\
+ & ученая степень, ученое звание\\[6pt]
+ & \textbf{фамилия имя отчество}\\
+ & ученая степень, ученое звание\\[6pt]
+ \textbf{Ведущая организация:} & название организации
\end{tabularx}
\vskip2ex\noindent
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/defs.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,9 +0,0 @@
-% Список сокращений и условных обозначений
-\defs
-
-\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}}
-$\vec A$ & --- & векторный потенциал\\
-$I$ & --- & интенсивность света\\
-$j_l$ & --- & сферическая функция Бесселя первого рода\\
-$Y_{lm}$ & --- & сферическая гармоника\\
-\end{longtable}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/intro.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -8,7 +8,7 @@
\actualitysection
\actualitytext
-% Цель диссертационной работы
+% Цели и задачи диссертационной работы
\objectivesection
\objectivetext
@@ -16,7 +16,7 @@
\noveltysection
\noveltytext
-% Практическая ценность
+% Теоретическая и практическая значимость
\valuesection
\valuetext
@@ -24,7 +24,7 @@
\resultssection
\resultstext
-% Апробация работы
+% Степень достоверности и апробация результатов
\approbationsection
\approbationtext
@@ -38,4 +38,4 @@
% Структура и объем диссертации
\structsection
-\structtext
\ No newline at end of file
+\structtext
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -106,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {М. А. Скворцов},
title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
school = {ИТФ им. Л.~Д.~Ландау},
@@ -124,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {Э. В. Тернер},
- authortype = {США},
- title = {Одноразовая ракета-носитель},
- media = {Текст},
- type = {заявка},
- number = {1095735},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} B 64 G 1/00},
- holder = {заявитель Спейс Системз/Лорал, инк.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {Бюл. № 7 (I ч.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {США},
- pagetotal = {5 с.~: ил.},
- language = {russian},
+ author = {Э. В. Тернер},
+ authorcountry= {США},
+ title = {Одноразовая ракета-носитель},
+ media = {Текст},
+ type = {заявка},
+ number = {1095735},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} B 64 G 1/00},
+ holder = {заявитель Спейс Системз/Лорал, инк.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {Бюл. № 7 (I ч.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {США},
+ pagetotal = {5 с.~: ил.},
+ language = {russian},
}
@PATENT{patent2,
- author = {В. И. Чугаева},
- authortype = {РФ},
- title = {Приемопередающее устройство},
- media = {Текст},
- type = {пат.},
- number = {2000131736/09},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
- holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {Бюл. № 23 (II ч.)},
- pagetotal = {2 с.~: ил.},
- language = {russian},
+ author = {В. И. Чугаева},
+ authorcountry= {РФ},
+ title = {Приемопередающее устройство},
+ media = {Текст},
+ type = {пат.},
+ number = {2000131736/09},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
+ holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {Бюл. № 23 (II ч.)},
+ pagetotal = {2 с.~: ил.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/candidate/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,9 +1,9 @@
\documentclass[%
candidate, % тип документа
+%natbib, % использовать пакет natbib для "сжатия" цитирований
subf, % использовать пакет subcaption для вложенной нумерации рисунков
href, % использовать пакет hyperref для создания гиперссылок
colorlinks, % цветные гиперссылки
-%times, % шрифт Times как основной
%fixint, % включить прямые знаки интегралов
%classified, % гриф секретности
%facsimile, % отображать факсимиле диссертанта
@@ -13,11 +13,37 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% Список сокращений и условных обозначений
+\usepackage[intoc,nocfg,russian]{nomencl}
+\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}}
+\setlength{\nomlabelwidth}{3em}
+\setlength{\nomitemsep}{-\parsep}
+\renewcommand{\nomlabel}[1]{#1 ---}
+\makenomenclature
+
+% Шрифт Times в тексте как основной
+%\usepackage{tempora}
+% альтернативный пакет из дистрибутива TeX Live
+%\usepackage{cyrtimes}
+
+% Шрифт Times в формулах как основной
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% альтернативный пакет
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
+% Плавающие рисунки "в оборку".
+\usepackage{wrapfig}
+
\usepackage[style=gost-numeric,
backend=biber,
language=auto,
@@ -36,7 +62,7 @@
%\setcitestyle{semicolon}
% Ссылки на работы соискателя включаются в общий список литературы
-\let\citemy=\cite
+\let\citeown=\cite
% Использовать полужирное начертание для векторов
\let\vec=\mathbf
@@ -123,7 +149,7 @@
\input{concl}
% Список сокращений и условных обозначений
-%\input{defs}
+\printnomenclature
% Словарь терминов
%\input{dict}
@@ -136,6 +162,6 @@
% Приложения
%\appendix
-%\input{app-a}
+%\input{a}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,3 +1,19 @@
\chapter{Название главы}
\section{Название секции}
+
+Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
+\nomenclature{$\epsilon_\infty$}{высокочастотная диэлектрическая проницаемость}
+\nomenclature{$\epsilon_0$}{статическая диэлектрическая проницаемость}
+Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$.
+Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
+Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+Ссылка на формулу~\eqref{e:Coulomb}
+\begin{equation}\label{e:Coulomb}
+ \frac{1}{|\vec r_1 - \vec r_2|} =
+ 4\pi \int \frac{d^3 q}{(2\pi)^3}\,
+ \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2},
+\end{equation}
+где \nomencl{$\vec r_i$}{координата $i$-й частицы}.
+
\section{Выводы к первой главе}
\ No newline at end of file
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{Название приложения}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +0,0 @@
-\chapter{Название приложения}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/autoref.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,11 +1,12 @@
\documentclass[%
autoref, % тип документа
+%natbib, % использовать пакет natbib для "сжатия" цитирований
href, % использовать пакет hyperref для создания гиперссылок
-facsimile, % отображать факсимиле диссертанта и ученого секретаря
colorlinks, % цветные гиперссылки
-%fixint, % отключить прямые знаки интегралов
%times, % шрифт Times как основной
+%fixint, % включить прямые знаки интегралов
%classified, % гриф секретности
+facsimile, % отображать факсимиле диссертанта и ученого секретаря
]{disser}
\usepackage[
@@ -12,6 +13,11 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+\usepackage[autostyle]{csquotes}
+
\usepackage[T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[english,russian]{babel}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/defs.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,9 +0,0 @@
-% Список сокращений и условных обозначений
-\defs
-
-\begin{longtable}{lp{0.025\textwidth}p{0.89\textwidth}}
-$\vec A$ & --- & векторный потенциал\\
-$I$ & --- & интенсивность света\\
-$j_l$ & --- & сферическая функция Бесселя первого рода\\
-$Y_{lm}$ & --- & сферическая гармоника\\
-\end{longtable}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/intro.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -28,7 +28,7 @@
\methodssection
\methodstext
-% Положения, выносимые на защиту
+% Результаты и положения, выносимые на защиту
\resultssection
\resultstext
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/nomake.cmd 2017-03-05 21:37:27 UTC (rev 43400)
@@ -27,19 +27,20 @@
exit /b
:help
- echo all build DVI of autoref and thesis
- echo allpdf build PDF of autoref and thesis
+ echo all build PDF of autoref and thesis
+ echo allpdf build PDF of autoref and thesis
+ echo alldvi build DVI of autoref and thesis
%latexnmk% help
goto :eof
+:allpdf
+ set target=thesis & %latexnmk% pdf
+ set target=autoref & %latexnmk% pdf
+ set target=
+goto :eof
+
:alldvi
set target=thesis & %latexnmk% dvi
set target=autoref & %latexnmk% dvi
set target=
goto :eof
-
-:allpdf
- set target=thesis & %latexnmk% pdf
- set target=autoref & %latexnmk% pdf
- set target=
-goto :eof
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -106,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {М. А. Скворцов},
title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
school = {ИТФ им. Л.~Д.~Ландау},
@@ -124,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {Э. В. Тернер},
- authortype = {США},
- title = {Одноразовая ракета-носитель},
- media = {Текст},
- type = {заявка},
- number = {1095735},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} B 64 G 1/00},
- holder = {заявитель Спейс Системз/Лорал, инк.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {Бюл. № 7 (I ч.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {США},
- pagetotal = {5 с.~: ил.},
- language = {russian},
+ author = {Э. В. Тернер},
+ authorcountry= {США},
+ title = {Одноразовая ракета-носитель},
+ media = {Текст},
+ type = {заявка},
+ number = {1095735},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} B 64 G 1/00},
+ holder = {заявитель Спейс Системз/Лорал, инк.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {Бюл. № 7 (I ч.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {США},
+ pagetotal = {5 с.~: ил.},
+ language = {russian},
}
@PATENT{patent2,
- author = {В. И. Чугаева},
- authortype = {РФ},
- title = {Приемопередающее устройство},
- media = {Текст},
- type = {пат.},
- number = {2000131736/09},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
- holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {Бюл. № 23 (II ч.)},
- pagetotal = {2 с.~: ил.},
- language = {russian},
+ author = {В. И. Чугаева},
+ authorcountry= {РФ},
+ title = {Приемопередающее устройство},
+ media = {Текст},
+ type = {пат.},
+ number = {2000131736/09},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
+ holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {Бюл. № 23 (II ч.)},
+ pagetotal = {2 с.~: ил.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/doctor/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,9 +1,9 @@
\documentclass[%
doctor, % тип документа
+%natbib, % использовать пакет natbib для "сжатия" цитирований
subf, % использовать пакет subcaption для вложенной нумерации рисунков
href, % использовать пакет hyperref для создания гиперссылок
colorlinks, % цветные гиперссылки
-%times, % шрифт Times как основной
%fixint, % включить прямые знаки интегралов
%classified, % гриф секретности
%facsimile, % отображать факсимиле диссертанта
@@ -13,11 +13,34 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% Список сокращений и условных обозначений
+\usepackage[intoc,nocfg,russian]{nomencl}
+\newcommand{\nomencl}[2]{#1 --- #2\nomenclature{#1}{#2}}
+\setlength{\nomlabelwidth}{3em}
+\setlength{\nomitemsep}{-\parsep}
+\renewcommand{\nomlabel}[1]{#1 ---}
+\makenomenclature
+
+% Шрифт Times в тексте как основной
+%\usepackage{tempora}
+% альтернативный пакет из дистрибутива TeX Live
+%\usepackage{cyrtimes}
+
+% Шрифт Times в формулах как основной
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% альтернативный пакет
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
\usepackage[style=gost-numeric,
backend=biber,
language=auto,
@@ -36,7 +59,7 @@
%\setcitestyle{semicolon}
% Ссылки на работы соискателя включаются в общий список литературы
-\let\citemy=\cite
+\let\citeown=\cite
% Использовать полужирное начертание для векторов
\let\vec=\mathbf
@@ -120,7 +143,7 @@
\input{concl}
% Список сокращений и условных обозначений
-%\input{defs}
+\printnomenclature
% Словарь терминов
%\input{dict}
@@ -133,6 +156,6 @@
% Приложения
%\appendix
-%\input{app-a}
+%\input{a}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +1,17 @@
\chapter{Название главы}
+\section{Название секции}
+
+Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
+\nomenclature{$\epsilon_\infty$}{высокочастотная диэлектрическая проницаемость}
+\nomenclature{$\epsilon_0$}{статическая диэлектрическая проницаемость}
+Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$.
+Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
+Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+Ссылка на формулу~\eqref{e:Coulomb}
+\begin{equation}\label{e:Coulomb}
+ \frac{1}{|\vec r_1 - \vec r_2|} =
+ 4\pi \int \frac{d^3 q}{(2\pi)^3}\,
+ \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2},
+\end{equation}
+где \nomencl{$\vec r_i$}{координата $i$-й частицы}.
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{Название приложения}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +0,0 @@
-\chapter{Заголовок приложения}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/intro.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,5 +1 @@
\intro
-
-Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
-Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
-Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -106,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {М. А. Скворцов},
title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
school = {ИТФ им. Л.~Д.~Ландау},
@@ -124,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {Э. В. Тернер},
- authortype = {США},
- title = {Одноразовая ракета-носитель},
- media = {Текст},
- type = {заявка},
- number = {1095735},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} B 64 G 1/00},
- holder = {заявитель Спейс Системз/Лорал, инк.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {Бюл. № 7 (I ч.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {США},
- pagetotal = {5 с.~: ил.},
- language = {russian},
+ author = {Э. В. Тернер},
+ authorcountry= {США},
+ title = {Одноразовая ракета-носитель},
+ media = {Текст},
+ type = {заявка},
+ number = {1095735},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} B 64 G 1/00},
+ holder = {заявитель Спейс Системз/Лорал, инк.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {Бюл. № 7 (I ч.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {США},
+ pagetotal = {5 с.~: ил.},
+ language = {russian},
}
@PATENT{patent2,
- author = {В. И. Чугаева},
- authortype = {РФ},
- title = {Приемопередающее устройство},
- media = {Текст},
- type = {пат.},
- number = {2000131736/09},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
- holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {Бюл. № 23 (II ч.)},
- pagetotal = {2 с.~: ил.},
- language = {russian},
+ author = {В. И. Чугаева},
+ authorcountry= {РФ},
+ title = {Приемопередающее устройство},
+ media = {Текст},
+ type = {пат.},
+ number = {2000131736/09},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
+ holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {Бюл. № 23 (II ч.)},
+ pagetotal = {2 с.~: ил.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/master/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -3,7 +3,6 @@
subf, % использовать пакет subcaption для вложенной нумерации рисунков
href, % использовать пакет hyperref для создания гиперссылок
colorlinks, % цветные гиперссылки
-%times, % шрифт Times как основной
%fixint, % включить прямые знаки интегралов
]{disser}
@@ -11,11 +10,26 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% Шрифт Times в тексте как основной
+%\usepackage{tempora}
+% альтернативный пакет из дистрибутива TeX Live
+%\usepackage{cyrtimes}
+
+% Шрифт Times в формулах как основной
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% альтернативный пакет
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
\usepackage[style=gost-numeric,
backend=biber,
language=auto,
@@ -58,11 +72,14 @@
\topic{Тема диссертации}
% Автор
-\author {ФИО автора} % ФИО
-\group {1111/1} % Группа
-\coursenum {111111} % Номер направления
-\course {Название направления}
-\masterprognum{111111} % Номер магистерской программы
+\author{ФИО автора}
+% Группа
+\group{1111/1}
+% Номер направления
+\coursenum{111111}
+\course{Название направления}
+% Номер магистерской программы
+\masterprognum{111111}
\masterprog {Название программы}
% Научный руководитель
@@ -110,7 +127,7 @@
%
%% Author
%\author{Author's Name} % Full Name
-%\course{Physics} % Название специальности
+%\course{Physics} % Specialization
%
%\group{} % Study Group
%\masterprog {Title of program}
@@ -136,8 +153,10 @@
% Содержание
\tableofcontents
+
% Введение
\input{intro}
+
% Глава 1
\input{1}
% Глава 2
@@ -151,6 +170,6 @@
% Приложения
\appendix
-\input{app-a}
+\input{a}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/1.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +1,15 @@
\chapter{Название главы}
+\section{Название секции}
+
+Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
+Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$.
+Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
+Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
+Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
+Ссылка на формулу~\eqref{e:Coulomb}
+\begin{equation}\label{e:Coulomb}
+ \frac{1}{|\vec r_1 - \vec r_2|} =
+ 4\pi \int \frac{d^3 q}{(2\pi)^3}\,
+ \frac{e^{i\vec q(\vec r_1 - \vec r_2)}}{q^2}.
+\end{equation}
+
Added: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/a.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -0,0 +1 @@
+\chapter{Название приложения}
Deleted: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/app-a.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1 +0,0 @@
-\chapter{Заголовок приложения}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/intro.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,5 +1 @@
\intro
-
-Ссылки на литературу~\cite{Yoffe_1993_AP_42_173,Efros_1982_FTP_16_7_1209,%
-Anselm_1978,Segall_1968,Agranovich_1983,InP,Mishchenko_1996,Skvortsov_2008,%
-Perelman_2003_math:0307245,Nielsen_2010_1006.2735,patent1,patent2}.
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.bib 2017-03-05 21:37:27 UTC (rev 43400)
@@ -106,7 +106,7 @@
language = {russian},
}
- at DSCITHESIS{Skvortsov_2008,
+ at DOCTHESIS{Skvortsov_2008,
author = {М. А. Скворцов},
title = {Флуктуационные и интерференционные эффекты в мезоскопических системах},
school = {ИТФ им. Л.~Д.~Ландау},
@@ -124,50 +124,50 @@
% 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},
+ title = {A configuration interaction analysis of exchange in double quantum dots},
+ author = {Erik Nielsen and Richard P. Muller},
+ archiveprefix= {arXiv},
+ eprint = {1006.2735},
+ primaryclass = {cond-mat},
}
@PATENT{patent1,
- author = {Э. В. Тернер},
- authortype = {США},
- title = {Одноразовая ракета-носитель},
- media = {Текст},
- type = {заявка},
- number = {1095735},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} B 64 G 1/00},
- holder = {заявитель Спейс Системз/Лорал, инк.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- reqdate = {07.04.2000},
- pubdate = {10.03.2001},
- publication = {Бюл. № 7 (I ч.)},
- prdate = {09.04.1999},
- prnumber = {09/289, 037},
- prcountry = {США},
- pagetotal = {5 с.~: ил.},
- language = {russian},
+ author = {Э. В. Тернер},
+ authorcountry= {США},
+ title = {Одноразовая ракета-носитель},
+ media = {Текст},
+ type = {заявка},
+ number = {1095735},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} B 64 G 1/00},
+ holder = {заявитель Спейс Системз/Лорал, инк.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ requestdate = {07.04.2000},
+ publicationdate = {10.03.2001},
+ publication = {Бюл. № 7 (I ч.)},
+ prioritydate = {09.04.1999},
+ prioritynumber = {09/289, 037},
+ prioritycountry = {США},
+ pagetotal = {5 с.~: ил.},
+ language = {russian},
}
@PATENT{patent2,
- author = {В. И. Чугаева},
- authortype = {РФ},
- title = {Приемопередающее устройство},
- media = {Текст},
- type = {пат.},
- number = {2000131736/09},
- location = {Рос. Федерация},
- ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
- holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
- credits = {патент. поверенный Егорова Г. Б.},
- reqnumber = {000108705/28},
- date = {18.12.2000},
- publdate = {20.08.2002},
- publication = {Бюл. № 23 (II ч.)},
- pagetotal = {2 с.~: ил.},
- language = {russian},
+ author = {В. И. Чугаева},
+ authorcountry= {РФ},
+ title = {Приемопередающее устройство},
+ media = {Текст},
+ type = {пат.},
+ number = {2000131736/09},
+ location = {Рос. Федерация},
+ ipc = {МПК\ensuremath{^7} H 04 В 1/38, Н 04 J 13/00},
+ holder = {заявитель и патентообладатель Воронеж. науч.-ислед. ин-т связи.},
+ credits = {патент. поверенный Егорова Г. Б.},
+ requestnumber= {000108705/28},
+ date = {18.12.2000},
+ publicationdate = {20.08.2002},
+ publication = {Бюл. № 23 (II ч.)},
+ pagetotal = {2 с.~: ил.},
+ language = {russian},
}
Modified: trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/doc/latex/disser/templates-utf8/specialist/thesis.tex 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,9 +1,9 @@
\documentclass[%
specialist, % тип документа
+%natbib, % использовать пакет natbib для "сжатия" цитирований
subf, % использовать пакет subcaption для вложенной нумерации рисунков
href, % использовать пакет hyperref для создания гиперссылок
colorlinks, % цветные гиперссылки
-%times, % шрифт Times как основной
%fixint, % включить прямые знаки интегралов
]{disser}
@@ -11,11 +11,29 @@
a4paper, mag=1000,
left=2.5cm, right=1cm, top=2cm, bottom=2cm, headsep=0.7cm, footskip=1cm
]{geometry}
+
+\usepackage[intlimits]{amsmath}
+\usepackage{amssymb,amsfonts}
+
\usepackage[T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[english,russian]{babel}
\ifpdf\usepackage{epstopdf}\fi
+\usepackage[autostyle]{csquotes}
+% Шрифт Times в тексте как основной
+%\usepackage{tempora}
+% альтернативный пакет из дистрибутива TeX Live
+%\usepackage{cyrtimes}
+
+% Шрифт Times в формулах как основной
+%\usepackage[varg,cmbraces,cmintegrals]{newtxmath}
+% альтернативный пакет
+%\usepackage[subscriptcorrection,nofontinfo]{mtpro2}
+
+% Плавающие рисунки "в оборку".
+\usepackage{wrapfig}
+
\usepackage[style=gost-numeric,
backend=biber,
language=auto,
@@ -52,25 +70,23 @@
% Титульный лист на русском языке
%
-% Название организации
\institution{Название организации}
% Имя лица, допускающего к защите (зав. кафедрой)
-\apname{д.\,ф.-м.\,н., профессор С.\,C.~Сидоров}
+\apname{ФИО зав. кафедрой}
\title{Дипломная работа}
-% Тема
\topic{<<Тема работы>>}
+% Автор
+\author{ФИО автора}
% Группа
\group{Студента группы}
-% Автор
-\author{ФИО автора}
% Научный руководитель
-\sa {И.\,И.~Иванов}
-\sastatus {д.\,ф.-м.\,н., профессор}
+\sa {ФИО руководителя}
+\sastatus{д.~ф.-м.~н., ст.~н.~с.}
% Рецензент
\rev {П.\,П.~Петров}
@@ -110,6 +126,11 @@
%\rev {P.\,P.~Petrov}
%\revstatus{Associate Professor}
%
+%% Consultant
+%\con{}
+%\conspec{}
+%\constatus{}
+%
%% City & Year
%\city{Saint Petersburg}
%\date{\number\year}
@@ -133,4 +154,8 @@
% Список литературы
\printbibliography[heading=bibintoc]
+% Приложения
+%\appendix
+%\input{a}
+
\end{document}
Modified: trunk/Master/texmf-dist/source/latex/disser/chapter.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/chapter.dtx 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/source/latex/disser/chapter.dtx 2017-03-05 21:37:27 UTC (rev 43400)
@@ -10,7 +10,7 @@
%
% \subsection{\xC3\xEB\xE0\xE2\xE0}
%
-% \subsubsection{\xCF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE0 \xE7\xE0\xEF\xE8\xF1\xE8 \xE2 \xEE\xE3\xEB\xE0\xE2\xEB\xE5\xED\xE8\xE8}
+% \subsubsection{\xCF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE0 \xE3\xEB\xE0\xE2\xFB \xE2 \xEE\xE3\xEB\xE0\xE2\xEB\xE5\xED\xE8\xE8}
%
% \DescribeMacro{\tocprethechapter}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\tocprethechapter+}
% \DescribeMacro{\tocpostthechapter}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\tocpostthechapter+}
@@ -29,7 +29,7 @@
\providecommand\tocchapternumfont{\normalfont}
% \end{macrocode}
-% \subsubsection{\xCF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE0 \xE2 \xF2\xE5\xEA\xF1\xF2\xE5}
+% \subsubsection{\xCF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE0 \xED\xF3\xEC\xE5\xF0\xF3\xE5\xEC\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xE2 \xF2\xE5\xEA\xF1\xF2\xE5}
% \DescribeMacro{\thechapteralign}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\thechapteralign+}
% \DescribeMacro{\thechapterfont}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\thechapterfont+}
% \DescribeMacro{\prethechapter}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\prethechapter+}
@@ -53,6 +53,20 @@
\setlength{\chapterindent}{0\p@}
% \end{macrocode}
+% \subsubsection{\xCF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xFB \xF4\xEE\xF0\xEC\xE0\xF2\xE0 \xED\xE5\xED\xF3\xEC\xE5\xF0\xF3\xE5\xEC\xEE\xE9 \xE3\xEB\xE0\xE2\xFB \xE2 \xF2\xE5\xEA\xF1\xF2\xE5}
+% \DescribeMacro{\schapteralign}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\schapteralign+}
+% \DescribeMacro{\schapterfont}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\schapterfont+}
+% \DescribeMacro{\beforeschapter}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\beforeschapter+}
+% \DescribeMacro{\afterschapter}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\afterschapter+}
+% \begin{macrocode}
+\providecommand\schapteralign{\chapteralign}
+\providecommand\schapterfont{\chapterfont}
+\providecommand\beforeschapter{\beforechapter}
+\providecommand\afterschapter{\afterchapter}
+\newlength{\schapterindent}
+\setlength{\schapterindent}{0\p@}
+
+% \end{macrocode}
%
% \subsubsection{\xCD\xE8\xE7\xEA\xEE\xF3\xF0\xEE\xE2\xED\xE5\xE2\xFB\xE5 \xEA\xEE\xEC\xE0\xED\xE4\xFB}
%
@@ -133,9 +147,9 @@
% \begin{macrocode}
\def\@makeschapterhead#1{{%
\parindent\z@
- \normalfont\hskip\chapterindent%
+ \normalfont\hskip\schapterindent%
\interlinepenalty\@M
- \chapteralign\chapterfont\beforechapter #1\afterchapter
+ \schapteralign\schapterfont\beforeschapter #1\afterschapter
}}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/disser/custom.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/custom.dtx 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/source/latex/disser/custom.dtx 2017-03-05 21:37:27 UTC (rev 43400)
@@ -9,91 +9,8 @@
% \end{macrocode}
% \subsection{\xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0 \xF1\xF2\xEE\xF0\xEE\xED\xED\xE8\xF5 \xEF\xE0\xEA\xE5\xF2\xEE\xE2}
%
-% \DescribePackage{amsmath}
-% \DescribePackage{amssymb}
-% \DescribePackage{amsfonts}
+% \xCF\xF0\xFF\xEC\xFB\xE5 \xF1\xE8\xEC\xE2\xEE\xEB\xFB \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2 \xE8\xE7 \xF8\xF0\xE8\xF4\xF2\xEE\xE2 \xF1\xE5\xEC\xE5\xE9\xF1\xF2\xE2\xE0 Euler.
% \begin{macrocode}
-\ifDis at ams
- \usepackage[intlimits]{amsmath}
- \usepackage{amssymb,amsfonts}
-\fi
-
-% \end{macrocode}
-% \xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xF8\xF0\xE8\xF4\xF2\xE0 Times \xE2\xEC\xE5\xF1\xF2\xEE Computer Modern Roman.
-% \begin{macrocode}
-\ifDis at times
-% \end{macrocode}
-% \xD0\xE5\xE0\xEB\xE8\xE7\xE0\xF6\xE8\xFF \xEA\xEE\xEC\xE0\xED\xE4 |\English| \xE8 |\Eng| \xE1\xE5\xE7 \xEF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE5\xED\xE8\xFF \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEE\xEA \xF8\xF0\xE8\xF4\xF2\xE0.
-% \xDD\xF2\xEE \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xE4\xEB\xFF \xEA\xEE\xF0\xF0\xE5\xEA\xF2\xED\xEE\xE3\xEE \xEE\xF2\xEE\xE1\xF0\xE0\xE6\xE5\xED\xE8\xFF \xF1\xE8\xEC\xE2\xEE\xEB\xE0 \xEF\xE5\xF0\xE5\xED\xEE\xF1\xE0 \xF1\xF2\xF0\xEE\xEA\xE8 \xEF\xF0\xE8
-% \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED\xE8\xE8 \xEF\xE0\xEA\xE5\xF2\xEE\xE2 \pkg{pscyr} \xE8 \pkg{cyrtimes}.
-% \DescribeMacro{\English}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\English+}
-% \DescribeMacro{\Eng}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\Eng+}
-% \begin{macrocode}
- \AtBeginDocument{
- \DeclareRobustCommand{\English}{%
- \expandafter\set at hyphenmins\englishhyphenmins
- \language\l at english}%
- \let\Eng=\English
- }
- \ifDis at mtpro
- \AtBeginDocument{%
-% \end{macrocode}
-% \DescribePackage{mtpro2}
-% \begin{macrocode}
- \IfFileExists{mtpro2.sty}{
- \usepackage[subscriptcorrection,nofontinfo]{mtpro2}
- }{
-% \DescribePackage{mtpro}
- \IfFileExists{mtpro.sty}{
- \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro}
- }{
- \PackageWarning{disser}%
- {Unable to find mtpro2 or mtpro package. Math font is unchanged.}
- }
- }
- }
- \else
-% \end{macrocode}
-% \DescribePackage{newtxmath}
-% \begin{macrocode}
- \AtEndOfPackage{%
- \IfFileExists{newtxmath.sty}{
- \usepackage[varg,cmbraces,cmintegrals]{newtxmath}
- }{
- \PackageWarning{disser}%
- {Unable to find txfonts package. Font is unchanged.}
- }
- }
- \fi
- \AtEndOfPackage{%
- \IfFileExists{pscyr.sty}{
-% \end{macrocode}
-% \DescribePackage{pscyr}
-% \xD3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE0 Times \xEA\xE0\xEA \xF8\xF0\xE8\xF4\xF2\xE0 \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE, \xE2\xFB\xE1\xEE\xF0 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xEE\xE3\xEE \xEC\xEE\xED\xEE\xF8\xE8\xF0\xE8\xED\xED\xEE\xE3\xEE
-% \xF8\xF0\xE8\xF4\xF2\xE0.
-% \begin{macrocode}
- \usepackage{pscyr}
- \renewcommand\rmdefault{ftm}
- \renewcommand\ttdefault{cmtt}
- }{
- \IfFileExists{cyrtimes.sty}{
-% \end{macrocode}
-% \DescribePackage{cyrtimes}
-% \xC2\xEC\xE5\xF1\xF2\xEE \pkg{pscyr} \xEC\xEE\xE6\xE5\xF2 \xE1\xFB\xF2\xFC \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xED \xEF\xE0\xEA\xE5\xF2 \pkg{cyrtimes}, \xE2\xF5\xEE\xE4\xFF\xF9\xE8\xE9 \xE2
-% \xF1\xEE\xF1\xF2\xE0\xE2 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2\xE0 \TeX Live.
-% \begin{macrocode}
- \usepackage{cyrtimes}
- }{
- \PackageWarning{disser}%
- {Unable to find pscyr or cyrtimes package. Font is unchanged.}
- }
- }
- }
-\fi
-
-% \end{macrocode}
-% \xC1\xEE\xEB\xE5\xE5 \xE5\xF1\xF2\xE5\xF1\xF2\xE2\xE5\xED\xED\xFB\xE5 \xF1\xE8\xEC\xE2\xEE\xEB\xFB \xE8\xED\xF2\xE5\xE3\xF0\xE0\xEB\xEE\xE2 \xE8\xE7 \xF8\xF0\xE8\xF4\xF2\xEE\xE2 \xF1\xE5\xEC\xE5\xE9\xF1\xF2\xE2\xE0 Euler.
-% \begin{macrocode}
\ifDis at fixint
\DeclareSymbolFont{EulerExtension}{U}{euex}{m}{n}
\DeclareMathSymbol\intop\mathop{EulerExtension}{"52}
@@ -215,8 +132,9 @@
% \DescribePackage{subcaption}
% \begin{macrocode}
\ifDis at subf
- \usepackage[config,font=small,labelsep=period]{caption}
+ \usepackage[font=small,labelsep=period]{caption}
\usepackage[list=true,subrefformat=parens]{subcaption}
+ \captionsetup{compatibility=false}
% \end{macrocode}
% \xD4\xEE\xF0\xEC\xE0\xF2 \xF1\xF7\xE5\xF2\xF7\xE8\xEA\xE0.
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/disser/disser.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/disser.dtx 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/source/latex/disser/disser.dtx 2017-03-05 21:37:27 UTC (rev 43400)
@@ -19,7 +19,7 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*driver>
-\ProvidesFile{disser.drv}[2016/06/26 1.4.0 Document class for dissertations]
+\ProvidesFile{disser.drv}[2017/03/03 1.5.0 Document class for dissertations]
\documentclass{ltxdoc}
\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
@@ -169,9 +169,6 @@
% \item[\href{file:gost732.pdf}{gost732.dtx}]
% \xC8\xF1\xF5\xEE\xE4\xED\xFB\xE9 \xF2\xE5\xEA\xF1\xF2 \xEA\xEB\xE0\xF1\xF1\xE0 \pkg{gost732} \xE4\xEB\xFF \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2 \xE2
% \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xC3\xCE\xD1\xD2 7.32-2001.
-% \item[\href{file:gost705.pdf}{gost705.dtx}]
-% \xC8\xF1\xF5\xEE\xE4\xED\xFB\xE9 \xF2\xE5\xEA\xF1\xF2 \xF1\xF2\xE8\xEB\xE5\xE9 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8 \pkg{gost705.bst} \xE8
-% \pkg{gost705s.bst}.
% \end{deflist}
%
% \clearpage
@@ -183,7 +180,7 @@
%<*disser>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2016/06/26 1.4.0 Document class for dissertations]
+\ProvidesClass{disser}[2017/03/03 1.4.1 Document class for dissertations]
% \end{macrocode}
% \xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{kvoptions} \xE4\xEB\xFF \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xEA\xE8 \xEE\xEF\xF6\xE8\xE9 \xE2 \xF4\xEE\xF0\xEC\xE0\xF2\xE5
@@ -244,11 +241,6 @@
% \begin{macrocode}
\newif\ifDis at facsimile\Dis at facsimilefalse
% \end{macrocode}
-% \item \xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xEE\xE2 \pkg{amsmath}, \pkg{amsfonts}, \pkg{amssymb}
-% (\xE2\xEA\xEB\xFE\xF7\xE5\xED\xEE).
-% \begin{macrocode}
-\newif\ifDis at ams\Dis at amstrue
-% \end{macrocode}
% \item \xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \pkg{hyperref} (\xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xEE).
% \begin{macrocode}
\newif\ifDis at href\Dis at hreffalse
@@ -301,10 +293,6 @@
% \begin{macrocode}
\DeclareOption{facsimile}{\Dis at facsimiletrue}
% \end{macrocode}
-% \xCD\xE5 \xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE0\xF2\xFC \xEF\xE0\xEA\xE5\xF2\xFB \pkg{amsmath}, \pkg{amsfonts}, \pkg{amssymb}.
-% \begin{macrocode}
-\DeclareOption{noams}{\Dis at amsfalse}
-% \end{macrocode}
% \xCF\xEE\xE4\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xEF\xE0\xEA\xE5\xF2\xE0 \pkg{natbib} \xE8 \xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xFB\xF5 \xED\xE0\xF1\xF2\xF0\xEE\xE5\xEA.
% \begin{macrocode}
\DeclareOption{natbib}{\Dis at natbibtrue}
@@ -395,15 +383,6 @@
% \begin{macrocode}
\DeclareOption{fleqn}{\input{fleqn.clo}}
% \end{macrocode}
-% \xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE2 \xF2\xE5\xEA\xF1\xF2\xE5 \xE8 \xF4\xEE\xF0\xEC\xF3\xEB\xE0\xF5 \xF8\xF0\xE8\xF4\xF2 Times \xE2\xEC\xE5\xF1\xF2\xEE Computer Modern
-% Roman.
-% \begin{macrocode}
-\DeclareOption{times}{\Dis at timestrue}
-% \end{macrocode}
-% \xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEC\xE0\xF2\xE5\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8\xE5 \xF8\xF0\xE8\xF4\xF2\xFB MathTime Pro.
-% \begin{macrocode}
-\DeclareOption{mtpro}{\Dis at mtprotrue}
-% \end{macrocode}
% \xC5\xF1\xEB\xE8 \xF3\xEA\xE0\xE7\xE0\xED\xE0 \xFD\xF2\xE0 \xEE\xEF\xF6\xE8\xFF, \xF2\xEE \xE1\xEB\xEE\xEA\xE8 \xF2\xE5\xEA\xF1\xF2\xE0 \xE2 \xF1\xEF\xE8\xF1\xEA\xE5 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xE1\xF3\xE4\xF3\xF2 \xEF\xE5\xF7\xE0\xF2\xE0\xF2\xFC\xF1\xFF
% \xED\xE0 \xED\xEE\xE2\xFB\xF5 \xF1\xF2\xF0\xEE\xEA\xE0\xF5 \xE8 \xF1 \xEE\xF2\xF1\xF2\xF3\xEF\xEE\xEC.
% \begin{macrocode}
@@ -448,6 +427,7 @@
}
\DeclareOption{candidate}{%
\Dis at bachelorfalse
+ \Dis at specialistfalse
\Dis at masterfalse
\Dis at candidatetrue
\Dis at doctorfalse
@@ -455,6 +435,7 @@
}
\DeclareOption{doctor}{%
\Dis at bachelorfalse
+ \Dis at specialistfalse
\Dis at masterfalse
\Dis at candidatefalse
\Dis at doctortrue
@@ -462,6 +443,7 @@
}
\DeclareOption{autoref}{%
\Dis at bachelorfalse
+ \Dis at specialistfalse
\Dis at masterfalse
\Dis at candidatefalse
\Dis at doctorfalse
Modified: trunk/Master/texmf-dist/source/latex/disser/disser.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/disser.ins 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/source/latex/disser/disser.ins 2017-03-05 21:37:27 UTC (rev 43400)
@@ -53,8 +53,6 @@
\clsfile{gost732}
\nopostamble
\usedir{bibtex/bst/disser}%
- \file{gost705.bst}{\from{gost705.dtx}{gost705}}
- \file{gost705s.bst}{\from{gost705.dtx}{gost705s}}
}
\endbatchfile
\endinput
Deleted: trunk/Master/texmf-dist/source/latex/disser/gost705.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/gost705.dtx 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/source/latex/disser/gost705.dtx 2017-03-05 21:37:27 UTC (rev 43400)
@@ -1,2739 +0,0 @@
-% \iffalse meta-comment
-%
-% This bibliography style attempts to format bibliography according to
-% GOST R 7.0.5-2008 with some 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) Stanislav Kruchinin
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any later
-% version. This version of this license is in
-% http://www.latex-project.org/lppl/lppl-1-3c.txt
-% and the latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% Current Maintainer of this work is Stanislav Kruchinin.
-%
-% This work consists of the main source file gost705.dtx
-% and the derived files
-% gost705.bst, gost705s.bst, gost705.pdf.
-%
-% Distribution:
-% CTAN:macros/latex/contrib/disser/src/gost705.dtx
-%
-% Unpacking:
-% (a) If disser.ins present:
-% latex disser.ins
-% (b) Without disser.ins:
-% tex gost705.dtx
-%
-% Documentation:
-% latex gost705.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 or German bibliographic entries you need to create field
- language = {russian} or language = {german}.
-
-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) Stanislav Kruchinin
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3c of this license or (at your option) any later
-version. This version of this license is in
- http://www.latex-project.org/lppl/lppl-1-3c.txt
-and the latest version of this license is in
- http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
-
-This work has the LPPL maintenance status "maintained".
-
-Current Maintainer of this work is Stanislav Kruchinin.
-
-This work consists of the main source file gost705.dtx
-and the derived files
- gost705.bst gost705s.bst gost705.pdf.
-
-\endpreamble
-\let\MetaPrefix\DoubleperCent
-
-\generate{%
- \nopostamble
- \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}%
- [2016/06/18 1.4.0 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}
- \usepackage{cmap}
-\else
- \usepackage[hypertex]{hyperref}
-\fi
-
-\hypersetup{
- pdftitle = {Documented source code of gost705 style},
- pdfauthor = {Stanislav Kruchinin},
- pdfsubject = {gost705},
- pdfstartview = {FitH},
- pdfborder = {0 0 0},
- bookmarksopen = true,
- bookmarksnumbered = true,
- bookmarksopenlevel = 2,
- colorlinks = true, linkcolor = darkblue,
- citecolor = darkblue, filecolor = darkblue,
- menucolor = darkblue, urlcolor = darkblue
-}
-
-\usepackage[T2A]{fontenc}
-\usepackage[cp1251]{inputenc}
-\usepackage[english,russian]{babel}
-
-\MakeShortVerb{\|}
-
-\def\file#1{\texttt{#1}}
-\def\pkg#1{\textsf{#1}}
-\def\cmd#1{\texttt{#1}}
-
-\newcommand\DescribeFunction[1]{
- \DescribeMacro{#1}\index{\texttt{#1}}
-}
-
-\makeatletter
- \def\IndexParms{%
- \parindent \z@
- \columnsep 15pt
- \parskip 0pt plus 1pt
- \rightskip 15pt
- \mathsurround \z@
- \parfillskip=-15pt
- \small
- \def\@idxitem{\normalfont\par\hangindent 30pt\bfseries}%
- \def\subitem{\normalfont\par\hangindent 30pt}%
- \def\subsubitem{\normalfont\par\hangindent 30pt\hspace*{15pt}}%
- \def\indexspace{\par\vspace{10pt plus 2pt minus 3pt}}%
- }
- \def\theindex{\@restonecoltrue\if at twocolumn\@restonecolfalse\fi
- \columnseprule \z@ \columnsep 35\p@
- \twocolumn[\index at prologue]%
- \IndexParms \let\item\@idxitem \ignorespaces}
- \def\endtheindex{\if at restonecol\onecolumn\else\clearpage\fi}
-\makeatother
-
-\setlength\hfuzz{20pt}
-\hbadness=10000
-
-\makeindex
-
-\begin{document}
- \sloppy
- \DocInput{gost705.dtx}
- \IndexPrologue{\section{\xCF\xF0\xE5\xE4\xEC\xE5\xF2\xED\xFB\xE9 \xF3\xEA\xE0\xE7\xE0\xF2\xE5\xEB\xFC}}
- \printindex
-\end{document}
-%</driver>
-% \fi
-%
-% \GetFileInfo{gost705.drv}
-%
-% \title{\pkg{gost705} \xE8 \pkg{gost705s} "--- \xF1\xF2\xE8\xEB\xE8 \xEE\xF4\xEE\xF0\xEC\xEB\xE5\xED\xE8\xFF \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xE8
-% \xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xC3\xCE\xD1\xD2 \xD0 7.0.5-2008}
-% \date{\xC2\xE5\xF0\xF1\xE8\xFF \fileversion\\[6pt]\filedate}
-% \author{\xD1\xF2\xE0\xED\xE8\xF1\xEB\xE0\xE2 \xCA\xF0\xF3\xF7\xE8\xED\xE8\xED\\[6pt]
-% \normalsize E-mail:
-% \href{mailto:stanislav.kruchinin at gmail.com}
-% {\texttt{stanislav.kruchinin at gmail.com}}}
-%
-% \maketitle
-%
-% \tableofcontents
-%
-% \section{\xC8\xF1\xF5\xEE\xE4\xED\xFB\xE9 \xF2\xE5\xEA\xF1\xF2}\parindent=0pt
-% \begin{macrocode}
-
-%<*gost705|gost705s>
-
-% \end{macrocode}
-% \subsection{\xCF\xEE\xEB\xFF, \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE5\xEC\xFB\xE5 \xE2 bib-\xF4\xE0\xE9\xEB\xE0\xF5}
-% \begin{macrocode}
-ENTRY
- { address
- annote
- author
- booktitle
- bookauthor
- chapter
- edition
- editor
- compiler
- howpublished
- institution
- journal
- key
- month
- note
- number
- organization
- pages
- numpages
- publisher
- school
- series
- title
- type
- volume
- year
- language
- booklanguage
- url
- urldate
- isbn
- doi
- archive
- archivePrefix
- primaryClass
- eprint
- authortype
- media
- location
- ipc
- holder
- credits
- reqnumber
- reqdate
- pubdate
- publication
- prdate
- prnumber
- prcountry
- pagetotal
- }
- {}
- { label }
-
-% \end{macrocode}
-% \subsection{\xCE\xE1\xFA\xFF\xE2\xEB\xE5\xED\xE8\xE5 \xE8 \xE8\xED\xE8\xF6\xE8\xE0\xEB\xE8\xE7\xE0\xF6\xE8\xFF \xEF\xE5\xF0\xE5\xEC\xE5\xED\xED\xFB\xF5 \xE8 \xEA\xEE\xED\xF1\xF2\xE0\xED\xF2}
-% \begin{macrocode}
-INTEGERS { output.state before.all mid.sentence after.sentence after.block
-after.dblslash after.slash after.colon after.semicolon }
-
-% \end{macrocode}
-% \DescribeFunction{init.state.consts}
-% \begin{macrocode}
-FUNCTION {init.state.consts}
-{
- #0 'before.all :=
- #1 'mid.sentence :=
- #2 'after.sentence :=
- #3 'after.block :=
- #4 'after.dblslash :=
- #5 'after.slash :=
- #6 'after.colon :=
- #7 'after.semicolon :=
-}
-
-STRINGS { s t }
-
-STRINGS { curlanguage }
-
-% \end{macrocode}
-% \subsection{\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5 \xFF\xE7\xFB\xEA\xE0}
-% \DescribeFunction{change.language}
-% \begin{macrocode}
-FUNCTION {change.language}
-{
- booklanguage empty$
- { "" }
- { booklanguage 'curlanguage :=
- "\selectlanguageifdefined{"
- curlanguage *
- "}" *
- }
- if$
-}
-
-% \end{macrocode}
-% \subsection{\xC2\xFB\xE2\xEE\xE4 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xEE\xE9 \xE7\xE0\xEF\xE8\xF1\xE8}
-% \DescribeFunction{output.nonnull}
-% \begin{macrocode}
-FUNCTION {output.nonnull}
-{
- swap$
- output.state mid.sentence =
- { ", " * write$ }
- { output.state after.block =
- { add.period$ write$
- " \BibDash " write$
- newline$
- "\newblock " write$
- }
- { output.state before.all =
- 'write$
- { output.state after.dblslash =
- { "~//" * change.language * " " * write$ }
- { output.state after.slash =
- { "~/ " * write$ }
- { output.state after.colon =
- { ": " * write$ }
- { output.state after.semicolon =
- { "; " * write$ }
- { add.period$ " " * write$ }
- if$
- }
- if$
- }
- if$
- }
- if$
- }
- if$
- }
- if$
- mid.sentence 'output.state :=
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{output}
-% \begin{macrocode}
-FUNCTION {output}
-{
- duplicate$ empty$
- 'pop$
- 'output.nonnull
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{output.check}
-% \begin{macrocode}
-FUNCTION {output.check}
-{
- 't :=
- duplicate$ empty$
- { pop$ "empty " t * " in " * cite$ * warning$ }
- 'output.nonnull
- if$
-}
-
-% \end{macrocode}
-% \subsection{\xC2\xFB\xE2\xEE\xE4 \xE1\xEB\xEE\xEA\xEE\xE2 \xE8 \xEE\xE3\xF0\xE0\xED\xE8\xF7\xE8\xF2\xE5\xEB\xE5\xE9}
-% \DescribeFunction{fin.entry}
-% \begin{macrocode}
-FUNCTION {fin.entry}
-{
- add.period$
- write$
- newline$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.block}
-% \begin{macrocode}
-FUNCTION {new.block}
-{
- output.state before.all =
- 'skip$
- { after.block 'output.state := }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.dblslash}
-% \begin{macrocode}
-FUNCTION {new.dblslash}
-{
- output.state before.all =
- 'skip$
- { after.dblslash 'output.state := }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.slash}
-% \begin{macrocode}
-FUNCTION {new.slash}
-{
- output.state before.all =
- 'skip$
- { after.slash 'output.state := }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.colon}
-% \begin{macrocode}
-FUNCTION {new.colon}
-{
- output.state before.all =
- 'skip$
- { after.colon 'output.state := }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.semicolon}
-% \begin{macrocode}
-FUNCTION {new.semicolon}
-{
- output.state before.all =
- 'skip$
- { after.semicolon 'output.state := }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.sentence}
-% \begin{macrocode}
-FUNCTION {new.sentence}
-{
- output.state after.block =
- 'skip$
- { output.state before.all =
- 'skip$
- { after.sentence 'output.state := }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{add.blank}
-% \begin{macrocode}
-FUNCTION {add.blank} { " " * before.all 'output.state := }
-
-% \end{macrocode}
-% \DescribeFunction{not}
-% \begin{macrocode}
-FUNCTION {not}
-{
- { #0 }
- { #1 }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{and}
-% \begin{macrocode}
-FUNCTION {and}
-{
- 'skip$
- { pop$ #0 }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{or}
-% \begin{macrocode}
-FUNCTION {or}
-{
- { pop$ #1 }
- 'skip$
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{non.stop}
-% \begin{macrocode}
-FUNCTION {non.stop}
-{
- duplicate$
- "}" * add.period$
- #-1 #1 substring$ "." =
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.block.checka}
-% \begin{macrocode}
-FUNCTION {new.block.checka}
-{
- empty$
- 'skip$
- 'new.block
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.block.checkb}
-% \begin{macrocode}
-FUNCTION {new.block.checkb}
-{
- empty$
- swap$ empty$
- and
- 'skip$
- 'new.block
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.sentence.checka}
-% \begin{macrocode}
-FUNCTION {new.sentence.checka}
-{
- empty$
- 'skip$
- 'new.sentence
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{new.sentence.checkb}
-% \begin{macrocode}
-FUNCTION {new.sentence.checkb}
-{
- empty$
- swap$ empty$
- and
- 'skip$
- 'new.sentence
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{field.or.null}
-% \begin{macrocode}
-FUNCTION {field.or.null}
-{
- duplicate$ empty$
- { pop$ "" }
- 'skip$
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{emphasize}
-% \begin{macrocode}
-FUNCTION {emphasize}
-{
- duplicate$ empty$
- { pop$ "" }
- { "\BibEmph{" swap$ * "}" * }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{space.word}
-% \begin{macrocode}
-FUNCTION {space.word} { " " swap$ * " " * }
-
-% \end{macrocode}
-% \subsection{\xCE\xE1\xF9\xE5\xEF\xF0\xE8\xED\xFF\xF2\xFB\xE5 \xF1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xFF}
-% \begin{macrocode}
-FUNCTION {bbl.edby} % { "\bbledby{}" }
-{
- curlanguage "english" =
- { "Ed. by " }
- { curlanguage "german" =
- { "ed. " }
- { curlanguage "russian" =
- { "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
- { "language is not defined: " language "edited by" * *
- warning$ "edited by" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.cmplr}
-% \begin{macrocode}
-FUNCTION {bbl.cmplr}
-{
- curlanguage "english" =
- { "Compiler " }
- { curlanguage "german" =
- { "Hrsg. " }
- { curlanguage "russian" =
- { "{\cyr\CYRS\cyro\cyrs\cyrt.\ }" }
- { "language is not defined: " language "compiler" * * warning$ "compiler" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.edition}
-% \begin{macrocode}
-FUNCTION {bbl.edition} % { "\bbledition{}" }
-{
- curlanguage "english" =
- { "edition" }
- { curlanguage "german" =
- { "Aufl." }
- { curlanguage "russian" =
- { "{\cyr\cyri\cyrz\cyrd.}" }
- { "language is not defined: " language "edition" * * warning$ "edition" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.vvolume}
-% \begin{macrocode}
-FUNCTION {bbl.vvolume} % { "\bblVolume{}" }
-{
- curlanguage "english" =
- { "Volume" }
- { curlanguage "german" =
- { "Band" }
- { curlanguage "russian" =
- { "{\cyr\CYRT\cyro\cyrm}" }
- { "language is not defined: " language "Volume" * * warning$ "Volume" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.vvol}
-% \begin{macrocode}
-FUNCTION {bbl.vvol} % { "\bblVol{}" }
-{
- curlanguage "english" =
- { "Vol." }
- { curlanguage "german" =
- { "Bd." }
- { curlanguage "russian" =
- { "{\cyr\CYRT.}" }
- { "language is not defined: " language "Vol." * * warning$ "Vol." }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.iissue}
-% \begin{macrocode}
-FUNCTION {bbl.iissue} % { "\bblIssue{}" }
-{
- curlanguage "english" =
- { "Issue" }
- { curlanguage "german" =
- { "Heft" }
- { curlanguage "russian" =
- { "{\cyr\CYRV\cyrery\cyrp\cyru\cyrs\cyrk}" }
- { "language is not defined: " language * warning$ "Issue" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.iiss}
-% \begin{macrocode}
-FUNCTION {bbl.iiss} % { "\bblIss{}" }
-{
- curlanguage "english" =
- { "Iss." }
- { curlanguage "german" =
- { "H." }
- { curlanguage "russian" =
- { "{\cyr\CYRV\cyrery\cyrp.}" }
- { "language is not defined: " language * warning$ "Iss." }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.of}
-% \begin{macrocode}
-FUNCTION {bbl.of} % { "\bblof{}" }
-{
- curlanguage "english" =
- { "of" }
- { curlanguage "german" =
- { "von" }
- { curlanguage "russian" =
- { "{\cyr\cyri\cyrz}" }
- { "language is not defined: " language * warning$ "of" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.etal}
-% \begin{macrocode}
-FUNCTION {bbl.etal} % { "\bblof{}" }
-{
- curlanguage "english" =
- { "et~al." }
- { curlanguage "german" =
- { "u.~a." }
- { curlanguage "russian" =
- { "{\cyr\cyri~\cyrd\cyrr.}" }
- { "language is not defined: " language * warning$ "etal" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.nnumber}
-% \begin{macrocode}
-FUNCTION {bbl.nnumber} % { "\bblNumber{}" }
-{
- curlanguage "english" =
- { "Number" }
- { curlanguage "german" =
- { "Heft" }
- { curlanguage "russian" =
- { "{\cyr\CYRN\cyro\cyrm\cyre\cyrr}" }
- { "language is not defined: " language * warning$ "Number" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.number}
-% \begin{macrocode}
-FUNCTION {bbl.number} % { "\bblnumber{}" }
-{
- curlanguage "english" =
- { "number" }
- { curlanguage "german" =
- { "Heft" }
- { curlanguage "russian" =
- { "{\cyr\cyrn\cyro\cyrm\cyre\cyrr}" }
- { "language is not defined: " language * warning$ "number" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.nr}
-% \begin{macrocode}
-FUNCTION {bbl.nr} % { "\bblno{}" }
-{
- curlanguage "english" =
- { "no." }
- { curlanguage "german" =
- { "H." }
- { curlanguage "russian" =
- { "{\cyr\textnumero}" }
- { "language is not defined: " language * warning$ "no" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.nnr}
-% \begin{macrocode}
-FUNCTION {bbl.nnr} % { "\bblno{}" }
-{
- curlanguage "english" =
- { "No." }
- { curlanguage "german" =
- { "H." }
- { curlanguage "russian" =
- { "{\cyr\textnumero}" }
- { "language is not defined: " language * warning$ "No" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.in}
-% \begin{macrocode}
-FUNCTION {bbl.in} % { "\bblin{}" }
-{
- curlanguage "english" =
- { "in" }
- { curlanguage "german" =
- { "in" }
- { curlanguage "russian" =
- { "{\cyr\cyrv}" }
- { "language is not defined: " language * warning$ "in" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.iin}
-% \begin{macrocode}
-FUNCTION {bbl.iin} % { "\bblIn{}" }
-{
- curlanguage "english" =
- { "In" }
- { curlanguage "german" =
- { "In" }
- { curlanguage "russian" =
- { "{\cyr\CYRV}" }
- { "language is not defined: " language * warning$ "In" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.pages}
-% \begin{macrocode}
-FUNCTION {bbl.pages} % { "\bblpp." }
-{
- curlanguage "english" =
- { "p." }
- { curlanguage "german" =
- { "S." }
- { curlanguage "russian" =
- { "{\cyr\cyrs.}" }
- { "language is not defined: " language * warning$ "p." }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.page}
-% \begin{macrocode}
-FUNCTION {bbl.page} % { "\bblp." }
-{
- curlanguage "english" =
- { "p." }
- { curlanguage "german" =
- { "S." }
- { curlanguage "russian" =
- { "{\cyr\cyrs.}"}
- { "language is not defined: " language * warning$ "p." }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.ppages}
-% \begin{macrocode}
-FUNCTION {bbl.ppages} % { "\bblPp." }
-{
- curlanguage "english" =
- { "P." }
- { curlanguage "german" =
- { "S." }
- { curlanguage "russian" =
- { "{\cyr\CYRS.}" }
- { "language is not defined: " language * warning$ "P." }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.ppage}
-% \begin{macrocode}
-FUNCTION {bbl.ppage} % { "\bblP." }
-{
- curlanguage "english" =
- { "P." }
- { curlanguage "german" =
- { "S." }
- { curlanguage "russian" =
- { "{\cyr\CYRS.}" }
- { "language is not defined: " language * warning$ "P." }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.techrep}
-% \begin{macrocode}
-FUNCTION {bbl.techrep}
-{
- curlanguage "english" =
- { "Tech.~Rep." }
- { curlanguage "german" =
- { "Tech.~Bericht" }
- { curlanguage "russian" =
- { "{\cyr\CYRT\cyre\cyrh.\ \cyrd\cyro\cyrk\cyrl\cyra\cyrd.}" }
- { "language is not defined: " language * warning$ "Tech Rep" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.mthesis}
-% \begin{macrocode}
-FUNCTION {bbl.mthesis}
-{
- curlanguage "english" =
- { "Master's thesis" }
- { curlanguage "german" =
- { "Diss.~Mag." }
- { curlanguage "russian" =
- { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ "
- "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
- { "language is not defined: " language * warning$ "Master thesis" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.phdthesis}
-% \begin{macrocode}
-FUNCTION {bbl.phdthesis}
-{
- curlanguage "english" =
- { "Ph.\,D. thesis" }
- { curlanguage "german" =
- { "Diss.~Ph.\,D." }
- { curlanguage "russian" =
- { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ "
- "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
- { "language is not defined: " language * warning$ "PhD thesis" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.dscithesis}
-% \begin{macrocode}
-FUNCTION {bbl.dscithesis}
-{
- curlanguage "english" =
- { "Dr.\,Sci. dissertation" }
- { curlanguage "german" =
- { "Diss.~Dr." }
- { curlanguage "russian" =
- { "{\cyr\CYRD\cyro\cyrk\cyrt\cyro\cyrr\cyrs\cyrk\cyra\cyrya\ "
- "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
- { "language is not defined: " language * warning$ "Dr. Sci. dissertation" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.req}
-% \begin{macrocode}
-FUNCTION {bbl.req}
-{
- curlanguage "english" =
- { "req." }
- { curlanguage "german" =
- { "ang." }
- { curlanguage "russian" =
- { "{\cyr\cyrz\cyra\cyrya\cyrv\cyrl.}" }
- { "language is not defined: " language * warning$ "req" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.publ}
-% \begin{macrocode}
-FUNCTION {bbl.publ}
-{
- curlanguage "english" =
- { "publ." }
- { curlanguage "german" =
- { "ausg." }
- { curlanguage "russian" =
- { "{\cyr\cyro\cyrp\cyru\cyrb\cyrl.}" }
- { "language is not defined: " language * warning$ "In" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bbl.prio}
-% \begin{macrocode}
-FUNCTION {bbl.prio}
-{
- curlanguage "english" =
- { "priority" }
- { curlanguage "german" =
- { "Prioritat" }
- { curlanguage "russian" =
- { "{\cyr\cyrp\cyrr\cyri\cyro\cyrr\cyri\cyrt\cyre\cyrt}" }
- { "language is not defined: " language * warning$ "In" }
- if$
- }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \subsection{\xD4\xEE\xF0\xEC\xE0\xF2 \xFD\xEB\xE5\xEC\xE5\xED\xF2\xEE\xE2 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xF1\xFB\xEB\xEE\xEA}
-% \begin{macrocode}
-INTEGERS { nameptr namesleft numnames }
-
-% \end{macrocode}
-% \DescribeFunction{format.names}
-% \begin{macrocode}
-FUNCTION {format.names}
-{
- 's :=
- #1 'nameptr :=
- s num.names$ 'numnames :=
- numnames 'namesleft :=
- { namesleft #0 > }
- { s nameptr
- "{vv~}{ll}{~f.}{, jj}" format.name$ 't :=
- nameptr #1 >
- { nameptr #4 =
- numnames #4 > and
- { "others" 't :=
- #1 'namesleft := }
- 'skip$
- if$
- namesleft #1 >
- { ", " * t * }
- { t "others" =
- t "~others" =
- or
- { " " * bbl.etal * }
- { ", " * t * }
- if$
- }
- if$
- }
- 't
- if$
- nameptr #1 + 'nameptr :=
- namesleft #1 - 'namesleft :=
- }
- while$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.names.rev}
-% \begin{macrocode}
-FUNCTION {format.names.rev}
-{
- 's :=
- #1 'nameptr :=
- s num.names$ 'numnames :=
- numnames 'namesleft :=
- { namesleft #0 > }
- { s nameptr
- "{f.}{~vv}{~ll}{, jj}" format.name$ 't :=
- nameptr #1 >
- { nameptr #4 =
- numnames #4 > and
- { "others" 't :=
- #1 'namesleft := }
- 'skip$
- if$
- namesleft #1 >
- { ", " * t * }
- { t "others" =
- t "~others" =
- or
- { " " * bbl.etal * }
- { ", " * t * }
- if$
- }
- if$
- }
- 't
- if$
- nameptr #1 + 'nameptr :=
- namesleft #1 - 'namesleft :=
- }
- while$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.authors}
-% \begin{macrocode}
-FUNCTION {format.authors}
-{
- author empty$
- { "" }
- { author format.names emphasize }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.bookauthors}
-% \begin{macrocode}
-FUNCTION {format.bookauthors}
-{
- bookauthor empty$
- { "" }
- { bookauthor format.names }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.authors.after}
-% \begin{macrocode}
-FUNCTION {format.authors.after}
-{
- author empty$
- { "" }
- { author format.names.rev }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.bookauthors.after}
-% \begin{macrocode}
-FUNCTION {format.bookauthors.after}
-{
- bookauthor empty$
- { "" }
- { bookauthor format.names.rev }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.editors.after}
-% \begin{macrocode}
-FUNCTION {format.editors.after}
-{
- editor empty$
- { "" }
- { bbl.edby editor format.names.rev * }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.compiler.after}
-% \begin{macrocode}
-FUNCTION {format.compiler.after}
-{
- compiler empty$
- { "" }
- { bbl.cmplr compiler format.names.rev * }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.title}
-% \begin{macrocode}
-FUNCTION {format.title}
-{
- title empty$
- { "" }
- { title }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.date}
-% \begin{macrocode}
-FUNCTION {format.date}
-{
- year empty$
- { month empty$
- { "" }
- { "there's a month but no year in " cite$ * warning$ month }
- if$
- }
- { month empty$
- 'year
- { year ". " quote$ "--- " month * * * * }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{output.address.publisher.date}
-% \begin{macrocode}
-FUNCTION {output.address.publisher.date}
-{
- address empty$
- 'skip$
- { address output
- publisher empty$
- 'skip$
- { new.colon }
- if$
- }
- if$
- publisher output
- format.date output
-}
-
-% \end{macrocode}
-% \DescribeFunction{output.bibitem}
-% \begin{macrocode}
-FUNCTION {output.bibitem}
-{
- newline$
- "\bibitem" "{" * write$
- cite$ write$
- "}" write$
- newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
- if$
- "\selectlanguageifdefined{" write$
- curlanguage write$
- "}" write$ newline$
- ""
- before.all 'output.state :=
-}
-
-% \end{macrocode}
-% \DescribeFunction{n.dashify}
-% \begin{macrocode}
-FUNCTION {n.dashify}
-{
- 't :=
- ""
- { t empty$ not }
- { t #1 #1 substring$ "-" =
- { t #1 #2 substring$ "--" = not
- { "--" *
- t #2 global.max$ substring$ 't :=
- }
- { { t #1 #1 substring$ "-" = }
- { "-" *
- t #2 global.max$ substring$ 't :=
- }
- while$
- }
- if$
- }
- { t #1 #1 substring$ *
- t #2 global.max$ substring$ 't :=
- }
- if$
- }
- while$
-}
-
-% \end{macrocode}
-% \DescribeFunction{word.in}
-% \begin{macrocode}
-FUNCTION {word.in} { bbl.iin " " * }
-
-% \end{macrocode}
-% \DescribeFunction{format.btitle}
-% \begin{macrocode}
-FUNCTION {format.btitle} { title }
-
-% \end{macrocode}
-% \DescribeFunction{tie.or.space.connect}
-% \begin{macrocode}
-FUNCTION {tie.or.space.connect}
-{
- duplicate$ text.length$ #3 <
- { "~" }
- { " " }
- if$
- swap$ * *
-}
-
-% \end{macrocode}
-% \DescribeFunction{tie.connect}
-% \begin{macrocode}
-FUNCTION {tie.connect} { "~" swap$ * * }
-
-% \end{macrocode}
-% \DescribeFunction{either.or.check}
-% \begin{macrocode}
-FUNCTION {either.or.check}
-{
- empty$
- 'pop$
- { "can't use both " swap$ * " fields in " * cite$ * warning$ }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.bvolume}
-% \begin{macrocode}
-FUNCTION {format.bvolume}
-{
- volume empty$
- { "" }
- { bbl.vvol volume tie.connect
- series empty$
- 'skip$
- { bbl.of space.word * series emphasize * }
- if$
- "volume and number" number either.or.check
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.number.series}
-% \begin{macrocode}
-FUNCTION {format.number.series}
-{
- volume empty$
- { number empty$
- { series field.or.null }
- { series empty$
- { "there's a number but no series in " cite$ * warning$
- bbl.nnr
- }
- { new.sentence
- bbl.iiss series tie.or.space.connect
- ", " * bbl.nr
- tie.or.space.connect
- }
- if$
- number tie.or.space.connect
- }
- if$
- }
- { "" }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{is.num}
-% \begin{macrocode}
-FUNCTION {is.num}
-{
- chr.to.int$
- duplicate$ "0" chr.to.int$ < not
- swap$ "9" chr.to.int$ > not and
-}
-
-% \end{macrocode}
-% \DescribeFunction{extract.num}
-% \begin{macrocode}
-FUNCTION {extract.num}
-{
- duplicate$ 't :=
- "" 's :=
- { t empty$ not }
- { t #1 #1 substring$
- t #2 global.max$ substring$ 't :=
- duplicate$ is.num
- { s swap$ * 's := }
- { pop$ "" 't := }
- if$
- }
- while$
- s empty$
- 'skip$
- { pop$ s }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{convert.edition}
-% \begin{macrocode}
-FUNCTION {convert.edition} { edition }
-
-% \end{macrocode}
-% \DescribeFunction{format.edition}
-% \begin{macrocode}
-FUNCTION {format.edition}
-{
- edition empty$
- { "" }
- { output.state mid.sentence =
- { convert.edition "l" change.case$ " " * bbl.edition * }
- { convert.edition "t" change.case$ " " * bbl.edition * }
- if$
- }
- if$
-}
-
-INTEGERS { multiresult }
-
-% \end{macrocode}
-% \DescribeFunction{multi.page.check}
-% \begin{macrocode}
-FUNCTION {multi.page.check}
-{
- 't :=
- #0 'multiresult :=
- { multiresult not
- t empty$ not
- and
- }
- { t #1 #1 substring$
- duplicate$ "-" =
- swap$ duplicate$ "," =
- swap$ "+" =
- or or
- { #1 'multiresult := }
- { t #2 global.max$ substring$ 't := }
- if$
- }
- while$
- multiresult
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.pages}
-% \begin{macrocode}
-FUNCTION {format.pages}
-{
- pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.pages.page}
-% \begin{macrocode}
-FUNCTION {format.pages.page}
-{
- pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$
- }
- { format.pages }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.vol.num.pages}
-% \begin{macrocode}
-FUNCTION {format.vol.num.pages}
-{
- volume field.or.null
- number empty$
- 'skip$
- { ", no." number tie.or.space.connect *
- volume empty$
- { "there's a number but no volume in " cite$ * warning$ }
- 'skip$
- if$
- }
- if$
- pages empty$
- 'skip$
- { duplicate$ empty$
- { pop$ format.pages }
- { ": " * pages n.dashify * }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.volume}
-% \begin{macrocode}
-FUNCTION {format.volume}
-{
- volume empty$
- { "" }
- { bbl.vvol volume tie.or.space.connect }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.number}
-% \begin{macrocode}
-FUNCTION {format.number}
-{ number empty$
- { "" }
- { bbl.nr number tie.or.space.connect }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{empty.misc.check}
-% \begin{macrocode}
-FUNCTION {empty.misc.check}
-{
- author empty$ title empty$ howpublished empty$
- month empty$ year empty$ note empty$
- and and and and and
- key empty$ not and
- { "all relevant fields are empty in " cite$ * warning$ }
- 'skip$
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.thesis.type}
-% \begin{macrocode}
-FUNCTION {format.thesis.type}
-{
- type empty$
- 'skip$
- { pop$
- type "t" change.case$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.tr.number}
-% \begin{macrocode}
-FUNCTION {format.tr.number}
-{
- type empty$
- { bbl.techrep }
- 'type
- if$
- number empty$
- { "t" change.case$ }
- { number tie.or.space.connect }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{author.before}
-% \begin{macrocode}
-FUNCTION {author.before}
-{
- author empty$
- 'skip$
- { format.authors output
- new.sentence
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bookauthor.before}
-% \begin{macrocode}
-FUNCTION {bookauthor.before}
-{
- bookauthor empty$
- 'skip$
- { format.bookauthors output
- new.sentence
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{author.after}
-% \begin{macrocode}
-FUNCTION {author.after}
-{
- author empty$
- 'skip$
- { author num.names$ #3 >
- { format.authors.after output
- new.semicolon
- }
- 'skip$
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{bookauthor.after}
-% \begin{macrocode}
-FUNCTION {bookauthor.after}
-{
- bookauthor empty$
- 'skip$
- { bookauthor num.names$ #3 >
- { format.bookauthors.after output
- new.semicolon
- }
- 'skip$
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{editor.organization.after}
-% \begin{macrocode}
-FUNCTION {editor.organization.after}
-{
- compiler empty$
- 'skip$
- { format.compiler.after output
- new.semicolon
- }
- if$
- editor empty$
- 'skip$
- { format.editors.after output
- new.semicolon
- }
- if$
- organization empty$
- 'skip$
- { organization output
- new.semicolon
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.annote}
-% \begin{macrocode}
-FUNCTION {format.annote}
-{
- annote empty$
- { "" }
- { after.sentence 'output.state :=
- "\BibAnnote{" annote add.period$ * "}" *
- }
- if$
-}
-
-% \end{macrocode}
-% \subsection{\xD1\xEE\xE7\xE4\xE0\xED\xE8\xE5 \xE3\xE8\xEF\xE5\xF0\xF1\xF1\xFB\xEB\xEE\xEA}
-% \DescribeFunction{format.url}
-% \begin{macrocode}
-FUNCTION {format.url}
-{
- url empty$
- { "" }
- { "\BibUrl{" url * "}" * }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.urldate}
-% \begin{macrocode}
-FUNCTION {format.urldate}
-{
- urldate empty$
- { "" }
- { add.blank
- "\BibUrlDate{" urldate * "}" *
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{output.url}
-% \begin{macrocode}
-FUNCTION {output.url}
-{
- url empty$
- 'skip$
- { format.url output
- format.urldate output
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.isbn}
-% \begin{macrocode}
-FUNCTION {format.isbn}
-{
- isbn empty$
- { "" }
- { "ISBN:~\href{http://isbndb.com/search-all.html?kw=" isbn *
- "}{" * isbn * "}" *
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{add.doi.url}
-% \begin{macrocode}
-FUNCTION {add.doi.url}
-{ duplicate$ empty$
- 'skip$
- { doi empty$
- { url empty$
- 'skip$
- { "\href{" url * "}{" * swap$ * "}" * }
- if$
- }
- { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{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}
-% \DescribeFunction{add.number}
-% \begin{macrocode}
-FUNCTION {add.number}
-{ duplicate$ empty$
- { "" }
- { bbl.nr swap$ tie.or.space.connect }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{in.square.brackets}
-% \begin{macrocode}
-FUNCTION {in.square.brackets}
-{
- duplicate$ empty$
- { pop$ "" }
- { "[" swap$ * "]" * }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{in.round.brackets}
-% \begin{macrocode}
-FUNCTION {in.round.brackets}
-{
- duplicate$ empty$
- { pop$ "" }
- { "(" swap$ * ")" * }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.type.number}
-% \begin{macrocode}
-FUNCTION {format.type.number}
-{
- type empty$
- { "" }
- {
- number empty$
- { "" }
- { type number tie.or.space.connect }
- if$
- }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.reqdate}
-% \begin{macrocode}
-FUNCTION {format.reqdate}
-{ reqdate empty$
- { "" }
- { bbl.req reqdate tie.or.space.connect }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.pubdate}
-% \begin{macrocode}
-FUNCTION {format.pubdate}
-{ pubdate empty$
- { "" }
- { bbl.publ pubdate tie.or.space.connect }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{format.prdate}
-% \begin{macrocode}
-FUNCTION {format.prdate}
-{ prdate empty$
- { "" }
- { bbl.prio prdate tie.or.space.connect }
- if$
-}
-
-% \end{macrocode}
-% \subsection{\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5 \xF2\xE8\xEF\xEE\xE2 \xE1\xE8\xE1\xEB\xE8\xEE\xE3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xF5 \xF1\xF1\xFB\xEB\xEE\xEA}
-% \DescribeFunction{article}
-% \begin{macrocode}
-FUNCTION {article}
-{
- output.bibitem
- author.before
- format.title "title" output.check
- new.dblslash
- journal emphasize add.doi.url "journal" output.check
- new.block
- format.date output
- new.block
- format.volume output
- format.number output
- new.block
- format.pages.page output
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{book}
-% \begin{macrocode}
-FUNCTION {book}
-{
- output.bibitem
- author.before
- format.btitle add.doi.url "title" output.check
- new.slash
- editor.organization.after
- new.sentence
- format.number.series output
- new.block
- format.edition output
- new.block
- output.address.publisher.date
- new.block
- format.bvolume output
- new.block
- format.pages.page output
- new.block
- format.isbn output
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{booklet}
-% \begin{macrocode}
-FUNCTION {booklet}
-{
- output.bibitem
- author.before
- format.title "title" output.check
- editor.organization.after
- new.block
- howpublished output
- address output
- format.date output
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{inbook}
-% \begin{macrocode}
-FUNCTION {inbook}
-{
- output.bibitem
- author.before
- format.btitle add.doi.url "title" output.check
- new.dblslash
- bookauthor.before
- booktitle "booktitle" output.check
- editor.organization.after
- new.block
- format.edition output
- new.block
- format.number.series output
- new.sentence
- output.address.publisher.date
- new.block
- format.bvolume output
- new.block
- format.pages.page output
- new.block
- format.isbn output
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{incollection}
-% \begin{macrocode}
-FUNCTION {incollection}
-{
- output.bibitem
- author.before
- new.sentence
- format.title add.doi.url "title" output.check
- new.dblslash
- booktitle "booktitle" output.check
- new.slash
- editor.organization.after
- new.block
- output.address.publisher.date
- new.block
- format.bvolume output
- format.number.series output
- new.block
- format.pages.page output
- new.block
- note output
- new.block
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{inproceedings}
-% \begin{macrocode}
-FUNCTION {inproceedings}
-{
- output.bibitem
- author.before
- new.sentence
- format.title add.doi.url "title" output.check
- new.dblslash
- booktitle "booktitle" output.check
- new.slash
- editor.organization.after
- new.block
- format.bvolume output
- format.number.series output
- new.block
- address empty$
- { publisher output
- format.date "year" output.check
- }
- { address output.nonnull
- new.colon
- publisher output
- format.date "year" output.check
- }
- if$
- new.block
- format.pages.page output
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{conference}
-% \begin{macrocode}
-FUNCTION {conference} { inproceedings }
-
-% \end{macrocode}
-% \DescribeFunction{manual}
-% \begin{macrocode}
-FUNCTION {manual}
-{
- output.bibitem
- author empty$
- { organization empty$
- 'skip$
- { organization output.nonnull
- address output
- }
- if$
- }
- { format.authors output.nonnull }
- if$
- new.block
- format.btitle "title" output.check
- author empty$
- { organization empty$
- { address new.block.checka
- address output
- }
- 'skip$
- if$
- }
- { organization address new.block.checkb
- organization output
- address output
- }
- if$
- format.edition output
- format.date output
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{mastersthesis}
-% \begin{macrocode}
-FUNCTION {mastersthesis}
-{
- output.bibitem
- format.authors "author" output.check
- new.block
- format.btitle add.doi.url "title" output.check
- new.block
- bbl.mthesis format.thesis.type output.nonnull
- school "school" output.check
- address output
- format.date "year" output.check
- new.block
- note output
- new.block
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{misc}
-% \begin{macrocode}
-FUNCTION {misc}
-{
- output.bibitem
- format.authors "author" output.check
- new.block
- format.title "title" output.check
- new.block
- howpublished output
- new.block
- format.date output
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{phdthesis}
-% \begin{macrocode}
-FUNCTION {phdthesis}
-{
- output.bibitem
- format.authors "author" output.check
- new.sentence
- format.btitle add.doi.url "title" output.check
- new.colon
- bbl.phdthesis format.thesis.type output.nonnull
- new.slash
- school "school" output.check
- new.block
- output.address.publisher.date
- new.block
- format.pages.page output
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{dscithesis}
-% \begin{macrocode}
-FUNCTION {dscithesis}
-{
- output.bibitem
- format.authors "author" output.check
- new.sentence
- format.btitle add.doi.url "title" output.check
- new.colon
- bbl.dscithesis format.thesis.type output.nonnull
- new.slash
- school "school" output.check
- new.block
- output.address.publisher.date
- new.block
- format.pages.page output
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{proceedings}
-% \begin{macrocode}
-FUNCTION {proceedings}
-{
- output.bibitem
- format.btitle add.doi.url "title" output.check
- new.slash
- editor.organization.after
- new.block
- format.bvolume output
- format.number.series output
- address empty$
- { publisher output
- format.date "year" output.check
- }
- { address output.nonnull
- format.date "year" output.check
- new.sentence
- publisher output
- }
- if$
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{techreport}
-% \begin{macrocode}
-FUNCTION {techreport}
-{
- output.bibitem
- author.before
- new.sentence
- format.title add.doi.url "title" output.check
- new.colon
- format.tr.number output.nonnull
- editor.organization.after
- new.block
- address output
- new.colon
- institution "institution" output.check
- format.date "year" output.check
- new.block
- note output
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{patent}
-% \begin{macrocode}
-FUNCTION {patent}
-{
- output.bibitem
- title output.nonnull
- add.blank
- media in.square.brackets output
- new.colon
- format.type.number output
- add.blank
- location output
- new.colon
- ipc output
- new.slash
- format.authors.after "author" output.check
- add.blank
- authortype in.round.brackets output.nonnull
- new.semicolon
- holder output.nonnull
- new.semicolon
- credits output.nonnull
- new.block
- reqnumber add.number output
- new.semicolon
- format.reqdate output
- new.semicolon
- format.pubdate output
- publication output
- new.semicolon
- format.prdate output
- prnumber output
- prcountry in.round.brackets output
- new.block
- note output
- new.sentence
- output.url
- format.annote output
- new.block
- pagetotal output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{unpublished}
-% \begin{macrocode}
-FUNCTION {unpublished}
-{
- output.bibitem
- author.before
- format.btitle add.doi.url "title" output.check
- editor.organization.after
- new.block
- note "note" output.check
- new.sentence
- format.eprint output
- new.block
- output.url
- format.annote output
- fin.entry
-}
-
-% \end{macrocode}
-% \DescribeFunction{default.type}
-% \begin{macrocode}
-FUNCTION {default.type} { misc }
-
-% \end{macrocode}
-% \subsection{\xD1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xFF \xED\xE0\xE7\xE2\xE0\xED\xE8\xE9 \xEC\xE5\xF1\xFF\xF6\xE5\xE2}
-% \begin{macrocode}
-MACRO {jan} {"\bbljan{}"}
-MACRO {feb} {"\bblfeb{}"}
-MACRO {mar} {"\bblmar{}"}
-MACRO {apr} {"\bblapr{}"}
-MACRO {may} {"\bblmay{}"}
-MACRO {jun} {"\bbljun{}"}
-MACRO {jul} {"\bbljul{}"}
-MACRO {aug} {"\bblaug{}"}
-MACRO {sep} {"\bblsep{}"}
-MACRO {oct} {"\bbloct{}"}
-MACRO {nov} {"\bblnov{}"}
-MACRO {dec} {"\bbldec{}"}
-
-% \end{macrocode}
-% \subsection{\xD1\xEE\xEA\xF0\xE0\xF9\xE5\xED\xE8\xFF \xED\xE0\xE7\xE2\xE0\xED\xE8\xE9 \xE6\xF3\xF0\xED\xE0\xEB\xEE\xE2}
-% \subsubsection{\xD4\xE8\xE7\xE8\xEA\xE0 \xE8 \xE0\xF1\xF2\xF0\xEE\xED\xEE\xEC\xE8\xFF}
-% \xCA\xEE\xE4 \xE4\xE0\xED\xED\xEE\xE9 \xF1\xE5\xEA\xF6\xE8\xE8 \xF1\xEE\xE7\xE4\xE0\xED \xED\xE0 \xEE\xF1\xED\xEE\xE2\xE5 \xF4\xE0\xE9\xEB\xE0 \file{physjour.mbs} \xEF\xE0\xEA\xE5\xF2\xE0
-% \pkg{custom-bib}.
-% \begin{macrocode}
-MACRO {aa}{"Astron. \& Astrophys."}
-MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
-MACRO {aj} {"Astron. J."}
-MACRO {aph} {"Acta Phys."}
-MACRO {advp} {"Adv. Phys."}
-MACRO {ajp} {"Amer. J. Phys."}
-MACRO {ajm} {"Amer. J. Math."}
-MACRO {amsci} {"Amer. Sci."}
-MACRO {anofd} {"Ann. Fluid Dyn."}
-MACRO {am} {"Ann. Math."}
-MACRO {ap} {"Ann. Phys. (NY)"}
-MACRO {adp} {"Ann. Phys. (Leipzig)"}
-MACRO {ao} {"Appl. Opt."}
-MACRO {apl} {"Appl. Phys. Lett."}
-MACRO {app} {"Astroparticle Phys."}
-MACRO {apj} {"Astrophys. J."}
-MACRO {apjsup} {"Astrophys. J. Suppl."}
-MACRO {apss} {"Astrophys. Space Sci."}
-MACRO {araa} {"Ann. Rev. Astron. Astrophys."}
-MACRO {baas} {"Bull. Amer. Astron. Soc."}
-MACRO {baps} {"Bull. Amer. Phys. Soc."}
-MACRO {cmp} {"Comm. Math. Phys."}
-MACRO {cpam} {"Commun. Pure Appl. Math."}
-MACRO {cppcf} {"Comm. Plasma Phys. \& Controlled Fusion"}
-MACRO {cpc} {"Comp. Phys. Comm."}
-MACRO {cqg} {"Class. Quant. Grav."}
-MACRO {cra} {"C. R. Acad. Sci. A"}
-MACRO {fed} {"Fusion Eng. \& Design"}
-MACRO {ft} {"Fusion Tech."}
-MACRO {grg} {"Gen. Relativ. Gravit."}
-MACRO {ieeens} {"IEEE Trans. Nucl. Sci."}
-MACRO {ieeeps} {"IEEE Trans. Plasma Sci."}
-MACRO {ijimw} {"Interntl. J. Infrared \& Millimeter Waves"}
-MACRO {ip} {"Infrared Phys."}
-MACRO {irp} {"Infrared Phys."}
-MACRO {jap} {"J. Appl. Phys."}
-MACRO {jasa} {"J. Acoust. Soc. America"}
-MACRO {jcp} {"J. Comp. Phys."}
-MACRO {jchp} {"J. Chem. Phys."}
-MACRO {jetp} {"Sov. Phys.--JETP"}
-MACRO {jfe} {"J. Fusion Energy"}
-MACRO {jfm} {"J. Fluid Mech."}
-MACRO {jmp} {"J. Math. Phys."}
-MACRO {jne} {"J. Nucl. Energy"}
-MACRO {jnec} {"J. Nucl. Energy, C: Plasma Phys., Accelerators, Thermonucl. Res."}
-MACRO {jnm} {"J. Nucl. Mat."}
-MACRO {jpc} {"J. Phys. Chem."}
-MACRO {jpp} {"J. Plasma Phys."}
-MACRO {jpsj} {"J. Phys. Soc. Japan"}
-MACRO {jsi} {"J. Sci. Instrum."}
-MACRO {jvst} {"J. Vac. Sci. \& Tech."}
-MACRO {nat} {"Nature"}
-MACRO {nature} {"Nature"}
-MACRO {nedf} {"Nucl. Eng. \& Design/Fusion"}
-MACRO {nf} {"Nucl. Fusion"}
-MACRO {nim} {"Nucl. Inst. \& Meth."}
-MACRO {nimpr} {"Nucl. Inst. \& Meth. in Phys. Res."}
-MACRO {np} {"Nucl. Phys."}
-MACRO {npb} {"Nucl. Phys. B"}
-MACRO {nt/f} {"Nucl. Tech./Fusion"}
-MACRO {npbpc} {"Nucl. Phys. B (Proc. Suppl.)"}
-MACRO {inc} {"Nuovo Cimento"}
-MACRO {nc} {"Nuovo Cimento"}
-MACRO {pf} {"Phys. Fluids"}
-MACRO {pfa} {"Phys. Fluids A: Fluid Dyn."}
-MACRO {pfb} {"Phys. Fluids B: Plasma Phys."}
-MACRO {pl} {"Phys. Lett."}
-MACRO {pla} {"Phys. Lett. A"}
-MACRO {plb} {"Phys. Lett. B"}
-MACRO {prep} {"Phys. Rep."}
-MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
-MACRO {pp} {"Phys. Plasmas"}
-MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
-MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
-MACRO {prl} {"Phys. Rev. Lett."}
-MACRO {pr} {"Phys. Rev."}
-MACRO {physrev} {"Phys. Rev."}
-MACRO {pra} {"Phys. Rev. A"}
-MACRO {prb} {"Phys. Rev. B"}
-MACRO {prc} {"Phys. Rev. C"}
-MACRO {prd} {"Phys. Rev. D"}
-MACRO {pre} {"Phys. Rev. E"}
-MACRO {ps} {"Phys. Scripta"}
-MACRO {procrsl} {"Proc. Roy. Soc. London"}
-MACRO {rmp} {"Rev. Mod. Phys."}
-MACRO {rsi} {"Rev. Sci. Inst."}
-MACRO {science} {"Science"}
-MACRO {sciam} {"Sci. Am."}
-MACRO {sam} {"Stud. Appl. Math."}
-MACRO {sjpp} {"Sov. J. Plasma Phys."}
-MACRO {spd} {"Sov. Phys.--Doklady"}
-MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
-MACRO {spu} {"Sov. Phys.--Uspekhi"}
-MACRO {st} {"Sky and Telesc."}
-
-% \end{macrocode}
-% \subsubsection{\xCE\xEF\xF2\xE8\xEA\xE0}
-% \xC8\xE7 \xF4\xE0\xE9\xEB\xE0~\file{photjour.mbs}.
-% \begin{macrocode}
-MACRO {appopt} {"Appl. Opt."}
-MACRO {bell} {"Bell Syst. Tech. J."}
-MACRO {ell} {"Electron. Lett."}
-MACRO {jasp} {"J. Appl. Spectr."}
-MACRO {jqe} {"IEEE J. Quantum Electron."}
-MACRO {jlwt} {"J. Lightwave Technol."}
-MACRO {jmo} {"J. Mod. Opt."}
-MACRO {josa} {"J. Opt. Soc. America"}
-MACRO {josaa} {"J. Opt. Soc. Amer.~A"}
-MACRO {josab} {"J. Opt. Soc. Amer.~B"}
-MACRO {jdp} {"J. Phys. (Paris)"}
-MACRO {oc} {"Opt. Commun."}
-MACRO {ol} {"Opt. Lett."}
-MACRO {os} {"Opt. Spectrosc."}
-MACRO {phtl} {"IEEE Photon. Technol. Lett."}
-MACRO {pspie} {"Proc. Soc. Photo-Opt. Instrum. Eng."}
-MACRO {sjot} {"Sov. J. Opt. Technol."}
-MACRO {sjqe} {"Sov. J. Quantum Electron."}
-MACRO {sleb} {"Sov. Phys.--Leb. Inst. Rep."}
-MACRO {stph} {"Sov. Phys.--Techn. Phys."}
-MACRO {stphl} {"Sov. Techn. Phys. Lett."}
-MACRO {vr} {"Vision Res."}
-MACRO {zph} {"Z. f. Physik"}
-MACRO {zphb} {"Z. f. Physik~B"}
-MACRO {zphd} {"Z. f. Physik~D"}
-
-% \end{macrocode}
-% \subsubsection{\xD4\xE8\xE7\xE8\xEA\xE0 \xEA\xEE\xED\xE4\xE5\xED\xF1\xE8\xF0\xEE\xE2\xE0\xED\xED\xEE\xE3\xEE \xF1\xEE\xF1\xF2\xEE\xFF\xED\xE8\xFF}
-% \begin{macrocode}
-MACRO {sse} {"Solid-State Electron."}
-MACRO {pss} {"Phys. Sol. State"}
-MACRO {sst} {"Semicond. Sci. Tech."}
-MACRO {nl} {"Nano Lett."}
-
-READ
-
-% \end{macrocode}
-% \subsection{\xD1\xEE\xF0\xF2\xE8\xF0\xEE\xE2\xEA\xE0 \xF1\xEF\xE8\xF1\xEA\xE0 \xEB\xE8\xF2\xE5\xF0\xE0\xF2\xF3\xF0\xFB \xEF\xEE \xE8\xEC\xE5\xED\xE0\xEC \xE0\xE2\xF2\xEE\xF0\xEE\xE2 \xE8 \xED\xE0\xE7\xE2\xE0\xED\xE8\xFF\xEC}
-% \begin{macrocode}
-%<*gost705s>
-% \end{macrocode}
-% \DescribeFunction{sortify}
-% \begin{macrocode}
-FUNCTION {sortify}
-{
- purify$
- "l" change.case$
-}
-
-INTEGERS { len }
-
-% \end{macrocode}
-% \DescribeFunction{chop.word}
-% \begin{macrocode}
-FUNCTION {chop.word}
-{
- 's :=
- 'len :=
- s #1 len substring$ =
- { s len #1 + global.max$ substring$ }
- 's
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{sort.format.names}
-% \begin{macrocode}
-FUNCTION {sort.format.names}
-{
- 's :=
- #1 'nameptr :=
- ""
- s num.names$ 'numnames :=
- numnames 'namesleft :=
- { namesleft #0 > }
- { nameptr #1 >
- { " " * }
- 'skip$
- if$
- s nameptr
- "{vv{ } }{ll{ }}{ f{ }}{ jj{ }}"
- format.name$ 't :=
- nameptr numnames = t "others" = and
- { "et al" * }
- { t sortify * }
- if$
- nameptr #1 + 'nameptr :=
- namesleft #1 - 'namesleft :=
- }
- while$
-}
-
-% \end{macrocode}
-% \DescribeFunction{sort.format.title}
-% \begin{macrocode}
-FUNCTION {sort.format.title}
-{
- 't :=
- "A " #2
- "An " #3
- "The " #4 t chop.word
- chop.word
- chop.word
- sortify
- #1 global.max$ substring$
-}
-
-% \end{macrocode}
-% \DescribeFunction{author.sort}
-% \begin{macrocode}
-FUNCTION {author.sort}
-{
- author empty$
- { key empty$
- { "to sort, need author or key in " cite$ * warning$ "" }
- { key sortify }
- if$
- }
- { author sort.format.names }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{author.title.sort}
-% \begin{macrocode}
-FUNCTION {author.title.sort}
-{
- author empty$
- { title empty$
- { key empty$
- { "to sort, need author, title, or key in " cite$ * warning$ "" }
- { key sortify }
- if$
- }
- { title sort.format.title }
- if$
- }
- { author sort.format.names }
- if$
-}
-
-% \end{macrocode}
-% \DescribeFunction{presort}
-% \begin{macrocode}
-FUNCTION {presort}
-{
- author.title.sort
- " "
- *
- year field.or.null sortify
- *
- " "
- *
- title field.or.null
- sort.format.title
- *
- #1 entry.max$ substring$
- 'sort.key$ :=
-}
-
-ITERATE {presort}
-
-SORT
-
-%</gost705s>
-
-% \end{macrocode}
-% \subsection{\xC2\xFB\xF7\xE8\xF1\xEB\xE5\xED\xE8\xE5 \xE4\xEB\xE8\xED\xFB \xF2\xE0\xE1\xF3\xEB\xFF\xF6\xE8\xE8 \xEC\xE5\xE6\xE4\xF3 \xED\xEE\xEC\xE5\xF0\xEE\xEC \xE8 \xF2\xE5\xEA\xF1\xF2\xEE\xEC}
-% \begin{macrocode}
-STRINGS { longest.label }
-
-INTEGERS { number.label longest.label.width }
-
-% \end{macrocode}
-% \DescribeFunction{initialize.longest.label}
-% \begin{macrocode}
-FUNCTION {initialize.longest.label}
-{
- "" 'longest.label :=
- #1 'number.label :=
- #0 'longest.label.width :=
-}
-
-% \end{macrocode}
-% \DescribeFunction{longest.label.pass}
-% \begin{macrocode}
-FUNCTION {longest.label.pass}
-{
- number.label int.to.str$ 'label :=
- number.label #1 + 'number.label :=
- label width$ longest.label.width >
- { label 'longest.label :=
- label width$ 'longest.label.width :=
- }
- 'skip$
- if$
-}
-
-EXECUTE {initialize.longest.label}
-
-ITERATE {longest.label.pass}
-
-% \end{macrocode}
-% \subsection{\xD4\xEE\xF0\xEC\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF thebibliography}
-% \subsubsection{\xCF\xF0\xE5\xE0\xEC\xE1\xF3\xEB\xE0}
-% \DescribeFunction{begin.bib}
-% \begin{macrocode}
-FUNCTION {begin.bib}
-{
- preamble$ empty$
- 'skip$
- { preamble$ write$ newline$ }
- if$
- "\providecommand*\BibEmph[1]{#1}" write$ newline$
- "\providecommand*\BibDash{}" write$ newline$
- "\providecommand*\href[2]{#2}" write$ newline$
- "\providecommand*\url[1]{\texttt{#1}}" write$ newline$
- "\providecommand*\urlprefix{URL: }" write$ newline$
- "\providecommand*\BibUrl[1]{\urlprefix\url{#1}}" write$ newline$
- "\providecommand*\BibUrlDate[1]{({%" write$ newline$
- "\cyr\cyrd\cyra\cyrt\cyra\ %" write$ newline$
- "\cyro\cyrb\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrya}: #1)}" write$ newline$
- "\providecommand*\BibAnnote[1]{#1}" write$ newline$
- "\begin{thebibliography}{" longest.label * "}" * write$ newline$
- "\def\selectlanguageifdefined#1{" write$ newline$
- "\expandafter\ifx\csname date#1\endcsname\relax" write$ newline$
- "\else\language\csname l@#1\endcsname\fi}" write$ newline$
-}
-
-% \end{macrocode}
-% \subsubsection{\xCD\xE0\xF7\xE0\xEB\xEE \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF}
-% \begin{macrocode}
-EXECUTE {begin.bib}
-
-EXECUTE {init.state.consts}
-
-ITERATE {call.type$}
-
-% \end{macrocode}
-% \subsubsection{\xCA\xEE\xED\xE5\xF6 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF}
-% \DescribeFunction{end.bib}
-% \begin{macrocode}
-FUNCTION {end.bib}
-{
- newline$
- "\end{thebibliography}" write$ newline$
-}
-
-EXECUTE {end.bib}
-
-%</gost705|gost705s>
-% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/disser/gost732.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/gost732.dtx 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/source/latex/disser/gost732.dtx 2017-03-05 21:37:27 UTC (rev 43400)
@@ -18,9 +18,9 @@
%
% Current Maintainer of this work is Stanislav Kruchinin.
%
-% This work consists of the main source file gost705.dtx
+% This work consists of the main source file gost732.dtx
% and the derived files
-% gost732.bst, gost732.pdf.
+% gost732.cls, gost732.pdf.
%
% Distribution:
% CTAN:macros/latex/contrib/disser/src/gost732.dtx
@@ -90,9 +90,9 @@
Current Maintainer of this work is Stanislav Kruchinin.
-This work consists of the main source file gost705.dtx
+This work consists of the main source file gost732.dtx
and the derived files
- gost732.bst gost732.pdf.
+ gost732.cls gost732.pdf.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -124,7 +124,7 @@
\fi
%</ignore>
%<*driver>
-\ProvidesFile{gost732.drv}[2016/06/26 1.4.0 GOST 7.32-2001 implementation]
+\ProvidesFile{gost732.drv}[2017/03/03 1.5.0 GOST 7.32-2001 implementation]
\documentclass{ltxdoc}
\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
@@ -255,6 +255,8 @@
\CYRI\ \CYRS\CYRO\CYRK\CYRR\CYRA\CYRSHCH\CYRE\CYRN\CYRI\CYRYA
}
+\def\nomname{\defsname}
+
\renewcommand\defs{%
\nchapter{\defsname}
}
Modified: trunk/Master/texmf-dist/source/latex/disser/titledefs.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/disser/titledefs.dtx 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/source/latex/disser/titledefs.dtx 2017-03-05 21:37:27 UTC (rev 43400)
@@ -381,6 +381,10 @@
}
\providecommand*\defs{\nchapter{\defsname}}
+\AtBeginDocument{%
+ \addto\captionsrussian{\def\nomname{\defsname}}
+}
+
% \end{macrocode}
% \item \xD1\xEB\xEE\xE2\xE0\xF0\xFC \xF2\xE5\xF0\xEC\xE8\xED\xEE\xE2
% \DescribeMacro{\dictname}\index{\xCC\xE0\xEA\xF0\xEE\xF1\xFB!\verb*+\dictname+}
Modified: trunk/Master/texmf-dist/tex/latex/disser/disser.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/disser.cls 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/tex/latex/disser/disser.cls 2017-03-05 21:37:27 UTC (rev 43400)
@@ -44,7 +44,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2016/06/26 1.4.0 Document class for dissertations]
+\ProvidesClass{disser}[2017/03/03 1.4.1 Document class for dissertations]
\RequirePackage{kvoptions}
@@ -65,7 +65,6 @@
\newif\ifDis at libcat\Dis at libcatfalse
\newif\ifDis at classified\Dis at classifiedfalse
\newif\ifDis at facsimile\Dis at facsimilefalse
-\newif\ifDis at ams\Dis at amstrue
\newif\ifDis at href\Dis at hreffalse
\newif\ifDis at subf\Dis at subffalse
\newif\ifDis at times\Dis at timesfalse
@@ -78,7 +77,6 @@
\DeclareOption{libcat}{\Dis at libcattrue}
\DeclareOption{classified}{\Dis at classifiedtrue}
\DeclareOption{facsimile}{\Dis at facsimiletrue}
-\DeclareOption{noams}{\Dis at amsfalse}
\DeclareOption{natbib}{\Dis at natbibtrue}
\DeclareOption{fixint}{\Dis at fixinttrue}
\DeclareOption{colorlinks}{\Dis at colorlinkstrue}
@@ -129,8 +127,6 @@
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-\DeclareOption{times}{\Dis at timestrue}
-\DeclareOption{mtpro}{\Dis at mtprotrue}
\DeclareOption{openbib}{%
\AtEndOfPackage{%
\renewcommand\@openbib at code{%
@@ -169,6 +165,7 @@
}
\DeclareOption{candidate}{%
\Dis at bachelorfalse
+ \Dis at specialistfalse
\Dis at masterfalse
\Dis at candidatetrue
\Dis at doctorfalse
@@ -176,6 +173,7 @@
}
\DeclareOption{doctor}{%
\Dis at bachelorfalse
+ \Dis at specialistfalse
\Dis at masterfalse
\Dis at candidatefalse
\Dis at doctortrue
@@ -183,6 +181,7 @@
}
\DeclareOption{autoref}{%
\Dis at bachelorfalse
+ \Dis at specialistfalse
\Dis at masterfalse
\Dis at candidatefalse
\Dis at doctorfalse
@@ -498,6 +497,13 @@
\newlength{\chapterindent}
\setlength{\chapterindent}{0\p@}
+\providecommand\schapteralign{\chapteralign}
+\providecommand\schapterfont{\chapterfont}
+\providecommand\beforeschapter{\beforechapter}
+\providecommand\afterschapter{\afterchapter}
+\newlength{\schapterindent}
+\setlength{\schapterindent}{0\p@}
+
\newcommand*\chaptermark[1]{}
\newcommand\chapter{%
@@ -551,9 +557,9 @@
\def\@makeschapterhead#1{{%
\parindent\z@
- \normalfont\hskip\chapterindent%
+ \normalfont\hskip\schapterindent%
\interlinepenalty\@M
- \chapteralign\chapterfont\beforechapter #1\afterchapter
+ \schapteralign\schapterfont\beforeschapter #1\afterschapter
}}
\newcommand*\l at chapter[2]{%
@@ -1338,57 +1344,6 @@
%%% From File: custom.dtx
-\ifDis at ams
- \usepackage[intlimits]{amsmath}
- \usepackage{amssymb,amsfonts}
-\fi
-
-\ifDis at times
- \AtBeginDocument{
- \DeclareRobustCommand{\English}{%
- \expandafter\set at hyphenmins\englishhyphenmins
- \language\l at english}%
- \let\Eng=\English
- }
- \ifDis at mtpro
- \AtBeginDocument{%
- \IfFileExists{mtpro2.sty}{
- \usepackage[subscriptcorrection,nofontinfo]{mtpro2}
- }{
- \IfFileExists{mtpro.sty}{
- \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro}
- }{
- \PackageWarning{disser}%
- {Unable to find mtpro2 or mtpro package. Math font is unchanged.}
- }
- }
- }
- \else
- \AtEndOfPackage{%
- \IfFileExists{newtxmath.sty}{
- \usepackage[varg,cmbraces,cmintegrals]{newtxmath}
- }{
- \PackageWarning{disser}%
- {Unable to find txfonts package. Font is unchanged.}
- }
- }
- \fi
- \AtEndOfPackage{%
- \IfFileExists{pscyr.sty}{
- \usepackage{pscyr}
- \renewcommand\rmdefault{ftm}
- \renewcommand\ttdefault{cmtt}
- }{
- \IfFileExists{cyrtimes.sty}{
- \usepackage{cyrtimes}
- }{
- \PackageWarning{disser}%
- {Unable to find pscyr or cyrtimes package. Font is unchanged.}
- }
- }
- }
-\fi
-
\ifDis at fixint
\DeclareSymbolFont{EulerExtension}{U}{euex}{m}{n}
\DeclareMathSymbol\intop\mathop{EulerExtension}{"52}
@@ -1476,8 +1431,9 @@
}
\ifDis at subf
- \usepackage[config,font=small,labelsep=period]{caption}
+ \usepackage[font=small,labelsep=period]{caption}
\usepackage[list=true,subrefformat=parens]{subcaption}
+ \captionsetup{compatibility=false}
\DeclareCaptionSubType[asbuk]{figure}
\def\thesubfigure{\textit{\asbuk{subfigure}}}
\providecommand\thefigsubsep{,~}
Modified: trunk/Master/texmf-dist/tex/latex/disser/gost732.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/gost732.cls 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/tex/latex/disser/gost732.cls 2017-03-05 21:37:27 UTC (rev 43400)
@@ -62,6 +62,8 @@
\CYRI\ \CYRS\CYRO\CYRK\CYRR\CYRA\CYRSHCH\CYRE\CYRN\CYRI\CYRYA
}
+\def\nomname{\defsname}
+
\renewcommand\defs{%
\nchapter{\defsname}
}
Modified: trunk/Master/texmf-dist/tex/latex/disser/titledefs.rtx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/disser/titledefs.rtx 2017-03-05 01:05:40 UTC (rev 43399)
+++ trunk/Master/texmf-dist/tex/latex/disser/titledefs.rtx 2017-03-05 21:37:27 UTC (rev 43400)
@@ -138,6 +138,10 @@
}
\providecommand*\defs{\nchapter{\defsname}}
+\AtBeginDocument{%
+ \addto\captionsrussian{\def\nomname{\defsname}}
+}
+
\providecommand*\dictname{%
{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\ %
\cyrt\cyre\cyrr\cyrm\cyri\cyrn\cyro\cyrv}
More information about the tex-live-commits
mailing list