Unverified Commit 6005b146 authored by Vlad's avatar Vlad Committed by GitHub
Browse files

Merge pull request #1 from AbdullinAM/master

Исправления по замечаниям от Новопашенного
parents 26825e9c a890b427
Pipeline #22644184 passed with stage
in 4 minutes and 37 seconds
......@@ -429,7 +429,7 @@
\renewcommand{\conclusionname}{\CYRZ\CYRA\CYRK\CYRL\CYRYU\CYRCH\CYRE\CYRN\CYRI\CYRE}
\renewcommand{\bibname}{\CYRS\CYRP\CYRI\CYRS\CYRO\CYRK\ \CYRI\CYRS\CYRP\CYRO\CYRL\CYRSFTSN\CYRZ\CYRO\CYRV\CYRA\CYRN\CYRN\CYRERY\CYRH\ \CYRI\CYRS\CYRT\CYRO\CYRCH\CYRN\CYRI\CYRK\CYRO\CYRV}
\renewcommand{\appendixname}{\CYRP\CYRR\CYRI\CYRL\CYRO\CYRZH\CYRE\CYRN\CYRI\CYRE}
\renewcommand{\figurename}{\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}
\renewcommand{\figurename}{\CYRR\cyri\cyrs.}
\renewcommand{\tablename}{\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}
}
......@@ -489,7 +489,8 @@
labelsep=newline,
justification=centering,
skip=-10pt}
\floatname{figure}{\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}
% \floatname{figure}{\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}
\floatname{figure}{\CYRR\cyri\cyrs}
\floatname{table}{\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}
% Workaround for disser-1.2.0 `headcenter` pagestyle options
......
......@@ -81,7 +81,8 @@
\end{tabbing}
\vfill
\begin{center}
{\@city\cdsep\@date}
\@city\\
\@date
\end{center}
\normalfont\clearpage
}\fi
......@@ -160,7 +161,8 @@
\end{flushright}
\vfill
\begin{center}
{\@city\cdsep\@date}
\@city\\
\@date
\end{center}
\normalfont\clearpage
%
......
......@@ -492,6 +492,7 @@
\providecommand\chapteralign{\centering}
\providecommand\chapterfont{\Large\bfseries}
\providecommand\beforechapternum{\CYRR\CYRA\CYRZ\CYRD\CYRE\CYRL~}
\providecommand\beforechapter{}
\providecommand\afterchapter{\par\nobreak\vskip 20\p@}
\newlength{\chapterindent}
......@@ -514,9 +515,11 @@
\def\@chapter[#1]#2{
\ifnum \c@secnumdepth >\m@ne
\refstepcounter{chapter}%
{\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}%
% {\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}%
{\addcontentsline{toc}{chapter}{\beforechapternum\@tocseccntformat{chapter}#1}}%
\else
{\addcontentsline{toc}{chapter}{#1}}%
% {\addcontentsline{toc}{chapter}{#1}}%
{\addcontentsline{toc}{chapter}{\beforechapternum#1}}%
\fi
\chaptermark{#1}%
\addtocontents{lof}{\protect\addvspace{10\p@}}%
......@@ -533,7 +536,7 @@
\parindent\z@
\normalfont\hskip\chapterindent%
\ifnum \c@secnumdepth >\m@ne
{\thechapterfont\thechapteralign\@seccntformat{chapter}}
{\chapterfont\thechapteralign\beforechapternum\@seccntformat{chapter}}
\fi
\interlinepenalty\@M
\chapterfont\chapteralign\beforechapter #1\afterchapter
......@@ -631,11 +634,12 @@
\renewcommand\chapteralign{\appendixalign}
\renewcommand\chapterfont{\appendixfont}
\renewcommand\beforechapternum{}
\renewcommand\beforechapter{\beforeappendix}
\renewcommand\afterchapter{\afterappendix}
\renewcommand\chapterindent{\appendixindent}
\gdef\thechapter{\theappendix}
%\gdef\thechapter{\theappendix}
}
\newcommand\noappendix{
......@@ -670,8 +674,10 @@
\providecommand\tocsectionfont{\normalfont}
\providecommand\tocsectionfillfont{}
\providecommand\tocsectionnumfont{}
\providecommand\tocsectionindent{1.5em}
\providecommand\tocsectionnameindent{2.6em}
% \providecommand\tocsectionindent{1.5em}
\providecommand\tocsectionindent{0em}
% \providecommand\tocsectionnameindent{2.6em}
\providecommand\tocsectionnameindent{2.0em}
\providecommand\sectionfont{\normalfont\large\bfseries}
......@@ -691,8 +697,10 @@
\providecommand\tocsubsectionfillfont{}
\providecommand\tocsubsectionnumfont{}
\providecommand\tocsubsectionindent{4.1em}
\providecommand\tocsubsectionnameindent{3.5em}
% \providecommand\tocsubsectionindent{4.1em}
% \providecommand\tocsubsectionnameindent{3.5em}
\providecommand\tocsubsectionindent{0.0em}
\providecommand\tocsubsectionnameindent{2.5em}
\providecommand\subsectionfont{\normalfont\normalsize\bfseries}
......@@ -712,8 +720,10 @@
\providecommand\tocsubsubsectionfillfont{}
\providecommand\tocsubsubsectionnumfont{}
\providecommand\tocsubsubsectionindent{7.6em}
\providecommand\tocsubsubsectionnameindent{4.7em}
% \providecommand\tocsubsubsectionindent{7.6em}
% \providecommand\tocsubsubsectionnameindent{4.7em}
\providecommand\tocsubsubsectionindent{0.0em}
\providecommand\tocsubsubsectionnameindent{3.0em}
\providecommand\subsubsectionfont{\normalfont\normalsize\bfseries}
......
......@@ -47,4 +47,5 @@
\usepackage{float}
% Для таблиц с объединенными ячейками
\usepackage{multirow}%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{multirow}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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