summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/extras/NovelDeco-glyphs.pdf (renamed from Master/texmf-dist/doc/lualatex/novel/NovelDeco-glyphs.pdf)bin42202 -> 42202 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/extras/novel-Gallery-ChapterStart.pdf (renamed from Master/texmf-dist/doc/lualatex/novel/novel-Gallery-ChapterStart.pdf)bin311166 -> 311166 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/extras/novel-cover-template.tex (renamed from Master/texmf-dist/doc/lualatex/novel/novel-cover-template.tex)2
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/extras/novel-example.pdf1138
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/extras/novel-example.tex (renamed from Master/texmf-dist/doc/lualatex/novel/novel-example.tex)16
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/extras/novel-template.tex (renamed from Master/texmf-dist/doc/lualatex/novel/novel-template.tex)7
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/extras/swop240gamutHSV-monitorlimit.pngbin0 -> 111238 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/extras/swop240gamutHSV.pngbin0 -> 153607 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/novel.pdf194
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/novel.tex19
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-01-overview.html25
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-02-class-options.html26
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-03-metadata-pdfx.html3
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-04-layout.html3
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-05-fonts.html5
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-06-header-footer.html3
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-07-text-size-style.html3
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-08-images.html3
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-09-chapters-displays.html3
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-10-cover-art.html26
-rw-r--r--Master/texmf-dist/doc/lualatex/novel/noveldocs-11-debugging.html141
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty53
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty21
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty16
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty20
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty66
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty42
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-Images.sty21
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty102
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty37
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-example.tex140
-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.sty38
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/novel/novel.cls233
39 files changed, 1975 insertions, 443 deletions
diff --git a/Master/texmf-dist/doc/lualatex/novel/NovelDeco-glyphs.pdf b/Master/texmf-dist/doc/lualatex/novel/extras/NovelDeco-glyphs.pdf
index 27fa8e99052..27fa8e99052 100644
--- a/Master/texmf-dist/doc/lualatex/novel/NovelDeco-glyphs.pdf
+++ b/Master/texmf-dist/doc/lualatex/novel/extras/NovelDeco-glyphs.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/novel-Gallery-ChapterStart.pdf b/Master/texmf-dist/doc/lualatex/novel/extras/novel-Gallery-ChapterStart.pdf
index 2e623ca54ba..2e623ca54ba 100644
--- a/Master/texmf-dist/doc/lualatex/novel/novel-Gallery-ChapterStart.pdf
+++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-Gallery-ChapterStart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/novel-cover-template.tex b/Master/texmf-dist/doc/lualatex/novel/extras/novel-cover-template.tex
index 3c22e4797c9..32f7cae1506 100644
--- a/Master/texmf-dist/doc/lualatex/novel/novel-cover-template.tex
+++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-cover-template.tex
@@ -1,6 +1,6 @@
% !TeX program = LuaLaTeX
% !TeX encoding = UTF-8
-\documentclass[coverart]{novel} % v. 1.32 or later
+\documentclass[coverart]{novel} % v. 1.4 or later
\SetMediaSize{width}{height} % includes bleed
\SetTrimSize{width}{height} % without bleed
\SetTitle{example} % title required, might not be book title
diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.pdf b/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.pdf
new file mode 100644
index 00000000000..ab4b071a92c
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.pdf
@@ -0,0 +1,1138 @@
+%PDF-1.3
+%ÐÔÅØ
+4 0 obj
+<</Type /Metadata /Subtype /XML
+/Length 6743 >>
+stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+ <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.1-c043 52.372728, 2009/01/18-15:08:04 ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <rdf:Description rdf:about=""
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+ <xmp:ModifyDate>2017-07-30T12:47:19-07:00</xmp:ModifyDate>
+ <xmp:CreateDate>2017-07-30T12:47:19-07:00</xmp:CreateDate>
+ <xmp:CreatorTool>LaTeX with novel and microtype</xmp:CreatorTool>
+ <xmp:MetadataDate>2017-07-30T12:47:19-07:00</xmp:MetadataDate>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <dc:format>application/pdf</dc:format>
+ <dc:title>
+ <rdf:Alt>
+ <rdf:li xml:lang="x-default">Dark and Stormy</rdf:li>
+ </rdf:Alt>
+ </dc:title>
+ <dc:creator>
+ <rdf:Bag>
+ <rdf:li>Dirk Hardcase</rdf:li>
+ </rdf:Bag>
+ </dc:creator>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
+ <xmpMM:DocumentID>uuid:A12D98E081B6A0EC2CBA2D468474F922</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:64C4CF94333B89CCE0B43320EE24644B</xmpMM:InstanceID>
+ <xmpMM:RenditionClass>default</xmpMM:RenditionClass>
+ <xmpMM:VersionID>1</xmpMM:VersionID>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+ <pdf:Producer>LuaTeX with novel-pdfx and hyperref</pdf:Producer>
+ <pdf:Trapped>False</pdf:Trapped>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">
+ <pdfx:GTS_PDFXVersion>PDF/X-1a:2001</pdfx:GTS_PDFXVersion>
+ <pdfx:GTS_PDFXConformance>PDF/X-1a:2001</pdfx:GTS_PDFXConformance>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/">
+ <pdfxid:GTS_PDFXVersion>PDF/X-1a:2001</pdfxid:GTS_PDFXVersion>
+ </rdf:Description>
+ <rdf:Description rdf:about=""
+ xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
+ xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
+ xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#">
+ <pdfaExtension:schemas>
+ <rdf:Bag>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdf</pdfaSchema:prefix>
+ <pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>A name object indicating whether the document has been modified to include trapping information</pdfaProperty:description>
+ <pdfaProperty:name>Trapped</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/pdfx/1.3/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdfx</pdfaSchema:prefix>
+ <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>Conformance level of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXConformance</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>xmpMM</pdfaSchema:prefix>
+ <pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description>
+ <pdfaProperty:name>InstanceID</pdfaProperty:name>
+ <pdfaProperty:valueType>URI</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaSchema:namespaceURI>http://www.npes.org/pdfx/ns/id/</pdfaSchema:namespaceURI>
+ <pdfaSchema:prefix>pdfxid</pdfaSchema:prefix>
+ <pdfaSchema:schema>PDF/X ID Schema</pdfaSchema:schema>
+ <pdfaSchema:property>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <pdfaProperty:category>internal</pdfaProperty:category>
+ <pdfaProperty:description>ID of PDF/X standard</pdfaProperty:description>
+ <pdfaProperty:name>GTS_PDFXVersion</pdfaProperty:name>
+ <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+ </rdf:li>
+ </rdf:Seq>
+ </pdfaSchema:property>
+ </rdf:li>
+ </rdf:Bag>
+ </pdfaExtension:schemas>
+ </rdf:Description>
+ </rdf:RDF>
+ </x:xmpmeta>
+ <?xpacket end="w"?>
+endstream
+endobj
+7 0 obj
+<</Length 397 >>
+stream
+0 g 0 G
+1 0 0 1 279.474 438.882 cm
+q
+1.8 0 0 1.8 0 0 cm
+1 0 0 1 -279.474 -438.882 cm
+BT
+/F44 11.3574 Tf 1 0 0 1 279.474 438.882 Tm [<0025>-5<00420053004C>-250<0042004F0045>]TJ
+ET
+1 0 0 1 279.474 438.882 cm
+Q
+1 0 0 1 -2.937 -29.591 cm
+q
+2.4 0 0 2.4 0 0 cm
+1 0 0 1 -276.537 -409.291 cm
+BT
+/F44 11.3574 Tf 1 0 0 1 276.537 409.291 Tm [<0034005500500053>-2<004E005A>]TJ
+ET
+1 0 0 1 276.537 409.291 cm
+Q
+
+endstream
+endobj
+6 0 obj
+<</Type/Page/Contents 7 0 R/Resources 5 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+5 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F44 8 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+12 0 obj
+<</Length 0 >>
+stream
+
+endstream
+endobj
+11 0 obj
+<</Type/Page/Contents 12 0 R/Resources 10 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+10 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet[/PDF]>>
+endobj
+15 0 obj
+<</Length 1245 >>
+stream
+1 0 0 1 126.474 453.677 cm
+q
+3.6 0 0 3.6 0 0 cm
+1 0 0 1 -126.474 -453.677 cm
+BT
+/F44 11.3574 Tf 1 0 0 1 126.474 453.677 Tm [<0025>-5<00420053004C>-250<0042004F0045>]TJ
+ET
+1 0 0 1 126.474 453.677 cm
+Q
+1 0 0 1 -2.937 -44.386 cm
+q
+4.8 0 0 4.8 0 0 cm
+1 0 0 1 -123.537 -409.291 cm
+BT
+/F44 11.3574 Tf 1 0 0 1 123.537 409.291 Tm [<0034005500500053>-2<004E005A>]TJ
+ET
+1 0 0 1 123.537 409.291 cm
+Q
+1 0 0 1 22.687 -36.988 cm
+q
+1.6 0 0 1.6 0 0 cm
+1 0 0 1 -146.224 -372.303 cm
+BT
+/F38 11.3574 Tf 1 0 0 1 146.224 372.303 Tm [<0022>-250<0035>49<0042004D0046>-250<00500047>-250<002F004A0048004900550054>]TJ
+ET
+1 0 0 1 146.224 372.303 cm
+Q
+1 0 0 1 -7.368 -71.018 cm
+q
+6 0 0 6 0 0 cm
+1 0 0 1 -138.856 -301.285 cm
+BT
+/F45 11.3574 Tf 1 0 0 1 138.856 301.285 Tm [<0176>]TJ
+ET
+1 0 0 1 138.856 301.285 cm
+Q
+1 0 0 1 -138.856 -301.285 cm
+BT
+/F38 34.07221 Tf 1 0 0 1 106.742 215.362 Tm [<0025004A0053004C>-250<002900420053>8<00450044004200540046>]TJ
+/F38 14.19675 Tf 1 0 0 1 134.49 54.203 Tm [<002F0050004F0046>7<0059004A005400550046004F0055>-250<003100560043004D004A004400420055004A0050004F0054>]TJ
+1 0 0 1 109.27 39.407 Tm [<0022004F005A00550050>7<0058004F>-250<06E6>-250<0022004F005A0051004D004200440046>-250<06E6>-250<0022004F005A>-15<0058004900460053>8<0046>]TJ
+ET
+
+endstream
+endobj
+14 0 obj
+<</Type/Page/Contents 15 0 R/Resources 13 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+13 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F44 8 0 R/F38 16 0 R/F45 17 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+20 0 obj
+<</Length 2468 >>
+stream
+BT
+/F48 11.3574 Tf 1 0 0 1 117.136 320.519 Tm [<002400500051>7<005A0053004A004800490055>-250<006908E708E508E608EC>-250<0025004A0053004C>-250<002900420053>8<00450044004200540046>10<000F>]TJ
+1 0 0 1 145.053 305.724 Tm [<0022004D004D>-250<0033004A0048004900550054>-250<00330046005400460053>-15<0057>8<0046>-7<0045000F>]TJ
+1 0 0 1 136.205 276.133 Tm [<086C004A0054>-250<004A0054>-250<0042>-250<0058>8<00500053004C>-250<00500047>-250<084800440055004A0050004F000F>]TJ
+1 0 0 1 130.566 261.338 Tm [<0022004D004D>-250<0051>-7<0046005300540050004F0054>-250<0042004F0045>-250<0046>7<0057>8<0046004F00550054>-250<00420053>8<0046>]TJ
+1 0 0 1 120.356 246.542 Tm [<00470053>8<0050004E>-250<005500490046>-250<00420056005500490050005306A30054>-250<004A004E00420048004A004F00420055004A0050004F000F>]TJ
+1 0 0 1 118.152 231.747 Tm [<0033004600540046004E0043004D0042004F00440046>-250<00550050>-250<0042004F005A>-250<0053>8<00460042004D>-250<0051>-7<0046005300540050004F000D>]TJ
+1 0 0 1 122.707 216.952 Tm [<004D004A0057004A004F0048>-250<00500053>-250<0045004600420045000D>-250<004A0054>-250<00440050004A004F0044004A00450046004F00550042004D000F>]TJ
+1 0 0 1 130.543 187.361 Tm [<00310053004A004F00550046>-7<0045>-250<0050004F>-250<00420044004A0045000E00470053>8<0046>-7<0046>-250<005100420051>-7<00460053>59<000F>]TJ
+1 0 0 1 101.008 172.566 Tm [<00310053004A004F00550046>-7<0045>-250<004A004F>-250<005500490046>-250<0036004F004A00550046>-7<0045>-250<003400550042005500460054>-250<00500047>-250<0022>49<004E00460053004A>1<00440042000F>]TJ
+1 0 0 1 147.472 142.975 Tm [<002A00340023002F>-250<08E5000E08E608E708E808E908EA08EB08EC08ED000E08EE>]TJ
+1 0 0 1 126.239 113.384 Tm [<003100560043004D004A005400490046>-7<0045>-250<0043005A>-250<0025004A0053004C>-250<002900420053>8<00450044004200540046>10<000D>]TJ
+1 0 0 1 134.729 98.589 Tm [<0022>50<004F005A00550050>7<0058004F000D>-250<0022>50<004F005A00540055004200550046>-250<003600340022>]TJ
+1 0 0 1 92.701 83.793 Tm [<0058>-15<0058>-15<0058>59<000F0046>7<00590042004E0051004D0046>10<000F00440050004E00100045004900420053>8<004500440042005400460010005100560043004D004A004400420055004A0050004F00540010>]TJ
+1 0 0 1 92.349 54.203 Tm [<003100560043004D004A005400490046005306A30054>-250<0024004200550042004D00500048004A004F0048000E002A004F000E003100560043004D004A004400420055004A0050004F>-250<0025004200550042>]TJ
+1 0 0 1 137.67 39.407 Tm [<004200570042004A004D00420043004D0046>-250<00560051>-7<0050004F>-250<0053>8<0046>-7<00520056004600540055000F>]TJ
+ET
+
+endstream
+endobj
+19 0 obj
+<</Type/Page/Contents 20 0 R/Resources 18 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+18 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F48 21 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+24 0 obj
+<</Length 803 >>
+stream
+BT
+/F38 11.3574 Tf 1 0 0 1 110.787 424.087 Tm [<003800490046004F>-250<005500490046>-250<004D0050004F0046>-250<00530042004400440050>-7<0050004F>-250<00490050>7<0058004D0054>-250<00420055>-250<004500560054004C000D>]TJ
+1 0 0 1 110.389 409.291 Tm [<0022004F0045>-250<00580049004A00550046>-250<0043004A0053>8<00450054>-250<00440046004200540046>-250<005500490046004A0053>-250<00550058004A0A1D00460053>58<000D>]TJ
+1 0 0 1 110.787 394.496 Tm [<09AB0046004F>-250<005400490042004D004D>-250<005500490046>-250<0053004A0057>8<004600530054>-250<0050>7<0057>8<00460053098C0050>7<0058>-250<0058004A00550049>-250<004E004600420045000F>]TJ
+1 0 0 1 198.975 379.701 Tm [<06D8>]TJ
+/F48 11.3574 Tf 1 0 0 1 207.402 379.701 Tm [<00310053>8<0050005100490046>-7<0044005A>-250<00500047>-250<0024004D004200560045004A00560054>]TJ
+ET
+
+endstream
+endobj
+23 0 obj
+<</Type/Page/Contents 24 0 R/Resources 22 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+22 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F38 16 0 R/F48 21 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+27 0 obj
+<</Length 0 >>
+stream
+
+endstream
+endobj
+26 0 obj
+<</Type/Page/Contents 27 0 R/Resources 25 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+25 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet[/PDF]>>
+endobj
+30 0 obj
+<</Length 7502 >>
+stream
+BT
+/F38 18.17191 Tf 1 0 0 1 159.426 485.231 Tm [<0024004900420051005500460053>-250<0030004F0046>]TJ
+/F38 11.3574 Tf 0.98 0 0 1 54 394.511 Tm [<002A0055>-178<005800420054>-178<0042>-179<004500420053004C>-178<0042004F0045>-179<0054005500500053004E005A>-178<004F004A004800490055000F>-315<002D00500053>8<0045>-178<0038004A005500490046004F0054>-178<0053>7<0050>-6<00450046>-179<0049004A0054>-178<00490050005300540046>-178<005500490053>7<0050005600480049>]TJ
+0.993 0 0 1 54 379.716 Tm [<005500490046>-250<0048004D0050>-7<0050004E000D>-251<00580049004A00440049>-251<005800420054000D>-251<00420054>-251<004900460053>8<004600550050004700500053>8<0046>-250<004E0046004F0055004A0050004F0046>-7<0045000D>-251<004500420053004C000F>-336<002E005000540055>-250<0048004D0050>-7<0050004E>]TJ
+1 0 0 1 54 364.92 Tm [<004A0054>-250<004500420053004C000D>-250<00460049>-250<0058>8<005000550020>]TJ
+1.002 0 0 1 71.036 350.125 Tm [<002E0050>7<0057004A004F0048>-249<0053004A004800490055>-249<0042004D0050004F0048000D>-249<0049004A0054>-249<00490050005300540046>-249<004200530053004A0057>7<0046>-6<0045>-249<00420055>-249<005500490046>-249<004300420044004C>-249<00450050>-7<00500053>-249<00500047>-250<002D00420045005A>]TJ
+1.02 0 0 1 53.455 335.329 Tm [<0038004A00540049004A004F00550042004D0046>23<06DD0054>-255<00520056004200530055004600530054000F>-359<003400420045004D005A>57<000D>-258<002D00500053>7<0045>-255<0038004A005500490046004F0054>-256<005800420054>-256<004F00500055>-256<0050004F>-255<004A0055000D>-259<004900420057004A004F0048>]TJ
+0.986 0 0 1 54 320.534 Tm [<0054004D004A00510051>-7<0046>-7<0045>-253<0050098A>-253<0049004A0054>-253<0054004200450045004D0046>-254<0042004D0050004F0048>-253<005500490046>-253<00580042005A>59<000F>-337<09AB00420055>-253<005800420054>-254<0043>-10<0046>-7<00440042005600540046>-253<005500490046>-253<0058>7<004600420055004900460053>]TJ
+1 0 0 1 53.58 305.739 Tm [<005800420054>-250<0054005500500053004E005A>59<000F>]TJ
+1.02 0 0 1 71.036 290.943 Tm [<002D00500053>7<0046004E>-301<004A005100540056004E>-302<00450050004D00500053>-302<0054004A0055>-303<0042004E00460055000D>-316<00440050004F00540046>-7<0044005500460055005600460053>-302<00420045004A0051004A00540044004A004F0048>-302<0046004D004A0055000F>-498<00360055>]TJ
+1.02 0 0 1 54 276.148 Tm [<00510056005300560054>-264<0046004D004A0055000D>-270<0057>7<004600540055004A00430056004D0056004E>-264<00560055000D>-270<0051004D004200440046005300420055>-264<00420044000D>-270<00420045004A0051004A00540044004A004F0048>-265<0057004A005500420046>9<000D>-269<00470046004D004A0054000F>-386<002400560053000E>]TJ
+1.02 0 0 1 54 261.353 Tm [<00420043004A005500560053>-304<0045004A004400550056004E>-305<0048005300420057004A00450042>-304<004E004200560053004A0054000F>-505<002F0042004E>-305<00420053>7<00440056>-303<004D004A0043>-10<00460053>7<0050>10<000D>-319<004F0050004F0056004E004E005A>-304<0046004800460055000D>]TJ
+1.02 0 0 1 54 246.557 Tm [<00440050004F00540046>-6<0044005500460055005600460053>-358<004A0045000D>-386<00570056004D005100560055004200550046>-357<0042000D>-386<004E00420048004F0042000F>-664<00250050004F0046>-7<0044>-358<0057>7<00460049004A00440056004D0042>-356<00420056004800560046>-358<00460056>]TJ
+1.02 0 0 1 54 231.762 Tm [<004F0046>-6<005200560046>8<000F>-343<00310046004D004D0046004F005500460054005200560046>-251<004900420043004A00550042004F0055>-251<004E005000530043004A>-251<00550053004A00540055004A005200560046>-251<00540046004F0046>-7<0044005500560054>-251<00460055>-251<004F0046005500560054>-251<00460055>]TJ
+1.02 0 0 1 54 216.967 Tm [<004E0042004D004600540056004200450042>-321<00470042004E00460054>-321<00420044>-322<0055005600530051004A0054>-321<0046004800460054005500420054000F>-556<002E004200560053004A0054>-321<00560055>-322<004D0046>-7<0050>9<000F>-554<0024005300420054>-322<0057004A0057>7<0046005300530042>]TJ
+1.02 0 0 1 54 202.171 Tm [<004E0046005500560054>-281<005300490050004F004400560054>-281<00540046004E000F>-436<002F0056004D004D0042>-281<00460055>-281<004D0046>-7<0044005500560054>-282<0057>7<004600540055004A00430056004D0056004E>-280<00560053004F0042>-281<00470053004A004F0048004A004D004D0042>-282<0056004D000E>]TJ
+1.01 0 0 1 54 187.376 Tm [<00550053004A004400460054000F>-330<0031>-12<0049004200540046004D004D00560054>-248<00460056>-247<00550046004D004D00560054>-248<0054004A0055>-248<0042004E00460055>-247<005500500053005500500053>-248<0048005300420057004A00450042>-248<0051004D004200440046005300420055000F>-330<002A004F00550046004800460053>]TJ
+1.003 0 0 1 54 172.58 Tm [<005400420051004A0046004F>-248<004600540055000D>-249<004A004200440056004D004A0054>-249<004A004F000D>-248<00510053>7<00460055004A0056004E>-248<00520056004A0054000D>-249<0057004A0057>7<0046005300530042>-247<00420044000D>-249<004F0056004F0044000F>-332<003100530042004600540046004F0055>-249<0046004800460055>]TJ
+0.982 0 0 1 54 157.785 Tm [<00540046004E>-253<0057>7<0046004D>-253<004D0046>-7<0050>-254<0056004D00550053004A004400460054>-253<0043004A0043>-11<0046004F00450056004E000F>-339<0022>11<0046004F00460042004F>-252<0047004200560044004A004300560054000F>-340<002E005000530043004A>-253<00450050004D00500053>-254<004F0056004D004D0042000D>]TJ
+1.013 0 0 1 54 142.99 Tm [<004E0042004D004600540056004200450042>-245<00460056000D>-246<00510056004D0057004A004F00420053>-245<00420055000D>-246<004E0050004D004D004A0054>-245<00420044000D>-246<004F0056004D004D0042000F>-329<00240056005300420043004A005500560053>-245<004200560044005500500053>-246<00540046004E000E>]TJ
+1.02 0 0 1 54 128.194 Tm [<0051>-6<00460053>-259<004F0056004D004D0042000F>-368<00250050004F0046>-7<0044>-259<005700420053004A00560054>-259<00500053>7<0044004A>-258<0046004800460055>-259<0053004A005400560054000F>-367<00250056004A0054>-259<004F004A00430049>-259<004E004A000D>-262<00440050004F004800560046>-259<00460056000D>]TJ
+1.004 0 0 1 54 113.399 Tm [<0042004400440056004E00540042004F>-249<0046004D0046004A00470046004F0045000D>-250<005400420048004A0A1D004A0054>-250<00520056004A0054000D>-250<0045004A0042004E000F>-334<00250056004A0054>-250<0046004800460055>-250<00500053>7<0044004A>-248<0054004A0055>-250<0042004E00460055>-250<00500053>7<0044004A>]TJ
+1 0 0 1 54 98.604 Tm [<0045004A0048004F004A00540054004A004E>-250<00530056005500530056004E000F>]TJ
+1.02 0 0 1 71.036 83.808 Tm [<002F0042004E>-328<00450056004A>-328<004D004A00480056004D0042000D>-349<00470053004A004F0048004A004D004D0042>-329<0042000D>-349<00460056004A0054004E0050>-7<0045>-328<00540050>-7<00450042004D00460054000D>-349<00540050004D004D004A0044004A005500560045004A004F>-328<0057>6<0046004D000D>]TJ
+1.016 0 0 1 53.58 69.013 Tm [<0058004A0054004A000F>-327<002E005000530043004A>-246<004200560044005500500053>-246<004D00500053>7<0046004E>-245<004F0050004F>-245<004B0056005400550050>8<000F>-327<002F0042004E>-245<004D0042004400560054>-246<004D004A0043>-10<00460053>7<0050>10<000D>-245<00510053>7<00460055004A0056004E>-245<00420055000D>]TJ
+0.98 0 0 1 54 54.218 Tm [<004D00500043>-10<005000530055004A0054>-215<0057004A005500420046>10<000D>-222<0056004D00550053004A0044004A00460054>-215<00460055000D>-223<00550046004D004D00560054000F>-327<00250050004F0046>-7<0044>-215<0042004D004A0052005600460055000D>-223<005500500053005500500053>-215<00540046>-7<0045>-215<0042004400440056004E00540042004F>]TJ
+0.995 0 0 1 54 39.422 Tm [<0043004A0043>-10<0046004F00450056004E000D>-250<0046005300420055>-251<004D004A00480056004D0042>-251<0042004D004A0052005600460055>-251<004E00420048004F0042000D>-250<0057004A005500420046>-251<00500053004F00420053>7<0046>-250<0050>-7<0045004A0050>-251<004E0046005500560054>-250<0042>-251<004E004A000F>]TJ
+ET
+
+endstream
+endobj
+29 0 obj
+<</Type/Page/Contents 30 0 R/Resources 28 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+28 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F38 16 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+33 0 obj
+<</Length 10932 >>
+stream
+BT
+/F38 10.44878 Tf 1 0 0 1 36 565.643 Tm [<0013>]TJ
+/F38 10.44878 Tf 1 0 0 1 150.639 565.643 Tm [<0025>-50<09B9>-50<09C1>-50<09B0>-466<0029>-50<09B1>-50<09C1>-50<09B4>-50<09B3>-50<09B1>-50<09C2>-50<09B5>]TJ
+/F38 11.3574 Tf 1.011 0 0 1 36 542.45 Tm [<002E005000530043004A>-247<00420044>-248<00500053>7<0044004A>-246<00460055>-248<004F004A0054004D>-247<00490046004F00450053>7<00460053004A0055>-247<004E0050004D004D004A0054000F>-331<0034005600540051>-7<0046004F0045004A005400540046>-247<00560055>-248<004E0042005400540042000F>-330<0024005300420054>]TJ
+1.02 0 0 1 36 527.654 Tm [<004F0046>-6<0044>-284<0042004F00550046>9<000F>-443<00310046004D004D0046004F005500460054005200560046>-284<0042>-284<004F0056004D004D0042000F>-443<00240056004E>-284<00540050>-7<0044004A004A0054>-283<004F004200550050>-7<005200560046>-284<0051>-7<0046004F00420055004A004300560054>-284<00460055>]TJ
+1.02 0 0 1 36 512.859 Tm [<004E00420048004F004A0054>-316<0045004A0054>-316<005100420053005500560053004A0046004F0055>-317<004E0050004F005500460054000D>-334<004F0042005400440046005500560053>-316<0053004A0045004A00440056004D00560054>-316<004E00560054000F>-541<0022004D004A005200560042004E>]TJ
+0.999 0 0 1 36 498.063 Tm [<0055004A004F0044004A00450056004F0055>-250<00560053004F0042000F>-336<002F0056004D004D0042>-251<0056004D004D0042004E0044005000530051>-7<00460053>-251<0057>7<004600540055004A00430056004D0056004E>-250<0055005600530051004A0054000F>-335<00310046004D004D0046004F005500460054005200560046>]TJ
+1 0 0 1 36 483.268 Tm [<004400560053005400560054>-250<004D00560044005500560054>-250<004E004200560053004A0054000F>]TJ
+1.012 0 0 1 53.036 468.473 Tm [<002F0056004D004D0042>-247<004E0042004D004600540056004200450042>-248<0051>-7<005000530A1D004A005500500053>-247<0045004A0042004E000F>-332<00250050004F0046>-6<0044>-248<00470046004D004A0054>-248<0046005300420055000D>-247<00440050004F004800560046>-248<004F0050004F000D>]TJ
+0.992 0 0 1 35.716 453.677 Tm [<0057>8<0050004D00560055005100420055>-251<00420055000D>-252<0055004A004F0044004A00450056004F0055>-251<00550053004A00540055004A005200560046>9<000D>-251<004D004A0043>-10<00460053>7<0050>10<000F>-335<0037004A00570042004E00560054>-251<0057004A0057>7<0046005300530042>-251<004700460053004E0046004F00550056004E>]TJ
+0.98 0 0 1 36 438.882 Tm [<00470046004D004A0054000F>-329<00250050004F0046>-7<0044>-221<004F0050004F0056004E004E005A>-222<0051>-7<0046004D004D0046004F005500460054005200560046>-222<0042004F00550046>9<000F>-328<0031>-12<0049004200540046004D004D00560054>-222<00420045004A0051004A00540044004A004F0048>-222<00540046004E000E>]TJ
+0.98 0 0 1 36 424.087 Tm [<0051>-7<00460053>-226<0046004D004A0055000F>-330<00310053>7<0050004A004F>-225<004700460053004E0046004F00550056004E>-226<004E0042005400540042>-226<00420044>-226<005200560042004E000F>-331<00340046>-7<0045>-226<0045004A0042004E>-226<0055005600530051004A0054000D>-232<004E0050004D004600540055004A0046>]TJ
+1.02 0 0 1 35.716 409.291 Tm [<0057004A005500420046>9<000D>-249<0051004D004200440046005300420055>-250<0042000D>-250<004E0050004D004600540055004A0046>-249<004F0046>-7<0044000D>-251<004D0046>-7<0050>9<000F>-338<002E00420046>-7<00440046004F00420054>-250<004D00420044004A004F004A0042000F>-339<002F0042004E>-250<004A005100540056004E>]TJ
+1.015 0 0 1 36 394.496 Tm [<004D004A00480056004D0042000D>-246<0046004D0046004A00470046004F0045>-247<00420055000D>-246<0042004400440056004E00540042004F>-247<004F0046>-7<0044000D>-246<0054005600540044004A0051004A0055>-247<0042000D>-246<004A005100540056004E000F>-330<002E005000530043004A>-246<0043004D0042004F0045004A0055>]TJ
+1.017 0 0 1 36 379.701 Tm [<004D004A00480056004D0042>-244<0047004600560048004A00420055>-245<004E00420048004F0042000F>-328<002F0056004F0044>-245<0046004D0046004A00470046004F0045>-245<00440050004F00540046>-7<0052005600420055>-245<004D00500053>7<0046004E000F>-326<00340046>-7<0045>-245<004D00420044004A004F004A0042>]TJ
+1.02 0 0 1 36 364.905 Tm [<004F0056004D004D0042>-305<0057004A005500420046>-306<0046004F004A004E000F>-510<00310046004D004D0046004F005500460054005200560046>-306<0055004A004F0044004A00450056004F0055>-305<00510056005300560054>-306<0057>7<0046004D>-305<004E00420048004F0042000F>-510<002A004F00550046000E>]TJ
+1.004 0 0 1 36 350.11 Tm [<004800460053>-248<004F0050004F>-249<0046004F004A004E000F>-332<003100530042004600540046004F0055>-248<00460056004A0054004E0050>-7<0045>-249<004F0056004F0044>-249<00460056>-248<00510056005300560054000F>-332<00250050004F0046>-7<0044>-249<0043004A0043>-10<0046004F00450056004E>]TJ
+1.014 0 0 1 36 335.315 Tm [<005200560042004E>-247<004A004F>-247<00550046004D004D00560054000F>-331<002F0056004D004D0042004E>-247<004400560053005400560054>-247<00510056004D0057004A004F00420053>-247<004D0046>-7<0044005500560054000F>-331<00250050004F0046>-7<0044>-247<00460055>-248<004E004A000F>-330<002F0042004E>]TJ
+1 0 0 1 35.716 320.519 Tm [<00570056004D005100560055004200550046>-250<004E0046005500560054>-250<00460056>-250<0046004F004A004E000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<0051>-7<0046004D004D0046004F005500460054005200560046>-250<00470046004D004A0054>-250<00460056>-250<004E0042005400540042000F>]TJ
+1.02 0 0 1 53.036 305.724 Tm [<00320056004A0054005200560046>-349<0056004D004D0042004E0044005000530051>-7<00460053>-349<0051004D004200440046005300420055>-349<004A005100540056004E000F>-639<0024005300420054>-350<004F004A00430049000F>-639<002E005000530043004A>-349<0057>7<0046004D>]TJ
+1.02 0 0 1 36 290.928 Tm [<004B0056005400550050>-303<0057004A005500420046>-304<004D0042004400560054>-304<0055004A004F0044004A00450056004F0055>-304<0056004D00550053004A004400460054000F>-503<002D00500053>7<0046004E>-303<004A005100540056004E>-304<00450050004D00500053>-303<0054004A0055>-304<0042004E00460055000D>]TJ
+1.02 0 0 1 36 276.133 Tm [<00440050004F00540046>-6<0044005500460055005600460053>-252<00420045004A0051004A00540044004A004F0048>-252<0046004D004A0055000F>-348<002A004F>-252<004900420044>-252<004900420043004A00550042005400540046>-252<0051004D0042005500460042>-252<0045004A004400550056004E00540055000F>-348<002A004F000E>]TJ
+1.02 0 0 1 36 261.338 Tm [<00550046004800460053>-311<00550046004E005100560054>-312<00440050004F00570042004D004D004A0054>-311<00420056004800560046>9<000F>-525<00260055004A0042004E>-312<004700420044004A004D004A0054004A0054000F>-526<002F0056004F0044>-311<0046004D0046004E0046004F00550056004E>]TJ
+1.006 0 0 1 36 246.542 Tm [<004700460053004E0046004F00550056004E>-247<0058004A0054004A000F>-331<0022>11<0046004F00460042004F>-246<0051004D004200440046005300420055000F>-331<00360055>-247<004A004E0051>-7<00460053>7<0045004A00460055000D>-246<0046004F004A004E>-248<00540046>-6<0045>-248<0048005300420057004A00450042>]TJ
+1.02 0 0 1 36 231.747 Tm [<00540050004D004D004A0044004A005500560045004A004F000D>-311<00470046004D004A0054>-299<0050>-7<0045004A0050>-298<0051004D004200440046005300420055>-299<005200560042004E000D>-311<00420044>-299<00510056004D0057004A004F00420053>-298<0046004D004A0055>-299<00510056005300560054>-298<0046004800460055>]TJ
+0.995 0 0 1 36 216.952 Tm [<0046004F004A004E000F>-334<002F0056004F0044>-250<0057004A005500420046>-250<005500500053005500500053>58<000F>-334<00310053>7<0050004A004F>-249<00550046004E005100560054>-250<004F004A00430049>-250<0054004A0055>-250<0042004E00460055>-250<004F004A0054004D000F>-335<0037004A00570042004E00560054>]TJ
+1 0 0 1 36 202.156 Tm [<00520056004A0054>-250<005500500053005500500053>-250<0057004A005500420046>-250<0053004A005400560054>-250<0051>-7<0050005300550042>-250<0057>8<00460049004A00440056004D0042000F>]TJ
+0.999 0 0 1 53.036 187.361 Tm [<00270056005400440046>-250<004E004200560053004A0054000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<004D00560044005500560054>-250<004F004A00430049>-250<00420055>-250<004D0046>-7<0044005500560054000F>-334<00340046>-7<0045>-250<0043004A0043>-10<0046004F00450056004E000D>]TJ
+1.004 0 0 1 36 172.566 Tm [<004F0056004D004D0042>-247<0042>-248<0047004200560044004A004300560054>-248<00540046004E0051>-7<00460053>58<000D>-247<004D0046>-7<0050>-248<0057>7<0046004D004A0055>-247<0056004D00550053004A0044004A00460054>-248<00550046004D004D00560054000D>-248<00420044>-248<0057>7<0046004F0046004F00420055004A0054>-247<00420053>7<00440056>]TJ
+1.016 0 0 1 35.58 157.77 Tm [<0058004A0054004A>-246<0057>7<0046004D>-245<004F004A0054004D000F>-328<0037>78<004600540055004A00430056004D0056004E>-245<0045004A0042004E000F>-328<0022004D004A005200560042004E>-246<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-245<00420056004800560046>-246<00520056004A0054>]TJ
+1.008 0 0 1 36 142.975 Tm [<005400420048004A0A1D004A0054>-246<0051>-7<00500054005600460053>7<0046>10<000D>-246<0055005600530051004A0054>-247<004D0042004400560054>-246<00440050004F004800560046>-247<005200560042004E000D>-247<004A004F>-246<00490046004F00450053>7<00460053004A0055>-246<0053004A005400560054>-246<00460053>7<00500054>]TJ
+0.98 0 0 1 36 128.179 Tm [<0046004800460055>-241<00470046004D004A0054000F>-336<002E00420046>-7<00440046004F00420054>-241<0046004800460055>-242<0046005300420055>-241<004A004F>-241<005400420051004A0046004F>-242<004E00420A1D004A0054>-241<0051>-7<005000530A1D004A005500500053>59<000F>-335<0037>81<004600540055004A00430056004D0056004E>]TJ
+1.02 0 0 1 36 113.384 Tm [<0051>-6<005000530A1D004A005500500053>57<000F>-487<002F0056004D004D0042>-299<004700420044004A004D004A0054004A000F>-487<00340046>-7<0045>-299<0042>-299<0055005600530051004A0054>-298<00460056>-299<004D0042004400560054>-299<00440050004E004E0050>-6<00450050>-299<004700420044004A004D004A0054004A0054000F>]TJ
+0.983 0 0 1 36 98.589 Tm [<002E005000530043004A>-252<00470053004A004F0048004A004D004D0042000D>-254<0058004A0054004A>-252<004A004F>-253<0045004A0048004F004A00540054004A004E>-253<004A004F005500460053>7<00450056004E000D>-252<004B0056005400550050>-253<004D0046>-7<0044005500560054>-253<005400420048004A0A1D004A0054>-253<00450056004A000D>]TJ
+1.02 0 0 1 36 83.793 Tm [<00460055>-258<0057>7<00460049004A00440056004D0042>-258<004D004A0043>-10<00460053>7<0050>-258<00450056004A>-259<004400560053005400560054>-259<00450056004A000F>-367<002E004200560053004A0054>-259<00550046004E0051>-7<00500053>-259<004D004A00480056004D0042>-259<00540046>-6<0045>-259<004D0042004400560054000F>]TJ
+1.02 0 0 1 36 68.998 Tm [<00250056004A0054>-341<004400560053005400560054>-341<0046004F004A004E>-341<00560055>-341<00420056004800560046>9<000F>-614<0024005300420054>-341<00420044>-341<004E00420048004F0042000F>-615<0024005300420054>-341<004F0056004D004D0042000F>-615<002F0056004D004D0042>]TJ
+1.02 0 0 1 36 54.203 Tm [<0046004800460054005500420054000F>-526<00240056005300420043004A005500560053>-312<0042>-311<004D0046>-7<0050>9<000F>-526<00320056004A0054005200560046>-312<0046004800460054005500420054>-311<0058004A0054004A>-312<0046004800460055>-312<004F0056004F0044000F>-526<002F0042004E>]TJ
+1 0 0 1 36 39.407 Tm [<0047004600560048004A00420055>-250<004D0042004400560054>-250<0057>8<0046004D>-250<004600540055000F>-333<00240056005300420043004A005500560053>-250<00440050004F00540046>-7<0044005500460055005600460053>58<000F>]TJ
+ET
+
+endstream
+endobj
+32 0 obj
+<</Type/Page/Contents 33 0 R/Resources 31 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+31 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F38 16 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+36 0 obj
+<</Length 6129 >>
+stream
+BT
+/F38 10.44878 Tf 1 0 0 1 161.562 565.643 Tm [<0025>-50<09B1>-50<09C1>-50<09B0>-466<09B1>-50<09BD>-50<09B4>-467<0034>-50<09C3>-25<09BE>-50<09C1>-50<09BC>-50<09C8>]TJ
+/F38 10.44878 Tf 1 0 0 1 355.141 565.643 Tm [<0014>]TJ
+/F38 11.3574 Tf 0.98 0 0 1 71.036 542.45 Tm [<0034005600540051>-7<0046004F0045004A005400540046>-249<0057>7<0046004D>-248<00470046004D004A0054000F>-339<00360055>-249<004D00500053>7<0046004E>-248<004D00500053>7<0046004E000D>-249<004A004F005500460053>7<00450056004E>-249<00460056000D>-250<0055004A004F0044004A00450056004F0055>-250<0054004A0055>]TJ
+1.015 0 0 1 54 527.654 Tm [<0042004E00460055000D>-246<004D004200500053>7<0046>-6<00460055>-247<0057004A005500420046>9<000D>-246<00420053>7<00440056000F>-329<0022>11<0046004F00460042004F>-246<0047004200560044004A004300560054>-246<0051>-7<0046>-7<00450046>-247<00460056>-246<0042004F00550046>9<000F>-329<003100530042004600540046004F0055>]TJ
+1.02 0 0 1 54 512.859 Tm [<0046004F004A004E>-282<0046004D004A0055000D>-293<00530056005500530056004E>-283<00420055000D>-292<004E0050004D004600540055004A0046>-283<004F0050004F000D>-292<004F0050004F0056004E004E005A>-283<0057>7<0046004D000D>-291<004F004A0054004D000F>-440<00360055>-283<004D0046>-7<0044005500560054>]TJ
+1.02 0 0 1 54 498.063 Tm [<00460053>7<00500054000D>-317<004E0042004D004600540056004200450042>-304<0054004A0055>-304<0042004E00460055000D>-319<004700460053004E0046004F00550056004E>-304<00460056000D>-319<00540050>-7<00450042004D00460054>-303<004400560053005400560054000D>-319<004E00420048004F0042000F>]TJ
+1.007 0 0 1 54 483.268 Tm [<00250050004F0046>-7<0044>-248<00460056>-249<00510056005300560054000F>-332<00320056004A0054005200560046>-248<0057>7<00460049004A00440056004D0042000D>-248<00560053004F0042>-249<00540046>-7<0045>-248<0056004D00550053004A0044004A00460054>-249<004200560044005500500053>58<000D>-248<0051>-7<0046>-7<00450046>]TJ
+1.02 0 0 1 54 468.473 Tm [<004D00500053>7<0046004E>-315<0046004800460054005500420054>-317<00450056004A000D>-334<00460055>-316<00440050004F00570042004D004D004A0054>-317<0046004D004A0055>-316<0046005300420055>-317<00540046>-7<0045>-316<004F0056004D004D0042000F>-541<00250050004F0046>-7<0044>-316<004D00560044005500560054000F>]TJ
+0.98 0 0 1 54 453.677 Tm [<00240056005300420043004A005500560053>-241<00460055>-242<004F0056004F0044000F>-336<0022004D004A005200560042004E>-242<00450050004D00500053>-242<0050>-7<0045004A0050>10<000D>-244<00440050004E004E0050>-7<00450050>-242<00510053>7<00460055004A0056004E000D>-243<0056004D00550053004A0044004A00460054>]TJ
+1.018 0 0 1 54 438.882 Tm [<004F0050004F000D>-244<0051004900420053>7<0046005500530042>-243<004A004F000D>-245<0057>7<0046004D004A0055000F>-326<002A004F00550046004800460053>-244<00420053>7<00440056>-244<004600540055000D>-244<004F0050004F0056004E004E005A>-244<004A004F000D>-245<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 54 424.087 Tm [<0047004200560044004A004300560054000D>-250<0046004800460054005500420054>-250<0057>8<0046004D000D>-250<0050>-7<0045004A0050>10<000F>]TJ
+1.005 0 0 1 71.036 409.291 Tm [<00340046>-7<0045>-247<00440050004E004E0050>-7<00450050>-248<0051>-6<00500054005600460053>7<0046>-247<0051>-7<0046>-7<00450046>9<000F>-330<002E004200560053004A0054>-248<00560055>-247<004600540055000F>-332<00360055>-247<00520056004A0054>-248<00510056005300560054000F>-331<00340046>-7<0045>]TJ
+1.01 0 0 1 54 394.496 Tm [<00420044>-247<0050>-7<0045004A0050>9<000F>-330<00340046>-7<0045>-248<0057>7<00460049004A00440056004D0042>-247<00490046004F00450053>7<00460053004A0055>-247<00540046004E000F>-331<00250056004A0054>-248<004F0050004F>-248<0050>-6<0045004A0050>9<000F>-330<002E005000530043004A>-248<00560055>-248<00450056004A000F>]TJ
+1.02 0 0 1 54 379.701 Tm [<00340046>-6<0045>-317<0042004400440056004E00540042004F>-317<0053004A005400560054>-316<0046004800460055>-317<0050>-7<0045004A0050>9<000F>-541<002A004F>-316<004900420044>-317<004900420043004A00550042005400540046>-317<0051004D0042005500460042>-316<0045004A004400550056004E00540055000F>]TJ
+1.02 0 0 1 54 364.905 Tm [<00310046004D004D0046004F005500460054005200560046>-361<004F0050004F>-362<0046004D004A0055000F>-677<00270056005400440046>-362<00540046>-6<0045>-362<004B0056005400550050>-362<00460056>-362<00560053004F0042>-362<0051>-6<0050005300550042>-362<0055004A004F0044004A00450056004F0055000F>]TJ
+0.981 0 0 1 54 350.11 Tm [<002E004200560053004A0054>-255<00470046004D004A0054>-255<0050>-7<0045004A0050>9<000D>-254<00540050004D004D004A0044004A005500560045004A004F>-255<00540046>-7<0045000D>-256<0057>8<0050004D00560055005100420055>-255<0042000D>-255<00500053004F00420053>7<0046>-254<00420044000D>-255<0046005300420055000F>-341<002E005000530043004A>]TJ
+1.02 0 0 1 54 335.315 Tm [<00520056004A0054>-271<00450050004D00500053>57<000F>-405<00250050004F0046>-6<0044>-272<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-277<0046005300420055>-271<00420044>-271<005400420048004A0A1D004A0054>-272<00540046004E0051>-7<00460053>57<000D>-277<004F0056004F0044>-271<00450056004A>]TJ
+1.02 0 0 1 54 320.519 Tm [<004D00500043>-9<005000530055004A0054>-269<00510056005300560054000D>-275<00520056004A0054>-269<00440050004F004800560046>-269<00510056005300560054>-269<004E0046005500560054>-269<0056004D00550053004A0044004A00460054>-269<00550046004D004D00560054000F>-399<00310053>7<0050004A004F>-268<00460055>]TJ
+1.02 0 0 1 54 305.724 Tm [<005200560042004E000F>-341<0024004D004200540054>-250<0042005100550046004F0055>-250<005500420044004A0055004A>-250<00540050>-7<0044004A0050005400520056>-250<00420045>-250<004D004A0055005000530042>-250<005500500053>7<005200560046004F0055>-249<0051>-7<00460053>-250<00440050004F00560043004A0042>]TJ
+0.98 0 0 1 54 290.928 Tm [<004F00500054005500530042000D>-241<0051>-7<00460053>-238<004A004F004400460051005500500054>-239<0049005A004E0046004F00420046>-7<00500054000F>-334<003100530042004600540046004F0055>-238<005400420051004A0046004F>-239<0055005600530051004A0054000D>-241<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 53.716 276.133 Tm [<0057>8<0046004D000D>-250<0046004D0046004A00470046004F0045>-250<0047004200560044004A004300560054000D>-250<0057>8<00460049004A00440056004D0042>-250<00460056000D>-250<004D0042004400560054000F>]TJ
+ET
+
+endstream
+endobj
+35 0 obj
+<</Type/Page/Contents 36 0 R/Resources 34 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+34 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F38 16 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+39 0 obj
+<</Length 7785 >>
+stream
+BT
+/F38 18.17191 Tf 1 0 0 1 140.517 485.231 Tm [<0024004900420051005500460053>-250<0035>49<0058>8<0050>]TJ
+/F38 11.3574 Tf 0.994 0 0 1 36 394.511 Tm [<09AB0046>-252<004F004A004800490055>-252<005800420054>-252<00540055004A004D004D>-252<004500420053004C>-252<0042004F0045>-252<0054005500500053004E005A>59<000F>-336<09AB004A0054>-252<0054004900500056004D0045>-252<004F00500055>-252<0043>-10<0046>-252<00540056005300510053004A0054004A004F0048000D>]TJ
+0.989 0 0 1 36 379.716 Tm [<00540046>-7<0046004A004F0048>-253<00420054>-253<00490050>6<0058>-252<0050004F004D005A>-254<00490042004D0047>-253<0042004F>-253<0049005000560053>-254<004900420054>-253<0046004D0042005100540046>-7<0045>-253<0054004A004F00440046>-254<005500490046>-253<098B005300540055>-253<0044004900420051005500460053>59<000F>]TJ
+1.02 0 0 1 36 364.92 Tm [<09AB00420055>-287<004A004F004700500053004E00420055004A0050004F>-287<005800420054>-287<004F0046>-7<004400460054005400420053>-15<005A>57<000D>-297<004A004F>-287<0044004200540046>-287<005A>7<00500056>-287<005100560055>-287<005500490046>-287<0043>-10<0050>-7<0050004C>-287<00450050>6<0058004F>]TJ
+1 0 0 1 36 350.125 Tm [<0042004F0045>-250<004900420057>8<0046004F06DD0055>-250<0053>8<004600420045>-250<0042004F005A>-250<00500047>-250<004A0055>-250<004700500053>-250<005500490046>-250<004D004200540055>-250<00550058>8<0050>-250<0058>8<0046>-7<0046004C0054000F>]TJ
+0.98 0 0 1 53.036 335.329 Tm [<002D00500053>8<0045>-210<0038004A005500490046004F0054000D>-219<0058>8<00460055>-210<0042004F0045>-210<004300530056004A00540046>-7<0045000D>-219<098B004F0042004D004D005A>-210<004200530053004A0057>7<0046>-6<0045>-210<00420055>-210<0049004A0054>-210<0045004600540055004A004F00420055004A0050004F000F>]TJ
+0.98 0 0 1 36 320.534 Tm [<09AB0046>-239<0053>7<0046004200540050004F>-238<00490046>-240<005800420054>-240<0058>8<00460055>-239<005800420054>-240<0043>-10<0046>-7<00440042005600540046>9<000D>-241<00420054>-240<004900420054>-239<0043>-11<0046>-7<0046004F>-239<004F005000550046>-8<0045000D>-242<005500490046>-240<0058>8<004600420055004900460053>]TJ
+1 0 0 1 35.58 305.739 Tm [<005800420054>-250<0054005500500053004E005A>59<000F>-333<002A0055>-250<005800420054>-250<004500420053004C000D>-250<00550050>-7<0050>9<000F>]TJ
+1.02 0 0 1 53.036 290.943 Tm [<002D00500053>7<0046004E>-301<004A005100540056004E>-302<00450050004D00500053>-302<0054004A0055>-303<0042004E00460055000D>-316<00440050004F00540046>-7<0044005500460055005600460053>-302<00420045004A0051004A00540044004A004F0048>-302<0046004D004A0055000F>-498<00360055>]TJ
+1.02 0 0 1 36 276.148 Tm [<00510056005300560054>-264<0046004D004A0055000D>-270<0057>7<004600540055004A00430056004D0056004E>-264<00560055000D>-270<0051004D004200440046005300420055>-264<00420044000D>-270<00420045004A0051004A00540044004A004F0048>-265<0057004A005500420046>9<000D>-269<00470046004D004A0054000F>-386<002400560053000E>]TJ
+1.02 0 0 1 36 261.353 Tm [<00420043004A005500560053>-304<0045004A004400550056004E>-305<0048005300420057004A00450042>-304<004E004200560053004A0054000F>-505<002F0042004E>-305<00420053>7<00440056>-303<004D004A0043>-10<00460053>7<0050>10<000D>-319<004F0050004F0056004E004E005A>-304<0046004800460055000D>]TJ
+1.02 0 0 1 36 246.557 Tm [<00440050004F00540046>-6<0044005500460055005600460053>-358<004A0045000D>-386<00570056004D005100560055004200550046>-357<0042000D>-386<004E00420048004F0042000F>-664<00250050004F0046>-7<0044>-358<0057>7<00460049004A00440056004D0042>-356<00420056004800560046>-358<00460056>]TJ
+1.02 0 0 1 36 231.762 Tm [<004F0046>-6<005200560046>8<000F>-343<00310046004D004D0046004F005500460054005200560046>-251<004900420043004A00550042004F0055>-251<004E005000530043004A>-251<00550053004A00540055004A005200560046>-251<00540046004F0046>-7<0044005500560054>-251<00460055>-251<004F0046005500560054>-251<00460055>]TJ
+1.02 0 0 1 36 216.967 Tm [<004E0042004D004600540056004200450042>-321<00470042004E00460054>-321<00420044>-322<0055005600530051004A0054>-321<0046004800460054005500420054000F>-556<002E004200560053004A0054>-321<00560055>-322<004D0046>-7<0050>9<000F>-554<0024005300420054>-322<0057004A0057>7<0046005300530042>]TJ
+1.02 0 0 1 36 202.171 Tm [<004E0046005500560054>-281<005300490050004F004400560054>-281<00540046004E000F>-436<002F0056004D004D0042>-281<00460055>-281<004D0046>-7<0044005500560054>-282<0057>7<004600540055004A00430056004D0056004E>-280<00560053004F0042>-281<00470053004A004F0048004A004D004D0042>-282<0056004D000E>]TJ
+1.01 0 0 1 36 187.376 Tm [<00550053004A004400460054000F>-330<0031>-12<0049004200540046004D004D00560054>-248<00460056>-247<00550046004D004D00560054>-248<0054004A0055>-248<0042004E00460055>-247<005500500053005500500053>-248<0048005300420057004A00450042>-248<0051004D004200440046005300420055000F>-330<002A004F00550046004800460053>]TJ
+1.003 0 0 1 36 172.58 Tm [<005400420051004A0046004F>-248<004600540055000D>-249<004A004200440056004D004A0054>-249<004A004F000D>-248<00510053>7<00460055004A0056004E>-248<00520056004A0054000D>-249<0057004A0057>7<0046005300530042>-247<00420044000D>-249<004F0056004F0044000F>-332<003100530042004600540046004F0055>-249<0046004800460055>]TJ
+0.982 0 0 1 36 157.785 Tm [<00540046004E>-253<0057>7<0046004D>-253<004D0046>-7<0050>-254<0056004D00550053004A004400460054>-253<0043004A0043>-11<0046004F00450056004E000F>-339<0022>11<0046004F00460042004F>-252<0047004200560044004A004300560054000F>-340<002E005000530043004A>-253<00450050004D00500053>-254<004F0056004D004D0042000D>]TJ
+1.013 0 0 1 36 142.99 Tm [<004E0042004D004600540056004200450042>-245<00460056000D>-246<00510056004D0057004A004F00420053>-245<00420055000D>-246<004E0050004D004D004A0054>-245<00420044000D>-246<004F0056004D004D0042000F>-329<00240056005300420043004A005500560053>-245<004200560044005500500053>-246<00540046004E000E>]TJ
+1.02 0 0 1 36 128.194 Tm [<0051>-6<00460053>-259<004F0056004D004D0042000F>-368<00250050004F0046>-7<0044>-259<005700420053004A00560054>-259<00500053>7<0044004A>-258<0046004800460055>-259<0053004A005400560054000F>-367<00250056004A0054>-259<004F004A00430049>-259<004E004A000D>-262<00440050004F004800560046>-259<00460056000D>]TJ
+1.004 0 0 1 36 113.399 Tm [<0042004400440056004E00540042004F>-249<0046004D0046004A00470046004F0045000D>-250<005400420048004A0A1D004A0054>-250<00520056004A0054000D>-250<0045004A0042004E000F>-334<00250056004A0054>-250<0046004800460055>-250<00500053>7<0044004A>-248<0054004A0055>-250<0042004E00460055>-250<00500053>7<0044004A>]TJ
+1 0 0 1 36 98.604 Tm [<0045004A0048004F004A00540054004A004E>-250<00530056005500530056004E000F>]TJ
+1.02 0 0 1 53.036 83.808 Tm [<002F0042004E>-328<00450056004A>-328<004D004A00480056004D0042000D>-349<00470053004A004F0048004A004D004D0042>-329<0042000D>-349<00460056004A0054004E0050>-7<0045>-328<00540050>-7<00450042004D00460054000D>-349<00540050004D004D004A0044004A005500560045004A004F>-328<0057>6<0046004D000D>]TJ
+1.016 0 0 1 35.58 69.013 Tm [<0058004A0054004A000F>-327<002E005000530043004A>-246<004200560044005500500053>-246<004D00500053>7<0046004E>-245<004F0050004F>-245<004B0056005400550050>8<000F>-327<002F0042004E>-245<004D0042004400560054>-246<004D004A0043>-10<00460053>7<0050>10<000D>-245<00510053>7<00460055004A0056004E>-245<00420055000D>]TJ
+0.98 0 0 1 36 54.218 Tm [<004D00500043>-10<005000530055004A0054>-215<0057004A005500420046>10<000D>-222<0056004D00550053004A0044004A00460054>-215<00460055000D>-223<00550046004D004D00560054000F>-327<00250050004F0046>-7<0044>-215<0042004D004A0052005600460055000D>-223<005500500053005500500053>-215<00540046>-7<0045>-215<0042004400440056004E00540042004F>]TJ
+0.995 0 0 1 36 39.422 Tm [<0043004A0043>-10<0046004F00450056004E000D>-250<0046005300420055>-251<004D004A00480056004D0042>-251<0042004D004A0052005600460055>-251<004E00420048004F0042000D>-250<0057004A005500420046>-251<00500053004F00420053>7<0046>-250<0050>-7<0045004A0050>-251<004E0046005500560054>-250<0042>-251<004E004A000F>]TJ
+ET
+
+endstream
+endobj
+38 0 obj
+<</Type/Page/Contents 39 0 R/Resources 37 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 9 0 R>>
+endobj
+37 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F38 16 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+42 0 obj
+<</Length 10951 >>
+stream
+BT
+/F38 10.44878 Tf 1 0 0 1 161.562 565.643 Tm [<0025>-50<09B1>-50<09C1>-50<09B0>-466<09B1>-50<09BD>-50<09B4>-467<0034>-50<09C3>-25<09BE>-50<09C1>-50<09BC>-50<09C8>]TJ
+/F38 10.44878 Tf 1 0 0 1 355.141 565.643 Tm [<0016>]TJ
+/F38 11.3574 Tf 1.011 0 0 1 54 542.45 Tm [<002E005000530043004A>-247<00420044>-248<00500053>7<0044004A>-246<00460055>-248<004F004A0054004D>-247<00490046004F00450053>7<00460053004A0055>-247<004E0050004D004D004A0054000F>-331<0034005600540051>-7<0046004F0045004A005400540046>-247<00560055>-248<004E0042005400540042000F>-330<0024005300420054>]TJ
+1.02 0 0 1 54 527.654 Tm [<004F0046>-6<0044>-284<0042004F00550046>9<000F>-443<00310046004D004D0046004F005500460054005200560046>-284<0042>-284<004F0056004D004D0042000F>-443<00240056004E>-284<00540050>-7<0044004A004A0054>-283<004F004200550050>-7<005200560046>-284<0051>-7<0046004F00420055004A004300560054>-284<00460055>]TJ
+1.02 0 0 1 54 512.859 Tm [<004E00420048004F004A0054>-316<0045004A0054>-316<005100420053005500560053004A0046004F0055>-317<004E0050004F005500460054000D>-334<004F0042005400440046005500560053>-316<0053004A0045004A00440056004D00560054>-316<004E00560054000F>-541<0022004D004A005200560042004E>]TJ
+0.999 0 0 1 54 498.063 Tm [<0055004A004F0044004A00450056004F0055>-250<00560053004F0042000F>-336<002F0056004D004D0042>-251<0056004D004D0042004E0044005000530051>-7<00460053>-251<0057>7<004600540055004A00430056004D0056004E>-250<0055005600530051004A0054000F>-335<00310046004D004D0046004F005500460054005200560046>]TJ
+1 0 0 1 54 483.268 Tm [<004400560053005400560054>-250<004D00560044005500560054>-250<004E004200560053004A0054000F>]TJ
+1.012 0 0 1 71.036 468.473 Tm [<002F0056004D004D0042>-247<004E0042004D004600540056004200450042>-248<0051>-7<005000530A1D004A005500500053>-247<0045004A0042004E000F>-332<00250050004F0046>-6<0044>-248<00470046004D004A0054>-248<0046005300420055000D>-247<00440050004F004800560046>-248<004F0050004F000D>]TJ
+0.992 0 0 1 53.716 453.677 Tm [<0057>8<0050004D00560055005100420055>-251<00420055000D>-252<0055004A004F0044004A00450056004F0055>-251<00550053004A00540055004A005200560046>9<000D>-251<004D004A0043>-10<00460053>7<0050>10<000F>-335<0037004A00570042004E00560054>-251<0057004A0057>7<0046005300530042>-251<004700460053004E0046004F00550056004E>]TJ
+0.98 0 0 1 54 438.882 Tm [<00470046004D004A0054000F>-329<00250050004F0046>-7<0044>-221<004F0050004F0056004E004E005A>-222<0051>-7<0046004D004D0046004F005500460054005200560046>-222<0042004F00550046>9<000F>-328<0031>-12<0049004200540046004D004D00560054>-222<00420045004A0051004A00540044004A004F0048>-222<00540046004E000E>]TJ
+0.98 0 0 1 54 424.087 Tm [<0051>-7<00460053>-226<0046004D004A0055000F>-330<00310053>7<0050004A004F>-225<004700460053004E0046004F00550056004E>-226<004E0042005400540042>-226<00420044>-226<005200560042004E000F>-331<00340046>-7<0045>-226<0045004A0042004E>-226<0055005600530051004A0054000D>-232<004E0050004D004600540055004A0046>]TJ
+1.02 0 0 1 53.716 409.291 Tm [<0057004A005500420046>9<000D>-249<0051004D004200440046005300420055>-250<0042000D>-250<004E0050004D004600540055004A0046>-249<004F0046>-7<0044000D>-251<004D0046>-7<0050>9<000F>-338<002E00420046>-7<00440046004F00420054>-250<004D00420044004A004F004A0042000F>-339<002F0042004E>-250<004A005100540056004E>]TJ
+1.015 0 0 1 54 394.496 Tm [<004D004A00480056004D0042000D>-246<0046004D0046004A00470046004F0045>-247<00420055000D>-246<0042004400440056004E00540042004F>-247<004F0046>-7<0044000D>-246<0054005600540044004A0051004A0055>-247<0042000D>-246<004A005100540056004E000F>-330<002E005000530043004A>-246<0043004D0042004F0045004A0055>]TJ
+1.017 0 0 1 54 379.701 Tm [<004D004A00480056004D0042>-244<0047004600560048004A00420055>-245<004E00420048004F0042000F>-328<002F0056004F0044>-245<0046004D0046004A00470046004F0045>-245<00440050004F00540046>-7<0052005600420055>-245<004D00500053>7<0046004E000F>-326<00340046>-7<0045>-245<004D00420044004A004F004A0042>]TJ
+1.02 0 0 1 54 364.905 Tm [<004F0056004D004D0042>-305<0057004A005500420046>-306<0046004F004A004E000F>-510<00310046004D004D0046004F005500460054005200560046>-306<0055004A004F0044004A00450056004F0055>-305<00510056005300560054>-306<0057>7<0046004D>-305<004E00420048004F0042000F>-510<002A004F00550046000E>]TJ
+1.004 0 0 1 54 350.11 Tm [<004800460053>-248<004F0050004F>-249<0046004F004A004E000F>-332<003100530042004600540046004F0055>-248<00460056004A0054004E0050>-7<0045>-249<004F0056004F0044>-249<00460056>-248<00510056005300560054000F>-332<00250050004F0046>-7<0044>-249<0043004A0043>-10<0046004F00450056004E>]TJ
+1.014 0 0 1 54 335.315 Tm [<005200560042004E>-247<004A004F>-247<00550046004D004D00560054000F>-331<002F0056004D004D0042004E>-247<004400560053005400560054>-247<00510056004D0057004A004F00420053>-247<004D0046>-7<0044005500560054000F>-331<00250050004F0046>-7<0044>-247<00460055>-248<004E004A000F>-330<002F0042004E>]TJ
+1 0 0 1 53.716 320.519 Tm [<00570056004D005100560055004200550046>-250<004E0046005500560054>-250<00460056>-250<0046004F004A004E000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<0051>-7<0046004D004D0046004F005500460054005200560046>-250<00470046004D004A0054>-250<00460056>-250<004E0042005400540042000F>]TJ
+1.02 0 0 1 71.036 305.724 Tm [<00320056004A0054005200560046>-349<0056004D004D0042004E0044005000530051>-7<00460053>-349<0051004D004200440046005300420055>-349<004A005100540056004E000F>-639<0024005300420054>-350<004F004A00430049000F>-639<002E005000530043004A>-349<0057>7<0046004D>]TJ
+1.02 0 0 1 54 290.928 Tm [<004B0056005400550050>-303<0057004A005500420046>-304<004D0042004400560054>-304<0055004A004F0044004A00450056004F0055>-304<0056004D00550053004A004400460054000F>-503<002D00500053>7<0046004E>-303<004A005100540056004E>-304<00450050004D00500053>-303<0054004A0055>-304<0042004E00460055000D>]TJ
+1.02 0 0 1 54 276.133 Tm [<00440050004F00540046>-6<0044005500460055005600460053>-252<00420045004A0051004A00540044004A004F0048>-252<0046004D004A0055000F>-348<002A004F>-252<004900420044>-252<004900420043004A00550042005400540046>-252<0051004D0042005500460042>-252<0045004A004400550056004E00540055000F>-348<002A004F000E>]TJ
+1.02 0 0 1 54 261.338 Tm [<00550046004800460053>-311<00550046004E005100560054>-312<00440050004F00570042004D004D004A0054>-311<00420056004800560046>9<000F>-525<00260055004A0042004E>-312<004700420044004A004D004A0054004A0054000F>-526<002F0056004F0044>-311<0046004D0046004E0046004F00550056004E>]TJ
+1.006 0 0 1 54 246.542 Tm [<004700460053004E0046004F00550056004E>-247<0058004A0054004A000F>-331<0022>11<0046004F00460042004F>-246<0051004D004200440046005300420055000F>-331<00360055>-247<004A004E0051>-7<00460053>7<0045004A00460055000D>-246<0046004F004A004E>-248<00540046>-6<0045>-248<0048005300420057004A00450042>]TJ
+1.02 0 0 1 54 231.747 Tm [<00540050004D004D004A0044004A005500560045004A004F000D>-311<00470046004D004A0054>-299<0050>-7<0045004A0050>-298<0051004D004200440046005300420055>-299<005200560042004E000D>-311<00420044>-299<00510056004D0057004A004F00420053>-298<0046004D004A0055>-299<00510056005300560054>-298<0046004800460055>]TJ
+0.995 0 0 1 54 216.952 Tm [<0046004F004A004E000F>-334<002F0056004F0044>-250<0057004A005500420046>-250<005500500053005500500053>58<000F>-334<00310053>7<0050004A004F>-249<00550046004E005100560054>-250<004F004A00430049>-250<0054004A0055>-250<0042004E00460055>-250<004F004A0054004D000F>-335<0037004A00570042004E00560054>]TJ
+1 0 0 1 54 202.156 Tm [<00520056004A0054>-250<005500500053005500500053>-250<0057004A005500420046>-250<0053004A005400560054>-250<0051>-7<0050005300550042>-250<0057>8<00460049004A00440056004D0042000F>]TJ
+0.999 0 0 1 71.036 187.361 Tm [<00270056005400440046>-250<004E004200560053004A0054000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<004D00560044005500560054>-250<004F004A00430049>-250<00420055>-250<004D0046>-7<0044005500560054000F>-334<00340046>-7<0045>-250<0043004A0043>-10<0046004F00450056004E000D>]TJ
+1.004 0 0 1 54 172.566 Tm [<004F0056004D004D0042>-247<0042>-248<0047004200560044004A004300560054>-248<00540046004E0051>-7<00460053>58<000D>-247<004D0046>-7<0050>-248<0057>7<0046004D004A0055>-247<0056004D00550053004A0044004A00460054>-248<00550046004D004D00560054000D>-248<00420044>-248<0057>7<0046004F0046004F00420055004A0054>-247<00420053>7<00440056>]TJ
+1.016 0 0 1 53.58 157.77 Tm [<0058004A0054004A>-246<0057>7<0046004D>-245<004F004A0054004D000F>-328<0037>78<004600540055004A00430056004D0056004E>-245<0045004A0042004E000F>-328<0022004D004A005200560042004E>-246<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-245<00420056004800560046>-246<00520056004A0054>]TJ
+1.008 0 0 1 54 142.975 Tm [<005400420048004A0A1D004A0054>-246<0051>-7<00500054005600460053>7<0046>10<000D>-246<0055005600530051004A0054>-247<004D0042004400560054>-246<00440050004F004800560046>-247<005200560042004E000D>-247<004A004F>-246<00490046004F00450053>7<00460053004A0055>-246<0053004A005400560054>-246<00460053>7<00500054>]TJ
+0.98 0 0 1 54 128.179 Tm [<0046004800460055>-241<00470046004D004A0054000F>-336<002E00420046>-7<00440046004F00420054>-241<0046004800460055>-242<0046005300420055>-241<004A004F>-241<005400420051004A0046004F>-242<004E00420A1D004A0054>-241<0051>-7<005000530A1D004A005500500053>59<000F>-335<0037>81<004600540055004A00430056004D0056004E>]TJ
+1.02 0 0 1 54 113.384 Tm [<0051>-6<005000530A1D004A005500500053>57<000F>-487<002F0056004D004D0042>-299<004700420044004A004D004A0054004A000F>-487<00340046>-7<0045>-299<0042>-299<0055005600530051004A0054>-298<00460056>-299<004D0042004400560054>-299<00440050004E004E0050>-6<0045>-1<0050>-298<004700420044004A004D004A0054004A0054000F>]TJ
+0.983 0 0 1 54 98.589 Tm [<002E005000530043004A>-252<00470053004A004F0048004A004D004D0042000D>-254<0058004A0054004A>-252<004A004F>-253<0045004A0048004F004A00540054004A004E>-253<004A004F005500460053>7<00450056004E000D>-252<004B0056005400550050>-253<004D0046>-7<0044005500560054>-253<005400420048004A0A1D004A0054>-253<00450056004A000D>]TJ
+1.02 0 0 1 54 83.793 Tm [<00460055>-258<0057>7<00460049004A00440056004D0042>-258<004D004A0043>-10<00460053>7<0050>-258<00450056004A>-259<004400560053005400560054>-259<00450056004A000F>-367<002E004200560053004A0054>-259<00550046004E0051>-7<00500053>-259<004D004A00480056004D0042>-259<00540046>-6<0045>-259<004D0042004400560054000F>]TJ
+1.02 0 0 1 54 68.998 Tm [<00250056004A0054>-341<004400560053005400560054>-341<0046004F004A004E>-341<00560055>-341<00420056004800560046>9<000F>-614<0024005300420054>-341<00420044>-341<004E00420048004F0042000F>-615<0024005300420054>-341<004F0056004D004D0042000F>-615<002F0056004D004D0042>]TJ
+1.02 0 0 1 54 54.203 Tm [<0046004800460054005500420054000F>-526<00240056005300420043004A005500560053>-312<0042>-311<004D0046>-7<0050>9<000F>-526<00320056004A0054005200560046>-312<0046004800460054005500420054>-311<0058004A0054004A>-312<0046004800460055>-312<004F0056004F0044000F>-526<002F0042004E>]TJ
+1 0 0 1 54 39.407 Tm [<0047004600560048004A00420055>-250<004D0042004400560054>-250<0057>8<0046004D>-250<004600540055000F>-333<00240056005300420043004A005500560053>-250<00440050004F00540046>-7<0044005500460055005600460053>58<000F>]TJ
+ET
+
+endstream
+endobj
+41 0 obj
+<</Type/Page/Contents 42 0 R/Resources 40 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 43 0 R>>
+endobj
+40 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F38 16 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+46 0 obj
+<</Length 6114 >>
+stream
+BT
+/F38 10.44878 Tf 1 0 0 1 36 565.643 Tm [<0017>]TJ
+/F38 10.44878 Tf 1 0 0 1 150.639 565.643 Tm [<0025>-50<09B9>-50<09C1>-50<09B0>-466<0029>-50<09B1>-50<09C1>-50<09B4>-50<09B3>-50<09B1>-50<09C2>-50<09B5>]TJ
+/F38 11.3574 Tf 0.98 0 0 1 53.036 542.45 Tm [<0034005600540051>-7<0046004F0045004A005400540046>-249<0057>7<0046004D>-248<00470046004D004A0054000F>-339<00360055>-249<004D00500053>7<0046004E>-248<004D00500053>7<0046004E000D>-249<004A004F005500460053>7<00450056004E>-249<00460056000D>-250<0055004A004F0044004A00450056004F0055>-250<0054004A0055>]TJ
+1.015 0 0 1 36 527.654 Tm [<0042004E00460055000D>-246<004D004200500053>7<0046>-6<00460055>-247<0057004A005500420046>9<000D>-246<00420053>7<00440056000F>-329<0022>11<0046004F00460042004F>-246<0047004200560044004A004300560054>-246<0051>-7<0046>-7<00450046>-247<00460056>-246<0042004F00550046>9<000F>-329<003100530042004600540046004F0055>]TJ
+1.02 0 0 1 36 512.859 Tm [<0046004F004A004E>-282<0046004D004A0055000D>-293<00530056005500530056004E>-283<00420055000D>-292<004E0050004D004600540055004A0046>-283<004F0050004F000D>-292<004F0050004F0056004E004E005A>-283<0057>7<0046004D000D>-291<004F004A0054004D000F>-440<00360055>-283<004D0046>-7<0044005500560054>]TJ
+1.02 0 0 1 36 498.063 Tm [<00460053>7<00500054000D>-317<004E0042004D004600540056004200450042>-304<0054004A0055>-304<0042004E00460055000D>-319<004700460053004E0046004F00550056004E>-304<00460056000D>-319<00540050>-7<00450042004D00460054>-303<004400560053005400560054000D>-319<004E00420048004F0042000F>]TJ
+1.007 0 0 1 36 483.268 Tm [<00250050004F0046>-7<0044>-248<00460056>-249<00510056005300560054000F>-332<00320056004A0054005200560046>-248<0057>7<00460049004A00440056004D0042000D>-248<00560053004F0042>-249<00540046>-7<0045>-248<0056004D00550053004A0044004A00460054>-249<004200560044005500500053>58<000D>-248<0051>-7<0046>-7<00450046>]TJ
+1.02 0 0 1 36 468.473 Tm [<004D00500053>7<0046004E>-315<0046004800460054005500420054>-317<00450056004A000D>-334<00460055>-316<00440050004F00570042004D004D004A0054>-317<0046004D004A0055>-316<0046005300420055>-317<00540046>-7<0045>-316<004F0056004D004D0042000F>-541<00250050004F0046>-7<0044>-316<004D00560044005500560054000F>]TJ
+0.98 0 0 1 36 453.677 Tm [<00240056005300420043004A005500560053>-241<00460055>-242<004F0056004F0044000F>-336<0022004D004A005200560042004E>-242<00450050004D00500053>-242<0050>-7<0045004A0050>10<000D>-244<00440050004E004E0050>-7<00450050>-242<00510053>7<00460055004A0056004E000D>-243<0056004D00550053004A0044004A00460054>]TJ
+1.018 0 0 1 36 438.882 Tm [<004F0050004F000D>-244<0051004900420053>7<0046005500530042>-243<004A004F000D>-245<0057>7<0046004D004A0055000F>-326<002A004F00550046004800460053>-244<00420053>7<00440056>-244<004600540055000D>-244<004F0050004F0056004E004E005A>-244<004A004F000D>-245<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 36 424.087 Tm [<0047004200560044004A004300560054000D>-250<0046004800460054005500420054>-250<0057>8<0046004D000D>-250<0050>-7<0045004A0050>10<000F>]TJ
+1.005 0 0 1 53.036 409.291 Tm [<00340046>-7<0045>-247<00440050004E004E0050>-7<00450050>-248<0051>-6<00500054005600460053>7<0046>-247<0051>-7<0046>-7<00450046>9<000F>-330<002E004200560053004A0054>-248<00560055>-247<004600540055000F>-332<00360055>-247<00520056004A0054>-248<00510056005300560054000F>-331<00340046>-7<0045>]TJ
+1.01 0 0 1 36 394.496 Tm [<00420044>-247<0050>-7<0045004A0050>9<000F>-330<00340046>-7<0045>-248<0057>7<00460049004A00440056004D0042>-247<00490046004F00450053>7<00460053004A0055>-247<00540046004E000F>-331<00250056004A0054>-248<004F0050004F>-248<0050>-6<0045004A0050>9<000F>-330<002E005000530043004A>-248<00560055>-248<00450056004A000F>]TJ
+1.02 0 0 1 36 379.701 Tm [<00340046>-6<0045>-317<0042004400440056004E00540042004F>-317<0053004A005400560054>-316<0046004800460055>-317<0050>-7<0045004A0050>9<000F>-541<002A004F>-316<004900420044>-317<004900420043004A00550042005400540046>-317<0051004D0042005500460042>-316<0045004A004400550056004E00540055000F>]TJ
+1.02 0 0 1 36 364.905 Tm [<00310046004D004D0046004F005500460054005200560046>-361<004F0050004F>-362<0046004D004A0055000F>-677<00270056005400440046>-362<00540046>-6<0045>-362<004B0056005400550050>-362<00460056>-362<00560053004F0042>-362<0051>-6<0050005300550042>-362<0055004A004F0044004A00450056004F0055000F>]TJ
+0.981 0 0 1 36 350.11 Tm [<002E004200560053004A0054>-255<00470046004D004A0054>-255<0050>-7<0045004A0050>9<000D>-254<00540050004D004D004A0044004A005500560045004A004F>-255<00540046>-7<0045000D>-256<0057>8<0050004D00560055005100420055>-255<0042000D>-255<00500053004F00420053>7<0046>-254<00420044000D>-255<0046005300420055000F>-341<002E005000530043004A>]TJ
+1.02 0 0 1 36 335.315 Tm [<00520056004A0054>-271<00450050004D00500053>57<000F>-405<00250050004F0046>-6<0044>-272<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-277<0046005300420055>-271<00420044>-271<005400420048004A0A1D004A0054>-272<00540046004E0051>-7<00460053>57<000D>-277<004F0056004F0044>-271<00450056004A>]TJ
+1.02 0 0 1 36 320.519 Tm [<004D00500043>-9<005000530055004A0054>-269<00510056005300560054000D>-275<00520056004A0054>-269<00440050004F004800560046>-269<00510056005300560054>-269<004E0046005500560054>-269<0056004D00550053004A0044004A00460054>-269<00550046004D004D00560054000F>-399<00310053>7<0050004A004F>-268<00460055>]TJ
+1.02 0 0 1 36 305.724 Tm [<005200560042004E000F>-341<0024004D004200540054>-250<0042005100550046004F0055>-250<005500420044004A0055004A>-250<00540050>-7<0044004A0050005400520056>-250<00420045>-250<004D004A0055005000530042>-250<005500500053>7<005200560046004F0055>-249<0051>-7<00460053>-250<00440050004F00560043004A0042>]TJ
+0.98 0 0 1 36 290.928 Tm [<004F00500054005500530042000D>-241<0051>-7<00460053>-238<004A004F004400460051005500500054>-239<0049005A004E0046004F00420046>-7<00500054000F>-334<003100530042004600540046004F0055>-238<005400420051004A0046004F>-239<0055005600530051004A0054000D>-241<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 35.716 276.133 Tm [<0057>8<0046004D000D>-250<0046004D0046004A00470046004F0045>-250<0047004200560044004A004300560054000D>-250<0057>8<00460049004A00440056004D0042>-250<00460056000D>-250<004D0042004400560054000F>]TJ
+ET
+
+endstream
+endobj
+45 0 obj
+<</Type/Page/Contents 46 0 R/Resources 44 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 43 0 R>>
+endobj
+44 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F38 16 0 R>>/ProcSet[/PDF/Text]>>
+endobj
+49 0 obj
+<</Length 0 >>
+stream
+
+endstream
+endobj
+48 0 obj
+<</Type/Page/Contents 49 0 R/Resources 47 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 43 0 R>>
+endobj
+47 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet[/PDF]>>
+endobj
+52 0 obj
+<</Length 0 >>
+stream
+
+endstream
+endobj
+51 0 obj
+<</Type/Page/Contents 52 0 R/Resources 50 0 R/MediaBox[0 0 396 612]/CropBox[0 0 396 612]
+
+/TrimBox[0 0 396 612]/Parent 43 0 R>>
+endobj
+50 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /ProcSet[/PDF]>>
+endobj
+1 0 obj
+<<>>
+endobj
+2 0 obj
+<<>>
+endobj
+3 0 obj
+<< /pgfprgb [/Pattern /DeviceRGB] >>
+endobj
+53 0 obj
+[13[219 333 219 291]34[667 557 616 667]41[673 280]47[666]49[499]51[555 454]54[634]66[486 478 389 489 401 314 477 519 276]76[486 266 783 518 447 489 491 357 353 307 521 472 688 475 503]105[633]1699[268]2120[564]2156[961]2277[444 444 444 444 444 444 444 444 444 444]]
+endobj
+54 0 obj
+<</Length 286 >>
+stream
+
+endstream
+endobj
+55 0 obj
+<</Subtype/CIDFontType0C/Length 13951 >>
+stream
+
+
+‹û3‹ûDû&eûYÿÿû33ÿÿçLÍÿÿý™šÿÿçLÍ‹ÿÿçÌÌ‹ÿÿz34ÿ
+šÿÿì€
+æf‹ÿ
+€
+™šÿ
+€
+€
+ÌÌÿÿìšÿ
+€
+LÍ{­‹®‹·žª¿ÿÿü33ÿ
+™šÿÿüÌÍ‹ÿÿõLÍ‹ÿÿöæfÿÿþ³3ÿÿóšÿÿùLÍo\ûb„kb‹x‹x–}©‹»‹¸­¹Æˆ”…“}‹qmn|‹ÿÿøæf‹ÿÿýš‹—‹”ÿ
+fg`ÿÿ½ffø$ÇW¨÷ôÇ÷;²˜wùªÝzÚ2÷yù*ÿÿåæf‹ÿÿꙚ”ÿÿè€
+€
+½ÎЋ‘®"‹%2rûnû'Í9÷
+² × ×
+endstream
+endobj
+56 0 obj
+<</Type/FontDescriptor/FontName/GEYXPB+LibertinusSerif-Italic/Flags 4/FontBBox[-634 -312 6171 893]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle -12/StemV 73/XHeight 429/FontFile3 55 0 R/CIDSet 54 0 R>>
+endobj
+57 0 obj
+<</Length 1454 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-GEYXPB-LibertinusSerif-Italic-0)
+%%Title: (TeX-GEYXPB-LibertinusSerif-Italic-0 TeX GEYXPB-LibertinusSerif-Italic 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (GEYXPB-LibertinusSerif-Italic)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-GEYXPB-LibertinusSerif-Italic def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+53 beginbfchar
+<000D> <002C>
+<000E> <002D>
+<000F> <002E>
+<0010> <002F>
+<0022> <0041>
+<0023> <0042>
+<0024> <0043>
+<0025> <0044>
+<0029> <0048>
+<002A> <0049>
+<002F> <004E>
+<0031> <0050>
+<0033> <0052>
+<0034> <0053>
+<0036> <0055>
+<0042> <0061>
+<0043> <0062>
+<0044> <0063>
+<0045> <0064>
+<0046> <0065>
+<0047> <0066>
+<0048> <0067>
+<0049> <0068>
+<004A> <0069>
+<004C> <006B>
+<004D> <006C>
+<004E> <006D>
+<004F> <006E>
+<0050> <006F>
+<0051> <0070>
+<0052> <0071>
+<0053> <0072>
+<0054> <0073>
+<0055> <0074>
+<0056> <0075>
+<0057> <0076>
+<0058> <0077>
+<0059> <0078>
+<005A> <0079>
+<0069> <00A9>
+<06A3> <2019>
+<0848> <00660069>
+<086C> <00540068>
+<08E5> <0030>
+<08E6> <0031>
+<08E7> <0032>
+<08E8> <0033>
+<08E9> <0034>
+<08EA> <0035>
+<08EB> <0036>
+<08EC> <0037>
+<08ED> <0038>
+<08EE> <0039>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+
+endstream
+endobj
+21 0 obj
+<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/GEYXPB+LibertinusSerif-Italic/DescendantFonts[58 0 R]/ToUnicode 57 0 R>>
+endobj
+58 0 obj
+<</Type/Font/Subtype/CIDFontType0/BaseFont/GEYXPB+LibertinusSerif-Italic/FontDescriptor 56 0 R/W 53 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+endobj
+59 0 obj
+[374[2000]]
+endobj
+60 0 obj
+<</Length 47 >>
+stream
+
+endstream
+endobj
+61 0 obj
+<</Subtype/CIDFontType0C/Length 472 >>
+stream
+
+¯ Ú Ú’ l/ 
+endstream
+endobj
+62 0 obj
+<</Type/FontDescriptor/FontName/ETXLAD+NovelDeco/Flags 4/FontBBox[-392 -234 1985 781]/Ascent 894/CapHeight 537/Descent -246/ItalicAngle 0/StemV 61/XHeight 429/FontFile3 61 0 R/CIDSet 60 0 R>>
+endobj
+63 0 obj
+<</Length 652 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-ETXLAD-NovelDeco-0)
+%%Title: (TeX-ETXLAD-NovelDeco-0 TeX ETXLAD-NovelDeco 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (ETXLAD-NovelDeco)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-ETXLAD-NovelDeco def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+1 beginbfchar
+<0176> <254C>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+
+endstream
+endobj
+17 0 obj
+<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/ETXLAD+NovelDeco/DescendantFonts[64 0 R]/ToUnicode 63 0 R>>
+endobj
+64 0 obj
+<</Type/Font/Subtype/CIDFontType0/BaseFont/ETXLAD+NovelDeco/FontDescriptor 62 0 R/W 59 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+endobj
+65 0 obj
+[13[220 338 220]19[465 465]22[465 465]32[435]34[695]36[646 701 557 485]41[730 297]45[528 839 699 702 541 702]52[485 597 661 652 951]66[457 493 428 506 447 310 500 538 271 272 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515]1752[742]1757[268]1766[351]2442[582 560 540]2475[1048]2480[554 556]2483[492 565 477]2489[311]2492[667 602 563]2497[511 412 529]2504[489]2589[614]]
+endobj
+66 0 obj
+<</Length 324 >>
+stream
+
+endstream
+endobj
+67 0 obj
+<</Subtype/CIDFontType0C/Length 16638 >>
+stream
+
+ "
+
+]  L Ñ '™Hê©…ØÚQßî'ÄI»¦ £!:"–#¥$†%I&&ì'Ü)'*Ø,,5,y,š-á.û/ê1á344À5S6V6Õ88Ò9:k;C<9=m>š,‹½ø龋½ø$½½øï÷>û’û>û’©^÷>÷’÷>û’û ÷¿÷>÷’‹üû\÷¿û>÷‘÷è‹ü8ýøˆùNüˆü û£÷è÷²óêluvo‹ÿÿà€
+LÍÿ
+ÌÍÿ
+€
+eŽ‰‹‰‰‹Š‡^W€[•‡—Š—‹¼ŸÛ¹¥Í‹¼°•eNü‹8z†;ˆ……‹v‘…¼Œÿ
+ffÿ
+™špÿ
+LÍ—‘‹–ÿÿöÌÍÿ
+€
+LÍÿÿýæfÿ
+LÍÿÿýæfÿ
+LÍÿÿýæfÿ
+33ÿÿûÌÍÿ
+LÍÿÿýæfÿ
+³3u¢€·…¤…‘xŠ……û«Â÷í²äÚ¶øA}‡ƒ~†ŒŠÆûÁDªo¹¹‹½¡²·‰ÿ
+LÍ…ÿ
+æfÿ
+æfÿÿõÌÍÿ
+³3ÿÿçš”w”w¥‹ÿ
+eŽ‰‹‰‰‹Š‡^W€[•‡—Š—‹۹¥Í‹¼°•eNü‹8z†;ˆ……‹v‘…¼Œÿ
+ÌÍÿÿòæfÿ
+³3ƒÿ
+‹ª÷V«÷>¬÷Ú÷§»¦…§ü÷Œ÷uÿ
+ÌÍÿ
+LÍ•ÿ
+L͉ÿ
+33ÿÿýæfÿ
+ffÿ
+LÍ…ÿ
+¯ Ú Ú’
+endstream
+endobj
+68 0 obj
+<</Type/FontDescriptor/FontName/GVFVJX+LibertinusSerif/Flags 4/FontBBox[-1082 -256 6171 1125]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle 0/StemV 73/XHeight 429/FontFile3 67 0 R/CIDSet 66 0 R>>
+endobj
+69 0 obj
+<</Length 1697 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-GVFVJX-LibertinusSerif-0)
+%%Title: (TeX-GVFVJX-LibertinusSerif-0 TeX GVFVJX-LibertinusSerif 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (GVFVJX-LibertinusSerif)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-GVFVJX-LibertinusSerif def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+72 beginbfchar
+<000D> <002C>
+<000E> <002D>
+<000F> <002E>
+<0013> <0032>
+<0014> <0033>
+<0016> <0035>
+<0017> <0036>
+<0020> <003F>
+<0022> <0041>
+<0024> <0043>
+<0025> <0044>
+<0026> <0045>
+<0027> <0046>
+<0029> <0048>
+<002A> <0049>
+<002D> <004C>
+<002E> <004D>
+<002F> <004E>
+<0030> <004F>
+<0031> <0050>
+<0032> <0051>
+<0034> <0053>
+<0035> <0054>
+<0036> <0055>
+<0037> <0056>
+<0038> <0057>
+<0042> <0061>
+<0043> <0062>
+<0044> <0063>
+<0045> <0064>
+<0046> <0065>
+<0047> <0066>
+<0048> <0067>
+<0049> <0068>
+<004A> <0069>
+<004B> <006A>
+<004C> <006B>
+<004D> <006C>
+<004E> <006D>
+<004F> <006E>
+<0050> <006F>
+<0051> <0070>
+<0052> <0071>
+<0053> <0072>
+<0054> <0073>
+<0055> <0074>
+<0056> <0075>
+<0057> <0076>
+<0058> <0077>
+<0059> <0078>
+<005A> <0079>
+<06D8> <2014>
+<06DD> <2019>
+<06E6> <2022>
+<098A> <00660066>
+<098B> <00660069>
+<098C> <0066006C>
+<09AB> <00540068>
+<09B0> <006B>
+<09B1> <0061>
+<09B3> <0063>
+<09B4> <0064>
+<09B5> <0065>
+<09B9> <0069>
+<09BC> <006D>
+<09BD> <006E>
+<09BE> <006F>
+<09C1> <0072>
+<09C2> <0073>
+<09C3> <0074>
+<09C8> <0079>
+<0A1D> <00740074>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+
+endstream
+endobj
+16 0 obj
+<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/GVFVJX+LibertinusSerif/DescendantFonts[70 0 R]/ToUnicode 69 0 R>>
+endobj
+70 0 obj
+<</Type/Font/Subtype/CIDFontType0/BaseFont/GVFVJX+LibertinusSerif/FontDescriptor 68 0 R/W 65 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+endobj
+71 0 obj
+[37[718]52[475]66[476]69[527]76[523]78[801 563 519]83[401]85[331]90[533]]
+endobj
+72 0 obj
+<</Length 12 >>
+stream
+
+endstream
+endobj
+73 0 obj
+<</Subtype/CIDFontType0C/Length 2898 >>
+stream
+
+€
+€
+¡ŽŽŽŽ ÷ ÷’•
+endstream
+endobj
+74 0 obj
+<</Type/FontDescriptor/FontName/EAQJHJ+LibertinusSerif-Semibold/Flags 4/FontBBox[-446 -328 6171 900]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle 0/StemV 81/XHeight 463/FontFile3 73 0 R/CIDSet 72 0 R>>
+endobj
+75 0 obj
+<</Length 868 >>
+stream
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-EAQJHJ-LibertinusSerif-Semibold-0)
+%%Title: (TeX-EAQJHJ-LibertinusSerif-Semibold-0 TeX EAQJHJ-LibertinusSerif-Semibold 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (EAQJHJ-LibertinusSerif-Semibold)
+/Supplement 0
+>> def
+/CMapName /TeX-Identity-EAQJHJ-LibertinusSerif-Semibold def
+/CMapType 2 def
+1 begincodespacerange
+<0000> <FFFF>
+endcodespacerange
+0 beginbfrange
+endbfrange
+11 beginbfchar
+<0025> <0044>
+<0034> <0053>
+<0042> <0061>
+<0045> <0064>
+<004C> <006B>
+<004E> <006D>
+<004F> <006E>
+<0050> <006F>
+<0053> <0072>
+<0055> <0074>
+<005A> <0079>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+
+endstream
+endobj
+8 0 obj
+<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/EAQJHJ+LibertinusSerif-Semibold/DescendantFonts[76 0 R]/ToUnicode 75 0 R>>
+endobj
+76 0 obj
+<</Type/Font/Subtype/CIDFontType0/BaseFont/EAQJHJ+LibertinusSerif-Semibold/FontDescriptor 74 0 R/W 71 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+endobj
+9 0 obj
+<</Type/Pages/Parent 77 0 R/Count 10/Kids[6 0 R 11 0 R 14 0 R 19 0 R 23 0 R 26 0 R 29 0 R 32 0 R 35 0 R 38 0 R]>>
+endobj
+43 0 obj
+<</Type/Pages/Parent 77 0 R/Count 4/Kids[41 0 R 45 0 R 48 0 R 51 0 R]>>
+endobj
+77 0 obj
+<</Type/Pages /Count 14/Kids[9 0 R 43 0 R]>>
+endobj
+78 0 obj
+<</Type/Catalog/Pages 77 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ]/PageLabels<</Nums[0<</S/r>>6<</S/D>>]>>>>
+endobj
+79 0 obj
+<<
+ /Title(Dark\040and\040Stormy)/Author(Dirk\040Hardcase)/Creator(LaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20170730124719-07'00')/ModDate(D:20170730124719-07'00')/Producer(LuaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001)
+>>
+endobj
+xref
+0 80
+0000000000 65535 f
+0000065454 00000 n
+0000065474 00000 n
+0000065494 00000 n
+0000000015 00000 n
+0000007437 00000 n
+0000007297 00000 n
+0000006844 00000 n
+0000108251 00000 n
+0000108589 00000 n
+0000007746 00000 n
+0000007603 00000 n
+0000007546 00000 n
+0000009277 00000 n
+0000009134 00000 n
+0000007832 00000 n
+0000103646 00000 n
+0000083871 00000 n
+0000012077 00000 n
+0000011934 00000 n
+0000009409 00000 n
+0000081936 00000 n
+0000013191 00000 n
+0000013048 00000 n
+0000012188 00000 n
+0000013513 00000 n
+0000013370 00000 n
+0000013313 00000 n
+0000021301 00000 n
+0000021158 00000 n
+0000013599 00000 n
+0000032544 00000 n
+0000032401 00000 n
+0000021412 00000 n
+0000038984 00000 n
+0000038841 00000 n
+0000032655 00000 n
+0000047080 00000 n
+0000046937 00000 n
+0000039095 00000 n
+0000058343 00000 n
+0000058199 00000 n
+0000047191 00000 n
+0000108718 00000 n
+0000064769 00000 n
+0000064625 00000 n
+0000058454 00000 n
+0000065081 00000 n
+0000064937 00000 n
+0000064880 00000 n
+0000065368 00000 n
+0000065224 00000 n
+0000065167 00000 n
+0000065547 00000 n
+0000065829 00000 n
+0000066172 00000 n
+0000080202 00000 n
+0000080425 00000 n
+0000082081 00000 n
+0000082271 00000 n
+0000082299 00000 n
+0000082403 00000 n
+0000082954 00000 n
+0000083162 00000 n
+0000084003 00000 n
+0000084180 00000 n
+0000084578 00000 n
+0000084959 00000 n
+0000101676 00000 n
+0000101892 00000 n
+0000103784 00000 n
+0000103967 00000 n
+0000104057 00000 n
+0000104126 00000 n
+0000107103 00000 n
+0000107326 00000 n
+0000108397 00000 n
+0000108806 00000 n
+0000108867 00000 n
+0000109230 00000 n
+trailer
+<</Size 80/Root 78 0 R/Info 79 0 R/ID[<AD0D766225EA5F45E3AE02EE1F79F9B5> <AD0D766225EA5F45E3AE02EE1F79F9B5>]>>
+startxref
+109569
+%%EOF
diff --git a/Master/texmf-dist/doc/lualatex/novel/novel-example.tex b/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.tex
index e48e0181bbc..87408dfe8cd 100644
--- a/Master/texmf-dist/doc/lualatex/novel/novel-example.tex
+++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.tex
@@ -3,7 +3,7 @@
%
% EXAMPLE OF NOVEL DOCUMENT CLASS
% Uses mostly default layout.
-\documentclass{novel} % v. 1.32 or later
+\documentclass{novel} % v. 1.4 or later
\SetTitle{Dark and Stormy}
\SetSubtitle{A Tale of Nights}
\SetAuthor{Dirk Hardcase}
@@ -80,12 +80,16 @@ available upon request.\par
\end{center}
\clearpage
-% v. Epigraph, Dedication, Table of Contents, or repeated Half-Title:
+% v. Epigraph, Dedication, Table of Contents, or repeated Half-Title.
+% In this case, an Epigraph:
\thispagestyle{empty}
-\vspace*{6\nbs}
-\hfill\charscale[1.8]{\textbf{Dark and}}\par
-\vspace{\nbs}
-\hfill\charscale[2.4]{\textbf{Stormy}}\par
+\vspace*{7\nbs}
+\begin{adjustwidth}{5em}{5em}
+\noindent When the lone raccoon howls at dusk,\\
+And white birds cease their twitter,\\
+Then shall the rivers overflow with mead.\par
+\hfill---\textit{Prophecy of Claudius}\par
+\end{adjustwidth}
\clearpage
% vi. Blank page:
diff --git a/Master/texmf-dist/doc/lualatex/novel/novel-template.tex b/Master/texmf-dist/doc/lualatex/novel/extras/novel-template.tex
index 0c747cbcc05..bf07ac10778 100644
--- a/Master/texmf-dist/doc/lualatex/novel/novel-template.tex
+++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-template.tex
@@ -1,6 +1,6 @@
% !TeX program = LuaLaTeX
% !TeX encoding = UTF-8
-\documentclass{novel} % v. 1.32 or later
+\documentclass{novel} % v. 1.4 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:
@@ -13,12 +13,15 @@
% \SetPDFX[]{}
\begin{document}
-
+% Some popular commands:
% \frontmatter
% \SetVersoHeadText{}
% \SetRectoHeadText{}
% \thispagestyle{}
% \mainmatter
+% \begin{ChapterStart}
+% \ChapterTitle{}
+% \end{ChapterStart}
It was a dark and stormy night.\par
diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/swop240gamutHSV-monitorlimit.png b/Master/texmf-dist/doc/lualatex/novel/extras/swop240gamutHSV-monitorlimit.png
new file mode 100644
index 00000000000..8fc93f8a4a4
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/extras/swop240gamutHSV-monitorlimit.png
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/swop240gamutHSV.png b/Master/texmf-dist/doc/lualatex/novel/extras/swop240gamutHSV.png
new file mode 100644
index 00000000000..35e26b42d5e
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/extras/swop240gamutHSV.png
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/novel/novel.pdf b/Master/texmf-dist/doc/lualatex/novel/novel.pdf
index a2be27f635a..deca5a33f16 100644
--- a/Master/texmf-dist/doc/lualatex/novel/novel.pdf
+++ b/Master/texmf-dist/doc/lualatex/novel/novel.pdf
@@ -9,10 +9,10 @@ stream
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:xmp="http://ns.adobe.com/xap/1.0/">
- <xmp:ModifyDate>2017-07-25T16:59:48-07:00</xmp:ModifyDate>
- <xmp:CreateDate>2017-07-25T16:59:48-07:00</xmp:CreateDate>
+ <xmp:ModifyDate>2017-07-31T15:56:20-07:00</xmp:ModifyDate>
+ <xmp:CreateDate>2017-07-31T15:56:20-07:00</xmp:CreateDate>
<xmp:CreatorTool>LaTeX with novel and microtype</xmp:CreatorTool>
- <xmp:MetadataDate>2017-07-25T16:59:48-07:00</xmp:MetadataDate>
+ <xmp:MetadataDate>2017-07-31T15:56:20-07:00</xmp:MetadataDate>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -26,7 +26,7 @@ stream
<rdf:Description rdf:about=""
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
<xmpMM:DocumentID>uuid:A12D98E081B6A0EC2CBA2D468474F922</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:BAB6161961EA1482E1C14D6E8D6B9260</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:236D7740069925BAAEF6C3CA0365511E</xmpMM:InstanceID>
<xmpMM:RenditionClass>default</xmpMM:RenditionClass>
<xmpMM:VersionID>1</xmpMM:VersionID>
</rdf:Description>
@@ -182,7 +182,7 @@ endobj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F44 8 0 R/F46 9 0 R/F47 10 0 R>>/ProcSet[/PDF/Text]>>
endobj
14 0 obj
-<</Length 8728 >>
+<</Length 8441 >>
stream
BT
/F44 11.3574 Tf 1.02 0 0 1 53.036 564.643 Tm [<0022004D004E005000540055>-285<0046>6<0057>8<00460053>-14<005A00550049004A004F0048>-286<004A0054>-286<00510053>7<0046000E00440050004F098B004800560053>8<0046>-6<0045>-286<00550050>-285<06E0004B005600540055>-286<0058>7<00500053004C000D>120<06E1>-295<0046>6<0057>7<0046004F>-284<005500490046>]TJ
@@ -218,13 +218,11 @@ BT
/F44 11.3574 Tf 1.02 0 0 1 223.163 209.554 Tm [<004A0054>-328<004D004A00440046004F00540046>-6<0045>-328<0056004F004500460053>-328<005500490046>-328<0034002A002D>]TJ
1 0 0 1 36 194.759 Tm [<00300051>-7<0046004F>-250<00270050004F0055>-250<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<0A21000F0A21000F>]TJ
/F44 13.62884 Tf 1 0 0 1 36 169.257 Tm [<0015000F>-333<0037>79<004600530054004A0050004F>]TJ
-/F44 11.3574 Tf 0.981 0 0 1 35.625 150.372 Tm [<0037>81<004600530054004A0050004F>-254<0A21000F0A23000D>-256<0A220A26000E002B0056004D005A000E0A220A200A210A27000F>-341<002C004F0050>7<0058004D0046>-7<00450048004600420043004D0046>-255<00440050>-7<0045004600530054>-255<00420053>7<0046>-254<004A004F0057004A00550046>-7<0045>-256<00550050>-255<00550042004C0046>]TJ
-1 0 0 1 36 135.577 Tm [<004E0042004A004F00550046004F0042004F00440046>-250<00500047>-250<00550049004A0054>-250<00510053>8<0050004B0046>-7<00440055000F>-333<00240050004F0055004200440055>-250<00240035>48<0022002F000F>]TJ
-/F44 13.62884 Tf 1 0 0 1 36 110.075 Tm [<0016000F>-333<0027>58<0022>34<00320054>]TJ
-/F44 11.3574 Tf 1 0 0 1 36 91.191 Tm [<0032>29<000F>-607<00240042004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<0043>-10<0046>-250<005600540046>-7<0045>-250<004700500053>-250<0026000E0043>-10<0050>-7<0050004C00540020>]TJ
-1 0 0 1 36 76.396 Tm [<0022000F>]TJ
-0.997 0 0 1 53.036 76.396 Tm [<002F0050>10<000F>-334<0022004F0045000D>-250<0055004900420055>-250<004700460042005500560053>7<0046>-249<0058004A004D004D>-250<004F0046>6<0057>8<00460053>-249<0043>-10<0046>-250<0042004500450046>-7<0045000D>-251<00420054>-250<005500490046>-250<00550046>-7<00440049004F0050004D00500048005A>-250<004A0054>]TJ
-1 0 0 1 53.036 61.6 Tm [<004A004F004900460053>8<0046004F0055004D005A>-250<004A004F00440050004E005100420055004A0043004D0046>10<000F>]TJ
+/F44 11.3574 Tf 1 0 0 1 36 150.372 Tm [<0A21000F0A230A24000D>-250<0A220A200A210A27000E0A200A27000E0A230A21001B>-333<0042004500450046>-7<0045>-250<00450046004300560048>-250<004700460042005500560053>7<0046>-249<004700500053>-250<004E0042004A004F00550042004A004F004600530054000F>]TJ
+1.02 0 0 1 36 135.577 Tm [<0A21000F0A230A22000D>-293<0A220A200A210A27000E0A200A27000E0A220A26001B>-404<004E004A004F00500053>-284<004300560048>-284<098B005900460054>-284<004A004F>-284<00450050>-7<00440054000D>-293<004E0042004B00500053>-284<004300560048>-284<00440050004F004400460053004F004A004F0048>]TJ
+1 0 0 1 36 120.782 Tm [<003D00550046>7<00590055004D0054>-250<004A004F>-250<00440050>-7<00450046>10<000F>]TJ
+1 0 0 1 36 105.986 Tm [<0A21000F0A22000D>-250<0A220A200A210A27000E0A200A26000E0A200A26001B>-333<0042004500450046>-7<0045>-250<00440050>-7<00450046>-250<004700500053>-250<00440050004D00500053>-250<004A004E004200480046>-250<0042005300550058>7<00500053004C000F>]TJ
+1 0 0 1 36 91.191 Tm [<0A21000F0A21000D>-250<0A220A200A210A27000E0A200A23000E0A200A21001B>-333<004A004F004A0055004A0042004D>-250<005100560043004D004A0044>-250<0053>7<0046004D0046004200540046>10<000F>]TJ
/F44 10.44878 Tf 1 0 0 1 186.571 39.407 Tm [<0013>]TJ
ET
@@ -239,25 +237,39 @@ endobj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F44 8 0 R/F47 10 0 R>>/ProcSet[/PDF/Text]>>
endobj
17 0 obj
-<</Length 3945 >>
+<</Length 7283 >>
stream
BT
-/F44 11.3574 Tf 1 0 0 1 54 564.643 Tm [<0032>29<000F>-607<002E005A>-250<0055004900460054004A0054>-250<004200450057004A005400500053>-250<00550050004D0045>-250<004E004606D8>]TJ
-1 0 0 1 54 549.847 Tm [<0022000F>]TJ
-1.02 0 0 1 71.036 549.847 Tm [<0034005500500051>-323<0053004A004800490055>-323<0055004900460053>6<0046>10<000F>-561<09AB004A0054>-323<00450050>-7<00440056004E0046004F0055>-323<0044004D004200540054>-324<004A0054>-323<0057>7<00460053>-14<005A>-324<0045004A098A00460053>7<0046004F0055>-322<00470053>7<0050004E>]TJ
-1 0 0 1 71.036 535.052 Tm [<0042004F005A00550049004A004F0048>-250<005600540046>-7<0045>-250<004700500053>-250<005500490046005400460054>-250<0042004F0045>-250<00500055004900460053>-250<00420044004200450046004E004A0044>-250<005100560043004D004A004400420055004A0050004F0054000F>]TJ
-1 0 0 1 54 520.257 Tm [<0032>29<000F>-607<002A0047>-250<002A>-250<005600540046>-250<0035004A004C003B>-250<004700500053>-250<00270046>7<005A004F004E0042004F>-250<0045004A0042004800530042004E0054000D>-250<005500490046004F06D8>]TJ
-1 0 0 1 54 505.461 Tm [<0022000F>-585<00280050>-250<004200580042005A>59<000F>]TJ
-1 0 0 1 54 490.666 Tm [<0032>29<000F>]TJ
-1.009 0 0 1 71.036 490.666 Tm [<003800490046004F>-247<002A>-247<0058>7<0050004C0046>-247<00560051>-247<00550049004A0054>-248<004E00500053004F004A004F0048000D>-247<004E005A>-247<0049004600420045>-248<00470046004D0055>-247<004D004A004C0046>-248<0042>-247<00550050>-7<00450045004D00460053>-247<004900420045>]TJ
-1.02 0 0 1 71.036 475.87 Tm [<0043>-9<0046>-7<0046004F>-300<0051>-7<00500056004F0045004A004F0048>-299<004A0055>-300<004A004F>-300<0042>-299<00540042004F00450043>-10<0050>6<0059000F>-490<002A>-299<0053>7<0050004D004D0046>-6<0045>-300<0050>6<0057>8<00460053>-299<0042004F0045>-299<004D0050>-7<0050004C>-300<00420055>-299<005500490046>]TJ
-0.98 0 0 1 71.036 461.075 Tm [<004E00560048>-234<0054004900500055>-234<0050004F>-235<005500490046>-234<00580042004D004D000F>-333<002A0055>-235<005800420054>-234<0042>-234<0058>7<0050004E0042004F>-234<004A004F>-234<004900460053>-234<0047005000530055004A00460054>-235<0058004A00550049>-234<0042>-235<0045005300560048>]TJ
-1.02 0 0 1 71.036 446.28 Tm [<004900420043004A0055>-266<0055004900420055>-265<005800420054>-266<004300420045000D>-272<0042004F0045>-266<0042004F>-266<00420A1D004A0055005600450046>-266<0055004900420055>-265<005800420054>-266<0046>6<0057>7<0046004F>-265<0058>7<0050005300540046>10<000F>-388<003400490046>]TJ
-0.98 0 0 1 71.036 431.484 Tm [<004900420045>-232<00540046>-7<0046004F>-233<0043>-10<00460A1D00460053>-233<00450042005A0054000D>-237<004D004A004C0046>-232<005500490046>-233<0055004A004E0046>-232<002A>-233<00550050>-7<0050004C>-232<004900460053>-233<00550050>-232<005500490046>-233<0046004A0048004900550049>-233<00480053004200450046>]TJ
-1.02 0 0 1 71.036 416.689 Tm [<00540050>-6<0044004C>-249<004900500051>9<000F>-337<09AB0046004F>-249<002A>-249<004800500055>-248<00560051>9<000D>-249<00580042005400490046>-7<0045000D>-250<0042004F0045>-248<004500530042004800480046>-7<0045>-249<004E005A>-249<004D0050004F0046004D005A>-248<004300560A1D>]TJ
-0.98 0 0 1 71.036 401.894 Tm [<00450050>7<0058004F>-240<00550050>-242<005500490046>-241<0050004F0046000E004E0042004F>-241<0045004600550046>-7<00440055004A0057>7<0046>-240<004200480046004F0044005A>-241<0055004900420055>-241<002A>-241<004B0050004C004A004F0048004D005A>-241<00440042004D004D0046>-7<0045>-241<004E005A>]TJ
-1 0 0 1 71.036 387.098 Tm [<004E00460042004F0054>-250<00500047>-250<004D004A0057004A004F0048000F>-333<003A>70<00500056>-249<004C004F0050>6<0058>-249<0058004900420055>-250<002A>-250<004E00460042004F0020>]TJ
-1 0 0 1 54 372.303 Tm [<0022000F>-585<003A>71<004600420049000F>-333<00340055004A0044004C>-250<0058004A00550049>-250<004E0046>9<000D>-249<004C004A0045000F>-333<09AB004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004700500053>-250<005A>7<00500056000F>]TJ
+/F44 13.62884 Tf 1 0 0 1 54 553.936 Tm [<0016000F>-333<0027>58<0022>34<00320054>]TJ
+/F44 11.3574 Tf 1 0 0 1 54 535.052 Tm [<0032>29<000F>-607<00240042004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<0043>-10<0046>-250<005600540046>-7<0045>-250<004700500053>-250<0026000E0043>-10<0050>-7<0050004C00540020>]TJ
+1 0 0 1 54 520.257 Tm [<0022000F>]TJ
+0.997 0 0 1 71.036 520.257 Tm [<002F0050>10<000F>-334<0022004F0045000D>-250<0055004900420055>-250<004700460042005500560053>7<0046>-249<0058004A004D004D>-250<004F0046>6<0057>8<00460053>-249<0043>-10<0046>-250<0042004500450046>-7<0045000D>-251<00420054>-250<005500490046>-250<00550046>-7<00440049004F0050004D00500048005A>-250<004A0054>]TJ
+1 0 0 1 71.036 505.461 Tm [<004A004F004900460053>8<0046004F0055004D005A>-250<004A004F00440050004E005100420055004A0043004D0046>10<000F>]TJ
+1 0 0 1 54 490.666 Tm [<0032>29<000F>-607<002A0054>-250<00550049004A0054>-250<00510053>8<0050004B0046>-7<00440055>-250<00540055004A004D004D>-250<0042004D004A0057>8<00460020>]TJ
+1 0 0 1 54 475.87 Tm [<0022000F>]TJ
+0.98 0 0 1 71.036 475.87 Tm [<003A>72<00460054000D>-203<0042004F0045>-191<004A0055>-191<004A0054>-191<00540055004A004D004D>-191<004A004F>-191<005600540046>-191<0043005A>-191<004A00550054>-191<00500053004A0048004A004F0042005500500053>59<000F>-318<00290050>6<0058>9<0046>7<0057>8<00460053>60<000D>-203<005500490046>-191<00500053004A0048004A004F0042005500500053>]TJ
+1.019 0 0 1 70.616 461.075 Tm [<0058>7<00500056004D0045>-243<004D004A004C0046>-244<00540050004E0046>-6<0050004F0046>-244<0046004D00540046>-244<00550050>-244<00550042004C0046>-244<0050>6<0057>8<00460053>-243<004D0050004F0048000E005500460053004E>-244<004E0042004A004F00550046004F0042004F00440046>9<000D>]TJ
+1.01 0 0 1 71.036 446.28 Tm [<0043>-9<0046>-7<00440042005600540046>-247<00490046>-246<004A0054>-246<004E0050>6<0057004A004F0048>-246<0050004F>-246<00550050>-247<00500055004900460053>-246<00550049004A004F00480054000F>-329<002A0047>-247<004A004F005500460053>7<0046005400550046>-6<0045000D>-246<00440050004F0055004200440055>]TJ
+1.006 0 0 1 71.036 431.484 Tm [<00240035>48<0022002F>-248<0042004F0045>-248<005500490046>-249<00440053>7<00460042005500500053>-248<0009>16<0046000E004E0042004A004D>-248<00420055>-248<005500500051>-249<00500047>-249<004F0050>6<0057>8<0046004D000F0044004D0054>-248<098B004D0046000A000F>-331<003A>69<00500056>-248<0058004A004D004D>]TJ
+1.017 0 0 1 71.036 416.689 Tm [<004F0046>-6<0046>-7<0045>-245<00550050>-246<0043>-9<0046>-246<00470042004E004A004D004A00420053>-245<0058004A00550049>-245<002D00560042002D00420035>61<00460039000D>-244<00470050004F005500540051>-7<0046>-7<0044000D>-245<00300051>-7<0046004F>-245<0035>47<005A0051>-6<0046>9<000D>-244<0042004F0045>]TJ
+1.02 0 0 1 71.036 401.894 Tm [<005500490046>-309<005500460053004E004A004F0050004D00500048005A>-309<00500047>-309<098B00440055004A0050004F>-310<00580053004A0055004A004F0048000F>-519<002D00560042>-309<00440050>-7<0045004A004F0048>-309<004F00500055>-310<0053>7<0046>-6<00520056004A0053>7<0046>-6<0045000F>]TJ
+1 0 0 1 71.036 387.098 Tm [<0036004F0055004A004D>-250<005500490046004F000D>-250<005500490046>-250<00500053004A0048004A004F0042005500500053>-250<0058004A004D004D>-250<004E0042004A004F00550042004A004F>-250<004A0055>-250<00470053>8<0050004E>-250<0055004A004E0046>-250<00550050>-250<0055004A004E0046>10<000F>]TJ
+1 0 0 1 54 372.303 Tm [<0032>29<000F>-607<002E005A>-250<0055004900460054004A0054>-250<004200450057004A005400500053>-250<00550050004D0045>-250<004E004606D8>]TJ
+1 0 0 1 54 357.508 Tm [<0022000F>]TJ
+1.02 0 0 1 71.036 357.508 Tm [<0034005500500051>-323<0053004A004800490055>-323<0055004900460053>6<0046>10<000F>-561<09AB004A0054>-323<00450050>-7<00440056004E0046004F0055>-323<0044004D004200540054>-324<004A0054>-323<0057>7<00460053>-14<005A>-324<0045004A098A00460053>7<0046004F0055>-322<00470053>7<0050004E>]TJ
+1 0 0 1 71.036 342.712 Tm [<0042004F005A00550049004A004F0048>-250<005600540046>-7<0045>-250<004700500053>-250<005500490046005400460054>-250<0042004F0045>-250<00500055004900460053>-250<00420044004200450046004E004A0044>-250<005100560043004D004A004400420055004A0050004F0054000F>]TJ
+1 0 0 1 54 327.917 Tm [<0032>29<000F>-607<002A0047>-250<002A>-250<005600540046>-250<0035004A004C003B>-250<004700500053>-250<00270046>7<005A004F004E0042004F>-250<0045004A0042004800530042004E0054000D>-250<005500490046004F06D8>]TJ
+1 0 0 1 54 313.121 Tm [<0022000F>-585<00280050>-250<004200580042005A>59<000F>]TJ
+1 0 0 1 54 298.326 Tm [<0032>29<000F>]TJ
+1.009 0 0 1 71.036 298.326 Tm [<003800490046004F>-247<002A>-247<0058>7<0050004C0046>-247<00560051>-247<00550049004A0054>-248<004E00500053004F004A004F0048000D>-247<004E005A>-247<0049004600420045>-248<00470046004D0055>-247<004D004A004C0046>-248<0042>-247<00550050>-7<00450045004D00460053>-247<004900420045>]TJ
+1.02 0 0 1 71.036 283.531 Tm [<0043>-9<0046>-7<0046004F>-300<0051>-7<00500056004F0045004A004F0048>-299<004A0055>-300<004A004F>-300<0042>-299<00540042004F00450043>-10<0050>6<0059000F>-490<002A>-299<0053>7<0050004D004D0046>-6<0045>-300<0050>6<0057>8<00460053>-299<0042004F0045>-299<004D0050>-7<0050004C>-300<00420055>-299<005500490046>]TJ
+0.98 0 0 1 71.036 268.735 Tm [<004E00560048>-234<0054004900500055>-234<0050004F>-235<005500490046>-234<00580042004D004D000F>-333<002A0055>-235<005800420054>-234<0042>-234<0058>7<0050004E0042004F>-234<004A004F>-234<004900460053>-234<0047005000530055004A00460054>-235<0058004A00550049>-234<0042>-235<0045005300560048>]TJ
+1.02 0 0 1 71.036 253.94 Tm [<004900420043004A0055>-266<0055004900420055>-265<005800420054>-266<004300420045000D>-272<0042004F0045>-266<0042004F>-266<00420A1D004A0055005600450046>-266<0055004900420055>-265<005800420054>-266<0046>6<0057>7<0046004F>-265<0058>7<0050005300540046>10<000F>-388<003400490046>]TJ
+0.98 0 0 1 71.036 239.145 Tm [<004900420045>-232<00540046>-7<0046004F>-233<0043>-10<00460A1D00460053>-233<00450042005A0054000D>-237<004D004A004C0046>-232<005500490046>-233<0055004A004E0046>-232<002A>-233<00550050>-7<0050004C>-232<004900460053>-233<00550050>-232<005500490046>-233<0046004A0048004900550049>-233<00480053004200450046>]TJ
+1.02 0 0 1 71.036 224.349 Tm [<00540050>-6<0044004C>-249<004900500051>9<000F>-337<09AB0046004F>-249<002A>-249<004800500055>-248<00560051>9<000D>-249<00580042005400490046>-7<0045000D>-250<0042004F0045>-248<004500530042004800480046>-7<0045>-249<004E005A>-249<004D0050004F0046004D005A>-248<004300560A1D>]TJ
+0.98 0 0 1 71.036 209.554 Tm [<00450050>7<0058004F>-240<00550050>-242<005500490046>-241<0050004F0046000E004E0042004F>-241<0045004600550046>-7<00440055004A0057>7<0046>-240<004200480046004F0044005A>-241<0055004900420055>-241<002A>-241<004B0050004C004A004F0048004D005A>-241<00440042004D004D0046>-7<0045>-241<004E005A>]TJ
+1 0 0 1 71.036 194.759 Tm [<004E00460042004F0054>-250<00500047>-250<004D004A0057004A004F0048000F>-333<003A>70<00500056>-249<004C004F0050>6<0058>-249<0058004900420055>-250<002A>-250<004E00460042004F0020>]TJ
+1 0 0 1 54 179.963 Tm [<0022000F>-585<003A>71<004600420049000F>-333<00340055004A0044004C>-250<0058004A00550049>-250<004E0046>9<000D>-249<004C004A0045000F>-333<09AB004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004700500053>-250<005A>7<00500056000F>]TJ
/F44 10.44878 Tf 1 0 0 1 204.571 39.407 Tm [<0014>]TJ
ET
@@ -437,40 +449,43 @@ endobj
<</Type/Font/Subtype/CIDFontType0/BaseFont/RVBPVV+NovelDeco/FontDescriptor 27 0 R/W 24 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
endobj
30 0 obj
-[2[288]13[220 338 220 323]18[465 465 465 465 465]28[236]32[435]34[695 588 646 701 557 485 685 730 297 322 637 528 839 699 702 541 702 587 485 597 661 652 951 660 575 604]66[457 493 428 506 447 310 500 538 271 272 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515 424]1752[742]1760[375 375]2442[582 560]2475[1048]2589[614]2592[465 465 465 465]2597[465 465 465 465]]
+[2[288]9[298 298]13[220 338 220 323]18[465 465 465 465 465]27[236 236]32[435]34[695 588 646 701 557 485 685 730 297]45[528 839 699 702 541 702 587 485 597 661 652 951 660 575 604]61[287]66[457 493 428 506 447 310 500 538 271 272 512 264 790 542 504 519 503 372 390 316 531 497 747 490 515 424]1752[742]1760[375 375]2442[582 560]2475[1048]2589[614]2592[465 465 465 465 465 465 465 465 465]]
endobj
31 0 obj
<</Length 326 >>
stream
- ¾¿ÿÿð?ÿÿð
+ g¾¿çÿô?ÿÿð
endstream
endobj
32 0 obj
-<</Subtype/CIDFontType0C/Length 17824 >>
+<</Subtype/CIDFontType0C/Length 17694 >>
stream
-
-) "
+
+) "
+

!
"
#
+$
%
&
'
-(
-  „ k ì ‘ ÓõÂGõš »{]U. !
-!]"_"Ö#d$s%¬&I&Î(@(—*++(+¿-.*/ /Î0š1q2a3¬5]6—7§7Ê8D8¿:; =>D>ˆ??Æ@ªA(AáBZC ,‹½ø龋½ø$½½øï÷>û’û>û’©^÷>÷’÷>û’û ÷¿÷>÷’‹üû\÷¿û>÷‘÷è‹ü8ýøˆùNüˆûÇõøÆwæõ÷$ù&snxU‹E™h”3“=‘1vŒ…Ž„•‹•‹Ž”Œ–™‹Ç˜÷
+(
+ | ` G È{jïEB´c#Ä»ýÖîÕÊ !!–"$#3$l% %Ž'
+÷«¯ÿÿü™šÿ
+LÍÿÿùÌÌÿ
+ûkgÿ
LÍÿ
ÌÍÿ
‹è¤ÏÅ€”†“‹–÷‹ÿ
-ffÿ
-³4¬õà÷S÷ÿ
+ffÿ
ûDo*[÷y¨—®Ò8ü„÷=ß‹ÿ
eŽ‰‹‰‰‹Š‡^W€[•‡—Š—‹¼ŸÛ¹¥Í‹¼°•eNü‹8z†;ˆ……‹v‘…¼Œÿ
ffÿ
-÷,ÿ
+÷,ÿ
™špÿ
LÍ—‘‹–ÿÿöÌÍÿ
@@ -488,24 +503,24 @@ LÍ…ÿ
³3ÿÿçš”w”w¥‹ÿ
eŽ‰‹‰‰‹Š‡^W€[•‡—Š—‹۹¥Í‹¼°•eNü‹8z†;ˆ……‹v‘…¼Œÿ
LÍ…ÿ
-±ÎÓ®û22ûû'á9÷÷ÞÞ÷&÷BÝûû‰¬÷檵w÷jØ÷j÷‹8p†Eˆ……‹v‘…¼Œÿ
+±ÎÓ®û22ûû'á9÷÷ÞÞ÷&÷BÝûû‰¬÷檵w÷jØ÷j÷‹8p†Eˆ……‹v‘…¼Œÿ
æ€ÿÿüæ€ÿ
-€ÿÿþÌÀ–ÿ
+€ÿÿþÌÀ–ÿ
¯
¯ Ú Ú’
endstream
endobj
33 0 obj
-<</Type/FontDescriptor/FontName/SGXFCI+LibertinusSerif/Flags 4/FontBBox[-1082 -256 6171 1125]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle 0/StemV 73/XHeight 429/FontFile3 32 0 R/CIDSet 31 0 R>>
+<</Type/FontDescriptor/FontName/UZVDII+LibertinusSerif/Flags 4/FontBBox[-1082 -256 6171 1125]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle 0/StemV 73/XHeight 429/FontFile3 32 0 R/CIDSet 31 0 R>>
endobj
34 0 obj
-<</Length 1791 >>
+<</Length 1833 >>
stream
%!PS-Adobe-3.0 Resource-CMap
%%DocumentNeededResources: ProcSet (CIDInit)
%%IncludeResource: ProcSet (CIDInit)
-%%BeginResource: CMap (TeX-SGXFCI-LibertinusSerif-0)
-%%Title: (TeX-SGXFCI-LibertinusSerif-0 TeX SGXFCI-LibertinusSerif 0)
+%%BeginResource: CMap (TeX-UZVDII-LibertinusSerif-0)
+%%Title: (TeX-UZVDII-LibertinusSerif-0 TeX UZVDII-LibertinusSerif 0)
%%Version: 1.000
%%EndComments
/CIDInit /ProcSet findresource begin
@@ -513,18 +528,20 @@ stream
begincmap
/CIDSystemInfo
<< /Registry (TeX)
-/Ordering (SGXFCI-LibertinusSerif)
+/Ordering (UZVDII-LibertinusSerif)
/Supplement 0
>> def
-/CMapName /TeX-Identity-SGXFCI-LibertinusSerif def
+/CMapName /TeX-Identity-UZVDII-LibertinusSerif def
/CMapType 2 def
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
0 beginbfrange
endbfrange
-79 beginbfchar
+82 beginbfchar
<0002> <0021>
+<0009> <0028>
+<000A> <0029>
<000D> <002C>
<000E> <002D>
<000F> <002E>
@@ -534,6 +551,7 @@ endbfrange
<0014> <0033>
<0015> <0034>
<0016> <0035>
+<001B> <003A>
<001C> <003B>
<0020> <003F>
<0022> <0041>
@@ -545,8 +563,6 @@ endbfrange
<0028> <0047>
<0029> <0048>
<002A> <0049>
-<002B> <004A>
-<002C> <004B>
<002D> <004C>
<002E> <004D>
<002F> <004E>
@@ -562,6 +578,7 @@ endbfrange
<0039> <0058>
<003A> <0059>
<003B> <005A>
+<003D> <005C>
<0042> <0061>
<0043> <0062>
<0044> <0063>
@@ -599,6 +616,7 @@ endbfrange
<0A21> <0031>
<0A22> <0032>
<0A23> <0033>
+<0A24> <0034>
<0A25> <0035>
<0A26> <0036>
<0A27> <0037>
@@ -614,10 +632,10 @@ end
endstream
endobj
8 0 obj
-<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/SGXFCI+LibertinusSerif/DescendantFonts[35 0 R]/ToUnicode 34 0 R>>
+<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/UZVDII+LibertinusSerif/DescendantFonts[35 0 R]/ToUnicode 34 0 R>>
endobj
35 0 obj
-<</Type/Font/Subtype/CIDFontType0/BaseFont/SGXFCI+LibertinusSerif/FontDescriptor 33 0 R/W 30 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
+<</Type/Font/Subtype/CIDFontType0/BaseFont/UZVDII+LibertinusSerif/FontDescriptor 33 0 R/W 30 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>>
endobj
11 0 obj
<</Type/Pages /Count 3/Kids[6 0 R 13 0 R 16 0 R]>>
@@ -627,51 +645,51 @@ endobj
endobj
37 0 obj
<<
- /Title(Novel\040Document\040Class)/Creator(LaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20170725165948-07'00')/ModDate(D:20170725165948-07'00')/Producer(LuaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001)
+ /Title(Novel\040Document\040Class)/Creator(LaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20170731155620-07'00')/ModDate(D:20170731155620-07'00')/Producer(LuaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001)
>>
endobj
xref
0 38
0000000000 65535 f
-0000027016 00000 n
-0000027036 00000 n
-0000027056 00000 n
+0000030067 00000 n
+0000030087 00000 n
+0000030107 00000 n
0000000015 00000 n
0000013580 00000 n
0000013439 00000 n
0000006726 00000 n
-0000058772 00000 n
-0000037723 00000 n
-0000035718 00000 n
-0000059092 00000 n
-0000022639 00000 n
-0000022495 00000 n
+0000061750 00000 n
+0000040774 00000 n
+0000038769 00000 n
+0000062070 00000 n
+0000022352 00000 n
+0000022208 00000 n
0000013710 00000 n
-0000026906 00000 n
-0000026762 00000 n
-0000022760 00000 n
-0000027109 00000 n
-0000027257 00000 n
-0000027326 00000 n
-0000034398 00000 n
-0000034621 00000 n
-0000035863 00000 n
-0000036053 00000 n
-0000036080 00000 n
-0000036185 00000 n
-0000036806 00000 n
-0000037014 00000 n
-0000037854 00000 n
-0000038031 00000 n
-0000038422 00000 n
-0000038805 00000 n
-0000056708 00000 n
-0000056924 00000 n
-0000058909 00000 n
-0000059159 00000 n
-0000059482 00000 n
+0000029957 00000 n
+0000029813 00000 n
+0000022473 00000 n
+0000030160 00000 n
+0000030308 00000 n
+0000030377 00000 n
+0000037449 00000 n
+0000037672 00000 n
+0000038914 00000 n
+0000039104 00000 n
+0000039131 00000 n
+0000039236 00000 n
+0000039857 00000 n
+0000040065 00000 n
+0000040905 00000 n
+0000041082 00000 n
+0000041488 00000 n
+0000041871 00000 n
+0000059644 00000 n
+0000059860 00000 n
+0000061887 00000 n
+0000062137 00000 n
+0000062460 00000 n
trailer
-<</Size 38/Root 36 0 R/Info 37 0 R/ID[<0947F68E99322F5C31D76E88CF999B04> <0947F68E99322F5C31D76E88CF999B04>]>>
+<</Size 38/Root 36 0 R/Info 37 0 R/ID[<373F126C7C1D35302D8F384A6C9697A8> <373F126C7C1D35302D8F384A6C9697A8>]>>
startxref
-59801
+62779
%%EOF
diff --git a/Master/texmf-dist/doc/lualatex/novel/novel.tex b/Master/texmf-dist/doc/lualatex/novel/novel.tex
index e0cc6440ccd..bdf6113d385 100644
--- a/Master/texmf-dist/doc/lualatex/novel/novel.tex
+++ b/Master/texmf-dist/doc/lualatex/novel/novel.tex
@@ -3,7 +3,7 @@
%
% SOURCE CODE FOR FILE novel.pdf, the cover info
% for novel document class.
-\documentclass{novel} % v. 1.32 or later
+\documentclass{novel} % v. 1.34 or later
% Almost all settings are defaults.
\SetHeadFootStyle{3}
\SetTitle{Novel Document Class} % only footer, with page number
@@ -82,7 +82,15 @@ Open Font License, version 1.1.
\QuickChapter{4. Version}
-Version 1.32, 26-July-2017. Knowledgeable coders are invited to take maintenance of this project. Contact CTAN.
+\noindent 1.34, 2017-07-31: added debug feature for maintainers.
+
+\noindent 1.32, 2017-07-26: minor bug fixes in docs, major bug concerning \string\textls\space in code.
+
+\noindent 1.2, 2017-06-06: added code for color image artwork.
+
+\noindent 1.1, 2017-03-01: initial public release.
+
+\clearpage
\QuickChapter{5. FAQs}
@@ -95,6 +103,13 @@ is inherently incompatible.
\end{adjustwidth}
\begin{adjustwidth}{\parindent}{0pt}
+\backindent\makebox[\parindent][l]{Q. }Is this project still alive?
+\end{adjustwidth}
+\begin{adjustwidth}{\parindent}{0pt}
+\backindent\makebox[\parindent][l]{A. }Yes, and it is still in use by its originator. However, the originator would like someone else to take over long-term maintenance, because he is moving on to other things. If interested, contact CTAN and the creator (e-mail at top of novel.cls file). You will need to be familiar with LuaLaTeX, fontspec, Open Type, and the terminology of fiction writing. Lua coding not required. Until then, the originator will maintain it from time to time.
+\end{adjustwidth}
+
+\begin{adjustwidth}{\parindent}{0pt}
\backindent\makebox[\parindent][l]{Q. }My thesis advisor told me---
\end{adjustwidth}
\begin{adjustwidth}{\parindent}{0pt}
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 b058bb1d1a0..523555173f4 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-01-overview.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-01-overview.html
@@ -139,7 +139,7 @@
<div id="main">
<a id="thetop"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
<p><b>User Guide</b></p>
@@ -155,6 +155,7 @@
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</a></p>
</div>
@@ -206,11 +207,25 @@
<a id="a1.1.4"></a>
<h4>1.1.4 Useful Tools</h4>
-<p>Before sending your PDF file anywhere, you should always open it in Adobe Reader, and inspect it. If you are on a system that does not have that software, then find a friend who has it. The reason is that some other PDF readers will not object to problem files, but Adobe Reader will complain.</p>
+<p><b>Word Processor:</b> I use LibreOffice for this (version 5.3 or later preferred), but you can use most other word processors.</p>
-<p>In commercial printing, it is not necessary that your file be "optimized for fast web view" or "linearized." Nevertheless, some services do a lot of work with e-books, and may request that printer files be optimized or linearized, out of force of habit. The free <code>qpdf</code> command-line tool, available for Linux and Windows, is your friend.</p>
+<p>Write your wonderful novel using the word processor, with the same page layout that you will eventually use for TeX, and with the same font and point size. However, don't use italics or any other font effect that requires TeX code. This will give you a rough idea of how things look, and how many pages are used. You will still need to do final editing within TeX, where you will add codes for italics and other effects, and perhaps re-write paragraphs so that they look better.</p>
-<p>Your PDF cannot be encrypted or password-protected for commercial printing. Only you and the printer are supposed to see it. So, it is always possible to extract the text, not as a TeX document, but as plain text. Adobe Reader probably will not do what you expect. Adobe Acrobat Pro does a good job, if you first "add tags" via its accessibility features. Otherwise, the free Okular PDF reader does a reasonable job, as does the <code>pdftotext</code> command-line program (part of <code>xpdf</code>). Be sure to request that layout be preserved. You may need to review the exported text for words that were broken by hyphenation, and re-assemble the words.</p>
+<p>A good word processor will have a high-end spelling checker, and perhaps some grammatical checks. It can apply &ldquo;smart quotes&rdquo; and other character substitutions on-the-fly. If you save the result as plain text <em>with utf-8 encoding</em> then it can be used with the <code>novel</code> document class. Beware of saving plain text in Windows native encoding.</p>
+
+<p>Note that some word processors interpret two hyphens as an em-dash. In TeX, it's three hyphens. As long as the substitution is made, things will be OK.</p>
+
+<p><b>Adobe Reader:</b> Before sending your PDF file anywhere, you should always open it in Adobe Reader, and inspect it. If you are on a system that does not have that software, then find a friend who has it (different platform OK).</p>
+
+<p>The reason is that some other PDF readers will not object to problem files, but Adobe Reader will complain. Almost certainly, the recipient of your PDF will open it in a commercial program (perhaps Adobe Acrobat Pro), inspect it, and add manufacturing information at the bottom of the last blank page. It is that revised PDF file that will go to the printing machine.</p>
+
+<p>How to inspect your finished PDF: (1) In Adobe Reader, go to Edit, Preferences, Documents. Check "Save As optimizes for fast web view." Then go to Edit, Preferences, Page Display. Check "Show art, trim, and bleed boxes." Then OK. (2) Open your PDF. If its Trim Size is smaller than the full PDF page size (Media Size) you should see a light green box. This shows the Trim Size. This box does not print; it is only for visualization. However, if your Trim Size is the same as the Media Size (the normal situation) then the green box, if visible, will be all the way to the page edges. (3) Go to File, Properties, Fonts. Any font must be (subset) embedded. (4) "Save As" the same file name (or another one, if you prefer). This will optimize the file. You probably do not need to do that, but it does not hurt, and a few services expect it.</p>
+
+<p><b>ImageMagick or GraphicsMagick;</b> If your document has any images, whether grayscale interior or color cover art, then you will need more advanced image processing than most image editors (such as GIMP) can provide. See page 10 of this documentation, for detailed instructions.</p>
+
+<p><b>Text Extraction:</b> Did you lose your TeX source document after preparing the PDF? If so, you can extract its unformatted plain text (not TeX code). Your PDF cannot be encrypted or password-protected for commercial printing. Only you and the printer are supposed to see it. So, it is always possible to extract the text.</p>
+
+<p>Adobe Reader probably will not do what you expect. Adobe Acrobat Pro does a good job, if you first "add tags" via its accessibility features. Otherwise, the free <code>Okular</code> PDF reader does a reasonable job, as does the <code>pdftotext</code> command-line program (part of <code>xpdf</code>). Be sure to request that layout be preserved. You may need to review the exported text for words that were broken by hyphenation, and re-assemble the words.</p>
<a id="a1.2"></a>
@@ -760,7 +775,7 @@
<p>Requires NovelDeco font. Caps become "medium" caps, between regular and small.<p>
<pre class="noindentcmd">\decoglyph{}</pre>
-<p>Selects a decorative glyph from the decofont. Glyphs are chosen from a code table.</p>
+<p>Selects a decorative glyph from the decofont. Glyphs are chosen from a code table. The decorative glyphs in this font (not including its ordinary characters) are shown in file <code>NovelDeco-glyphs.pdf</code>, which can be found in these docs in the <code>extras</code> folder.</p>
<pre class="noindentcmd">\squeeze{<em>text</em>}<br>\crush{<em>text</em>}</pre>
<p>Horizontally shrinks text by 1% or 2%, respectively.</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 1e5160702df..41989318f24 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
@@ -24,7 +24,8 @@
<li><a href="#a2.5">2.5 cropview</a></li>
<li><a href="#a2.6">2.6 closecrop</a></li>
<li><a href="#a2.7">2.7 xml</a></li>
-
+ <li><a href="#a2.8">2.8 debug</a></li>
+ <li><a href="#a2.9">2.9 unblock</a></li>
</ul>
<p>&nbsp;</p>
@@ -37,7 +38,7 @@
<a id="thetop"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
@@ -54,6 +55,7 @@
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</a></p>
</div>
@@ -160,6 +162,26 @@
<p>The exported file will be named <code>jobname-XMPasXML.xml</code>, where <code>jobname</code> is the file name of your *.tex document. If you wish to obtain the XMP packet, without the xml header, you can easily do that with a Unicode-compatible text editor. The necessary editing is obvious.</p>
+<a id="a2.8"></a>
+<h4>2.8 debug (primarily for developer use)</h4>
+
+<p>The <code>novel</code> class has an additional debugging feature. It is primarily intended for developers, but may be helpful to some ordinary users. Do not use this option if your document compiles, because it will clutter the log file with many messages that you do not need.</p>
+
+<p>The use of the <code>debug</code> option is described on documentation page 11.</p>
+
+
+<a id="a2.9"></a>
+<h4>2.9 unblock (primarily for developer use)</h4>
+
+<p>A number of LaTeX packages are known to be incompatible with <code>novel</code>, because "the way those packages do things" conflicts with "the way novel does things." If you attempt to load one of those packages, then the results you get may not be in agreement with the formats and styles described in this documentation, because the other package over-rides some of novel's own macros.</p>
+
+<p>Therefore, at the end of your Preamble, <code>novel</code> reviews the loaded packages, and throws an error message if you included any of them via <code>\usepackage</code> or <code>\RequirePackage</code>. That also applies if you call some other package that chain-loads one of the forbidden packages.</p>
+
+<p>The odds that you will need a forbidden package are small, because they generally pertain to layout for mathematical and academic papers (tables, floats, equations, diagrams, etc.).</p>
+
+<p>If you specify document class option <code>unblock</code> then the list of forbidden packages will be disregarded by <code>novel</code>. Use at your own risk! This option is really intended for the convenience of developers, rather than ordinary users.</p>
+
+
</div><!-- end main -->
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 a3a8c113929..2bb7d3f444d 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.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
@@ -75,6 +75,7 @@
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</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 f7f821fd9ad..0a6843bdbae 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.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
@@ -82,6 +82,7 @@
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</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 f69c59ba020..93adff55df6 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-05-fonts.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-05-fonts.html
@@ -78,7 +78,7 @@
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
<p><b>User Guide</b></p>
@@ -94,6 +94,7 @@
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</a></p>
</div>
@@ -280,6 +281,8 @@
<p class="code"><code>{\decofont <em>text</em>}</code></p>
+<p>The decorative glyphs in this font (not including its ordinary characters) are shown in file <code>NovelDeco-glyphs.pdf</code>, which can be found in these docs in the <code>extras</code> folder.</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 9133ad09374..399104b0976 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
@@ -47,7 +47,7 @@
<a id="a6"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
@@ -64,6 +64,7 @@
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</a></p>
</div>
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 320753163f7..7e124c69897 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.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
<p><b>User Guide</b></p>
@@ -74,6 +74,7 @@
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</a></p>
</div>
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 0507b902b6a..26f6390d7a0 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.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
<p><b>User Guide</b></p>
@@ -64,6 +64,7 @@
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</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 9c916e38f74..5b4b75d0d4b 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.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
@@ -129,6 +129,7 @@ Footnotes and Endnotes</a></p>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</p>
<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</a></p>
</div>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-10-cover-art.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-10-cover-art.html
index 5fe86c73209..20a802ff3e8 100644
--- a/Master/texmf-dist/doc/lualatex/novel/noveldocs-10-cover-art.html
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-10-cover-art.html
@@ -25,6 +25,7 @@ PDF/X Compliance</a></p>
<li><a href="#a10.3">10.3 Convert to CMYK 240% Ink</a></li>
<li><a href="#a10.4">10.4 Convert to PDF/X</a></li>
<li><a href="#a10.5">10.5 Final Check</a></li>
+ <li><a href="#a10.A">!0.A Appendix: The Color Gamut</a></li>
</ul>
@@ -36,7 +37,7 @@ PDF/X Compliance</a></p>
<div id="main">
<a id="a10"></a>
<h1>Documentation for <code>novel</code> document class</h1>
-<p>Documentation version: 1.32.</p>
+<p>Documentation version: 1.34.</p>
<div class="pagetopage">
@@ -53,6 +54,7 @@ PDF/X Compliance</a></p>
<span style="visibility:hidden">9. </span>Chapters; Continued Pages;<br>
<span style="visibility:hidden">9. </span>Footnotes, Endnotes.</a></p>
<p>10. Cover Artwork</p>
+<p><a href="noveldocs-11-debugging.html">11. Debugging</a></p>
</div>
@@ -201,7 +203,7 @@ PDF/X Compliance</h2>
<p>Open the PDF in Adobe Reader, which does a trick that no other free software will do, to my knowledge. If your platform does not have Adobe Reader, then find a friend who has it. May be a different platform.</p>
-<p>In Adobe Reader, go to Edit, Preferences, Documents. Check "Save As optimizes for fast web view." Then go to Edit, Preferences, Page Disaply. Check "Show art, trim, and bleed boxes." Then OK.</p>
+<p>In Adobe Reader, go to Edit, Preferences, Documents. Check "Save As optimizes for fast web view." Then go to Edit, Preferences, Page Display. Check "Show art, trim, and bleed boxes." Then OK.</p>
<p>Open your PDF. You should see a light green box, just inside the image boundary. This shows the Trim Area. This box does not print; it is only for visualization. Go to File, Properties, Fonts. There should be no fonts listed.</p>
@@ -214,6 +216,26 @@ PDF/X Compliance</h2>
<p class="centerimg"><img src="html-resources/verified238.png" width="700" height="446" alt="works for me"></p>
+<a id="a10.A"></a>
+<h3>10.A Appendix: The 240% Ink Limit Color Gamut</h3>
+
+<p><img src="extras/SWOP240gamutHSV.png" class="floatright" width="225" height="265" alt="240% gamut samples"> At right are color samples in the HSV color coordinate system (as used in color picker for GIMP 2.8 software). Each sample would normally be a rectangle, with lightness as horizontal axis, and saturation as vertical axis. Note that "saturation" is a technical term, not to be confused with "chroma (colorfulness). The highest chroma would be at upper right of each rectangle. There are 36 hues, corresponding to 10 degree increments on the HSV color wheel.</p>
+
+<p>A portion of each rectangle has been whited-out. Those colors are inaccessible to the SWOP CMYK printing process with 240% ink limit. Most of the inacessible colors are at the upper left of each rectangle, where the combination of low lightness and high saturation would call for too much ink. In a few cases, the inacessible colors simply cannot be reached by standard CMYK inks.</p>
+
+<p>In general, the range of color that can be accurately portrayed on a consumer-grade laptop monitor is smaller than the range that can be printed. So, in the above image, your monitor is faking many of the colors, by showing them as closely as it can. The method of faking may depend on your computer, and on your browser. In many cases, nearby colors are also faked, so that the color error is not all in one place.</p>
+
+<p><img src="extras/SWOP240gamutHSV-monitorlimit.png" class="floatright" width="225" height="265" alt="240% gamut with monitor limit"> At right, the colors that are probably faked by your monitor have also been whited out. These tend to be in the upper portions, where the colors are too chromatic for inexpensive LCD technology. Expensive professional monitors could show more. If you look back at the first image, you will see that the faked areas seem to be in a uniform color, because your monitor cannot display the differences.</p>
+
+<p>If your cover artwork uses colors from the first image, then those RGB values can be reasonably well converted to printable CMYK at 240% ink limit. What you'll be missing are richly colored shadows.</p>
+
+<p>If you limit your cover artwork to colors in the second image, then you are much less likely to be surprised by overly colorful areas in print, which couldn't be seen that way on your monitor. On the other hand, maybe you would like to use all of the colors available in the first image, with the understanding that the printed color will be a bit surprising. It's up to you.</p>
+
+<p>You may have heard that when artwork is converted to CMYK 240%, colors tend to be "duller." Not necessarily. The second image looks much duller than the first, but that is because large areas of identically-faked color have been whited out. Those colors are still in the second image, but they only occupy a thin boundary of the remaining color.</p>
+
+<p>The full-size color sample images are in docs folder <code>extras</code>, and are named <code>SWOP240gamutHSV.png</code> and <code>SWOP240gamutHSV-monitorlimit.png</code>.</p>
+
+<p>In any case: Depending on your image viewing technology and monitor, intensely green colors may be more colorful in print than as viewed on your monitor, even after image conversion. That doesn't mean that your image will have a greenish cast. It merely means that intense greens (shamrock) may or may not print more colorful than expected.</p>
diff --git a/Master/texmf-dist/doc/lualatex/novel/noveldocs-11-debugging.html b/Master/texmf-dist/doc/lualatex/novel/noveldocs-11-debugging.html
new file mode 100644
index 00000000000..2866e924249
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/novel/noveldocs-11-debugging.html
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Novel class documentation - Debugging</title>
+<link rel="stylesheet" type="text/css" href="html-resources/novel-doc.css">
+</head>
+
+<body>
+<div id="master">
+
+
+<div id="toc">
+
+<p>Document class "novel"</p>
+
+<p><a href="#a11">11. Debugging</a></p>
+
+<ul>
+ <li><a href="#a11.1">11.1 Ordinary Novel Tracking</a></li>
+ <li><a href="#a11.2">11.2 Debug Novel Tracking</a></li>
+ <li><a href="#a11.3">11.3 Your Own Debug Tracking</a></li>
+</ul>
+
+<p>&nbsp;</p>
+</div><!-- end toc -->
+
+
+
+<div id="main">
+<a id="thetop"></a>
+<h1>Documentation for <code>novel</code> document class</h1>
+<p>Documentation version: 1.34.</p>
+
+
+<div class="pagetopage">
+<p><b>User Guide</b></p>
+<p><a href="noveldocs-01-overview.html">1. Overview</a></p>
+<p><a href="noveldocs-02-class-options.html">2. Class Options</a></p>
+<p><a href="noveldocs-03-metadata-pdfx.html">3. Metadata, PDF/X</a></p>
+<p><a href="noveldocs-04-layout.html">4. Page Layout</a></p>
+<p><a href="noveldocs-05-fonts.html">5. Choosing Fonts</a></p>
+<p><a href="noveldocs-06-header-footer.html">6. Headers, Footers</a><br>
+<p><a href="noveldocs-07-text-size-style.html">7. Text Sizes, Styles</a></p>
+<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, Endnotes.</a></p>
+<p><a href="noveldocs-10-cover-art.html">10. Cover Artwork</a></p>
+<p>11. Debugging</p>
+</div>
+
+
+<a id="a11"></a>
+<h2 style="clear:none">11. Debugging</h2>
+
+<p>New in version 1.34.</p>
+
+<p>The <code>debug</code> class option is primarily for developers. However, ordinary users may sometimes find it helpful. Do not use this option with a document that compiles successfully, even if it does not look the way you wanted it to look. Debuggin code does not change the PDF, but writes many additional messages to the log file, which are not necessary when the run is successful.</p>
+
+<p>The debugging information is also written to your console (terminal window or GUI application).</p>
+
+
+
+<a id="a11.1"></a>
+<h3>11.1 Ordinary Novel Tracking</h3>
+
+<p>If you look at the log file for a successful run, you will see several messages that look something like this:</p>
+
+<p class="code"><code>Novel Tracking 0.2: novel-FileData.sty loaded.</code></p>
+
+<p>That message was written to the log file at the time the compiler encountered code this code:</p>
+
+<p class="code"><code>\typeout{Novel Tracking 0.2: novel-FileData.sty loaded.}</code></p>
+
+<p>Then, you know that the compiler successfully reached that point in execution. Tracking numbers beginning with <code>0.</code> are in the <code>novel.cls</code> main file, and are written to the log whether or not you use the <code>debug</code> option. If a tracking number is missing, or out of numerical order, it merely means that your document setup has followed a particular fork in the code.</p>
+
+<p>What if the run is unsuccessful? You know it succeeded up to the point where the last tracking number (in log order, not numerical order) was written, and must have failed at some point after that.</p>
+
+
+<a id="a11.2"></a>
+<h3>11.2 Debug Novel Tracking</h3>
+
+<p>When the <code>debug</code> option is used, additional tracking codes appear in the log file. These are generated from the various subsidiary files that are part of the <code>novel</p> package. For example:</p>
+
+<p class="code"><code>Novel Tracking 3.4.1 in novel-LayoutSettings.sty.</code></p>
+
+<p>is written to the log file, when the following line of code is encountered, located in file <code>novel-LayoutSettings.sty</code>:</p>
+
+<p class="code"><code>\NDB{3.4.1 in novel-LayoutSettings.sty.}</code></p>
+
+<p>The <code>\NDB</code> macro detects whether or not you are using the <code>debug</code> option.</p>
+
+<p>So, when you see that log message, you know that the code leading to it was successfully executed.</p>
+
+<p>Keep in mind that due to forks in the logic, successive Novel Tracking messages may have code numbers all over the place, and some of them may be skipped or repeated. But more likely than not, if your document fails to compile, the error was triggered by code that soon follows the last successful Novel Tracking message, in that same file.</p>
+
+<p>The cause of an error may be any of these things:<br>
+&nbsp; &nbsp; (1) An error in novel's own code.<br>
+&nbsp; &nbsp; (2) Error in another package used by novel.<br>
+&nbsp; &nbsp; (3) Your own document code.</p>
+
+<p>The first instance is possible, but unlikely, because each update of <code>novel</code> is tested before release.</p>
+
+<p>In the second case, the offending package hopefully provides its own error message. If that package has recently been updated, then perhaps an error crept in, and will be quickly resolved when others report it.
+
+<p>The third case is up to you. Note that bad code is often not detected until the point where it is used. For example, suppose you define the following macro in your Preamble, where <code>\BADCODE</code> is undefined:</p>
+
+<p class="code"><code>\newcommand\mymonkeywrench{\BADCODE}</code></p>
+
+<p>That will not throw an error when it is parsed. If you do not use <code>\mymonkeywrench</code> anywhere, then it will not throw an error. But if you use <code>\mymonkeywrench</code> on page 214 of your novel, that's where the error will finally appear.</p>
+
+
+<a id="a11.3"></a>
+<h3>11.3 Your Own Debug Tracking</h3>
+
+<p>You can add Novel Tracking messages to your own code. You can put the messages inside macros, or simply insert them somewhere in the text.</p>
+
+<p>For example, you could do something like this, where the <code>22.5</code> is arbitrary:</p>
+
+<p class="code"><code>\newcommand\mymonkeywrench{\NDB{User 22.5 page \thepage.}\BADCODE}</code></p>
+
+<p>Then, if that macro is invoked on page 214, it will write this to the log file:</p>
+
+<p class="code"><code>Novel Tracking User 22.5 page 214.</code></p>
+
+<p>For a complicated macro, you could put Novel Tracking at its start and at its end. Then you will know whether the macro was accessed, and if it successfully completed.</p>
+
+<p>Remember that when you insert the <code>\NDB{}</code> code, you have to pay attention to white space. In some cases, you must avoid space before or after it. And, if the code is on its own line, you might need to terminate the line with a percent <code>%</code> so that the line return is not read into your document.</p>
+
+
+
+</div><!-- end main -->
+
+<div id="finish"></div>
+
+</div><!-- end master -->
+
+</body>
+</html>
+
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo
index 683aaabfcbf..fd22ffdef38 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.32
+% Typically used in the USA. Novel file version 1.34
% 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 e43cb14445e..cd2cdc4ff35 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty
@@ -12,15 +12,17 @@
%%
%%
\ProvidesFile{novel-CalculateLayout.sty}%
-[2017/07/26 v1.32 LaTeX file (layout calculations)]
+[2017/07/31 v1.34 LaTeX file (layout calculations)]
%%
-
%%
%% This file is loaded \AtEndPreamble, which precedes \AtBeginDocument.
%%
-\newlength\normalFontSize % becomes 1em in normal text, after \AtBeginDocument
+%% Novel Tracking messages in this file begin with 9.
+\NDB{9.0 in novel-CalculateLayout.sty.}
+
+\newlength\normalFontSize % becomes 1em in normal text.
\newlength\normalBaselineSkip % also abbreviated as \nbs
@@ -35,6 +37,7 @@
\SetMediaSize{5.5in}{8.5in}
\fi
\fi
+\NDB{9.1 in novel-CalculateLayout.sty.}
% Default margins are based on Trim Height, if user does not set margins.
% Works for standard w/h aspect ratios, but not for exotically narrow.
\if@MarginsSet\else
@@ -69,6 +72,7 @@
} % end internal dimtest
} % end dimtest for margins.
\fi % end default margins
+\NDB{9.2 in novel-CalculateLayout.sty.}
%
% Choose default font size based on Trim Width, unless font size set by user:
\if@FontSizeSet\else
@@ -82,6 +86,7 @@
} % end internal dimtest
} % end dimtest for font size.
\fi
+\NDB{9.3 in novel-CalculateLayout.sty.}
%
% Default lines/page based on Trim Height, font size, unless LPP set by user:
\if@LinesPerPageSet\else
@@ -97,6 +102,7 @@
\FPclip{\@tempLPP}{\@tempLPP} % remove excess trailing 0.
\gdef\my@LinesPerPage{\@tempLPP}
\fi
+\NDB{9.4 in novel-CalculateLayout.sty.}
%
% Correct bottom margin for descenders, assumed to be 0.3em:
\addtolength\Old@BottomMargin{0.3\Old@FontSize}
@@ -114,6 +120,7 @@
%
%% end set default sizes and initial corrections
+\NDB{9.5 in novel-CalculateLayout.sty.}
%% OLD, NEW, CURRENT, LIVE, TEXT MACRO DEFINITIONS
@@ -173,7 +180,7 @@
%
%% End old, new... macro definitions.
-
+\NDB{9.6 in novel-CalculateLayout.sty.}
%% PRELIMINARY CALCULATION OF BASELINESKIP
%% -----------------------------------------------------------------------------
@@ -192,6 +199,7 @@
\if@gotFooter % allow for footer jump
\FPadd{\adj@LinesPerPage}{\adj@LinesPerPage}{\@footjump}
\fi
+\NDB{9.7 in novel-CalculateLayout.sty.}
%
% Baseline Skip is Live Height divided by adjusted number of lines.
% Thus initially, Text (with header/footer) occupies full Live Height.
@@ -213,6 +221,7 @@
%
%% End preliminary calculation of baselineskip.
+\NDB{9.8 in novel-CalculateLayout.sty.}
%% FIT CurrentTextWidth TO NewLiveWidth
@@ -226,7 +235,7 @@
%
%% end fit CurrentTextWidth to NewLiveWidth
-
+\NDB{9.9 in novel-CalculateLayout.sty.}
%% ADJUST CurrentBaselineSkip TO FIT NewLiveHeight
%% -----------------------------------------------------------------------------
@@ -238,6 +247,7 @@
\setlength\Current@BaselineSkip{\Current@BaselineSkipNum pt}
\FPmul{\Current@TextHeightNum}{\Current@BaselineSkipNum}{\adj@LinesPerPage}
\fi
+\NDB{9.10 in novel-CalculateLayout.sty.}
% Check if the revised skip is too small:
\FPdiv{\@ratioBLtoFS}{\Current@BaselineSkipNum}{\Current@FontSizeNum}
\FPiflt{\@ratioBLtoFS}{1.2} % Too small. Re-tweak font, text width, skip.
@@ -256,6 +266,7 @@
%
%% end adjust CurrentBaselineSkip to fit NewLiveHeight.
+\NDB{9.11 in novel-CalculateLayout.sty.}
%% DISTRIBUTE SIDE EXCESS
@@ -269,6 +280,7 @@
%
%% end distribute side excess.
+\NDB{9.12 in novel-CalculateLayout.sty.}
%% SET TEXTWIDTH, FONT SIZE, BASELINESKIP
@@ -278,18 +290,18 @@
%
\setlength\normalFontSize{\Current@FontSizeNum pt}
\setlength\normalBaselineSkip{\Current@BaselineSkipNum pt}
-
+%
\@setfontsize\normalsize\normalFontSize{\normalBaselineSkip}%
-
-
\normalsize % Defined in `novel.cls'. Uses numbers, not lengths.
%
+\NDB{9.13 in novel-CalculateLayout.sty.}
\newlength\nfs % abbreviation for normal fontsize
\setlength\nfs{\normalFontSize}
\gdef\nfsnum{\strip@pt\nfs}
\newlength\nbs % abbreviation for normal baselineskip
\setlength\nbs{\normalBaselineSkip}
\gdef\nbsnum{\strip@pt\nbs} % just the numerical part
+\NDB{9.14 in novel-CalculateLayout.sty.}
%
% This document class limits range of normal point size:
\FPiflt{\Current@FontSizeNum}{8}%
@@ -315,6 +327,7 @@
\typeout{^^JClass `novel' Alert: Line spacing is allowable, but wide.^^J%
Consider more lines per page, or add header or footer.^^J}%
\fi
+\NDB{9.15 in novel-CalculateLayout.sty.}
%
\FPdiv{\Ratio@BaselineSkip}{\Current@BaselineSkipNum}{\Old@BaselineSkipNum}
\FPround{\Ratio@BaselineSkip}{\Ratio@BaselineSkip}{3}
@@ -323,6 +336,7 @@
\FPdiv{\Ratio@EM}{\Current@FontSizeNum}{\Old@FontSizeNum}
\FPround{\Ratio@EM}{\Ratio@EM}{3}
\FPclip{\Ratio@EM}{\Ratio@EM}
+\NDB{9.16 in novel-CalculateLayout.sty.}
% Alert if images scaled by \Rework:
\ifthenelse{\equal{\Ratio@EM}{1} \AND \equal{\Ratio@BaselineSkip}{1}}{}{%
\typeout{^^JClass `novel' Alert: Due to \string\Rework\space there may be^^J%
@@ -348,7 +362,7 @@
%
%% end set textwidth, font size, baselineskip
-
+\NDB{9.17 in novel-CalculateLayout.sty.}
@@ -364,6 +378,7 @@
\setlength\headheight{0pt}
\setlength\headsep{0pt}
\fi
+\NDB{9.18 in novel-CalculateLayout.sty.}
%
% Prior to this, the following were set by user or calculated:
% \textwidth \headsep \headheight
@@ -381,6 +396,8 @@
\fi
%%
+\NDB{9.19 in novel-CalculateLayout.sty.}
+
%
% Standard TeX \hoffset and \voffset is not relative to the MediaBox, but is
@@ -422,6 +439,8 @@
\fi
%%
+\NDB{9.20 in novel-CalculateLayout.sty.}
+
%
% \evensidemargin is at the left (outside edge) of verso pages.
% Calculation as above, but using \New@OutsideMargin
@@ -438,6 +457,8 @@
\fi
%%
+\NDB{9.21 in novel-CalculateLayout.sty.}
+
%
@@ -463,7 +484,7 @@
\fi
%%
-
+\NDB{9.22 in novel-CalculateLayout.sty.}
% Vertical position of the textblock is measured to the "top" of the first line
% of text. But that could be an X height, or an accented character height,
@@ -498,7 +519,7 @@
\fi
%%
-
+\NDB{9.23 in novel-CalculateLayout.sty.}
%% End layout calculations.
@@ -528,7 +549,7 @@
\fi
% End when Media Size exceeds Trim Size.
-
+\NDB{9.24 in novel-CalculateLayout.sty.}
% When Media Size = Trim Size, cropmarks are disabled.
% Too late for \@cropviewfalse; OK since CropBox already calculated properly.
@@ -548,6 +569,7 @@
\newlength\adj@NewLiveHeight
\setlength\adj@NewLiveHeight{\New@LiveHeight+0.3\normalFontSize}
%
+\NDB{9.25 in novel-CalculateLayout.sty.}
\gdef\@getPageXY{
\check@IsVerso % defined in novel-HeadFootStyles.sty
\if@isVerso
@@ -569,7 +591,7 @@
\setlength\Live@By{\Trim@By+\New@BottomMargin-0.3\normalFontSize}
}
%
-
+\NDB{9.26 in novel-CalculateLayout.sty.}
%% With class option `shademargins' (only effective in draft mode):
@@ -603,6 +625,7 @@
\fi%
\fi % end \if@shademargins
%
+\NDB{9.27 in novel-CalculateLayout.sty.}
% Labels each page with DRAFT at upper left, if in draft mode:
\if@useDraftMode
@@ -611,7 +634,7 @@
}%
\fi
%
-
+\NDB{9.28 in novel-CalculateLayout.sty.}
% Cropmarks (trim marks, really) are not important in this document class.
% That's because the targeted printing services generally do not want them.
@@ -671,6 +694,8 @@
%
%% end cropmarks
+\NDB{9.29 in novel-CalculateLayout.sty.}
+
%%
%% End of file `novel-CalculateLayout.sty'.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
index 17adb6ff2c1..e9801e14573 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty
@@ -13,9 +13,12 @@
%%
%%
\ProvidesFile{novel-ChapterScene.sty}%
-[2017/07/26 v1.32 LaTeX file (chapter and scene macros)]
+[2017/07/31 v1.34 LaTeX file (chapter and scene macros)]
%%
+%% Novel Tracking messages in this file begin with 6.
+\NDB{6.0 in novel-ChapterScene.sty.}
+
% Class `novel' does not use \maketitle.
\gdef\maketitle{%
@@ -24,6 +27,7 @@
You must make your own title pages!^^J}%
}
%
+\NDB{6.1 in novel-ChapterScene.sty.}
%% SCENE CHANGES
@@ -53,6 +57,7 @@
\raisebox{-.3em}{*\quad\quad*\quad\quad*}\hfil\par%
}
%% end scene changes
+\NDB{6.2 in novel-ChapterScene.sty.}
%% Repair \FirstLine{} command from `magaz' package.
@@ -70,7 +75,7 @@
\oldFirstLine{#1}\par\vspace{-\nbs}\strut\par%
}
%%
-
+\NDB{6.3 in novel-ChapterScene.sty.}
%% ChapterStart environment.
@@ -85,6 +90,7 @@
% The argument is the number of normal baselineskips high:
\newenvironment{ChapterStart}[1][10]
{%
+ \NDB{6.4.0 in novel-ChapterScene.sty.}%
\setlength\@oldparindent{\parindent}%
\global\@oldparindent=\@oldparindent%
\setlength\parindent{0pt}%
@@ -96,7 +102,9 @@
\null%
\setcounter{@linequarter}{0}%
\begin{textblock*}{\textwidth}[0,0](0pt,0pt)%
-}{%
+ \NDB{6.4.1 in novel-ChapterScene.sty.}%
+}{% close the environment:
+ \NDB{6.4.3 in novel-ChapterScene.sty.}%
\ifthenelse{%
\equal{\value{@linequarter}}{1} \OR \equal{\value{@linequarter}}{5}%
\OR \equal{\value{@linequarter}}{9} \OR \equal{\value{@linequarter}}{13}%
@@ -115,11 +123,12 @@
\setlength\parindent{\@oldparindent}%
\global\parindent=\parindent%
\nov@AfterGroup\NoIndentAfterThis% etextools and noindentafter
+ \NDB{6.4.4 in novel-ChapterScene.sty.}%
}
%%
\LetLtxMacro\ChapterDisplay\ChapterStart\relax % deprecated
\LetLtxMacro\endChapterDisplay\endChapterStart\relax % deprecated
-
+\NDB{6.5 in novel-ChapterScene.sty.}
%
\newcommand\ChapterTitle[2][c]{% optional alignment l, c, r
\ignorespaces%
@@ -135,6 +144,7 @@
\fi%
{\@csalign\stake\smash{{\chapterfont{}#2}}\par}%
}
+\NDB{6.6 in novel-ChapterScene.sty.}
%
\newcommand\ChapterSubtitle[2][c]{% optional alignment l, c, r
\vspace{0.25\nbs}\addtocounter{@linequarter}{1}
@@ -149,6 +159,7 @@
\fi%
{\@csalign{\stake\smash{\subchfont #2}}\par}%
}
+\NDB{6.7 in novel-ChapterScene.sty.}
% In ChapterDeco, a trick is used. Instead of two optional arguments, and
% instead of using expl3 syntax to create different argument delimiters,
% the arguments for alignment and scale are passed as a single option.
@@ -179,6 +190,7 @@
}
%
%%
+\NDB{6.8 in novel-ChapterScene.sty.}
%% \Epigraph[align,scale,width]{text} OBSOLETE IN CODE VERSION 1.2
@@ -214,6 +226,7 @@
\NoIndentAfterThis%
} % end \QuickChapter
%%
+\NDB{6.9 in novel-ChapterScene.sty.}
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo
index bd0e377f0e8..0101a03b921 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.32
+% Typically used in Europe. Novel file version 1.34
% 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 9b276ca0728..bb079c6c7cc 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty
@@ -13,9 +13,12 @@
%%
%%
\ProvidesFile{novel-FileData.sty}%
-[2017/07/26 v1.32 LaTeX file (File Data settings)]
+[2017/07/31 v1.34 LaTeX file (File Data settings)]
%%
+%% Novel Tracking codes in this file begin with 2.
+\NDB{2.0 in novel-FileData.sty.}
+
%% FILE DATA (see class documentation for technical meaning of this term).
%% -----------------------------------------------------------------------------
@@ -32,6 +35,7 @@
\gdef\thetitle{\@title}
\gdef\theTitle{\@title}
\title{}
+\NDB{2.1 in novel-FileData.sty.}
%
% \author{} or \SetAuthor{}
% Copied to metadata at end of preamble, unless not set or over-ridden.
@@ -43,6 +47,7 @@
\gdef\theauthor{\@author}
\gdef\theAuthor{\@author}
\author{}
+\NDB{2.2 in novel-FileData.sty.}
%
% \subtitle{} or \SetSubtitle{} (if any)
% Not copied to metadata by itself, as there is no such metadata entry.
@@ -54,6 +59,7 @@
\gdef\thesubtitle{\@subtitle}
\gdef\theSubtitle{\@subtitle}
\subtitle{}
+\NDB{2.3 in novel-FileData.sty.}
%
% \SetApplication{} (rarely used)
% Also known as CreatorTool.
@@ -62,6 +68,7 @@
% Normally leave as default, but can change if urgent.
\gdef\SetApplication#1{\gdef\@novelApplication{#1}}
\SetApplication{LaTeX with novel and microtype} % default
+\NDB{2.4 in novel-FileData.sty.}
%
% \SetProducer{} (rarely used)
% Name of the software that compiles to source to make PDF.
@@ -69,6 +76,7 @@
% Normally leave as default, but can change if urgent.
\gdef\SetProducer#1{\gdef\@novelProducer{#1}}
\SetProducer{LuaTeX with novel-pdfx and hyperref} % default
+\NDB{2.5 in novel-FileData.sty.}
%
% Although some other data fields could have been added,
% they do not pertain to fiction, especially if your book is print-on-demand.
@@ -98,18 +106,22 @@
\gdef\@OIregistry{}
\gdef\@OIprofile{}
%
+\NDB{2.6 in novel-FileData.sty.}
%%
\gdef\SetPDFX{\@ifstar\@setpdfxst\@setpdfxns}
\newcommand\@setpdfxst[2][CGATSTR001]{
\global\@noembediccfalse
\@setpdfx{#1}{#2}
}
+\NDB{2.7 in novel-FileData.sty.}
\newcommand\@setpdfxns[2][CGATSTR001]{
\global\@noembedicctrue
\@setpdfx{#1}{#2}
}
+\NDB{2.8 in novel-FileData.sty.}
%
\newcommand\@setpdfx[2]{
+ \NDB{2.9.0 in novel-FileData.sty.}
\ifthenelse{\equal{#2}{off}}{
\global\pdfx@isOFFtrue
\@chosenComplianceOKtrue
@@ -150,6 +162,7 @@
\ClassError{novel}{Bad compliance argument for \string\SetPDFX}%
{Choose: off, X-1a:2001, X-1a:2003, X-3:2002, X-3:2003.^^J}%
\fi
+ \NDB{2.9.1 in novel-FileData.sty.}
%
\ifpdfx@isOFF\else % Output Intent ignored if compliance is `off'.
% Grab the file that defines the output intent information:
@@ -163,6 +176,7 @@
}
\makeatother % back to usual
\fi
+ \NDB{2.9.2 in novel-FileData.sty.}
} % end \@setpdfx
%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
index dadd4e2805c..d8219eaa728 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty
@@ -13,13 +13,17 @@
%%
%%
\ProvidesFile{novel-FontDefaults.sty}%
-[2017/07/26 v1.32 LaTeX file (default fonts)]
+[2017/07/31 v1.34 LaTeX file (default fonts)]
%%
%%
%% This file is loaded \AtEndPreamble.
%%
+
+%% Novel Tracking messages in this file begin with 10.
+\NDB{10.0 in novel-FontDefaults.sty.}
+
%% 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.
@@ -35,6 +39,7 @@
\defaultfontfeatures[\ttfamily]{% monofont has no kerning or common ligatures
SmallCapsFeatures={Renderer=Basic},Ligatures=TeX,%
}%
+\NDB{10.1 in novel-FontDefaults.sty.}
\ifthenelse{\equal{\ttdefault}{lmtt}\OR\equal{\ttdefault}{cmtt}}{% over-ride:
\IfFontExistsTF{Libertinus Mono}{
\setmonofont[%
@@ -50,6 +55,7 @@
}
}
}{} % User \setmonofont, so leave alone.
+\NDB{10.2 in novel-FontDefaults.sty.}
%%
\defaultfontfeatures{} % reset
% Main and sans fonts: kerning, ligatures, and OldStyle numbers if available:
@@ -69,6 +75,7 @@
}
}
}{} % User \setsansfont, so leave alone.
+\NDB{10.3 in novel-FontDefaults.sty.}
%%
% 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,
@@ -103,11 +110,13 @@
}
}
\fi
+\NDB{10.4 in novel-FontDefaults.sty.}
% Now we are ready to set the main font:
\setmainfont[\@parentfontfeatures]{\@parentfontname}
\let\textfont\rmfamily\relax % compatibility
\let\mainfont\rmfamily\relax % compatibility
%
+\NDB{10.5 in novel-FontDefaults.sty.}
%%
\defaultfontfeatures{} % reset
% The novel-specific display fonts use these defaults:
@@ -115,6 +124,7 @@
SmallCapsFeatures={Renderer=Basic},Kerning=On,%
Ligatures=TeX,Ligatures=CommonOff,Numbers=Lining,%
}%
+\NDB{10.6 in novel-FontDefaults.sty.}
%% The novel-specific fonts:
\if@chapterfontset\else
\SetChapterFont[\@parentfontfeatures,Scale=1.6]{\@parentfontname}
@@ -132,6 +142,7 @@
\global\@headfontdefaulttrue
\fi
\newfontfamily\headfont[\@headfontfeatures]{\@headfontname}
+\NDB{10.7 in novel-FontDefaults.sty.}
%%
\defaultfontfeatures{} % reset
\defaultfontfeatures{% for decofont
@@ -143,6 +154,7 @@
\SetDecoFont{NovelDeco}
}{}
\fi
+\NDB{10.8 in novel-FontDefaults.sty.}
%%
\gdef\acronym#1{#1}% Re-defined below, if decofont available.
%%
@@ -190,6 +202,8 @@
%
\fi% end \if@gotdeco
%
+\NDB{10.9 in novel-FontDefaults.sty.}
+%
%%
% Any other fonts will use these defaults:
\defaultfontfeatures{} % reset
@@ -213,8 +227,10 @@
\let\setdefaultlanguage\relax
\let\setotherlanguage\relax
\let\setotherlanguages\relax
+\NDB{10.10 in novel-FontDefaults.sty.}
% Now that the basic fonts are defined, we can load these packages:
\RequirePackage{polyglossia} % Instead of babel.
+\NDB{10.11 in novel-FontDefaults.sty.}
%
\ifthenelse{\equal{\@setmainlang}{}}{
\setmainlanguage{english}
@@ -239,6 +255,7 @@
\setotherlanguages[\@setotherlangsopt]{\@setotherlangs}
}
}
+\NDB{10.12 in novel-FontDefaults.sty.}
%% 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
@@ -257,6 +274,7 @@
%
%%
+\NDB{10.13 in novel-FontDefaults.sty.}
%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
index 7398356ff8f..fb1b42528bc 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty
@@ -13,9 +13,12 @@
%%
%%
\ProvidesFile{novel-Footnotes.sty}%
-[2017/07/26 v1.32 LaTeX file (commands for footnotes and endnotes)]
+[2017/07/31 v1.34 LaTeX file (commands for footnotes and endnotes)]
%%
+%% Novel Tracking codes in this file begin with 8.
+\NDB{8.0 in novel-Footnotes.sty.}
+
%% FOOTNOTES
%% -----------------------------------------------------------------------------
@@ -47,6 +50,7 @@
\gdef\ResetFootnoteSymbol{\setcounter{@fnsymbolcount}{1}} % only symbols
\gdef\Resetendnote{\setcounter{@rnnumbercount}{1}}
%
+\NDB{8.1 in novel-Footnotes.sty.}
\newtoggle{@usenomark} % when true: no mark, no increment count
\newtoggle{@placedfootnotenumber} % true if any numerical footnote placed
%
@@ -59,6 +63,7 @@
}
\let\footnoterule\@fourem
%
+\NDB{8.2 in novel-Footnotes.sty.}
% \@makefnmark applies to the footnote marker in the flow of main text:
@@ -69,6 +74,7 @@
{\forceindent#1}%
{\forceindent\@getbotfnmark\,#1}%
} % end \@makefntext
+\NDB{8.3 in novel-Footnotes.sty.}
% Now re-define \footnote:
\newcommand\footnote[2][]{%
\ifthenelse{\equal{#1}{0}}{%
@@ -84,6 +90,7 @@
\unskip\my@oldfootnote{#2}%
\endgroup%
} % end \footnote
+\NDB{8.4 in novel-Footnotes.sty.}
%
% \@rollfnsymbol prevents running out of symbolic markers:
\gdef\@rollfnsymbol{%
@@ -92,6 +99,7 @@
\setcounter{@fnsymbolcount}{1}%
}{}%
} % end \@rollfnsymbol
+\NDB{8.5 in novel-Footnotes.sty.}
%
% \@getfnmark places a footnote marker in the running text.
% The marker depends upon whether it should be a number or a symbol.
@@ -124,6 +132,7 @@
\sups{\arabic{@fnnumbercount}}%
}%
} % end \@getfnmark
+\NDB{8.6 in novel-Footnotes.sty.}
%
% \@getbotfnmark places the marker in front of the actual footnote,
% towards the bottom of the textblock. It duplicates the marker used in
@@ -161,6 +170,8 @@
%
%% end footnotes
+\NDB{8.7 in novel-Footnotes.sty.}
+
%% ENDNOTES
%% -----------------------------------------------------------------------------
@@ -180,6 +191,7 @@
\stepcounter{@endnotecount}\sups{\arabic{@endnotecount}}%
\long\edef\@endnotelist{\@endnotelist\space (\arabic{@endnotecount},p.\thepage)}%
}
+\NDB{8.8 in novel-Footnotes.sty.}
%%
% \endnotetext{ID}{text} where ID is (usually) the endnote number.
% If ID is other than space or tilde, it prints at left margin, followed by
@@ -195,52 +207,16 @@
}
%% end endnotes
+\NDB{8.9 in novel-Footnotes.sty.}
+
+
+%% See novel.cls for the accompanying AtBeginDocument routine.
+
+%% See novel.cls for the accompanying AtEndDocument routine.
+
+
-%% ATBEGINDOCUMENT
-%% -----------------------------------------------------------------------------
-%%
-\AtBeginDocument{
- \gdef\SetFootnoteMarker#1{%
- \typeout{^^JClass `novel' Alert: %
- \string\SetFootnoteMarker\space ineffective after Preamble.^^J}%
- }
- % Must wait for \nbs to be calculated:
- \setlength\footnotesep{0.8\nbs}
- % Must wait for main font and its size to be active:
- \newlength\@hoaring
- \setlength\@hoaring{\heightof{Ã…}}
- \global\@hoaring=\@hoaring
- \newlength\@twast % tweaks asterisk
- \setlength\@twast{\heightof{*}}
- \addtolength\@twast{-\@hoaring}
- \global\@twast=\@twast
- \newlength\@twdag % tweaks dagger
- \setlength\@twdag{\heightof{†}}
- \addtolength\@twdag{-0.2\@twdag}
- \addtolength\@twdag{-\@hoaring}
- \global\@twdag=\@twdag
- \newlength\@twdbldag % tweaks double dagger
- \setlength\@twdbldag{\heightof{‡}}
- \addtolength\@twdbldag{-0.2\@twdbldag}
- \addtolength\@twdbldag{-\@hoaring}
- \global\@twdbldag=\@twdbldag
- \newlength\@twsect % tweaks section mark
- \setlength\@twsect{\heightof{§}}
- \addtolength\@twsect{-0.2\@twsect}
- \addtolength\@twsect{-\@hoaring}
- \global\@twsect=\@twsect
- \newlength\@tweight % tweaks 8, reliably the tallest digit
- \setlength\@tweight{\heightof{8}}%
- \addtolength\@tweight{-0.2\@tweight}%
- \addtolength\@tweight{-\@hoaring}%
- \global\@tweight=\@tweight%
- % Must wait to see how \SetFootnoteMarker was used:
- \ifthenelse{\equal{\@myfnsymbols}{*}}{\setcounter{@maxfnsymbol}{8}}{}
- \ifthenelse{\equal{\@myfnsymbols}{†}}{\setcounter{@maxfnsymbol}{6}}{}
- %
-} % end \AtBeginDocument
-%%
%% ATENDDOCUMENT
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
index 19492dc93fc..851efc97ce6 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty
@@ -13,9 +13,12 @@
%%
%%
\ProvidesFile{novel-HeadFootStyles.sty}%
-[2017/07/26 v1.32 LaTeX file (header and footer styles)]
+[2017/07/31 v1.34 LaTeX file (header and footer styles)]
%%
+%% Novel Tracking messages in this file begin with 5.
+\NDB{5.0 in novel-HeadFootStyles.sty.}
+
%% File `novel-LayoutSettings.sty' reserved space for header/footer,
%% but did not place anything there. In this file, `fancyhdr' syntax
@@ -39,6 +42,7 @@
%
\newtoggle{@inheadfoot} % true in header or footer
%%
+\NDB{5.1 in novel-HeadFootStyles.sty.}
%% INITIALIZE FANCYHDR
@@ -50,14 +54,15 @@
\renewcommand\footrulewidth{0pt}
\fancyhead[LO,RE,LE,RO,CE,CO]{}
\fancyfoot[LO,RE,LE,RO,CE,CO]{}
-% \SetLooseHead looseness factor (microtype) 0=tight, 50=default
+% \SetLooseHead looseness factor (fontspec LetterSpace) 0=tight, 50=default
\gdef\SetLooseHead#1{
\gdef\@@loosehead{#1}
\FPdiv{\@loosehead}{\@@loosehead}{10} % change in method of using fontspec with microtype
\FPmin{\@looseheadnum}{\@loosehead}{50} % Don't want numbers too loose.
}
+\NDB{5.2 in novel-HeadFootStyles.sty.}
\SetLooseHead{50}
-
+\NDB{5.3 in novel-HeadFootStyles.sty.}
% Create flags to know if \fancyhead and \fancyfoot have been defined by user,
% somewhere in the Preamble. If not, then pre-defined styles based on trimsize
% will be applied \AtEndPreamble.
@@ -67,6 +72,7 @@
\@tempFancyhead[#1]{\toggletrue{@inheadfoot}{\normalsize#2}}%
}
%
+\NDB{5.4 in novel-HeadFootStyles.sty.}
\LetLtxMacro{\@tempFancyfoot}{\fancyfoot}
\renewcommand\fancyfoot[2][]{%
\@styledFootertrue%
@@ -78,12 +84,15 @@
}%
}
%
+\NDB{5.5 in novel-HeadFootStyles.sty.}
\LetLtxMacro{\@myTempTPS}{\thispagestyle}
% Re-define \thispagestyle based on layout. When style requests only the page
% number, decide what to do based on this command and whether footer is used:
\newif \if@thispagestyleset \@thispagestylesetfalse
-\AtBeginShipout{\global\@thispagestylesetfalse}
%
+%% See AtBeginShipout routine in novel.cls.
+%
+\NDB{5.6 in novel-HeadFootStyles.sty.}
\gdef\thispagestyle#1{%
\global\@thispagestylesettrue%
\gdef\@pagestyleOK{false}%
@@ -101,6 +110,7 @@
\else \@myTempTPS{empty}%
\fi%
}{}%
+ \NDB{5.6.1 in novel-HeadFootStyles.sty.}%
\ifthenelse{\equal{#1}{forcenumber}}{%
\gdef\@pagestyleOK{true}%
\if@gotFooter \@myTempTPS{fancyplain}%
@@ -108,6 +118,7 @@
\fi%
}{}%
%
+ \NDB{5.6.2 in novel-HeadFootStyles.sty.}%
\ifthenelse{\equal{#1}{dropfolioinside}% after \clearpage
\OR \equal{#1}{dropfolio} \OR \equal{#1}{dropfoliolater}}{% compatibility
\gdef\@pagestyleOK{true}%
@@ -119,6 +130,7 @@
\@dropfolioinside
\fi%
}{}%
+ \NDB{5.6.3 in novel-HeadFootStyles.sty.}%
% With `dropfoliobeneath` only a footer is used, if present. If no footer,
% then the styled page number is centered at one baselineskip beneath the
% ordinary bottom of the textblock. Thus, the number intrudes into the
@@ -134,30 +146,34 @@
\@dropfoliobeneath
\fi%
}{}%
+ \NDB{5.6.4 in novel-HeadFootStyles.sty.}%
%%
\ifthenelse{\equal{\@pagestyleOK}{true}}{}{%
\ClassWarning{novel}{^^JPage \pagenumberstyle\space has %
\string\thispagestyle{}^^J%
but its argument is not defined. Default substituted. Better fix that.^^J}%
}%
+ \NDB{5.6.5 in novel-HeadFootStyles.sty.}%
}
%
%% End initialize fancyhdr.
-%% ACTIVATE HEADER/FOOTER STYLES AT BEGIN DOCUMENT
+%% See AtBeginDocument routine in novel.cls:
%% -----------------------------------------------------------------------------
-%
-\gdef\@activateHeadFootStyles{ % called \AtBeginDocument by novel.cls
+\NDB{5.7 in novel-HeadFootStyles.sty.}
+\gdef\@activateHeadFootStyles{ % called AtBeginDocument by novel.cls
% Pre-configured header/footer styles, unless user over-rode them:
% \versoheadtext is initialized to \theauthor
% \rectoheadtext is initialized to \thetitle
+ \NDB{5.7.1 in novel-HeadFootStyles.sty.}%
\@ifundefined{versoheadtext}{
\NewVersoHeadText{\smcp{\StrSubstitute{\theauthor}{\space}{ \,}}}
}{}
\@ifundefined{rectoheadtext}{
\NewRectoHeadText{\smcp{\StrSubstitute{\thetitle}{\space}{ \,}}}
}{}
+ \NDB{5.7.2 in novel-HeadFootStyles.sty.}%
%
% ----------------------------------------------------------------------------
% IF YOU ARE WRITING YOUR OWN HEADER/FOOTER STYLE:
@@ -235,7 +251,7 @@
\fi
}{}
%
-
+ \NDB{5.7.1 in novel-HeadFootStyles.sty.}%
%
% END PRE-DEFINED STYLES.
% ----------------------------------------------------------------------------
@@ -268,6 +284,7 @@
%
%% end initialize fancyhdr
+\NDB{5.8 in novel-HeadFootStyles.sty.}
%% DROPFOLIO
%% -----------------------------------------------------------------------------
@@ -287,12 +304,14 @@
\setlength\temp@pgnumraise{%
\New@BottomMargin+0.5\New@MediaHeight-0.5\New@TrimHeight}%
\fi%
+ \NDB{5.8.1 in novel-HeadFootStyles.sty.}%
\check@IsVerso%
\if@isVerso%
\AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{%
\hspace{\dimexpr\Trim@Lx+\New@OutsideMargin+0.5\textwidth-0.5\temp@pgnumwidth}\raisebox{%
\temp@pgnumraise}{{\headfont{\addfontfeature{LetterSpace=\@looseheadnum}\pagenumberstyle}}}}}%
\else%
+ \NDB{5.8.2 in novel-HeadFootStyles.sty.}%
\AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{%
\hspace{\dimexpr\Trim@Lx+\New@InsideMargin-0.5\temp@pgnumwidth}%
\charscale[1,0.5\textwidth,\temp@pgnumraise]{%
@@ -302,6 +321,7 @@
%
\let\dropfolionow\relax % compatibility with earlier version.
%
+\NDB{5.9 in novel-HeadFootStyles.sty.}
% \@dropfoliobeneath does not change the textblock height. The styled page
% number is centered where an extra line would be, within the bottom margin.
@@ -315,12 +335,14 @@
\setlength\temp@pgnumraise{%
\New@BottomMargin-\nbs+0.5\New@MediaHeight-0.5\New@TrimHeight}%
\fi%
+ \NDB{5.9.1 in novel-HeadFootStyles.sty.}%
\check@IsVerso%
\if@isVerso%
\AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{%
\hspace{\dimexpr\Trim@Lx+\New@OutsideMargin-0.5\temp@pgnumwidth}\raisebox{%
\temp@pgnumraise}{{\headfont{\addfontfeature{LetterSpace=\@looseheadnum}\pagenumberstyle}}}}}%
\else%
+ \NDB{5.9.2 in novel-HeadFootStyles.sty.}%
\AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{%
\hspace{\dimexpr\Trim@Lx+\New@InsideMargin-0.5\temp@pgnumwidth}%
\charscale[1,0.5\textwidth,\temp@pgnumraise]{%
@@ -330,6 +352,8 @@
%%
%
+\NDB{5.10 in novel-HeadFootStyles.sty.}
+
% Content of header text (if present) can be changed at any time within
% the body, using the following commands. If not used, then
% Verso is initialized to \theauthor and Recto is initialized to \thetitle
@@ -347,6 +371,7 @@
\let\SetVersoHeadText\NewVersoHeadText\relax % for convenience
\let\RenewVersoHeadText\NewVersoHeadText\relax % for convenience
%
+\NDB{5.11 in novel-HeadFootStyles.sty.}
\gdef\NewRectoHeadText#1{
\FPdiv{\@myk}{\@loosehead}{500}
\setlength\@mykem{\@myk em}
@@ -354,6 +379,7 @@
}
\let\SetRectoHeadText\NewRectoHeadText\relax % for convenience
\let\RenewRectoHeadText\NewRectoHeadText\relax % for convenience
+\NDB{5.12 in novel-HeadFootStyles.sty.}
%
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
index 338cbcebcd0..e5c1ccb076c 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty
@@ -13,9 +13,11 @@
%%
%%
\ProvidesFile{novel-Images.sty}%
-[2017/07/26 v1.32 LaTeX file (image placement)]
+[2017/07/31 v1.34 LaTeX file (image placement)]
%%
+%% Novel Tracking messages in this file begin with 7.
+\NDB{7.0 in novel-Images.sty.}
%%
%% Be sure to read the separate documentation about how to prepare images.
@@ -79,6 +81,7 @@
{The `novel' class has its own commands for placing images. See docs.^^J%
You cannot use the \string\includegraphics\space command.}%
}
+\NDB{7.1 in novel-Images.sty.}
%
% \InlineImage can be used in body, header, footer.
% However, macros such as \imagefilename, \imagewidth, etc.
@@ -111,6 +114,7 @@
\ifthenelse{\equal{\@myilya}{} \OR \equal{\@myilya}{0}}{%
\def\@myily{0pt}}{\def\@myily{\@myilya}%
}%
+ \NDB{7.1.1 in novel-Images.sty.}%
\iftoggle{@inheadfoot}{}{\gdef\imagefilename{#3}}% for possible later use
\gdef\my@graphic{\@includegraphics[draft=false]{#3}}%
\setlength\@imagewidth{\widthof{\my@graphic}}%
@@ -118,12 +122,14 @@
\iftoggle{@inheadfoot}{}{\setlength\imagewidth{\@imagewidth}}%
\setlength\@imageheight{\heightof{\my@graphic}}%
\global\@imageheight=\@imageheight%
+ \NDB{7.1.2 in novel-Images.sty.}%
\iftoggle{@inheadfoot}{}{%
\setlength\imageheight{\@imageheight}%
\global\imageheight=\imageheight%
\typeout{^^JClass~`novel'~Info:~An~image~was~placed~on~page~\thepage.^^J%
Review~layout~to~ensure~that~it~does~not~overflow~into~margins.^^J}%
}%
+ \NDB{7.1.3 in novel-Images.sty.}%
%
\setlength\@imagehoffset{\@myilx}%
\IfBeginWith{\@myily}{b}{%
@@ -136,6 +142,7 @@
\setlength\@imagevoffset{-\@imageheight}%
\addtolength\@imagevoffset{\@myily}%
}%
+ \NDB{7.1.4 in novel-Images.sty.}%
%
\IfBooleanTF{#1}%
% starred:
@@ -147,6 +154,7 @@
}%
}%
% unstarred:
+ \NDB{7.1.5 in novel-Images.sty.}%
{%
\iftoggle{@inheadfoot}{}{\gdef\imagestarred{false}}%
\hspace{\@imagehoffset}%
@@ -159,6 +167,7 @@
%
%%
+\NDB{7.2 in novel-Images.sty.}
%% \BlockImage[alignment]{image}[text]
@@ -196,6 +205,7 @@
\ifthenelse{\equal{\@myyt}{}\OR\equal{\@myyt}{0}}{%
\def\@myy{0pt}}{\def\@myy{\@myyt}%
}
+ \NDB{7.2.1 in novel-Images.sty.}%
\newdimen\@sbsheight
\ifthenelse{\equal{\@myalign}{c}\OR\equal{\@myalign}{}}{%
{\centering\strut\InlineImage*[{\@myx-0.5\imagewidth},{\@myy}]{#2}\par}
@@ -203,6 +213,7 @@
{\centering\strut #3\par}
\setbox0=\vbox{{\centering #3\par}}
}{}
+ \NDB{7.2.2 in novel-Images.sty.}%
\ifthenelse{\equal{\@myalign}{r}}{%
\noindent\InlineImage*[{\textwidth-\imagewidth+\@myx},{\@myy}]{#2}\par%
\vspace{-\nbs}
@@ -215,6 +226,7 @@
\end{adjustwidth}%
}%
}{}
+ \NDB{7.2.3 in novel-Images.sty.}%
\ifthenelse{\equal{\@myalign}{l}}{%
\noindent\InlineImage*[{\@myx},{\@myy}]{#2}\par%
\vspace{-\nbs}
@@ -227,7 +239,8 @@
\end{adjustwidth}%
}%
}{}
- % portion here, inspired by post from user Killian Foth,
+ \NDB{7.2.4 in novel-Images.sty.}%
+ % portion here, inspired by post from user Killian Foth,
% at stackoverflow.com, license CC-by-sa-3.0.
\@sbsheight=\ht0 \advance\@sbsheight by \dp0
\def\@sbsheightnum{\strip@pt\@sbsheight}
@@ -250,7 +263,7 @@
\ExplSyntaxOff
%%
-
+\NDB{7.3 in novel-Images.sty.}
% Returns 1 for monochrome, 8 for grayscale (or rgb). EXPERIMENTAL.
@@ -264,7 +277,7 @@
}%
}
%
-
+\NDB{7.4 in novel-Images.sty.}
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo
index 9ac498ceb00..a6dbf7ad286 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.32
+% Typically used in Japan. Novel file version 1.34
% 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 51b3f14c185..9fcb85aef6c 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty
@@ -13,9 +13,11 @@
%%
%%
\ProvidesFile{novel-LayoutSettings.sty}%
-[2017/07/26 v1.32 LaTeX file (layout settings)]
+[2017/07/31 v1.34 LaTeX file (layout settings)]
%%
+% Novel Tracking codes in this file begin with 3.
+\NDB{3.0 in novel-LayoutSettings.sty.}
%% 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.
@@ -54,6 +56,7 @@
\newlength\normalxheight
\newlength\normalXheight
%%
+\NDB{3.1 in novel-LayoutSettings.sty.}
%% SIZE-RELATED COMMANDS AVAILABLE IN PREAMBLE.
@@ -69,6 +72,7 @@
%
% \SetTrimSize{}{} width and height of printed book.
\newcommand\SetTrimSize[2]{%
+ \NDB{3.2.0 in novel-LayoutSettings.sty.}
\global\@TrimSizeSettrue
\ifthenelse{\dimtest{#1}{<}{2.99in}}{
\ClassError{novel}{Unacceptably small Trim Width}%
@@ -87,6 +91,7 @@
{\string\SetTrimSize\space cannot follow \string\ReworkTrimSize^^J%
and cannot follow \string\ReworkMargins.}%
\fi
+ \NDB{3.2.1 in novel-LayoutSettings.sty.}
\setlength\Old@TrimWidth{#1}%
\setlength\Old@TrimHeight{#2}%
\setlength\New@TrimWidth{#1}%
@@ -97,10 +102,12 @@
\setlength\New@MediaWidth{#1}%
\setlength\New@MediaHeight{#2}%
\fi
+ \NDB{3.2.3 in novel-LayoutSettings.sty.}
}
%
% Retroactively change Trim Size after layout. See documentation:
\newcommand\ReworkTrimSize[2]{%
+ \NDB{3.4.0 in novel-LayoutSettings.sty.}
\if@coverart % New in version 1.2
\ClassError{novel}{Rework command cannot be used with coverart option}%
{Instead of reworking document size, you must re-do the artwork.}
@@ -115,6 +122,7 @@
Carefully review your PDF to ensure that line breaks, paragraphs,^^J%
and page breaks are where you expect them to be.^^J}%
\fi
+ \NDB{3.4.1 in novel-LayoutSettings.sty.}
}
% Margins at top and bottom are relative to:
% top of header, or top of textblock if no header;
@@ -122,6 +130,7 @@
% Inside margin generally greater than outside, due to gutter.
% Standard margins command ("TOBI, or not TOBI, that is the question."):
\newcommand\SetMargins[4]{ % top, outside, bottom, inside
+ \NDB{3.5.0 in novel-LayoutSettings.sty.}
\global\@MarginsSettrue
\if@ReworkMarginsSet
\ClassError{novel}{^^JCannot set Margins after reworking them}%
@@ -135,9 +144,11 @@
\setlength\New@BottomMargin{#3}
\setlength\Old@InsideMargin{#4}
\setlength\New@InsideMargin{#4}
+ \NDB{3.5.1 in novel-LayoutSettings.sty.}
}
% Retroactively change margins after layout. See documentation:
\newcommand\ReworkMargins[4]{
+ \NDB{3.6.0 in novel-LayoutSettings.sty.}
\if@coverart % New in version 1.2
\ClassError{novel}{Rework command cannot be used with coverart option}%
{Instead of reworking document size, you must re-do the artwork.}
@@ -152,6 +163,7 @@
Carefully review your PDF to ensure that line breaks, paragraphs,^^J%
and page breaks are where you expect them to be.^^J}%
\fi
+ \NDB{3.6.1 in novel-LayoutSettings.sty.}
}
% \SetMediaSize[]{}{} such as {8.5in}{11in}.
% This command is only used when the Trim Size must be placed in a larger
@@ -164,6 +176,7 @@
%
\newif \if@offcenterTrim \@offcenterTrimfalse
\newcommand\SetMediaSize[3][center]{ % [alignment] width, height
+ \NDB{3.7.0 in novel-LayoutSettings.sty.}
\ifthenelse{\equal{#1}{center} \OR \equal{#1}{edge}}{
\global\@MediaSizeSettrue
\setlength\Old@MediaWidth{#2}
@@ -177,6 +190,7 @@
\if@coverart\else % new in version 1.2
\ifthenelse{\equal{#1}{edge}}{\global\@offcenterTrimtrue}{}
\fi
+ \NDB{3.7.1 in novel-LayoutSettings.sty.}
}
% \SetLinesPerPage{} limited due to fontsize and Trim Size constraints.
% There is no `rework' command, because as long as the number of lines fit,
@@ -185,6 +199,7 @@
% 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]{
+ \NDB{3.8.0 in novel-LayoutSettings.sty.}
\global\@LinesPerPageSettrue
\FPiflt{#1}{1}%
\ClassError{novel}{\string\SetLinesPerPage\ must be at least 1}%
@@ -192,6 +207,7 @@
\else\fi %
\FPround{\temp@IntegerLines}{#1}{0}
\def\my@LinesPerPage{\temp@IntegerLines}
+ \NDB{3.8.1 in novel-LayoutSettings.sty.}
}
% \SetFontSize{} may be in any units, even decimals: 12.2pt, 11.5bp, etc.
% When packages load, the font size is temporarily set to 11pt at 15pt skip,
@@ -199,8 +215,10 @@
% Then the size is changed to its actual value based on this command, or on
% the defaults for Trim Size, or on the effects of \Rework.
\newcommand\SetFontSize[1]{
+ \NDB{3.9.0 in novel-LayoutSettings.sty.}
\global\@FontSizeSettrue
\global\setlength\Old@FontSize{#1}
+ \NDB{3.9.1 in novel-LayoutSettings.sty.}
}
%
%% End size-related commands available in Preamble.
@@ -228,6 +246,7 @@
\SetHeadJump{1.5} % default
\gdef\SetFootJump#1{\gdef\@footjump{#1}}
\SetFootJump{1.5} % default
+\NDB{3.10 in novel-LayoutSettings.sty.}
% New in version 1.2, coverart.
\if@coverart % cover art has no header or footer
\gdef\SetHeadFootStyle#1{\gdef\my@HeadFootStyle{0}}
@@ -238,19 +257,20 @@
\gdef\SetHeadFootStyle#1{\gdef\my@HeadFootStyle{#1}}
\gdef\SetHeadStyle#1{\gdef\my@HeadFootStyle{#1}} % deprecated
\fi
+\NDB{3.11 in novel-LayoutSettings.sty.}
% See docs part 7 for what these emblems do, if used:
\newcommand\SetEmblems[2]{ % verso, recto
\gdef\my@VersoEmblem{{\headfont #1}}
\gdef\my@RectoEmblem{{\headfont #2}}
}
+\NDB{3.12 in novel-LayoutSettings.sty.}
\let\SetEmblem\SetEmblems% for convenience
% If you want something fancier than \thepage:
\gdef\SetPageNumberStyle#1{\gdef\pagenumberstyle{#1}}
-\AtBeginDocument{
- \ifcsname pagenumberstyle\endcsname\else
- \SetPageNumberStyle{\thepage}
- \fi
-}
+
+% See novel.cls for the accompanying AtBeginDocument routine.
+
+\NDB{3.13 in novel-LayoutSettings.sty.}
%
\newif \if@gotHeader
\newif \if@gotFooter
@@ -259,6 +279,7 @@
\newif \if@validHF
%
\gdef\@reserveHFspace{ % used for layout calculations
+ \NDB{3.14.1 in novel-LayoutSettings.sty.}
\ifthenelse{\equal{\my@HeadFootStyle}{0}}{
\@gotHeaderfalse\@gotFooterfalse\@validHFtrue
}{}
@@ -286,51 +307,22 @@
{\string\SetHeadFootStyle\space needs choice of 0,1,2,3,4,5,6,^^J%
even if you wish to customize using fancyhdr syntax.^^J}%
\fi
+ \NDB{3.14.2 in novel-LayoutSettings.sty.}
} % end \@reserveHFspace
% Each new chapter generally has its own header/footer style. This allows a
% default setting when chapters begin with ChapterStart environment:
\gdef\SetChapterStart#1{\gdef\@setchapterstart{#1}}
\SetChapterStart{footer} % default
-\AtBeginDocument{% check if user wrote good command or not
- \def\@setchapterstartOK{false}%
- \ifthenelse{\equal{\@setchapterstart}{empty}}{%
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstart}{plain}}{%
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstart}{footer}}{%
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstart}{fancyplain}}{%
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstart}{fancy}}{%
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstart}{forcenumber}}{%
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstart}{dropfolio}}{% no footnote there
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstart}{dropfoliolater}}{% footnote(s) there
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstart}{foliobeneath}}{%
- \def\@setchapterstartOK{true}%
- }{}%
- \ifthenelse{\equal{\@setchapterstartOK}{true}}{}{%
- \ClassError{novel}{\string\SetChapterStart\space bad argument}%
- {\string\SetChapterStart\space only allows certain choices.^^J}%
- }%
-}
+\NDB{3.15 in novel-LayoutSettings.sty.}
+%
+% See novel.cls for the accompanying AtBeginDocument routine.
%
%% End reserve space for header/footer and set default ChapterStart
%% New in version 1.2: cover image.
\newcommand\SetCoverImage[1]{
+ \NDB{3.17.0 in novel-LayoutSettings.sty.}
\def\coverimageok{false}
\IfSubStr{#1}{jpg}{\def\coverimageok{true}}{}
\IfSubStr{#1}{jpeg}{\def\coverimageok{true}}{}
@@ -342,6 +334,7 @@
\ClassError{novel}{Cover image has wrong file extension}%
{Cover image must be jpg, JPG, jpeg, or JPEG.}
}%
+ \NDB{3.17.1 in novel-LayoutSettings.sty.}
}
%%
@@ -358,6 +351,7 @@
% dagger, dbldagger, and section (when used as footnote markers)
% are always partially faked.
\newcommand\SetMarkerStyle[2][real]{
+ \NDB{3.18.0 in novel-LayoutSettings.sty.}
\def\@goodfnm{no}
\ifthenelse{\equal{#2}{asterisk}}{%
\def\@goodfnm{yes}\global\toggletrue{@usesymbolmark}%
@@ -376,6 +370,7 @@
\ClassError{novel}{Bad choice for \string\SetMarkers}%
{Optional: real, fake. Required: asterisk, dagger, number.}%
}{}
+ \NDB{3.18.1 in novel-LayoutSettings.sty.}
}
%
\SetMarkerStyle[real]{asterisk} % default
@@ -394,6 +389,8 @@
\SetCropmarkGap{0.125in} % default
%%
+\NDB{3.19 in novel-LayoutSettings.sty.}
+
%% Fake \microtypesetup until package is loaded later:
\newif \if@setmicrotype
@@ -403,7 +400,7 @@
}
%%
-
+\NDB{3.20 in novel-LayoutSettings.sty.}
%% MISCELLANOUS SETTINGS. Mostly remove "glue". Best to leave as-is.
@@ -467,12 +464,14 @@
%
%% End miscellaneous settings.
+\NDB{3.21 in novel-LayoutSettings.sty.}
% 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{%
+ \NDB{3.22.0 in novel-LayoutSettings.sty.}
\def\@featuresareok{yes}
\IfSubStr{#1}{Color}{\def\@featuresareok{no}}{}%
\IfSubStr{#1}{Colour}{\def\@featuresareok{no}}{}%
@@ -485,6 +484,7 @@
{You defined a font, or added a font feature, with Color or Opacity.^^J%
That is disallowed in `novel' class.}%
}
+ \NDB{3.22.1 in novel-LayoutSettings.sty.}
}
%%
@@ -520,6 +520,7 @@
\newif \if@parentfontset
\gdef\@parentfontfeatures{}
\gdef\@parentfontname{}
+\NDB{3.23 in novel-LayoutSettings.sty.}
\DeclareDocumentCommand \SetParentFont { O{} m O{} } {% from version 1.1.
\novel@checkfeatures{#1,#3}
\gdef\@parentfontfeatures{#1,#3}
@@ -532,6 +533,7 @@
\gdef\@parentfontname{#2}
\global\@parentfontsettrue
}%
+\NDB{3.24 in novel-LayoutSettings.sty.}
%% Store settings for the chapterfont:
% The chapter font is used by the \ChapterTitle{} command.
\newif \if@chapterfontset
@@ -580,6 +582,7 @@
\global\@gotdecotrue
\newfontface\decofont[#1,#3]{#2}
}%
+\NDB{3.25 in novel-LayoutSettings.sty.}
%
\msg_set:nnnn {fontspec} {font-not-found} { % rewrites the standard message
Font~ "#1"~ cannot~ be~ found.
@@ -589,6 +592,7 @@
If~the~missing~font~is~anything~else,~then~the~missing~font~is\\
not~caused~by~`novel'~class.\\
}%
+\NDB{3.26 in novel-LayoutSettings.sty.}
%% For syntax consistency:
\cs_new_eq:NN \NewFontFamily \newfontfamily
\cs_new_eq:NN \NewFontFace \newfontface
@@ -598,6 +602,7 @@
\cs_new_eq:NN \AddFontFeatures \addfontfeatures
\cs_new_eq:NN \AddFontFeature \addfontfeatures
%%
+\NDB{3.27 in novel-LayoutSettings.sty.}
%% \CreateFontFeature{substitutions}{feature code}
% 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.
@@ -639,7 +644,7 @@
%%
%% end definition of parent and other fonts.
-
+\NDB{3.29 in novel-LayoutSettings.sty.}
%% FAKE POLYGLOSSIA COMMANDS
%% --------------------------------------------------------------------------
@@ -675,7 +680,7 @@
%
%% end fake polyglossia commands.
-
+\NDB{3.30 in novel-LayoutSettings.sty.}
%% FRONTMATTER, MAINMATTER, BACKMATTER
%% --------------------------------------------------------------------------
@@ -685,8 +690,10 @@
\newif \ifWithinBackmatter \WithinBackmatterfalse
\newcounter{frontmatterpages}
\newcounter{runningpages}
-\AtBeginShipout{\stepcounter{runningpages}}
%
+% See novel.cls for the AtBeginShipout routine.
+%
+\NDB{3.32 in novel-LayoutSettings.sty.}
\def\frontmatter{ % starts page count and frontmatter count at 1.
\ifWithinFrontmatter
\ClassError{novel}{\string\frontmatter\ used more than once}%
@@ -708,6 +715,7 @@
\setcounter{page}{1}
\setcounter{frontmatterpages}{1}
}
+\NDB{3.33 in novel-LayoutSettings.sty.}
%
\def\mainmatter{ % restarts page to 1, arabic numbers; freeze frontpagecount
\ifWithinMainmatter
@@ -725,6 +733,7 @@
\pagenumbering{arabic}
\setcounter{page}{1}
}
+\NDB{3.34 in novel-LayoutSettings.sty.}
%
\def\backmatter{\@ifstar\@backmatterst\@backmatterns}
%
@@ -760,6 +769,7 @@
\fi
\WithinFrontmatterfalse\WithinMainmatterfalse\WithinBackmattertrue
}
+\NDB{3.35 in novel-LayoutSettings.sty.}
%
\def\Backmatter{\@ifstar\@Backmatterst\@Backmatterns}
%
@@ -799,7 +809,7 @@
}
%
%% end frontmatter, mainmatter, backmatter.
-
+\NDB{3.36 in novel-LayoutSettings.sty.}
%% DISABLE OR NEUTRALIZE SOME STANDARD LATEX COMMANDS
@@ -845,7 +855,7 @@
\long\gdef\listoffigures\@nodocommand{listoffigures}
%
%% end disable or neutralize.
-
+\NDB{3.37 in novel-LayoutSettings.sty.}
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
index 48d2e30772c..3bea7af88dd 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
+++ b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty
@@ -13,9 +13,11 @@
%%
%%
\ProvidesFile{novel-TextMacros.sty}%
-[2017/07/26 v1.32 LaTeX file (text macros usable within document body)]
+[2017/07/31 v1.34 LaTeX file (text macros usable within document body)]
%%
+%% Novel Tracking messages in this file begin with 4.
+\NDB{4.0 in novel-TextMacros.sty.}
%% This file contains commands that are usable within the document body,
%% for styling and otherwise manipulating text.
@@ -121,7 +123,7 @@
% \part{}, \chapter{}, \section{}, \subsection{}, \subsubsection{}, \paragraph{}, \subparagraph{}
%
%% Certain commands will generate an error, so that you know they cannot be used:
-% \maketitle, \makeindex, \tableofcontents, \listoftables, \listoffigures
+% \maketitle, \makeindex, \tableofcontents, \listoftables, \listoffigures, \textls
%
%% You cannot use \includepdf (package: pdfpages).
%
@@ -139,18 +141,17 @@
% Useful when you wish to put a note to yourself in the *.tex document.
% Not the same as % comment, because anything after the braces will print.
\long\gdef\memo#1{}
+\NDB{4.1 in novel-TextMacros.sty.}
%
\gdef\stake{\rule{0pt}{1pt}} % placeholder
%
% \forceindent and \backindent perform or remove indent, using \hspace{}.
% Rationale: Sometimes \indent and \noindent are neutralized by another command.
\newlength\forceparlength % holds default value, even when \parindent changed
-\AtBeginDocument{
- \setlength\forceparlength{\parindent}
- \global\forceparlength=\forceparlength
- \gdef\forceindent{\ifvmode\else\unskip\fi\stake\hspace{\forceparlength}}
- \gdef\backindent{\ifvmode\else\unskip\fi\hspace{-\forceparlength}}
-}
+\NDB{4.2 in novel-TextMacros.sty.}
+
+% See novel.cls for accompanying AtBeginDocument routine.
+
%%
% \smcp{} and \textsc{} small caps (Open Type) and \allsmcp{}:
%
@@ -171,6 +172,7 @@
}
%
\ExplSyntaxOff
+\NDB{4.4 in novel-TextMacros.sty.}
%
\let\textsc\smcp\relax % unified
\let\oldscshape\scshape\relax % in case needed later
@@ -188,6 +190,7 @@
%% Just in case `xcolor' re-defines its internals, to prevent code bomb:
\ProvideDocumentCommand\@declaredcolor { m } {}
\ProvideDocumentCommand\@undeclaredcolor { o m } {}
+\NDB{4.5 in novel-TextMacros.sty.}
%%
\if@graytext % and the usual colors, including black and white.
\definecolor[named]{gray1}{gray}{0.15} % ten percent gray, etc.
@@ -208,6 +211,7 @@
\ifthenelse{\equal{#2}{hingledingle}}{\@declaredcolor{white}}{}% hingledingle is internal alias for white
}
\fi
+\NDB{4.6 in novel-TextMacros.sty.}
%%
@@ -229,7 +233,7 @@
\expandafter\aftergroup\csname nov@ettl@fterGroup\the\nov@ettl@fter\endcsname%
}
% End code from `etextools`.
-
+\NDB{4.7 in novel-TextMacros.sty.}
@@ -247,6 +251,7 @@
#2%
\fi%
}
+\NDB{4.8 in novel-TextMacros.sty.}
%% \bigemdash inspired by code by RTBarnard at stackoverflow.com, CC-by-sa-3.0:
% Allows a rule of variable length to fill available space at its right.
% There must be a "right-hand limit" imposed by something, such as by enclosing
@@ -272,7 +277,7 @@
{\leaders\hbox{\rule[\@myraise ex]{1pt}{\@mythick em}}\hfill\stake}%
}
%%
-
+\NDB{4.9 in novel-TextMacros.sty.}
%%
% \charscale[scale,x,y]{text} and starred version
@@ -320,7 +325,7 @@
}
\ExplSyntaxOff
%%
-
+\NDB{4.10 in novel-TextMacros.sty.}
@@ -352,6 +357,7 @@
\FPround{\my@tempDetailsSkipNum}{\my@tempDetailsSkipNum}{2}%
\fontsize{\my@tempDetailsFontNum pt}{\my@tempDetailsSkipNum pt}\selectfont}%
{\endgroup}
+\NDB{4.11 in novel-TextMacros.sty.}
%
%%
% Environment toc (alternative table of contents):
@@ -370,6 +376,7 @@
}{%
\endgroup\end{adjustwidth}\par%
}%
+\NDB{4.12 in novel-TextMacros.sty.}
%% \tocitem[number]{description}{page} provides a one-line table entry in toc.
% optional number might be chapter number. Can use ~ to offset.
% unstarred: distance between description and page is not decorated.
@@ -387,6 +394,7 @@
\dotfill%
\,#3\par\vspace{\@tocskip}%
}%
+\NDB{4.13 in novel-TextMacros.sty.}
%
\newcommand\@tocitemns[3][]{%
\ifthenelse{\equal{#1}{}}{}{%
@@ -400,6 +408,7 @@
\hfill%
#3\par\vspace{\@tocskip}%
}%
+\NDB{4.14 in novel-TextMacros.sty.}
%% end toc and \tocitem.
%%
%% legalese environment. Certain info, such as Copyright page, customarily is
@@ -418,6 +427,7 @@
\setlength\@temphangl{\widthof{#1}}%
\stake\hspace{-\@temphangl}#1%
}
+\NDB{4.15 in novel-TextMacros.sty.}
%%
% \showlength[decimal places]{length}{units}
% Returns the length as a string with the units, but does not change the length.
@@ -445,6 +455,7 @@
\temp@lengthnum#3%
}
%% end \showlength
+\NDB{4.16 in novel-TextMacros.sty.}
%% \squeeze{} and \crush{} slightly shrink the horizonal dimension of the
@@ -478,6 +489,7 @@
\gdef\realmarker{\toggletrue{@realmarker}} % anywhere in text
\gdef\fakemarker{\togglefalse{@realmarker}} % anywhere in text
%%
+\NDB{4.17 in novel-TextMacros.sty.}
\ExplSyntaxOn
%
\DeclareDocumentCommand \sups { m }
@@ -495,6 +507,7 @@
}%
}% end \sups
%
+\NDB{4.18 in novel-TextMacros.sty.}
\DeclareDocumentCommand \subs { m }
{%
\iftoggle{@realmarker}{%
@@ -522,6 +535,8 @@
\gdef\specialblankline{\null} % deprecated
%%
+\NDB{4.19 in novel-TextMacros.sty.}
+
%%
%% End of file `novel-TextMacros.sty'.
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-example.tex b/Master/texmf-dist/tex/lualatex/novel/novel-example.tex
deleted file mode 100644
index 2fc27f93fc7..00000000000
--- a/Master/texmf-dist/tex/lualatex/novel/novel-example.tex
+++ /dev/null
@@ -1,140 +0,0 @@
-% !TeX program = LuaLaTeX
-% !TeX encoding = UTF-8
-%
-% EXAMPLE OF NOVEL DOCUMENT CLASS
-% Uses mostly default layout.
-\documentclass{novel} % v. 1.32 or later
-\SetTitle{Dark and Stormy}
-\SetSubtitle{A Tale of Nights}
-\SetAuthor{Dirk Hardcase}
-\SetPDFX[CGATSTR001]{X-1a:2001}
-
-
-
-% This example document picks a \titlepagefont for the book's title,
-% depending on what you have installed. Not necessarily a good choice!
-\begin{document}
-
-\frontmatter
-
-% i. Half-Title page:
-\thispagestyle{empty}
-\vspace*{6\nbs}
-\hfill\charscale[1.8]{\textbf{Dark and}}\par
-\vspace{\nbs}
-\hfill\charscale[2.4]{\textbf{Stormy}}\par
-\clearpage
-
-% ii. Blank page:
-\thispagestyle{empty}
-\null
-\clearpage
-
-% iii. Full Title page:
-\thispagestyle{empty}
-\vspace*{5\nbs}
-\begin{center}
-\charscale[3.6]{\textbf{Dark and}}\par
-\vspace{2\nbs}
-\charscale[4.8]{\textbf{Stormy}}\par
-\vspace{1.5\nbs}
-\charscale[1.6]{A Tale of Nights}\par
-\vspace{4\nbs}
-\ChapterDeco[6]{\decoglyph{n9548}}
-\vspace{4\nbs}
-{\addfontfeature{Scale=3}\theAuthor}
-\vfill
-{\addfontfeature{Scale=1.25} Nonexistent Publications\\
-Anytown • Anyplace • Anywhere}\par
-
-\end{center}
-\clearpage
-
-
-% iv. Copyright page:
-\thispagestyle{empty}
-\begin{center}
-\itshape{
-\null
-\vfill
-Copyright ©2017 Dirk Hardcase.\par % Whichever year, copyright holder.
-All Rights Reserved.\par % Usually no need to be elaborate.
-\null
-This is a work of fiction.\\
-All persons and events are\\
-from the author's imagination.\\
-Resemblance to any real person,\\
-living or dead, is coincidental.\par % Or similar language.
-\null
-Printed on acid-free paper.\par % If true. Usually is true.
-Printed in the United States of America.\par % Or whichever nation.
-\null
-ISBN 0-12345678-9\par % Whatever it is. No barcode, just number.
-\null
-
-Published by Dirk Hardcase,\par % Publisher is you, not the print/distribution service.
-Anytown, Anystate USA\par % Publisher's location.
-www.example.com/dhardcase/publications/\par % Contact for publisher or author.
-\null
-Publisher's Cataloging-In-Publication Data\\
-available upon request.\par
-% Fiction often does not need catalog data.
-} % end itshape
-\end{center}
-\clearpage
-
-% v. Epigraph, Dedication, Table of Contents, or repeated Half-Title:
-\thispagestyle{empty}
-\vspace*{6\nbs}
-\hfill\charscale[1.8]{\textbf{Dark and}}\par
-\vspace{\nbs}
-\hfill\charscale[2.4]{\textbf{Stormy}}\par
-\clearpage
-
-% vi. Blank page:
-\thispagestyle{empty}
-\null
-\clearpage
-
-% Must use even number of pages in frontmatter.
-% Now to begin your story:
-\mainmatter
-
-% Chapter One:
-\begin{ChapterStart}
-\vspace*{3\nbs}
-\ChapterTitle{Chapter One}
-\end{ChapterStart}
-
-It was a dark and stormy night. Lord Withens rode his horse through the gloom, which was, as heretofore mentioned, dark.
-
-Moving right along, his horse arrived at the back door of Lady Wishintale's quarters. Sadly, Lord Withens was not on it, having slipped off his saddle along the way. That was because the weather was stormy.
-
-\lipsum
-
-
-% Chapter Two:
-\clearpage
-\begin{ChapterStart}
-\vspace*{3\nbs}
-\ChapterTitle{Chapter Two}
-\end{ChapterStart}
-
-The night was still dark and stormy. This should not be surprising, seeing as how only half an hour has elapsed since the first chapter. That information was necessary, in case you put the book down and haven't read any of it for the last two weeks.
-
-Lord Withens, wet and bruised, finally arrived at his destination. The reason he was wet was because, as has been noted, the weather was stormy. It was dark, too.
-
-\lipsum
-
-
-% Don't forget: The final page must be verso, and must be blank.
-\clearpage
-\thispagestyle{empty}
-\null
-% If necessary, insert an additional blank page, so that the total page count is even:
-\clearpage
-\thispagestyle{empty}
-\null
-
-\end{document}
-
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex
index 6865e3896d9..192a1df532b 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/07/26 v1.32 LaTeX file (additional glyph to unicode)]
+[2017/07/31 v1.34 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 8af72bc29f5..fda08eda60c 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/07/26 v1.32 LaTeX file (microtype configuration file for novel class)]
+ [2017/07/31 v1.34 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 996abd35c2a..615f74e35b3 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/07/26 v1.32 LaTeX file (PDF/X support for novel class)]
+ [2017/07/31 v1.34 LaTeX file (PDF/X support for novel class)]
% This package supports, and is part of, class `novel'.
% No support for anything but LuaLaTeX.
@@ -33,6 +33,9 @@
%% This file is loaded \AtEndPreamble.
%%
+%% Novel Tracking messages in this file begin with 11.
+\NDB{11.0 in novel-pdfx.sty.}
+
%
% Hyperref options for PDF/X with LuaTeX:
@@ -42,12 +45,14 @@
pdfpagelabels=true,pageanchor=false,pdfstartview=}
%
\RequirePackage[\pdfx@pdfX@opts@luatex]{hyperref}
+\NDB{11.1 in novel-pdfx.sty.}
%
\hypersetup{pdfencoding=auto}
\expandafter\ifx\csname KV@Hyp@psdextra\endcsname\relax\else
\hypersetup{psdextra}
\fi
\Hy@bookmarksfalse
+\NDB{11.2 in novel-pdfx.sty.}
%
\newif \if@gottitle \@gottitlefalse % refers to PDF File Data
% Was \title{} called prior to this step? If so:
@@ -61,6 +66,7 @@
before using \string\SetPDFX.^^J}
\fi
\fi
+\NDB{11.3 in novel-pdfx.sty.}
%
\if@gottitle\else
\ClassWarning{novel}{Your file has been compiled without standard^^J %
@@ -76,7 +82,7 @@
\edef\pdfcreationdate{\pdfcreationdate}%
\let\pdfx@mdfivesum\pdf@mdfivesum
%
-
+\NDB{11.4 in novel-pdfx.sty.}
@@ -105,6 +111,7 @@
\FPmul{\my@THnum}{\my@THnum}{0.99626401}
\FPround{\my@THnum}{\my@THnum}{3}
%
+\NDB{11.5 in novel-pdfx.sty.}
\FPsub{\my@TWorigin}{\my@MWnum}{\my@TWnum}
\FPmul{\my@TWorigin}{\my@TWorigin}{0.5}
\FPround{\my@TWorigin}{\my@TWorigin}{3}
@@ -121,6 +128,7 @@
\FPclip{\my@THorigin}{\my@THorigin}
\FPclip{\my@THcorner}{\my@THcorner}
%
+\NDB{11.6 in novel-pdfx.sty.}
\newcommand\novel@CropBox{%
\if@cropview%
/CropBox[\my@TWorigin\space\my@THorigin\space\my@TWcorner\space\my@THcorner]%
@@ -128,10 +136,12 @@
/CropBox[0\space0\space\my@MWnum\space\my@MHnum]%
\fi%
}
+\NDB{11.7 in novel-pdfx.sty.}
%
\newcommand\novel@TrimBox{%
/TrimBox[\my@TWorigin\space\my@THorigin\space\my@TWcorner\space\my@THcorner]%
}
+\NDB{11.8 in novel-pdfx.sty.}
%
% New in version 1.2: BleedBox, only for cover art. Same size as MediaBox.
\newcommand\novel@BleedBox{%
@@ -139,12 +149,14 @@
/BleedBox[0\space0\space\my@MWnum\space\my@MHnum]%
\else\fi%
}
+\NDB{11.9 in novel-pdfx.sty.}
%
\begingroup\edef\next{%
\endgroup\pdfpageattr{\novel@CropBox^^J\novel@BleedBox^^J\novel@TrimBox}}\next
%
%% End calculate and specify TrimBox.
+\NDB{11.10 in novel-pdfx.sty.}
%% DISABLE HYPERLINKS AND BOOKMARKS
@@ -179,12 +191,9 @@
Reason: The grid and text are in layers. No layers allowed.^^J}%
\fi
}{}
-
-
-
-
%% End disable hyperlinks and bookmarks.
+\NDB{11.11 in novel-pdfx.sty.}
%% GENERAL PDF INTERNAL METADATA PREPARATION
@@ -196,6 +205,7 @@
%
%% End general PDF in internal metadata preparation.
+\NDB{11.12 in novel-pdfx.sty.}
%% PREPARATION OF XMP METADATA
@@ -220,6 +230,7 @@
\def\pad@cxxviii{\pad@lxiv\pad@lxiv}
\def\pad@cclvi{\pad@cxxviii\pad@cxxviii}
\def\pad@dxii{\pad@cclvi\pad@cclvi}
+\NDB{11.13 in novel-pdfx.sty.}
%
% Frankly, I am not sure if all this rigamarole is necessary, but it works!
% Here, portions of XMP code are prepared. Later, they will be inserted
@@ -243,11 +254,13 @@
\pad@vi</dc:creator>^^J
}
}
+\NDB{11.14 in novel-pdfx.sty.}
%
\def\@documentID{uuid:\xmp@docid}
\def\@instanceID{uuid:\xmp@instid}
%
\def\@pdfVersion{1.\the\pdfminorversion}
+\NDB{11.15 in novel-pdfx.sty.}
%
\ifpdfx@isOFF
\gdef\@verconfString{}%
@@ -259,6 +272,7 @@
\fi
}
\fi
+\NDB{11.16 in novel-pdfx.sty.}
%
\ifpdfx@isOFF
\gdef\@pdfidString{}%
@@ -267,6 +281,7 @@
\pad@vi<pdfxid:GTS_PDFXVersion>\@PDFXversion</pdfxid:GTS_PDFXVersion>^^J
}
\fi
+\NDB{11.17 in novel-pdfx.sty.}
%
\ifthenelse{\equal{\@novelApplication}{} \OR \equal{\@novelApplication}{ }}{
\gdef\@applicationString{}%
@@ -279,6 +294,7 @@
}{
\gdef\@producerString{\pad@vi<pdf:Producer>\@novelProducer</pdf:Producer>^^J}%
}
+\NDB{11.18 in novel-pdfx.sty.}
%
% Calculation of Dates and Times, which must be in a specific format.
% Each time you process to PDF, the current date/time is used,
@@ -328,6 +344,7 @@
%
%% End Prepare XMP metadata.
+\NDB{11.19 in novel-pdfx.sty.}
%% WRITE THE XMP METADATA, UNLESS PDF/X IS OFF OR NO TITLE
@@ -367,6 +384,7 @@
%
%% End write the XMP metadata.
+\NDB{11.20 in novel-pdfx.sty.}
%% PREPARE PDF /INFO METADATA
@@ -395,6 +413,7 @@
\endgroup
\fi
}
+\NDB{11.21 in novel-pdfx.sty.}
% Now, massage the metadata:
\@infotopdfstring{\@infotitle}{\@title}
\@infotopdfstring{\@infoauthor}{\@author}
@@ -409,6 +428,7 @@
%
%% End prepare PDF /Info.
+\NDB{11.22 in novel-pdfx.sty.}
%% WRITE THE OUTPUT INTENT, UNLESS PDFX IS OFF.
@@ -470,6 +490,7 @@
%
%% End write the output intent.
+\NDB{11.23 in novel-pdfx.sty.}
%% DISABLE HYPERREF OPTIONS
@@ -487,11 +508,12 @@
%
%% End disable hyperref options.
+\NDB{11.24 in novel-pdfx.sty.}
%% PREPARE PDF/Info
%% -----------------------------------------------------------------------------
-%% The \novel@PDFinfo command is called \AtBeginDocument.
+%% The \novel@PDFinfo command is used AtBeginDocument in novel.cls.
%
\gdef\@novelPDFinfo{ % rather than \PDF@FinishDoc
\if@gottitle
@@ -522,7 +544,7 @@
%
%% End prepare PDF/Info.
-
+\NDB{11.25 in novel-pdfx.sty.}
%%
diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty
index 2289151a617..c0a6a1d9a69 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/07/26 v1.32 LaTeX file (novel XMP packet template)]
+[2017/07/31 v1.34 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 48337e39c00..47405f00799 100644
--- a/Master/texmf-dist/tex/lualatex/novel/novel.cls
+++ b/Master/texmf-dist/tex/lualatex/novel/novel.cls
@@ -17,14 +17,20 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
% Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016.
-\ProvidesClass{novel}[2017/07/26 v1.3 LaTeX document class]
+\ProvidesClass{novel}[2017/07/31 v1.34 LaTeX document class]
%%
+%% Version 1.34: Added debug class option and related code.
+
%% Version 1.32 includes a minor documentation fix, and a major bug fix
%% concerning looose text tracking. The bug occasionally appeared when
%% page headings were compiled, but gave a cryptic error message
%% about MT@res@a. The fix is expected to be permanent.
+%% Version 1.2: Added capability for cover artwork.
+
+%% Versions 1.1.x: First general release, occasional documantation changes.
+
%% DESCRIPTION:
%% Class `novel' is designed for print fiction: novels or short stories.
@@ -49,6 +55,11 @@
%% custom font, NovelDeco.otf, is used for special purposes.
%%
+%% From version 1.34, novel has a debug system. See documentation pg. 11.
+%% Some messages appear in log file, whether or not debug option used.
+%% Other messages only appear with debug option.
+\typeout{Novel Tracking 0.0: Begin loading novel.cls file.}
+
%% REQUIRE LUATEX and do some preliminary setup.
%% -----------------------------------------------------------------------------
@@ -112,25 +123,27 @@
%% -----------------------------------------------------------------------------
% Allowed option list:
% draft xml shademargins graytext greytext cropmarks cropview closecrop
-% New in version 1.2: coverart
+% coverart debug
% Yes, I realize that this could have been done another way:
\gdef\@mycol{\@classoptionslist}
-\StrDel{\@mycol}{ }[\@mycola]
-\StrDel{\@mycola}{,}[\@mycolb]
-\StrDel{\@mycolb}{draft}[\@mycolc]
-\StrDel{\@mycolc}{xml}[\@mycold]
-\StrDel{\@mycold}{shademargins}[\@mycole]
-\StrDel{\@mycole}{graytext}[\@mycolf]
-\StrDel{\@mycolf}{greytext}[\@mycolg]
-\StrDel{\@mycolg}{cropmarks}[\@mycolh]
-\StrDel{\@mycolh}{cropview}[\@mycoli]
-\StrDel{\@mycoli}{closecrop}[\@mycolj]
-\StrDel{\@mycolj}{coverart}[\@mycolk]
+\StrDel{\@mycol}{ }[\@mycol]
+\StrDel{\@mycol}{,}[\@mycol]
+\StrDel{\@mycol}{draft}[\@mycol]
+\StrDel{\@mycol}{xml}[\@mycol]
+\StrDel{\@mycol}{shademargins}[\@mycol]
+\StrDel{\@mycol}{graytext}[\@mycol]
+\StrDel{\@mycol}{greytext}[\@mycol]
+\StrDel{\@mycol}{cropmarks}[\@mycol]
+\StrDel{\@mycol}{cropview}[\@mycol]
+\StrDel{\@mycol}{closecrop}[\@mycol]
+\StrDel{\@mycol}{coverart}[\@mycol]
+\StrDel{\@mycol}{debug}[\@mycol]
%
-\gdef\@mycolzzz{\@mycolk} % modify if others added
-\ifthenelse{\equal{\@mycolzzz}{}}{}{
- \ClassWarning{novel}{Unrecognized class option: \@mycolzzz\space^^J%
- The unrecognized option was ignored!^^J}%
+\ifthenelse{\equal{\@mycol}{}}{}{
+ \ClassWarning{novel}{Unrecognized class option: \@mycol^^J%
+ The unrecognized option was ignored!^^J%
+ Note that font point size and document size^^J%
+ are not novel class options. See documentation.}%
}
%
% If used, option `draft' shows overflow rule.
@@ -190,13 +203,28 @@
\DeclareOption{closecrop}{
\@cropviewtrue\@closecroptrue
}
-% New in version 1.2: coverart option.
+% New in version 1.2: coverart option. See documentation page 10.
% This is used to create a 1-page file with no text, just an image.
% Intended purpose is PDF/X for novel cover. See docs page 10.
\newif \if@coverart
\DeclareOption{coverart}{
\@coverarttrue
}
+% New in version 1.34: debug option. See documentation page 11.
+\newif \if@noveldebug
+\DeclareOption{debug}{
+ \@noveldebugtrue
+}
+% New in version 1.34: unblock option, for developer use only.
+% Normally, a number of packages known to be incompatible with this document class
+% are blocked from loading. If the user tries to get them via \usepackage
+% or \RequirePackage, or if they are called within some other loaded package,
+% then compile halts with an error. The `unblock' option turns off blocking,
+% and allows incompatible packages to load. Use only at own risk!
+\newif \if@novelunblock % For developer use.
+\DeclareOption{unblock}{
+ \@novelunblocktrue
+}
%% Note that document size and normal font size are not class options.
%% They are set by commands in the Preamble, and have default values.
%
@@ -227,6 +255,13 @@
\fi
%% end class options
+\typeout{Novel Tracking 0.0: Class options processed.}
+
+% \NDB is used in various other files, part of novel class.
+% It may also be used in the TeX document.
+% If debug option, this prints a message to log file.
+% Example usage: \NDB{your message goes here}
+\gdef\NDB#1{\if@noveldebug\typeout{Novel Tracking #1}\fi}
%% Activate xcolor, adjustbox, and eso-pic:
@@ -257,7 +292,6 @@
%% end activate xcolor and adjustbox
-
%% Temporary normal font size
%% -----------------------------------------------------------------------------
%% This normalsize is temporary, so that packages can load without complaint.
@@ -273,7 +307,7 @@
%
%% end temporary normal point size and baselineskip
-
+\typeout{Novel Tracking 0.1: Additional packages loaded.}
%% Define commands used for File Data, including PDF/X Settings.
%% -----------------------------------------------------------------------------
@@ -281,6 +315,7 @@
%% and in XMP. This class does not write it to the Catalog.
%% Defines commands such as \title{}, not necessarily the same as other TeX.
\RequirePackage{novel-FileData}
+\typeout{Novel Tracking 0.2: novel-FileData.sty loaded.}
%
%%
@@ -290,6 +325,7 @@
%% Define commands that over-ride the class option pre-configured settings.
%% Variety of miscellaneous layout settings such as \parsep, \parindent, etc.
\RequirePackage{novel-LayoutSettings}
+\typeout{Novel Tracking 0.3: novel-LayoutSettings.sty loaded.}
%
%%
@@ -299,14 +335,19 @@
%%
% Macros for use in document body:
\RequirePackage{novel-TextMacros} % part of novel class
+\typeout{Novel Tracking 0.4: novel-TextMacros.sty loaded.}
% Standard `fancyhdr' header footer styles:
\RequirePackage{novel-HeadFootStyles} % part of novel class
+\typeout{Novel Tracking 0.5: novel-HeadFootStyles.sty loaded.}
% Chapter and Scene styles:
\RequirePackage{novel-ChapterScene}
+\typeout{Novel Tracking 0.6: novel-ChapterScene.sty loaded.}
% Image placement:
-\RequirePackage{novel-Images} % part novel class
+\RequirePackage{novel-Images} % part of novel class
+\typeout{Novel Tracking 0.7: novel-Images.sty loaded.}
% Footnotes and endnotes:
\RequirePackage{novel-Footnotes} % part of novel class
+\typeout{Novel Tracking 0.8: novel-Footnotes.sty loaded.}
%%
@@ -314,13 +355,17 @@
%% -----------------------------------------------------------------------------
%
\AtEndPreamble{
+ \typeout{Novel Tracking 1.AEP.E: Entered AtEndPreamble routine in novel.cls.}
\RequirePackage{novel-CalculateLayout}
+ \typeout{Novel Tracking 1.9: novel-CalculateLayout.sty loaded.}
\RequirePackage{novel-FontDefaults}
+ \typeout{Novel Tracking 1.10: novel-FontDefaults.sty loaded.}
\renewcommand\textls[2][]{#2%
\typeout{Class `novel' Alert: \string\textls\space ignored on pg \thepage.}%
} % nullifies this microtype command (problems)
\RequirePackage{novel-pdfx}
- \AtBeginShipout{\gdef\@fnafter{}}
+ \typeout{Novel Tracking 1.11: novel-pdfx.sty loaded.}
+ \typeout{Novel Tracking 1.AEP.X: Exiting AtEndPreamble routine in novel.cls.}
}
%%
@@ -328,17 +373,15 @@
%% \AtBeginDocument finishes the setup
%% -----------------------------------------------------------------------------
%
-% Error if certain packages were requested in the Preamble.
-% This macro is invoked \AtBeginDocument.
-\newif \ifshutoffblock % part of incompatible package blocking
-%
\AtBeginDocument{ %
+ \typeout{Novel Tracking 1.ABD.E: Entering AtBeginDocument routine in novel.cls.}
\defaultfontfeatures{} % reset
% Any other fonts will use these defaults:
\defaultfontfeatures{%
SmallCapsFeatures={Renderer=Basic},Kerning=On,%
Ligatures=TeX,%
}%
+ \NDB{1.ABD.1 in novel.cls.}
%
% Find some useful measurements:
\gdef\@normalxheight{\heightof{x}}
@@ -347,12 +390,14 @@
\gdef\@normalXheight{\heightof{X}}
\setlength\normalXheight{\@normalXheight}
\global\normalXheight=\normalXheight
+ \NDB{1.ABD.2 in novel.cls.}
% Activate user choice of whether or not to indent after scenebreak commands:
\if@indentAfterScenebreak\else
\NoIndentAfterCmd{\scenebreak}
\NoIndentAfterCmd{\sceneline}
\NoIndentAfterCmd{\scenestars}
\fi
+ \NDB{1.ABD.3 in novel.cls.}
%
\@activateHeadFootStyles % in file `novel-HeadFootStyles.sty'
\@novelPDFinfo % in file `novel-pdfx.sty'.
@@ -361,10 +406,11 @@
\let\title\relax
\let\author\relax
\let\subtitle\relax
- % Disallow incompatible packages:
- \ifshutoffblock
- \gdef\sorry@no#1{}
- \else
+ \NDB{1.ABD.4 in novel.cls.}
+ % Dealing with known incompatible packages:
+ \if@novelunblock
+ \gdef\sorry@no#1{} % let them be used
+ \else % block them (default)
\gdef\sorry@no#1{\@ifpackageloaded{#1}{%
\ClassError{novel}{Sorry, package `#1' cannot be used}%
{The `novel' class does not allow use of package `#1'.^^J%
@@ -374,6 +420,7 @@
}{}%
}
\fi
+ \NDB{1.ABD.5 in novel.cls.}
%
\sorry@no{pdfx}
\sorry@no{xmpincl}
@@ -402,23 +449,129 @@
\sorry@no{nth}
\sorry@no{engord}
\sorry@no{endnotes}
+ %%
+ \NDB{1.ABD.6 in novel.cls.}
+ %%
+ %% Pertains to novel-LayoutSettings.sty:
+ \ifcsname pagenumberstyle\endcsname\else
+ \SetPageNumberStyle{\thepage}
+ \fi
+ \NDB{1.ABD.7 in novel.cls.}
+ %
+ \def\@setchapterstartOK{false}%
+ \ifthenelse{\equal{\@setchapterstart}{empty}}{%
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstart}{plain}}{%
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstart}{footer}}{%
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstart}{fancyplain}}{%
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstart}{fancy}}{%
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstart}{forcenumber}}{%
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstart}{dropfolio}}{% no footnote there
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstart}{dropfoliolater}}{% footnote(s) there
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstart}{foliobeneath}}{%
+ \def\@setchapterstartOK{true}%
+ }{}%
+ \ifthenelse{\equal{\@setchapterstartOK}{true}}{}{%
+ \ClassError{novel}{\string\SetChapterStart\space bad argument}%
+ {\string\SetChapterStart\space only allows certain choices.^^J}%
+ }%
+ \NDB{1.ABD.8 in novel.cls.}
+ %%
+ %% Pertains to novel-TextMacros.sty:
+ \setlength\forceparlength{\parindent}
+ \global\forceparlength=\forceparlength
+ \gdef\forceindent{\ifvmode\else\unskip\fi\stake\hspace{\forceparlength}}
+ \gdef\backindent{\ifvmode\else\unskip\fi\hspace{-\forceparlength}}
+ \NDB{1.ABD.9 in novel.cls.}
+ %%
+ %% Pertains to novel-footnotes.sty:
+ \gdef\SetFootnoteMarker#1{%
+ \typeout{^^JClass `novel' Alert: %
+ \string\SetFootnoteMarker\space ineffective after Preamble.^^J}%
+ }
+ % Must wait for \nbs to be calculated:
+ \setlength\footnotesep{0.8\nbs}
+ \NDB{1.ABD.10 in novel.cls.}
+ % Must wait for main font and its size to be active:
+ \newlength\@hoaring
+ \setlength\@hoaring{\heightof{Ã…}}
+ \global\@hoaring=\@hoaring
+ \newlength\@twast % tweaks asterisk
+ \setlength\@twast{\heightof{*}}
+ \addtolength\@twast{-\@hoaring}
+ \global\@twast=\@twast
+ \newlength\@twdag % tweaks dagger
+ \setlength\@twdag{\heightof{†}}
+ \addtolength\@twdag{-0.2\@twdag}
+ \addtolength\@twdag{-\@hoaring}
+ \global\@twdag=\@twdag
+ \newlength\@twdbldag % tweaks double dagger
+ \setlength\@twdbldag{\heightof{‡}}
+ \addtolength\@twdbldag{-0.2\@twdbldag}
+ \addtolength\@twdbldag{-\@hoaring}
+ \global\@twdbldag=\@twdbldag
+ \newlength\@twsect % tweaks section mark
+ \setlength\@twsect{\heightof{§}}
+ \addtolength\@twsect{-0.2\@twsect}
+ \addtolength\@twsect{-\@hoaring}
+ \global\@twsect=\@twsect
+ \newlength\@tweight % tweaks 8, reliably the tallest digit
+ \setlength\@tweight{\heightof{8}}%
+ \addtolength\@tweight{-0.2\@tweight}%
+ \addtolength\@tweight{-\@hoaring}%
+ \global\@tweight=\@tweight%
+ \NDB{1.ABD.11 in novel.cls.}
+ % Must wait to see how \SetFootnoteMarker was used:
+ \ifthenelse{\equal{\@myfnsymbols}{*}}{\setcounter{@maxfnsymbol}{8}}{}
+ \ifthenelse{\equal{\@myfnsymbols}{†}}{\setcounter{@maxfnsymbol}{6}}{}
+ \NDB{1.ABD.12 in novel.cls.}
+ %%
+ \typeout{Novel Tracking 1.ABD.X: Exiting AtBeginDocument in novel.cls.}
}
%%
+
%% New in version 1.2, coverart option. See docs page 10.
-\if@coverart
- \AfterEndPreamble{
- \AddToShipoutPictureBG{%
- \AtPageUpperLeft{%
- \InlineImage*{\novelcoverimage}%
- }%
- }
- \null% without this, page has no "content"
- }
-\else\fi
+\AfterEndPreamble{
+ \typeout{Novel Tracking 1.FEP.E: Entered AfterEndPreamble in novel.cls.}
+ \if@coverart
+ \AddToShipoutPictureBG{%
+ \AtPageUpperLeft{%
+ \InlineImage*{\novelcoverimage}%
+ }%
+ }
+ \null% without this, page has no "content"
+ \fi
+ \typeout{Novel Tracking 1.FEP.X: Exiting AfterEndPreamble in novel.cls.}
+}
%%
+%% AtBeginShipout occurs at the completion of each page layout, in document body.
+\AtBeginShipout{%
+ \NDB{1.ABS.E: Entered AtBeginShipout, page \thepage, in novel.cls.}%
+ \gdef\@fnafter{}% Pertains to some standard LaTeX footnote code.
+ \stepcounter{runningpages}%
+ \global\@thispagestylesetfalse%
+ \NDB{1.ABS.X: Exiting AtBeginShipout, page \thepage, in novel.cls.}%
+}
+%%
+
%%
%% End of file `novel.cls'