Unverified Commit cacb1061 authored by Azat Abdullin's avatar Azat Abdullin Committed by GitHub
Browse files

Merge pull request #2 from AbdullinAM/master

Новые изменения от Новопашенного
parents 6005b146 127a2529
......@@ -165,28 +165,27 @@
\CYRR\CYRE\CYRF\CYRE\CYRR\CYRA\CYRT
}
\newcommand\csseabstractnameen{%
ABSTRACT%
THE ABSTRACT%
}
\newcommand\stats@report{%
\CYRO\cyrt\cyrch\cyre\cyrt%
\CYRN\cyra%
}
\newcommand\stats@report@en{%
Report%
}
\newcommand\stats@page{%
\cyrs\cyrt\cyrr.%
\cyrs.%
}
\newcommand\stats@page@en{%
pages%
}
\newcommand\stats@fig{%
\cyrr\cyri\cyrs.%
\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyro\cyrv%
}
\newcommand\stats@fig@en{%
figures%
pictures%
}
\newcommand\stats@table{%
\cyrt\cyra\cyrb\cyrl.%
\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyr\char251%
}
\newcommand\stats@table@en{%
tables%
......@@ -198,15 +197,15 @@
references%
}
\newcommand\stats@appendix{%
\cyrp\cyrr\cyri\cyrl.%
\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrishrt%
}
\newcommand\stats@appendix@en{%
appendicies%
}
\newcommand\@stats[5]{%
\newcommand\@stats[4]{%
\stats@report%
\IfEq{#1}{0}{}{%
, #1~\stats@page%
~#1~\stats@page%
}%
\IfEq{#2}{0}{}{%
, #2~\stats@fig%
......@@ -214,17 +213,17 @@
\IfEq{#3}{0}{}{%
, #3~\stats@table%
}%
% \IfEq{#4}{0}{}{%
% , #4~\stats@cite%
% }%
\IfEq{#4}{0}{}{%
, #4~\stats@cite%
}%
\IfEq{#5}{0}{}{%
, #5~\stats@appendix%
, #4~\stats@appendix%
}%
}
\newcommand\@stats@en[5]{%
\newcommand\@stats@en[4]{%
\stats@report@en%
\IfEq{#1}{0}{}{%
, #1~\stats@page@en%
#1~\stats@page@en%
}%
\IfEq{#2}{0}{}{%
, #2~\stats@fig@en%
......@@ -232,11 +231,11 @@
\IfEq{#3}{0}{}{%
, #3~\stats@table@en%
}%
% \IfEq{#4}{0}{}{%
% , #4~\stats@cite@en%
% }%
\IfEq{#4}{0}{}{%
, #4~\stats@cite@en%
}%
\IfEq{#5}{0}{}{%
, #5~\stats@appendix@en%
, #4~\stats@appendix@en%
}%
}
......@@ -268,19 +267,19 @@
}\keywordsen{}
\newcommand\@makeabstract[4]{%
\clearpage%
\thispagestyle{empty}%
%\clearpage%
%\thispagestyle{empty}%
%
\@makeschapterhead{#1}%
\@afterheading%
%
\begin{center}%
#2%
\end{center}%
\begin{flushleft}%
~~~~~ #2%
\end{flushleft}%
%
\begin{center}%
\begin{flushleft}%
\MakeUppercase{#3}%
\end{center}
\end{flushleft}
%
{%
\hskip\parindent%
......@@ -295,7 +294,6 @@
\@pagecount}{%
\@figcount}{%
\@tablecount}{%
\@citecount}{%
\@appendixcount%
}}{%
\@keywords}{%
......@@ -309,7 +307,6 @@
\@pagecount}{%
\@figcount}{%
\@tablecount}{%
\@citecount}{%
\@appendixcount%
}}{%
\@keywords@en}{%
......@@ -318,6 +315,7 @@
}
\newcommand\makeabstract{%
\makeabstractru%
\makeabstracten%
}
......@@ -479,12 +477,14 @@
\DeclareCaptionFormat{hfillstart}{\hfill#1#2#3\par}
\captionsetup{singlelinecheck=false}
\captionsetup[figure]{%
font=normal,
labelsep=period,
justification=centering}
% \captionsetup[table]{%
% labelsep=period,
% justification=raggedleft}
\captionsetup[table]{
font=normal,
format=hfillstart,
labelsep=newline,
justification=centering,
......
......@@ -38,7 +38,7 @@
\ifundeflength\secondskip{8ex}
\ifundeflength\thirdskip{2ex}
\ifundeflength\fourthskip{0ex}
\ifundeflength\fifthskip{16ex}
\ifundeflength\fifthskip{5ex}
\ifundeflength\sixthskip{1ex}
\def\titlefont{\Large\bfseries}
......@@ -48,6 +48,7 @@
\thispagestyle{empty}
\enlargethispage{2cm}
\begin{center}
\instfont\minobrname\par
\instfont\@institution\par
\instfont\@faculty\par
\instfont\@department\par
......@@ -64,18 +65,22 @@
\end{center}
\vskip\fourthskip
%
\begin{flushleft}
\courselabel\ \@coursenum\ --\ \@course\\%
\masterproglabel\ \@masterprognum\ --\ \@masterprog%
\end{flushleft}
\begin{center}
\small
\courselabel\ \@coursenum\ <<\@course>>\\%
\masterproglabel\\
\ \@masterprognum\ <<\@masterprog>>%
\end{center}
%
\vskip\fifthskip
\vskip5ex
\begin{tabbing}
\studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip]
\ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi
\ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi
\ifx\@rev\empty\else\diplomafield{rev}\\[\sixthskip]\fi
\ifx\@revsnd\empty\else\diplomafield{revsnd}\\[\sixthskip]\fi
\ifx\@scon\empty\else\diplomafield{scon}\\[9pt]\fi
\ifx\@sconsnd\empty\else\diplomafield{sconsnd}\fi
\ifx\@con\empty\else\diplomafield{con}\\[9pt]\fi
\ifx\@consnd\empty\else\diplomafield{consnd}\fi
\end{tabbing}
......@@ -133,6 +138,7 @@
\thispagestyle{empty}
\enlargethispage{2cm}
\begin{center}
\instfont\minobrname\par
\instfont\@institution\par
\instfont\@faculty\par
\instfont\@department\par
......@@ -152,7 +158,8 @@
\begin{center}
% Aligning student name as on the title page
\vphantom{\courselabel\ \@coursenum\ --\ \@course}\ \\%
\vphantom{\masterproglabel\ \@masterprognum\ --\ \@masterprog}%
\vphantom{\masterproglabel\
\@masterprognum\ --\ \@masterprog}%
\end{center}
%
\vskip\fifthskip
......
......@@ -492,7 +492,7 @@
\providecommand\chapteralign{\centering}
\providecommand\chapterfont{\Large\bfseries}
\providecommand\beforechapternum{\CYRR\CYRA\CYRZ\CYRD\CYRE\CYRL~}
\providecommand\beforechapternum{}
\providecommand\beforechapter{}
\providecommand\afterchapter{\par\nobreak\vskip 20\p@}
\newlength{\chapterindent}
......@@ -501,11 +501,11 @@
\newcommand*\chaptermark[1]{}
\newcommand\chapter{%
\if@openright
\cleardoublepage
\else
%\if@openright
% \cleardoublepage
%\else
\clearpage
\fi
%\fi
\thispagestyle{\@chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
......@@ -940,7 +940,7 @@
\disser@deflength\abovecaptionskip{10\p@}
\disser@deflength\belowcaptionskip{0\p@}
\newcommand\captionlabeldelim{.}
\newcommand\captionfont{\small}
\newcommand\captionfont{\normal}
\newcommand\captionlabelfont{\small\selectfont}
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
......@@ -959,7 +959,7 @@
\def\fps@figure{tbp}
\def\ftype@figure{1}
\def\ext@figure{lof}
\def\fnum@figure{\figurename~\thefigure}
\def\fnum@figure{\figurename\thefigure}
\renewcommand\thetable{\ifnum \c@chapter>\z@\thechapter.\fi\@arabic\c@table}
......@@ -1018,7 +1018,7 @@
\if@titlepage
\newenvironment{abstract}{
\thispagestyle{empty}
%\thispagestyle{empty}
\@beginparpenalty\@lowpenalty
\begin{center}%
\abstractnamefont\abstractname
......@@ -1536,11 +1536,11 @@
}
\newcommand\nchapter[1]{%
\if@openright
\cleardoublepage
\else
%\if@openright
% \cleardoublepage
%\else
\clearpage
\fi
%\fi
\thispagestyle{\@chapterpagestyle}%
\global\@topnum\z@
\hrefphantom{chapter}
......
......@@ -14,6 +14,9 @@
\ProvidesFile{titledefs.rtx}
\def\minobrname{
\cyr\CYRM\cyri\cyrn\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrt\cyrv\cyro\ \cyro\cyrb\cyrr\cyra\cyrz\cyro\cyrv\cyra\cyrn\cyri\cyrya\ \cyri\ \cyrn\cyra\cyru\cyrk\cyri\ \CYRR\cyro\cyrs\cyrs\cyri\cyrishrt\cyrs\cyrk\cyro\cyrishrt\ \CYRF\cyre\cyrd\cyre\cyrr\cyra\cyrc\cyri\cyri
}
\def\abstractname{\cyr\CYRA\cyrn\cyrn\cyro\cyrt\cyra\cyrc\cyri\cyrya}
\def\titlepagename{%
\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ %
......@@ -26,17 +29,16 @@
\cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre}
\def\appos{\cyr\cyrz\cyra\cyrv.\ \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt}
\def\groupname{\cyr\cyrg\cyrr.}
\def\topicname{\cyr\CYRT\cyre\cyrm\cyra}
\def\topiclabel{\topicname:\ }
\def\coursename{\cyr\CYRN\cyra\cyrp\cyrr\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre}
\def\courselabel{\coursename:}
\def\topicname{}
\def\topiclabel{}
\def\coursename{\cyr\cyrp\cyro\ \cyrn\cyra\cyrp\cyrr\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyryu}
\def\courselabel{\coursename}
\def\specname{%
\cyr\CYRS\cyrp\cyre\cyrc\cyri\cyra\cyrl\cyrsftsn\cyrn\cyro\cyrs\cyrt\cyrsftsn}
\def\speclabel{\specname:}
\cyr\cyrp\cyro\ \cyro\cyrb\cyrr\cyra\cyrz\cyro\cyrv\cyra\cyrt\cyre\cyrl\cyr\char252\cyrn\cyro\cyrishrt\ \cyrp\cyrr\cyro\cyrg\cyrr\cyra\cyrm\cyrm\cyre}
\def\speclabel{\specname}
\def\masterprogname{%
\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ %
\cyrp\cyrr\cyro\cyrg\cyrr\cyra\cyrm\cyrm\cyra}
\def\masterproglabel{\masterprogname:}
\cyr\cyrp\cyro\ \cyro\cyrb\cyrr\cyra\cyrz\cyro\cyrv\cyra\cyrt\cyre\cyrl\cyr\char252\cyrn\cyro\cyrishrt\ \cyrp\cyrr\cyro\cyrg\cyrr\cyra\cyrm\cyrm\cyre}
\def\masterproglabel{\masterprogname}
\def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ %
\cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt}
\def\studentlabel{\studentname\ \groupname\ \@group\hspace{1.5cm}}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment