diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex/disser/templates')
13 files changed, 116 insertions, 88 deletions
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex index 86f80000056..8fa1954e017 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex @@ -3,30 +3,30 @@ Внутритекстовая формула $\frac{1}{\epsilon^*}=\frac{1}{\epsilon_\infty}-\frac{1}{\epsilon_0}$. Внутритекстовая формула в стиле выделенной $\dfrac{1}{\epsilon_\infty}$. -Ссылки на литературу~\cite{Efros-FTP16-82-1209,Yoffe-AP42-93-173,Kayanuma-PRB38-88-9797}. +Ссылки на литературу~\cite{Efros-1982-FTP16-82-1209,Yoffe-1993-AP-42-173,Kayanuma-1988-PRB-38-9797}. Ссылка на формулу~\eqref{eq:e} \begin{equation}\label{eq:e} \vec P=\sqrt{\frac{N_0 m_r \Omega_{LO}}{4\pi\epsilon^*}}(\vec u_+ - \vec u_-). \end{equation} Ссылка на рис.~\ref{fig:f} -\begin{figure}[h] +\begin{figure}[!ht] \centering -\includegraphics{fig} +\includegraphics[width=4cm]{fig} \caption{\label{fig:f}% Подпись к рисунку. } \end{figure} -\begin{floatingfigure}{0.4\textwidth} +\begin{floatingfigure}{0.3\textwidth} \centering - \includegraphics{fig} + \includegraphics[width=4cm]{fig} \caption{\label{fig:ff}Рисунок <<в оборку>>.} \end{floatingfigure} -Если разность энергий электронно-дыроч\-ных уровней $E_2-E_1$ близка к энергии предельного оптического фонона $\hbar\Omega_{LO}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$. Волновые функции последних представляют собой следующие комбинации почти вырожденных состояний. +Если разность энергий электронно-дырочных уровней $E_2-E_1$ близка к энергии предельного оптического фонона $\hbar\Omega_{LO}$, то в разложении волновых функций полного гамильтониана можно ограничиться нулевым приближением для всех состояний, за исключением близких по значению к $E_2$. Волновые функции последних представляют собой следующие комбинации почти вырожденных состояний. Ссылка на таблицу~\ref{tab:t1}. -\begin{table}[h] +\begin{table}[!ht] \centering \caption{Пример таблицы}\label{tab:t1} \vskip1.em @@ -41,18 +41,51 @@ \end{tabular} \end{table} -\begin{figure}[h] +\begin{figure}[!ht] \centering - \subfigure[]{\includegraphics{fig}\label{fig:sub1}}\quad - \subfigure[]{\includegraphics{fig}\label{fig:sub2}}\quad - \subfigure[]{\includegraphics{fig}\label{fig:sub3}} - \caption{Подчиненная нумерация рисунков: - \subref{fig:sub1} ссылка 1, - \subref{fig:sub2} ссылка 2, - \subref{fig:sub3} ссылка 3. - } + \begin{minipage}{5cm} + \centering + \includegraphics[width=4cm]{fig} + \caption{Рисунок с отдельным названием} + \end{minipage} + \quad + \begin{minipage}{5cm} + \centering + \includegraphics[width=4cm]{fig} + \caption{Рисунок с отдельным названием} + \end{minipage} + \quad + \begin{minipage}{5cm} + \centering + \includegraphics[width=4cm]{fig} + \caption{Рисунок с отдельным названием} + \end{minipage} \end{figure} + +\begin{figure}[!ht] +\centering + \begin{minipage}{5cm} + \centering + \includegraphics[width=4cm]{fig} + \end{minipage} + \quad + \begin{minipage}{5cm} + \centering + \includegraphics[width=4cm]{fig} + \end{minipage} + \caption{Рисунки с единым названием} +\end{figure} + Ссылка на внутренний рисунок (рис.~\ref{fig:sub1}) + +\begin{figure}[!ht] +\centering + \subfloat[][]{\label{fig:sub1}\includegraphics[width=4cm]{fig}}\quad + \subfloat[][]{\label{fig:sub2}\includegraphics[width=4cm]{fig}}\quad + \subfloat[][]{\label{fig:sub3}\includegraphics[width=4cm]{fig}} +\caption{Рисунки с единым названием и подчинённой нумерацией} +\end{figure} + \subsection{Название подсекции} Текст подсекции \subsubsection{Название подподсекции} diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd index 8ed500ecaa6..47506aac7c5 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/nomake.cmd @@ -32,6 +32,7 @@ set arc=rar set arcflags=a -r -x%target%.pdf -x%target%.prj set tex=%texmf%\miktex\bin\latex +set pdftex=%texmf%\miktex\bin\pdflatex set texflags=-src-specials set bibtex=%texmf%\miktex\bin\bibtex8 @@ -54,6 +55,7 @@ set suffix=$$ if %1/==/ ( :make + chcp 1251 %tex% %target%.tex %bibtex% %bibtexflags% %target% %tex% %target%.tex @@ -65,13 +67,17 @@ if %1/==/ goto :eof if %1/==pdf/ ( :pdf - set tex=pdflatex - call :make + chcp 1251 + %pdftex% %target%.tex + %bibtex% %bibtexflags% %target% + %pdftex% %target%.tex + %pdftex% %texflags% %target%.tex +goto :eof ) +rem Make source distribution if %1/==srcdist/ ( :srcdist - echo Making source distribution... if not exist %clsdir% mkdir %clsdir% xcopy %clssrc% %clsdir% /S xcopy %bstsrc%\%bstfile% . /S @@ -96,9 +102,9 @@ if %1/==cleansvn/ ( goto :end ) +rem Fix bounding boxes of EPS files if %1/==fixbb/ ( :fixbb - echo Fixing bounding boxes of EPS files... for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n goto :end :fix @@ -108,9 +114,9 @@ goto :end goto :eof ) +rem Convert EPS to PDF if %1/==epstopdf/ ( :epstopdf - echo Converting EPS to PDF... for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n goto :end :conv @@ -143,13 +149,6 @@ if %1/==djvu/ ( %pdftodjvu% %pdftodjvuflags% %target%.pdf goto :end ) -rem Create OCRed DjVu file -if %1/==ocr/ ( -:ocr - if not exist %target%.djvu call :djvu - %djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu -goto :end -) rem Create backup if %1/==backup/ ( :backup @@ -158,6 +157,7 @@ if %1/==backup/ ( goto :end ) +if %1/ neq / (echo Don't know how to make %1 ) :end shift & goto :start diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib index a85ee17ba6f..0b1c94af0dc 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib @@ -1,4 +1,4 @@ -@ARTICLE{Yoffe-AP42-93-173, +@ARTICLE{Yoffe-1993-AP-42-173, Author = {A. D. Yoffe}, Journal = {Adv. Phys.}, Pages = {173}, @@ -6,7 +6,7 @@ Year = {1993} } -@ARTICLE{Kayanuma-PRB38-88-9797, +@ARTICLE{Kayanuma-1988-PRB-38-9797, Author = {Y. Kayanuma}, Journal = {Phys. Rev. B}, Pages = {9797}, @@ -14,7 +14,7 @@ Year = {1988} } -@ARTICLE{Efros-FTP16-82-1209, +@ARTICLE{Efros-1982-FTP16-82-1209, Author = {Ал. Л. Эфрос and А. Л. Эфрос}, Journal = {Физика и техника полупроводников}, Pages = {1209}, diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex index d275587edb5..3cb15edc17f 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex @@ -50,6 +50,6 @@ \input{concl} % ---------------------------------------------------------------- \bibliography{thesis} -\bibliographystyle{disser} +\bibliographystyle{gost71u} \end{document} % ---------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd index 8ed500ecaa6..902f2a22ab2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd @@ -32,6 +32,7 @@ set arc=rar set arcflags=a -r -x%target%.pdf -x%target%.prj set tex=%texmf%\miktex\bin\latex +set pdftex=%texmf%\miktex\bin\pdflatex set texflags=-src-specials set bibtex=%texmf%\miktex\bin\bibtex8 @@ -54,6 +55,7 @@ set suffix=$$ if %1/==/ ( :make + chcp 1251 %tex% %target%.tex %bibtex% %bibtexflags% %target% %tex% %target%.tex @@ -65,13 +67,17 @@ if %1/==/ goto :eof if %1/==pdf/ ( :pdf - set tex=pdflatex - call :make + chcp 1251 + %pdftex% %target%.tex + %bibtex% %bibtexflags% %target% + %pdftex% %target%.tex + %pdftex% %texflags% %target%.tex +goto :eof ) +rem Make source distribution if %1/==srcdist/ ( :srcdist - echo Making source distribution... if not exist %clsdir% mkdir %clsdir% xcopy %clssrc% %clsdir% /S xcopy %bstsrc%\%bstfile% . /S @@ -96,9 +102,9 @@ if %1/==cleansvn/ ( goto :end ) +rem Fix bounding boxes of EPS files if %1/==fixbb/ ( :fixbb - echo Fixing bounding boxes of EPS files... for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n goto :end :fix @@ -108,9 +114,9 @@ goto :end goto :eof ) +rem Convert EPS to PDF if %1/==epstopdf/ ( :epstopdf - echo Converting EPS to PDF... for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n goto :end :conv @@ -143,13 +149,6 @@ if %1/==djvu/ ( %pdftodjvu% %pdftodjvuflags% %target%.pdf goto :end ) -rem Create OCRed DjVu file -if %1/==ocr/ ( -:ocr - if not exist %target%.djvu call :djvu - %djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu -goto :end -) rem Create backup if %1/==backup/ ( :backup @@ -158,6 +157,7 @@ if %1/==backup/ ( goto :end ) +echo Don't know how to make %1 :end shift & goto :start diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib index a85ee17ba6f..0b1c94af0dc 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib @@ -1,4 +1,4 @@ -@ARTICLE{Yoffe-AP42-93-173, +@ARTICLE{Yoffe-1993-AP-42-173, Author = {A. D. Yoffe}, Journal = {Adv. Phys.}, Pages = {173}, @@ -6,7 +6,7 @@ Year = {1993} } -@ARTICLE{Kayanuma-PRB38-88-9797, +@ARTICLE{Kayanuma-1988-PRB-38-9797, Author = {Y. Kayanuma}, Journal = {Phys. Rev. B}, Pages = {9797}, @@ -14,7 +14,7 @@ Year = {1988} } -@ARTICLE{Efros-FTP16-82-1209, +@ARTICLE{Efros-1982-FTP16-82-1209, Author = {Ал. Л. Эфрос and А. Л. Эфрос}, Journal = {Физика и техника полупроводников}, Pages = {1209}, diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd index 8ed500ecaa6..902f2a22ab2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd @@ -32,6 +32,7 @@ set arc=rar set arcflags=a -r -x%target%.pdf -x%target%.prj set tex=%texmf%\miktex\bin\latex +set pdftex=%texmf%\miktex\bin\pdflatex set texflags=-src-specials set bibtex=%texmf%\miktex\bin\bibtex8 @@ -54,6 +55,7 @@ set suffix=$$ if %1/==/ ( :make + chcp 1251 %tex% %target%.tex %bibtex% %bibtexflags% %target% %tex% %target%.tex @@ -65,13 +67,17 @@ if %1/==/ goto :eof if %1/==pdf/ ( :pdf - set tex=pdflatex - call :make + chcp 1251 + %pdftex% %target%.tex + %bibtex% %bibtexflags% %target% + %pdftex% %target%.tex + %pdftex% %texflags% %target%.tex +goto :eof ) +rem Make source distribution if %1/==srcdist/ ( :srcdist - echo Making source distribution... if not exist %clsdir% mkdir %clsdir% xcopy %clssrc% %clsdir% /S xcopy %bstsrc%\%bstfile% . /S @@ -96,9 +102,9 @@ if %1/==cleansvn/ ( goto :end ) +rem Fix bounding boxes of EPS files if %1/==fixbb/ ( :fixbb - echo Fixing bounding boxes of EPS files... for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n goto :end :fix @@ -108,9 +114,9 @@ goto :end goto :eof ) +rem Convert EPS to PDF if %1/==epstopdf/ ( :epstopdf - echo Converting EPS to PDF... for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n goto :end :conv @@ -143,13 +149,6 @@ if %1/==djvu/ ( %pdftodjvu% %pdftodjvuflags% %target%.pdf goto :end ) -rem Create OCRed DjVu file -if %1/==ocr/ ( -:ocr - if not exist %target%.djvu call :djvu - %djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu -goto :end -) rem Create backup if %1/==backup/ ( :backup @@ -158,6 +157,7 @@ if %1/==backup/ ( goto :end ) +echo Don't know how to make %1 :end shift & goto :start diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib index a85ee17ba6f..0b1c94af0dc 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib @@ -1,4 +1,4 @@ -@ARTICLE{Yoffe-AP42-93-173, +@ARTICLE{Yoffe-1993-AP-42-173, Author = {A. D. Yoffe}, Journal = {Adv. Phys.}, Pages = {173}, @@ -6,7 +6,7 @@ Year = {1993} } -@ARTICLE{Kayanuma-PRB38-88-9797, +@ARTICLE{Kayanuma-1988-PRB-38-9797, Author = {Y. Kayanuma}, Journal = {Phys. Rev. B}, Pages = {9797}, @@ -14,7 +14,7 @@ Year = {1988} } -@ARTICLE{Efros-FTP16-82-1209, +@ARTICLE{Efros-1982-FTP16-82-1209, Author = {Ал. Л. Эфрос and А. Л. Эфрос}, Journal = {Физика и техника полупроводников}, Pages = {1209}, diff --git a/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk b/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk index a3e37c98505..123cad7674e 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk +++ b/Master/texmf-dist/doc/latex/disser/templates/latex.fig.mk @@ -18,14 +18,10 @@ fixbb: *.eps echo "OK" ;\ done -pdf: *.eps - @echo -e "\nConverting figures to PDF...\n" - @for f in *.eps ; \ - do \ - echo -n "$$f..." ;\ - epstopdf $$f ;\ - echo "OK" ;\ - done +pdf: $(patsubst %.eps, %.pdf, $(wildcard *.eps)) + +%.pdf: %.eps + epstopdf "$<" clean: rm -f *.pdf diff --git a/Master/texmf-dist/doc/latex/disser/templates/latex.mk b/Master/texmf-dist/doc/latex/disser/templates/latex.mk index 1add498387b..8c1927f8f11 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/latex.mk +++ b/Master/texmf-dist/doc/latex/disser/templates/latex.mk @@ -56,7 +56,6 @@ help: $(TARGET).dvi: $(SRC) $(TEX) $(TEXFLAGS) $(TARGET).tex $(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\ - $(TEX) $(TEXFLAGS) $(TARGET).tex counter=3 ; \ while egrep -s 'Rerun (LaTeX|to get)' $(TARGET).log && [ $$counter -gt 0 ] ;\ do \ @@ -71,8 +70,8 @@ $(TARGET).pdf: $(SRC) @$(MAKE) -C fig fixbb pdf $(PDFLATEX) $(TARGET).tex $(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\ - $(PDFLATEX) $(TARGET).tex counter=3 ; \ + echo "counter=$counter" ; \ while egrep -s 'Rerun (LaTeX|to get)' $(TARGET).log && [ $$counter -gt 0 ] ;\ do \ $(PDFLATEX) $(TARGET).tex ;\ diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd index 8ed500ecaa6..902f2a22ab2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/master/nomake.cmd @@ -32,6 +32,7 @@ set arc=rar set arcflags=a -r -x%target%.pdf -x%target%.prj set tex=%texmf%\miktex\bin\latex +set pdftex=%texmf%\miktex\bin\pdflatex set texflags=-src-specials set bibtex=%texmf%\miktex\bin\bibtex8 @@ -54,6 +55,7 @@ set suffix=$$ if %1/==/ ( :make + chcp 1251 %tex% %target%.tex %bibtex% %bibtexflags% %target% %tex% %target%.tex @@ -65,13 +67,17 @@ if %1/==/ goto :eof if %1/==pdf/ ( :pdf - set tex=pdflatex - call :make + chcp 1251 + %pdftex% %target%.tex + %bibtex% %bibtexflags% %target% + %pdftex% %target%.tex + %pdftex% %texflags% %target%.tex +goto :eof ) +rem Make source distribution if %1/==srcdist/ ( :srcdist - echo Making source distribution... if not exist %clsdir% mkdir %clsdir% xcopy %clssrc% %clsdir% /S xcopy %bstsrc%\%bstfile% . /S @@ -96,9 +102,9 @@ if %1/==cleansvn/ ( goto :end ) +rem Fix bounding boxes of EPS files if %1/==fixbb/ ( :fixbb - echo Fixing bounding boxes of EPS files... for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n goto :end :fix @@ -108,9 +114,9 @@ goto :end goto :eof ) +rem Convert EPS to PDF if %1/==epstopdf/ ( :epstopdf - echo Converting EPS to PDF... for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n goto :end :conv @@ -143,13 +149,6 @@ if %1/==djvu/ ( %pdftodjvu% %pdftodjvuflags% %target%.pdf goto :end ) -rem Create OCRed DjVu file -if %1/==ocr/ ( -:ocr - if not exist %target%.djvu call :djvu - %djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu -goto :end -) rem Create backup if %1/==backup/ ( :backup @@ -158,6 +157,7 @@ if %1/==backup/ ( goto :end ) +echo Don't know how to make %1 :end shift & goto :start diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib index a85ee17ba6f..0b1c94af0dc 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib +++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib @@ -1,4 +1,4 @@ -@ARTICLE{Yoffe-AP42-93-173, +@ARTICLE{Yoffe-1993-AP-42-173, Author = {A. D. Yoffe}, Journal = {Adv. Phys.}, Pages = {173}, @@ -6,7 +6,7 @@ Year = {1993} } -@ARTICLE{Kayanuma-PRB38-88-9797, +@ARTICLE{Kayanuma-1988-PRB-38-9797, Author = {Y. Kayanuma}, Journal = {Phys. Rev. B}, Pages = {9797}, @@ -14,7 +14,7 @@ Year = {1988} } -@ARTICLE{Efros-FTP16-82-1209, +@ARTICLE{Efros-1982-FTP16-82-1209, Author = {Ал. Л. Эфрос and А. Л. Эфрос}, Journal = {Физика и техника полупроводников}, Pages = {1209}, diff --git a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd index 64de24ccfb2..ac159d29bc2 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/nomake.cmd @@ -1,4 +1,4 @@ @echo off set subdirs=bachelor ..\master ..\candidate ..\doctor -for %%i in (%subdirs%) do cd %%i & nomake %1
\ No newline at end of file +for %%i in (%subdirs%) do cd %%i & nomake %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file |