disser update (23jun09)

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

21 files changed, 117 insertions, 110 deletions

diff --git a/Master/texmf-dist/doc/latex/disser/templates/Makefile b/Master/texmf-dist/doc/latex/disser/templates/Makefile
index e30dd8b9b24..37488ee350c 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/Makefile
@@ -1,15 +1,26 @@
-TARGET=disser
-DOCDIR?=$(TEXMF)/doc/latex/$(TARGET)
-
-dvi ps ps_2on1 pdf pdf_2on1 html clean epstopdf fixbb srcdist all allpdf:
-	@$(MAKE) -i -C bachelor $@
-	@$(MAKE) -i -C master $@
-	@$(MAKE) -i -C candidate $@
-	@$(MAKE) -i -C doctor $@
-
-help:
-	@$(MAKE) -C bachelor $@
-
-install:
-	cp -rf ../templates $(DOCDIR)
-	cp -rf ../include $(DOCDIR)
\ No newline at end of file
+TARGET=thesis

+TEXMF?=/usr/share/texmf

+DOCDIR?=$(TEXMF)/doc/latex/disser

+

+dvi ps ps_2on1 pdf pdf_2on1 html clean epstopdf fixbb srcdist all allpdf:

+	@$(MAKE) -i -C bachelor $@

+	@$(MAKE) -i -C master $@

+	@$(MAKE) -i -C candidate $@

+	@$(MAKE) -i -C doctor $@

+

+help:

+	@$(MAKE) -s -C bachelor $@

+	@echo "  install    install templates to TeX tree"

+	@echo "  uninstall  uninstall templates"

+	@echo "  reinstall  reinstall templates"

+

+install:

+	cp -rf ../templates $(DOCDIR)

+	cp -rf ../include $(DOCDIR)

+

+uninstall:

+	rm -rf $(DOCDIR)/templates

+	rm -rf $(DOCDIR)/include

+	rmdir $(DOCDIR)

+

+reinstall: uninstall install

diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
index b9c1223fad1..86cd1ef1174 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
@@ -27,7 +27,7 @@ Anselm_1978,Segall_1968}. Ссылка на формулу~\eqref{eq:e}
 \end{wrapfigure}
 
 Если разность энергий электронно-дырочных уровней $E_2-E_1$ близка к энергии продольного оптического фонона $\hbar\Omega_{LO}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$.
-Волновые функции последних представляют собой следующие комбинации вырожденных состояний.
+Волновые функции последних представляют собой следующие комбинации вырожденных состояний~\footnote{Текст сноски}.
 
 Ссылка на таблицу~\ref{tab:t1}.
 \begin{table}[!ht]
@@ -36,8 +36,8 @@ Anselm_1978,Segall_1968}. Ссылка на формулу~\eqref{eq:e}
   \vskip1.em
   \begin{tabular}{l|ccc}
     \hline\hline
-    & \quad$\lambda \times 10^{-11}$,~$\text{Дин}\cdot\text{см}^{-2}$\quad &
-    \quad$\mu \times 10^{-11}$,~$\text{Дин}\cdot\text{см}^{-2}$ & \quad$\rho$, $\text{г}\cdot \text{см}^{-3}$\quad \\
+    & \quad$\lambda \times 10^{-11}$,~$\text{Дин}\times\text{см}^{-2}$\quad &
+    \quad$\mu \times 10^{-11}$,~$\text{Дин}\times\text{см}^{-2}$ & \quad$\rho$, $\text{г}\times \text{см}^{-3}$\quad \\
     \hline
     InP       & 3.82 & 1.69 & 4.14 \\
     SiO$_{2}$ & 1.57 & 3.11 & 2.2  \\
@@ -108,22 +108,22 @@ Anselm_1978,Segall_1968}. Ссылка на формулу~\eqref{eq:e}
 
 \newtheorem{lemm}{Лемма}[chapter]
 
-\def\thelemmstyle{\bf}
-\def\oparglemmstyle{}
-\def\lemmstyle{\it}
+\def\thelemmstyle{\bfseries}
+\def\oparglemmstyle{\itshape}
+\def\lemmstyle{}
 \def\preoparglemm{(}
 \def\postoparglemm{)}
 
 \newtheorem{remark}{Примечание}[chapter]
 
-\def\remarkstyle{\it}
+\def\remarkstyle{\itshape}
 \def\theremarkstyle{}
 \def\posttheremark{:}
 
 \begin{lemm}[Шура]
-Матрица, коммутирующая со всеми матрицами неприводимого представления, кратна единичной.
+Квадратная матрица, коммутирующая со всеми матрицами неприводимого представления, кратна единичной.
 \end{lemm}
 
 \begin{remark}
-Имеется в виду квадратная матрица.
+Текст примечания.
 \end{remark}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/Makefile
index c853e59f80b..775b7fc3d88 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/Makefile
@@ -1 +1 @@
-include ../../../include/latex.fig.mk
+include ../../../include/latex.fig.mk
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/nomake.cmd
index 7d62dafdb27..d5b89784882 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/nomake.cmd
@@ -1 +1 @@
-@call ..\..\..\include\latex.fig.nmk.cmd %*
+@call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
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 39e5d90404a..07630d2e16a 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
@@ -1,17 +1,15 @@
 @echo off
 
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
 if "%1"=="all" (
 :all
-	..\..\include\latex.nmk.cmd dvi
+	%latexnmk% dvi
 goto :eof
 ) else if "%1"=="allpdf" (
 :allpdf
-	..\..\include\latex.nmk.cmd pdf
+	%latexnmk% pdf
 goto :eof
 ) else (
-	..\..\include\latex.nmk.cmd %*
+	%latexnmk% %*
 )
-
-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.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
index e3f5776015c..a6f338cd8a8 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
@@ -9,7 +9,7 @@
 \usepackage[T2A]{fontenc}
 \usepackage[cp1251]{inputenc}
 \usepackage[english,russian]{babel}
-\usepackage{epstopdf}
+\ifpdf\usepackage{epstopdf}\fi
 
 % Номера страниц сверху и по центру
 %\def\headfont{\small}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
index 8c16534241b..64ce78d61a5 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
@@ -1,15 +1,15 @@
-\documentclass[14pt,autoref,href
+\documentclass[14pt,autoref,href,facsimile
 %,fixint=false
-,facsimile
+%,times
 ]{disser}
 
-\usepackage[a4paper, nohead, includefoot, mag=1000,
-            margin=2cm, footskip=1cm]{geometry}
+\usepackage[a4paper,nohead,includefoot,mag=1000,
+            margin=2cm,footskip=1cm]{geometry}
 \usepackage[T2A]{fontenc}
 \usepackage[cp1251]{inputenc}
 \usepackage[english,russian]{babel}
 \usepackage{tabularx}
-\usepackage{epstopdf}
+\ifpdf\usepackage{epstopdf}\fi
 
 % Поддержка нескольких списков литературы в одном документе
 \usepackage{multibib}
@@ -20,13 +20,11 @@
 % Путь к файлам с иллюстрациями
 \graphicspath{{fig/}}
 
+\begin{document}
 % Включение файла с общим текстом диссертации и автореферата
 % (текст титульного листа и характеристика работы).
 \input{common}
-% --------------------------------------------------------------------------
-\begin{document}
 
-% Внешняя сторона обложки
 \title{АВТОРЕФЕРАТ\\
 диссертации на соискание ученой степени\\
 кандидата физико-математических наук}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/Makefile
index c853e59f80b..775b7fc3d88 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/Makefile
@@ -1 +1 @@
-include ../../../include/latex.fig.mk
+include ../../../include/latex.fig.mk
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd
index 7d62dafdb27..d5b89784882 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd
@@ -1 +1 @@
-@call ..\..\..\include\latex.fig.nmk.cmd %*
+@call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
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 c6ed3f12107..542e4e15259 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
@@ -1,28 +1,25 @@
 @echo off
 
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
 if "%1"=="help" (
 :help
-	call ..\..\include\latex.nmk.cmd %1
+	%latexnmk% %1
 	echo   all        build DVI of autoref and thesis
 	echo   allpdf     build PDF of autoref and thesis
 goto :eof
 ) else if "%1"=="all" (
 :all
-	set target=thesis & call ..\..\include\latex.nmk.cmd dvi
-	set target=autoref & call ..\..\include\latex.nmk.cmd dvi
+	set target=thesis & %latexnmk% dvi
+	set target=autoref & %latexnmk% dvi
 	set target=
 goto :eof
 ) else if "%1"=="allpdf" (
 :allpdf
-	set target=thesis & call ..\..\include\latex.nmk.cmd pdf
-	set target=autoref & call ..\..\include\latex.nmk.cmd pdf
+	set target=thesis & %latexnmk% pdf
+	set target=autoref & %latexnmk% pdf
 	set target=
 goto :eof
 ) else (
-	call ..\..\include\latex.nmk.cmd %*
-	goto :eof
+	%latexnmk% %*
 )
-
-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/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
index 1a8fb00efb0..6e125186c98 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
@@ -11,7 +11,7 @@
 \usepackage[T2A]{fontenc}
 \usepackage[cp1251]{inputenc}
 \usepackage[english,russian]{babel}
-\usepackage{epstopdf}
+\ifpdf\usepackage{epstopdf}\fi
 
 % Номера страниц сверху и по центру
 %\def\headfont{\small}
@@ -24,11 +24,10 @@
 % Путь к файлам с иллюстрациями
 \graphicspath{{fig/}}
 
+\begin{document}
 % Включение файла с общим текстом диссертации и автореферата
 % (текст титульного листа и характеристика работы).
-\input common
-% ----------------------------------------------------------------
-\begin{document}
+\input{common}
 
 \title{ДИССЕРТАЦИЯ\\
 на соискание ученой степени\\
@@ -49,4 +48,3 @@
 \appendix
 \input{app-a}
 \end{document}
-% ----------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
index 629a4ed379f..6f5f5f45336 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
@@ -1,15 +1,15 @@
-\documentclass[14pt,autoref,href
+\documentclass[14pt,autoref,href,facsimile
 %,fixint=false
-,facsimile
+%,times
 ]{disser}
 
-\usepackage[a4paper, nohead, includefoot, mag=1000,
-            margin=2cm, footskip=1cm]{geometry}
+\usepackage[a4paper,nohead,includefoot,mag=1000,
+            margin=2cm,footskip=1cm]{geometry}
 \usepackage[T2A]{fontenc}
 \usepackage[cp1251]{inputenc}
 \usepackage[english,russian]{babel}
 \usepackage{tabularx}
-\usepackage{epstopdf}
+\ifpdf\usepackage{epstopdf}\fi
 
 % Поддержка нескольких списков литературы в одном документе
 \usepackage{multibib}
@@ -20,13 +20,11 @@
 % Путь к файлам с иллюстрациями
 \graphicspath{{fig/}}
 
+\begin{document}
 % Включение файла с общим текстом диссертации и автореферата
 % (текст титульного листа и характеристика работы).
 \input{common}
-% --------------------------------------------------------------------------
-\begin{document}
 
-% Внешняя сторона обложки
 \title{АВТОРЕФЕРАТ\\
 диссертации на соискание ученой степени\\
 доктора физико-математических наук}
@@ -39,7 +37,7 @@
 Работа выполнена в \emph{название организации}.
 \end{center}
 
-\vskip1em\noindent
+\vskip1ex\noindent
 Официальные оппоненты:\\
 \emph{ученая степень}, \\
 \emph{ученое звание}\hfill
@@ -52,20 +50,20 @@
 \emph{фамилия имя отчество}\\[1em]
 Ведущая организация:\\
 \emph{название организации}
-\vskip2em\noindent
+\vskip2ex\noindent
 Защита состоится \datefield{} в \rule[0pt]{1cm}{0.5pt}\, часов
 на заседании диссертационного совета \emph{шифр совета} при \emph{название
 организации, при которой создан совет}, расположенном по адресу:
 \emph{адрес}
 
-\vskip1em\noindent
+\vskip1ex\noindent
 С диссертацией можно ознакомиться в библиотеке
 \emph{название организации}.
 
-\vskip1em\noindent
+\vskip1ex\noindent
 Автореферат разослан \datefield{}
 
-\vskip2em\noindent
+\vskip2ex\noindent
 Отзывы и замечания по автореферату в двух экземплярах, заверенные
 печатью, просьба высылать по вышеуказанному адресу на имя ученого секретаря
 диссертационного совета.
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/Makefile
index c853e59f80b..775b7fc3d88 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/Makefile
@@ -1 +1 @@
-include ../../../include/latex.fig.mk
+include ../../../include/latex.fig.mk
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/nomake.cmd
index 7d62dafdb27..d5b89784882 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/nomake.cmd
@@ -1 +1 @@
-@call ..\..\..\include\latex.fig.nmk.cmd %*
+@call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
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 c6ed3f12107..542e4e15259 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
@@ -1,28 +1,25 @@
 @echo off
 
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
 if "%1"=="help" (
 :help
-	call ..\..\include\latex.nmk.cmd %1
+	%latexnmk% %1
 	echo   all        build DVI of autoref and thesis
 	echo   allpdf     build PDF of autoref and thesis
 goto :eof
 ) else if "%1"=="all" (
 :all
-	set target=thesis & call ..\..\include\latex.nmk.cmd dvi
-	set target=autoref & call ..\..\include\latex.nmk.cmd dvi
+	set target=thesis & %latexnmk% dvi
+	set target=autoref & %latexnmk% dvi
 	set target=
 goto :eof
 ) else if "%1"=="allpdf" (
 :allpdf
-	set target=thesis & call ..\..\include\latex.nmk.cmd pdf
-	set target=autoref & call ..\..\include\latex.nmk.cmd pdf
+	set target=thesis & %latexnmk% pdf
+	set target=autoref & %latexnmk% pdf
 	set target=
 goto :eof
 ) else (
-	call ..\..\include\latex.nmk.cmd %*
-	goto :eof
+	%latexnmk% %*
 )
-
-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/doctor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
index 5bed0c9a95f..bd6e30bb991 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
@@ -11,7 +11,7 @@
 \usepackage[T2A]{fontenc}
 \usepackage[cp1251]{inputenc}
 \usepackage[english,russian]{babel}
-\usepackage{epstopdf}
+\ifpdf\usepackage{epstopdf}\fi
 
 % Номера страниц сверху и по центру
 %\def\headfont{\small}
@@ -24,11 +24,10 @@
 % Путь к файлам с иллюстрациями
 \graphicspath{{fig/}}
 
+\begin{document}
 % Включение файла с общим текстом диссертации и автореферата
 % (текст титульного листа и характеристика работы).
-\input common
-% ----------------------------------------------------------------
-\begin{document}
+\input{common}
 
 \title{ДИССЕРТАЦИЯ\\
 на соискание ученой степени\\
@@ -49,4 +48,3 @@
 \appendix
 \input{app-a}
 \end{document}
-% ----------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates/master/fig/Makefile
index c853e59f80b..775b7fc3d88 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/fig/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/fig/Makefile
@@ -1 +1 @@
-include ../../../include/latex.fig.mk
+include ../../../include/latex.fig.mk
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/fig/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/master/fig/nomake.cmd
index 7d62dafdb27..d5b89784882 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/fig/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/fig/nomake.cmd
@@ -1 +1 @@
-@call ..\..\..\include\latex.fig.nmk.cmd %*
+@call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file
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 39e5d90404a..07630d2e16a 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
@@ -1,17 +1,15 @@
 @echo off
 
+set latexnmk=call ..\..\include\latex.nmk.cmd
+
 if "%1"=="all" (
 :all
-	..\..\include\latex.nmk.cmd dvi
+	%latexnmk% dvi
 goto :eof
 ) else if "%1"=="allpdf" (
 :allpdf
-	..\..\include\latex.nmk.cmd pdf
+	%latexnmk% pdf
 goto :eof
 ) else (
-	..\..\include\latex.nmk.cmd %*
+	%latexnmk% %*
 )
-
-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/master/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
index 201ef3d5d39..c0b8cef117e 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
@@ -9,7 +9,7 @@
 \usepackage[T2A]{fontenc}
 \usepackage[cp1251]{inputenc}
 \usepackage[english,russian]{babel}
-\usepackage{epstopdf}
+\ifpdf\usepackage{epstopdf}\fi
 
 % Номера страниц сверху и по центру
 %\def\headfont{\small}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
index e84f3cc0004..8541b2d85d5 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
@@ -5,8 +5,10 @@ rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
 
 setlocal enabledelayedexpansion
 
+set target=thesis
 if "!texmf!"=="" set texmf=%programfiles%\miktex
-if "!docdir!"=="" set tdir=!texmf!\doc\latex\%target%
+if "!docdir!"=="" set docdir=!texmf!\doc\latex\disser
+if "!subdirs!"=="" set subdirs=bachelor ..\master ..\candidate ..\doctor
 
 if "%CMDEXTVERSION%"=="" (
 	echo Error: This script requires command interpreter from Windows 2000 or above.
@@ -14,16 +16,28 @@ if "%CMDEXTVERSION%"=="" (
 )
 
 if "%1"=="help" (
-	set subdirs=bachelor
-) else (
-	set subdirs=bachelor ..\master ..\candidate ..\doctor
-)
-
-if "%1"=="install" (
+:help
+	cd bachelor & call nomake help & cd ..
+	echo   install    install templates to TeX tree
+	echo   uninstall  uninstall templates
+	echo   reinstall  reinstall templates
+goto :eof
+) else if "%1"=="install" (
 :install
 	if not exist "%docdir%" md "%docdir%"
-	xcopy /y /e /i /f ..\templates "%tdir%\templates"
-	xcopy /y /e /i /f ..\include "%tdir%\include"
+	xcopy /y /e /i /f ..\templates "%docdir%\templates"
+	xcopy /y /e /i /f ..\include "%docdir%\include"
+goto :eof
+) else if "%1"=="uninstall" (
+:uninstall
+	rmdir /s /q %docdir%\templates
+	rmdir /s /q %docdir%\include
+	rmdir %docdir%
+goto :eof
+) else if "%1"=="reinstall" (
+:reinstall
+	call :uninstall
+	call :install
 goto :eof
 )