From 8bbceb3b979ea045f94ab7ed960bbf4609694c93 Mon Sep 17 00:00:00 2001
From: Alexander Yakovlev <keloero@oreolek.ru>
Date: Sun, 12 Nov 2017 01:29:21 +0700
Subject: [PATCH] Current version

---
 oreolek-article.cls |  5 ++---
 oreolek-book.cls    |  5 ++---
 oreolek-script.cls  | 15 ++++++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/oreolek-article.cls b/oreolek-article.cls
index 6943c0d..126681b 100644
--- a/oreolek-article.cls
+++ b/oreolek-article.cls
@@ -20,12 +20,11 @@
 \RequirePackage{xltxtra}
 \RequirePackage{polyglossia}
 \setdefaultlanguage{russian}
-\defaultfontfeatures{Mapping=tex-text, Scale=MatchLowercase}
-\setmainfont{PT Serif}
+\defaultfontfeatures{Mapping=tex-text, Scale=MatchLowercase, Ligatures=TeX}
+\setmainfont{PT Serif}[BoldFont={* Bold}, BoldItalicFont={* Bold Italic}, SmallCapsFont = {* Caption}]
 \setmonofont{PT Mono}
 \setmathrm{PT Serif}
 \newfontfamily{\cyrillicfont}{PT Serif}
-\newfontinstance\scshape[Letters=SmallCaps, Numbers=Uppercase]{PT Serif Caption}
 \RequirePackage{hyperref}
 \RequirePackage{indentfirst}
 \RequirePackage[cm]{fullpage}
diff --git a/oreolek-book.cls b/oreolek-book.cls
index 5243e15..42b8a60 100644
--- a/oreolek-book.cls
+++ b/oreolek-book.cls
@@ -21,12 +21,11 @@
 \RequirePackage{polyglossia}
 \RequirePackage{pifont}
 \setdefaultlanguage{russian}
-\defaultfontfeatures{Mapping=tex-text, Scale=MatchLowercase}
-\setmainfont{PT Serif}
+\defaultfontfeatures{Mapping=tex-text, Scale=MatchLowercase, Ligatures=TeX}
+\setmainfont{PT Serif}[BoldFont={* Bold}, BoldItalicFont={* Bold Italic}, SmallCapsFont = {* Caption}]
 \setmonofont{PT Mono}
 \setmathrm{PT Serif}
 \newfontfamily{\cyrillicfont}{PT Serif}
-\newfontinstance\scshape[Letters=SmallCaps, Numbers=Uppercase]{PT Serif Caption}
 \RequirePackage{hyperref}
 \RequirePackage{indentfirst}
 \RequirePackage[cm]{fullpage}
diff --git a/oreolek-script.cls b/oreolek-script.cls
index 47d57af..34f1b98 100644
--- a/oreolek-script.cls
+++ b/oreolek-script.cls
@@ -28,12 +28,14 @@
 
 \DeclareOption{nofullpage}{\global\@Fullpagefalse}
 
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{extreport}}
-\ProcessOptions
-
 % We will be basing this class on the report class.
 
-\LoadClass{report}
+\DeclareOption*{%
+  \PassOptionsToClass{\CurrentOption}{extreport}% or book or whatever
+}
+\ProcessOptions\relax
+
+\LoadClass{extreport}
 
 % Now we initialize the counters.
 \newcounter{act}
@@ -147,12 +149,11 @@
 \RequirePackage{xltxtra}
 \RequirePackage{polyglossia}
 \setdefaultlanguage{russian}
-\defaultfontfeatures{Mapping=tex-text, Scale=MatchLowercase}
-\setmainfont{PT Serif}
+\defaultfontfeatures{Mapping=tex-text, Scale=MatchLowercase, Ligatures=TeX}
+\setmainfont{PT Serif}[BoldFont={* Bold}, BoldItalicFont={* Bold Italic}, SmallCapsFont = {* Caption}]
 \setmonofont{PT Mono}
 \setmathrm{PT Serif}
 \newfontfamily{\cyrillicfont}{PT Serif}
-\newfontinstance\scshape[Letters=SmallCaps, Numbers=Uppercase]{PT Serif Caption}
 \RequirePackage{hyperref}
 \RequirePackage{indentfirst}