disser update (23jul07)

git-svn-id: svn://tug.org/texlive/trunk@4658 c570f23f-e606-0410-a88d-b1316a301751

17 files changed, 212 insertions, 107 deletions

diff --git a/Master/texmf-dist/doc/latex/disser/README b/Master/texmf-dist/doc/latex/disser/README
index 48049b4615f..9d75d81ccc4 100644
--- a/Master/texmf-dist/doc/latex/disser/README
+++ b/Master/texmf-dist/doc/latex/disser/README
@@ -1,9 +1,23 @@
 Overview
 --------
 
-This is a LaTeX document class and set of templates for creating dissertations.
+disser is a LaTeX document class and set of templates for creating dissertations.
 It is oriented on Russian-speaking users.
 
+Dependencies
+------------
+
+This class uses the third party packages. It is recommended to install all of 
+the following: amssymb, amsmath, graphicx, natbib, floatflt, pscyr, hyperref, 
+hypernat, subfig, caption, cmap
+
+Getting latest version
+----------------------
+
+You can obtain the latest version of the package from SVN-repository.
+Just install Subversion (if you don't have one) and run the following command:
+> svn export https://svn.sourceforge.net/svnroot/disser/ ./disser-latest
+
 Installation
 ------------
 
@@ -24,14 +38,19 @@ Manually
 > mkdir /path/to/texmf/tex/latex/disser
 
 2. Generate class files
+> cd src
 > latex disser.ins
 
-3. Copy disser.cls and *.rtx
-> cp disser.cls *.rtx /path/to/texmf/tex/latex/disser
+3. Copy *.cls and *.rtx to destination directory
+> cp *.cls *.rtx /path/to/texmf/tex/latex/disser
+
+4. Copy disser.dvi to documentation directory
+> cp *.cls *.rtx /path/to/texmf/doc/latex/disser
 
-4. Refresh filename database
+5. Refresh filename database
 > mktexlsr
 
+
 License
 -------
 
diff --git a/Master/texmf-dist/doc/latex/disser/README.ru b/Master/texmf-dist/doc/latex/disser/README.ru
index 2c73eedadaa..659d4e7ff4e 100644
--- a/Master/texmf-dist/doc/latex/disser/README.ru
+++ b/Master/texmf-dist/doc/latex/disser/README.ru
@@ -1,3 +1,23 @@
+Введение
+--------
+
+Пакет disser предназначен для верстки дипломов и диссертаций. Ориентирован 
+на рускоязычных пользователей.
+
+Зависимости
+-----------
+
+Класс disser.cls использует стронние пакеты. Для корректной сборки шаблонов 
+следует установить всё нижеперечисленное: amssymb, amsmath, graphicx, natbib, 
+floatflt, pscyr, hyperref, hypernat, subfig, caption, cmap
+
+Получение последней версии
+--------------------------
+
+Наиболее свежую версию пакета можно получить из SVN-репозитория. 
+Для этого достаточно установить Subversion и выполнить команду
+> svn export https://svn.sourceforge.net/svnroot/disser/
+
 Установка
 ---------
 
@@ -20,10 +40,13 @@
 2. Генерируем файлы класса
 > latex disser.ins
 
-3. Копируем disser.cls и *.rtx в созданный каталог.
-> cp disser.cls *.rtx /путь/к/texmf/tex/latex/disser
+3. Копируем *.cls и *.rtx в созданный каталог.
+> cp *.cls *.rtx /путь/к/texmf/tex/latex/disser
 
-4. Обновляем базу имен файлов
+4. Копируем disser.dvi в каталог с документацией.
+> cp disser.dvi /путь/к/texmf/doc/latex/disser
+
+5. Обновляем базу имен файлов
 > mktexlsr
 
 Лицензия
@@ -42,4 +65,3 @@
 Тхис програм ис дистрибутед ин тхе хопе тхат ит вилл бе усефул,
 бут ВИТХОУТ АНЫ ВАРРАНТЫ; витхоут евен тхе имплиед варранты оф
 МЕРЧАНТАБИЛИТЫ ор ФИТНЕСС ФОР А ПАРТИЦУЛАР ПУРПОСЕ.
-
diff --git a/Master/texmf-dist/doc/latex/disser/changelog.txt b/Master/texmf-dist/doc/latex/disser/changelog.txt
index 9b0d57e5a39..0c63924e262 100644
--- a/Master/texmf-dist/doc/latex/disser/changelog.txt
+++ b/Master/texmf-dist/doc/latex/disser/changelog.txt
@@ -2,7 +2,19 @@ disser changelog
 Copyright (C) 2004-2007 Stanislav Kruchinin
 -------------------------------------------
 
-Changes in version 1.0.2 (2006-03-04):
+Changes in version 1.0.3 (2007-07-11):
+
+Class:
++ Major improvements in Makefile/nomake.cmd infrastructure.
++ subfig package is used instead of obsolete subfigure.
++ Added some parametrizations for page styles and headings.
+
+Templates:
++ Added more examples with figures to bachelor template.
+* Fix: thesis.bib EOLN changed to LF.
+
+
+Changes in version 1.0.2 (2007-03-04):
 
 Class:
 + Added class gost732.
@@ -12,7 +24,7 @@ Class:
   http://disser.svn.sourceforge.net/viewvc/disser/).
 
 Templates:
-+ Candidate and doctor: added templates of author's abstracts (autoreferats).
++ Candidate and doctor: added templates of author's abstracts.
 * Candidate and doctor: fixed \title.
 
 
diff --git a/Master/texmf-dist/doc/latex/disser/nomake.cmd b/Master/texmf-dist/doc/latex/disser/nomake.cmd
index 3ed3c9711f3..aa1d1770b9d 100644
--- a/Master/texmf-dist/doc/latex/disser/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/nomake.cmd
@@ -1,38 +1,62 @@
 @echo off
 
 set target=disser
+
 if %texmf%.==. set texmf=d:\programs\miktex\local
 set destdir=%texmf%\tex\latex\%target%
-set clean=*.rtx *.cls *.log *.out *.aux *.dvi *.idx *.glo *.toc *.ind *.ilg *.bak
+set docdir=%texmf%\doc\latex\%target%
+set clean=*.rtx *.cls *.log *.out *.aux *.dvi *.idx *.glo *.toc *.ind *.ilg *.bak *.bbl *.blg
 
 if %1.==. (
-:make
+:default
+	goto :all
+)
+
+:start
+if %1.==. goto :eof
+
+if %1.==all. (
+:all
 	latex %target%.ins
-	echo.
-	echo Now run '%~n0 install'
-	echo.
+	call :doc
 goto :eof
 )
 
-if %1.==. goto :eof
+if %1.==class. (
+:class
+    latex %target%.ins
+goto :eof
+)
 
 if %1.==clean. (
+:clean
 	del %clean%
 	goto :eof
+goto :end
 )
 
 if %1.==install. (
+:install
 	if not exist %target%.cls (
 		echo You must run 'nomake' first
 		goto :eof
 	)
 	if not exist %destdir% mkdir %destdir%
-	copy /y *.rtx %destdir% > nul
-	copy /y *.cls %destdir% > nul
-	goto :eof
+	if not exist %docdir% mkdir %docdir%
+	xcopy /y /f *.rtx %destdir%
+	xcopy /y /f *.cls %destdir%
+	xcopy /y /f *.dvi %docdir%
+goto :end
 )
 
 if %1.==doc. (
+:doc
+	chcp 1251
 	latex %target%.dtx
 	latex -src-specials %target%.dtx
+goto :end
 )
+
+if %1. neq . (echo Don't know how to make %1 )
+:end
+shift & goto :start
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
index 86f80000056..8fa1954e017 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
@@ -3,30 +3,30 @@
 
 Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$.
 Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$.
-Ссылки на литературу~\cite{Efros-FTP16-82-1209,Yoffe-AP42-93-173,Kayanuma-PRB38-88-9797}.
+Ссылки на литературу~\cite{Efros-1982-FTP16-82-1209,Yoffe-1993-AP-42-173,Kayanuma-1988-PRB-38-9797}.
 Ссылка на формулу~\eqref{eq:e}
 \begin{equation}\label{eq:e}
   \vec P=\sqrt{\frac{N_0 m_r \Omega_{LO}}{4\pi\epsilon^*}}(\vec u_+ - \vec u_-).
 \end{equation}
 
 Ссылка на рис.~\ref{fig:f}
-\begin{figure}[h]
+\begin{figure}[!ht]
 \centering
-\includegraphics{fig}
+\includegraphics[width=4cm]{fig}
 \caption{\label{fig:f}%
 Подпись к рисунку.
 }
 \end{figure}
 
-\begin{floatingfigure}{0.4\textwidth}
+\begin{floatingfigure}{0.3\textwidth}
   \centering
-  \includegraphics{fig}
+  \includegraphics[width=4cm]{fig}
   \caption{\label{fig:ff}Рисунок <<в оборку>>.}
 \end{floatingfigure}
-Если разность энергий электронно-дыроч\-ных уровней $E_2-E_1$ близка к энергии предельного оптического фонона $\hbar\Omega_{LO}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$. Волновые функции последних представляют собой следующие комбинации почти вырожденных состояний.
+Если разность энергий электронно-дырочных уровней $E_2-E_1$ близка к энергии предельного оптического фонона $\hbar\Omega_{LO}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$. Волновые функции последних представляют собой следующие комбинации почти вырожденных состояний.
 
 Ссылка на таблицу~\ref{tab:t1}.
-\begin{table}[h]
+\begin{table}[!ht]
   \centering
   \caption{Пример таблицы}\label{tab:t1}
   \vskip1.em
@@ -41,18 +41,51 @@
 \end{tabular}
 \end{table}
 
-\begin{figure}[h]
+\begin{figure}[!ht]
 \centering
-    \subfigure[]{\includegraphics{fig}\label{fig:sub1}}\quad
-    \subfigure[]{\includegraphics{fig}\label{fig:sub2}}\quad
-    \subfigure[]{\includegraphics{fig}\label{fig:sub3}}
-    \caption{Подчиненная нумерация рисунков:
-    \subref{fig:sub1} ссылка 1,
-    \subref{fig:sub2} ссылка 2,
-    \subref{fig:sub3} ссылка 3.
-    }
+  \begin{minipage}{5cm}
+    \centering
+    \includegraphics[width=4cm]{fig}
+    \caption{Рисунок с отдельным названием}
+  \end{minipage}
+  \quad
+  \begin{minipage}{5cm}
+    \centering
+    \includegraphics[width=4cm]{fig}
+    \caption{Рисунок с отдельным названием}
+  \end{minipage}
+  \quad
+  \begin{minipage}{5cm}
+    \centering
+    \includegraphics[width=4cm]{fig}
+    \caption{Рисунок с отдельным названием}
+  \end{minipage}
 \end{figure}
+
+\begin{figure}[!ht]
+\centering
+  \begin{minipage}{5cm}
+    \centering
+    \includegraphics[width=4cm]{fig}
+  \end{minipage}
+  \quad
+  \begin{minipage}{5cm}
+    \centering
+    \includegraphics[width=4cm]{fig}
+  \end{minipage}
+  \caption{Рисунки с единым названием}
+\end{figure}
+
 Ссылка на внутренний рисунок (рис.~\ref{fig:sub1})
+
+\begin{figure}[!ht]
+\centering
+  \subfloat[][]{\label{fig:sub1}\includegraphics[width=4cm]{fig}}\quad
+  \subfloat[][]{\label{fig:sub2}\includegraphics[width=4cm]{fig}}\quad
+  \subfloat[][]{\label{fig:sub3}\includegraphics[width=4cm]{fig}}
+\caption{Рисунки с единым названием и подчинённой нумерацией}
+\end{figure}
+
 \subsection{Название подсекции}
 Текст подсекции
 \subsubsection{Название подподсекции}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
index 8ed500ecaa6..47506aac7c5 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
@@ -32,6 +32,7 @@ set arc=rar
 set arcflags=a -r -x%target%.pdf -x%target%.prj
 
 set tex=%texmf%\miktex\bin\latex
+set pdftex=%texmf%\miktex\bin\pdflatex
 set texflags=-src-specials
 
 set bibtex=%texmf%\miktex\bin\bibtex8
@@ -54,6 +55,7 @@ set suffix=$$
 
 if %1/==/ (
 :make
+	chcp 1251
 	%tex% %target%.tex
 	%bibtex% %bibtexflags% %target%
 	%tex% %target%.tex
@@ -65,13 +67,17 @@ if %1/==/ goto :eof
 
 if %1/==pdf/ (
 :pdf
-	set tex=pdflatex
-	call :make
+	chcp 1251
+	%pdftex% %target%.tex
+	%bibtex% %bibtexflags% %target%
+	%pdftex% %target%.tex
+	%pdftex% %texflags% %target%.tex
+goto :eof
 )
 
+rem Make source distribution
 if %1/==srcdist/ (
 :srcdist
-	echo Making source distribution...
 	if not exist %clsdir% mkdir %clsdir%
 	xcopy %clssrc% %clsdir% /S
 	xcopy %bstsrc%\%bstfile% . /S
@@ -96,9 +102,9 @@ if %1/==cleansvn/ (
 goto :end
 )
 
+rem Fix bounding boxes of EPS files
 if %1/==fixbb/ (
 :fixbb
-	echo Fixing bounding boxes of EPS files...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n
 goto :end
 :fix
@@ -108,9 +114,9 @@ goto :end
 goto :eof	
 )
 
+rem Convert EPS to PDF
 if %1/==epstopdf/ (
 :epstopdf
-	echo Converting EPS to PDF...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n
 	goto :end
 :conv
@@ -143,13 +149,6 @@ if %1/==djvu/ (
 	%pdftodjvu% %pdftodjvuflags% %target%.pdf
 goto :end
 )
-rem Create OCRed DjVu file
-if %1/==ocr/ (
-:ocr
-	if not exist %target%.djvu call :djvu
-	%djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu
-goto :end	
-)
 rem Create backup
 if %1/==backup/ (
 :backup
@@ -158,6 +157,7 @@ if %1/==backup/ (
 goto :end
 )
 
+if %1/ neq / (echo Don't know how to make %1 )
 :end
 shift & goto :start
 
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
index a85ee17ba6f..0b1c94af0dc 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
@@ -1,4 +1,4 @@
-@ARTICLE{Yoffe-AP42-93-173,
+@ARTICLE{Yoffe-1993-AP-42-173,
     Author  = {A. D. Yoffe},
     Journal = {Adv. Phys.},
     Pages   = {173},
@@ -6,7 +6,7 @@
     Year    = {1993}
 }
 
-@ARTICLE{Kayanuma-PRB38-88-9797,
+@ARTICLE{Kayanuma-1988-PRB-38-9797,
     Author  = {Y. Kayanuma},
     Journal = {Phys. Rev. B},
     Pages   = {9797},
@@ -14,7 +14,7 @@
     Year    = {1988}
 }
 
-@ARTICLE{Efros-FTP16-82-1209,
+@ARTICLE{Efros-1982-FTP16-82-1209,
     Author   = {Ал. Л. Эфрос and А. Л. Эфрос},
     Journal  = {Физика и техника полупроводников},
     Pages    = {1209},
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
index d275587edb5..3cb15edc17f 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
@@ -50,6 +50,6 @@
 \input{concl}
 % ----------------------------------------------------------------
 \bibliography{thesis}
-\bibliographystyle{disser}
+\bibliographystyle{gost71u}
 \end{document}
 % ----------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
index 8ed500ecaa6..902f2a22ab2 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
@@ -32,6 +32,7 @@ set arc=rar
 set arcflags=a -r -x%target%.pdf -x%target%.prj
 
 set tex=%texmf%\miktex\bin\latex
+set pdftex=%texmf%\miktex\bin\pdflatex
 set texflags=-src-specials
 
 set bibtex=%texmf%\miktex\bin\bibtex8
@@ -54,6 +55,7 @@ set suffix=$$
 
 if %1/==/ (
 :make
+	chcp 1251
 	%tex% %target%.tex
 	%bibtex% %bibtexflags% %target%
 	%tex% %target%.tex
@@ -65,13 +67,17 @@ if %1/==/ goto :eof
 
 if %1/==pdf/ (
 :pdf
-	set tex=pdflatex
-	call :make
+	chcp 1251
+	%pdftex% %target%.tex
+	%bibtex% %bibtexflags% %target%
+	%pdftex% %target%.tex
+	%pdftex% %texflags% %target%.tex
+goto :eof
 )
 
+rem Make source distribution
 if %1/==srcdist/ (
 :srcdist
-	echo Making source distribution...
 	if not exist %clsdir% mkdir %clsdir%
 	xcopy %clssrc% %clsdir% /S
 	xcopy %bstsrc%\%bstfile% . /S
@@ -96,9 +102,9 @@ if %1/==cleansvn/ (
 goto :end
 )
 
+rem Fix bounding boxes of EPS files
 if %1/==fixbb/ (
 :fixbb
-	echo Fixing bounding boxes of EPS files...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n
 goto :end
 :fix
@@ -108,9 +114,9 @@ goto :end
 goto :eof	
 )
 
+rem Convert EPS to PDF
 if %1/==epstopdf/ (
 :epstopdf
-	echo Converting EPS to PDF...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n
 	goto :end
 :conv
@@ -143,13 +149,6 @@ if %1/==djvu/ (
 	%pdftodjvu% %pdftodjvuflags% %target%.pdf
 goto :end
 )
-rem Create OCRed DjVu file
-if %1/==ocr/ (
-:ocr
-	if not exist %target%.djvu call :djvu
-	%djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu
-goto :end	
-)
 rem Create backup
 if %1/==backup/ (
 :backup
@@ -158,6 +157,7 @@ if %1/==backup/ (
 goto :end
 )
 
+echo Don't know how to make %1
 :end
 shift & goto :start
 
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
index a85ee17ba6f..0b1c94af0dc 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
@@ -1,4 +1,4 @@
-@ARTICLE{Yoffe-AP42-93-173,
+@ARTICLE{Yoffe-1993-AP-42-173,
     Author  = {A. D. Yoffe},
     Journal = {Adv. Phys.},
     Pages   = {173},
@@ -6,7 +6,7 @@
     Year    = {1993}
 }
 
-@ARTICLE{Kayanuma-PRB38-88-9797,
+@ARTICLE{Kayanuma-1988-PRB-38-9797,
     Author  = {Y. Kayanuma},
     Journal = {Phys. Rev. B},
     Pages   = {9797},
@@ -14,7 +14,7 @@
     Year    = {1988}
 }
 
-@ARTICLE{Efros-FTP16-82-1209,
+@ARTICLE{Efros-1982-FTP16-82-1209,
     Author   = {Ал. Л. Эфрос and А. Л. Эфрос},
     Journal  = {Физика и техника полупроводников},
     Pages    = {1209},
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
index 8ed500ecaa6..902f2a22ab2 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
@@ -32,6 +32,7 @@ set arc=rar
 set arcflags=a -r -x%target%.pdf -x%target%.prj
 
 set tex=%texmf%\miktex\bin\latex
+set pdftex=%texmf%\miktex\bin\pdflatex
 set texflags=-src-specials
 
 set bibtex=%texmf%\miktex\bin\bibtex8
@@ -54,6 +55,7 @@ set suffix=$$
 
 if %1/==/ (
 :make
+	chcp 1251
 	%tex% %target%.tex
 	%bibtex% %bibtexflags% %target%
 	%tex% %target%.tex
@@ -65,13 +67,17 @@ if %1/==/ goto :eof
 
 if %1/==pdf/ (
 :pdf
-	set tex=pdflatex
-	call :make
+	chcp 1251
+	%pdftex% %target%.tex
+	%bibtex% %bibtexflags% %target%
+	%pdftex% %target%.tex
+	%pdftex% %texflags% %target%.tex
+goto :eof
 )
 
+rem Make source distribution
 if %1/==srcdist/ (
 :srcdist
-	echo Making source distribution...
 	if not exist %clsdir% mkdir %clsdir%
 	xcopy %clssrc% %clsdir% /S
 	xcopy %bstsrc%\%bstfile% . /S
@@ -96,9 +102,9 @@ if %1/==cleansvn/ (
 goto :end
 )
 
+rem Fix bounding boxes of EPS files
 if %1/==fixbb/ (
 :fixbb
-	echo Fixing bounding boxes of EPS files...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n
 goto :end
 :fix
@@ -108,9 +114,9 @@ goto :end
 goto :eof	
 )
 
+rem Convert EPS to PDF
 if %1/==epstopdf/ (
 :epstopdf
-	echo Converting EPS to PDF...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n
 	goto :end
 :conv
@@ -143,13 +149,6 @@ if %1/==djvu/ (
 	%pdftodjvu% %pdftodjvuflags% %target%.pdf
 goto :end
 )
-rem Create OCRed DjVu file
-if %1/==ocr/ (
-:ocr
-	if not exist %target%.djvu call :djvu
-	%djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu
-goto :end	
-)
 rem Create backup
 if %1/==backup/ (
 :backup
@@ -158,6 +157,7 @@ if %1/==backup/ (
 goto :end
 )
 
+echo Don't know how to make %1
 :end
 shift & goto :start
 
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
index a85ee17ba6f..0b1c94af0dc 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
@@ -1,4 +1,4 @@
-@ARTICLE{Yoffe-AP42-93-173,
+@ARTICLE{Yoffe-1993-AP-42-173,
     Author  = {A. D. Yoffe},
     Journal = {Adv. Phys.},
     Pages   = {173},
@@ -6,7 +6,7 @@
     Year    = {1993}
 }
 
-@ARTICLE{Kayanuma-PRB38-88-9797,
+@ARTICLE{Kayanuma-1988-PRB-38-9797,
     Author  = {Y. Kayanuma},
     Journal = {Phys. Rev. B},
     Pages   = {9797},
@@ -14,7 +14,7 @@
     Year    = {1988}
 }
 
-@ARTICLE{Efros-FTP16-82-1209,
+@ARTICLE{Efros-1982-FTP16-82-1209,
     Author   = {Ал. Л. Эфрос and А. Л. Эфрос},
     Journal  = {Физика и техника полупроводников},
     Pages    = {1209},
diff --git a/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk b/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk
index a3e37c98505..123cad7674e 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk
+++ b/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk
@@ -18,14 +18,10 @@ fixbb: *.eps
 		echo "OK" ;\
 	done
 
-pdf: *.eps
-	@echo -e "\nConverting figures to PDF...\n"
-	@for f in *.eps ; \
-	do \
-		echo -n "$$f..." ;\
-		epstopdf $$f ;\
-		echo "OK" ;\
-	done
+pdf:	$(patsubst %.eps, %.pdf, $(wildcard *.eps))
+
+%.pdf:	%.eps
+	epstopdf "$<"
 
 clean:
 	rm -f *.pdf
diff --git a/Master/texmf-dist/doc/latex/disser/templates/latex.mk b/Master/texmf-dist/doc/latex/disser/templates/latex.mk
index 1add498387b..8c1927f8f11 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/latex.mk
+++ b/Master/texmf-dist/doc/latex/disser/templates/latex.mk
@@ -56,7 +56,6 @@ help:
 $(TARGET).dvi: $(SRC)
 	$(TEX) $(TEXFLAGS) $(TARGET).tex
 	$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\
-	$(TEX) $(TEXFLAGS) $(TARGET).tex
 	counter=3 ; \
 	while egrep -s 'Rerun (LaTeX|to get)' $(TARGET).log && [ $$counter -gt 0 ] ;\
 	do \
@@ -71,8 +70,8 @@ $(TARGET).pdf: $(SRC)
 	@$(MAKE) -C fig fixbb pdf
 	$(PDFLATEX) $(TARGET).tex
 	$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\
-	$(PDFLATEX) $(TARGET).tex
 	counter=3 ; \
+	echo "counter=$counter" ; \
 	while egrep -s 'Rerun (LaTeX|to get)' $(TARGET).log && [ $$counter -gt 0 ] ;\
 	do \
   		$(PDFLATEX) $(TARGET).tex ;\
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
index 8ed500ecaa6..902f2a22ab2 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
@@ -32,6 +32,7 @@ set arc=rar
 set arcflags=a -r -x%target%.pdf -x%target%.prj
 
 set tex=%texmf%\miktex\bin\latex
+set pdftex=%texmf%\miktex\bin\pdflatex
 set texflags=-src-specials
 
 set bibtex=%texmf%\miktex\bin\bibtex8
@@ -54,6 +55,7 @@ set suffix=$$
 
 if %1/==/ (
 :make
+	chcp 1251
 	%tex% %target%.tex
 	%bibtex% %bibtexflags% %target%
 	%tex% %target%.tex
@@ -65,13 +67,17 @@ if %1/==/ goto :eof
 
 if %1/==pdf/ (
 :pdf
-	set tex=pdflatex
-	call :make
+	chcp 1251
+	%pdftex% %target%.tex
+	%bibtex% %bibtexflags% %target%
+	%pdftex% %target%.tex
+	%pdftex% %texflags% %target%.tex
+goto :eof
 )
 
+rem Make source distribution
 if %1/==srcdist/ (
 :srcdist
-	echo Making source distribution...
 	if not exist %clsdir% mkdir %clsdir%
 	xcopy %clssrc% %clsdir% /S
 	xcopy %bstsrc%\%bstfile% . /S
@@ -96,9 +102,9 @@ if %1/==cleansvn/ (
 goto :end
 )
 
+rem Fix bounding boxes of EPS files
 if %1/==fixbb/ (
 :fixbb
-	echo Fixing bounding boxes of EPS files...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n
 goto :end
 :fix
@@ -108,9 +114,9 @@ goto :end
 goto :eof	
 )
 
+rem Convert EPS to PDF
 if %1/==epstopdf/ (
 :epstopdf
-	echo Converting EPS to PDF...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n
 	goto :end
 :conv
@@ -143,13 +149,6 @@ if %1/==djvu/ (
 	%pdftodjvu% %pdftodjvuflags% %target%.pdf
 goto :end
 )
-rem Create OCRed DjVu file
-if %1/==ocr/ (
-:ocr
-	if not exist %target%.djvu call :djvu
-	%djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu
-goto :end	
-)
 rem Create backup
 if %1/==backup/ (
 :backup
@@ -158,6 +157,7 @@ if %1/==backup/ (
 goto :end
 )
 
+echo Don't know how to make %1
 :end
 shift & goto :start
 
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
index a85ee17ba6f..0b1c94af0dc 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
@@ -1,4 +1,4 @@
-@ARTICLE{Yoffe-AP42-93-173,
+@ARTICLE{Yoffe-1993-AP-42-173,
     Author  = {A. D. Yoffe},
     Journal = {Adv. Phys.},
     Pages   = {173},
@@ -6,7 +6,7 @@
     Year    = {1993}
 }
 
-@ARTICLE{Kayanuma-PRB38-88-9797,
+@ARTICLE{Kayanuma-1988-PRB-38-9797,
     Author  = {Y. Kayanuma},
     Journal = {Phys. Rev. B},
     Pages   = {9797},
@@ -14,7 +14,7 @@
     Year    = {1988}
 }
 
-@ARTICLE{Efros-FTP16-82-1209,
+@ARTICLE{Efros-1982-FTP16-82-1209,
     Author   = {Ал. Л. Эфрос and А. Л. Эфрос},
     Journal  = {Физика и техника полупроводников},
     Pages    = {1209},
diff --git a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
index 64de24ccfb2..ac159d29bc2 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
@@ -1,4 +1,4 @@
 @echo off
 
 set subdirs=bachelor ..\master ..\candidate ..\doctor
-for %%i in (%subdirs%) do cd %%i & nomake %1
\ No newline at end of file
+for %%i in (%subdirs%) do cd %%i & nomake %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file