Browse Source

fixed default fonts under XeLaTeX; added better maths fonts

master
Jonathan Spratte 1 year ago
parent
commit
02b654bd75

BIN
Doc/doc_MRTbundle.pdf View File


+ 2
- 0
Doc/doc_MRTbundle.tex View File

@@ -49,7 +49,9 @@
49 49
 \include{tex/doc_introduction}
50 50
 \include{tex/doc_downwards}
51 51
 \include{tex/doc_MRTthesis}
52
+\inbeamerdoctrue
52 53
 \include{tex/doc_MRTbeam}
54
+\inbeamerdocfalse
53 55
 \include{tex/doc_MRTalone}
54 56
 \include{tex/doc_MRTtab}
55 57
 \include{tex/doc_MRTif}

+ 1
- 0
Doc/preamble/doc_macros.tex View File

@@ -1,4 +1,5 @@
1 1
 \makeatletter
2
+\newif\ifinbeamerdoc
2 3
 \newcommand*\pkg[1]{\textrm{#1}}
3 4
 \newcommand*\pkgWopt[2]{\opt{[#2]}\penalty500\pkg{#1}}
4 5
 \newcommand*\cls[1]{\textrm{#1}}

+ 6
- 0
Doc/tex/doc_MRTalone.tex View File

@@ -117,6 +117,12 @@ and all its dependencies. Additional dependencies are:
117 117
         \item \pkg{lmodern}
118 118
         \item \pkg{helvet}
119 119
         \item \pkg{MRTlmscale} dependent on the \bverb|scale maths| key.
120
+        \item If \opt{new maths} is used
121
+          \begin{itemize}
122
+            \item \pkg{bm}
123
+            \item \pkg{newpxmath} [upint, slantedGreek]
124
+            \item The |ztmcm| font
125
+          \end{itemize}
120 126
       \end{itemize}
121 127
     \item \pkg{babel} [ngerman] or if \opt{british} is used with
122 128
       [main=british, ngerman]

+ 5
- 0
Doc/tex/doc_MRTbeam.tex View File

@@ -359,6 +359,11 @@ are loaded:
359 359
         \item \pkg{lmodern}
360 360
         \item \pkg{helvet}
361 361
         \item \pkg{MRTlmscale} dependent on the \bverb|scale maths| key.
362
+        \item If \opt{new maths} is used
363
+          \begin{itemize}
364
+            \item \pkg{newpxmath} [upint, slantedGreek]
365
+            \item The |ztmcm| font
366
+          \end{itemize}
362 367
       \end{itemize}
363 368
     \item \TikZ
364 369
     \item \pkg{biblatex} (with URLs being line breakable at any place)

+ 8
- 2
Doc/tex/doc_MRTthesis.tex View File

@@ -145,9 +145,9 @@ The following options are accessible with \cs{MRTthesisSetup}.
145 145
 \begin{describeopt}{number}[\meta{number}]
146 146
   The MRT report number displayed in the citation indications. Initially is
147 147
   empty. The typical pattern of these numbers is something like:
148
-  \texttt{TT-yy-mm-n} with \texttt{TT} the thesis type, e.\,g.\@ \texttt{BA} or
148
+  \texttt{TT-yy-mm-nn} with \texttt{TT} the thesis type, e.\,g.\@ \texttt{BA} or
149 149
   \texttt{MA}, \texttt{yy} the last two digits of the year, \texttt{mm} the
150
-  month, and \texttt{n} the number of the thesis in this month.
150
+  month, and \texttt{nn} the number of the thesis in this month.
151 151
 \end{describeopt}
152 152
 \begin{describeopt}{pos figure}[\meta{placement}]
153 153
   The \meta{placement} of floats of type \texttt{figure}.
@@ -473,6 +473,12 @@ formatting.%
473 473
         \item \pkg{lmodern}
474 474
         \item \pkg{helvet}
475 475
         \item \pkg{MRTlmscale} dependent on the \bverb|scale maths| key.
476
+        \item If \opt{new maths} is used
477
+          \begin{itemize}
478
+            \item \pkg{bm}
479
+            \item \pkg{newpxmath} [upint, slantedGreek]
480
+            \item The |ztmcm| font
481
+          \end{itemize}
476 482
       \end{itemize}
477 483
     \item \pkg{babel} [ngerman] or if \opt{british} is used with
478 484
       [main\Seq british, ngerman]

+ 18
- 0
Doc/tex/doc_shared_class_options.tex View File

@@ -22,6 +22,24 @@
22 22
   You shouldn't have too much text with a mono font anyway. Per default the
23 23
   font \bverb|Latin Modern Mono| will be used.
24 24
 \end{describeopt}
25
+\begin{describeopt}{new maths}[\meta{choice}]
26
+  This is only available if you're using \hologo{pdfTeX}. With this you can
27
+  specify whether some special maths fonts are loaded. The result looks closer
28
+  to the MS Word template for Greek letters and operators.\\
29
+  Available \meta{choice}s are |off| or |false| to turn this off, |on| or |true|
30
+  to turn this on, and a valid float, to set the scale of the Greek letters and
31
+  activate the feature.  By default |1.05| will be used.\\
32
+  The number of usable fonts will be used exhaustively. The \pkg{newpxmath} will
33
+  be loaded with its \opt{upint} and \opt{slantedGreek}, the math letters of
34
+  \pkg{mathptmx} will be loaded with a scale factor.
35
+  \ifinbeamerdoc
36
+    \pkg{bm} can't be loaded if you use this in \cls{MRTbeam}, as this will take
37
+    up too many fonts, so no bold Greek letters for you.
38
+  \else
39
+    \pkg{bm} will be loaded so that you can use the bold symbols of the Latin
40
+    Modern fonts for Greek letters.
41
+  \fi
42
+\end{describeopt}
25 43
 \begin{describeopt}{scale maths}[\meta{choice}]
26 44
   This is only available if you're using \hologo{pdfTeX}. With this you can
27 45
   specify whether the \pkg{MRTlmscale} package should be loaded. Available

+ 67
- 11
MRTalone/MRTalone.cls View File

@@ -3,7 +3,7 @@
3 3
 
4 4
 \NeedsTeXFormat{LaTeX2e}
5 5
 
6
-\RequirePackage{expl3,xparse}
6
+\RequirePackage{expl3,xparse,MRTif}
7 7
 \ProvidesExplClass
8 8
   {MRTalone}          {\MRTalone@date}
9 9
   {\MRTalone@version} {standalone matching MRTthesis}
@@ -24,11 +24,15 @@
24 24
 \bool_new:N \l_MRTalone_british_bool
25 25
 \bool_new:N \l_MRTalone_sfacc_height_bool
26 26
 \bool_new:N \l_MRTalone_lmscale_bool
27
+\bool_new:N \l_MRTalone_new_math_bool
27 28
 % <<<
28 29
 % tl >>>
29 30
 \tl_const:Nn \c_MRTalone_setup_file_name_tl { ./MRTalone.setup.tex }
30 31
 \tl_const:Nn \c_MRTalone_options_file_name_tl { ./MRTalone.option.tex }
31 32
 % <<<
33
+% fp >>>
34
+\fp_new:N \l_MRTalone_new_math_scale_fp
35
+% <<<
32 36
 % <<<
33 37
 %%==========================================================================<<<
34 38
 
@@ -50,6 +54,15 @@
50 54
     \token_to_str:N \MRTaloneOptions \c_space_tl may ~ only ~ be ~ used ~ in ~
51 55
     the ~ file ~ '\c_MRTalone_options_file_name_tl'.
52 56
   }%<<<
57
+\msg_new:nnn { MRTalone } { no~float }%>>>
58
+  {
59
+    Parsing~says~you~didn't~provide~a~valid~float.~Please~provide~a
60
+    valid~float.\\
61
+    If~you're~sure~that~you~entered~a~valid~float,~please~report~the~bug
62
+    to~the\\
63
+    package~maintainer.\\
64
+    Error~occured~while~parsing~#1.%
65
+  }%<<<
53 66
 %%==========================================================================<<<
54 67
 
55 68
 \NewDocumentCommand \MRTaloneSetup { +m }%>>>
@@ -80,19 +93,25 @@
80 93
   }%<<<
81 94
 \bool_if:NTF \c_MRTalone_xetex_or_luatex_bool
82 95
   {%>>>
96
+    \clist_map_inline:nn { scale maths, new maths }
97
+      {
98
+        \keys_define:nn { MRTalone / loadtime }
99
+          {
100
+            #1 .code:n =
101
+              {
102
+                \msg_error:nnnn { MRTalone } { wrong~engine } { key ~ `#1` }
103
+                  { pdftex }
104
+              }
105
+          }
106
+      }
83 107
     \keys_define:nn { MRTalone / loadtime }
84 108
       {
85 109
          font        .tl_set:N  = \l_MRTalone_font_tl
86
-        ,font        .initial:n = { TeX~Gyre~Heros }
110
+        ,font        .initial:n = { texgyreheros-regular.otf }
87 111
         ,serif font  .tl_set:N  = \l_MRTalone_serif_font_tl
88
-        ,serif font  .initial:n = { Latin Modern Roman }
112
+        ,serif font  .initial:n = { lmroman10-regular.otf }
89 113
         ,mono font   .tl_set:N  = \l_MRTalone_mono_font_tl
90
-        ,mono font   .initial:n = { Latin Modern Mono }
91
-        ,scale maths .code:n    =
92
-          {
93
-            \msg_error:nnnn { MRTalone } { wrong~engine }
94
-              { key ~ `scale~maths` } { pdftex }
95
-          }
114
+        ,mono font   .initial:n = { lmmono10-regular.otf }
96 115
       }
97 116
   }%<<<
98 117
   {%>>>
@@ -109,7 +128,7 @@
109 128
       }
110 129
     \keys_define:nn { MRTalone / loadtime }
111 130
       {
112
-        scale maths .code:n =
131
+        scale maths .code:n =%>>>
113 132
           {
114 133
             \tl_if_empty:nTF { #1 }
115 134
               {
@@ -128,8 +147,35 @@
128 147
                     \PassOptionsToPackage { #1 } { MRTlmscale }
129 148
                   }
130 149
               }
131
-          }
150
+          }%<<<
132 151
         ,scale maths .initial:n = {}
152
+        ,new maths .code:n = %>>>
153
+          {
154
+            \tl_if_empty:nTF { #1 }
155
+              { \bool_set_true:N \l_MRTalone_new_math_bool }
156
+              {
157
+                \str_case:nnF { #1 }
158
+                  {
159
+                    { off } { \bool_set_false:N \l_MRTalone_new_math_bool }
160
+                    { on  } { \bool_set_true:N  \l_MRTalone_new_math_bool }
161
+                  }
162
+                  {
163
+                    \bool_set_true:N \l_MRTalone_new_math_bool
164
+                    \MRTifFloatTF { #1 }
165
+                      {
166
+                        \fp_set:Nn \l_MRTalone_new_math_scale_fp { #1 }
167
+                      }
168
+                      {
169
+                        \msg_error:nnn { MRTalone } { no~float }
170
+                          {
171
+                            the~value~\exp_not:n { #1 }~you~provided~to~
172
+                            `new~math`.
173
+                          }
174
+                      }
175
+                  }
176
+              }
177
+          }%<<<
178
+        ,new maths .initial:n = { 1.05 }
133 179
       }
134 180
   }%<<<
135 181
 %% <<<
@@ -197,6 +243,16 @@
197 243
 \RequirePackage{enumitem}
198 244
 \RequirePackage[fleqn]{mathtools}
199 245
 % bad math fonts 
246
+\bool_if:NT \l_MRTalone_new_math_bool
247
+  {
248
+    \RequirePackage{bm}
249
+    \RequirePackage[upint,slantedGreek]{newpxmath}
250
+    \DeclareSymbolFont{letters}{OML}{ztmcm}{m}{it}
251
+    \DeclareFontFamily{OML}{ztmcm}{\skewchar \font =127}
252
+    \DeclareFontShape{OML}{ztmcm}{m}{it}
253
+      { <-> s*[\fp_use:N \l_MRTalone_new_math_scale_fp ] zptmcm7m }{}
254
+    \DeclareFontShape{OML}{ztmcm}{m}{sl}{<->ssub * ztmcm/m/it}{}
255
+  }
200 256
 \RequirePackage[italic,defaultmathsizes]{mathastext}
201 257
 \RequirePackage{isomath}
202 258
 \bool_if:NTF \l_MRTalone_sfacc_height_bool

+ 68
- 13
MRTbeam/MRTbeam.cls View File

@@ -3,7 +3,7 @@
3 3
 
4 4
 \NeedsTeXFormat{LaTeX2e}
5 5
 
6
-\RequirePackage{expl3,xparse}
6
+\RequirePackage{expl3,xparse,MRTif}
7 7
 
8 8
 %% options and class loading >>>
9 9
 %%=============================================================================
@@ -12,11 +12,22 @@
12 12
 \bool_const:Nn \c_MRTbeam_xetex_or_luatex_bool%>>>
13 13
   { \sys_if_engine_luatex_p: || \sys_if_engine_xetex_p: }%<<<
14 14
 \bool_new:N \l_MRTbeam_lmscale_bool
15
+\bool_new:N \l_MRTbeam_new_math_bool
16
+\fp_new:N \l_MRTbeam_new_math_scale_fp
15 17
 \msg_new:nnn { MRTbeam } { wrong~engine }%>>>
16 18
   {
17 19
     The ~ used ~ #1 ~ is ~ not ~ available ~ under ~ \c_sys_engine_str. ~ You ~
18 20
     have ~ to ~ use ~ #2.
19 21
   }%<<<
22
+\msg_new:nnn { MRTbeam } { no~float }%>>>
23
+  {
24
+    Parsing~says~you~didn't~provide~a~valid~float.~Please~provide~a
25
+    valid~float.\\
26
+    If~you're~sure~that~you~entered~a~valid~float,~please~report~the~bug
27
+    to~the\\
28
+    package~maintainer.\\
29
+    Error~occured~while~parsing~#1.%
30
+  }%<<<
20 31
 %% Additional KV-options >>>
21 32
 \keys_define:nn { MRTbeam / loadtime }%>>>
22 33
   {
@@ -27,20 +38,26 @@
27 38
   }%<<<
28 39
 \bool_if:NTF \c_MRTbeam_xetex_or_luatex_bool
29 40
   {%>>>
30
-    \keys_define:nn { MRTbeam / loadtime }
41
+    \clist_map_inline:nn { scale maths, new maths }
31 42
       {
32
-         font        .tl_set:N = \l_MRTbeam_font_tl
33
-        ,font        .initial:n = { TeX~Gyre~Heros }
34
-        ,serif~font  .tl_set:N = \l_MRTbeam_serif_font_tl
35
-        ,serif font  .initial:n = { Latin Modern Roman }
36
-        ,mono~font   .tl_set:N = \l_MRTbeam_mono_font_tl
37
-        ,mono font   .initial:n = { Latin Modern Mono }
38
-        ,scale maths .code:n    =
43
+        \keys_define:nn { MRTbeam / loadtime }
39 44
           {
40
-            \msg_error:nnnn { MRTbeam } { wrong~engine }
41
-              { key ~ `scale~maths` } { pdftex }
45
+            #1 .code:n =
46
+              {
47
+                \msg_error:nnnn { MRTbeam } { wrong~engine } { key ~ `#1` }
48
+                  { pdftex }
49
+              }
42 50
           }
43 51
       }
52
+    \keys_define:nn { MRTbeam / loadtime }
53
+      {
54
+         font        .tl_set:N = \l_MRTbeam_font_tl
55
+        ,font        .initial:n = { texgyreheros-regular.otf }
56
+        ,serif font  .tl_set:N = \l_MRTbeam_serif_font_tl
57
+        ,serif font  .initial:n = { lmroman10-regular.otf }
58
+        ,mono font   .tl_set:N = \l_MRTbeam_mono_font_tl
59
+        ,mono font   .initial:n = { lmmono10-regular.otf }
60
+      }
44 61
   }%<<<
45 62
   {%>>>
46 63
     \clist_map_inline:nn { font, serif~font, mono~font }
@@ -56,7 +73,7 @@
56 73
       }
57 74
     \keys_define:nn { MRTbeam / loadtime }
58 75
       {
59
-        scale maths .code:n =
76
+        scale maths .code:n =%>>>
60 77
           {
61 78
             \tl_if_empty:nTF { #1 }
62 79
               {
@@ -75,8 +92,37 @@
75 92
                     \PassOptionsToPackage { #1 } { MRTlmscale }
76 93
                   }
77 94
               }
78
-          }
95
+          }%<<<
79 96
         ,scale maths .initial:n = {}
97
+        ,new maths .code:n = %>>>
98
+          {
99
+            \tl_if_empty:nTF { #1 }
100
+              { \bool_set_true:N \l_MRTbeam_new_math_bool }
101
+              {
102
+                \str_case:nnF { #1 }
103
+                  {
104
+                    { off   } { \bool_set_false:N \l_MRTbeam_new_math_bool }
105
+                    { false } { \bool_set_false:N \l_MRTbeam_new_math_bool }
106
+                    { on    } { \bool_set_true:N  \l_MRTbeam_new_math_bool }
107
+                    { true  } { \bool_set_true:N  \l_MRTbeam_new_math_bool }
108
+                  }
109
+                  {
110
+                    \bool_set_true:N \l_MRTbeam_new_math_bool
111
+                    \MRTifFloatTF { #1 }
112
+                      {
113
+                        \fp_set:Nn \l_MRTbeam_new_math_scale_fp { #1 }
114
+                      }
115
+                      {
116
+                        \msg_error:nnn { MRTbeam } { no~float }
117
+                          {
118
+                            the~value~\exp_not:n { #1 }~you~provided~to~
119
+                            `new~math`.
120
+                          }
121
+                      }
122
+                  }
123
+              }
124
+          }%<<<
125
+        ,new maths .initial:n = { 1.05 }
80 126
       }
81 127
   }%<<<
82 128
 %% <<<
@@ -123,6 +169,15 @@
123 169
     \bool_if:NT \l_MRTbeam_lmscale_bool { \RequirePackage { MRTlmscale } }
124 170
     \RequirePackage{helvet}
125 171
   }%<<<
172
+\bool_if:NT \l_MRTbeam_new_math_bool
173
+  {
174
+    \RequirePackage[upint,slantedGreek]{newpxmath}
175
+    \DeclareSymbolFont{letters}{OML}{ztmcm}{m}{it}
176
+    \DeclareFontFamily{OML}{ztmcm}{\skewchar \font =127}
177
+    \DeclareFontShape{OML}{ztmcm}{m}{it}
178
+      { <-> s*[\fp_use:N \l_MRTbeam_new_math_scale_fp ] zptmcm7m }{}
179
+    \DeclareFontShape{OML}{ztmcm}{m}{sl}{<->ssub * ztmcm/m/it}{}
180
+  }
126 181
 \if@MRTbeam@sfacc@height@
127 182
   \RequirePackage[height]{MRTsfacc}
128 183
 \else

+ 80
- 26
MRTthesis/MRTthesis.cls View File

@@ -44,6 +44,7 @@
44 44
 \bool_new:N \l_MRTthesis_toc_front_bool
45 45
 \bool_new:N \l_MRTthesis_sfacc_height_bool
46 46
 \bool_new:N \l_MRTthesis_lmscale_bool
47
+\bool_new:N \l_MRTthesis_new_math_bool
47 48
 \bool_new:N \l_MRTthesis_hyperref_code_executed_bool
48 49
 % <<<
49 50
 % box >>>
@@ -65,6 +66,9 @@
65 66
 \tl_new:N \l_MRTthesis_auto_backmatter_addo_tl
66 67
 \tl_new:N \l_MRTthesis_auto_backmatter_after_tl
67 68
 % <<<
69
+% fp >>>
70
+\fp_new:N \l_MRTthesis_new_math_scale_fp
71
+% <<<
68 72
 % <<<
69 73
 %%==========================================================================<<<
70 74
 
@@ -90,6 +94,15 @@
90 94
   {
91 95
     Patching~`\token_to_str:N #1`~failed.~Please~contact~MRTbundle's~maintainer.
92 96
   }%<<<
97
+\msg_new:nnn { MRTthesis } { no~float }%>>>
98
+  {
99
+    Parsing~says~you~didn't~provide~a~valid~float.~Please~provide~a
100
+    valid~float.\\
101
+    If~you're~sure~that~you~entered~a~valid~float,~please~report~the~bug
102
+    to~the\\
103
+    package~maintainer.\\
104
+    Error~occured~while~parsing~#1.%
105
+  }%<<<
93 106
 %%==========================================================================<<<
94 107
 
95 108
 %% constants >>>
@@ -126,19 +139,25 @@
126 139
   }%<<<
127 140
 \bool_if:NTF \c_MRTthesis_xetex_or_luatex_bool
128 141
   {%>>>
142
+    \clist_map_inline:nn { scale maths, new maths }
143
+      {
144
+        \keys_define:nn { MRTthesis / loadtime }
145
+          {
146
+            #1 .code:n =
147
+              {
148
+                \msg_error:nnnn { MRTthesis } { wrong~engine } { key ~ `#1` }
149
+                  { pdftex }
150
+              }
151
+          }
152
+      }
129 153
     \keys_define:nn { MRTthesis / loadtime }
130 154
       {
131 155
          font        .tl_set:N = \l_MRTthesis_font_tl
132
-        ,font        .initial:n = { TeX~Gyre~Heros }
156
+        ,font        .initial:n = { texgyreheros-regular.otf }
133 157
         ,serif font  .tl_set:N = \l_MRTthesis_serif_font_tl
134
-        ,serif font  .initial:n = { Latin Modern Roman }
158
+        ,serif font  .initial:n = { lmroman10-regular.otf }
135 159
         ,mono font   .tl_set:N = \l_MRTthesis_mono_font_tl
136
-        ,mono font   .initial:n = { Latin Modern Mono }
137
-        ,scale maths .code:n    =
138
-          {
139
-            \msg_error:nnnn { MRTthesis } { wrong~engine }
140
-              { key ~ `scale~maths` } { pdftex }
141
-          }
160
+        ,mono font   .initial:n = { lmmono10-regular.otf }
142 161
       }
143 162
   }%<<<
144 163
   {%>>>
@@ -155,12 +174,10 @@
155 174
       }
156 175
     \keys_define:nn { MRTthesis / loadtime }
157 176
       {
158
-        scale maths .code:n =
177
+        scale maths .code:n =%>>>
159 178
           {
160 179
             \tl_if_empty:nTF { #1 }
161
-              {
162
-                \bool_set_true:N \l_MRTthesis_lmscale_bool
163
-              }
180
+              { \bool_set_true:N \l_MRTthesis_lmscale_bool }
164 181
               {
165 182
                 \str_case:nnF { #1 }
166 183
                   {
@@ -172,8 +189,35 @@
172 189
                     \PassOptionsToPackage { #1 } { MRTlmscale }
173 190
                   }
174 191
               }
175
-          }
192
+          }%<<<
176 193
         ,scale maths .initial:n = {}
194
+        ,new maths .code:n = %>>>
195
+          {
196
+            \tl_if_empty:nTF { #1 }
197
+              { \bool_set_true:N \l_MRTthesis_new_math_bool }
198
+              {
199
+                \str_case:nnF { #1 }
200
+                  {
201
+                    { off } { \bool_set_false:N \l_MRTthesis_new_math_bool }
202
+                    { on  } { \bool_set_true:N  \l_MRTthesis_new_math_bool }
203
+                  }
204
+                  {
205
+                    \bool_set_true:N \l_MRTthesis_new_math_bool
206
+                    \MRTifFloatTF { #1 }
207
+                      {
208
+                        \fp_set:Nn \l_MRTthesis_new_math_scale_fp { #1 }
209
+                      }
210
+                      {
211
+                        \msg_error:nnn { MRTthesis } { no~float }
212
+                          {
213
+                            the~value~\exp_not:n { #1 }~you~provided~to~
214
+                            `new~math`.
215
+                          }
216
+                      }
217
+                  }
218
+              }
219
+          }%<<<
220
+        ,new maths .initial:n = { 1.05 }
177 221
       }
178 222
   }%<<<
179 223
 %% <<<
@@ -190,6 +234,19 @@
190 234
 %% additional packages to achieve template formatting >>>
191 235
 %%=============================================================================
192 236
 \RequirePackage{MRTtab,MRTwuline}
237
+\bool_if:NTF \l_MRTthesis_british_bool
238
+  {% true >>>
239
+    \RequirePackage[main=british,ngerman]{babel}
240
+    \useshorthands{"}
241
+    \addto\extrasbritish{\languageshorthands{ngerman}}
242
+    \tl_set:Nn \l_MRTthesis_titlepage_von_tl { by }
243
+    \tl_set:Nn \l_MRTthesis_toc_Seite_tl { Page }
244
+  }% <<<
245
+  {% false >>>
246
+    \RequirePackage[ngerman]{babel}
247
+    \tl_set:Nn \l_MRTthesis_titlepage_von_tl { von }
248
+    \tl_set:Nn \l_MRTthesis_toc_Seite_tl { Seite }
249
+  }% <<<
193 250
 \bool_if:NTF \c_MRTthesis_xetex_or_luatex_bool
194 251
   {% true >>>
195 252
     \RequirePackage[no-math]{fontspec}
@@ -219,19 +276,6 @@
219 276
     \RequirePackage{helvet}
220 277
   }%<<<
221 278
 \renewcommand\familydefault{\sfdefault}
222
-\bool_if:NTF \l_MRTthesis_british_bool
223
-  {% true >>>
224
-    \RequirePackage[main=british,ngerman]{babel}
225
-    \useshorthands{"}
226
-    \addto\extrasbritish{\languageshorthands{ngerman}}
227
-    \tl_set:Nn \l_MRTthesis_titlepage_von_tl { by }
228
-    \tl_set:Nn \l_MRTthesis_toc_Seite_tl { Page }
229
-  }% <<<
230
-  {% false >>>
231
-    \RequirePackage[ngerman]{babel}
232
-    \tl_set:Nn \l_MRTthesis_titlepage_von_tl { von }
233
-    \tl_set:Nn \l_MRTthesis_toc_Seite_tl { Seite }
234
-  }% <<<
235 279
 \RequirePackage[singlespacing=true]{scrlayer-scrpage}
236 280
 \bool_if:NF \l_MRTthesis_no_geometry_bool
237 281
   {
@@ -255,6 +299,16 @@
255 299
 \RequirePackage{etoolbox}
256 300
 \RequirePackage[fleqn]{mathtools}
257 301
 % bad math fonts 
302
+\bool_if:NT \l_MRTthesis_new_math_bool
303
+  {
304
+    \RequirePackage{bm}
305
+    \RequirePackage[upint,slantedGreek]{newpxmath}
306
+    \DeclareSymbolFont{letters}{OML}{ztmcm}{m}{it}
307
+    \DeclareFontFamily{OML}{ztmcm}{\skewchar \font =127}
308
+    \DeclareFontShape{OML}{ztmcm}{m}{it}
309
+      { <-> s*[\fp_use:N \l_MRTthesis_new_math_scale_fp ] zptmcm7m }{}
310
+    \DeclareFontShape{OML}{ztmcm}{m}{sl}{<->ssub * ztmcm/m/it}{}
311
+  }
258 312
 \RequirePackage[italic,defaultmathsizes]{mathastext}
259 313
 \RequirePackage{isomath}
260 314
 \bool_if:NTF \l_MRTthesis_sfacc_height_bool

+ 1
- 1
issues.md View File

@@ -1,5 +1,5 @@
1 1
 # XeTeX and LuaTeX
2
-- `mathastext` has to be preceeded by `\usepackage[no-math]{fontspec}`
2
+- (solved) `mathastext` has to be preceeded by `\usepackage[no-math]{fontspec}`
3 3
 
4 4
 # MRTsfacc
5 5
 - (solved) nested use of `\mathaccentV` doesn't work properly

Loading…
Cancel
Save