Обновлены Lecture.cls и preamble.sty

1 files changed, 50 insertions, 84 deletions

diff --git a/Lecture.cls b/Lecture.cls
index e983fa6..622ef41 100644
--- a/Lecture.cls
+++ b/Lecture.cls
@@ -1,97 +1,63 @@
-\LoadClass[a4paper,oneside]{article}
+\LoadClass[14pt,a4paper,oneside]{extarticle}
 
 \RequirePackage[utf8]{inputenc}
+\RequirePackage[english,russian]{babel}
 \RequirePackage[T2A]{fontenc}
-\RequirePackage[russian]{babel}
-\RequirePackage{hyperref}
-\RequirePackage{underscore}
-\RequirePackage{setspace}
+
+\usepackage[
+  a4paper, mag=1000,
+  left=2.5cm, right=1.5cm,
+  top=3cm, bottom=3cm
+]{geometry}
+
+\RequirePackage[hidelinks,colorlinks=false]{hyperref}
+\RequirePackage{url}
 \RequirePackage{indentfirst}
-\RequirePackage{cancel}
-\RequirePackage[left=1.4cm,right=1.4cm,
-    top=2.3cm,bottom=2.3cm,bindingoffset=0cm]{geometry}
-\singlespacing
-\RequirePackage{float}
+
 \RequirePackage{fancyhdr}
-% \pagestyle{fancy}
-% \pagestyle{headings}
+\pagestyle{fancy}
 
+\RequirePackage{setspace}
+\singlespacing
 
-%----------------------------------------------------------------------------------------
-%   TITLE PAGE
-%----------------------------------------------------------------------------------------
+% --- TITLE PAGE --- %
 \renewcommand{\maketitle}
 {
+\afterpage{
+\newgeometry{
+  a4paper, mag=1000,
+  left=1.5cm, right=1.5cm,
+  top=2cm, bottom=2cm
+}
 
-\begin{titlepage} % Suppresses displaying the page number on the title page and the subsequent page counts as page 1
-    \newcommand{\HRule}{\rule{\linewidth}{0.5mm}} % Defines a new command for horizontal lines, change thickness here
-
-    \center % Centre everything on the page
-
-    %------------------------------------------------
-    %   Headings
-    %------------------------------------------------
-
-    % \textsc{\LARGE Саратовский Государственный Университет}\\[1.5cm] % Main heading such as the name of your university/college
-    \textsc{\LARGE Саратовский Государственный Университет}\\[0.2cm] % Main heading such as the name of your university/college
-    \textsc{\Large Факультет Компьютерных Наук и Информационных Технологий}\\[0.5cm] % Major heading such as course name
-
-    % \textsc{\large 1214}\\[0.5cm] % Minor heading such as course title
-
-    %------------------------------------------------
-    %   Title
-    %------------------------------------------------
-
-    \HRule\\[0.6cm]
-    % {\huge\bfseries Универсальная прикладная алгебра}\\[0.4cm] % Title of your document
-    {\huge\bfseries\textsc \@title}\\[0.4cm] % Title of your document
-
-    \HRule\\[1.5cm]
-
-    %------------------------------------------------
-    %   Author(s)
-    %------------------------------------------------
-
-    % \begin{minipage}{0.4\textwidth}
-    %   \begin{flushleft}
-    %       \large
-    %       \textit{Законспектировали}\\
-    %       \textsc{Андрей Гущин\\Иван Улитин\\Роман Стаин\\Николай Шустов} % Your name
-    %   \end{flushleft}
-    % \end{minipage}
-    % ~
-    % \begin{minipage}{0.4\textwidth}
-    %   \begin{flushright}
-    %       \large
-    %       % \textit{Редактор}\\
-    %       % \textsc{Боба} % Supervisor's name
-    %   \end{flushright}
-    % \end{minipage}
-
-    % If you don't want a supervisor, uncomment the two lines below and comment the code above
-    {\large\textit{Законспектировал}}\\
-    \textsc{\@author} % Your name
-
-    %------------------------------------------------
-    %   Date
-    %------------------------------------------------
-
-    \vfill\vfill\vfill\vfill\vfill % Position the date 3/4 down the remaining page
-
-    {\large\the\year{} г.} % Date, change the \today to a set date if you want to be precise
-
-    %------------------------------------------------
-    %   Logo
-    %------------------------------------------------
-
-    %\vfill\vfill
-    %\includegraphics[width=0.2\textwidth]{placeholder.jpg}\\[1cm] % Include a department/university logo - this will require the graphicx package
-
-    %----------------------------------------------------------------------------------------
-
-    \vfill % Push the date up 1/4 of the remaining page
-
+% Suppresses displaying the page number on the title page and the subsequent page counts as page 1
+\begin{titlepage}
+  % Defines a new command for horizontal lines, change thickness here
+  \newcommand{\HRule}{\rule{\linewidth}{0.5mm}}
+  \center
+
+  % --- Headings --- %
+  \textsc{\Large Саратовский Государственный Университет}\\[0.2cm]
+  \textsc{\normalsize Факультет Компьютерных Наук и Информационных Технологий}\\[0.5cm]
+
+  % --- Title --- %
+  \HRule\\[0.6cm]
+  {\LARGE \bfseries\textsc \@title}\\[0.3cm]
+  \HRule\\[1.5cm]
+
+  % --- Author(s) --- %
+  {\large\textit{Законспектировано:}}\\
+  \textsc{\@author}
+
+  % --- Date --- %
+  % Position the date 3/4 down the remaining page
+  \vfill\vfill\vfill\vfill\vfill\vfill
+  {\large\@date}
+  % Push the date up 1/4 of the remaining page
+  \vfill
 \end{titlepage}
 
+\clearpage
+\restoregeometry
+}
 }
-%----------------------------------------------------------------------------------------