diff options
author | Karl Berry <karl@freefriends.org> | 2009-06-24 16:35:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-06-24 16:35:13 +0000 |
commit | d73a503687f31a927aea191ec9ed3cf1c950fd8f (patch) | |
tree | 7dc5b70b51a539ac785341bad4387d836bb371c2 /Master/texmf-dist/doc/latex/disser/templates/candidate | |
parent | 3c2360d0385b88c9a20bd20ac33c71d9cec07294 (diff) |
disser update (23jun09)
git-svn-id: svn://tug.org/texlive/trunk@13941 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/disser/templates/candidate')
5 files changed, 19 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex index 8c16534241b..64ce78d61a5 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex @@ -1,15 +1,15 @@ -\documentclass[14pt,autoref,href +\documentclass[14pt,autoref,href,facsimile %,fixint=false -,facsimile +%,times ]{disser} -\usepackage[a4paper, nohead, includefoot, mag=1000, - margin=2cm, footskip=1cm]{geometry} +\usepackage[a4paper,nohead,includefoot,mag=1000, + margin=2cm,footskip=1cm]{geometry} \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} \usepackage{tabularx} -\usepackage{epstopdf} +\ifpdf\usepackage{epstopdf}\fi % Поддержка нескольких списков литературы в одном документе \usepackage{multibib} @@ -20,13 +20,11 @@ % Путь к файлам с иллюстрациями \graphicspath{{fig/}} +\begin{document} % Включение файла с общим текстом диссертации и автореферата % (текст титульного листа и характеристика работы). \input{common} -% -------------------------------------------------------------------------- -\begin{document} -% Внешняя сторона обложки \title{АВТОРЕФЕРАТ\\ диссертации на соискание ученой степени\\ кандидата физико-математических наук} diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/Makefile b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/Makefile index c853e59f80b..775b7fc3d88 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/Makefile +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/Makefile @@ -1 +1 @@ -include ../../../include/latex.fig.mk +include ../../../include/latex.fig.mk
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd index 7d62dafdb27..d5b89784882 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/fig/nomake.cmd @@ -1 +1 @@ -@call ..\..\..\include\latex.fig.nmk.cmd %* +@call ..\..\..\include\latex.fig.nmk.cmd %*
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd index c6ed3f12107..542e4e15259 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/nomake.cmd @@ -1,28 +1,25 @@ @echo off +set latexnmk=call ..\..\include\latex.nmk.cmd + if "%1"=="help" ( :help - call ..\..\include\latex.nmk.cmd %1 + %latexnmk% %1 echo all build DVI of autoref and thesis echo allpdf build PDF of autoref and thesis goto :eof ) else if "%1"=="all" ( :all - set target=thesis & call ..\..\include\latex.nmk.cmd dvi - set target=autoref & call ..\..\include\latex.nmk.cmd dvi + set target=thesis & %latexnmk% dvi + set target=autoref & %latexnmk% dvi set target= goto :eof ) else if "%1"=="allpdf" ( :allpdf - set target=thesis & call ..\..\include\latex.nmk.cmd pdf - set target=autoref & call ..\..\include\latex.nmk.cmd pdf + set target=thesis & %latexnmk% pdf + set target=autoref & %latexnmk% pdf set target= goto :eof ) else ( - call ..\..\include\latex.nmk.cmd %* - goto :eof + %latexnmk% %* ) - -if "%1" neq "" echo Don't know how to make %1 -:end -shift & goto :start diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex index 1a8fb00efb0..6e125186c98 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex @@ -11,7 +11,7 @@ \usepackage[T2A]{fontenc} \usepackage[cp1251]{inputenc} \usepackage[english,russian]{babel} -\usepackage{epstopdf} +\ifpdf\usepackage{epstopdf}\fi % Номера страниц сверху и по центру %\def\headfont{\small} @@ -24,11 +24,10 @@ % Путь к файлам с иллюстрациями \graphicspath{{fig/}} +\begin{document} % Включение файла с общим текстом диссертации и автореферата % (текст титульного листа и характеристика работы). -\input common -% ---------------------------------------------------------------- -\begin{document} +\input{common} \title{ДИССЕРТАЦИЯ\\ на соискание ученой степени\\ @@ -49,4 +48,3 @@ \appendix \input{app-a} \end{document} -% ---------------------------------------------------------------- |