summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-16 22:19:58 +0000
committerKarl Berry <karl@freefriends.org>2017-04-16 22:19:58 +0000
commitefe0b7a21b56319128ff8a157ccea02a51692268 (patch)
tree482d53be525233edcf36b12a8133fc9b48f2e667 /Master/texmf-dist
parentcacc7d77918eb955a4bc5bed894e8ea1445a6ba4 (diff)
novel (14apr17)
git-svn-id: svn://tug.org/texlive/trunk@43863 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/html-resources/fluffy-conspiracy.pngbin0 -> 8361 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/html-resources/font-tree.pngbin0 -> 11784 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/html-resources/fonts-in-use.pngbin104515 -> 95964 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/html-resources/greensmile.pngbin0 -> 1400 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/html-resources/human-robot-talk.pngbin0 -> 15341 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/html-resources/redfrown.pngbin0 -> 1335 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/novel-template.tex4
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-01-overview.html21
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-02-class-options.html4
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-03-metadata-pdfx.html4
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-04-layout.html4
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-05-fonts.html539
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-06-header-footer.html27
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-07-text-size-style.html6
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-08-images.html4
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-09-chapters-displays.html4
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty64
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-Images.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty144
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty5
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel.cls2
33 files changed, 469 insertions, 389 deletions
diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/fluffy-conspiracy.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/fluffy-conspiracy.png
new file mode 100644
index 00000000000..a27e371f8d4
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/fluffy-conspiracy.png
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/font-tree.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/font-tree.png
new file mode 100644
index 00000000000..2ae9c2e1dca
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/font-tree.png
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/fonts-in-use.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/fonts-in-use.png
index 043851dcf2e..d7a076bd7a0 100644
--- a/Master/texmf-dist/doc/lualatex/novel/html-resources/fonts-in-use.png
+++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/fonts-in-use.png
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/greensmile.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/greensmile.png
new file mode 100644
index 00000000000..dec553d83e4
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/greensmile.png
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/human-robot-talk.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/human-robot-talk.png
new file mode 100644
index 00000000000..4d6ab6d1b96
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/human-robot-talk.png
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/redfrown.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/redfrown.png
new file mode 100644
index 00000000000..a39480bae54
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/redfrown.png
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/novel-template.tex b/Master/texmf-dist/doc/lualatex/novel/novel-template.tex
index 6ba0791e48c..61b0dea5511 100644
--- a/Master/texmf-dist/doc/lualatex/novel/novel-template.tex
+++ b/Master/texmf-dist/doc/lualatex/novel/novel-template.tex
@@ -1,13 +1,13 @@
% !TeX program = LuaLaTeX
% !TeX encoding = UTF-8
-\documentclass{novel} % v. 1.0.10 or later
+\documentclass{novel} % v. 1.1 or later
% You may put this wherever your installation keeps templates.
% Many packages are pre-loaded. Nearly all settings are pre-configured.
% Some popular user settings:
% \SetTrimSize{}{}
% \SetMargins{}{}{}{}
% \SetHeadFootStyle{}
-% \SetMasterFont[]{}
+% \SetParentFont[]{}
% \SetTitle{}
% \SetAuthor{}
% \SetPDFX[]{}
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-01-overview.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-01-overview.html
index c25a4b63687..b49e4049452 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-01-overview.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-01-overview.html
@@ -69,12 +69,12 @@
</li>
<li><a href="#a1.5.4">1.5.4 Font Setup</a>
<ul>
- <li>\SetMasterFont, \SetHeadFont, \SetChapterFont, \SetSubchFont, \SetDecoFont, \SetSansFont, \SetMonoFont, \NewFontFamily, \NewFontFace</li>
+ <li>\SetParentFont, \SetHeadFont, \SetChapterFont, \SetSubchFont, \SetDecoFont, \SetSansFont, \SetMonoFont, \NewFontFamily, \NewFontFace</li>
</ul>
</li>
<li><a href="#a1.5.5">1.5.5 Other Configuration</a>
<ul>
- <li>\SetRectoheadText, \SetVersoHeadText, \SetEmblems, \SetPageNumberStyle, \SetLooseHead, \SetChapterDisplay, \SetIndentAfterScenebreak, \SetMarkerStyle, \microtypesetup, \setmainlanguage</li>
+ <li>\SetRectoheadText, \SetVersoHeadText, \SetEmblems, \SetPageNumberStyle, \SetLooseHead, \SetChapterStart, \SetIndentAfterScenebreak, \SetMarkerStyle, \microtypesetup, \setmainlanguage</li>
</ul>
</li>
</ul>
@@ -139,7 +139,7 @@
<div id="main">
<a id="thetop"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
<p><b>User Guide</b></p>
@@ -153,7 +153,7 @@
<p><a href="noveldocs-08-images.html">8. Using Images</a></p>
<p><a href="noveldocs-09-chapters-displays.html">9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</a></p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
</div>
@@ -554,23 +554,22 @@
<p>In <code>novel</code>, you will be using Open Type fonts loaded with features by the <code>fontspec</code> package. This permits much more flexibility than can be achieved using ancient <code>TeX</code> font methods. In particular, you never need <code>\usepackage{<em>fontname</em>}</code>, because available Open Type fonts can be loaded without LaTeX support files. If you are not already familiar with <code>LuaLaTeX</code> and <code>fontspec</code> with Open Type fonts, then forget <em>everything</em> you ever learned about <code>TeX</code> fonts, and start fresh.</p>
<p><code>TeX</code> ligatures, such as subtituting <code>&ldquo;</code> for <code>``</code>, are always enabled. Kerning (Open Type feature <code>kern</code>) is always enabled. Standard ligatures (Open Type feature <code>liga</code>) is enabled for fonts described in this section, including new fonts that you define. However, <code>liga</code> is <em>not</em> enabled by default for specialty fonts that will be described in later sections.</p>
-<pre class="noindentcmd">\SetMasterFont[features]{font family}</pre>
+<pre class="noindentcmd">\SetParentFont[features]{font family}</pre>
<p>Default: <code>Libertinus Serif</code></p>
<p>Alternate: <code>Linux Libertine O</code></p>
<p>Emergency Last Choice: <code>Latin Modern Roman</code></p>
-<p>Essential! Denoted <code>{*}</code> when used to define other fonts.</p>
<p>If you permit the default or alternate font family to be chosen automatically, then the Semibold weights will be used in place of Bold. This is not automatically done for any others, becuase most font families do not have Semibold.</p>
<pre class="noindentcmd">\SetHeadFont[features]{font family}</pre>
-<p>Default: <code>[Numbers=Lining, Scale=0.92]{*}</code></p>
+<p>Default: <code>[Numbers=Lining, Scale=0.92]{<em>based on parent font</em>}</code></p>
<p>Used in each element of headers and footers, unless overridden by other font commands.</p>
<pre class="noindentcmd">\SetChapterFont[features]{font family}</pre>
-<p>Default: <code>[Numbers=Lining, Scale=1.6]{*}</code></p>
+<p>Default: <code>[Numbers=Lining, Scale=1.6]{<em>based on parent font</em>}</code></p>
<p>Used in <code>\ChapterTitle{}</code> command</p>
<pre class="noindentcmd">\SetSubchFont[features]{font family}</pre>
-<p>Default: <code>[Numbers=Lining, Scale=1.2]{*}</code></p>
+<p>Default: <code>[Numbers=Lining, Scale=1.2]{<em>based on parent font</em>}</code></p>
<p>Used in <code>\ChapterSubtitle{}</code> command.</p>
<pre class="noindentcmd">Advanced:<br>\SetDecoFont[features]{font}</pre>
@@ -580,11 +579,13 @@
<pre class="noindentcmd">Advanced:<br>\SetSansFont[features]{font family}</pre>
<p>Default: <code>Libertinus Sans</code></p>
<p>Alternate: <code>Linux Biolinum O</code></p>
+<p>Emergency Last Choice: <code>Latin Modern Sans</code></p>
<p>Rarely used in fiction.</p>
<pre class="noindentcmd">Advanced:<br>\SetMonoFont[features]{font family}</pre>
<p>Default: <code>Libertinus Mono</code></p>
<p>Alternate: <code>Linux Libertine Mono O</code></p>
+<p>Emergency Last Choice: <code>Latin Modern Mono</code></p>
<p>Rarely used in fiction.</p>
<pre class="noindentcmd">Advanced:<br>\NewFontFamily\<i>yourfontcommand</i>[features]{font family}</pre>
@@ -617,7 +618,7 @@
<p>Default: <code>50</code></p>
<p>Tweaks tracking of header text, 0 to 200.</p>
-<pre class="noindentcmd">\SetChapterDisplay{<em>choice</em>}</pre>
+<pre class="noindentcmd">\SetChapterStart{<em>choice</em>}</pre>
<p>Default: <code>footer</code> (no header, footer only if used)</p>
<p>Sets the default page style for the start of new chapters. May be locally changed.</p>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-02-class-options.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-02-class-options.html
index fcde29cd1b4..c3f43ce7b46 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-02-class-options.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-02-class-options.html
@@ -37,7 +37,7 @@
<a id="thetop"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
@@ -52,7 +52,7 @@
<p><a href="noveldocs-08-images.html">8. Using Images</a></p>
<p><a href="noveldocs-09-chapters-displays.html">9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</a></p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
</div>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-03-metadata-pdfx.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-03-metadata-pdfx.html
index a706b72fb55..15a618ba5b7 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-03-metadata-pdfx.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-03-metadata-pdfx.html
@@ -58,7 +58,7 @@
<div id="main">
<a id="thetop"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
@@ -73,7 +73,7 @@
<p><a href="noveldocs-08-images.html">8. Using Images</a></p>
<p><a href="noveldocs-09-chapters-displays.html">9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</a></p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
</div>
<a id="a3"></a>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-04-layout.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-04-layout.html
index cc52734189e..369ceddda8f 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-04-layout.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-04-layout.html
@@ -65,7 +65,7 @@
<div id="main">
<a id="thetop"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
@@ -80,7 +80,7 @@
<p><a href="noveldocs-08-images.html">8. Using Images</a></p>
<p><a href="noveldocs-09-chapters-displays.html">9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</a></p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
</div>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-05-fonts.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-05-fonts.html
index 0e09e0fd533..869a67aff37 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-05-fonts.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-05-fonts.html
@@ -18,36 +18,48 @@
<ul>
-<li><a href="#a5.1">5.1 General Considerations</a>
+
+<li><a href="#a5.1">5.1 Parent Font and Descendants</a>
+ <ul>
+ <li><a href="#a5.1.1">5.1.1 Map of Font Positions</a></li>
+ <li><a href="#a5.1.2">5.1.2 Text Font</a></li>
+ <li><a href="#a5.1.3">5.1.3 Chapter Font</a></li>
+ <li><a href="#a5.1.4">5.1.4 Subch Font</a></li>
+ <li><a href="#a5.1.5">5.1.5 Head Font</a></li>
+ </ul>
+</li><!-- end 5.1 -->
+
+<li><a href="#a5.2">5.2 Other Pre-Defined Fonts</a>
<ul>
- <li><a href="#a5.1.1">5.1.1 Licensing</a></li>
- <li><a href="#a5.1.2">5.1.2 Technical</a></li>
- <li><a href="#a5.1.3">5.1.3 Appearance</a></li>
- <li style="margin-bottom:0px;"><a href="#a5.1.4">5.1.4 The Default Fonts</a><br>
- <span style="visibility:hidden">5.1.4 </span>Libertinus and NovelDeco</li>
- </ul></li><!-- end 5.1 -->
-<li><a href="#a5.2">5.2 Font Names, Files, Features</a>
+ <li><a href="#a5.2.1">5.2.1 Sans and Mono Fonts</a></li>
+ <li><a href="#a5.2.2">5.2.2 Math Font: Forget It</a></li>
+ <li><a href="#a5.2.3">5.2.3 Deco Font</a></li>
+ </ul>
+</li><!-- end 5.1 -->
+
+<li><a href="#a5.3">5.3 Defining New Fonts</a></li>
+
+<li><a href="#a5.4">5.4 Font Customization Syntax</a>
<ul>
- <li><a href="#a5.2.1">5.2.1 Font Family vs. File Name</a></li>
- <li><a href="#a5.2.2">5.2.2 Set/New by Family/Filename</a></li>
- <li><a href="#a5.2.3">5.2.3 Open Type Features</a><br>
- <span style="visibility:hidden">5.2.3 </span>kerning, ligatures, numbers,<br>
- <span style="visibility:hidden">5.2.3 </span>letters, and many others</li>
- <li><a href="#a5.2.4">5.2.4 Scale Pseudo-Feature</a></li>
- <li><a href="#a5.2.5">5.2.5 Color and Opacity</a></li>
- <li><a href="#a5.2.6">5.2.6 \CreateFeature{}</a></li>
- </ul></li><!-- end 5.2 -->
-<li><a href="#a5.3">5.3 Setting and Defining Fonts</a>
+ <li><a href="#a5.4.1">5.4.1 Font Family vs. File Name</a></li>
+ <li><a href="#a5.4.2">5.4.2 Set/New by Family/Filename</a></li>
+ <li><a href="#a5.4.3">5.4.3 Open Type Features</a><br>
+ <span style="visibility:hidden">5.4.3 </span>kerning, ligatures, numbers,<br>
+ <span style="visibility:hidden">5.4.3 </span>letters, and many others</li>
+ <li><a href="#a5.4.4">5.4.4 Scale Pseudo-Feature</a></li>
+ <li><a href="#a5.4.5">5.4.5 Color and Opacity</a></li>
+ <li><a href="#a5.4.6">5.4.6 \CreateFeature{}{}</a></li>
+ <li><a href="#a5.4.7">5.4.7 Local Feature Changes</a></li>
+ </ul>
+</li><!-- end 5.4 -->
+
+<li><a href="#a5.5">5.5 Shopping for Fonts</a>
<ul>
- <li><a href="#a5.3.1">5.3.1 General-Purpose Fonts</a><br>
- <span style="visibility:hidden">5.3.1 </span>master, sans, mono</li>
- <li style="margin-bottom:0px;"><a href="#a5.3.2">5.3.2 Novel-Specific Fonts</a><br>
- <span style="visibility:hidden">5.3.2 </span>chapter, header, and others</li>
- <li style="margin-bottom:0px;"><a href="#a5.3.3">5.3.3 New Font Commands</a></li>
- <li><a href="#a5.3.4">5.3.4 Which Font Features?</a></li>
- <li><a href="#a5.3.5">5.3.5 Local Feature Modifications</a></li>
- </ul></li><!-- end 5.3 -->
-<li><a href="#a5.4">5.4 Microtype Setup</a></li>
+ <li><a href="#a5.5.1">5.5.1 Licensing Issues</a></li>
+ <li><a href="#a5.5.2">5.5.2 Technical Issues</a></li>
+ <li><a href="#a5.5.3">5.5.3 Appearance Issues</a></li>
+ </ul>
+</li><!-- end 5.5 -->
</ul>
@@ -62,11 +74,11 @@
<div id="main">
-<a id="thetop"></a>
+<a id="a5"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
<p><b>User Guide</b></p>
@@ -80,96 +92,263 @@
<p><a href="noveldocs-08-images.html">8. Using Images</a></p>
<p><a href="noveldocs-09-chapters-displays.html">9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</a></p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
</div>
-<a id="a5"></a>
+
<h2 style="clear:none">5. Fonts</h2>
-<p>This page describes how to choose fonts and font features, and how to apply fonts within your document. If you are looking for information about how to specify the master text point size, see <a href="noveldocs-04-layout.html#a4.2.3">Page 4</a>. If you are looking for information about how to change the size of text within the body of your document, or about how to style text (such as italics), then see <a href="noveldocs-07-text-size-style.html">Page 7</a>.</p>
-<p><b>Don't panic!</b> This page contains a lot of material, but you probably don't need to know most of it. For example, suppose you are licensed for Adobe Garamond Pro, and wish to use it. Behold:</p>
-<p class="code"><code>\SetMasterFont{Adobe Garamond Pro}</code></p>
-<p>That's all you need to do. Then <code>novel</code> will take that setting, and automatically configure a number of other things.</p>
-<p>Forget TeX PostScript fonts such as <code>cmr</code> and encodings such as <code>T1</code>. This is the Twenty-First Century. You will be using Unicode, Open Type fonts, and font features.</p>
-<p>You may not have to choose or configure any fonts. The <code>novel</code> class is pre-configured with fonts carefully chosen for print fiction. They come with the SIL Open Font License, and can be used for commercial purposes. So, before you panic about having to learn a new way to handle fonts, try some test documents using the defaults.</p>
+<p>This page describes how to choose fonts and font features, and how to apply fonts within your document.</p>
+
+<p>If you are looking for information about how to specify the main text point size, see <a href="noveldocs-04-layout.html#a4.2.3">Page 4</a>.</p>
+
+<p>If you are looking for information about how to change the size of text within the body of your document, or about how to style text (such as italics), then see <a href="noveldocs-07-text-size-style.html">Page 7</a>.</p>
+
+<p><b>EEEK!</b> If you are like me, you <em>first</em> try to do something the way you did it before, then when it fails, you <em>finally</em> read the instructions. So, before you came to this page, you tried these things, and none of them worked:</p>
+
+<p class="code"><code>
+\usepackage{somefont} % FAILS!<br>
+\renewcommand\rmdefault{smf} \normalfont % FAILS!<br>
+\setmainfont{Some Font} % FAILS!
+</code></p>
+
+<p><b>DON'T PANIC.</b> In <code>novel</code>, the essential fonts are specified with different code. Fortunately, they are all pre-configured. If you accept the carefully-chosen defaults, then you do not need to worry about fonts. You do not even need to specify the font families. Sit back and relax.</p>
+
+<p>Or, you can do something like this, if you have the font license. Then let <code>novel</code> do the rest:</p>
+
+<p class="code"><code>\SetParentFont{Adobe Garamond Pro} % WORKS!</code></p>
+
+<p><b>It's that simple.</b> But TeX being what it is, there are complicated ways to customize things. The rest of this page shows you how to do it. You will be using Open Type fonts, or perhaps TrueType fonts. Forget the old Type 1 fonts.</p>
<a id="a5.1"></a>
-<h3>5.1 General Considerations</h3>
+<h3>5.1 The Parent Font and Descendants</h3>
-<p>Many TeX fonts are only available in older Type 1 format (PostScript) or even as bitmap metafonts. Do not use them.</p>
+<p>In <code>novel</code>, you do not directly set the default font, or the main font, or the roman font, or whatever. Instead, you set the parent font. The command:</p>
-<p>In some other cases, a TeX font package provides both the older format, and a newer Open Type (*.otf or *.ttf) format. The different formats will have different font names. Sometimes the difference is very slight. Carefully look at the font name for the Open Type format. Remember that most on-line discussions will refer to the older fonts, simply because they have been around longer.</p>
+<p class="code"><code>\SetParentFont[optional,features]{Font Family}</code></p>
-<p>Do not attempt to load a font by the <code>\RequirePackage</code> or <code>\usepackage</code> commands. That will cause TeX to look for the older PostScript fonts, which will probably fail with an eror message about being unable to find metrics. And, even if the fonts happen to load, they will be the wrong ones. Instead, if you choose to use fonts other than the defaults, load them via the font setting commands described on this page.</p>
+<p>The parent font, or <em>parentfont</em>, is the ancestor of several other fonts, wich will use the same font family unless you manually set them to something else:</p>
-<p>Update: Now, if you attempt to load a font the wrong way, you will get an error message.</p>
+<p class="centerimg"><img src="html-resources/font-tree.png" width="600" height="150" alt="parent and descendant fonts"></p>
-<a id="a5.1.1"></a>
-<h4>5.1.1 Licensing Issues</h4>
+<p>The <em>parentfont</em> has TeX ligatures and kerning, applied by default. All of the descendant fonts will also have TeX ligatures and kerning. (Note: TeX ligatures allow you to type <code>``</code> to get &ldquo; and so forth.)</p>
-<p>Presumably, you are writing your novel for commercial value, and do not intend to give anything away for free. For that reason, avoid fonts licensed under the GPL (GNU Public License) unless it has the font exception clause. Some TeX fonts are licensed under GPL, so watch out.</p>
+<p>If you specify any optional features for the <em>parentfont</em>, they will automatically be applied to descendants: <em>textfont</em>, <em>chapterfont</em>, <em>subchfont</em>, and <em>headfont</em>.</p>
-<p>Beware of fonts "free for personal use" from download sites. Your commercial application is not "personal use." Of course, if you like the font, you may purchase its commercial license.</p>
+<p>If you do not set the <em>parentfont</em> yourself, then the following will be used as default, in order of priority: <em>Libertinus Serif</em>, <em>Linux Libertine O</em>, <em>Latin Modern Roman</em>.
-<p>Also beware of fonts generically labeled as "freeware" with no particular designer name. If you don't know who created the font, then how do you know that it can be given away for free? Even if there is a designer name, some of them had second thoughts about "freeware." They intended the fonts to be free only if you give your own work away for free. But they didn't mention it. Maybe they have no legal recourse, but you don't want them making anonymous negative reviews of your book.</p>
+<p>The <em>Libertinus Serif</em> fonts are well-suited to fiction. If in doubt, use them. They can be downloaded as TeX <code>libertinus</code> package, but do not write <code>\usepackage{libertinus}</code> in your Preamble. Those fonts are a more up-to-date fork of the <em>Linux Libertine O</em> fonts, which are in the <code>libertine</code> package. Alas, even though <em>Latin Modern Roman</em> is a fine font, its style and weight are not well-suited to fiction; the only reason they are a last-choice default, is because just about every TeX system has them.</p>
-<p>You have numerous fonts already installed in your operating system, and perhaps others that came bundled with a particular application. If you intend to use those fonts, carefully read their licenses. It is often the case that fonts bundled with an application may <em>only</em> be used for documents created within, or processed by, that application.</p>
+<p style="font-size:small">Note: In class version 1.0.10 and earlier, the <em>parentfont</em> was known as the <em>masterfont</em>, and the <em>textfont</em> was known as the <em>mainfont</em>. For backwards compatibility, both will work.</p>
-<p>Always look for a Copyright notice, which can be identified with a particular person or organization. Copyright is good! It means that someone is claiming authorship of the font software. Only the Copyright owner has the right to give the font away for free, or license it to you after payment (often through an intermediary).</p>
-<p>If you prefer free fonts, the most widely accepted license is the <em>SIL Open Font License</em>. This allows you to use the font for commercial purposes, embed it in PDF, modify it to suit your needs (if you change the font name), and even re-distribute the modifications. The default fonts chosen for <code>novel</code> use this license.</p>
+
+<a id="a5.1.1"></a>
+<h4>5.1.1 Map of Font Positions</h4>
+
+<p>The <em>parentfont</em> is not directly used, anywhere in your document. Instead, its descendants are specialized for use in different situations. Here is a typical page spread, using some of the pre-configured choices for chapters and headings:</p>
+
+<p class="centerimg"><img src="html-resources/fonts-in-use.png" width="532" height="408" alt="fonts in use"></p>
+
+<p>If you use the <code>novel</code> pre-configured style commands, then the correct font will automatically be applied. That is the recommended, no-brainer method. If instead you choose to write your own custom styles, then you will also need to specify the fonts; but this allows you more TeX coding flexibility.</p>
+
<a id="a5.1.2"></a>
-<h4>5.1.2 Technical Issues</h4>
+<h4>5.1.2 The Text Font</h4>
-<p>Many fonts have technical errors, even among professional fonts. Some of the errors are so minor that they are not worth fixing. This is particularly true for glyphs that are missing extrema.</p>
+<p>The text font, or <em>textfont</em>, is the default main font used used for ordinary, flowing text. It uses the <em>parentfont</em>, with added features: common ligatures, and oldstyle numbers.</p>
+
+<p>Common ligatures (the Open Type <em>liga</em> feature) are such things as replacing f<span style="position:relative; left:2px">f</span> with the single character ff. Oldstyle numbers are designed to blend with surrounding text. Not every font has these features; if they are missing, then whatever the font actually has, is used instead.</p>
+
+<p>Normally, you do not need to call the <em>textfont</em> explicity, because it is the default for ordinary text. But in the event that you have a small passage in <em>textfont</em>, within a passage in some other font, you can do this:</p>
+
+<p class="code"><code>{\textfont <em>text</em>}</code></p>
+
+<p>Note that <code>{\textfont <em>text</em>}</code> and <code>{\rmfamily <em>text</em>}</code> mean the same thing.</p>
+
+<p>You do not set the <em>textfont</em> itself. It inherits from the <em>parentfont</em>.</p>
-<p>However, beware of fonts that are based on traced artwork. The late 1990s had an explosion of amateur dingbat and decorative fonts produced this way, by scanning images from old books and digitizing the scan. The resulting vector glyphs rarely meet standards, and often are quite awful. The problem is that when a commercial printer renders your PDF to print, the printer's software is very different from what you have on your home computer. A technically erroneous glyph might look OK at home, but be rejected commercially.</p>
-<p>If you have the knowledge, you can open a font in font editor software (such as FontForge) and ask it for validation. Missing extrema are rarely a problem, even if a lot of them are missing. Self-intersecting glyphs are not a problem if the the glyph is composed of two elements stuck together, such as Ç composed of C with separate cedilla. However, a self-intersecting glyph may be a problem if its lines criss-cross each other. Open paths, and outer paths drawn the wrong way, are often a problem. If the errors are confined to glyphs that you will not be using, then it can pass.</p>
<a id="a5.1.3"></a>
-<h4>5.1.3 Appearance Issues</h4>
+<h4>5.1.3 The Chapter Title Font</h4>
-<p>There are general expectations for book fonts, in terms of character sizes and shapes, and weights. Many of the widely-used TeX fonts, including Latin Modern, are unacceptable in fiction for this reason. The most commonly-used font in word processors, Times New Roman, is only marginally acceptable for fiction, and only because it is so often used by amateur writers who don't know how to change the font (but write books advising you to change your lifestyle).</p>
+<p>The <code>novel</code> command <code>\ChapterTitle{<em>text</em>}</code> automatically styles its text in the <em>chapterfont</em>.</p>
-<p>The best way to assess a font is to print it to paper. Computer screens rarely show details, except at large magnification. Depending on whom you ask for an opinion, fiction is most easily read when there are about 60 to 66 characters (including spaces) per line. To evaluate a font for the main text, print out some paragraphs about 4" to 4.25" wide, and scale the font's point size so that you get an average number of characters per line in that range. Be sure to do that: Adobe Garamond Pro at 12pt, Libertinus Serif at 11.4pt, and Libre Caslon Text at 9.6pt (!) provide about the same number of characters per line of text. At the proper point size, some fonts will look too dark, and others will look too light.</p>
+<p>If you write custom code for chapter titles, then whether or not you use this font is your choice. It is not automatic. If you wish to use it:</p>
-<p>Things to look for: Are the lowercase letters too tall? If they are, then it is hard for readers in many Western languages to find where sentences start, by looking for capital letters. Also, there is less white space between lines, which makes the text appear dense and harder to read. Is the shape of the characters so natural that you don't notice them? That's good! It is your writing, not the font, that is to be noticed. Remember that some fonts are designed for use at large size, in posters; such fonts tend to look mechanical in fiction. Other fonts are designed for computer screens; the letters will be too widely-spaced in fiction. Nearly all modern fonts have decent kerning and important ligatures, so that's not usually a decisive factor.</p>
+<p class="code"><code>{\chapterfont <em>text</em>}</code></p>
+
+<p>You may customize the <em>chapterfont</em>:</p>
+
+<p class="code"><code>\SetChapterFont[optional,features]{Font Family} % Note command case!</code></p>
+
+<p>If you do not use the above command to customize the <em>chapterfont</em>, then by default it will be the <em>parentfont</em> with added features: Lining numbers, and 1.6 scale.</p>
-<p>The prevailing rule: If you notice the font, it's wrong.</p>
<a id="a5.1.4"></a>
-<h4>5.1.4 The Default Fonts</h4>
+<h4>5.1.4 The Chapter Subtitle Font</h4>
+
+<p>The <code>novel</code> commands <code>\ChapterSubtitle{<em>text</em>}</code> and <code>\QuickChapter{<em>text</em>}</code> automatically style their text in the <em>subchfont</em>.</p>
-<p>After considerable examination of fonts, both within and without TeX, I settled on the <em>Libertinus</em> font family. This is a fork of the well-known <em>[Linux] Libertine</em> and <em>Biolinum</em> fonts. Libertinus is available only as Open Type, and can be installed as TeX package <code>libertinus</code>, or downloaded separately. Note that <code>\RequirePackage{libertinus}</code> and <code>\usepackage{libertinus}</code> <em>do not work</em>. You have to get the fonts yourself.</p>
+<p>If you write custom code for chapter subtitles or quick chapters, then whether or not you use this font is your choice. It is not automatic. If you wish to use it:</p>
-<p>Libertinus Serif has a favorable combination of quality, character set, Open Type features, glyph design, and licensing. Its character shapes are very good for flowing text, as in fiction. Do not confuse [Linux] Libertine or Libertinus with <em>Liberation</em>, which is a font resembling Times New Roman with a "word processor" look about it.</p>
+<p class="code"><code>{\subchfont <em>text</em>}</code></p>
-<p>If you don't have Libertinus, then <code>novel</code> will look for [Linux] Libertine and Biolinum. If you don't have those either, then solely for the purpose of providing minimal working examples, the Latin Modern fonts will be used as a last resort. But don't rely on Latin Modern for an actual book! Set your own Open Type fonts, or install Libertinus or Libertine/Biolinum.</p>
+<p>You may customize the subchfont:</p>
-<p>Class <code>novel</code> is bundled with its own custom font, NovelDeco. This font provides some hard-to-find capabilities that you might find useful.</p>
+<p class="code"><code>\SetSubchFont[optional,features]{Font Family} % Note command case!</code></p>
+
+<p>If you do not use the above command to customize the <em>subchfont</em>, then by default it will be the <em>parentfont</em> with added features: Lining numbers, and 1.2 scale.</p>
+
+
+
+<a id="a5.1.5"></a>
+<h4>5.1.5 The Header/Footer Font</h4>
+
+<p>The <code>novel</code> pre-configured header/footer layouts automatically style their text in the <em>headfont</em>.
+
+<p>If you write a customer header/footer layout (using <code>fancyhdr</code> syntax), then whether or not you use this font is your choice. It is not automatic. If you wish to use it:</p>
+
+<p class="code"><code>{\headfont <em>text</em>}</code></p>
+
+<p>You may customize the headfont:</p>
+
+<p class="code"><code>\SetHeadFont[optional,features]{Font Family} % Note command case!</code></p>
+
+<p>If you do not use the above command to customize the <em>headfont</em>, then by default it will be the <em>parentfont</em> with added features: Lining numbers, and 0.92 scale.</p>
-<p>Libertinus, Libertine/Biolinum, and NovelDeco are licensed under the SIL Open Font License.</p>
-<p>Remember: You do not have to use TeX fonts. If you have the license for a font such as Adobe Garamond Pro, and wish to use it, you can easily do so.</p>
<a id="a5.2"></a>
-<h3>5.2 Font Names, Files, and Features</h3>
+<h3>5.2 Other Pre-Defined Fonts</h3>
+
+<p>There are also a few pre-defined font commands that are "unrelated to" the <em>parentfont</em>.</p>
+
+
+<a id="a5.2.1"></a>
+<h4>5.2.1 Sans and Mono Fonts</h4>
+
+<p>You probably do not need a sans-serif or monospaced font in a work of fiction. The most prominent exception might be headers/footers, where the use of a light sans-serif font is fashionable. But in that case, set the <em>headfont</em> to the desired sans-serif font, instead of inheriting from <em>parentfont</em>.</p>
+
+<p>The <code>novel</code> class does not have its own commands for setting or using sans-serif or monospaced fonts. If you wish, you may use ordinary <code>fontspec</code> syntax to set them:</p>
+
+<p class="code"><code>
+\setsansfont[optional,features]{Font Family}<br>
+\setmonofont[optional,features]{Font Family}
+</code></p>
+
+<p>Then, you may use them with ordinary LaTeX commands:</p>
+
+<p class="code"><code>
+{\sffamily <em>sans-serif text</em>}<br>
+{\ttfamily <em>monospaced text</em>}
+</code></p>
+
+<p>If you do not set these fonts, then the defaults are: <em>Libertinus Sans</em>, or <em>Linux Biolinum O</em>, or <em>Latin Modern Sans</em> for the sans-serif font; <em>Libertinus Mono</em>, or <em>Linux Libertine Mono O</em>, or <em>Latin Modern Mono</em> for the monospaced font.</p>
+
+
+
+<a id="a5.2.2"></a>
+<h4>5.2.2 Math Font: Forget It!</h4>
+
+<p>The <code>novel</code> class is not set up to do math. Seriously. In fact, the dollar sign $ is an ordinary character, and does not enter or leave math mode after <code>\begin{document}</code>.</p>
+
+<p>Nevertheless, TeX being what it is, there is a behind-the-secene choice of a math font, which (hopefully) your document will never use. The code automatically looks for <em>Libertinus Math,</em> or <em>Asana-Math</em>, or <em>Latin Modern Math</em>.</p>
+
+<p>Otherwise, there is no special command for choosing a math font, and no special command for using it. Proof left to student.</p>
+
+
+
+<a id="a5.2.3"></a>
+<h4>5.2.3 The Deco Font</h4>
+
+<p>The <code>novel</code> class ships with its own custom font, <em>NovelDeco.otf</em>. This Open Type font is specifically designed to provide a number of decorative glyphs, and some other characters. It is <em>not</em> a general-purpose font, and can <em>not</em> be replaced by any other font, except by a modified version of <em>NovelDeco</em>.</p>
+
+<p>The <em>decofont</em> is automatically configured. You do not need to set it. However, if you use a font editor to create a modified version, then your modification must have a different font name (to avoid confusion with the original). In such a rare case, you may point to your modified font like this:</p>
+
+<p class="code"><code>\SetDecoFont[optional,features]{YourDecoFont}</code></p>
+
+<p>The <em>decofont</em> is automatically called by other commands, such as <code>\decoglyph{}</code> and <code>\acronym{}</code>. Normally you do not request <em>decofont</em> directly. But if you wish to do so:</p>
+
+<p class="code"><code>{\decofont <em>text</em>}</code></p>
+
+
+
+
+<a id="a5.3"></a>
+<h3>5.3 Defining New Fonts</h3>
+
+<p>You can define new font commands. The syntax depends on whether the new font is part of a family (where you might have bold and italic variants), or just a single file (no variants). If part of a family, use <code>\NewFontFamily</code>. If alone, use <code>\NewFontFace</code>.</p>
+
+<p>Note that if you define a font <em>family</em> when you should have just defined a font <em>face</em>, there will be complaints in the log file, because the font loaded cannot find the (nonexistent) other members of the family. But the document will compile. On the other hand, if you define a font <em>face</em> when you should have defined a font <em>family</em>, then commands for bold or italic will have no effect, since the other family members were not loaded. Again, the document will compile.</p>
-<p>If you have used Open Type fonts before, then much of this will be familiar to you. But do glance through it. The use of exotic and context-dependent features will not be discussed, partly because they are rarely used in fiction, and partly because I lack experience in using them.</p>
+<p>The <code>\NewFontFamily</code> command (or <code>\NewFontFace</code>) takes three arguments: First, the name of the new font command is required. Second, font features are optional. Third, the font name is required.</p>
+
+<p style="margin-top:16px"><b>Example:</b> Suppose your work is science fiction, and one if its characters is a talking robot. You wish to depict its utterances in a robotic-looking font, which will be called using a new <code>\robovoice</code> command. You shop around, and find that the <em>Orbitron</em> font suits your purpose, except that it is too large compared to your <em>textfont</em>. So, you scale it.</p>
+
+<p>In the Preamble, you define the new font command:</p>
+
+<p class="code"><code>\NewFontFace\robovoice[Scale=0.8]{Orbitron} % not part of a family</code></p>
+
+<p>After some experimentation, you realize that the <code>\robovoice</code> letters need to be spread apart a bit. This is accomplished using the standard LaTeX <code>\textls</code> command.</p>
+
+<p>In the document body:</p>
+
+<p class="code"><code>
+``Want some oil?'' asked Captain Withens.\par<br>
+\textls{\robovoice ``Is it Gamma-42 Special oil?''} asked the robot.\par<br>
+``No, I got it on sale at Cosmo-Mart.''\par<br>
+\textls{\robovoice ``Forget it. I'm an oil gourmet.''}\par
+</code></p>
+
+<p>The result:</p>
+
+<p class="centerimg"><img src="html-resources/human-robot-talk.png" width="483" height="127" alt="conversation, human-robot"></p>
+
+<p>Caution: If you are using a new font within body text (as above), then it is a bad idea to use Scale greater than 1.0. Reason: An excessively tall font will cause lines to spread apart.</p>
+
+
+<p style="margin-top:16px"><img class="floatright" src="html-resources/fluffy-conspiracy.png" width="265" height="409" alt="the fluffy conspiracy"> <b>Example:</b> Suppose that you wish to style the title of your book, in a font that is not used for other things such as chapter titles. You purchase a license for the <em>Bernhard Modern Std</em> fonts, in Regular and Italic.</p>
+
+<p>In the Preamble:</p>
+
+<p class="code"><code>\NewFontFamily\booktitlefont{Bernhard Modern Std}</code></p>
+
+<p>The title page, using <code>\charscale</code> for size:</p>
+
+<p class="code"><code>
+\thispagestyle{empty}<br>
+\vspace*{7\nbs}<br>
+\begin{center}<br>
+\charscale[3]{\booktitlefont The \textit{Fluffy} Conspiracy}\par<br>
+\vspace{6\nbs}<br>
+\charscale[2]{Priscilla Milde}\par<br>
+\vfill<br>
+Nonexistent Publications • Portland, Oregon\par<br>
+\end{center}
+</code></p>
+
+<p style="clear:both; margin-top:16px; font-size:small">Note: Command \NewFontFamily is identical to \newfontfamily, and command \NewFontFace is identical to \newfontface.</p>
+
+
+
+
+<a id="a5.4"></a>
+<h3>5.4 Font Customization Syntax</h3>
<p>You will be using <code>fontspec</code> syntax to select your own fonts. Much of what follows is a digested portion of the full <code>fontspec</code> documentation. There are many more features, and ways to use them, than will be described below.</p>
-<a id="a5.2.1"></a>
-<h4>5.2.1 Font (Family) Name vs. Font File Name</h4>
+
+<a id="a5.4.1"></a>
+<h4>5.4.1 Font (Family) Name vs. Font File Name</h4>
<p>A <em>font file</em> is an individual file, with its own <em>file name</em>, including file extension. For example, libertinusserif-regular.otf and libertinusserif-italic.otf are two different font files. This much is obvious.</p>
@@ -185,8 +364,8 @@
-<a id="a5.2.2"></a>
-<h4>5.2.2 Set/New by Font Name vs. File Name</h4>
+<a id="a5.4.2"></a>
+<h4>5.4.2 Set/New by Font Name vs. File Name</h4>
<p>When you set an existing font, or create a new font command, you can use either the font (family) name, or the specific font file name. However, there may be a big difference in results!</p>
@@ -231,8 +410,8 @@
<p>Note that the font file in braces is the one used as the "regular" font, in this definition.</p>
-<a id="a5.2.3"></a>
-<h4>5.2.3 Open Type Features</h4>
+<a id="a5.4.3"></a>
+<h4>5.4.3 Open Type Features</h4>
<p>Features are variations, contained within a single font file. In the bad old days, when you wanted true small caps, you had to load a separate font file that had them (and did not have ordinary lowercase letters). Now, if an Open Type font file has the "smcp" feature, you obtain the small caps from within the same file, by asking for them. Requests for the feature may be made on-the-fly, or pre-loaded for global use.</p>
@@ -259,7 +438,7 @@ Some Frequently-Used Open Type Features
<tr>
<td><p>common ligatures</p></td>
<td><p>liga</p></td>
-<td><p>Ligatures=Common<br><em>enabled: mainfont, sansfont</em></p></td>
+<td><p>Ligatures=Common<br><em>enabled: textfont, sansfont</em></p></td>
</tr>
<tr>
<td><p>Tex ligatures</p></td>
@@ -284,7 +463,7 @@ Some Frequently-Used Open Type Features
<tr>
<td><p>oldstyle numerals</p></td>
<td><p>onum</p></td>
-<td><p>Numbers=OldStyle<br><em>enabled: mainfont, sansfont</em></p></td>
+<td><p>Numbers=OldStyle<br><em>enabled: textfont, sansfont</em></p></td>
</tr>
</tbody>
</table>
@@ -309,8 +488,8 @@ Some Frequently-Used Open Type Features
<p>&bull; There are many more Open Type features, most of which are not useful in ordinary fiction writing. Fonts rarely have more than a few features. Some features (such as the ones shown above) have a specific meaning. Other features, such as "style sets", have whatever meaning the font designer assigns them; Thus the "ss03" feature of one font may do something very different from "ss03" in a different font.</p>
-<a id="a5.2.4"></a>
-<h4>5.2.4 Scale as Pseudo-Feature</h4>
+<a id="a5.4.4"></a>
+<h4>5.4.4 Scale as Pseudo-Feature</h4>
<p>Although it is not an Open Type feature, <code>Scale=<em>number</em></code> may be written like a feature. <code>Scale</code> globally adjusts the size of the font, relative to what it would otherwise be. If a local font size command is also applied, then the result is the compounded value.</p>
<p>If the font will be mingled with other fonts in the same place, Scale can tweak a font so that it does not stand out. If Scale does not exceed 1, then the baselineskip will not be affected. Over 1 risks spreading lines to accomodate the extra size; this should not be done for fonts that will appear in the flowing main text. But over 1 is acceptable for display fonts that do not wrap lines and do not mingle with main text.</p>
@@ -327,8 +506,8 @@ Some Frequently-Used Open Type Features
<p>Scale is more often used for fonts that are pre-defined to have a special meaning and location, such as chapter titles or page headers. There, the font is not mingled with ordinary text, and it is OK to use a larger Scale. Then, it is not necessary to use local font scaling commands each time the font is used.</p>
-<a id="a5.2.5"></a>
-<h4>5.2.5 Color and Opacity</h4>
+<a id="a5.4.5"></a>
+<h4>5.4.5 Color and Opacity</h4>
<p>Even though the <code>fontspec</code> syntax allows you to set <code>Color</code> and <code>Opacity</code> as pseudo-features when you define a font, <em>the novel class blocks these features.</em> If you attempt to set them as features in a font definition, an error will result. The same applies if you attempt to add them, using <code>\addfontfeature</code>. However, you can still make use of grayscale using ordinary, local color commands.</p>
<p>When you use the <code>graytext</code> class option, you may write text in grayscale, using commands from the included <code>xcolor</code> package. You should only do this for text that is in special locations. For example, if you begin each chapter with a number that is very large, you might wish to make that number gray, so that it does not overpower the main text.</p>
@@ -336,8 +515,9 @@ Some Frequently-Used Open Type Features
<p>If <code>graytext</code> is not chosen as class option, then any color (even white) will be rendered as black.</p>
-<a id="a5.2.6"></a>
-<h4>5.2.6 \CreateFeature{<em>code</em>}{<em>substitutions</em>}</h4>
+
+<a id="a5.4.6"></a>
+<h4>5.4.6 \CreateFeature{<em>code</em>}{<em>substitutions</em>}</h4>
<p>Once in a while, a font has a glyph that you would like to use, but it is not included in any of the font's Open Type feature sets. So, how to you grab that particular glyph? For example: One well-known font has a glyph named <em>emdash.alt</em>, which is not as long as the font's ordinary <em>emdash</em> glyph, and looks better in text. Unfortunately, <em>emdash.alt</em> is not in any of the font's style sets. Without some trickery, only a program such as InDesign can grab that glyph.</p>
<p>Thanks to the included <code>fontspec</code> 2016 update, <code>novel</code> has the necessary trickery. Command <code>\CreateFeature</code> creates a fake Open Type feature code, and assigns your list of substitutions to that code. Use comma-separated entries if there are multiple substitutions. For the case in question:</p>
@@ -348,200 +528,91 @@ Some Frequently-Used Open Type Features
<p class="code"><code>\SetMasterFont[RawFeature=+myem]{Adobe Garamond Pro}</code></p>
-<p>Of course, the fake feature has no effect if the font does not have the subsitution. Note that this technique is only used for a list of subtitutions, not for ligatures or any context-dependent features.</p>
-
-
-
-<a id="a5.3"></a>
-<h3>5.3 Setting and Defining Fonts</h3>
-
-<p>Some font commands are pre-defined by <code>fontspec</code>, for general purposes. These indicate the kind of font: main (meaning serif), sans, or mono. They may be used wherever you wish, for any purpose. Only the <em>mainfont</em> has a particular meaning, as the standard default font for your book text.</p>
-
-<p>Other pre-defined font commands are specific to <code>novel</code>. These fonts are used in specific places, or for specific purposes. They are called by other macros, and are not normally available for general purposes.</p>
-
-<p>Whether the font command is pre-defined by <code>fontspec</code> or by <code>novel</code>, it is "set". But you can also create your own font commands, which are "new". The syntax is explained below.</p>
-
-<p>When more than one feature is used, they must be separated by commas.</p>
-
-
-
-<a id="a5.3.1"></a>
-<h4>5.3.1 Setting Pre-Defined, General-Purpose Font Commands</h4>
-
-<p>As a matter of coding style, I use capital camel case ForImportantSettings. Notice that this document class uses <code>\SetMasterFont</code> rather than <code>\setmainfont</code></p>
-
-<p>Several standard font selection commands are not specific to <code>novel</code>. You may never need them, but here they are:</p>
-
-<div class="fontcommand">
-<pre><b>mainfont</b></pre>
-<p>Intended Usage: serif. Normal text.</p>
-<p>Default features: OldStyle numbers, kerning, common ligatures, TeX ligatures.</p>
-<p>Preamble: <code>\SetMasterFont[<em>features</em>]{<em>font</em>}</code></p>
-<p>Document: <code>\rmfamily{<em>text</em>}</code></p>
-<p>Pre-Configured Font: Libertinus Serif, using Semibold instead of Bold.</p>
-<p>Backup Font: If you do not have Libertinus Serif, then Linux Libertine O will be tried.</p>
-</div>
-
-<div class="fontcommand">
-<pre><b>sansfont</b></pre>
-<p>Intended Usage: sans-serif. Rarely used in fiction.</p>
-<p>Default features: OldStyle numbers, kerning, common ligatures, TeX ligatures.</p>
-<p>Preamble: <code>\SetSansFont[<em>features</em>]{<em>font</em>}</code></p>
-<p>Document: <code>\sffamily{<em>text</em>}</code></p>
-<p>Pre-Configured Font: Libertinus Sans</p>
-<p>Backup Font: If you do not have Libertinus Sans, then Linux Biolinum O will be tried.</p>
-</div>
-
-<div class="fontcommand">
-<pre><b>monofont</b></pre>
-<p>Intended Usage: monospaced. Rarely used in fiction.</p>
-<p>Default features: TeX ligatures.</p>
-<p>Preamble: <code>\SetMonoFont[<em>features</em>]{<em>font</em>}</code></p>
-<p>Document: <code>\ttfamily{<em>text</em>}</code></p>
-<p>Pre-Configured Font: Libertinus Mono</p>
-<p>Backup Font: If you do not have Libertinus Mono, then Linux Libertine Mono O will be tried.</p>
-</div>
+<p>Of course, the fake feature has no effect if the font does not have the substitution character.</p>
-<p>In all of the above cases, if neither the default nor backup font is found, and you do not set the font yourself, then Latin Modern (Open Type) fonts will be used, but only because you have them.</p>
+<p>This technique may be used for more complicated features, but that is beyond the scope of this documentation. See the <code>fontspec</code> manual if you need to do more.</p>
-<p>&bull; You should never need math mode in a novel. To prevent the software from loading Computer Modern fonts, package <code>unicode-math</code> is used. Note that in <code>novel</code>, the dollar sign <code>$</code> has its ordinary meaning as dollar, once the Preamble completes. It is <em>not</em> a means to enter or leave math mode.</p>
+<a id="a5.4.7"></a>
+<h4>5.4.7 Local Modifications to Open Type Features</h4>
+<p>If you specify a particular Open Type feature, it will be generally used for that font command. So if you define a new font command with <code>Letters=SmallCaps</code> as a feature (and if the font actually has them), then small caps will be used for that font, whether or not you locally request them with a command such as <code>\textsc</code>.</p>
-<a id="a5.3.2"></a>
-<h4>5.3.2 Setting Novel-Specific, Pre-Defined Font Commands</h4>
+<p>Often, you can add (or sometimes remove) features on a local basis. For example, suppose that you defined the font without using is <code>ss03</code> style set. You can locally add that feature to some text, using a command that looks like this:</p>
-<p>Class <code>novel</code> comes with a variety of pre-configured header/footer styles and chapter titles. These are described in detail on other documentation pages. You do not have to set these unless you wish to do so, because all of them (except <code>decofont</code> will default to variations on the main font.</p>
-<p>Each of these font commands has an "intended" usage, shown in the following map. When you allow <code>novel</code> to style your document, it will automatically choose the right font for the right place. But if you create custom styles, you will have to specify the fonts.</p>
+<p class="code"><code>{\addfontfeature{<em>which feature</em>} <em>applied to this text</em>}</code></p>
-<p class="centerimg"><img src="html-resources/fonts-in-use.png" width="660" height="530" alt="map of standard font locations"></p>
+<p>The above code assumes that you are already using the font in that location. You cannot apply <code>ss03</code> from one font to an entirely different font!</p>
-<div class="fontcommand">
-<pre><b>chapterfont</b></pre>
-<p>Intended Usage: chapter titles.</p>
-<p>Default features: kerning, TeX ligatures.</p>
-<p>Preamble: <code>\SetChapterFont[<em>features</em>]{<em>font</em>}</code></p>
-<p>Document: <code>{\chapterfont <em>text</em>}</code></p>
-<p>Pre-Configured Font: Duplicate of mainfont, but at Scale=1.6.</p>
-</div>
+<p>See the <code>fontspec</code> documentation for details of <code>\addfontfeature</code>.</p>
-<div class="fontcommand">
-<pre><b>subchfont</b></pre>
-<p>Intended Usage: chapter subtitles</p>
-<p>Default features: kerning, TeX ligatures.</p>
-<p>Preamble: <code>\SetSubchFont[<em>features</em>]{<em>font</em>}</code></p>
-<p>Document: <code>{\subchfont <em>text</em>}</code></p>
-<p>Pre-Configured Font: Duplicate of mainfont, but at Scale=1.2.</p>
-</div>
+<p>As an alternative to changing features locally, you can define different font commands to call the same underlying font, but with different features.</p>
-<div class="fontcommand">
-<pre><b>headfont</b></pre>
-<p>Intended Usage: page header and footer</p>
-<p>Default features: kerning, TeX ligatures.</p>
-<p>Preamble: <code>\SetHeadFont[<em>features</em>]{<em>font</em>}</code></p>
-<p>Document: <code>{\headfont <em>text</em>}</code></p>
-<p>Pre-Configured Font: Duplicate of mainfont, but at Scale=0.92.</p>
-</div>
+<p>Two ways to accomplish the same thing:</p>
-<div class="fontcommand">
-<pre><b>decofont</b></pre>
-<p>Intended Usage: special decorations and acronyms</p>
-<p>Most usage of <em>decofont</em> is indirect, via <code>\decoglyph</code> and <code>\acronym</code> commands.</p>
-<p>Default features: kerning, TeX ligatures.</p>
-<p>Preamble: <code>\SetDecoFont[<em>features</em>]{<em>font</em>}</code></p>
-<p>Document: <code>{\decofont <em>text</em>}</code></p>
-<p>Pre-Configured Default: NovelDeco.otf &nbsp; <em>see explanation below</em></p>
-</div>
+<p class="code"><code>
+\NewFontFamily\baskf{BaskervilleF}<br>
+\NewFontFamily\baskftab[Numbers=Monospaced]{BaskervilleF} % tnum feature<br>
+\begin{document}<br>
+Some text {\baskftab hello 123} is here.<br>
+Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here.
+</code></p>
-<p>&bull; The defaults will automatically track a change to the mainfont. For example, if you choose Adobe Garamond Pro as the mainfont, then the chapterfont (and all the others except decofont) will be variations of Adobe Garamond Pro. You may still manually set them to other fonts or with other features.</p>
-<p>&bull; In <code>novel</code>, certain styles use the fonts according to their descriptive command name. For example, <code>chapterfont</code> is intended for chapter titles. If you use one of the pre-defined chapter title commands, this font will be automatically selected, without the need for you to write <code>{\chapterfont&nbsp;<em>title</em>}</code>. If you choose to create your own chapter styles, you do not have to use <code>chapterfont</code>. But if you do, it will be easier to keep track of things. Similarly, you could use <code>chapterfont</code> outside of chapter titles, but that could lead to confusion if you lose track of your own coding.</p>
-<p>&bull; The same applies to the other pre-defined fonts. Each has a place where it is used by default in pre-defined styles. If you write your own style code, then you should choose the appropriate font (but it is not required). And, the font can be used elsewhere in the document, for other purposes.</p>
-<p>&bull; Most applications of <code>decofont</code> are indirect. Instead of requesting arbitrary text in this font, you use commands such as <code>\decoglyph</code> or <code>\acronym</code> for specific purposes. The <code>decofont</code> is NovelDeco.otf. Its font license allows modification (if you know how), but then you must change its internal font name and file name. In that case, you can use <code>\SetDecoFont</code> to point to your own derivative of NovelDeco. Do not use this command to choose an entirely different font, or macros that depend on it will fail, perhaps without warning. If you need an entirely different font for your own purposes, create a new font using the command shown below.</p>
+<a id="a5.5"></a>
+<h3>5.5 Shopping for Fonts</h3>
+<p>Many TeX fonts are only available in older Type 1 format (PostScript) or even as bitmap metafonts. Do not use them.</p>
-<a id="a5.3.3"></a>
-<h4>5.3.3 Creating New Font Commands</h4>
+<p>In some other cases, a TeX font package provides both the older format, and a newer Open Type (*.otf or *.ttf) format. The different formats will have different font names. Sometimes the difference is very slight. Carefully look at the font name for the Open Type format. Remember that most on-line discussions will refer to the older fonts, simply because they have been around longer.</p>
-<p>If you wish to create a new font command, so that you can apply it to text, the syntax differs from the "Set" commands shown above.</p>
-<p>Suppose that you wish to create a font command <code>\drabble</code> which will be used like this:</p>
-<p class="code"><code>{\drabble This text is in the font selected by the drabble command}</code></p>
-<p>Here is how you you define it:</p>
-<p class="code"><code>\NewFontFamily\drabble[<em>features</em>]{<em>font family name</em>}</code></p>
-<p>The syntax begins with <code>\NewFontFamily</code>, followed by the macro name you wish to create, followed by the optional Open Type features, and finally the font family name.</p>
-<p>If the font is in a family by itself, without accompanying italic or bold variants, use this:</p>
-<p class="code"><code>\NewFontFace\drabble[<em>features</em>]{<em>font name</em>}</code></p>
-<p>Note that the new font command works "inside the braces":</p>
-<p class="code"><code>{\drabble text}</code>.</p>
-<p>If it is part of a family, then the usual commands for selecting italic and bold will choose the appropriate fonts.</p>
-<p>&bull; When you define new fonts, kerning and TeX ligatures are enabled by default. Any other features (such as common ligatures) must be explicitly specified by you.</p>
+<p>Do not attempt to load a font by the <code>\RequirePackage</code> or <code>\usepackage</code> commands. Instead, if you choose to use fonts other than the defaults, load them via the font setting commands described on this page.</p>
+<p>Update: Now, if you attempt to load a font the wrong way, you will get an error message.</p>
-<a id="a5.3.4"></a>
-<h4>5.3.4 Which Open Type Features Are In a Font?</h4>
+<a id="a5.5.1"></a>
+<h4>5.5.1 Licensing Issues</h4>
-<p>You have a font. It has Open Type features. But which features does it have? There are several ways to find out, but the simplest and most reliable way is to request a feature, and see what happens. For example:</p>
+<p>Presumably, you are writing your novel for commercial value, and do not intend to give anything away for free. For that reason, avoid fonts licensed under the GPL (GNU Public License) unless it has the <em>font exception</em> clause. Some TeX fonts are licensed under GPL, so watch out.</p>
-<p class="code"><code>
-% !TeX program = LuaLaTeX<br>
-% !TeX encoding = UTF-8<br>
-\documentclass{novel}<br>
-\setlength\parindent{0pt}<br>
-%<br>
-\NewFontFace\testlibserit[VerticalPosition=Superior]{libertinusserif-italic.otf}<br>
-\NewFontFace\testcin[VerticalPosition=Superior]{Cinzel-Regular.otf}<br>
-%<br>
-\begin{document}<br>
-Libertinus Serif, Italic:\\{\testlibserit 0123456789 abcdefghijklmnopqrstuvwxyz \#‡}\par<br>
-\null<br>
-Cinzel, Regular:\\{\testcin 0123456789 abcdefghijklmnopqrstuvwxyz \#‡}\par<br>
-\end{document}\par</code></p>
+<p>Beware of fonts "free for personal use" from download sites. Your commercial application is not "personal use." Of course, if you like the font, you may purchase its commercial license.</p>
+<p>Also beware of fonts generically labeled as "freeware" with no particular designer name. If you don't know who created the font, then how do you know that it can be given away for free? Even if there is a designer name, some of them had second thoughts about "freeware." They intended the fonts to be free only if you give your own work away for free. But they didn't mention it. Maybe they have no legal recourse, but you don't want them making anonymous negative reviews of your book.</p>
-<p>The resulting PDF shows that Libertinus Serif, Italic has numbers and lowercase letters as superiors. Cinzel, Regular does not have this feature (if it doesn't have it for these characters, it is not likely to have it for any others).</p>
+<p>You have numerous fonts already installed in your operating system, and perhaps others that came bundled with a particular application. If you intend to use those fonts, carefully read their licenses. It is often the case that fonts bundled with an application may <em>only</em> be used for documents created within, or processed by, that application.</p>
-<p>&bull; Sometimes a font has features that you would like to use, but you do not know they are there. For example, the font linlibertine-regular.otf normally has capital W like most fonts, with three peaks. In its feature <code>ss05</code>, it has an alternative W with four peaks, like Garamond fonts. You can find that information in several ways: (1) Does the font come with documentation? Many do. (2) Is it described on a web site that offers the font? (3) Get a font editor, such as the free FontForge, and open the font. Look at the Element > Font Info > Lookups menu. Then you can discover which features it has, and which characters are contained in each feature. You can also look at the glyph drawings.</p>
+<p>Always look for a Copyright notice, which can be identified with a particular person or organization. Copyright is good! It means that someone is claiming authorship of the font software. Only the Copyright owner has the right to give the font away for free, or license it to you after payment (often through an intermediary).</p>
-<p>&bull; Just remember that there is no specific meaning to a style set, such as <code>ss05</code>. It does whatever the font designer wants it to do, which varies from font to font.</p>
+<p>If you prefer free fonts, the most widely accepted license is the <em>SIL Open Font License</em>. This allows you to use the font for commercial purposes, embed it in PDF, modify it to suit your needs (if you change the font name), and even re-distribute the modifications.</p>
-<a id="a5.3.5"></a>
-<h4>5.3.5 Local Modifications to Open Type Features</h4>
+<a id="a5.5.2"></a>
+<h4>5.5.2 Technical Issues</h4>
-<p>If you specify a particular Open Type feature, it will always be generally for that font command. So if you define a new font command with <code>Letters=SmallCaps</code> as a feature (and if the font actually has them), then small caps will be used for that font, whether or not you locally request them with a command such as <code>\textsc</code>.</p>
+<p>Many fonts have technical errors, even among professional fonts. Some of the errors are so minor that they are not worth fixing. This is particularly true for glyphs that are missing extrema.</p>
-<p>Often, you can add (or sometimes remove) features on a local basis. For example, suppose that you defined the font without using is <code>ss03</code> style set. You can locally add that feature to some text, using a command that looks like this:</p>
+<p>However, beware of fonts that are based on traced artwork. The late 1990s had an explosion of amateur dingbat and decorative fonts produced this way, by scanning images from old books and digitizing the scan. The resulting vector glyphs rarely meet standards, and often are quite awful. The problem is that when a commercial printer renders your PDF to print, the printer's software is very different from what you have on your home computer. A technically erroneous glyph might look OK at home, but be rejected commercially.</p>
-<p class="code"><code>{\addfontfeature{<em>which feature</em>} <em>applied to this text</em>}</code></p>
+<p>If you have the knowledge, you can open a font in font editor software (such as FontForge) and ask it for validation. Missing extrema are rarely a problem, even if a lot of them are missing. Self-intersecting glyphs are not a problem if the the glyph is composed of two elements stuck together, such as Ç composed of C with separate cedilla. However, a self-intersecting glyph may be a problem if its lines criss-cross each other. Open paths, and outer paths drawn the wrong way, are often a problem. If the errors are confined to glyphs that you will not be using, then it can pass.</p>
-<p>The above code assumes that you are already using the font in that location. You cannot apply <code>ss03</code> from one font to an entirely different font!</p>
-<p>See the <code>fontspec</code> documentation for details of <code>\addfontfeature</code>.</p>
+<a id="a5.5.3"></a>
+<h4>5.5.3 Appearance Issues</h4>
-<p>As an alternative the changing features locally, you can define different font commands to call the same underlying font, but with different features. For example, that is how <code>novel</code> defines the default <code>\chapterfont</code> and <code>\headfont</code>. Unless you manually change them, these fonts are the same as the main font. However, these fonts use Lining numbers instead of OldStyle, do not enable common ligatures, and are at different scales.</p>
+<p>There are general expectations for book fonts, in terms of character sizes and shapes, and weights. Many of the widely-used TeX fonts, including Latin Modern, are unacceptable in fiction for this reason. The most commonly-used font in word processors, Times New Roman, is only marginally acceptable for fiction, and only because it is so often used by amateur writers who don't know how to change the font (but write books advising you to change your lifestyle).</p>
-<p>Two ways to accomplish the same thing:</p>
+<p>The best way to assess a font is to print it to paper. Computer screens rarely show details, except at large magnification. Depending on whom you ask for an opinion, fiction is most easily read when there are about 60 to 66 characters (including spaces) per line. To evaluate a font for the main text, print out some paragraphs about 4" to 4.25" wide, and scale the font's point size so that you get an average number of characters per line in that range. Be sure to do that: Adobe Garamond Pro at 12pt, Libertinus Serif at 11.4pt, and Libre Caslon Text at 9.6pt (!) provide about the same number of characters per line of text. At the proper point size, some fonts will look too dark, and others will look too light.</p>
-<p class="code"><code>
-\NewFontFamily\baskf{BaskervilleF}<br>
-\NewFontFamily\baskftab[Numbers=Monospaced]{BaskervilleF} % tnum feature<br>
-\begin{document}<br>
-Some text {\baskftab hello 123} is here.<br>
-Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here.
-</code></p>
+<p>Things to look for: Are the lowercase letters too tall? If they are, then it is hard for readers in many Western languages to find where sentences start, by looking for capital letters. Also, there is less white space between lines, which makes the text appear dense and harder to read. Is the shape of the characters so natural that you don't notice them? That's good! It is your writing, not the font, that is to be noticed. Remember that some fonts are designed for use at large size, in posters; such fonts tend to look mechanical in fiction. Other fonts are designed for computer screens; the letters will be too widely-spaced in fiction. Nearly all modern fonts have decent kerning and important ligatures, so that's not usually a decisive factor.</p>
+<p>The prevailing rule: If you notice the font, it's wrong.</p>
-<a id="a5.4"></a>
-<h3>5.4 Microtype Setup</h3>
-<p>The included <code>microtype</code> package comes with standard settings that are, in my opinion, too extreme for fiction. Although there are font to font differences, most modern book fonts have similar properties, as far as <code>microtype</code> is concerned. For this reason, a custom configuration file <code>novel-microtype.cfg</code> is included, and automatically used by <code>novel</code>.</p>
-<p>Not all <code>microtype</code> features are available, but the most important ones (protrusion, expansion, tracking) are. The default expansion setting is 20, which corresponds to the ability to tweak for about one character per line of book text. It is large enough to be useful, small enough to be inconspicuous. You may change it using standard <code>\microtypesetup</code> commands, if you wish.</p>
-<p>If you do not explicitly request a configuration file, perhaps by only changing stretch and shrink, then <code>novel-microtype.cfg</code> will still be used.</p>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-06-header-footer.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-06-header-footer.html
index cea7b619d6c..f17197db1cb 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-06-header-footer.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-06-header-footer.html
@@ -46,10 +46,8 @@
<div id="main">
<a id="a6"></a>
-
-
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
@@ -64,7 +62,7 @@
<p><a href="noveldocs-08-images.html">8. Using Images</a></p>
<p><a href="noveldocs-09-chapters-displays.html">9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</a></p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
</div>
@@ -104,7 +102,7 @@
<img class="floatright" src="html-resources/headfoot1.png" width="276" height="219" alt="style 1" title="style 1">
<pre>
<b>\SetHeadFootStyle{1}</b></pre>
-<p>Only header.<br>
+<p>Only Header.<br>
Page number at outside (left verso, right recto).<br>
Optional emblem adjacent to page number.<br>
Text centered. Default author verso, title recto.<br>
@@ -115,7 +113,7 @@ Text centered. Default author verso, title recto.<br>
<img class="floatright" src="html-resources/headfoot2.png" width="276" height="219" alt="style 2" title="style 2">
<pre>
<b>\SetHeadFootStyle{2}</b></pre>
-<p>Only footer.<br>
+<p>Only Footer.<br>
Page number at outside (left verso, right recto).<br>
Optional emblem adjacent to page number.</p>
@@ -124,7 +122,7 @@ Optional emblem adjacent to page number.</p>
<img class="floatright" src="html-resources/headfoot3.png" width="276" height="219" alt="style 3" title="style 3">
<pre>
<b>\SetHeadFootStyle{3}</b></pre>
-<p>Only footer.<br>
+<p>Only Footer.<br>
Page number centered.<br>
Disregards emblem, if coded.</p>
@@ -133,7 +131,7 @@ Disregards emblem, if coded.</p>
<img class="floatright" src="html-resources/headfoot4.png" width="276" height="219" alt="style 4" title="style 4">
<pre>
<b>\SetHeadFootStyle{4}</b></pre>
-<p>Only header.<br>
+<p>Only Header.<br>
Page number at outside (left verso, right recto).<br>
Optional emblem adjacent to page number.<br>
Text towards outside, instead of centered.<br>
@@ -156,7 +154,7 @@ Default author verso, title recto.</p>
<img class="floatright" src="html-resources/headfoot6.png" width="276" height="219" alt="style 6" title="style 6">
<pre>
<b>\SetHeadFootStyle{6}</b></pre>
-<p>Only header.<br>
+<p>Only Header.<br>
Page number at outside (left verso, right recto).<br>
Optional emblem adjacent to page number.<br>
Text towards inside, instead of centered.<br>
@@ -164,6 +162,17 @@ Default author verso, title recto.</p>
<div style="clear:both"></div>
+<img class="floatright" src="html-resources/headfoot7.png" width="276" height="219" alt="style 6" title="style 7">
+<pre>
+<b>\SetHeadFootStyle{7}</b></pre>
+<p>Header and Footer<br>
+Page number centered in footer.<br>
+Text centered in header.<br>
+Default author verso, title recto.<br>
+Emblems left/right, verso/recto.</p>
+
+<div style="clear:both"></div>
+
<h5>Custom Style</h5>
<p>Before you think about writing custom header/footer styles, be sure to try the pre-configured choices. I have looked through a lot of fiction of all kinds. The pre-configured choices include every style I have seen, with the exception of the most highly decorative.</p>
<p>If none of the above are satisfactory, then you can write your own headers and footers using the syntax of the <code>fancyhdr</code> package.</p>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-07-text-size-style.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-07-text-size-style.html
index 7f156d7fbca..30351441f4f 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-07-text-size-style.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-07-text-size-style.html
@@ -58,7 +58,7 @@
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
<p><b>User Guide</b></p>
@@ -72,7 +72,7 @@
<p><a href="noveldocs-08-images.html">8. Using Images</a></p>
<p><a href="noveldocs-09-chapters-displays.html">9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</a></p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
</div>
@@ -80,7 +80,7 @@
<h2 style="clear:none;">7. Text Sizes and Styling</h2>
<p>This page describes how to change the size of text, how to style text (such as italics), and how to move it around. It also describes some miscellaneous commands that are intended to modify text.</p>
-<p>If you are looking for information about how to choose the master text point size, see <a href="noveldocs-04-layout.html#a4.2.3">Page 4</a>, because it is considered to be among the layout settings. If you are looking for information about how to choose fonts and font features, see <a href="noveldocs-05-fonts.html">Page 5</a>.</p>
+<p>If you are looking for information about how to choose the main text point size, see <a href="noveldocs-04-layout.html#a4.2.3">Page 4</a>, because it is considered to be among the layout settings. If you are looking for information about how to choose fonts and font features, see <a href="noveldocs-05-fonts.html">Page 5</a>.</p>
<p>There is no direct setting for normal baselineskip; it is automatically calculated from the size of the textblock and lines per page.</p>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-08-images.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-08-images.html
index 69c650dfa64..5b5d974fc9e 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-08-images.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-08-images.html
@@ -48,7 +48,7 @@
<div id="main">
<a id="thetop"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
<p><b>User Guide</b></p>
@@ -62,7 +62,7 @@
<p>8. Using Images</p>
<p><a href="noveldocs-09-chapters-displays.html">9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</a></p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
</div>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-09-chapters-displays.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-09-chapters-displays.html
index 8704c3b30f8..c7bd98fdfb7 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-09-chapters-displays.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-09-chapters-displays.html
@@ -112,7 +112,7 @@ Footnotes and Endnotes</a></p>
<div id="main">
<a id="a9"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.0.10.</p>
+<p>Documentation version: 1.1.</p>
<div class="pagetopage">
@@ -127,7 +127,7 @@ Footnotes and Endnotes</a></p>
<p><a href="noveldocs-08-images.html">8. Using Images</a></p>
<p>9. Display, Start Pages;<br>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
-<span style="visibility:hidden">9. </span>Footnotes, Endotes.</p>
+<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</p>
</div>
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo
index 167b42f7731..e0c3e241d12 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo
@@ -1,4 +1,4 @@
-% Typically used in the USA. Novel file version 1.0.10
+% Typically used in the USA. Novel file version 1.1
% The values of the arguments are public industry standards.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty
index ae84f7cd7d9..c2e482876b2 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty
@@ -12,7 +12,7 @@
%%
%%
\ProvidesFile{novel-CalculateLayout.sty}%
-[2017/03/27 v1.0.10 LaTeX file (layout calculations)]
+[2017/04/12 v1.1 LaTeX file (layout calculations)]
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
index 01e7491bf84..2b902215ef1 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-ChapterScene.sty}%
-[2017/03/27 v1.0.10 LaTeX file (chapter and scene macros)]
+[2017/04/12 v1.1 LaTeX file (chapter and scene macros)]
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo
index 45c4d80d8a6..524c3462a36 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo
@@ -1,4 +1,4 @@
-% Typically used in Europe. Novel file version 1.0.10
+% Typically used in Europe. Novel file version 1.1
% The values of the arguments are public industry standards.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty
index 5accb33c03d..46459cfa833 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-FileData.sty}%
-[2017/03/27 v1.0.10 LaTeX file (File Data settings)]
+[2017/04/12 v1.1 LaTeX file (File Data settings)]
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
index 238e7d67477..0b2d007a04a 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-FontDefaults.sty}%
-[2017/03/27 v1.0.10 LaTeX file (default fonts)]
+[2017/04/12 v1.1 LaTeX file (default fonts)]
%%
@@ -23,7 +23,7 @@
%% Most TeX installations will use Latin Modern or Computer Modern
%% as default fonts. These are unsuitable for commercial fiction.
%% But `novel' class uses Libertinus as defaults.
-%% Change them using \SetMasterFont and other fontspec commands, in Preamble.
+%% Change them using \SetParentFont and other fontspec commands, in Preamble.
% Libertinus Serif has Regular, Italic, Bold, Bold Italic.
% Here, Semibold over-rides Bold.
%
@@ -32,10 +32,10 @@
\defaultfontfeatures{} % reset
%
% The mono font:
-\defaultfontfeatures[\ttfamily]{% mono font has no kerning or common ligatures
+\defaultfontfeatures[\ttfamily]{% monofont has no kerning or common ligatures
SmallCapsFeatures={Renderer=Basic},Ligatures=TeX,%
}%
-\ifthenelse{\equal{\ttdefault}{lmtt} \OR \equal{\ttdefault}{cmtt}}{ % over-ride:
+\ifthenelse{\equal{\ttdefault}{lmtt}\OR\equal{\ttdefault}{cmtt}}{% over-ride:
\IfFontExistsTF{Libertinus Mono}{
\setmonofont[%
ItalicFont={},% Doesn't have these.
@@ -52,13 +52,13 @@
}{} % User \setmonofont, so leave alone.
%%
\defaultfontfeatures{} % reset
-% Main and sans fonts use kerning, ligatures, and OldStyle numbers if available:
+% Main and sans fonts: kerning, ligatures, and OldStyle numbers if available:
\defaultfontfeatures[\rmfamily,\sffamily]{%
SmallCapsFeatures={Renderer=Basic},Kerning=On,Numbers=OldStyle,%
Ligatures=Common,Ligatures=TeX,%
}%
% The sans font:
-\ifthenelse{\equal{\sfdefault}{lmss} \OR \equal{\sfdefault}{cmss}}{ % over-ride:
+\ifthenelse{\equal{\sfdefault}{lmss}\OR\equal{\sfdefault}{cmss}}{ % override:
\IfFontExistsTF{Libertinus Sans}{
\setsansfont{Libertinus Sans}
}{
@@ -70,30 +70,32 @@
}
}{} % User \setsansfont, so leave alone.
%%
-% At this point, if \rmdefault is something other than lmr or cmr, it probably
-% means that the user issued \setmainfont. But that's ineffective in this
-% class, because it will be over-written. Use \SetMasterFont instead:
-\ifthenelse{\equal{\rmdefault}{lmr} \OR \equal{\rmdefault}{cmr}}{}{%
- \ClassWarning{novel}{^^JDid you use \string\setmainfont\space in Preamble?^^J%
- The \string\setmainfont\space command is ineffective in `novel' class.^^J%
- Use \string\SetMasterFont\space instead. This Warning may be spurious if^^J%
- you have an unusual configuration for your TeX installation.^^J}%
+% At this point, if \rmdefault is something other than lmr, it means
+% that the user attempted to set the main font using ordinary TeX commands,
+% or via fontspec's \setmainfont. But those are ineffective in this class,
+% because without \SetParentFont the prior command will be over-written.
+\ifthenelse{\equal{\rmdefault}{lmr}}{}{%
+ \ClassWarning{novel}{^^JBIG BAD WARNING:^^J%
+ You attempted to define the main document font using a command such as^^J%
+ \string\renewcommand\string\rmdefault\space or \string\usepackage{font}^^J%
+ or \string\setmainfont. These are incorrect in `novel' class.^^J%
+ Use \string\SetParentFont\space instead. See `novel' documentation.^^J}%
}%
-% The masterfont:
-\if@masterfontset\else
+% The parentfont: (from v.1.1. Known as masterfont in prior versions)
+\if@parentfontset\else
\IfFontExistsTF{Libertinus Serif}{
- \SetMasterFont[%
+ \SetParentFont[%
BoldFont=libertinusserif-semibold.otf,%
BoldItalicFont=libertinusserif-semibolditalic.otf,%
]{Libertinus Serif}
}{
\IfFontExistsTF{Linux Libertine O}{
- \SetMasterFont[%
+ \SetParentFont[%
BoldFont=LinLibertine_RZ.otf,%
BoldItalicFont=LinLibertine_RZI.otf,%
]{Linux Libertine O}
}{
- \SetMasterFont[%
+ \SetParentFont[%
SmallCapsFont={Latin Modern Roman Caps}%
]{Latin Modern Roman}% Eeek! Only because you have it!
\let\scshape\oldscshape % or small caps won't work
@@ -102,7 +104,7 @@
}
\fi
% Now we are ready to set the main font:
-\@setmainfont[\@masterfontfeatures]{\@masterfontname}
+\setmainfont[\@parentfontfeatures]{\@parentfontname}
%
%%
\defaultfontfeatures{} % reset
@@ -113,18 +115,18 @@
}%
%% The novel-specific fonts:
\if@chapterfontset\else
- \SetChapterFont[\@masterfontfeatures,Scale=1.6]{\@masterfontname}
+ \SetChapterFont[\@parentfontfeatures,Scale=1.6]{\@parentfontname}
\fi
\newfontfamily\chapterfont[\@chapterfontfeatures]{\@chapterfontname}
%%
\if@subchfontset\else
- \SetSubchFont[\@masterfontfeatures,Scale=1.2]{\@masterfontname}
+ \SetSubchFont[\@parentfontfeatures,Scale=1.2]{\@parentfontname}
\fi
\newfontfamily\subchfont[\@subchfontfeatures]{\@subchfontname}
%%
\newif \if@headfontdefault
\if@headfontset\else
- \SetHeadFont[\@masterfontfeatures,Scale=0.92]{\@masterfontname}
+ \SetHeadFont[\@parentfontfeatures,Scale=0.92]{\@parentfontname}
\global\@headfontdefaulttrue
\fi
\newfontfamily\headfont[\@headfontfeatures]{\@headfontname}
@@ -144,7 +146,7 @@
%%
%% Now to get the decofont activated:
% Decorative glyphs, only in this font. Should not be re-set by user:
-\gdef\decoglyph#1{~} % If NovelDeco not found, non-breaking space in main text.
+\gdef\decoglyph#1{~}% If NovelDeco not found, nonbreaking space in main text.
%
\if@gotdeco % NovelDeco or a user-defined alternative was found:
\newfontface\@decoglyph[%
@@ -162,19 +164,19 @@
%
\gdef\decoglyph#1{% Be sure to use % without preceding space:
\IfBeginWith{#1}{n}{% normal weight symbol (same as regular)
- \StrBehind{#1}{n}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
+ \StrBehind{#1}{n}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
}{}%
\IfBeginWith{#1}{r}{% regular weight symbol
- \StrBehind{#1}{r}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
+ \StrBehind{#1}{r}[\@tempdecoglyph]{\@decoglyph\symbol{\@tempdecoglyph}}%
}{}%
\IfBeginWith{#1}{l}{% light weight symbol
- \StrBehind{#1}{l}[\@tempdecoglyph]{\@decoglypha\symbol{\@tempdecoglyph}}%
+ \StrBehind{#1}{l}[\@tempdecoglyph]{\@decoglypha\symbol{\@tempdecoglyph}}%
}{}%
\IfBeginWith{#1}{e}{% extra light weight symbol
- \StrBehind{#1}{e}[\@tempdecoglyph]{\@decoglyphb\symbol{\@tempdecoglyph}}%
+ \StrBehind{#1}{e}[\@tempdecoglyph]{\@decoglyphb\symbol{\@tempdecoglyph}}%
}{}%
\IfBeginWith{#1}{t}{% thin weight symbol
- \StrBehind{#1}{t}[\@tempdecoglyph]{\@decoglyphc\symbol{\@tempdecoglyph}}%
+ \StrBehind{#1}{t}[\@tempdecoglyph]{\@decoglyphc\symbol{\@tempdecoglyph}}%
}{}%
}% end gdef decoglyph
%
@@ -234,8 +236,8 @@
\setotherlanguages[\@setotherlangsopt]{\@setotherlangs}
}
}
-%% This provides default microtype settings, allows the user to over-ride, and
-% hopefully prevents the user from choosing inappropriate settings:
+%% This provides default microtype settings, allows the user to over-ride,
+% and hopefully prevents the user from choosing inappropriate settings:
\let\microtypesetup\relax % fake command no longer needed
\if@setmicrotype % user wrote \microtypesetup{} in Preamble
\IfSubStr{\@mymicrotypesetup}{config}{% user specified own config file
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
index 326f4a484d2..e7499c77308 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-Footnotes.sty}%
-[2017/03/27 v1.0.10 LaTeX file (commands for footnotes and endnotes)]
+[2017/04/12 v1.1 LaTeX file (commands for footnotes and endnotes)]
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
index 8f08dd349c9..6f6c9e47d15 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-HeadFootStyles.sty}%
-[2017/03/27 v1.0.10 LaTeX file (header and footer styles)]
+[2017/04/12 v1.1 LaTeX file (header and footer styles)]
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
index 8c1a8dab051..7054d3c31b5 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-Images.sty}%
-[2017/03/27 v1.0.10 LaTeX file (image placement)]
+[2017/04/12 v1.1 LaTeX file (image placement)]
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo
index 5c85ddc0ae2..3c3e7597d7f 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo
@@ -1,4 +1,4 @@
-% Typically used in Japan. Novel file version 1.0.10
+% Typically used in Japan. Novel file version 1.1
% The values of the arguments are public industry standards.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
index 0e6215ddfcd..e10c1cada65 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
@@ -13,11 +13,11 @@
%%
%%
\ProvidesFile{novel-LayoutSettings.sty}%
-[2017/03/27 v1.0.10 LaTeX file (layout settings)]
+[2017/04/12 v1.1 LaTeX file (layout settings)]
%%
-%% Note that nearly all layout settings are pre-configured based on Trim Size.
+%% Note that nearly all layout settings are preconfigured based on Trim Size.
%% In general, these user commands may be used to over-ride the presets.
\newlength\Old@TrimWidth % finished width of printed book
@@ -57,12 +57,12 @@
%% SIZE-RELATED COMMANDS AVAILABLE IN PREAMBLE.
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
%% Use if necessary for customization.
%% If you like a class option that pre-sets these values,
%% then you do not have to use any of these commands.
%
-% Note: This class does not ask you to set the width or height of the textblock.
+% Note: This class does not ask you to set the width/height of the textblock.
% Instead, these values are automatically calculated from other dimensions.
%
@@ -166,11 +166,11 @@
}
\ifthenelse{\equal{#1}{edge}}{\@offcenterTrimtrue}{}
}
-% \SetLinesPerPage{} may be limited due to fontsize and Trim Size constraints.
+% \SetLinesPerPage{} limited due to fontsize and Trim Size constraints.
% There is no `rework' command, because as long as the number of lines fit,
% the line spacing will be automatically changed to fit a reworked size.
% The only possible problem is if lines were originally so tight that
-% a reworked size cannot fit. In that case, the user's best plan is to remove
+% a reworked size cannot fit. In that case, the user's best plan is remove
% header or footer (if possible), or reduce vertical margins (if possible).
\newcommand\SetLinesPerPage[1]{
\global\@LinesPerPageSettrue
@@ -196,13 +196,13 @@
%% RESERVE SPACE FOR HEADER/FOOTER, AND SET DEFAULT CHAPTER DISPLAY PAGE
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
%% At this point, `novel' needs to know whether or not header/footer used,
%% so that space can be reserved at top/bottom. Actual styling comes later.
%
% If the user wishes to tweak layout, these Preamble commands store info,
% that will be used in novel-CalculateLayout.sty.
-% The jumps are scale factors, which increase or decrease headsep and footskip
+% The jumps are scale factors, which increase/decrease headsep and footskip
% relative to normal baselineskip. Do not use \setlength\headsep or
% \setlength\footskip directly, because direct settings will lead to
% improper calculations.
@@ -295,7 +295,7 @@
\ifthenelse{\equal{\@setchapterstart}{dropfolio}}{% no footnote there
\def\@setchapterstartOK{true}%
}{}%
- \ifthenelse{\equal{\@setchapterstart}{dropfoliolater}}{% has footnote(s) there
+ \ifthenelse{\equal{\@setchapterstart}{dropfoliolater}}{% footnote(s) there
\def\@setchapterstartOK{true}%
}{}%
\ifthenelse{\equal{\@setchapterstart}{foliobeneath}}{%
@@ -324,9 +324,11 @@
\newcommand\SetMarkerStyle[2][real]{
\def\@goodfnm{no}
\ifthenelse{\equal{#2}{asterisk}}{%
- \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}\gdef\@myfnsymbols{*}}{}
+ \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}%
+ \gdef\@myfnsymbols{*}}{}
\ifthenelse{\equal{#2}{dagger}}{%
- \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}\gdef\@myfnsymbols{†}}{}
+ \def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}%
+ \gdef\@myfnsymbols{†}}{}
\ifthenelse{\equal{#2}{number}}{%
\def\@goodfnm{yes}\global\togglefalse{@usesymbolmark}}{}
\def\@goodfnk{no}
@@ -369,7 +371,7 @@
%% MISCELLANOUS SETTINGS. Mostly remove "glue". Best to leave as-is.
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
%%
%
\@twocolumnfalse
@@ -430,8 +432,8 @@
%% End miscellaneous settings.
-% The following might become unnecessary if fontspec adds the capability
-% to disable keys. For now: Color and Opacity cannot be used as font features,
+% The following might become unnecessary if fontspec adds the capability to
+% disable keys. For now: Color and Opacity cannot be used as font features,
% for a black/white printed book. Alas, fontspec over-rules xcolor.
% So, this code over-rules fontspec:
\gdef\novel@checkfeatures#1{%
@@ -452,11 +454,13 @@
-%% DEFINITION OF MASTER AND OTHER FONTS
-%% -----------------------------------------------------------------------------
-%%
+%% DEFINITION OF PARENT AND OTHER FONTS
+%% --------------------------------------------------------------------------
+%% Prior to v. 1.1, parentfont was known as masterfont. Backwards compatible.
+%
+\providecommand\rmdefault{lmr} % should be lmr anyway, at this point.
% The `no-math' option prevents fontspec from tracking certain font changes.
-% This is probably necessary, since novel does some of its own font tracking:
+% This is probably necessary, since novel does some of its own font tracking:
\RequirePackage[no-math]{fontspec} % For LuaLaTeX. NOT package `fontenc'.
\defaultfontfeatures{} % reset
% User-created fonts (not standard, not novel-specific defaults:
@@ -464,38 +468,32 @@
SmallCapsFeatures={Renderer=Basic},Kerning=On,%
Ligatures=TeX,%
}%
-% Latin Modern Math (Open Type) fonts will be selected by default, for math.
% You shouldn't be doing math! You can use \setmathfont, if you wish.
-% If you must load a math font package, it should be done using \RequirePackage
-% before (yes, before) calling the document class.
+% If you must load a math font package, it should be done using
+% \RequirePackage before (yes, before) calling the document class.
\RequirePackage{unicode-math}
%%
%% This could have been easier, but fontspec allows mandatory and optional
% arguments to appear in either order. We wish to store the fontnames
% and arguments, but need Expl syntax to tell which is which.
-\let\@setmainfont\setmainfont\relax
-\def\setmainfont{%
- \ClassError{novel}{Use \string\SetMasterFont\space not \string\setmainfont}%
- {The \string\setmainfont\space command is not in this document class.^^J%
- Use \string\SetMasterFont\space to get what you need.^^J%
- You may see this message if you \string\usepackage{some font}^^J%
- in the Preamble. Do not do that. If you wish to use that font, and if^^J%
- it is Open Type (or TrueType) format, and installed, then instead of^^J%
- \string\usepackage\space use \string\SetMasterFont. See `novel' docs.^^J%
- Any attempt to continue without fixing is doomed to failure!}%
-}
\ExplSyntaxOn
-%% Store settings for the master font:
-% The master font will become the main font AtEndPreamble. It will also become
+%% Store settings for the parent font:
+% \AtEndPreamble, the parent font becomes becomes
% the default ancestor of all novel-defined fonts, except the deco font.
-\newif \if@masterfontset
-\gdef\@masterfontfeatures{}
-\gdef\@masterfontname{}
-\DeclareDocumentCommand \SetMasterFont { O{} m O{} } {%
+\newif \if@parentfontset
+\gdef\@parentfontfeatures{}
+\gdef\@parentfontname{}
+\DeclareDocumentCommand \SetParentFont { O{} m O{} } {% from version 1.1.
+ \novel@checkfeatures{#1,#3}
+ \gdef\@parentfontfeatures{#1,#3}
+ \gdef\@parentfontname{#2}
+ \global\@parentfontsettrue
+}%
+\DeclareDocumentCommand \SetMasterFont { O{} m O{} } {% DEPRECATED
\novel@checkfeatures{#1,#3}
- \gdef\@masterfontfeatures{#1,#3}
- \gdef\@masterfontname{#2}
- \global\@masterfontsettrue
+ \gdef\@parentfontfeatures{#1,#3}
+ \gdef\@parentfontname{#2}
+ \global\@parentfontsettrue
}%
%% Store settings for the chapterfont:
% The chapter font is used by the \ChapterTitle{} command.
@@ -564,7 +562,7 @@
\cs_new_eq:NN \AddFontFeature \addfontfeatures
%%
%% \CreateFontFeature{substitutions}{feature code}
-% Problem: The font has one or more alternate glyphs that you would like to use,
+% Problem: Font has one or more alternate glyphs that you would like to use,
% but they are not listed in a feature set for the font.
% Solution: Create your own feature set, with \CreateFontFeature. The created
% feature may then be used like a real feature, in any font definition.
@@ -583,7 +581,7 @@
% a style set such as ss03 if you are sure that the font in question
% do not already have ss03 (but this is taking a chance).
% Once defined, you may use it like this (for example):
-% \SetMasterFont[RawFeature=+myfs]{fontname}
+% \SetParentFont[RawFeature=+myfs]{fontname}
% \NewFontFamily\myfake[RawFeature=+myfs]{fontname}
% In the document body: {\addfontfeature{myfs} text}
\DeclareDocumentCommand \CreateFontFeature { m m } {%
@@ -602,12 +600,12 @@
%%
\ExplSyntaxOff
%%
-%% end definition of master and other fonts.
+%% end definition of parent and other fonts.
%% FAKE POLYGLOSSIA COMMANDS
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
% The polyglossia package is not loaded until \AtEndPreamble.
% So, its commands are not directly available in the Preamble.
% These fake commands store the data. Later, the commands will be relaxed,
@@ -643,7 +641,7 @@
%% FRONTMATTER, MAINMATTER, BACKMATTER
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
%
\newif \ifWithinFrontmatter \WithinFrontmatterfalse
\newif \ifWithinMainmatter \WithinMainmatterfalse
@@ -658,14 +656,14 @@
{You issued \string\frontmatter\ more than once.^^J}%
\fi
\ifWithinMainmatter
- \ClassError{novel}{\string\frontmatter\ cannot follow \mainmatter}%
- {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
- but you do not need all of them.^^J}%
+ \ClassError{novel}{\string\frontmatter\ cannot follow \mainmatter}%
+ {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
+ but you do not need all of them.^^J}%
\fi
\ifWithinBackmatter
- \ClassError{novel}{\string\frontmatter\ cannot follow \backmatter}%
- {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
- but you do not need all of them.^^J}%
+ \ClassError{novel}{\string\frontmatter\ cannot follow \backmatter}%
+ {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
+ but you do not need all of them.^^J}%
\fi
\WithinFrontmattertrue\WithinMainmatterfalse\WithinBackmatterfalse
\pagenumbering{roman}
@@ -679,9 +677,9 @@
{You issued \string\mainmatter\ more than once.}%
\fi
\ifWithinBackmatter
- \ClassError{novel}{\string\mainmatter\ cannot follow \backmatter}%
- {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
- but you do not need all of them.^^J}%
+ \ClassError{novel}{\string\mainmatter\ cannot follow \backmatter}%
+ {In order: \string\frontmatter\ \string\mainmatter\ \string\backmatter^^J%
+ but you do not need all of them.^^J}%
\fi
\WithinFrontmatterfalse\WithinMainmattertrue\WithinBackmatterfalse
\setcounter{frontmatterpages}{\value{page}}
@@ -692,7 +690,7 @@
%
\def\backmatter{\@ifstar\@backmatterst\@backmatterns}
%
-\def\@backmatterst{ % continues frontmatter count with lowercase roman numerals
+\def\@backmatterst{% continues frontmatter count w/ lowercase roman numerals
\ifWithinBackmatter
\ClassError{novel}{\string\backmatter\space used more than once}%
{You issued \string\backmatter\space more than once.^^J}%
@@ -700,9 +698,9 @@
% If you really must go directly from front to back without main,
% simply issue \mainmatter\backmatter together. Not advised.
\ifWithinFrontmatter
- \ClassError{novel}{Missing \string\mainmatter}%
- {You went directly from \string\frontmatter\space to \string\backmatter^^J%
- Must have \string\mainmatter\space in between.^^J}%
+ \ClassError{novel}{Missing \string\mainmatter}%
+ {You went directly from \string\frontmatter\space to \string\backmatter^^J%
+ Must have \string\mainmatter\space in between.^^J}%
\fi
\WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
\addtocounter{frontmatterpages}{1}
@@ -718,16 +716,16 @@
% If you really must go directly from front to back without main,
% simply issue \mainmatter\backmatter together. Not advised.
\ifWithinFrontmatter
- \ClassError{novel}{Missing \string\mainmatter}%
- {You went directly from \string\frontmatter\space to \string\backmatter^^J%
- Must have \string\mainmatter\space in between.^^J}%
+ \ClassError{novel}{Missing \string\mainmatter}%
+ {You went directly from \string\frontmatter\space to \string\backmatter^^J%
+ Must have \string\mainmatter\space in between.^^J}%
\fi
\WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
}
%
\def\Backmatter{\@ifstar\@Backmatterst\@Backmatterns}
%
-\def\@Backmatterst{ % continues frontmatter count with uppercase Roman numerals
+\def\@Backmatterst{% continues frontmatter count w/ uppercase Roman numerals
\ifWithinBackmatter
\ClassError{novel}{\string\backmatter\space used more than once}%
{You issued \string\backmatter\space more than once.^^J}%
@@ -735,9 +733,9 @@
% If you really must go directly from front to back without main,
% simply issue \mainmatter\backmatter together. Not advised.
\ifWithinFrontmatter
- \ClassError{novel}{Missing \string\mainmatter}%
- {You went directly from \string\frontmatter\space to \string\backmatter^^J%
- Must have \string\mainmatter\space in between.^^J}%
+ \ClassError{novel}{Missing \string\mainmatter}%
+ {You went directly from \string\frontmatter\space to \string\backmatter^^J%
+ Must have \string\mainmatter\space in between.^^J}%
\fi
\WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
\addtocounter{frontmatterpages}{1}
@@ -753,9 +751,9 @@
% If you really must go directly from front to back without main,
% simply issue \mainmatter\backmatter together. Not advised.
\ifWithinFrontmatter
- \ClassError{novel}{Missing \string\mainmatter}%
- {You went directly from \string\frontmatter\space to \string\backmatter^^J%
- Must have \string\mainmatter\space in between.^^J}%
+ \ClassError{novel}{Missing \string\mainmatter}%
+ {You went directly from \string\frontmatter\space to \string\backmatter^^J%
+ Must have \string\mainmatter\space in between.^^J}%
\fi
\WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
\pagenumbering{Roman}
@@ -767,12 +765,12 @@
%% DISABLE OR NEUTRALIZE SOME STANDARD LATEX COMMANDS
-%% -----------------------------------------------------------------------------
+%% --------------------------------------------------------------------------
% The `novel' class disallows these commands, or neutralizes them by simply
-% repeating their arguments. In some cases, they request functionality that is
-% not implemented in `novel'. In other cases, the functionality is part of core,
+% repeating their arguments. In some cases, they request functionality that's
+% not implemented in `novel'. In other cases, functionality is part of core,
% but would interfere with the `novel' emphasis on constant line skip.
-% You may re-define the commands using your own code in Preamble (discouraged).
+% You may redefine the commands using your own Preamble code (discouraged).
%
\gdef\null{\hbox{\strut}} % May be important!
%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
index 76d23fb55cb..309f2249990 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
@@ -13,7 +13,7 @@
%%
%%
\ProvidesFile{novel-TextMacros.sty}%
-[2017/03/27 v1.0.10 LaTeX file (text macros usable within document body)]
+[2017/04/12 v1.1 LaTeX file (text macros usable within document body)]
%%
@@ -33,7 +33,7 @@
% \thesubtitle or \theSubtitle returns string set by \subtitle{} or \SetSubtitle{} -- See novel-LayoutSettings.sty.
% \InlineImage, \BlockImage, \ClearImage -- See novel-Images.sty.
% \scenebreak, \sceneline, \scenestars -- See novel-ChapterScene.sty.
-% ChapterStart, \ChapterTitle{}, \ChapterSubtitle{}, \ChapterDeco{}, \ChapterText -- See novel-ChapterScene.sty.
+% ChapterStart, \ChapterTitle{}, \ChapterSubtitle{}, \ChapterDeco{} -- See novel-ChapterScene.sty.
% \DecoChapterTitle{}{}, \SideDecoChapterTitle{}, ModernChapterTitle[]{}{} -- See novel-ChapterScene.sty.
% {\chapterfont text} and other pre-defined font selection commands -- See novel-LayoutSettings.sty.
% \decoglyph{} and \acronym{} -- See novel-FontDefaults.sty.
@@ -57,7 +57,6 @@
% toc environment for table of contents.
% \tocitem[]{}{} and \tocitem*[]{}{} for one-line entries in toc.
% legalese environment uses ragged right, disables hyphenation, and reduces microtype tweaks.
-% poem environment uses ragged right, disables hyphenation, parindent zero, and optional increased right margin.
% \showlength[round]{length}{units} returns the length, re-calculated in units, rounded.
% \supersub{raise}{scale}{text} alternative to superscript and subscript commands.
% \sups{text}, \subs{text}, and \sinf{text} other alternatives to super/subscripts.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex
index e7b21e019c5..ff26b82150a 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex
@@ -14,7 +14,7 @@
%%
%%
\ProvidesFile{novel-gyphtounicode.tex}%
-[2017/03/27 v1.0.10 LaTeX file (additional glyph to unicode)]
+[2017/04/12 v1.1 LaTeX file (additional glyph to unicode)]
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg
index c5f73085be4..3cda2d724ea 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg
@@ -19,7 +19,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{novel-microtype.cfg}
- [2017/03/27 v1.0.10 LaTeX file (microtype configuration file for novel class)]
+ [2017/04/212 v1.1 LaTeX file (microtype configuration file for novel class)]
%%% -----------------------------------------------------------------------
%%% FONT SETS
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty b/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty
index 59723c00064..fb965571488 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{novel-pdfx.sty}
- [2017/03/27 v1.0.10 LaTeX file (PDF/X support for novel class)]
+ [2017/04/12 v1.1 LaTeX file (PDF/X support for novel class)]
% This package supports, and is part of, class `novel'.
% No support for anything but LuaLaTeX.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
index 5f2c92d9fce..ebe462d2668 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
@@ -22,7 +22,7 @@
%%
%%
\ProvidesFile{novel-xmppacket.sty}%
-[2017/03/27 v1.0.10 LaTeX file (novel XMP packet template)]
+[2017/04/12 v1.1 LaTeX file (novel XMP packet template)]
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel.cls b/Master/texmf-dist/tex/lualatex/novel/novel.cls
index e0245543b0f..bcdc6cef3bb 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel.cls
+++ b/Master/texmf-dist/tex/lualatex/novel/novel.cls
@@ -14,7 +14,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
% Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016.
-\ProvidesClass{novel}[2017/03/27 v1.0.10 LaTeX document class]
+\ProvidesClass{novel}[2017/04/12 v1.1 LaTeX document class]
%%