disser 1.1.3 (6nov09)

git-svn-id: svn://tug.org/texlive/trunk@16036 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2009-11-16 19:57:36 +0000
committer: Karl Berry <karl@freefriends.org> 2009-11-16 19:57:36 +0000
commit: 494bd0475fd9f4b8ad307a7fb97b96d1f8093936 (patch)
tree: 5b95640ef51caa72822a1478b49449c29c009b24 /Master/texmf-dist/doc/latex/disser/templates
parent: 7c71adc8d8bd0bf2195bb57a46f7029642681503 (diff)
21 files changed, 437 insertions, 260 deletions
diff --git a/Master/texmf-dist/doc/latex/disser/templates/Makefile b/Master/texmf-dist/doc/latex/disser/templates/Makefile
index 37488ee350c..2f7c7d55226 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/Makefile
@@ -1,26 +1,32 @@
-TARGET=thesis
-TEXMF?=/usr/share/texmf
-DOCDIR?=$(TEXMF)/doc/latex/disser
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+#
 
-dvi ps ps_2on1 pdf pdf_2on1 html clean epstopdf fixbb srcdist all allpdf:
+TARGET ?= thesis
+TEXMF ?= /usr/share/texmf
+DESTDIR ?= $(TEXMF)
+DOCDIR ?= $(DESTDIR)/doc/latex/disser
+
+dvi clean figclean bmtoeps epstopdf fixbb pdftopng256 pdftotiffg4 ps ps_2on1 pdf pdf_2on1 html srcdist all allpdf:
 	@$(MAKE) -i -C bachelor $@
 	@$(MAKE) -i -C master $@
 	@$(MAKE) -i -C candidate $@
 	@$(MAKE) -i -C doctor $@
 
 help:
-	@$(MAKE) -s -C bachelor $@
-	@echo "  install    install templates to TeX tree"
-	@echo "  uninstall  uninstall templates"
-	@echo "  reinstall  reinstall templates"
+	@$(MAKE) -s -C candidate $@ ;\
+	echo "  install      install templates" ;\
+	echo "  uninstall    uninstall templates" ;\
+	echo "  reinstall    reinstall templates"
 
 install:
-	cp -rf ../templates $(DOCDIR)
+	cp -rf ../templates $(DOCDIR) ;\
 	cp -rf ../include $(DOCDIR)
 
 uninstall:
-	rm -rf $(DOCDIR)/templates
-	rm -rf $(DOCDIR)/include
-	rmdir $(DOCDIR)
+	-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 86cd1ef1174..dbf4c317b37 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
@@ -4,7 +4,7 @@
 ��������������� ������� $\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}. ������ �� �������~\eqref{eq:e}
+Anselm_1978,Segall_1968,Agranovich_1983,InP}. ������ �� �������~\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}
@@ -27,7 +27,7 @@ Anselm_1978,Segall_1968}. ������ �� �������~\eqref{eq:e}
 \end{wrapfigure}
 
 ���� �������� ������� ����������-�������� ������� $E_2-E_1$ ������ � ������� ����������� ����������� ������ $\hbar\Omega_{LO}$, �� � ���������� �������� ������� ������� ������������� ����� ������������ ������� ������������ ��� ���� ���������, �� ����������� ������� �� �������� � $E_2$.
-�������� ������� ��������� ������������ ����� ��������� ���������� ����������� ���������~\footnote{����� ������}.
+�������� ������� ��������� ������������ ����� ��������� ���������� ����������� ���������\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{���}\times\text{��}^{-2}$\quad &
-    \quad$\mu \times 10^{-11}$,~$\text{���}\times\text{��}^{-2}$ & \quad$\rho$, $\text{�}\times \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  \\
@@ -88,7 +88,7 @@ Anselm_1978,Segall_1968}. ������ �� �������~\eqref{eq:e}
   \subfloat[][]{\label{fig:sub2}\includegraphics[width=4cm]{fig}}\quad
   \subfloat[][]{\label{fig:sub3}\includegraphics[width=4cm]{fig}}
 \caption[]{%
-������� � ������ ��������� � ����������� ����������:
+������� � ������ ��������� � ����������� ����������:
   \subref{fig:sub1} ������ 1,
   \subref{fig:sub2} ������ 2,
   \subref{fig:sub3} ������ 3.
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile b/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile
index 5f8b968c8c0..30faef4990e 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile
@@ -1,7 +1,18 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+#
+
 TARGET?=thesis
 
+
 include ../../include/latex.mk
 
 all: dvi
 
-allpdf: pdf
-\ No newline at end of file
+allpdf: pdf
+
+help: .help
+	@echo "  all          alias for dvi target" ;\
+	 echo "  allpdf       alias for pdf target" ;\
+
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
index 07630d2e16a..d3bc974cf93 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd
@@ -1,15 +1,29 @@
 @echo off
 
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+
 set latexnmk=call ..\..\include\latex.nmk.cmd
 
-if "%1"=="all" (
-:all
-	%latexnmk% dvi
-goto :eof
-) else if "%1"=="allpdf" (
-:allpdf
-	%latexnmk% pdf
-goto :eof
+if "%1"=="" (
+	%latexnmk%
 ) else (
-	%latexnmk% %*
+	for %%f in (%*) do if "%%f"=="help" (
+		call :%%f
+	) else if "%%f"=="all" (
+		%latexnmk% dvi
+	) else if "%%f"=="allpdf" (
+		%latexnmk% pdf
+	) else (
+		%latexnmk% %%f
+	)
 )
+
+exit /b
+
+:help
+	echo   all          alias for dvi target
+	echo   allpdf       alias for pdf target
+	%latexnmk% help
+goto :eof
+
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
index 2dbe1cbce31..19f2cd1c771 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
@@ -1,40 +1,60 @@
 @ARTICLE{Yoffe_1993_AP_42_173,
-  Author  = {A. D. Yoffe},
-  Title   = {Low-dimensional systems: quantum size effects and electronic
-             properties of semiconductor microcrystallites (zero-dimensional
-             systems) and some quasi-two-dimensional systems},
-  Journal = {Adv. Phys.},
-  Pages   = {173--266},
-  Volume  = {42},
-  Year    = {1993},
+  author = {A. D. Yoffe},
+  title = {Low-dimensional systems: quantum size effects and electronic
+           properties of semiconductor microcrystallites (zero-dimensional
+           systems) and some quasi-two-dimensional systems},
+  journal = {Adv. Phys.},
+  pages = {173--266},
+  volume = {42},
+  year = {1993}
 }
 
 @ARTICLE{Efros_1982_FTP_16_7_1209,
-  Author   = {{\relax ��}. �. ����� and �. �. �����},
-  Title    = {��������� ���������� ����� � ����������������� ����},
-  Journal  = {������ � ������� ���������������},
-  Year     = {1982},
-  Volume   = {16},
-  Number   = {7},
-  Pages    = {1209--1214},
-  Language = {russian},
+  author = {{\relax ��}. �. ����� and �. �. �����},
+  title = {��������� ���������� ����� � ����������������� ����},
+  journal = {������ � ������� ���������������},
+  year = {1982},
+  volume = {16},
+  number = {7},
+  pages = {1209--1214},
+  language = {russian},
 }
 
 @BOOK{Anselm_1978,
-  Author    = {�. �. �������},
-  Title     = {�������� � ������ ���������������},
-  Publisher = {�����},
-  Address   = {������},
-  Year      = {1978},
-  Language  = {russian}
+  author = {�. �. �������},
+  title = {�������� � ������ ���������������},
+  publisher = {�����},
+  address = {������},
+  year = {1978},
+  language = {russian}
 }
 
 @INPROCEEDINGS{Segall_1968,
-  Author    = {B. Segall},
-  Year      = {1968},
-  Editor    = {S. M. Ryvkin},
-  Booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
-  Pages     = {425},
-  Address   = {Leningrad},
-  Publisher = {Nauka},
+  author = {B. Segall},
+  year = {1968},
+  editor = {S. M. Ryvkin},
+  booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
+  pages = {425},
+  address = {Leningrad},
+  publisher = {Nauka}
+}
+
+@INBOOK{Agranovich_1983,
+  editor = {V. M. Agranovich and R. M. Hochstrasser},
+  title = {Spectroscopy and Excitation Dynamics of Condensed Molecular Systems},
+  chapter = {6},
+  publisher = {North-Holland},
+  year = {1983},
+  series = {Modern Problems in Condensed Matter Sciences},
+  address = {Amsterdam}
+}
+
+@INCOLLECTION{InP,
+  title = {InP Basic Parameters at 300 K},
+  booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+  organization = {Ioffe Physico-Technical Institute},
+  address = {St. Petersburg},
+  year = {2001},
+  url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+  urldate = {01.11.2009}
 }
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
index a6f338cd8a8..07d784042cb 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
@@ -1,7 +1,8 @@
-\documentclass[a4paper,14pt,bachelor,subf,href
+\documentclass[bachelor,subf,href
 %,fixint=false
 %,times
 ]{disser}
+
 \usepackage[
   a4paper, mag=1000, includefoot,
   left=3cm, right=1cm, top=2cm, bottom=2cm, headsep=1cm, footskip=1cm
@@ -52,6 +53,6 @@
 \input{concl}
 % ----------------------------------------------------------------
 \bibliography{thesis}
-\bibliographystyle{disser}
+\bibliographystyle{gost705}
 \end{document}
 % ----------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile b/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile
index cb0b531291c..cd39aa8987d 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile
@@ -1,18 +1,24 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+#
+
 TARGET?=thesis
 
+
 include ../../include/latex.mk
 
 all:
-	@env TARGET=thesis $(MAKE)
-	@env TARGET=autoref $(MAKE)
-	@eval unset TARGET
+	@env TARGET=thesis $(MAKE) ;\
+	 env TARGET=autoref $(MAKE) ;\
+	 eval unset TARGET
 
 allpdf:
-	@env TARGET=thesis $(MAKE) pdf
-	@env TARGET=autoref $(MAKE) pdf
-	@eval unset TARGET
+	@env TARGET=thesis $(MAKE) pdf ;\
+	 env TARGET=autoref $(MAKE) pdf ;\
+	 eval unset TARGET
+
+help: .help
+	@echo "  all          build DVI of autoref and thesis" ;\
+	 echo "  allpdf       build PDF of autoref and thesis" ;\
 
-help:
-	$(MAKE) -f ../../include/latex.mk help
-	@echo "  all        build DVI of autoref and thesis"
-	@echo "  allpdf     build PDF of autoref and thesis"
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 64ce78d61a5..90e388bf73b 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
@@ -53,7 +53,7 @@
 \end{tabularx}
 
 \vskip2ex\noindent
-������ ��������� \datefield{} � \rule[0pt]{1cm}{0.5pt}\, �����
+������ ��������� \datefield{} � \rule[0pt]{1cm}{0.5pt} �����
 �� ��������� ���������������� ������ \emph{���� ������} ��� \emph{��������
 �����������, ��� ������� ������ �����}, ������������� �� ������:
 \emph{�����}
@@ -158,13 +158,13 @@
 
 % ������� ������� ������ �� ������ ����������
 \def\BibPrefix{A}
-\bibliographystylemy{disser}
+\bibliographystylemy{gost705}
 \bibliographymy{thesis}
 
 \renewcommand\bibsection{\nsection{������������ ����������}}
 
 \def\BibPrefix{}
-\bibliographystyle{disser}
+\bibliographystyle{gost705}
 \bibliography{thesis}
 % ----------------------------------------------------------------
 
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 542e4e15259..39d5656ea50 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd
@@ -1,25 +1,40 @@
 @echo off
 
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+
 set latexnmk=call ..\..\include\latex.nmk.cmd
 
-if "%1"=="help" (
+if "%1"=="" (
+	%latexnmk%
+) else (
+	for %%f in (%*) do if "%%f"=="help" (
+		call :%%f
+	) else if "%%f"=="all" (
+		call :%%f
+	) else if "%%f"=="allpdf" (
+		call :%%f
+	) else (
+		%latexnmk% %%f
+	)
+)
+
+exit /b
+
 :help
-	%latexnmk% %1
-	echo   all        build DVI of autoref and thesis
-	echo   allpdf     build PDF of autoref and thesis
+	echo   all          build DVI of autoref and thesis
+	echo   allpdf       build PDF of autoref and thesis
+	%latexnmk% help
 goto :eof
-) else if "%1"=="all" (
+
 :all
 	set target=thesis & %latexnmk% dvi
 	set target=autoref & %latexnmk% dvi
 	set target=
 goto :eof
-) else if "%1"=="allpdf" (
+
 :allpdf
 	set target=thesis & %latexnmk% pdf
 	set target=autoref & %latexnmk% pdf
 	set target=
 goto :eof
-) else (
-	%latexnmk% %*
-)
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 c112fd6e76e..2a326a07a1f 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
@@ -1,69 +1,79 @@
 @ARTICLE{Ivanov_1999_Journal_17_173,
-  Author   = {�. �. ������ and �. �. ������ and �. �. �������},
-  Title    = {�������� ������},
-  Journal  = {�������� �������},
-  Volume   = {17},
-  Pages    = {173--180},
-  Year     = {1999},
-  Language = {russian}
+  author   = {�. �. ������ and �. �. ������ and �. �. �������},
+  title    = {�������� ������},
+  journal  = {�������� �������},
+  volume   = {17},
+  pages    = {173--180},
+  year     = {1999},
+  language = {russian}
 }
 
 @ARTICLE{Petrov_2001_Journal_23_12321,
-  Author   = {�. �. ������ and �. �. ������ and �. �. �������},
-  Title    = {�������� ������},
-  Journal  = {�������� �������},
-  Volume   = {23},
-  Pages    = {12321--12328},
-  Year     = {2001},
-  Language = {russian}
+  author   = {�. �. ������ and �. �. ������ and �. �. �������},
+  title    = {�������� ������},
+  journal  = {�������� �������},
+  volume   = {23},
+  pages    = {12321--12328},
+  year     = {2001},
+  language = {russian}
 }
 
 @ARTICLE{Sidorov_2002_Journal_32_1531,
-  Author  = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
-  Title   = {Article Name},
-  Journal = {Journal Name},
-  Volume  = {32},
-  Pages   = {1531--1540},
-  Year    = {2002}
+  author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+  title = {Article Title},
+  journal = {Journal Name},
+  volume = {32},
+  pages = {1531--1540},
+  year = {2002}
 }
 
 @ARTICLE{Yoffe_1993_AP_42_173,
-  Author  = {A. D. Yoffe},
-  Title   = {Low-dimensional systems: quantum size effects and electronic
-             properties of semiconductor microcrystallites (zero-dimensional
-             systems) and some quasi-two-dimensional systems},
-  Journal = {Adv. Phys.},
-  Pages   = {173--266},
-  Volume  = {42},
-  Year    = {1993},
+  author = {A. D. Yoffe},
+  title = {Low-dimensional systems: quantum size effects and electronic
+           properties of semiconductor microcrystallites (zero-dimensional
+           systems) and some quasi-two-dimensional systems},
+  journal = {Adv. Phys.},
+  pages = {173--266},
+  volume = {42},
+  year = {1993},
 }
 
 @ARTICLE{Efros_1982_FTP_16_7_1209,
-  Author   = {{\relax ��}. �. ����� and �. �. �����},
-  Title    = {��������� ���������� ����� � ����������������� ����},
-  Journal  = {������ � ������� ���������������},
-  Year     = {1982},
-  Volume   = {16},
-  Number   = {7},
-  Pages    = {1209--1214},
-  Language = {russian},
+  author = {{\relax ��}. �. ����� and �. �. �����},
+  title = {��������� ���������� ����� � ����������������� ����},
+  journal = {������ � ������� ���������������},
+  year = {1982},
+  volume = {16},
+  number = {7},
+  pages = {1209--1214},
+  language = {russian},
 }
 
 @BOOK{Anselm_1978,
-  Author    = {�. �. �������},
-  Title     = {�������� � ������ ���������������},
-  Publisher = {�����},
-  Address   = {������},
-  Year      = {1978},
-  Language  = {russian}
+  author    = {�. �. �������},
+  title     = {�������� � ������ ���������������},
+  publisher = {�����},
+  address   = {������},
+  year      = {1978},
+  language  = {russian}
 }
 
 @INPROCEEDINGS{Segall_1968,
-  Author    = {B. Segall},
-  Year      = {1968},
-  Editor    = {S. M. Ryvkin},
-  Booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
-  Pages     = {425},
-  Address   = {Leningrad},
-  Publisher = {Nauka},
+  author = {B. Segall},
+  year = {1968},
+  editor = {S. M. Ryvkin},
+  booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
+  pages = {425},
+  address = {Leningrad},
+  publisher = {Nauka},
+}
+
+@INCOLLECTION{InP,
+  title = {InP Basic Parameters at 300 K},
+  booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+  organization = {Ioffe Physico-Technical Institute},
+  address = {St. Petersburg},
+  year = {2001},
+  url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+  urldate = {01.11.2009}
 }
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
index 6e125186c98..c5976bd6af9 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,14pt,candidate,subf,href
+\documentclass[candidate,subf,href
 %,fixint=false
 %,facsimile
 %,times
@@ -43,7 +43,7 @@
 \input{concl}
 % ----------------------------------------------------------------
 \bibliography{thesis}
-\bibliographystyle{disser}
+\bibliographystyle{gost705}
 % ----------------------------------------------------------------
 \appendix
 \input{app-a}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile b/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile
index cb0b531291c..e041e488ac6 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile
@@ -1,18 +1,24 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+#
+
 TARGET?=thesis
 
+
 include ../../include/latex.mk
 
 all:
-	@env TARGET=thesis $(MAKE)
-	@env TARGET=autoref $(MAKE)
-	@eval unset TARGET
+	@env TARGET=thesis $(MAKE) dvi ;\
+	 env TARGET=autoref $(MAKE) dvi ;\
+	 eval unset TARGET
 
 allpdf:
-	@env TARGET=thesis $(MAKE) pdf
-	@env TARGET=autoref $(MAKE) pdf
-	@eval unset TARGET
+	@env TARGET=thesis $(MAKE) pdf ;\
+	 env TARGET=autoref $(MAKE) pdf ;\
+	 eval unset TARGET
+
+help: .help
+	@echo "  all          build DVI of autoref and thesis" ;\
+	 echo "  allpdf       build PDF of autoref and thesis" ;\
 
-help:
-	$(MAKE) -f ../../include/latex.mk help
-	@echo "  all        build DVI of autoref and thesis"
-	@echo "  allpdf     build PDF of autoref and thesis"
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 6f5f5f45336..afe43989319 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
@@ -51,7 +51,7 @@
 ������� �����������:\\
 \emph{�������� �����������}
 \vskip2ex\noindent
-������ ��������� \datefield{} � \rule[0pt]{1cm}{0.5pt}\, �����
+������ ��������� \datefield{} � \rule[0pt]{1cm}{0.5pt} �����
 �� ��������� ���������������� ������ \emph{���� ������} ��� \emph{��������
 �����������, ��� ������� ������ �����}, ������������� �� ������:
 \emph{�����}
@@ -156,13 +156,13 @@
 
 % ������� ������� ������ �� ������ ����������
 \def\BibPrefix{A}
-\bibliographystylemy{disser}
+\bibliographystylemy{gost705}
 \bibliographymy{thesis}
 
 \renewcommand\bibsection{\nsection{������������ ����������}}
 
 \def\BibPrefix{}
-\bibliographystyle{disser}
+\bibliographystyle{gost705}
 \bibliography{thesis}
 % ----------------------------------------------------------------
 
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 542e4e15259..39d5656ea50 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
@@ -1,25 +1,40 @@
 @echo off
 
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+
 set latexnmk=call ..\..\include\latex.nmk.cmd
 
-if "%1"=="help" (
+if "%1"=="" (
+	%latexnmk%
+) else (
+	for %%f in (%*) do if "%%f"=="help" (
+		call :%%f
+	) else if "%%f"=="all" (
+		call :%%f
+	) else if "%%f"=="allpdf" (
+		call :%%f
+	) else (
+		%latexnmk% %%f
+	)
+)
+
+exit /b
+
 :help
-	%latexnmk% %1
-	echo   all        build DVI of autoref and thesis
-	echo   allpdf     build PDF of autoref and thesis
+	echo   all          build DVI of autoref and thesis
+	echo   allpdf       build PDF of autoref and thesis
+	%latexnmk% help
 goto :eof
-) else if "%1"=="all" (
+
 :all
 	set target=thesis & %latexnmk% dvi
 	set target=autoref & %latexnmk% dvi
 	set target=
 goto :eof
-) else if "%1"=="allpdf" (
+
 :allpdf
 	set target=thesis & %latexnmk% pdf
 	set target=autoref & %latexnmk% pdf
 	set target=
 goto :eof
-) else (
-	%latexnmk% %*
-)
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 c112fd6e76e..2a326a07a1f 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
@@ -1,69 +1,79 @@
 @ARTICLE{Ivanov_1999_Journal_17_173,
-  Author   = {�. �. ������ and �. �. ������ and �. �. �������},
-  Title    = {�������� ������},
-  Journal  = {�������� �������},
-  Volume   = {17},
-  Pages    = {173--180},
-  Year     = {1999},
-  Language = {russian}
+  author   = {�. �. ������ and �. �. ������ and �. �. �������},
+  title    = {�������� ������},
+  journal  = {�������� �������},
+  volume   = {17},
+  pages    = {173--180},
+  year     = {1999},
+  language = {russian}
 }
 
 @ARTICLE{Petrov_2001_Journal_23_12321,
-  Author   = {�. �. ������ and �. �. ������ and �. �. �������},
-  Title    = {�������� ������},
-  Journal  = {�������� �������},
-  Volume   = {23},
-  Pages    = {12321--12328},
-  Year     = {2001},
-  Language = {russian}
+  author   = {�. �. ������ and �. �. ������ and �. �. �������},
+  title    = {�������� ������},
+  journal  = {�������� �������},
+  volume   = {23},
+  pages    = {12321--12328},
+  year     = {2001},
+  language = {russian}
 }
 
 @ARTICLE{Sidorov_2002_Journal_32_1531,
-  Author  = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
-  Title   = {Article Name},
-  Journal = {Journal Name},
-  Volume  = {32},
-  Pages   = {1531--1540},
-  Year    = {2002}
+  author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+  title = {Article Title},
+  journal = {Journal Name},
+  volume = {32},
+  pages = {1531--1540},
+  year = {2002}
 }
 
 @ARTICLE{Yoffe_1993_AP_42_173,
-  Author  = {A. D. Yoffe},
-  Title   = {Low-dimensional systems: quantum size effects and electronic
-             properties of semiconductor microcrystallites (zero-dimensional
-             systems) and some quasi-two-dimensional systems},
-  Journal = {Adv. Phys.},
-  Pages   = {173--266},
-  Volume  = {42},
-  Year    = {1993},
+  author = {A. D. Yoffe},
+  title = {Low-dimensional systems: quantum size effects and electronic
+           properties of semiconductor microcrystallites (zero-dimensional
+           systems) and some quasi-two-dimensional systems},
+  journal = {Adv. Phys.},
+  pages = {173--266},
+  volume = {42},
+  year = {1993},
 }
 
 @ARTICLE{Efros_1982_FTP_16_7_1209,
-  Author   = {{\relax ��}. �. ����� and �. �. �����},
-  Title    = {��������� ���������� ����� � ����������������� ����},
-  Journal  = {������ � ������� ���������������},
-  Year     = {1982},
-  Volume   = {16},
-  Number   = {7},
-  Pages    = {1209--1214},
-  Language = {russian},
+  author = {{\relax ��}. �. ����� and �. �. �����},
+  title = {��������� ���������� ����� � ����������������� ����},
+  journal = {������ � ������� ���������������},
+  year = {1982},
+  volume = {16},
+  number = {7},
+  pages = {1209--1214},
+  language = {russian},
 }
 
 @BOOK{Anselm_1978,
-  Author    = {�. �. �������},
-  Title     = {�������� � ������ ���������������},
-  Publisher = {�����},
-  Address   = {������},
-  Year      = {1978},
-  Language  = {russian}
+  author    = {�. �. �������},
+  title     = {�������� � ������ ���������������},
+  publisher = {�����},
+  address   = {������},
+  year      = {1978},
+  language  = {russian}
 }
 
 @INPROCEEDINGS{Segall_1968,
-  Author    = {B. Segall},
-  Year      = {1968},
-  Editor    = {S. M. Ryvkin},
-  Booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
-  Pages     = {425},
-  Address   = {Leningrad},
-  Publisher = {Nauka},
+  author = {B. Segall},
+  year = {1968},
+  editor = {S. M. Ryvkin},
+  booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
+  pages = {425},
+  address = {Leningrad},
+  publisher = {Nauka},
+}
+
+@INCOLLECTION{InP,
+  title = {InP Basic Parameters at 300 K},
+  booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+  organization = {Ioffe Physico-Technical Institute},
+  address = {St. Petersburg},
+  year = {2001},
+  url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+  urldate = {01.11.2009}
 }
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
index bd6e30bb991..7deef68782f 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,14pt,doctor,subf,href
+\documentclass[doctor,subf,href
 %,fixint=false
 %,facsimile
 %,times
@@ -43,7 +43,7 @@
 \input{concl}
 % ----------------------------------------------------------------
 \bibliography{thesis}
-\bibliographystyle{disser}
+\bibliographystyle{gost705}
 % ----------------------------------------------------------------
 \appendix
 \input{app-a}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/Makefile b/Master/texmf-dist/doc/latex/disser/templates/master/Makefile
index 5f8b968c8c0..30faef4990e 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/Makefile
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/Makefile
@@ -1,7 +1,18 @@
+#
+# Makefile for documents and templates
+# Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+#
+
 TARGET?=thesis
 
+
 include ../../include/latex.mk
 
 all: dvi
 
-allpdf: pdf
-\ No newline at end of file
+allpdf: pdf
+
+help: .help
+	@echo "  all          alias for dvi target" ;\
+	 echo "  allpdf       alias for pdf target" ;\
+
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
index 07630d2e16a..d3bc974cf93 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd
@@ -1,15 +1,29 @@
 @echo off
 
+rem Makefile for documents and templates
+rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
+
 set latexnmk=call ..\..\include\latex.nmk.cmd
 
-if "%1"=="all" (
-:all
-	%latexnmk% dvi
-goto :eof
-) else if "%1"=="allpdf" (
-:allpdf
-	%latexnmk% pdf
-goto :eof
+if "%1"=="" (
+	%latexnmk%
 ) else (
-	%latexnmk% %*
+	for %%f in (%*) do if "%%f"=="help" (
+		call :%%f
+	) else if "%%f"=="all" (
+		%latexnmk% dvi
+	) else if "%%f"=="allpdf" (
+		%latexnmk% pdf
+	) else (
+		%latexnmk% %%f
+	)
 )
+
+exit /b
+
+:help
+	echo   all          alias for dvi target
+	echo   allpdf       alias for pdf target
+	%latexnmk% help
+goto :eof
+
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
index 58b0166f55f..87dee2d3828 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
@@ -1,34 +1,60 @@
 @ARTICLE{Yoffe_1993_AP_42_173,
-  Author  = {A. D. Yoffe},
-  Journal = {Adv. Phys.},
-  Pages   = {173},
-  Volume  = {42},
-  Year    = {1993}
+  author = {A. D. Yoffe},
+  title = {Low-dimensional systems: quantum size effects and electronic
+           properties of semiconductor microcrystallites (zero-dimensional
+           systems) and some quasi-two-dimensional systems},
+  journal = {Adv. Phys.},
+  pages = {173--266},
+  volume = {42},
+  year = {1993}
 }
 
-@ARTICLE{Efros_1982_FTP_16_82_1209,
-  Author   = {{\relax ��}. �. ����� and �. �. �����},
-  Journal  = {������ � ������� ���������������},
-  Pages    = {1209},
-  Volume   = {16},
-  Year     = {1982},
-  Language = {russian}
+@ARTICLE{Efros_1982_FTP_16_7_1209,
+  author = {{\relax ��}. �. ����� and �. �. �����},
+  title = {��������� ���������� ����� � ����������������� ����},
+  journal = {������ � ������� ���������������},
+  year = {1982},
+  volume = {16},
+  number = {7},
+  pages = {1209--1214},
+  language = {russian},
 }
 
-@ARTICLE{Kayanuma_1988_PRB_38_9797,
-  Author  = {Y. Kayanuma},
-  Journal = {Phys. Rev. B},
-  Pages   = {9797},
-  Volume  = {38},
-  Year    = {1988}
+@BOOK{Anselm_1978,
+  author = {�. �. �������},
+  title = {�������� � ������ ���������������},
+  publisher = {�����},
+  address = {������},
+  year = {1978},
+  language = {russian}
 }
 
 @INPROCEEDINGS{Segall_1968,
-  Author    = {B. Segall},
-  Year      = {1968},
-  Editor    = {S. M. Ryvkin},
-  Booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
-  Pages     = {425},
-  Address   = {Leningrad},
-  Publisher = {Nauka},
+  author = {B. Segall},
+  year = {1968},
+  editor = {S. M. Ryvkin},
+  booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
+  pages = {425},
+  address = {Leningrad},
+  publisher = {Nauka}
+}
+
+@INBOOK{Agranovich_1983,
+  editor = {V. M. Agranovich and R. M. Hochstrasser},
+  title = {Spectroscopy and Excitation Dynamics of Condensed Molecular Systems},
+  chapter = {6},
+  publisher = {North-Holland},
+  year = {1983},
+  series = {Modern Problems in Condensed Matter Sciences},
+  address = {Amsterdam}
+}
+
+@incollection{InP,
+  title = {InP Basic Parameters at 300 K},
+  booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+  organization = {Ioffe Physico-Technical Institute},
+  address = {St. Petersburg},
+  year = {2001},
+  url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+  urldate = {01.11.2009}
 }
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
index c0b8cef117e..5f42746d338 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
@@ -1,7 +1,8 @@
-\documentclass[a4paper,14pt,master,subf,href
+\documentclass[master,subf,href
 %,fixint=false
 %,times
 ]{disser}
+
 \usepackage[
   a4paper, mag=1000, includefoot,
   left=3cm, right=1cm, top=2cm, bottom=2cm, headsep=1cm, footskip=1cm
@@ -25,7 +26,7 @@
 }
 % ��� ����, ������������ � ������ (���. ��������)
 \apname{��� ���. ��������}
-\title{�����������\\[-14pt]�� ��������� ������ �������\\��������}
+\title{�����������\\[-14pt]�� ��������� ������ �������\\��������}
 % ����
 \topic{���� �����������}
 
@@ -65,5 +66,5 @@
 \input{app-a}
 %---------------------------------------------------------------------------
 \bibliography{thesis}
-\bibliographystyle{disser}
+\bibliographystyle{gost705}
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
index 8541b2d85d5..1bd384fb3e1 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd
@@ -3,42 +3,53 @@
 rem nomake script for LaTeX projects
 rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
 
+if "%CMDEXTVERSION%"=="" (
+	echo This script requires command interpreter from Windows 2000 or above.
+	goto :eof
+)
+
 setlocal enabledelayedexpansion
 
 set target=thesis
-if "!texmf!"=="" set texmf=%programfiles%\miktex
-if "!docdir!"=="" set docdir=!texmf!\doc\latex\disser
+if "!texmf!"==""   set texmf=%programfiles%\miktex
+if "!destdir!"=="" set destdir=!texmf!
+if "!docdir!"==""  set docdir=!destdir!\doc\latex\disser
 if "!subdirs!"=="" set subdirs=bachelor ..\master ..\candidate ..\doctor
 
-if "%CMDEXTVERSION%"=="" (
-	echo Error: This script requires command interpreter from Windows 2000 or above.
-	goto :eof
-)
 
 if "%1"=="help" (
+	call :%1
+) else if "%1"=="install" (
+	call :%1
+) else if "%1"=="uninstall" (
+	call :%1
+) else if "%1"=="reinstall" (
+	call :%1
+) else (
+	for %%i in (%subdirs%) do @cd %%i & call nomake %*
+)
+
+exit /b
+
 :help
-	cd bachelor & call nomake help & cd ..
+	cd candidate & 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 "%docdir%\templates"
-	xcopy /y /e /i /f ..\include "%docdir%\include"
+	if not exist "!docdir!" mkdir "!docdir!"
+	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%
+	rmdir /s /q "!docdir!"
 goto :eof
-) else if "%1"=="reinstall" (
+
 :reinstall
 	call :uninstall
 	call :install
 goto :eof
-)
 
-for %%i in (%subdirs%) do @cd %%i & call nomake %*
-\ No newline at end of file
author	Karl Berry <karl@freefriends.org>	2009-11-16 19:57:36 +0000
committer	Karl Berry <karl@freefriends.org>	2009-11-16 19:57:36 +0000
commit	494bd0475fd9f4b8ad307a7fb97b96d1f8093936 (patch)
tree	5b95640ef51caa72822a1478b49449c29c009b24 /Master/texmf-dist/doc/latex/disser/templates
parent	7c71adc8d8bd0bf2195bb57a46f7029642681503 (diff)