Change default font to XCharter. Intro first

Change default font to XCharter.
Move introduction before TOC.
Set page numbering to roman in introduction.

diff --git a/CinelerraGG_Manual.tex b/CinelerraGG_Manual.tex
index a3c28dbfcf31bf3e8a53f140ca352aca3fcf4e40..0bdd2454b0ecd999f4e7d564bbd8839570153873 100644 (file)
--- a/CinelerraGG_Manual.tex
+++ b/CinelerraGG_Manual.tex
@@ -1,10 +1,7 @@
 %
 \documentclass[letter,14pt,oneside,openright,svgnames]{memoir} % paper size, font size and other options for document
 %
 \documentclass[letter,14pt,oneside,openright,svgnames]{memoir} % paper size, font size and other options for document

-%\input{common/setup.tex}

 \input{common/packages.tex} % common packages
 
 \input{common/packages.tex} % common packages
 

-
-%\includeonly{parts/Disclaimer}

 \begin{document}
 
 \titleLL % use cutom title
 \begin{document}
 
 \titleLL % use cutom title


@@ -13,9 +10,8 @@
 
 \newpage
 
 
 \newpage
 

-\mainmatter
-\tableofcontents
-\pagestyle{plain}
+%\pagestyle{plain}
+%\pagenumbering{roman}

 %\renewcommand{\chapterheadstart}{
 %%\vspace*{\beforechapskip}
 %\hrule\medskip}
 %\renewcommand{\chapterheadstart}{
 %%\vspace*{\beforechapskip}
 %\hrule\medskip}


@@ -34,8 +30,17 @@
 %\renewcommand{\printchaptername}{\normalfont\large\scshape Chapter}
 \renewcommand{\chapterheadstart}{}
 %\renewcommand{\beforechapskip}{\vspace{2pt}}
 %\renewcommand{\printchaptername}{\normalfont\large\scshape Chapter}
 \renewcommand{\chapterheadstart}{}
 %\renewcommand{\beforechapskip}{\vspace{2pt}}

+\frontmatter
+%\pagenumbering{Roman}
+
+\include{parts/Introduction}     % Introduction 
+
+\tableofcontents
+
+\pagestyle{plain}
+
+\mainmatter

 
 

-\include{parts/Introduction}

 \include{parts/Instalation}
 
 \end{document}
 \include{parts/Instalation}
 
 \end{document}

diff --git a/common/packages.tex b/common/packages.tex
index d3fc720f78d83c8ae00f24f26857d57a2402228e..7e91d036f0ce06e4b34afdd9f99175d7e513eec9 100644 (file)
--- a/common/packages.tex
+++ b/common/packages.tex
@@ -2,9 +2,12 @@
 \usepackage{cmap}
 \usepackage[T2A]{fontenc}
 \usepackage[utf8]{inputenc}         % file encoding
 \usepackage{cmap}
 \usepackage[T2A]{fontenc}
 \usepackage[utf8]{inputenc}         % file encoding

+\usepackage{substitutefont}         % so we can use fonts other than those specified in babel

 \usepackage[english]{babel}         % default language for document
 \usepackage[english]{babel}         % default language for document

+\usepackage[scaled=0.925]{XCharter} % Подключение русифицированных шрифтов XCharter
+\usepackage[bitstream-charter]{mathdesign} % Согласование математических шрифтов
+

 \usepackage{
 \usepackage{

-    amssymb,

     amsfonts,
     mathtools,
     mathtext,
     amsfonts,
     mathtools,
     mathtext,

diff --git a/common/settings.tex b/common/settings.tex
index b144fbad10f3beb0768bf2d3414240e705d10977..d626072203bd6a0271f1211aafc0d0c6345f521f 100644 (file)
--- a/common/settings.tex
+++ b/common/settings.tex
@@ -1 +1,2 @@
-%\usepackage{noto}
+%\usepackage[sfdefault]{noto}
+%\renewcommand{\rmdefault}{noto}

diff --git a/parts/Introduction.tex b/parts/Introduction.tex
index a091ce128b2408625b78850a6047e5d5ac6bf7f6..3a04c944c1e88885cdcd2bd14deccc1d8f073acf 100644 (file)
--- a/parts/Introduction.tex
+++ b/parts/Introduction.tex
@@ -1,5 +1,6 @@
-\chapter{Introduction}%
+\chapter*{Introduction}%

 \label{cha:introduction}
 \label{cha:introduction}

+\addcontentsline{toc}{chapter}{Introduction}

 
 Cinelerra is a software program NLE, Non-Linear Editor, that provides a way to edit, record, and play audio or video media. 
 It can also be used to retouch photos.
 
 Cinelerra is a software program NLE, Non-Linear Editor, that provides a way to edit, record, and play audio or video media. 
 It can also be used to retouch photos.


@@ -49,7 +50,7 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with this program;
 if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, U
 
 You should have received a copy of the GNU General Public License along with this program;
 if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, U
 

-\section{Cinelerra Overview}%
+\section*{Cinelerra Overview}%

 \label{sec:cinelerra_overview}
 
 Presented briefly here is an overview of Cinelerra-GG Infinity and information provided in this manual. 
 \label{sec:cinelerra_overview}
 
 Presented briefly here is an overview of Cinelerra-GG Infinity and information provided in this manual. 


@@ -131,7 +132,7 @@ The GG version of Cinelerra has been improved for \emph{stability}, \emph{modern
                 \end{itemize}
 \end{description}
 
                 \end{itemize}
 \end{description}
 

-\section{Chapters Overview}%
+\section*{Chapters Overview}%

 \label{sec:chapters_overview}
 
 Below is listed a brief overview of each chapter to help you to decide which chapters you should pay the most attention to and read more thoroughly. 
 \label{sec:chapters_overview}
 
 Below is listed a brief overview of each chapter to help you to decide which chapters you should pay the most attention to and read more thoroughly.