diff options
Diffstat (limited to 'Master/texmf-dist/doc')
48 files changed, 852 insertions, 1037 deletions
diff --git a/Master/texmf-dist/doc/latex/disser/README b/Master/texmf-dist/doc/latex/disser/README index 9d75d81ccc4..2d4afc5baf4 100644 --- a/Master/texmf-dist/doc/latex/disser/README +++ b/Master/texmf-dist/doc/latex/disser/README @@ -1,15 +1,17 @@ Overview -------- -disser is a LaTeX document class and set of templates for creating dissertations. -It is oriented on Russian-speaking users. +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 +hypernat, subfig, caption, cmap. + Getting latest version ---------------------- @@ -18,16 +20,17 @@ 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 ------------ Automatically Unix-like environment: -> make && make TEXMF=/path/to/texmf install +> make TEXMF=/path/to/texmf install > mktexlsr -Windows NT: +Windows: > set texmf=<path to texmf or localtexmf> > nomake & nomake install > mktexlsr diff --git a/Master/texmf-dist/doc/latex/disser/README.ru b/Master/texmf-dist/doc/latex/disser/README.ru index 659d4e7ff4e..eaf2e6186cf 100644 --- a/Master/texmf-dist/doc/latex/disser/README.ru +++ b/Master/texmf-dist/doc/latex/disser/README.ru @@ -4,19 +4,22 @@ Пакет disser предназначен для верстки дипломов и диссертаций. Ориентирован на рускоязычных пользователей. + Зависимости ----------- Класс disser.cls использует стронние пакеты. Для корректной сборки шаблонов следует установить всё нижеперечисленное: amssymb, amsmath, graphicx, natbib, -floatflt, pscyr, hyperref, hypernat, subfig, caption, cmap +floatflt, pscyr, hyperref, hypernat, subfig, caption, cmap. + Получение последней версии -------------------------- Наиболее свежую версию пакета можно получить из SVN-репозитория. Для этого достаточно установить Subversion и выполнить команду -> svn export https://svn.sourceforge.net/svnroot/disser/ +> svn export https://disser.svn.sourceforge.net/svnroot/disser/ + Установка --------- @@ -24,12 +27,12 @@ floatflt, pscyr, hyperref, hypernat, subfig, caption, cmap Автоматически В Unix-like ОС: -> make && make TEXMF=/путь/к/texmf install +> make TEXMF=/путь/к/texmf install > mktexlsr -В Windows NT: +В Windows: > set texmf=<путь к texmf или localtexmf> -> nomake & nomake install +> nomake install > mktexlsr Вручную @@ -37,7 +40,8 @@ floatflt, pscyr, hyperref, hypernat, subfig, caption, cmap 1. Создаем каталог > mkdir /путь/к/texmf/tex/latex/disser -2. Генерируем файлы класса +2. Генерируем файлы классов +> cd src > latex disser.ins 3. Копируем *.cls и *.rtx в созданный каталог. @@ -49,6 +53,7 @@ floatflt, pscyr, hyperref, hypernat, subfig, caption, cmap 5. Обновляем базу имен файлов > mktexlsr + Лицензия -------- diff --git a/Master/texmf-dist/doc/latex/disser/changelog.txt b/Master/texmf-dist/doc/latex/disser/changelog.txt index 0c63924e262..978b0585898 100644 --- a/Master/texmf-dist/doc/latex/disser/changelog.txt +++ b/Master/texmf-dist/doc/latex/disser/changelog.txt @@ -2,6 +2,35 @@ disser changelog Copyright (C) 2004-2007 Stanislav Kruchinin ------------------------------------------- +Changes in version 1.0.4 (2007-11-04): + +Class: ++ Wrote some documentation on class options and Makefile targets. +* Refactoring of sources and Makefiles. +* gost732 class code is no longer included in disser.dtx. ++ New option fixint={true|false}. ++ Parametrization of format for theorem-like environments. + +Templates: +* Appendix is now behind the Bibliography. +* nomake.cmd scripts became a stub for one common file. + Don't forget to include it to your source distribution. ++ Macros for sharing text between dissertation and abstract. ++ Changed style of second page in abstract. ++ Added \usepackage{srcltx} to make source links by default. +* Included makefiles moved to include dir. + + +Changes in version 1.0.3a (2007-07-28): + +Class: ++ \phantomchapter command was superseded by \metaphantom{}. + +Templates: +* Changed default settings for margins. +* Small fixes to comply standards. + + Changes in version 1.0.3 (2007-07-11): Class: diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.fig.mk b/Master/texmf-dist/doc/latex/disser/include/latex.fig.mk new file mode 100644 index 00000000000..75089a8711c --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/include/latex.fig.mk @@ -0,0 +1,41 @@ +# +# Makefile for EPS figures +# Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com> +# + +EPSTOOL=epstool +EPSTOPDF=epstopdf + +ETFLAGS=--quiet --copy --bbox + +FIGCLFILES=*.pdf +SUFFIX=~ + +# end of configuration + +help: + @echo Targets: + @echo " clean - clean PDF files" + @echo " epstopdf - convert all figures to PDF" + @echo " fixbb - fix BoundingBox" + @echo " help - (default) show help" + +clean: + rm -f $(FIGCLFILES) + +epstopdf: $(patsubst %.eps, %.pdf, $(wildcard *.eps)) + +fixbb: *.eps + @for f in *.eps ; \ + do \ + echo -n "fixbb: $$f..." ;\ + $(EPSTOOL) $(ETFLAGS) $$f $$f~ ;\ + mv $$f~ $$f ;\ + echo "done" ;\ + done + +%.pdf: %.eps + @echo -n "epstopdf: $<..." + @$(EPSTOPDF) "$<" + @echo "done" + diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd b/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd new file mode 100644 index 00000000000..f6f164b74a1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd @@ -0,0 +1,70 @@ +@echo off + +rem nomake script for EPS figures +rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com> + +if "%CMDEXTVERSION%"=="" ( + echo Error: This script requires command interpreter from Windows 2000 or above. + goto :eof +) + +set epstool=epstool +set epstopdf=epstopdf + +set etflags=--quiet --copy --bbox + +set figclfiles=*.pdf +set suffix=~ + +rem end of configuration + +if "%1"=="" ( +:default + call :help +goto :eof +) + +:start +if "%1"=="" goto :eof + +if "%1"=="help" ( +:help + echo Targets: + echo clean - clean generated PDF files + echo epstopdf - convert all figures to PDF + echo fixbb - fix BoundingBox + echo help - ^(default^) show this message +goto :eof +) + +if "%1"=="clean" ( +:clean + del /s %figclfiles% 2> nul +goto :eof +) + +if "%1"=="epstopdf" ( +:epstopdf + for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n +goto :end +:conv + %epstopdf% "%1" + echo epstopdf: %~nx1...done +goto :eof +) + +if "%1"=="fixbb" ( +:fixbb + for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n +goto :end +:fix + %epstool% %etflags% %1 %1.%suffix% + move %1.%suffix% %1 > nul + echo fixbb: %~nx1...done +goto :eof +) + +if "%1" neq "" echo Don't know how to make %1 +:end +shift & goto :start + diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.mk b/Master/texmf-dist/doc/latex/disser/include/latex.mk new file mode 100644 index 00000000000..1546c18f332 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/include/latex.mk @@ -0,0 +1,101 @@ +# +# Makefile for LaTeX projects +# Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com> +# + +TARGET=thesis + +ARCH=7z +BIBTEX=bibtex8 +DVIPS=dvips +FIND=/bin/find +L2H=latex2html +PDFTEX=pdflatex +PS2PDF=gs +PSNUP=psnup +TEX=latex + +ARCHEXT=zip +ARCHFLAGS=a -t$(ARCHEXT) +ARCHIVE=$(TARGET).$(ARCHEXT) +BIBTEXFLAGS=-H -c cp1251 + +L2HFLAGS=-dir html -iso_language RU.RU -split 3 -short_index \ + -numbered_footnotes -no_footnode -white -antialias -html_version 4.0 +PS2PDFFLAGS=-dBATCH -dNOPAUSE -sDEVICE=pdfwrite -g4960x7016 -r600 \ + -dCompatibilityLevel=1.2 -sOutputFile=$(TARGET)_2on1.pdf -c save pop \ + -f $(TARGET)_2on1.ps +PSNUPFLAGS=-2 -pA4 +TEXFLAGS=-src-specials + +CLEXT=*.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \ + *.bbl *.blg *.bak *.dvi *.ps *.pdf +CLFILES=$(CLEXT) $(ARCHIVE) +SRCFILES=* + +# end of configuration + +dvi: $(TARGET).dvi + +pdf: $(TARGET).pdf + +pdf_2on1: $(TARGET)_2on1.pdf + +ps: $(TARGET).ps + +ps_2on1: $(TARGET)_2on1.ps + +html: $(TARGET).dvi + @$(L2H) $(L2HFLAGS) $(TARGET).tex + +$(TARGET).dvi: $(TARGET).tex + @$(TEX) $(TEXFLAGS) $^ + @$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\ + @$(TEX) $(TEXFLAGS) $^ + @$(TEX) $(TEXFLAGS) $^ + +$(TARGET).ps: $(TARGET).dvi + @$(DVIPS) -o $@ $^ + +$(TARGET)_2on1.ps: $(TARGET).ps + @$(PSNUP) $(PSNUPFLAGS) $^ > $@ + +$(TARGET).pdf: $(TARGET).tex + @$(MAKE) -C fig epstopdf + @$(PDFTEX) $^ + @$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) + @$(PDFTEX) $^ + @$(PDFTEX) $^ + +$(TARGET)_2on1.pdf: $(TARGET)_2on1.ps + @$(PS2PDF) $^ $@ + +epstopdf: + @$(MAKE) -C fig $@ + +fixbb: + @$(MAKE) -C fig $@ + +srcdist: + @$(MAKE) clean + @$(ARCH) $(ARCHFLAGS) $(ARCHIVE) $(SRCFILES) + +clean: + rm -f $(CLFILES) + rm -f html/*.* + @$(MAKE) -C fig $@ + +help: + @echo "Targets:" + @echo " dvi - (default) build DVI" + @echo " clean - remove ouptut files" + @echo " epstopdf - convert all figures to PDF" + @echo " fixbb - fix BoundingBox" + @echo " help - show help" + @echo " html - build HTML" + @echo " pdf - build PDF" + @echo " pdf_2on1 - build PDF with 2 pages on one landscape-oriented A4" + @echo " ps - build PS" + @echo " ps_2on1 - build PS with 2 pages on one landscape-oriented A4" + @echo " srcdist - build source distribution $(ARCHIVE)" + diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd new file mode 100644 index 00000000000..2cdc9f56b82 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd @@ -0,0 +1,149 @@ +@echo off + +rem nomake script for LaTeX projects +rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com> + +if "%CMDEXTVERSION%"=="" ( + echo Error: This script requires command interpreter from Windows 2000 or above. + goto :eof +) + +if "%texmf%"=="" set texmf=%programfiles%\miktex-2.6 + +set target=thesis + +set arch=7z +set bibtex=bibtex8 +set epstool=epstool +set epstopdf=epstopdf +set ps2pdf=gswin32c +set dvips=dvips +set l2h=latex2html +set mktexlsr=mktexlsr +set pdftex=pdflatex +set psnup=psnup +set tex=latex + +set archext=zip +set archflags=a -t%archext% +set archive=%target%.%archext% +set bibtexflags=-H -c cp1251 +set l2hflags=-dir html -iso_language RU.RU -split 3 -short_index ^ + -numbered_footnotes -no_footnode -white -antialias ^ + -html_version 4.0 +set ps2pdfflags=-dBATCH -dNOPAUSE -sDEVICE=pdfwrite -g4960x7016 -r600 ^ + -dCompatibilityLevel#1.2 -sOutputFile=%target%_2on1.pdf -c save pop ^ + -f %target%_2on1.ps +set psnupflags=-2 -pA4 +set texflags=-src-specials -terminal=oem + +set clext=*.bbl *.bak *.aux *.blg *.out *.toc *.log *.dvi *.tmp *.pdf *.ps +set clfiles= %clext% %target%.%arc% +set srcfiles=* +set suffix=~ + +rem end of configuration + +if "%1"=="" ( +:default + call :dvi +goto :eof +) + +:start +if "%1"=="" goto :eof + +if "%1"=="dvi" ( +:dvi + %tex% %texflags% %target%.tex + %bibtex% %bibtexflags% %target% + %tex% %texflags% %target%.tex + %tex% %texflags% %target%.tex +goto :eof +) + +if "%1"=="pdf" ( +:pdf + call :epstopdf + %pdftex% %texflags% %target%.tex + %bibtex% %bibtexflags% %target% + %pdftex% %texflags% %target%.tex + %pdftex% %texflags% %target%.tex +goto :eof +) + +if "%1"=="pdf_2on1" ( +:pdf2on1 + if not exist %target%.ps call :ps2on1 + %ps2pdf% %ps2pdfflags% 2 > nul 2>&1 +goto :eof +) + +if "%1"=="ps" ( +:ps + if not exist %target%.dvi call :dvi + %dvips% -o %target%.ps %target%.dvi +goto :eof +) + +if "%1"=="ps_2on1" ( +:ps2on1 + if not exist %target%.ps call :ps + %psnup% %psnupflags% %target%.ps > %target%_2on1.ps +goto :eof +) + +if "%1"=="html" ( +:html + if not exist %target%.dvi call :dvi + %l2h% %l2hflags% %target%.tex +goto :eof +) + +if "%1"=="clean" ( +:clean + del /s %clfiles% 2> nul + if exist %target%.%arctype% del %target%.%arctype% +goto :eof +) + +if "%1"=="srcdist" ( +:srcdist + call :clean + %arch% %archflags% %archive% %srcfiles% +goto :eof +) + +if "%1"=="epstopdf" ( +:epstopdf + cd fig & call nomake.cmd epstopdf & cd .. +goto :eof +) + +if "%1"=="fixbb" ( +:fixbb + cd fig & call nomake.cmd fixbb & cd .. +goto :eof +) + +if "%1"=="help" ( +:help + echo Targets: + echo dvi - ^(default^) build DVI + echo clean - remove ouptut files + echo epstopdf - convert all figures to PDF + echo fixbb - fix BoundingBox + echo help - show help + echo html - build HTML + echo pdf - build PDF + echo pdf_2on1 - build PDF with 2 pages on one landscape-oriented A4 + echo ps - build PS + echo ps_2on1 - build PS with 2 pages on one landscape-oriented A4 + echo srcdist - build source distribution %archive% +goto :eof +) + +if "%1" neq "" echo Don't know how to make %1 +:end +shift & goto :start + diff --git a/Master/texmf-dist/doc/latex/disser/nomake.cmd b/Master/texmf-dist/doc/latex/disser/nomake.cmd index aa1d1770b9d..061b185d3d0 100644 --- a/Master/texmf-dist/doc/latex/disser/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/nomake.cmd @@ -1,62 +1,107 @@ @echo off -set target=disser +rem nomake script for LaTeX packages +rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com> + +if "%CMDEXTVERSION%"=="" ( + echo Error: This script requires command interpreter from Windows 2000 or above. + goto :eof +) -if %texmf%.==. set texmf=d:\programs\miktex\local +if "%texmf%"=="" set texmf=%programfiles%\miktex-2.6 + +set target=disser +set subclass=gost732 set destdir=%texmf%\tex\latex\%target% set docdir=%texmf%\doc\latex\%target% -set clean=*.rtx *.cls *.log *.out *.aux *.dvi *.idx *.glo *.toc *.ind *.ilg *.bak *.bbl *.blg +set clfiles=*.rtx *.cls *.log *.out *.aux *.dvi *.idx *.glo *.toc *.ind ^ + *.ilg *.bak *.bbl *.blg *.pdf + +set tex=latex +set pdftex=pdflatex -if %1.==. ( +set texflags=-src-specials -terminal=oem + +rem Default target +if "%1"=="" ( :default - goto :all + call :all +goto :eof ) :start -if %1.==. goto :eof +if "%1"=="" goto :eof -if %1.==all. ( +if "%1"=="all" ( :all - latex %target%.ins + call :class call :doc goto :eof ) -if %1.==class. ( +if "%1"=="class" ( :class - latex %target%.ins + %tex% %target%.ins goto :eof ) -if %1.==clean. ( +if "%1"=="clean" ( :clean - del %clean% - goto :eof -goto :end + del %clfiles% +goto :eof ) -if %1.==install. ( -:install - if not exist %target%.cls ( - echo You must run 'nomake' first - goto :eof - ) - if not exist %destdir% mkdir %destdir% - 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. ( +if "%1"=="doc" ( :doc - chcp 1251 - latex %target%.dtx - latex -src-specials %target%.dtx -goto :end + call :dvi + call :pdf +goto :eof +) + +if "%1"=="dvi" ( +:dvi + %tex% %texflags% %target%.dtx + %tex% %texflags% %target%.dtx + %tex% %texflags% %subclass%.dtx + %tex% %texflags% %subclass%.dtx +goto :eof +) + +if "%1"=="pdf" ( +:pdf + %pdftex% %texflags% %target%.dtx + %pdftex% %texflags% %target%.dtx + %pdftex% %texflags% %subclass%.dtx + %pdftex% %texflags% %subclass%.dtx +goto :eof +) + +if "%1"=="install" ( +:install + if not exist %target%.cls ( call :all ) + if not exist "%destdir%" md "%destdir%" + if not exist "%docdir%" md "%docdir%" + xcopy /y /f *.rtx "%destdir%" + xcopy /y /f *.cls "%destdir%" + xcopy /y /f *.dvi "%docdir%" + xcopy /y /f *.pdf "%docdir%" +goto :eof +) + +if "%1"=="help" ( +:help + echo Targets: + echo all - ^(default^) build classes and documentation + echo class - build classes + echo clean - remove ouptut files + echo doc - build documentation + echo dvi - build DVI version of documentation + echo help - show help + echo install - install package and documentation + echo pdf - build PDF version of documentation +goto :eof ) -if %1. neq . (echo Don't know how to make %1 ) +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/Makefile b/Master/texmf-dist/doc/latex/disser/templates/Makefile index 1b821d6dad2..3b8771800b1 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/Makefile @@ -1,4 +1,4 @@ -dvi ps ps_2on1 pdf_2on1 pdf html clean cleansvn srcdist: +dvi ps ps_2on1 pdf pdf_2on1 html clean epstopdf fixbb srcdist: @$(MAKE) -i -C bachelor $@ @$(MAKE) -i -C master $@ @$(MAKE) -i -C candidate $@ 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 8fa1954e017..a66b9129f45 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex @@ -3,7 +3,8 @@ Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$. -Ссылки на литературу~\cite{Efros-1982-FTP16-82-1209,Yoffe-1993-AP-42-173,Kayanuma-1988-PRB-38-9797}. +Ссылки на литературу~\cite{Efros-1982-FTP16-82-1209,% +Yoffe-1993-AP-42-173,Kayanuma-1988-PRB-38-9797,Segall-1968}. Ссылка на формулу~\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_-). @@ -18,7 +19,7 @@ } \end{figure} -\begin{floatingfigure}{0.3\textwidth} +\begin{floatingfigure}{0.35\textwidth} \centering \includegraphics[width=4cm]{fig} \caption{\label{fig:ff}Рисунок <<в оборку>>.} @@ -83,13 +84,18 @@ \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{Рисунки с единым названием и подчинённой нумерацией} +\caption[]{% +Рисунки с единым названием и подчинённой нумерацией: + \subref{fig:sub1} ссылка 1, + \subref{fig:sub2} ссылка 2, + \subref{fig:sub3} ссылка 3. +} \end{figure} \subsection{Название подсекции} Текст подсекции -\subsubsection{Название подподсекции} -Текст подподсекции +\subsubsection{Название под-подсекции} +Текст под-подсекции \paragraph{Название параграфа.} Текст параграфа \subparagraph{Название подпараграфа.} diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile b/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile index c2c5d718b33..4bad2e9be25 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/Makefile @@ -1,3 +1,3 @@ TARGET=thesis -include ../latex.mk
\ No newline at end of file +include ../../include/latex.mk
\ No newline at end of file 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 5ee58751ab0..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 ../../latex.fig.mk
\ No newline at end of file +include ../../../include/latex.fig.mk
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/fig.eps b/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/fig.eps index d3094eb51d3..9aeb4fae0ae 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/fig.eps +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/fig.eps @@ -3,7 +3,7 @@ %%HiResBoundingBox: 236 371.521 360.902 469.38 %%Creator: Adobe Illustrator(TM) 3.2
%%AI8_CreatorVersion: 10.0
-%%For: (STiX0r) (-)
+%%For: (User) (-)
%%Title: (2LevelSys.eps)
%%CreationDate: 12/13/2003 4:07 AM
%%DocumentProcessColors: Black
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 new file mode 100644 index 00000000000..031ac1797cf --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/fig/nomake.cmd @@ -0,0 +1 @@ +@call ..\..\..\include\latex.fig.nmk.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9
\ 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 47506aac7c5..477673612f6 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd @@ -1,166 +1 @@ -@echo off - -set target=thesis - -rem Checking for version of cmd.exe -if %CMDEXTVERSION%/==/ ( - echo Error: This script requieres command interpreter from Windows 2000 or above. - goto :eof -) - -rem Trying to autodetect MiKTeX installation directory -if %texmf%/==/ call :getdir HKCU\Software\MiK\MiKTeX\CurrentVersion\MiKTeX "Install Root" texmf -if %texmf%/==/ call :getdir HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX "Install Root" texmf - -if %texmf%/==/ ( - echo Error: Unable to find MiKTeX installation directory - echo You must set texmf value manually - goto :eof -) - -rem Name of thesis class -set clsname=disser -set clssrc=%texmf%\tex\latex\%clsname% -set clsdir=.\%clsname% - -rem Name of BibTeX style -set bstsrc=%texmf%\bibtex\bst\%clsname% -set bstfile=%clsname%.bst - -rem Cmdline tools -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 -set bibtexflags=-B -c cp1251 - -set epstool=%programfiles%\bin\eps\epstool -set epstopdf=%texmf%\miktex\bin\epstopdf - -set pdftodjvu=pdftodjvu -set pdftodjvuflags=--dpi=600 --threshold-level=80 --fg-quality=conservative --bg-subsample=3 --quality=65 --convert-links --fg-colors=256 --fg-image-colors=256 - -set djvuocr=djvubundle -set djvuocrflags=--ocr=lang=(Russian,English) - -set mktexlsr=%texmf%\miktex\bin\mktexlsr.exe - -set srcfiles=*.* -set clfiles=*.bbl *.bak *.aux *.blg *.out *.toc *.log *.dvi *.tmp *.pdf %target%.%arc% -set suffix=$$ - -if %1/==/ ( -:make - chcp 1251 - %tex% %target%.tex - %bibtex% %bibtexflags% %target% - %tex% %target%.tex - %tex% %texflags% %target%.tex -goto :eof -) -:start -if %1/==/ goto :eof - -if %1/==pdf/ ( -:pdf - 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 - if not exist %clsdir% mkdir %clsdir% - xcopy %clssrc% %clsdir% /S - xcopy %bstsrc%\%bstfile% . /S - call :clean - %arc% %arcflags% %target%.%arc% %srcfiles% - del /s /q %clsdir% - rmdir /s /q %clsdir% - del /q %bstfile% -goto :end -) - -if %1/==clean/ ( -:clean - del /s %clfiles% 2> nul - if exist %target%.rar del %target%.rar -goto :end -) - -if %1/==cleansvn/ ( -:cleansvn - del /s .svn 2>nul -goto :end -) - -rem Fix bounding boxes of EPS files -if %1/==fixbb/ ( -:fixbb - for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n -goto :end -:fix - echo %1 - %epstool% --copy --quiet --bbox %1 %1.%suffix% - move %1.%suffix% %1 -goto :eof -) - -rem Convert EPS to PDF -if %1/==epstopdf/ ( -:epstopdf - for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n - goto :end -:conv - echo %1 - %epstopdf% "%1" -goto :eof -) -rem Installs requiered packages -if %1/==install/ ( -:install - if not exist %clssrc% md %clssrc% - xcopy %clsdir%\ %clssrc%\ /Y - rmdir %clsdir% - if not exist %bstsrc% md %bstsrc% - move %bstfile% %bstsrc% - %mktexlsr% -goto :end -) -rem Start default DVI-viewer -if %1/==preview/ ( -:preview - if not exist %target%.dvi call :make - start %target%.dvi -goto :end -) -rem Convert PDF to DjVu using LizardTech DocumentExpress Enterprise -if %1/==djvu/ ( -:djvu - if not exist %target%.pdf call :pdf - %pdftodjvu% %pdftodjvuflags% %target%.pdf -goto :end -) -rem Create backup -if %1/==backup/ ( -:backup - call :srcdist - for /f "usebackq" %%n in (`date`) do move %target%.rar %%n.rar -goto :end -) - -if %1/ neq / (echo Don't know how to make %1 ) -:end -shift & goto :start - -:getdir - for /f "usebackq tokens=4 skip=2" %%i in (`reg query %1 /v %2`) do set %3=%%i -goto :eof +@call ..\..\include\latex.nmk.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file 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 0b1c94af0dc..933a33c56d2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib @@ -1,24 +1,34 @@ @ARTICLE{Yoffe-1993-AP-42-173, - Author = {A. D. Yoffe}, - Journal = {Adv. Phys.}, - Pages = {173}, - Volume = {42}, - Year = {1993} + Author = {A. D. Yoffe}, + Journal = {Adv. Phys.}, + Pages = {173}, + Volume = {42}, + Year = {1993} +} + +@ARTICLE{Efros-1982-FTP16-82-1209, + Author = {Ал. Л. Эфрос and А. Л. Эфрос}, + Journal = {Физика и техника полупроводников}, + Pages = {1209}, + Volume = {16}, + Year = {1982}, + Language = {russian} } @ARTICLE{Kayanuma-1988-PRB-38-9797, - Author = {Y. Kayanuma}, - Journal = {Phys. Rev. B}, - Pages = {9797}, - Volume = {38}, - Year = {1988} + Author = {Y. Kayanuma}, + Journal = {Phys. Rev. B}, + Pages = {9797}, + Volume = {38}, + Year = {1988} } -@ARTICLE{Efros-1982-FTP16-82-1209, - Author = {Ал. Л. Эфрос and А. Л. Эфрос}, - Journal = {Физика и техника полупроводников}, - Pages = {1209}, - Volume = {16}, - Year = {1982}, - 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}, } 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 3cb15edc17f..34128514a43 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex @@ -1,12 +1,12 @@ \documentclass[14pt,bachelor,href,subf]{disser} \usepackage[ - a4paper, includehead, includefoot, mag=1000, - headsep=0mm, headheight=0mm, - left=20mm, right=10mm, top=20mm, bottom=20mm - ]{geometry} + a4paper, mag=1000, nohead, includefoot, + left=3cm, right=1cm, top=2cm, bottom=2cm, footskip=1cm +]{geometry} \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +\usepackage{srcltx} \graphicspath{{fig/}} % ---------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex index c75825d5723..545adfaafc0 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/1.tex @@ -1,2 +1,3 @@ \chapter{Название главы} \section{Название секции} +\section{Выводы к первой главе}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile b/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile index c2c5d718b33..4bad2e9be25 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/Makefile @@ -1,3 +1,3 @@ TARGET=thesis -include ../latex.mk
\ No newline at end of file +include ../../include/latex.mk
\ No newline at end of file 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 a77cf1a7717..faf90932a20 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex @@ -1,9 +1,12 @@ \documentclass[14pt,autoref,href]{disser} -\usepackage[a4paper, includehead, includefoot, mag=1000, - left=2.5cm, right=2.5cm, top=0.5cm, bottom=2cm]{geometry} +\usepackage[a4paper, nohead, includefoot, mag=1000, + margin=2cm, footskip=1cm]{geometry} \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +\usepackage{tabularx} +% Включение общего текста, использумого в автореферате и диссертации +\input{common} % -------------------------------------------------------------------------- \begin{document} \institution{ @@ -35,59 +38,82 @@ \maketitle \noindent +\begin{center} Работа выполнена в \emph{название организации}. +\end{center} \vskip1cm \noindent -Научный руководитель (консультант): -\emph{ученая степень, ученое звание, фамилия, имя, отчество.} - -\noindent -Официальные оппоненты:\\ -\emph{ученая степень, ученое звание, фамилия, имя, отчество.}\\ -\emph{ученая степень, ученое звание, фамилия, имя, отчество.} - +\begin{tabularx}{\linewidth}{lp{1cm}X} +Научный руководитель: & & \emph{ученая степень}, \\ + & & \emph{ученое звание}, \\ + & & \emph{фамилия, имя, отчество} +\\ +Официальные оппоненты: & & \emph{ученая степень}, \\ + & & \emph{ученое звание}, \\ + & & \emph{фамилия, имя, отчество}\\ + & & \emph{ученая степень}, \\ + & & \emph{ученое звание}, \\ + & & \emph{фамилия, имя, отчество} +\\ +Ведущая организация: & & \emph{название организации}\\ +\end{tabularx} +\vskip3em \noindent -Ведущая организация: -\emph{название организации}\\ -\vskip1cm Защита состоится \datefield{} в \rule[0pt]{1cm}{0.5pt}\, часов на заседании диссертационного совета \emph{шифр совета} при \emph{название организации, при которой создан совет}, расположенном по адресу: \emph{адрес} -\vskip1cm +\vskip1em С диссертацией можно ознакомиться в библиотеке \emph{название организации}. -\vskip1cm -Автореферат разослан \datefield{}\\ +\vskip1em +Автореферат разослан \datefield{} +\vskip1em + Отзывы и замечания по автореферату в двух экземплярах, заверенные печатью, просьба высылать по вышеуказанному адресу на имя ученого секретаря диссертационного совета. -\vskip1cm\noindent +\vfill\noindent Ученый секретарь\\ диссертационного совета,\\ -\emph{ученая степень},\\ -\emph{ученое звание},\hfill \emph{фамилия, имя, отчество} +\emph{ученая степень}, \emph{ученое звание}\hfill \emph{фамилия, имя, отчество} \clearpage \section*{Общая характеристика работы} -\textbf{Актуальность работы} +% Формат заголовков +\let\introsect=\textbf + +% Актуальность работы +\actualitysection +\actualitytext -\textbf{Цель диссертационной работы} +% Цель диссертационной работы +\objectivesection +\objectivetext -\textbf{Научная новизна работы} +% Научная новизна +\noveltysection +\noveltytext -\textbf{Практическая ценность работы} +% Практическая ценность +\valuesection +\valuetext -\textbf{На защиту выносятся следующие основные результаты и положения:} -\begin{enumerate} -\item -\item -\item -\end{enumerate} +% Результаты и положения, выносимые на защиту +\resultssection +\resultstext -\textbf{Апробация работы.} +% Апробация работы +\approbationsection +\approbationtext -\textbf{Публикации.} +% Публикации +\pubsection +\pubtext -\textbf{Личный вклад автора.} +% Личный вклад автора +\contribsection +\contribtext -\textbf{Структура и объем диссертации.} +% Структура и объем диссертации +\structsection +\structtext \section*{Содержание работы} diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex new file mode 100644 index 00000000000..9aebeea6385 --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex @@ -0,0 +1,37 @@ + +\mkintrosect{actuality}{Актуальность работы}{% +Текст раздела +} + +\mkintrosect{objective}{Цель диссертационной работы}{% +Текст раздела +} + +\mkintrosect{novelty}{Научная новизна}{% +Текст раздела +} + +\mkintrosect{value}{Практическая ценность}{% +Текст раздела +} + +\mkintrosect{results}{% +На защиту выносятся следующие основные результаты и положения:}{% +Текст раздела +} + +\mkintrosect{approbation}{Апробация работы}{% +Текст раздела +} + +\mkintrosect{pub}{Публикации}{% +Текст раздела +} + +\mkintrosect{contrib}{Личный вклад автора}{% +Текст раздела +} + +\mkintrosect{struct}{Структура и объем диссертации}{% +Текст раздела +}
\ No newline at end of file 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 5ee58751ab0..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 ../../latex.fig.mk
\ No newline at end of file +include ../../../include/latex.fig.mk
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/fig.eps b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/fig.eps index d3094eb51d3..9aeb4fae0ae 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/fig.eps +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/fig.eps @@ -3,7 +3,7 @@ %%HiResBoundingBox: 236 371.521 360.902 469.38 %%Creator: Adobe Illustrator(TM) 3.2
%%AI8_CreatorVersion: 10.0
-%%For: (STiX0r) (-)
+%%For: (User) (-)
%%Title: (2LevelSys.eps)
%%CreationDate: 12/13/2003 4:07 AM
%%DocumentProcessColors: Black
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 new file mode 100644 index 00000000000..031ac1797cf --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd @@ -0,0 +1 @@ +@call ..\..\..\include\latex.fig.nmk.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex index a13f0a3e001..a8dc6c10340 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/intro.tex @@ -1,24 +1,39 @@ \intro -\paragraph{Актуальность работы.} +\input{common} -\paragraph{Цель диссертационной работы.} +% Актуальность работы +\actualitysection +\actualitytext -\paragraph{Научная новизна.} +% Цель диссертационной работы +\objectivesection +\objectivetext -\paragraph{Практическая ценность.} +% Научная новизна +\noveltysection +\noveltytext -\paragraph{На защиту выносятся следующие основные результаты и положения:} -\begin{enumerate} -\item -\item -\item -\end{enumerate} +% Практическая ценность +\valuesection +\valuetext -\paragraph{Апробация работы.} +% Результаты и положения, выносимые на защиту +\resultssection +\resultstext -\paragraph{Публикации.} +% Апробация работы +\approbationsection +\approbationtext -\paragraph{Личный вклад автора.} +% Публикации +\pubsection +\pubtext -\paragraph{Структура и объем диссертации.}
\ No newline at end of file +% Личный вклад автора +\contribsection +\contribtext + +% Структура и объем диссертации +\structsection +\structtext
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/list.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/list.tex new file mode 100644 index 00000000000..35a90000eae --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/list.tex @@ -0,0 +1 @@ +\chapter*{Список условных обозначений} 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 902f2a22ab2..477673612f6 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd @@ -1,166 +1 @@ -@echo off - -set target=thesis - -rem Checking for version of cmd.exe -if %CMDEXTVERSION%/==/ ( - echo Error: This script requieres command interpreter from Windows 2000 or above. - goto :eof -) - -rem Trying to autodetect MiKTeX installation directory -if %texmf%/==/ call :getdir HKCU\Software\MiK\MiKTeX\CurrentVersion\MiKTeX "Install Root" texmf -if %texmf%/==/ call :getdir HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX "Install Root" texmf - -if %texmf%/==/ ( - echo Error: Unable to find MiKTeX installation directory - echo You must set texmf value manually - goto :eof -) - -rem Name of thesis class -set clsname=disser -set clssrc=%texmf%\tex\latex\%clsname% -set clsdir=.\%clsname% - -rem Name of BibTeX style -set bstsrc=%texmf%\bibtex\bst\%clsname% -set bstfile=%clsname%.bst - -rem Cmdline tools -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 -set bibtexflags=-B -c cp1251 - -set epstool=%programfiles%\bin\eps\epstool -set epstopdf=%texmf%\miktex\bin\epstopdf - -set pdftodjvu=pdftodjvu -set pdftodjvuflags=--dpi=600 --threshold-level=80 --fg-quality=conservative --bg-subsample=3 --quality=65 --convert-links --fg-colors=256 --fg-image-colors=256 - -set djvuocr=djvubundle -set djvuocrflags=--ocr=lang=(Russian,English) - -set mktexlsr=%texmf%\miktex\bin\mktexlsr.exe - -set srcfiles=*.* -set clfiles=*.bbl *.bak *.aux *.blg *.out *.toc *.log *.dvi *.tmp *.pdf %target%.%arc% -set suffix=$$ - -if %1/==/ ( -:make - chcp 1251 - %tex% %target%.tex - %bibtex% %bibtexflags% %target% - %tex% %target%.tex - %tex% %texflags% %target%.tex -goto :eof -) -:start -if %1/==/ goto :eof - -if %1/==pdf/ ( -:pdf - 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 - if not exist %clsdir% mkdir %clsdir% - xcopy %clssrc% %clsdir% /S - xcopy %bstsrc%\%bstfile% . /S - call :clean - %arc% %arcflags% %target%.%arc% %srcfiles% - del /s /q %clsdir% - rmdir /s /q %clsdir% - del /q %bstfile% -goto :end -) - -if %1/==clean/ ( -:clean - del /s %clfiles% 2> nul - if exist %target%.rar del %target%.rar -goto :end -) - -if %1/==cleansvn/ ( -:cleansvn - del /s .svn 2>nul -goto :end -) - -rem Fix bounding boxes of EPS files -if %1/==fixbb/ ( -:fixbb - for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n -goto :end -:fix - echo %1 - %epstool% --copy --quiet --bbox %1 %1.%suffix% - move %1.%suffix% %1 -goto :eof -) - -rem Convert EPS to PDF -if %1/==epstopdf/ ( -:epstopdf - for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n - goto :end -:conv - echo %1 - %epstopdf% "%1" -goto :eof -) -rem Installs requiered packages -if %1/==install/ ( -:install - if not exist %clssrc% md %clssrc% - xcopy %clsdir%\ %clssrc%\ /Y - rmdir %clsdir% - if not exist %bstsrc% md %bstsrc% - move %bstfile% %bstsrc% - %mktexlsr% -goto :end -) -rem Start default DVI-viewer -if %1/==preview/ ( -:preview - if not exist %target%.dvi call :make - start %target%.dvi -goto :end -) -rem Convert PDF to DjVu using LizardTech DocumentExpress Enterprise -if %1/==djvu/ ( -:djvu - if not exist %target%.pdf call :pdf - %pdftodjvu% %pdftodjvuflags% %target%.pdf -goto :end -) -rem Create backup -if %1/==backup/ ( -:backup - call :srcdist - for /f "usebackq" %%n in (`date`) do move %target%.rar %%n.rar -goto :end -) - -echo Don't know how to make %1 -:end -shift & goto :start - -:getdir - for /f "usebackq tokens=4 skip=2" %%i in (`reg query %1 /v %2`) do set %3=%%i -goto :eof +@call ..\..\include\latex.nmk.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file 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 0b1c94af0dc..933a33c56d2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib @@ -1,24 +1,34 @@ @ARTICLE{Yoffe-1993-AP-42-173, - Author = {A. D. Yoffe}, - Journal = {Adv. Phys.}, - Pages = {173}, - Volume = {42}, - Year = {1993} + Author = {A. D. Yoffe}, + Journal = {Adv. Phys.}, + Pages = {173}, + Volume = {42}, + Year = {1993} +} + +@ARTICLE{Efros-1982-FTP16-82-1209, + Author = {Ал. Л. Эфрос and А. Л. Эфрос}, + Journal = {Физика и техника полупроводников}, + Pages = {1209}, + Volume = {16}, + Year = {1982}, + Language = {russian} } @ARTICLE{Kayanuma-1988-PRB-38-9797, - Author = {Y. Kayanuma}, - Journal = {Phys. Rev. B}, - Pages = {9797}, - Volume = {38}, - Year = {1988} + Author = {Y. Kayanuma}, + Journal = {Phys. Rev. B}, + Pages = {9797}, + Volume = {38}, + Year = {1988} } -@ARTICLE{Efros-1982-FTP16-82-1209, - Author = {Ал. Л. Эфрос and А. Л. Эфрос}, - Journal = {Физика и техника полупроводников}, - Pages = {1209}, - Volume = {16}, - Year = {1982}, - 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}, } 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 88d9434ed32..a6e511b7ad3 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex @@ -1,12 +1,12 @@ -\documentclass[14pt,candidate,href]{disser} +\documentclass[a4paper,14pt,candidate,subf,href]{disser} \usepackage[ - a4paper, includehead, includefoot, mag=1000, - headsep=0mm, headheight=0mm, - left=20mm, right=10mm, top=20mm, bottom=20mm - ]{geometry} + a4paper, mag=1000, nohead, includefoot, + left=3cm, right=1cm, top=2cm, bottom=2cm, footskip=1cm +]{geometry} \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +\usepackage{srcltx} \graphicspath{{fig/}} % ---------------------------------------------------------------- @@ -42,15 +42,16 @@ % ---------------------------------------------------------------- \tableofcontents % ---------------------------------------------------------------- +\input{list} \input{intro} \input{review} \input{1} \input{concl} -\appendix -\input{app-a} -\noappendix % ---------------------------------------------------------------- \bibliography{thesis} \bibliographystyle{gost71u} +% ---------------------------------------------------------------- +\appendix +\input{app-a} \end{document} % ---------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile b/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile index c2c5d718b33..4bad2e9be25 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/Makefile @@ -1,3 +1,3 @@ TARGET=thesis -include ../latex.mk
\ No newline at end of file +include ../../include/latex.mk
\ No newline at end of file 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 79d1f279ac8..f9229c51b62 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex @@ -1,9 +1,12 @@ \documentclass[14pt,autoref,href]{disser} -\usepackage[a4paper, includehead, includefoot, mag=1000, - left=2.5cm, right=2.5cm, top=0.5cm, bottom=2cm]{geometry} +\usepackage[a4paper, nohead, includefoot, mag=1000, + margin=2cm, footskip=1cm]{geometry} \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +\usepackage{tabularx} +% Включение общего текста, использумого в автореферате и диссертации +\input{common} % -------------------------------------------------------------------------- \begin{document} \institution{ @@ -22,11 +25,6 @@ % Специальность \specnum{11.11.11} \spec{Специальность} -% -% Научный руководитель -\sa{ФИО руководителя} -% Учёная степень и должность -\sastatus{д.~ф.-м.~н., проф.} % Город и год \city{Санкт-Петербург} @@ -35,55 +33,78 @@ \maketitle \noindent +\begin{center} Работа выполнена в \emph{название организации}. +\end{center} \vskip1cm \noindent -Официальные оппоненты:\\ -\emph{ученая степень, ученое звание, фамилия, имя, отчество.}\\ -\emph{ученая степень, ученое звание, фамилия, имя, отчество.} - +\begin{tabularx}{\linewidth}{lp{1cm}X} +Официальные оппоненты: & & \emph{ученая степень}, \\ + & & \emph{ученое звание}, \\ + & & \emph{фамилия, имя, отчество}\\ + & & \emph{ученая степень}, \\ + & & \emph{ученое звание}, \\ + & & \emph{фамилия, имя, отчество} +\\ +Ведущая организация: & & \emph{название организации}\\ +\end{tabularx} +\vskip3em \noindent -Ведущая организация: -\emph{название организации}\\ -\vskip1cm Защита состоится \datefield{} в \rule[0pt]{1cm}{0.5pt}\, часов на заседании диссертационного совета \emph{шифр совета} при \emph{название организации, при которой создан совет}, расположенном по адресу: \emph{адрес} -\vskip1cm +\vskip1em С диссертацией можно ознакомиться в библиотеке \emph{название организации}. -\vskip1cm -Автореферат разослан \datefield{}\\ +\vskip1em +Автореферат разослан \datefield{} +\vskip1em + Отзывы и замечания по автореферату в двух экземплярах, заверенные печатью, просьба высылать по вышеуказанному адресу на имя ученого секретаря диссертационного совета. -\vskip1cm\noindent +\vfill\noindent Ученый секретарь\\ диссертационного совета,\\ -\emph{ученая степень},\\ -\emph{ученое звание},\hfill \emph{фамилия, имя, отчество} +\emph{ученая степень}, \emph{ученое звание}\hfill \emph{фамилия, имя, отчество} \clearpage \section*{Общая характеристика работы} -\textbf{Актуальность работы} +% Формат заголовков +\let\introsect=\textbf + +% Актуальность работы +\actualitysection +\actualitytext -\textbf{Цель диссертационной работы} +% Цель диссертационной работы +\objectivesection +\objectivetext -\textbf{Научная новизна работы} +% Научная новизна +\noveltysection +\noveltytext -\textbf{Практическая ценность работы} +% Практическая ценность +\valuesection +\valuetext -\textbf{На защиту выносятся следующие основные результаты и положения:} -\begin{enumerate} -\item -\item -\item -\end{enumerate} +% Результаты и положения, выносимые на защиту +\resultssection +\resultstext -\textbf{Апробация работы.} +% Апробация работы +\approbationsection +\approbationtext -\textbf{Публикации.} +% Публикации +\pubsection +\pubtext -\textbf{Личный вклад автора.} +% Личный вклад автора +\contribsection +\contribtext -\textbf{Структура и объем диссертации.} +% Структура и объем диссертации +\structsection +\structtext \section*{Содержание работы} 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 5ee58751ab0..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 ../../latex.fig.mk
\ No newline at end of file +include ../../../include/latex.fig.mk
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/fig.eps b/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/fig.eps index d3094eb51d3..9aeb4fae0ae 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/fig.eps +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/fig.eps @@ -3,7 +3,7 @@ %%HiResBoundingBox: 236 371.521 360.902 469.38 %%Creator: Adobe Illustrator(TM) 3.2
%%AI8_CreatorVersion: 10.0
-%%For: (STiX0r) (-)
+%%For: (User) (-)
%%Title: (2LevelSys.eps)
%%CreationDate: 12/13/2003 4:07 AM
%%DocumentProcessColors: Black
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 new file mode 100644 index 00000000000..031ac1797cf --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/fig/nomake.cmd @@ -0,0 +1 @@ +@call ..\..\..\include\latex.fig.nmk.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9
\ 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 902f2a22ab2..477673612f6 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd @@ -1,166 +1 @@ -@echo off - -set target=thesis - -rem Checking for version of cmd.exe -if %CMDEXTVERSION%/==/ ( - echo Error: This script requieres command interpreter from Windows 2000 or above. - goto :eof -) - -rem Trying to autodetect MiKTeX installation directory -if %texmf%/==/ call :getdir HKCU\Software\MiK\MiKTeX\CurrentVersion\MiKTeX "Install Root" texmf -if %texmf%/==/ call :getdir HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX "Install Root" texmf - -if %texmf%/==/ ( - echo Error: Unable to find MiKTeX installation directory - echo You must set texmf value manually - goto :eof -) - -rem Name of thesis class -set clsname=disser -set clssrc=%texmf%\tex\latex\%clsname% -set clsdir=.\%clsname% - -rem Name of BibTeX style -set bstsrc=%texmf%\bibtex\bst\%clsname% -set bstfile=%clsname%.bst - -rem Cmdline tools -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 -set bibtexflags=-B -c cp1251 - -set epstool=%programfiles%\bin\eps\epstool -set epstopdf=%texmf%\miktex\bin\epstopdf - -set pdftodjvu=pdftodjvu -set pdftodjvuflags=--dpi=600 --threshold-level=80 --fg-quality=conservative --bg-subsample=3 --quality=65 --convert-links --fg-colors=256 --fg-image-colors=256 - -set djvuocr=djvubundle -set djvuocrflags=--ocr=lang=(Russian,English) - -set mktexlsr=%texmf%\miktex\bin\mktexlsr.exe - -set srcfiles=*.* -set clfiles=*.bbl *.bak *.aux *.blg *.out *.toc *.log *.dvi *.tmp *.pdf %target%.%arc% -set suffix=$$ - -if %1/==/ ( -:make - chcp 1251 - %tex% %target%.tex - %bibtex% %bibtexflags% %target% - %tex% %target%.tex - %tex% %texflags% %target%.tex -goto :eof -) -:start -if %1/==/ goto :eof - -if %1/==pdf/ ( -:pdf - 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 - if not exist %clsdir% mkdir %clsdir% - xcopy %clssrc% %clsdir% /S - xcopy %bstsrc%\%bstfile% . /S - call :clean - %arc% %arcflags% %target%.%arc% %srcfiles% - del /s /q %clsdir% - rmdir /s /q %clsdir% - del /q %bstfile% -goto :end -) - -if %1/==clean/ ( -:clean - del /s %clfiles% 2> nul - if exist %target%.rar del %target%.rar -goto :end -) - -if %1/==cleansvn/ ( -:cleansvn - del /s .svn 2>nul -goto :end -) - -rem Fix bounding boxes of EPS files -if %1/==fixbb/ ( -:fixbb - for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n -goto :end -:fix - echo %1 - %epstool% --copy --quiet --bbox %1 %1.%suffix% - move %1.%suffix% %1 -goto :eof -) - -rem Convert EPS to PDF -if %1/==epstopdf/ ( -:epstopdf - for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n - goto :end -:conv - echo %1 - %epstopdf% "%1" -goto :eof -) -rem Installs requiered packages -if %1/==install/ ( -:install - if not exist %clssrc% md %clssrc% - xcopy %clsdir%\ %clssrc%\ /Y - rmdir %clsdir% - if not exist %bstsrc% md %bstsrc% - move %bstfile% %bstsrc% - %mktexlsr% -goto :end -) -rem Start default DVI-viewer -if %1/==preview/ ( -:preview - if not exist %target%.dvi call :make - start %target%.dvi -goto :end -) -rem Convert PDF to DjVu using LizardTech DocumentExpress Enterprise -if %1/==djvu/ ( -:djvu - if not exist %target%.pdf call :pdf - %pdftodjvu% %pdftodjvuflags% %target%.pdf -goto :end -) -rem Create backup -if %1/==backup/ ( -:backup - call :srcdist - for /f "usebackq" %%n in (`date`) do move %target%.rar %%n.rar -goto :end -) - -echo Don't know how to make %1 -:end -shift & goto :start - -:getdir - for /f "usebackq tokens=4 skip=2" %%i in (`reg query %1 /v %2`) do set %3=%%i -goto :eof +@call ..\..\include\latex.nmk.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file 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 0b1c94af0dc..933a33c56d2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib @@ -1,24 +1,34 @@ @ARTICLE{Yoffe-1993-AP-42-173, - Author = {A. D. Yoffe}, - Journal = {Adv. Phys.}, - Pages = {173}, - Volume = {42}, - Year = {1993} + Author = {A. D. Yoffe}, + Journal = {Adv. Phys.}, + Pages = {173}, + Volume = {42}, + Year = {1993} +} + +@ARTICLE{Efros-1982-FTP16-82-1209, + Author = {Ал. Л. Эфрос and А. Л. Эфрос}, + Journal = {Физика и техника полупроводников}, + Pages = {1209}, + Volume = {16}, + Year = {1982}, + Language = {russian} } @ARTICLE{Kayanuma-1988-PRB-38-9797, - Author = {Y. Kayanuma}, - Journal = {Phys. Rev. B}, - Pages = {9797}, - Volume = {38}, - Year = {1988} + Author = {Y. Kayanuma}, + Journal = {Phys. Rev. B}, + Pages = {9797}, + Volume = {38}, + Year = {1988} } -@ARTICLE{Efros-1982-FTP16-82-1209, - Author = {Ал. Л. Эфрос and А. Л. Эфрос}, - Journal = {Физика и техника полупроводников}, - Pages = {1209}, - Volume = {16}, - Year = {1982}, - 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}, } 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 fa5e0519b84..a2d2867cd4d 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex @@ -1,12 +1,12 @@ -\documentclass[14pt,doctor,href]{disser} +\documentclass[a4paper,14pt,doctor,subf,href]{disser} \usepackage[ - a4paper, includehead, includefoot, mag=1000, - headsep=0mm, headheight=0mm, - left=20mm, right=10mm, top=20mm, bottom=20mm - ]{geometry} + a4paper, mag=1000, nohead, includefoot, + left=3cm, right=1cm, top=2cm, bottom=2cm, footskip=1cm +]{geometry} \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +\usepackage{srcltx} \graphicspath{{fig/}} % ---------------------------------------------------------------- @@ -41,11 +41,11 @@ \input{review} \input{1} \input{concl} -\appendix -\input{app-a} -\noappendix % ---------------------------------------------------------------- \bibliography{thesis} \bibliographystyle{gost71u} +% ---------------------------------------------------------------- +\appendix +\input{app-a} \end{document} % ---------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk b/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk deleted file mode 100644 index 123cad7674e..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Makefile for figures -# Author: Stanislav Kruchinin <stas@crypt.org.ru> -# - -all: - @echo "run: make fixbb to fix BoundingBox" - @echo "run: make pdf to convert all figures to PDF" - @echo "run: make clean to clean PDF files" - -fixbb: *.eps - @echo -e "\nFixing BoundingBoxes...\n" - @for f in *.eps ; \ - do \ - echo -n "$$f..." ;\ - epstool --quiet --copy --bbox $$f $$f~ ;\ - mv $$f~ $$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 deleted file mode 100644 index 8c1927f8f11..00000000000 --- a/Master/texmf-dist/doc/latex/disser/templates/latex.mk +++ /dev/null @@ -1,101 +0,0 @@ -# -# Makefile for LaTeX projects -# Author: Stanislav Kruchinin <stas@crypt.org.ru> -# - -TARGET=thesis - -TEX=latex -BIBTEX=bibtex8 -PDFLATEX=pdflatex -L2H=latex2html -FIND=/bin/find - -TEXFLAGS=-src-specials -BIBTEXFLAGS=-B -c cp1251 -L2HFLAGS=-dir html -iso_language RU.RU -split 3 -short_index \ - -numbered_footnotes -no_footnode -white -antialias \ - -html_version 4.0 - -SRC=$(TARGET).tex - -# Files to remove. -CLEANEXT=*.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \ - *.bbl *.blg *.bak *.dvi -CLEANFILES=$(TARGET).pdf $(TARGET).ps $(TARGET)_2on1.ps $(TARGET)_2on1.pdf \ - $(TARGET).tar.bz2 - -# Targets -dvi: $(TARGET).dvi - -ps: $(TARGET).ps - -pdf: $(TARGET).pdf - -html: $(SRC) - $(TEX) $(TARGET).tex - $(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\ - $(TEX) $(TARGET).tex - $(L2H) $(L2HFLAGS) $(TARGET).tex - -ps_2on1: $(TARGET)_2on1.ps - -pdf_2on1: $(TARGET)_2on1.pdf - -help: - @echo "run: make or make dvi or make $(TARGET).dvi" - @echo "run: make ps or make $(TARGET).ps" - @echo "run: make pdf or make $(TARGET).pdf" - @echo "run: make html" - @echo "run: make ps_2on1 or make $(TARGET)_2on1.ps" - @echo "run: make pdf_2on1 or make $(TARGET)_2on1.pdf" - @echo "run: make srcdist to create archive $(TARGET).tar.bz2" - @echo "run: make clean to remove (pdf)TeX ouptut files" - @echo "run: make cleansvn to \"make clean\" and remove .svn directories" - -$(TARGET).dvi: $(SRC) - $(TEX) $(TEXFLAGS) $(TARGET).tex - $(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\ - counter=3 ; \ - while egrep -s 'Rerun (LaTeX|to get)' $(TARGET).log && [ $$counter -gt 0 ] ;\ - do \ - $(TEX) $(TEXFLAGS) $(TARGET).tex ;\ - counter=`expr $$counter - 1` ;\ - done - -$(TARGET).ps: $(TARGET).dvi - dvips -o $(TARGET).ps $(TARGET).dvi - -$(TARGET).pdf: $(SRC) - @$(MAKE) -C fig fixbb pdf - $(PDFLATEX) $(TARGET).tex - $(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\ - counter=3 ; \ - echo "counter=$counter" ; \ - while egrep -s 'Rerun (LaTeX|to get)' $(TARGET).log && [ $$counter -gt 0 ] ;\ - do \ - $(PDFLATEX) $(TARGET).tex ;\ - counter=`expr $$counter - 1` ;\ - done - -$(TARGET)_2on1.ps: $(TARGET).ps - psnup -2 $^ > $@ - -$(TARGET)_2on1.pdf: $(TARGET)_2on1.ps - ps2pdf $^ $@ - -fixbb: fig/*.eps - @$(MAKE) -C fig fixbb - -srcdist: - @$(MAKE) clean - tar cjvf $(TARGET).tar.bz2 . - -clean: - rm -f $(CLEANEXT) $(CLEANFILES) - rm -f html/*\.* - @$(MAKE) -C fig clean - -cleansvn: - @$(MAKE) clean - $(FIND) . -name ".svn" -exec rm -Rf \{\} \; diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/Makefile b/Master/texmf-dist/doc/latex/disser/templates/master/Makefile index c2c5d718b33..4bad2e9be25 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/master/Makefile @@ -1,3 +1,3 @@ TARGET=thesis -include ../latex.mk
\ No newline at end of file +include ../../include/latex.mk
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex b/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex index 32fdb5374ba..a7aba9c235e 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/app-a.tex @@ -1,3 +1 @@ \chapter{Заголовок приложения} - -Текст приложения.
\ No newline at end of file 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 5ee58751ab0..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 ../../latex.fig.mk
\ No newline at end of file +include ../../../include/latex.fig.mk
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/fig/fig.eps b/Master/texmf-dist/doc/latex/disser/templates/master/fig/fig.eps index d3094eb51d3..9aeb4fae0ae 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/fig/fig.eps +++ b/Master/texmf-dist/doc/latex/disser/templates/master/fig/fig.eps @@ -3,7 +3,7 @@ %%HiResBoundingBox: 236 371.521 360.902 469.38 %%Creator: Adobe Illustrator(TM) 3.2
%%AI8_CreatorVersion: 10.0
-%%For: (STiX0r) (-)
+%%For: (User) (-)
%%Title: (2LevelSys.eps)
%%CreationDate: 12/13/2003 4:07 AM
%%DocumentProcessColors: Black
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 new file mode 100644 index 00000000000..031ac1797cf --- /dev/null +++ b/Master/texmf-dist/doc/latex/disser/templates/master/fig/nomake.cmd @@ -0,0 +1 @@ +@call ..\..\..\include\latex.fig.nmk.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9
\ 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 902f2a22ab2..477673612f6 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd @@ -1,166 +1 @@ -@echo off - -set target=thesis - -rem Checking for version of cmd.exe -if %CMDEXTVERSION%/==/ ( - echo Error: This script requieres command interpreter from Windows 2000 or above. - goto :eof -) - -rem Trying to autodetect MiKTeX installation directory -if %texmf%/==/ call :getdir HKCU\Software\MiK\MiKTeX\CurrentVersion\MiKTeX "Install Root" texmf -if %texmf%/==/ call :getdir HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX "Install Root" texmf - -if %texmf%/==/ ( - echo Error: Unable to find MiKTeX installation directory - echo You must set texmf value manually - goto :eof -) - -rem Name of thesis class -set clsname=disser -set clssrc=%texmf%\tex\latex\%clsname% -set clsdir=.\%clsname% - -rem Name of BibTeX style -set bstsrc=%texmf%\bibtex\bst\%clsname% -set bstfile=%clsname%.bst - -rem Cmdline tools -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 -set bibtexflags=-B -c cp1251 - -set epstool=%programfiles%\bin\eps\epstool -set epstopdf=%texmf%\miktex\bin\epstopdf - -set pdftodjvu=pdftodjvu -set pdftodjvuflags=--dpi=600 --threshold-level=80 --fg-quality=conservative --bg-subsample=3 --quality=65 --convert-links --fg-colors=256 --fg-image-colors=256 - -set djvuocr=djvubundle -set djvuocrflags=--ocr=lang=(Russian,English) - -set mktexlsr=%texmf%\miktex\bin\mktexlsr.exe - -set srcfiles=*.* -set clfiles=*.bbl *.bak *.aux *.blg *.out *.toc *.log *.dvi *.tmp *.pdf %target%.%arc% -set suffix=$$ - -if %1/==/ ( -:make - chcp 1251 - %tex% %target%.tex - %bibtex% %bibtexflags% %target% - %tex% %target%.tex - %tex% %texflags% %target%.tex -goto :eof -) -:start -if %1/==/ goto :eof - -if %1/==pdf/ ( -:pdf - 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 - if not exist %clsdir% mkdir %clsdir% - xcopy %clssrc% %clsdir% /S - xcopy %bstsrc%\%bstfile% . /S - call :clean - %arc% %arcflags% %target%.%arc% %srcfiles% - del /s /q %clsdir% - rmdir /s /q %clsdir% - del /q %bstfile% -goto :end -) - -if %1/==clean/ ( -:clean - del /s %clfiles% 2> nul - if exist %target%.rar del %target%.rar -goto :end -) - -if %1/==cleansvn/ ( -:cleansvn - del /s .svn 2>nul -goto :end -) - -rem Fix bounding boxes of EPS files -if %1/==fixbb/ ( -:fixbb - for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n -goto :end -:fix - echo %1 - %epstool% --copy --quiet --bbox %1 %1.%suffix% - move %1.%suffix% %1 -goto :eof -) - -rem Convert EPS to PDF -if %1/==epstopdf/ ( -:epstopdf - for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n - goto :end -:conv - echo %1 - %epstopdf% "%1" -goto :eof -) -rem Installs requiered packages -if %1/==install/ ( -:install - if not exist %clssrc% md %clssrc% - xcopy %clsdir%\ %clssrc%\ /Y - rmdir %clsdir% - if not exist %bstsrc% md %bstsrc% - move %bstfile% %bstsrc% - %mktexlsr% -goto :end -) -rem Start default DVI-viewer -if %1/==preview/ ( -:preview - if not exist %target%.dvi call :make - start %target%.dvi -goto :end -) -rem Convert PDF to DjVu using LizardTech DocumentExpress Enterprise -if %1/==djvu/ ( -:djvu - if not exist %target%.pdf call :pdf - %pdftodjvu% %pdftodjvuflags% %target%.pdf -goto :end -) -rem Create backup -if %1/==backup/ ( -:backup - call :srcdist - for /f "usebackq" %%n in (`date`) do move %target%.rar %%n.rar -goto :end -) - -echo Don't know how to make %1 -:end -shift & goto :start - -:getdir - for /f "usebackq tokens=4 skip=2" %%i in (`reg query %1 /v %2`) do set %3=%%i -goto :eof +@call ..\..\include\latex.nmk.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file 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 0b1c94af0dc..933a33c56d2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib @@ -1,24 +1,34 @@ @ARTICLE{Yoffe-1993-AP-42-173, - Author = {A. D. Yoffe}, - Journal = {Adv. Phys.}, - Pages = {173}, - Volume = {42}, - Year = {1993} + Author = {A. D. Yoffe}, + Journal = {Adv. Phys.}, + Pages = {173}, + Volume = {42}, + Year = {1993} +} + +@ARTICLE{Efros-1982-FTP16-82-1209, + Author = {Ал. Л. Эфрос and А. Л. Эфрос}, + Journal = {Физика и техника полупроводников}, + Pages = {1209}, + Volume = {16}, + Year = {1982}, + Language = {russian} } @ARTICLE{Kayanuma-1988-PRB-38-9797, - Author = {Y. Kayanuma}, - Journal = {Phys. Rev. B}, - Pages = {9797}, - Volume = {38}, - Year = {1988} + Author = {Y. Kayanuma}, + Journal = {Phys. Rev. B}, + Pages = {9797}, + Volume = {38}, + Year = {1988} } -@ARTICLE{Efros-1982-FTP16-82-1209, - Author = {Ал. Л. Эфрос and А. Л. Эфрос}, - Journal = {Физика и техника полупроводников}, - Pages = {1209}, - Volume = {16}, - Year = {1982}, - 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}, } 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 9680b946d8f..236b0c5b39f 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex @@ -1,12 +1,12 @@ -\documentclass[14pt,master,href,subf]{disser} +\documentclass[a4paper,14pt,master,href,subf]{disser} \usepackage[ - a4paper, includehead, includefoot, mag=1000, - headsep=0mm, headheight=0mm, - left=20mm, right=10mm, top=20mm, bottom=20mm - ]{geometry} + a4paper, mag=1000, nohead, includefoot, + left=3cm, right=1cm, top=2cm, bottom=2cm, footskip=1cm +]{geometry} \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} +\usepackage{srcltx} \graphicspath{{fig/}} % -------------------------------------------------------------------------- @@ -46,10 +46,6 @@ \date{\number\year} \maketitle -%---------------------------------------------------------------------------- -\begin{abstract} - -\end{abstract} %--------------------------------------------------------------------------- \tableofcontents %--------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd index ac159d29bc2..b183654f156 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd @@ -1,4 +1,18 @@ @echo off -set subdirs=bachelor ..\master ..\candidate ..\doctor -for %%i in (%subdirs%) do cd %%i & nomake %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file +rem nomake script for LaTeX projects +rem Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com> + +if "%CMDEXTVERSION%"=="" ( + echo Error: This script requires command interpreter from Windows 2000 or above. + goto :eof +) + +if "%1"=="help" ( + set subdirs=bachelor +) else ( + set subdirs=bachelor ..\master ..\candidate ..\doctor +) + +for %%i in (%subdirs%) do @cd %%i & nomake %1 %2 %3 %4 %5 %6 %7 %8 %9 + |