diff --git a/build/j-spec.pdf b/build/j-spec.pdf index 8a02f5a..30578dc 100644 Binary files a/build/j-spec.pdf and b/build/j-spec.pdf differ diff --git a/j-spec.tex b/j-spec.tex index 24cf4e9..03cc9f3 100644 --- a/j-spec.tex +++ b/j-spec.tex @@ -1,10 +1,10 @@ \immediate\write18{texcount -sum -1 -inc j-spec.tex > /tmp/wordcount.tex} % report is for the complete book -%\documentclass[a4paper,12pt]{report} +\documentclass[a4paper,12pt]{report} % article is for single section compilation -\documentclass[a4paper]{article} +%\documentclass[a4paper]{article} \usepackage[english,russian]{babel} \usepackage{ifthen} @@ -22,7 +22,7 @@ \date{\today{} (\DTMcurrenttime)} % defining if document is compiled as book or as articles -\def\isSingle{1} +%\def\isSingle{1} \usepackage{subfiles} @@ -30,9 +30,7 @@ \fontsize{12}{12}\selectfont \maketitle -\ifx\isSingle\undefined \tableofcontents -\fi \pagestyle{plain} \sloppy @@ -84,6 +82,10 @@ \subfile{jtc5-05-workshop} \newpage \subfile{jtd1-06-workshop} +\newpage +\subfile{jtd2-07-workshop} +\newpage +\subfile{jtd3-08-workshop} \printnomenclature[40mm] diff --git a/jtc1-01-abstract.tex b/jtc1-01-abstract.tex index 6ebf3ab..65bcac3 100644 --- a/jtc1-01-abstract.tex +++ b/jtc1-01-abstract.tex @@ -2,7 +2,7 @@ \begin{document} \sloppy \pagestyle{plain} -\tableofcontents +%\tableofcontents \section{Платформа: история и окружение} \subsection*{В этом разделе} @@ -470,4 +470,4 @@ Docker-образ и, как следствие, Docker-контейнеры в \newpage \printnomenclature[40mm] -\end{document} \ No newline at end of file +\end{document} diff --git a/jtc2-02-abstract.tex b/jtc2-02-abstract.tex index 30fac91..5ae247c 100644 --- a/jtc2-02-abstract.tex +++ b/jtc2-02-abstract.tex @@ -1,9 +1,10 @@ \documentclass[j-spec.tex]{subfiles} \begin{document} \sloppy -\setcounter{section}{1} +%\setcounter{section}{1} \pagestyle{plain} -\tableofcontents +%\tableofcontents + \section{Специализация: данные и функции} \subsection*{В предыдущем разделе} \begin{itemize} diff --git a/jtc3-03-abstract.tex b/jtc3-03-abstract.tex index afe0136..72406f9 100644 --- a/jtc3-03-abstract.tex +++ b/jtc3-03-abstract.tex @@ -1,10 +1,10 @@ \documentclass[j-spec.tex]{subfiles} \begin{document} \sloppy -\setcounter{section}{2} +%\setcounter{section}{2} \setlength{\columnsep}{22pt} \pagestyle{plain} -\tableofcontents +%\tableofcontents \section{Специализация: ООП} \subsection*{В предыдущем разделе} diff --git a/jtc4-04-abstract.tex b/jtc4-04-abstract.tex index b00b676..8e5d049 100644 --- a/jtc4-04-abstract.tex +++ b/jtc4-04-abstract.tex @@ -1,10 +1,10 @@ \documentclass[j-spec.tex]{subfiles} \begin{document} \sloppy -\setcounter{section}{3} +%\setcounter{section}{3} \setlength{\columnsep}{22pt} \pagestyle{plain} -\tableofcontents +%\tableofcontents \section{Специализация: ООП и исключения} \subsection*{В предыдущем разделе} diff --git a/jtc5-05-abstract.tex b/jtc5-05-abstract.tex index b1cbce6..0968ca0 100644 --- a/jtc5-05-abstract.tex +++ b/jtc5-05-abstract.tex @@ -1,10 +1,10 @@ \documentclass[j-spec.tex]{subfiles} \begin{document} \sloppy -\setcounter{section}{4} +%\setcounter{section}{4} \setlength{\columnsep}{22pt} \pagestyle{plain} -\tableofcontents +%\tableofcontents \section{Специализация: тонкости работы} \subsection*{В предыдущем разделе} diff --git a/jtd1-06-abstract.tex b/jtd1-06-abstract.tex index 770e928..2cfa5c3 100644 --- a/jtd1-06-abstract.tex +++ b/jtd1-06-abstract.tex @@ -1,10 +1,10 @@ \documentclass[j-spec.tex]{subfiles} \begin{document} \sloppy -\setcounter{section}{5} +%\setcounter{section}{5} \setlength{\columnsep}{22pt} \pagestyle{plain} -\tableofcontents +%\tableofcontents \section{Инструментарий: GUI -- графический интерфейс пользователя} \subsection*{В предыдущей главе} diff --git a/jtd2-07-abstract.tex b/jtd2-07-abstract.tex index 2d7dac5..88db218 100644 --- a/jtd2-07-abstract.tex +++ b/jtd2-07-abstract.tex @@ -1,10 +1,10 @@ \documentclass[j-spec.tex]{subfiles} \begin{document} \sloppy -\setcounter{section}{6} +%\setcounter{section}{6} \setlength{\columnsep}{22pt} \pagestyle{plain} -\tableofcontents +%\tableofcontents \section{Инструментарий: программные интерфейсы} \subsection*{В предыдущем разделе} diff --git a/jtd3-08-abstract.tex b/jtd3-08-abstract.tex index 7d9fd58..059f37f 100644 --- a/jtd3-08-abstract.tex +++ b/jtd3-08-abstract.tex @@ -1,10 +1,10 @@ \documentclass[j-spec.tex]{subfiles} \begin{document} \sloppy -\setcounter{section}{7} +%\setcounter{section}{7} \setlength{\columnsep}{22pt} \pagestyle{plain} -\tableofcontents +%\tableofcontents \section{Инструментарий: Обобщения} \subsection*{В предыдущем разделе} diff --git a/settings/main-style-preamble.tex b/settings/main-style-preamble.tex index 267cdd8..d8a487b 100644 --- a/settings/main-style-preamble.tex +++ b/settings/main-style-preamble.tex @@ -27,7 +27,7 @@ \newcommand{\tabitem}{~~\llap{\textbullet}~~} \spacing{1.15} -\babelfont{rm}{IBM Plex Sans} +\babelfont{rm}{PT Astra Sans} \babelfont{tt}{PT Mono} \titlelabel{\thetitle. \quad}