diff options
Diffstat (limited to 'Master')
33 files changed, 762 insertions, 1507 deletions
diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/License-icc-files.html b/Master/texmf-dist/doc/lualatex/novel/extras/License-icc-files.html deleted file mode 100644 index 6d0a4a5b975..00000000000 --- a/Master/texmf-dist/doc/lualatex/novel/extras/License-icc-files.html +++ /dev/null @@ -1,23 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - -<head> -<meta charset="UTF-8" /> -<title>License for icc files in "novel" extras folder.</title> -</head> -<body> - -<h2>License for icc files in <i>novel</i> extras folder.</h2> - -<p>Note that the ink limit file, mentioned in <i>novel</i> documentation, cannot be included here, as the license does not allow bundling with other software (such as the <i>novel</i> document class). You have to go get it yourself.</p> - -<p>File srgb.icc is a re-named copy of file <a href="https://github.com/ellelstone/elles_icc_profiles/blob/master/profiles/sRGB-elle-V2-srgbtrc.icc">sRGB-elle-V2-srgbtrc.icc</a> by Elle Stone.</p> - -<p>File crgb.icc is a re-named copy of file <a href="https://github.com/ellelstone/elles_icc_profiles/blob/master/profiles/ClayRGB-elle-V2-srgbtrc.icc">ClayRGB-elle-V2-srgbtrc.icc</a> by Elle Stone.</p> - -<p><b>License granted by Elle Stone:</b></p> - -<p>The ICC profiles that are included with the profile-making code are released under the Creative Commons Attribution-Share-Alike Unported license, version 3.0 <a href="https://creativecommons.org/licenses/by-sa/3.0/legalcode">https://creativecommons.org/licenses/by-sa/3.0/legalcode</a>.</p> - -</body> -</html> diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/novel-cover-template.tex b/Master/texmf-dist/doc/lualatex/novel/extras/novel-cover-template.tex index 41d6510af21..a1ce81f252f 100644 --- a/Master/texmf-dist/doc/lualatex/novel/extras/novel-cover-template.tex +++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-cover-template.tex @@ -3,7 +3,7 @@ % IF YOU COMPILE THIS DOCUMENT: Be sure that this file, and its generated PDF, % have read/write permissions for any user. If they don't, then % compile will fail at the point where files are written. -\documentclass[coverart]{novel} % v. 1.43.1 or later +\documentclass[coverart]{novel} % v. 1.46 \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 deleted file mode 100644 index 0b6172e5caa..00000000000 --- a/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.pdf +++ /dev/null @@ -1,1146 +0,0 @@ -%PDF-1.3 -%ÐÔÅØ -4 0 obj -<</Type /Metadata /Subtype /XML -/Length 6748 >> -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-11-11T17:23:41-08:00</xmp:ModifyDate> - <xmp:CreateDate>2017-11-11T17:23:41-08:00</xmp:CreateDate> - <xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool> - <xmp:MetadataDate>2017-11-11T17:23:41-08: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:8F454B7D3305A12C8BE9FD41F9FFCD7F</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>LuaLaTeX 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 -/F45 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 -/F45 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<</F45 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 -/F45 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 -/F45 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 -/F32 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 -/F46 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 -/F32 34.07221 Tf 1 0 0 1 106.742 215.362 Tm [<0025004A0053004C>-250<002900420053>8<00450044004200540046>]TJ -/F32 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<</F45 8 0 R/F32 16 0 R/F46 17 0 R>>/ProcSet[/PDF/Text]>> -endobj -20 0 obj -<</Length 2647 >> -stream -BT -/F50 11.3574 Tf 1 0 0 1 146.785 335.315 Tm [<0025086E087F0878>-250<086E087B0871>-250<00340881>25<087C087F087A0886>]TJ -/F50 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 93.092 113.384 Tm [<002A004F004500460051>-7<0046004F00450046004F0055004D005A>-250<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<</F50 21 0 R>>/ProcSet[/PDF/Text]>> -endobj -24 0 obj -<</Length 803 >> -stream -BT -/F32 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 -/F50 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<</F32 16 0 R/F50 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 -/F32 18.17191 Tf 1 0 0 1 159.426 485.231 Tm [<0024004900420051005500460053>-250<0030004F0046>]TJ -/F32 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<</F32 16 0 R>>/ProcSet[/PDF/Text]>> -endobj -33 0 obj -<</Length 10889 >> -stream -BT -/F32 10.44878 Tf 1 0 0 1 36 565.643 Tm [<0013>-10569<0025>-50<09B9>-50<09C1>-50<09B0>-341<0029>-50<09B1>-50<09C1>-50<09B4>-50<09B3>-50<09B1>-50<09C2>-50<09B5>]TJ -/F32 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<</F32 16 0 R>>/ProcSet[/PDF/Text]>> -endobj -36 0 obj -<</Length 6085 >> -stream -BT -/F32 10.44878 Tf 1 0 0 1 162.882 565.643 Tm [<0025>-50<09B1>-50<09C1>-50<09B0>-340<09B1>-50<09BD>-50<09B4>-340<0034>-50<09C3>-25<09BE>-50<09C1>-50<09BC>-50<09C8>-9956<0014>]TJ -/F32 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<</F32 16 0 R>>/ProcSet[/PDF/Text]>> -endobj -39 0 obj -<</Length 7785 >> -stream -BT -/F32 18.17191 Tf 1 0 0 1 140.517 485.231 Tm [<0024004900420051005500460053>-250<0035>49<0058>8<0050>]TJ -/F32 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<</F32 16 0 R>>/ProcSet[/PDF/Text]>> -endobj -42 0 obj -<</Length 10907 >> -stream -BT -/F32 10.44878 Tf 1 0 0 1 162.882 565.643 Tm [<0025>-50<09B1>-50<09C1>-50<09B0>-340<09B1>-50<09BD>-50<09B4>-340<0034>-50<09C3>-25<09BE>-50<09C1>-50<09BC>-50<09C8>-9956<0016>]TJ -/F32 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<</F32 16 0 R>>/ProcSet[/PDF/Text]>> -endobj -46 0 obj -<</Length 6071 >> -stream -BT -/F32 10.44878 Tf 1 0 0 1 36 565.643 Tm [<0017>-10569<0025>-50<09B9>-50<09C1>-50<09B0>-341<0029>-50<09B1>-50<09C1>-50<09B4>-50<09B3>-50<09B1>-50<09C2>-50<09B5>]TJ -/F32 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<</F32 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]2158[519]2161[551]2168[568]2170[648 591 552]2175[462]2177[492]2182[474]2277[444 444 444 444 444 444 444 444 444 444]] -endobj -54 0 obj -<</Length 286 >> -stream - -@¹B -endstream -endobj -55 0 obj -<</Subtype/CIDFontType0C/Length 15760 >> -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‹ÿÿꙚ”ÿÿè€ -€ -÷CŒ‹Š§ø+§ø‰Ú †w‰í§‹¹‰Û‹÷‹÷$¹°÷Cœœ‹›‹÷9Þû‹p‹OŠVŠ)‰‰‡vŠˆŽ‰Ž‹¢¤•†} ‹‡Š†Š…EûÛ„l~}m‹t‡‹‰ˆŠ‡÷.½Ó÷㤧Ž²‹÷‹²B‹8‹r‡r†rmû$4kû‹L‹|–‹ž‹‹Œ’‹§ÿ -½ÎЋ‘®"‹%2rûnû'Í9÷ -² -² × ×
-endstream -endobj -56 0 obj -<</Type/FontDescriptor/FontName/PVNKXQ+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 1580 >> -stream -%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-PVNKXQ-LibertinusSerif-Italic-0) -%%Title: (TeX-PVNKXQ-LibertinusSerif-Italic-0 TeX PVNKXQ-LibertinusSerif-Italic 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (PVNKXQ-LibertinusSerif-Italic) -/Supplement 0 ->> def -/CMapName /TeX-Identity-PVNKXQ-LibertinusSerif-Italic def -/CMapType 2 def -1 begincodespacerange -<0000> <FFFF> -endcodespacerange -0 beginbfrange -endbfrange -62 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> -<086E> <0061> -<0871> <0064> -<0878> <006B> -<087A> <006D> -<087B> <006E> -<087C> <006F> -<087F> <0072> -<0881> <0074> -<0886> <0079> -<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/PVNKXQ+LibertinusSerif-Italic/DescendantFonts[58 0 R]/ToUnicode 57 0 R>> -endobj -58 0 obj -<</Type/Font/Subtype/CIDFontType0/BaseFont/PVNKXQ+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(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20171111172341-08'00')/ModDate(D:20171111172341-08'00')/Producer(LuaLaTeX\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 -0000065464 00000 n -0000065484 00000 n -0000065504 00000 n -0000000015 00000 n -0000007442 00000 n -0000007302 00000 n -0000006849 00000 n -0000110267 00000 n -0000110605 00000 n -0000007751 00000 n -0000007608 00000 n -0000007551 00000 n -0000009282 00000 n -0000009139 00000 n -0000007837 00000 n -0000105662 00000 n -0000085887 00000 n -0000012261 00000 n -0000012118 00000 n -0000009414 00000 n -0000083952 00000 n -0000013375 00000 n -0000013232 00000 n -0000012372 00000 n -0000013697 00000 n -0000013554 00000 n -0000013497 00000 n -0000021485 00000 n -0000021342 00000 n -0000013783 00000 n -0000032685 00000 n -0000032542 00000 n -0000021596 00000 n -0000039081 00000 n -0000038938 00000 n -0000032796 00000 n -0000047177 00000 n -0000047034 00000 n -0000039192 00000 n -0000058396 00000 n -0000058252 00000 n -0000047288 00000 n -0000110734 00000 n -0000064779 00000 n -0000064635 00000 n -0000058507 00000 n -0000065091 00000 n -0000064947 00000 n -0000064890 00000 n -0000065378 00000 n -0000065234 00000 n -0000065177 00000 n -0000065557 00000 n -0000065910 00000 n -0000066253 00000 n -0000082092 00000 n -0000082315 00000 n -0000084097 00000 n -0000084287 00000 n -0000084315 00000 n -0000084419 00000 n -0000084970 00000 n -0000085178 00000 n -0000086019 00000 n -0000086196 00000 n -0000086594 00000 n -0000086975 00000 n -0000103692 00000 n -0000103908 00000 n -0000105800 00000 n -0000105983 00000 n -0000106073 00000 n -0000106142 00000 n -0000109119 00000 n -0000109342 00000 n -0000110413 00000 n -0000110822 00000 n -0000110883 00000 n -0000111246 00000 n -trailer -<</Size 80/Root 78 0 R/Info 79 0 R/ID[<243CBB777963D3075CCD798122F5F589> <243CBB777963D3075CCD798122F5F589>]>> -startxref -111590 -%%EOF diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.tex b/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.tex index 8827eb1315d..5120c5aaa95 100644 --- a/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.tex +++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.tex @@ -6,7 +6,7 @@ % IF YOU COMPILE THIS DOCUMENT: Be sure that this file, and its generated PDF, % have read/write permissions for any user. If they don't, then % compile will fail at the point where files are written. -\documentclass{novel} % v. 1.43.1 or later +\documentclass{novel} % v. 1.46 \SetTitle{Dark and Stormy} \SetSubtitle{A Tale of Nights} \SetAuthor{Dirk Hardcase} diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/novel-extras-README.html b/Master/texmf-dist/doc/lualatex/novel/extras/novel-extras-README.html new file mode 100644 index 00000000000..e22d9e6cc92 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-extras-README.html @@ -0,0 +1,43 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> +<meta charset="UTF-8" /> +<title>README for novel extras</title> +</head> +<body style="padding:16px"> + +<h2>README for novel extras</h2> + +<p>This folder contains items that may be helpful, but are not essential to operation of the <i>novel</i> document class.</p> + +<p>File <i>novel-example.tex</i> is a fake short novel. If you wish to compile it, place a copy in your user home folder (or other place where you have read/write privilege) and compile it there. On some operating systems, you cannot compile the original in its <i>extras</i> folder.</p> + +<p>File <i>novel-testsuite.tex</i> exercises the various capabilities of the document class. You can look at the code, and see how it compiles. You may also change settings, to see what they do. It requires file <i>novel-testimage.png</i>. If you wish to compile it, place a copy (along with image) in your user home folder (or other place where you have read/write privilege) and compile it there. On some operating systems, you cannot compile the original in its <i>extras</i> folder.</p> + +<p>File <i>novel-cover-template.tex</i> may be used for creating a cover, once you have a CMYK image. If you wish to compile it, place a copy in your user home folder (or other place where you have read/write privilege) and compile it there. On some operating systems, you cannot compile the original in its <i>extras</i> folder.</p> + +<p>File <i>novel-decoglyphs.pdf</i> shows the decorative characters in the <i>NovelDeco.otf</i> file, along with the codes needed to retrieve them.</p> + +<p>File <i>novel-Gallery-ChapterStart.pdf</i> shows a number of different ways to begin a chapter, making use of the ChapterStart environment and related commands.</p> + +<p>File <i>CPmodified.otf</i> is not (normally) for use in TeX. I use it when editing my work in a word processor, prior to TeX markup. To use it, install the font in your operating system (not in TeX) where a word processor can find it. This font is nearly-monospaced, with exaggerated punctuation marks. I have found that punctuation errors are most frequently overlooked during editing, since they are so small in many fonts, and the spell-check software doesn't find the errors.</p> + +<div style="margin:16px; padding:16px; border:1px solid #000000;"> +<h3>Included icc color profiles:</h3> +<p>Note that the ink limit file, mentioned in <i>novel</i> documentation, cannot be included here, as the license does not allow bundling with other software (such as the <i>novel</i> document class). You have to go get it yourself. Links provided in the documentation.</p> +<p>File <i>srgb.icc</i> is a re-named copy of file <a href="https://github.com/ellelstone/elles_icc_profiles/blob/master/profiles/sRGB-elle-V2-srgbtrc.icc">sRGB-elle-V2-srgbtrc.icc</a> by Elle Stone.</p> +<p>File <i>crgb.icc</i> is a re-named copy of file <a href="https://github.com/ellelstone/elles_icc_profiles/blob/master/profiles/ClayRGB-elle-V2-srgbtrc.icc">ClayRGB-elle-V2-srgbtrc.icc</a> by Elle Stone.</p> +<p><b>License granted by Elle Stone:</b></p> +<p>The ICC profiles that are included with the profile-making code are released under the Creative Commons Attribution-Share-Alike Unported license, version 3.0 <a href="https://creativecommons.org/licenses/by-sa/3.0/legalcode">https://creativecommons.org/licenses/by-sa/3.0/legalcode</a>.</p> +</div> + + + + + + + + +</body> +</html> diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/novel-testimage.png b/Master/texmf-dist/doc/lualatex/novel/extras/novel-testimage.png Binary files differnew file mode 100644 index 00000000000..1fabb2ccf20 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-testimage.png diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/novel-testsuite.tex b/Master/texmf-dist/doc/lualatex/novel/extras/novel-testsuite.tex new file mode 100644 index 00000000000..6788c87e139 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-testsuite.tex @@ -0,0 +1,266 @@ +% !TeX TS-program = LuaLaTeX +% !TeX encoding = UTF-8 +% +% TEST SUITE FOR NOVEL DOCUMENT CLASS +% +% IF YOU COMPILE THIS DOCUMENT: Be sure that this file, and its generated PDF, +% have read/write permissions for any user. If they don't, then +% compile will fail at the point where files are written. +% +% This document tests the various capabilities of `novel' document class. +% The Preamble settings are originally the defaults. +% Change them to exercise the setting, and see the result. +% In the document body, various commands are exercised. +% +% You need all fonts from the `libertinus' package, +% all fonts from `lmodern' package, +% and the included NovelDeco.otf. +% +% You also need the file` novel-testimage.png' +% in the same folder as this document. +% It is grayscale png, 150x150 pixels, with resolution 300pdi. +% +% The `test' class option is required. You may add others. +\documentclass[test]{novel} % v. 1.46. +\SetTitle{Test Suite} +\SetSubtitle{Novel Document Class} +\SetAuthor{Author Name} +% Additional Preamble, if desired. + + +\begin{document} + +\frontmatter % begins at page i. + +\thispagestyle{footer} +\vspace*{5\nbs} +\begin{center} +\charscale[3.6]{\textbf{Test Suite}}\par +\vspace{1.5\nbs} +\charscale[1.6]{Novel Document Class}\par +\vspace{4\nbs} +\ChapterDeco[6]{\decoglyph{n9548}} +\vspace{2\nbs} +\charscale[1.5]{The following page will be completely blank!}\par +\vfill +If you choose a head/foot style with footer, then page number i (lowercase roman) will appear in the footer below.\par +But if the head/foot style has no footer, then nothing below.\par +\end{center} +\clearpage + + +% Now to begin at page 1: +\mainmatter + +\begin{ChapterStart}[10] +\vspace*{3\nbs} +\ChapterTitle{Chapter One} +\ChapterSubtitle{Dark and Stormy} +\ChapterDeco[4]{\decoglyph{n9548}} +\end{ChapterStart} + +This tests the ChapterStart environment, plus \string\ChaterTitle, \string\ChapterSubtitle, \string\ChapterDeco, and \string\decoglyph. + +In the TeX document, you can change the height of the environment, the alignment of its components, the decoglpyh, and so forth. + +The first paragraph will not be indented, but all following paragraphs will be indented. + +Since this is a recto (odd-numbered) page at right side, the default margins will be a little larger at left, where there is an allowance for binding gutter. + +Unless you change the head/foot style, you should see no heading. Arabic page number 1 should be at the bottom. + +\clearpage + + +% NEXT PAGE: + +This page tests all of the linegap environment, the \string\charscale\space command, and \string\rotatebox. The combined effect is shown below: +\begin{linegap}{10} +\vspace{1.5\nbs} +\charscale[2,3em,-4em]{\rotatebox[origin=c]{45}{Random Test Items}} +\end{linegap} +Above, you should see the phrase Random Test Items in larger than normal text, tilted 45 degrees, nicely fitting between the text above and this text. The phrase does not begin at the left margin; this can be changed. + +If you change the font size or number of lines per page, then the tilted phrase might not fit nicely. That can be fixed by changing the linegap. + +\clearpage + + +% NEXT PAGE: + +This page tests \string\BlockImage\space effects. Remember that \textit{novel} uses its own methods of placing images. + +\BlockImage[r]{novel-testimage.png}[\pushtextdown{\nbs}Text accompanying image. This text appears to the left of the image. One line above this text was skipped.\par] + +Above, the top of the image sits where the baseline of text would be. The current paragraph comfortably clears the bottom of the image. + +\null + +In the following example, the accompanying text fills all available lines. This is \textit{not} the same as float/caption in other classes! + +\BlockImage[r]{novel-testimage.png}[Text accompanying image. The fact that this text fills the available area is not automated.\par I first compiled with some random amount of text, then adjusted it so that it filled.\par] + +If you change the font size or lines per page, then the accompanying text, above, probably won't fill its space. Or, it may overflow, and mingle with this paragraph. So, this is not a technique with wide applicability. + +\null + +Below, the image is centered: + +\BlockImage[c]{novel-testimage.png}[\pushtextdown{\nbs}This text overlies the image.\par] + +\clearpage + + +% NEXT PAGE: + +This page tests \string\InlineImage\space effects. Note that the command also has a starred version. The difference: Unstarred, the width of the image is taken into account. Starred, the width of the image is ignored. + +\null + +\noindent\InlineImage*[0,\normalXheight]{novel-testimage.png}This paragraph is not indented. The starred command places an image, offset so that its top sits at the X-height of the text. The image underlies the following text. If you use this effect, then be sure that the image is much lighter, or the text will be hard to read. + +\null\null\null + +\noindent\InlineImage[0,b-\normaldescender]{novel-testimage.png}This paragraph is not indented. The unstarred command places an image, offset so that its bottom sits at the descender of the text. It was necessary to insert previous blank lines, or the image would overlie (and obscure) the preceding paragraph. + +\null\null + +\noindent\InlineImage[0,1.5em]{novel-testimage.png}This paragraph is not indented. The unstarred command places an image, offset so that it rises above the paragraph, and also descends beneath the following text. + +\null\null + +In all of the above, the alignments will change, if you change the text size or lines per page. + +\clearpage + + +% NEXT PAGE: + +This page tests the footnote and endnote capabilities.\footnote{This is the first sample footnote. Unless you change the marker style, it will be marked with an asterisk.} Two footnotes have been placed.\footnote{This is the second footnote. Unless you change the marker style, it will be marked by a dagger.} + +\scenebreak + +The \string\scenebreak\space command was used above. This paragraph is not indented, unless you change the behavior using \string\SetScenebreakIndent. + +\scenestars + +As above, but this time marked by three centered asterisks. + +\sceneline + +As above, but this time marked by a short, centered line. + +\QuickChapter[3em]{Just Before Midnight} + +Above, \string\QuickChapter\space inserted two blank lines, in which a phrase is followed by a short line. The text is slightly larger than normal, and sits slightly above the normal baseline. + +\null + +There is a \string\bigemdash\space between here\makebox[2.5em]{\bigemdash}and here. Its length is set at 2.5em, using \string\makebox. Compare to normal—emdash. Thickness and yoffset is adjustable. + +\null + +This tests the endnote capability.\endnote You will see marker 1 after the last sentence, and marker 2 after this one.\endnote\memo{This text does not print.} But no actual endnotes are created. You may manually place them wherever you wish. For that, you may use the \string\endnotetext\space command (if its style works for you), or any other method. + +\null + +\endnotetext{1}{This tests the \string\endnotetext\space command, although you would not normally place the text of an endnote here. It is only a test.\par} + +\endnotetext{2}{Text for a second endnote.\par} + +\clearpage + + +% NEXT PAGE: + +The following tests the \textit{parascale} and \textit{linegap} environments: + +\begin{linegap}{8} +\vspace{0.4\nbs} +\begin{parascale}[0.8] +This text has a different scale than normal. Both the font size and the baseline skip have been proportionately changed. As a result, the lines are not on the normal line grid.\par +If the following normal text needs to be back on grid (usually the case), there are two possible solutions: (1) Compile, note the number of lines occupied by this text, then calculate how much vertical space must be added, to restore the grid. Manually add that space, usually splitting it top and bottom. (2) Place \textit{parascale} within a \textit{linegap} environment. This will restore the grid. You will still have to compile, and count lines\par +\end{parascale} +\end{linegap} + +Back to normal text. The above scaled text is wrapped in \textit{linegap}. The gap is not necessarily the number of lines in the scaled text. It is the number of normal lines that occupy that vertical space. + +At the dimensions originally used for this test, there are 9 lines of scaled text. They occupy more or less 7 lines of normal vertical space. However, I chose an 8 line gap, then added a little \string\vspace\space above the scaled text. I think this looks nicer. + +If you change the dimensions used for this test, then the scaled text and its surrounding will probably not align properly. So, before you use \textit{parascale}, plan ahead by making your settings final. + +\null + +\begin{adjustwidth}{2\normalparindent}{\normalparindent} +\forceindent This text uses the \textit{adjustwidth} environment. It is set to block indent 2\string\normalparindent\space at left, and indent 1\string\normalparindent\space at right. The \string\forceindent\space command precedes the text, so that (within the block) it indents like an ordinary paragraph.\par +\end{adjustwidth} + +\clearpage + + +% NEXT PAGE: + +This tests various text effects: + +\null + +\FirstLine{\noindent\charscale[2]{T}\hspace{-2pt}his line has its first letter enlarged, and sets the first line in small caps. After the first line, text continues as usual. Note that space must be provided prior to this paragraph, so that the first letter does not intrude on text (or margin) above it.} + +The \string\charscale\space command scales the letter, and \string\FirstLine\space performs the small caps. Also, some kerning was applied so that the large T has the following \textsc{h} resting beneath its top. The \string\noindent\space command goes inside \string\FirstLine. + +\null\null + +\lettrine{H}{ere}, is placed is a drop cap, using \string\lettrine. But you will only see the drop cap if you place \string\RequirePackage\{lettrine\} in the Preamble. Otherwise, you will not see anything unusual. This behavior is specific to the test suite. Anywhere else, if you try to use \string\lettine\space without loading the package, an error will result.\par +In general, it is difficult to style drop caps so that they look good for many different letters. An alternative is to use images for the drop caps. If you use images, please read the \textit{novel} documentation, as the method is not the same as the usual methods from the \textsc{lettrine} package.\par +Note that there is no automated way to combine a drop cap with a first line in small caps. This is discussed in \textsc{novel} documentation. + +\null +This line is in the main font.\par +\textsf{This line is in the sans font.}\par +\texttt{This line is in the mono font.}\par +{\mustbelibertinus This line is in Libertinus Serif.}\par % specific to testsuite +{\mustbelmodern This line is in Latin Modern Roman.}\par % specific to testsuite + + +\clearpage + + +% NEXT PAGE: + +\thispagestyle{dropfoliobeneath} + +This page tests drop folio. There will be no page header. If your head/foot style normally has a footer, then you will see it as usual. + +If you choose a head/foot style without footer, you will still see a page number centered below. Exactly where it appears will depend on which kind of drop folio is used. + +If using \string\thispagestyle\{dropfoliobeneath\} then the page number will appear within the lower margin. + +If using \string\thispagestyle\{dropfolioinside\} then the page number will appear just above the lower margin, where the final line of text would otherwise be placed. + +Use class options [draft,shademargins] to see the position. + +The initial choice is \textit{dropfoliobeneath}. + +\clearpage + +% NEXT PAGE: + +This tests the \string\cleartoend\space command. If this page is recto (odd), then exactly one blank page will follow. If this page is verso (even), then exactly two blank pages will follow. + +\null\null + +You may change the settings in the Preamble, or try additional settings. + +\null\null + +If you have the Adobe Acrobt Pro software, then you can also test for PDF/X compliance: + +First, add \lnum{\string\SetPDFX[CGATSTR001]\{X-1a:2001\}} to the Preamble. Then compile, and verify that the resulting PDF meets the standard, without embedded *.icc profile. + +Note that if you use an image other then the included \textit{novel-testimage.png}, then your own image must be prepared according to the specification in \textit{novel} documentation. Otherwise, an incorrectly prepared image will cause PDF/X compliance to fail. + + +\cleartoend % ensures final page is blank verso + +\end{document} + diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/firstletterspecial.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/firstletterspecial.png Binary files differnew file mode 100644 index 00000000000..3c096c2624e --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/firstletterspecial.png diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/firstlinespecial.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/firstlinespecial.png Binary files differnew file mode 100644 index 00000000000..648e8211d8a --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/firstlinespecial.png diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/gnome-censored.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/gnome-censored.png Binary files differnew file mode 100644 index 00000000000..2bd11a7149f --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/novel/html-resources/gnome-censored.png diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/irategnome.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/irategnome.png Binary files differdeleted file mode 100644 index ac0dac9fcce..00000000000 --- a/Master/texmf-dist/doc/lualatex/novel/html-resources/irategnome.png +++ /dev/null diff --git a/Master/texmf-dist/doc/lualatex/novel/novel-documentation.html b/Master/texmf-dist/doc/lualatex/novel/novel-documentation.html index f44b8b6a263..af834bc9118 100644 --- a/Master/texmf-dist/doc/lualatex/novel/novel-documentation.html +++ b/Master/texmf-dist/doc/lualatex/novel/novel-documentation.html @@ -30,7 +30,7 @@ div.d5 {margin:0px 0px 16px 16px; padding-bottom:0.5em; border-top:0; border-rig div.d6 {margin:0px 0px 16px 16px; padding-bottom:0.5em; border-top:0; border-right: 0px; border-bottom:1px dotted #666666; border-left:1px dotted #666666;} div.page {padding:16px 0px 16px 0px; border-top:4px solid #505050;} div.codeblock {overflow:auto; margin:16px; padding: 8px; border: 1px solid #000000;} -code {font-family:monospace,monospace; font-size:92%; color:#200050; background:transparent none; padding:0px 3px 0px 3px;} +code {font-family:monospace,monospace; color:#200050; background:transparent none; padding:0px 3px 0px 3px;} *.smaller {font-weight:normal; font-size:88%;} *.noindent {text-indent:0px;} *.noindent1 {text-indent:0px; margin-top:8px;} @@ -342,7 +342,15 @@ function closeall() { <li><a href="#h5.3.1">5.3.1 \SetScenebreakIndent</a></li> </ul> </li><!-- end 5.3 --> - <li id="l5.4"><span class="n" style="visibility:hidden"></span><a href="#h5.4">5.4 Chapter Numbering</a></li><!-- end 5.4 --> + <li id="l5.4"><span class="n" style="visibility:hidden"></span><a href="#h5.4">5.4 Chapter Numbering</a> + </li><!-- end 5.4 --> + <li id="l5.5"><span class="n"></span><a href="#h5.5">5.5 First Lines</a> + <ul id="u5.5"> + <li><a href="#h5.5.1">5.5.1 First Character Special</a></li> + <li><a href="#h5.5.2">5.5.2 First Line Small Caps</a></li> + <li><a href="#h5.5.3">5.5.3 Drop Caps</a></li> + </ul> + </li><!-- end 5.5 --> </ul> </li><!-- end 5 --> @@ -470,6 +478,7 @@ function closeall() { <li><a href="#h8.3.2.10">8.3.2.10 Author's Note</a></li> <li><a href="#h8.3.2.11">8.3.2.11 Map</a></li> <li><a href="#h8.3.2.12">8.3.2.12 Second Half-Title</a></li> + <li><a href="#h8.3.2.13">8.3.2.13 End of Front Matter</a></li> </ul> </li> <li id="l8.3.3"><span class="n"></span><a href="#h8.3.3">8.3.3 Main Matter</a> @@ -565,12 +574,13 @@ function closeall() { <!-- **************************************************************************************** --> <h1 id="h0">Document class <i>novel</i> - documentation</h1> -<p class="noindent">Version: 1.43.1, 2017/11/12. <span id="screennoscript" class="screennoscript"><b>For enchanced navigation of this file, turn on JavaScript.</b></span></p> +<p class="noindent">Version: 1.46, 2017/11/17. <span id="screennoscript" class="screennoscript"><b>For enchanced navigation of this file, turn on JavaScript.</b></span></p> <div><script type="text/javascript">if(document.getElementById("screennoscript")){document.getElementById("screennoscript").style.display="none";}</script></div> <p class="noindent" style="position:relative"><span style="position:absolute; top:-.1em; font-size:150%; color:#008000">☺</span> An example novel, text and cover, can be found at the <a class="external" rel="external" target="new" href="https://github.com/RobtAll/novel/">GitHub project page, https://github.com/RobtAll/novel/</a>, in the "other" folder. You will find its TeX source and the resulting PDF. The PDF text and cover meet submission standards for major American print-on-demand services.</p> <p>A smaller example document is <i>novel-example.tex</i>, which can be found in the <i>extras</i> folder within this documentation.</p> <p class="notprinted"><b>Printing this file:</b> A printed version (PDF or paper) has condensed Table of Contents, and inactive hyperlinks. If your user agent has trouble printing, do this: In a UNIX-compatible plain text editor, edit this file. About 83 lines from the top you will see a block of style that is commented out. Remove the comments so that the block is effective. Load the edited HTML file with JavaScript turned off.</p> <p class="notprinted">Some user agents have difficulty previewing this HTML file for print, or printing it. If you wish to print (to PDF or paper) then try this: Copy the HTML file, and name the copy <i style="white-space:nowrap">novel-documentation-print.html</i>. That might (or might not) help. In any case, the printable format of this file has an abbreviated list of contents at the top, not as a sidebar.</p> +<p><b>Attention:</b> Changed behavior of <code>\BlockImage</code> in v. 1.46. See <a href="#hG">issue G.3</a></p> <p> </p> @@ -650,7 +660,7 @@ function closeall() { <div class="d5" id="d1.2.1.1"> <p class="noindent">The pre-loaded <i>polyglossia</i> package (not <i>babel</i>) provides language support. By default, <i>novel</i> is configured for American English.</p> <p>If your document's language is something else, or if you will be writing in multiple languages, see the <i>polyglossia</i> package documentation regarding <code>\setdefaultlanguage</code> and other commands.</p> -</div><!-- end 1.2.2.2 --> +</div><!-- end 1.2.1.1 --> </div><!-- end 1.2.1 --> <h4 id="h1.2.2">1.2.2. Do Not Load Fonts via <code>\usepackage</code> or <code>\RequirePackage</code></h4> @@ -1471,13 +1481,13 @@ In this context, "folio" means page number. The header (if any) is blank. If the <p>The styled text is limited to one line (no wrap). If you have a long chapter title or subtitle, then break it into pieces of manageable size, by repeating the command(s). Example:</p> <p class="code"><img class="floatright" src="html-resources/chaptertitlesubtitle.png" width="338" height="179" title="chapter title and subtitle, left aligned" alt="chapter title and subtitle, left aligned"/> <code><small> -\begin{ChapterStart} -\vspace{2\nbs} -\ChapterTitle[l]{XV} -\vspace{\nbs} -\ChapterSubtitle[l]{In which Lord Withens, returned from his quest,} -\ChapterSubtitle[l]{encounters an Army of Gnomes at his castle gate.} -\end{\ChapterStart} +\begin{ChapterStart}<br/> +\vspace{2\nbs}<br/> +\ChapterTitle[l]{XV}<br/> +\vspace{\nbs}<br/> +\ChapterSubtitle[l]{In which Lord Withens, returned from his quest,}<br/> +\ChapterSubtitle[l]{encounters an Army of Gnomes at his castle gate.}<br/> +\end{\ChapterStart}<br/> Following the dark and stormy night, it was a bright and sunny day. That did nothing to improve the demeanor of Lord Withens, who was still soaked from riding through the rain. ...\par </small></code></p> </div><!-- end 5.1.3.2 --> @@ -1626,7 +1636,38 @@ Unfortunately, novelists of that era had so little to write about, or they would <p class="centerimg"><img src="html-resources/robberies.png" width="411" height="98" title="odinal chapter numbering" alt="ordinal chapter numbering"/></p> </div><!-- end 5.4 --> +<h3 id="h5.5">5.5. First Lines and Drop Caps</h3> +<div class="d3" id="d5.5"> +<p class="noindent">The first line of chapter text is often treated with a style of its own. Often, all or part of the first line is in small caps. The first letter may be larger than the rest. Or, the first letter may occupy several lines (sometimes using an image). This last effect is known as <i>drop cap</i> (French <i>lettrine</i>).</p> +<h4 id="h5.5.1">5.5.1. First Character Special</h4> +<div class="d4" id="d5.5.1"> +<p class="noindent">Use the <code>\charscale</code> command to size the first letter (or more than one letter) so that it stands above the remainder of the line. Remember that you will see a capital letter standing next to lowercase letters, so it will appear taller. You may also use a font command. Example, where <code>\NewFontFace\alexbrush{AlexBrush-Regular.ttf}</code> appears in Preamble:</p> +<p class="code"><code> +\noindent\charscale[1.6]{\alexbrush I}\hspace{0.2em}t was a dark and stormy night. Well, it really wasn't all that dark, seeing as how this story is set in Las Vegas. +</code></p> +<p class="centerimg"><img src="html-resources/firstletterspecial.png" width="680" height="83" alt="first letter special" title="first letter special"/></p> +</div><!-- end 5.5.1 --> + +<h4 id="h5.5.2">5.5.2. First Line Small Caps</h4> +<div class="d4" id="d5.5.2"> +<p class="noindent">If you want to place a portion of the first line in small caps, then simply do it using <code>\textsc{text}</code>. This effect can also continue to additional lines. That is, it does not automatically stop at the end of the first line.</p> +<p>The <i>magaz</i> package is pre-loaded in <i>novel</i>. It provides the <code>\FirstLine</code> command, which takes the entire first paragraph as its argument. Place <code>\noindent</code> inside. You may also style the first letter (or more than one) as described above; the styled letter appears inside the <code>\FirstLine</code> command. Example:</p> +<p class="code"><code> +\FirstLine{\noindent\charscale[1.6]{\alexbrush I}\hspace{0.2em}t was a dark and stormy night. Well, it really wasn't all that dark, seeing as how this story is set in Las Vegas.} +</code></p> +<p class="centerimg"><img src="html-resources/firstlinespecial.png" width="682" height="84" alt="first line small caps" title="first line small caps"/></p> +</div><!-- end 5.5.2 --> + +<h4 id="h5.5.3">5.5.3. Drop Cap</h4> +<div class="d4" id="d5.5.3"> +<p class="noindent">The <i>lettrine</i> package is pre-loaded and pre-configured in <i>novel</i>. The configuration forces lines to remain on grid. Lines are not added if the drop cap rises above prevailing text (DiscardVskip is very large). The Findent is set to 0.25em, and Nindent is set to 0em.</p> +<p>For information, see the <i>lettrine</i> package documentation and examples. Be aware that creating good-looking drop caps is harder than you think, even with automation. That is because you will be visually comparing an enlarged letter to surrounding normal text, and it is difficult to align the drop cap with the margin, in a way that looks right. In any case, drop caps are rarely used in popular fiction.</p> +<p>Do not use the <code>[image=true]</code> option with <i>lettrine</i>. Instead, place an image using <i>novel's</i> own <code>\InlineImage</code> command. If you set its vertical offset at baseline, then the bottom of the image will align with the baseline of the final line in the displaced text.</p> +<p>Note that <code>\lettrine</code> has an additional argument after the drop cap.</p> +<p>You cannot use <code>\lettrine</code> in conjunction with <code>\FirstLine</code>. This is a fact of life. If you wish to use a drop cap and also have the first line in small caps, do this: Use empty braces <code>{}</code> as the final argument to <code>\lettrine</code>. Then use <code>\textsc</code> with enough text to continue to the second line. Note where the first line ends. Then, move the closing brace of <code>\FirstLine</code> to that position. You may place the closing brace in the middle of a word, at a hyphenation point, if you wish (do not manually add the hyphen). This is the only method that provides a satisfactory layout.</p> +</div><!-- end 5.5.3 --> +</div><!-- end 5.5 --> </div><!-- end 5 --> @@ -1805,7 +1846,7 @@ This text is in lightgray, until the group ends.<br/> <div class="d4" id="d6.3.1"> <p class="noindent">• The <code>\raisebox</code> command does not play well with novel. It can be used, but there is the great risk of disturbing the line grid. Use <code><a href="#h6.1.2">\charscale</a></code> instead.</p> <p>• If you must use the <code>\vspace</code> command (or its relative, <code>\vskip</code>) be sure to measure the space in units of <code>\nbs</code> (normal baseline skip).</p> -<p>• Avoid the <i>minipage</i> and <i>parbox</i> environments. These are likely to disrupt the line grid. When that happens, restoring the grid is your own responsibility. You may find the <i>adjustwidth</i> environment to be a useful alternative.</p> +<p>• Avoid the <i>minipage</i> and <i>parbox</i> environments. These are likely to disrupt the line grid. When that happens, restoring the grid is your own responsibility. You may find the <i>adjustwidth</i> and <i>linegap</i> environments to be useful, as described in the next section.</p> <p>• In most cases, do not use the center environment. You may use <code>{\centering ... \par}</code> instead, for a single paragraph. The center environment may cause the text to go off-grid. That's not a problem on some stand-alone pages where you don't care about the grid, but it is ugly in the middle of running text.</p> <p>• Avoid positioning via the <i>textblock</i> or <i>textblock*</i> environments (package <i>textpos</i>). Actually, <i>novel</i> uses that code internally. But if not handled with more care than usual, positioned text can disrupt the baseline and position of surrounding text. You may use <code><a href="#h6.1.2">\charscale</a></code> to position small amounts of text safely, but not on a paragraph basis. Images have built-in positioning arguments, which may also be useful for positioned text.</p> <p>• Do not use floats. If you try, then <i>novel</i> may intercept them with a nasty message.</p> @@ -1819,6 +1860,15 @@ This text is in lightgray, until the group ends.<br/> <p class="noindent">This is not a complete list. It merely addresses a few situations that you are likely to encounter, without the need for elaborate code, and without loading additional packages.</p> <p style="margin-top:10pt"><code>\begin{adjustwidth}{<em>left</em>}{<em>right</em>} ... \end{adjustwidth}</code></p> <p>This environment, from the included <i>changepage</i> package, is the most useful way to create block indents. The included text may have multiple paragraphs and span pages. The left and right arguments are lengths, being the amount to <em>increase</em> the respective margins from their normal values.</p> +<p style="margin-top:10pt"><code>\begin{linegap}{<em>integer</em>} ... \end{linegap}</code></p> +<p>This environment creates a gap of <i>integer</i> lines. Then, the following text will be on-grid, regardless of what you place inside the environment. If the contents are small relative to the gap, there will be a lot of white space. If the contents are too large, then they will overflow the gap and overlap the following text, rather than push it down.</p> +<p>This environment is particularly useful when it contains highly styled text, because you don't have to calculate a <code>\vspace</code> to restore the following line grid. Pick a likely gap, then make it larger or smaller as desired.</p> +<p>The environment fails if it crosses a page boundary. There will be no error, merely an undesired result. Be sure to plan your writing so that the linegap remains on a single page.</p> +<p>If you use a non-integer linegap, it will be processed that way, but there will be a warning in the log file. The only reason it is not an error, is that a non-integer linegap might be useful on some display pages.</p> +<p style="margin-top:10pt"><code>\rotatebox{<em>text</em>}</code></p> +<p>This command is from the included <i>graphicx</i> package. It rotates the text, about an axis at the lower left of the text. If you wish to rotate the text about its center, use <code>\rotatebox[origin=c]{text}</code>.</p> +<p>This command plays nicely with <code>\charscale</code>, so you can size, rotate, and displace a string of text (single line). It makes a difference which command goes inside the other. More likely than not, the effect you want is obtained by using <code>\charscale</code> on the outside, with <code>\rotatebox</code> inside.</p> +<p>To avoid disturbing the line grid, <code>\rotatebox</code> is best used inside the <i>linegap</i> environment.</p> <p style="margin-top:10pt"><code>\phantom{<em>text</em>}</code></p> <p>Does not print the text, but leaves a horizontal gap as if the text were there.</p> <p style="margin-top:10pt"><code>\mbox{<em>text</em>}</code></p> @@ -2048,16 +2098,17 @@ This text is in lightgray, until the group ends.<br/> <h3 id="h7.3">7.3. Placing Images In Your Document</h3> <div class="d3" id="d7.3"> <p class="noindent">An image may be placed as an inline element, using the <code>\InlineImage</code> or <code>\InlineImage*</code> command. This allows the image to mingle with text, and even have text as an overlay.</p> -<p><code>\BlockImage</code> places the image so that <em>subsequent</em> text will clear the bottom of the image, and be on the baseline grid. You may also <em>accompany</em> the image with text in its own block space, if you wish.</p> +<p><code>\BlockImage</code> places the image as a block element. It may be accompanied by text, within the same block. IMPORTANT: Beginning with version 1.46, the behavior of this command has changed. See its description, below.</p> <p>If your book has a lot of images mingled with text, then you should consider using a page layout program (such as Scribus) instead of TeX. That's because the best strategies for an image-intensive picture book are very different from the strategies adoped by <i>novel</i>.</p> <p>• Beware of image overlap. Images are not allowed to overlap each other, in the kind of commercial printing that is likely to be used for your book. However, since overlap is generally legal in PDF, TeX will not issue an error.</p> <p>• Do not use the ordinary TeX commands, or environments, for floats or figures.</p> +<p>• Do not rotate an image in TeX. Prepare the rotated image in a graphics program, flatten it at correct size and dpi, then insert the pre-rotated image.</p> +<p>• Do not scale or crop an image in TeX. Do it in a graphics program. Be sure that the finished image is flattened, at correct size and dpi.</p> -<h4 id="h7.3.1">7.3.1. <code>\charscale[<em>scale,hoffset,voffset</em>]{<em>text</em>}</code> and starred version</h4> +<h4 id="h7.3.1">7.3.1. Image-Like Effects in Text</h4> <div class="d4" id="d7.3.1"> -<p class="noindent">The <code>\charscale</code> command pertains to text, not images. It is mentioned here because it can place text almost anywhere on a page, even overlapping other text or previously-placed images. Thus, it provides an image-like effect.</p> -<p>The command is documented in <a href="#h6.1.2">section 6.1.2</a>.</p> -</div><!-- end 7.4.1 --> +<p class="noindent">You may scale, rotate, and displace text. This is done using text commands, and the result is still text. When cleverly done, it provides an image-like effect. See <a href="#h6">section 6</a> for the possibilities.</p> +</div><!-- end 7.3.1 --> <h4 id="h7.3.2">7.3.2 <code>\InlineImage[<em>hoffset,voffset</em>]{<em>imageFile.png or .jpg</em>}</code> and starred version</h4> <div class="d4" id="d7.3.2"> @@ -2065,9 +2116,11 @@ This text is in lightgray, until the group ends.<br/> <p>You may offset the image horizontally or vertically. Positive direction is to the right and up. If you use one offset, then you must use both (if necessary, <i>0em</i>). Any units of length may be used, but the preferred units are <i>em</i> or <code>\textwidth</code> for horizontal, and <i>em</i> or <code>\nbs</code> for vertical, because these are most compatible with the <code><a href="#hA">\Rework</a></code> commands.</p> <p>By default, the <em>top</em> of the image is at the text baseline. If you prefer that the <em>bottom</em> of the image be at the text baseline, use voffset <i>b</i>. Example:</p> <p class="code"><code>\InlineImage[0em,b]{imageFile.png}</code></p> -<p>Thanks to the included <i>calc</i> package, offsets may use <code>\widthof{<em>text</em>}</code> and/or <code>\heightof{<em>text</em>}</code> as lengths. The most useful of these is when you wish to align the top of an image at the X-height of surrounding text:</p> +<p>Thanks to the included <i>calc</i> package, offsets may use <code>\widthof{<em>text</em>}</code>, <code>\heightof{<em>text</em>}</code>, or <code>\depthof{<em>text</em>}</code> as lengths. The most useful of these is when you wish to align the top of an image at the X-height of surrounding text:</p> <p class="code"><code>\InlineImage[0em,\heightof{X}]{imageFile.png}</code></p> <p>You may also use <code>\heightof{\Aring}</code> for the tallest accented letter normally found in Latin-1.</p> +<p>Another possibility is to align the bottom of an image with the lowercase descender:</p> +<p class="code"><code>\InlineImage[0em,b-\depthof{gjpqy}]{imageFile.png}</code></p> <p>Lengths <code>\imagewidth</code> and <code>\imageheight</code> may also be used for offsets. These lengths remain set, and can be used for other purposes (such as displacing text) until another image is placed.</p> <p>Offsets may be written as combinations of lengths. If you use the baseline <i>b</i> as above, it must be the first character of voffset. If you use <code>\widthof</code> or <code>\heightof</code>, then its backslash must be the first character <em>unless</em> it is preceded by another length. Thus, an offset of <code>-\heightof{X}</code> is prohibited, but you can use <code>0pt-\heightof{X}</code>. <p>Here are some examples of allowable code:</p> @@ -2099,28 +2152,30 @@ He would have taken the car, had it not been stolen. But that was why he was her <p class="centerimg"><img src="html-resources/inlineimagest.png" width="651" height="249" alt="example of InlineImage*"/></p> </div><!-- end 7.3.3 --> -<h4 id="h7.3.4">7.3.4. <code>\BlockImage[<em>alignment,hoffset,voffset</em>]{<em>imageFile.png or .jpg</em>}[<em>text</em>]</code></h4> +<h4 id="h7.3.4">7.3.4. <code>\BlockImage[<em>alignment,hoffset,voffset</em>]{<em>imageFile.png or .jpg</em>}[<em>accompanying text</em>]</code></h4> <div class="d4" id="d7.3.4"> -<p class="noindent">Note that <code>\BlockImage</code> has an optional argument that <i>precedes</i> the mandatory image file name. It has another optional argument that <i>follows</i> the file name. If this second option is used, there must be no space between <code>}[</code>.</p> -<p>The first optional argument has up to three comma-separated values. The first is alignment: <i>l</i>, <i>c</i>, or <i>r</i> for left, center, or right. The second and third values are hoffset and voffset. Unlike the <code>\InlineImage</code> command, do not use <i>b</i> to indicate vertical position relative to the image bottom; it is always at the top with this command. The default alignment is centered, without offsets.</p> -<p>An automatic calculation clears the height of the image. Subsequent text will be on grid. This is the right thing to do when the image and included text fit on a single page. But if they cannot both fit on a single page, an unusual layout will result.</p> +<p>The <code>\BlockImage</code> command places its image as a block element, distinct from the preceding or following text. Be sure to close the preceding paragraph before writing <code>\BlockImage</code>.</p> +<p>The command takes an optional argument with up to three comma-separated values. The first is <i>alignment</i>: <code>l</code>, <code>c</code>, or <code>r</code> for left, center, or right. The second and third values are lengths, <i>hoffset</i> and <i>voffset</i> for the image. Positive offsets are up and right.</p> +<p>Unlike the <code>\InlineImage</code> command, you may not use "b" in the vertical offset. By default top of the image is aligned to the baseline of where text would be, if you did not place an image. You may find that <code>\normalXheight</code> is a useful vertical offset, at it aligns the top of the image to where the X-height would be.</p> +<p>Following the mandatory image filename, an optional argument allows text to appear in the same block as the image. See the next section.</p> +<p>An automatic calculation ensures that text after <code>\BlockImage</code> will comfortably clear the bottom of the image (taking its voffset into account). The text will be on-grid.</p> +<p>Remember that TeX does not care if the image overflows into the margins. Thus, you must review the PDF to ensure that an image does not appear in an unsuitable location. You can visualize margins using the <i>draft,shademargins</i> document class options.</p> </div><!-- end 7.3.4 --> <h4 id="h7.3.5">7.3.5. <code>\BlockImage</code> with Accompanying Text</h4> <div class="d4" id="d7.3.5"> -<p class="noindent">The second optional argument of <code>\BlockImage</code>, following the image file name, may contain text that will accompany the image in the same block of space. The text is left-aligned like ordinary text, no matter which alignment you use for the image. The text may be in more than one paragraph, and may use <code>{\centering ...\par}</code> or <code>\begin{adjustwidth} ... \end{adjustwidth}</code> for positioning relative to the image. The text may overlie the image, using <code>\charscale</code>. You may need to use <code>\forceindent</code> or <code>\backindent</code> to control how the text appears. Note that you cannot automatically "flow" text around an image in <i>novel</i> class.</p> +<p><b>Attention:</b> Changed behavior of <code>\BlockImage</code> in v. 1.46. See <a href="#hG">issue G.3</a></p> +<p class="noindent">The second optional argument of <code>\BlockImage</code>, following the image filename, may contain text that will accompany the image in the same block of space. The text may be more than one paragraph.</p> +<p>If the image is aligned at left or right, then the accompanying text block will be separated from the image by the length of the normal paragraph indent. Within this block, the text will be justified. The usual indentation rules apply.</p> +<p>If the image is aligned at center, then the accompanying text will also be centered (and usually will overlie the image). If you wish to confine the width of this text block to less than the full page text width, then wrap the accompanying text (inside the brackets) in an <i>adjustwidth</i> environment.</p> +<p>Whatever the alignment of image offset, the first line of accompanying text will be vertically located on-grid, where the first line of text would ordinarily sit. If you wish to displace it vertically, then begin the accompanying text with <code>\pushtextdown{<em>length</em>}</code>. It is best to measure the length in terms of the normal baselineskip, <code>\nbs</code>.</p> +<p>Note that you cannot automatically "flow" text around an image in <i>novel</i> class. Although there is a LaTeX package that will do that, parts of it are incompatible with the grid structure of <i>novel</i>, so the package is disallowed. If you cleverly place just the right amount of accompanying text, then you can fill the area next to the image; but this is not automated.</p> +<p>If you write too much accompanying text, it will overflow into the text that follows. There is no automatic increase in the vertical space reserved for the image.</p> <p>Example:</p> -<p class="code"> -<code> -It was a dark and stormy night. Lord Withens mounted his horse and rode through the darkness, accidentally trampling some petunias in Her Ladyship's garden.\par<br/> -\BlockImage[l]{gnome.png}[\begin{adjustwidth}{8em}{0pt}\forceindent Suddenly he was confronted by an irate gnome, who expressed an opinion in the crudest of language, even for a gnome.\par<br/> -Lord Withens was taken aback. How dare this mere gnome speak to him in such a tone of voice? But then he remembered that the gnomes had gone to college, where swearing was routine.\par\end{adjustwidth}]<br/> -\charscale[1, 5\nbs]{CENSORED}\forceindent Lord Withens shrugged, and rode on. There was nothing to do but remain silent, this time taking more care. He would speak with his wife about the gnome situation when he returned.\par -</code></p> -<p class="centerimg"><img src="html-resources/irategnome.png" width="639" height="423" alt="example of BlockImage with accompanying text"/></p> -<p>In the above example, the text to the right of the image happens to have just the right number of lines to fill the available area. But that is only because I wrote it that way. If I had written less, then there would be one or more blank lines before the subsequent text ("Lord Withens shrugged..."). If I had written more, then the subsequent text would have been pushed down by the necessary number of lines, and there would have been more white area underneath the gnome.</p> -<p>Thus, this technique requires careful inspection, particularly if there is the danger that the image or accompanying text may overflow the bottom of the page.</p> -<p>Note that I used the start of the following text as a reference point for placing CENSORED over the gnome. That is not the only way it could have been done, but it was easy to discern the necessary offset.</p> +<p class="code"><code><small>It was a dark and stormy night. Lord Withens mounted his horse and rode through the darkness, accidentally trampling some petunias in Her Ladyship's garden.\par<br/> +\BlockImage[r]{gnome.png}[\pushtextdown{2\nbs}Suddenly he was confronted by an irate gnome, who expressed an opinion in the crudest of language, even for a gnome.\par]<br/> +Lord Withens shrugged, and rode on. There was nothing to do but remain silent, this time taking more care. He would speak with his wife about the gnome situation when he returned.\par</small></code></p> +<p class="centerimg"><img src="html-resources/gnome-censored.png" width="437" height="270" alt="example of BlockImage with accompanying text"/></p> <p>• In general, avoid using accompanying text with an image, with the possible exception of titles and other special layouts. There is little need for it in the flowing text of a novel. If you find that you need to use it frequently, then perhaps your book would benefit from a page layout program such as <i>Scribus</i>, instead of TeX.</p> </div><!-- end 7.3.5 --> </div><!-- end 7.3 --> @@ -2589,7 +2644,13 @@ Finally, I would like to thank... \lipsum[1]<br/> <p><i style="cursor:help" title="Chicago Manual of Style">CMoS</i> recommends that a second Half-Title be the first page of main matter. Thus, it would be page 1, with the actual story beginning on page 3. But it acknowledges that a <i>common practice</i> is for a second Half-Title and its verso to remain part of front matter, so that main matter begins with the story on page 1. Although I have seen a few books that follow the <i style="cursor:help" title="Chicago Manual of Style">CMoS</i> recommendation, it appears that the great majority of them follow the <i>common practice</i>.</p> <p>If your book has <a href="#h8.3.3.2">Part Separators</a> in main matter, then you can do without a second Half-Title.</p> </div><!-- end 8.3.2.12 --> -</div><!-- end 8.3.2.1 --> + +<h5 id="h8.3.2.13">8.3.2.13. Final Page of Front Matter</h5> +<div class="d5" id="d8.3.2.13"> +<p class="noindent">The final page of front matter is always verso. It is almost always blank. The easiest way to insert a blank page is to write <code>\cleartorecto</code> at the end of the preceding recto page.</p> +<p>Why is the final page of front matter almost always blank? It is because it faces the opening page of the main story, and you don't want to show anything that detracts from the scene or mood. But there are exceptions. For example, an Epigraph might usefully contribute to the setting. Or, in the case of an old-style English murder mystery (where you already know that the murderer did it with arsenic to inherit the family estate), a map of the estate, or a family tree, would not detract from the setting. The choice is yours.</p> +</div><!-- end 8.3.2.13 --> +</div><!-- end 8.3.2 --> <h4 id="h8.3.3">8.3.3. Main Matter</h4> <div class="d4" id="d8.3.3"> @@ -3182,17 +3243,30 @@ It was a dark and stormy night, etc.<br/> <h2 id="hG">Appendix G. Known Issues</h2> <div class="d2" id="dG"> -<p class="noindent">Here is a list of known issues (and solutions, if known). Remember that "only compile with lualatex" is not an issue; it is a feature! Also remember that academic-like commands and modes are often disabled in this document class. That is also a feature, not an issue.</p> +<p class="noindent">Here is a list of known issues (and solutions, if known). Remember that "only compile with lualatex" is not an issue; it is a feature! Also remember that academic-like commands and modes are often disabled in this document class. That is a feature, not an issue.</p> +<p>Issues may be reported at the <a class="external" rel="external" target="new" href="https://github.com/RobtAll/novel">GitHub project page</a> or by e-mail if you don't have a GitHub account. The e-mail address is near the top of the <i>novel.cls</i> file. These may change at some future time.</p> +<p>Before reporting an issue, attempt to compile the file <i>novel-testsuite.tex</i>. Make a copy of that file, and also copy the required image <i>novel-testimage.png</i>. Place the copies in your home directory, or some other location where you have read/write privilege. If compile fails, see if your TeX distribution is incomplete or out-of-date.</p> +<p>You may ask for new features, but don't expect any. The <i>novel</i> class is focused on doing one thing well, not several things poorly. That's why several standard LaTeX features are disabled.</p> + -<h3 id="hG.1"><span class="n"></span>G.1. Incorrect string placement with package <i>fmtcount</i></h3> +<h3 id="hG.1"><span class="n"></span>G.1. (Solved) Incorrect string placement with package <i>fmtcount</i></h3> <div class="d3" id="uG.1"> <p class="noindent">Solved. See <a href="#h5.4">section 5.4</a>.</p> </div><!-- end G.1 --> -<h3 id="hG.2"><span class="n"></span>G.2. Compile fails after changing default language</h3> +<h3 id="hG.2"><span class="n"></span>G.2. (Solved) Compile fails after changing default language</h3> <div class="d3" id="uG.2"> <p class="noindent">Solved. If you compile a document sucessfully, then re-compile with a different <code>\setdefaultlanguage</code> setting, then compile may fail the second time. It may stop with error message "You can't use \relax after \the."<p> <p>This depends on which languages are involved. The solution is simple: Discard the <i>*.aux</i> and <i>*.synctex.gz</i> files generated by previous compilation. Then try again.</p> +</div><!-- end G.2 --> + +<h3 id="hG.3"><span class="n"></span>G.3. (Solved) Changed Behavior of \BlockImage</h3> +<div class="d3" id="uG.3"> +<p class="noindent">Prior to version 1.46, the <code>\BlockImage</code> command attempted to measure the height of the image, measure the height of its acommpanying text block (if any), and automatically clear the maximum of the two.</p> +<p>However, the calculation could be disrupted by a variety of text effects. Since it was unreliable, the behavior of <code>\BlockImage</code> has been re-defined, beginning with version 1.46.</p> +<p>Now, the image (and its vertical offset) will be measured. But the height of any accompanying text will <i>not</i> be measured. After the image (and any accompanying text) have been placed, the following text will be on-grid, positioned so as to comfortably clear the image. However, if there is too much accompanying text, that text will overflow down into the following text.</p> +<p>Very few users, if any, will be affected. But if you started a document using <i>novel</i> prior to v. 1.46, and you use <code>\BlockImage</code>, then be sure to review the results.</p> +</div><!-- end G.3 --> </div><!-- end G --> diff --git a/Master/texmf-dist/doc/lualatex/novel/novel.pdf b/Master/texmf-dist/doc/lualatex/novel/novel.pdf index 6714f6e4c59..064d2f0fb55 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-11-11T17:20:38-08:00</xmp:ModifyDate> - <xmp:CreateDate>2017-11-11T17:20:38-08:00</xmp:CreateDate> + <xmp:ModifyDate>2017-11-17T09:45:13-08:00</xmp:ModifyDate> + <xmp:CreateDate>2017-11-17T09:45:13-08:00</xmp:CreateDate> <xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool> - <xmp:MetadataDate>2017-11-11T17:20:38-08:00</xmp:MetadataDate> + <xmp:MetadataDate>2017-11-17T09:45:13-08: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:E8A837EF8FC1F8D748E964EC5E2DF1BD</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:402DBE2D812F646ABB63C42A52EE8082</xmpMM:InstanceID> <xmpMM:RenditionClass>default</xmpMM:RenditionClass> <xmpMM:VersionID>1</xmpMM:VersionID> </rdf:Description> @@ -129,32 +129,32 @@ endobj stream 0 g 0 G BT -/F45 18.17191 Tf 1 0 0 1 178.388 537.015 Tm [<002F0030>-37<00370026002D>]TJ -/F45 13.62884 Tf 1 0 0 1 105.124 503.725 Tm [<0022>-250<00250050>-7<00440056004E0046004F0055>-250<0024004D004200540054>-250<004700500053>-250<005500490046>-250<0033004600540055>-250<00500047>-250<00360054>]TJ +/F46 18.17191 Tf 1 0 0 1 178.388 537.015 Tm [<002F0030>-37<00370026002D>]TJ +/F46 13.62884 Tf 1 0 0 1 105.124 503.725 Tm [<0022>-250<00250050>-7<00440056004E0046004F0055>-250<0024004D004200540054>-250<004700500053>-250<005500490046>-250<0033004600540055>-250<00500047>-250<00360054>]TJ ET 1 0 0 1 161.57 477.093 cm q 4 0 0 4 0 0 cm 1 0 0 1 -161.57 -477.093 cm BT -/F47 11.3574 Tf 1 0 0 1 161.57 477.093 Tm [<0176>]TJ +/F48 11.3574 Tf 1 0 0 1 161.57 477.093 Tm [<0176>]TJ ET 1 0 0 1 161.57 477.093 cm Q 1 0 0 1 -161.57 -477.093 cm BT -/F48 11.3574 Tf 1 0 0 1 53.432 446.295 Tm [<0038004900460053>5<0046>-250<004A0054>-249<005500490046>-250<00450050>-7<00440056004E0046004F005500420055004A0050004F00200020>]TJ -/F45 11.3574 Tf 1.017 0 0 1 203.432 446.295 Tm [<002A0055>-245<004A0054>-246<004A004F>-246<0029>-36<0035002E002D>-246<004700500053004E00420055000D>-246<0042004F0045>-246<00440042004F004F00500055>]TJ +/F49 11.3574 Tf 1 0 0 1 53.432 446.295 Tm [<0038004900460053>5<0046>-250<004A0054>-249<005500490046>-250<00450050>-7<00440056004E0046004F005500420055004A0050004F00200020>]TJ +/F46 11.3574 Tf 1.017 0 0 1 203.432 446.295 Tm [<002A0055>-245<004A0054>-246<004A004F>-246<0029>-36<0035002E002D>-246<004700500053004E00420055000D>-246<0042004F0045>-246<00440042004F004F00500055>]TJ 1 0 0 1 54 431.499 Tm [<0043>-10<0046>-249<0053>7<004600550053004A0046>7<0057>8<0046>-6<0045>-249<0057004A0042>]TJ -/F49 11.3574 Tf 1 0 0 1 128.745 431.499 Tm [<00550046>7<005900450050>-7<0044>]TJ -/F45 11.3574 Tf 1 0 0 1 157.229 431.499 Tm [<000F>-333<002A0047>-249<005A>7<00500056>-248<004900420057>7<0046>-248<00550049004A0054>-249<005100420044004C004200480046>-249<004A004F005400550042004D004D0046>-7<0045000D>-249<004D0050>-7<0050004C>-249<004700500053>]TJ +/F50 11.3574 Tf 1 0 0 1 128.745 431.499 Tm [<00550046>7<005900450050>-7<0044>]TJ +/F46 11.3574 Tf 1 0 0 1 157.229 431.499 Tm [<000F>-333<002A0047>-249<005A>7<00500056>-248<004900420057>7<0046>-248<00550049004A0054>-249<005100420044004C004200480046>-249<004A004F005400550042004D004D0046>-7<0045000D>-249<004D0050>-7<0050004C>-249<004700500053>]TJ 0.996 0 0 1 53.659 416.704 Tm [<000900550046>7<00590053>8<0050>-7<00500055000A001000450050>-7<00440010004D00560042004D004200550046>7<00590010004F0050>7<0057>8<0046004D0010004F0050>7<0057>8<0046004D000E00450050>-6<00440056004E0046004F005500420055004A0050004F000F00490055004E004D000F>-341<002A0047>-253<005A>7<00500056>-252<00420053>7<0046>]TJ 0.98 0 0 1 54 401.909 Tm [<0050004F004D004A004F0046>10<000D>-248<00480050>-247<00550050>-247<005500490046>-247<00240035>49<0022002F>-247<0051004200480046>-247<00420055>-247<00490A1D00510054001B00100010004400550042004F000F00500053004800100051004C00480010004F0050>6<0057>9<0046004D>-247<0042004F0045>-247<0044004D004A0044004C>]TJ 1 0 0 1 53.148 387.113 Tm [<06E0003100420044004C004200480046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>-250<00090029>-37<0035002E002D000A000F>122<06E1>]TJ -/F48 11.3574 Tf 1 0 0 1 54 357.522 Tm [<0025>-5<0046005400440053004A00510055004A0050004F001B>]TJ -/F45 11.3574 Tf 1.02 0 0 1 117.818 357.522 Tm [<09AB0046>]TJ -/F49 11.3574 Tf 1.02 0 0 1 138.758 357.522 Tm [<004F0050>6<0057>8<0046004D>]TJ -/F45 11.3574 Tf 1.02 0 0 1 167.321 357.522 Tm [<00450050>-6<00440056004E0046004F0055>-313<0044004D004200540054>-313<004A0054>-312<004700500053>-313<00580053004A0055004600530054>-312<00500047>-313<00500053004A0048004A004F0042004D>]TJ +/F49 11.3574 Tf 1 0 0 1 54 357.522 Tm [<0025>-5<0046005400440053004A00510055004A0050004F001B>]TJ +/F46 11.3574 Tf 1.02 0 0 1 117.818 357.522 Tm [<09AB0046>]TJ +/F50 11.3574 Tf 1.02 0 0 1 138.758 357.522 Tm [<004F0050>6<0057>8<0046004D>]TJ +/F46 11.3574 Tf 1.02 0 0 1 167.321 357.522 Tm [<00450050>-6<00440056004E0046004F0055>-313<0044004D004200540054>-313<004A0054>-312<004700500053>-313<00580053004A0055004600530054>-312<00500047>-313<00500053004A0048004A004F0042004D>]TJ 0.98 0 0 1 54 342.727 Tm [<098B00440055004A0050004F000D>-245<00550050>-244<0043>-10<0046>-243<00510053004A004F00550046>-7<0045>-244<00550050>-243<005100420051>-7<00460053>59<000D>-245<0058004A00550049>-243<00420A1D0046004F0055004A0050004F>-243<00550050>-244<005500490046>-243<0053>7<0046>-6<00520056004A0053>7<0046004E0046004F00550054>-242<00500047>]TJ 0.995 0 0 1 54 327.932 Tm [<005500490046>-249<00510053004A004F0055000E0050004F000E00450046004E0042004F0045>-250<004E00420053004C00460055000F>-335<002F0050004F000E00440050004D00500053>-249<004A004F005500460053004A005000530054>-250<0042004F0045>-250<00440050004D00500053>-250<00440050>6<0057>8<004600530054>]TJ 1.02 0 0 1 54 313.136 Tm [<00420053>7<0046>-293<0054005600510051>-7<0050005300550046>-7<0045000F>-474<002A004E0042004800460054>-295<00420053>7<0046>-293<0054005600510051>-7<0050005300550046>-7<0045000D>-306<004300560055>-295<0050004F004D005A>-294<00420054>-294<005500490046>6<005A>-294<004E004A004800490055>-294<0043>-10<0046>]TJ @@ -163,12 +163,12 @@ BT 1 0 0 1 54 268.75 Tm [<00500053>-250<004A0054>-250<00420044004200450046004E004A0044000D>-250<005500490046004F>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<004A0054>-250<004F00500055>-250<004700500053>-250<005A>8<00500056000F>]TJ 1 0 0 1 71.036 253.955 Tm [<002300560055>-250<004A0047>-250<005A>7<00500056>-250<00420053>7<0046>-249<00580053004A0055004A004F0048>-250<0042>-251<0045004600550046>-7<00440055004A0057>7<0046>-249<004F0050>6<0057>8<0046004D000D>-250<00500053>-250<00540044004A0046004F00440046>-250<098B00440055004A0050004F000D>-251<00500053>-250<0042>]TJ 1 0 0 1 54 239.16 Tm [<00440050004D004D0046>-7<00440055004A0050004F>-250<00500047>-250<00540049005000530055>-250<0054005500500053004A00460054000D>-250<005500490046004F>-250<0053>8<004600420045>-250<0050004F0002>]TJ -/F45 13.62884 Tf 1 0 0 1 54 213.658 Tm [<0012000F>-333<002700460042005500560053>7<00460054>]TJ -/F45 11.3574 Tf 1.02 0 0 1 54 194.773 Tm [<09AB0053>7<0050005600480049005000560055000D>-334<004A0055>-318<004A0054>-317<0042005400540056004E0046>-7<0045>-318<0055004900420055>-317<005500490046>-318<0051005600530051>-6<005000540046>-318<00500047>-317<005A>7<005000560053>-317<00580053004A0055004A004F0048>-318<004A0054>-317<0042>]TJ +/F46 13.62884 Tf 1 0 0 1 54 213.658 Tm [<0012000F>-333<002700460042005500560053>7<00460054>]TJ +/F46 11.3574 Tf 1.02 0 0 1 54 194.773 Tm [<09AB0053>7<0050005600480049005000560055000D>-334<004A0055>-318<004A0054>-317<0042005400540056004E0046>-7<0045>-318<0055004900420055>-317<005500490046>-318<0051005600530051>-6<005000540046>-318<00500047>-317<005A>7<005000560053>-317<00580053004A0055004A004F0048>-318<004A0054>-317<0042>]TJ 1 0 0 1 54 179.978 Tm [<00440050004E004E00460053>8<0044004A0042004D004D005A>-250<00510053004A004F00550046>-7<0045>-250<0043>-10<0050>-7<0050004C>-250<00500047>-250<098B00440055004A0050004F000F>]TJ 0.98 0 0 1 71.036 165.183 Tm [<0022>-244<004F0046>6<0058>]TJ -/F49 11.3574 Tf 0.98 0 0 1 103.452 165.183 Tm [<004F0050>7<0057>8<0046004D>]TJ -/F45 11.3574 Tf 0.98 0 0 1 130.156 165.183 Tm [<004A0054>-244<00510053>7<0046000E00440050004F098B004800560053>9<0046>-7<0045>-244<00550050>-244<00510053>7<0050>-6<0045005600440046>-244<0042>-245<005400550042004F004500420053>8<0045>-244<00550053004200450046>-244<0043>-10<0050>-7<0050004C>]TJ +/F50 11.3574 Tf 0.98 0 0 1 103.452 165.183 Tm [<004F0050>7<0057>8<0046004D>]TJ +/F46 11.3574 Tf 0.98 0 0 1 130.156 165.183 Tm [<004A0054>-244<00510053>7<0046000E00440050004F098B004800560053>9<0046>-7<0045>-244<00550050>-244<00510053>7<0050>-6<0045005600440046>-244<0042>-245<005400550042004F004500420053>8<0045>-244<00550053004200450046>-244<0043>-10<0050>-7<0050004C>]TJ 1.003 0 0 1 54 150.387 Tm [<0054004A005B0046>-249<00500047>-249<0A25000F0A25004A004F>-249<0038>-249<0059>-249<0A28000F0A25004A004F>-249<0029000D>-250<0058004A00550049>-249<004D0042005A>7<005000560055>-248<004E004200530048004A004F0054>-249<0055004900420055>-249<00420053>7<0046>-248<004D004A004C0046004D005A>-250<00550050>-249<0043>-10<0046>]TJ 0.998 0 0 1 54 135.592 Tm [<00420044004400460051005500420043004D0046>-249<00550050>-249<005500490046>-250<004E005000540055>-249<0058004A00450046004D005A000E005600540046>-7<0045>-249<00510053004A004F0055>-250<005400460053>-15<0057004A004400460054000F>-333<09AB0046>-250<098B004D0046>-249<005A>7<00500056>-248<00420053>7<0046>]TJ 0.98 0 0 1 54 120.797 Tm [<004F0050>7<0058>-203<0053>8<004600420045004A004F0048>-202<004A0054>-204<004A004F>-203<00550049004A0054>-203<004700500053004E00420055000F>-323<002300560055>-203<004A0047>-203<0055004900420055>-203<004A0054>-203<004F00500055>-203<005500490046>-203<0054004A005B0046>-203<00500053>-203<004D0042005A>7<005000560055>-202<005A>7<00500056>]TJ @@ -176,7 +176,7 @@ BT 1.02 0 0 1 54 91.206 Tm [<00560054004A004F0048>-243<005400550042004F004500420053>7<0045>-243<005500460053004E004A004F0050004D00500048005A>-244<0042004F0045>-243<0056004F004500460053005400550042004F004500420043004D0046>-244<0051005600530051>-7<005000540046>9<000F>-325<0023004600540055>-244<00500047>]TJ 0.984 0 0 1 54 76.411 Tm [<0042004D004D000D>-253<005500490046>-253<0029>-38<0035002E002D>-253<00450050>-7<00440056004E0046004F005500420055004A0050004F>-254<00440050004E00460054>-253<0058004A00550049>-253<004A004E0042004800460054>-254<0042004F0045>-253<0046>6<00590042004E0051004D00460054000D>-252<00540050>]TJ 1 0 0 1 54 61.615 Tm [<005A>8<00500056>-250<004C004F0050>7<0058>-250<0058004900420055>-250<005A>8<00500056>-250<00420053>8<0046>-250<00450050004A004F0048000F>]TJ -/F45 10.44878 Tf 1 0 0 1 204.571 39.407 Tm [<0012>]TJ +/F46 10.44878 Tf 1 0 0 1 204.571 39.407 Tm [<0012>]TJ ET endstream @@ -187,52 +187,52 @@ endobj /TrimBox[0 0 396 612]/Parent 12 0 R>> endobj 5 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F45 8 0 R/F47 9 0 R/F48 10 0 R/F49 11 0 R>>/ProcSet[/PDF/Text]>> +<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F46 8 0 R/F48 9 0 R/F49 10 0 R/F50 11 0 R>>/ProcSet[/PDF/Text]>> endobj 15 0 obj -<</Length 8732 >> +<</Length 8675 >> stream BT -/F45 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 +/F46 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 0.997 0 0 1 36 549.847 Tm [<004400490050004A00440046>-250<00500047>-251<00470050004F00550054000F>-335<09AB0046>-251<00440049005000540046004F>-250<00440050004E0051004A004D00460053>-251<004A0054>-251<002D00560042002D00420035>62<00460039000D>-250<0042004F0045>-251<00300051>-7<0046004F>-251<0035>49<005A0051>-6<0046>]TJ 1.02 0 0 1 36 535.052 Tm [<00470050004F00550054>-254<00420053>7<0046>-253<004D0050004200450046>-7<0045>-254<00560054004A004F0048>]TJ -/F49 11.3574 Tf 1.02 0 0 1 143.404 535.052 Tm [<00470050004F005500540051>-6<0046>-7<0044>]TJ -/F45 11.3574 Tf 1.02 0 0 1 184.399 535.052 Tm [<00550046>-6<00440049004F0050004D00500048005A>57<000F>-353<002A0047>-254<005A>7<00500056>-254<00510053>7<0046004700460053>-253<00550050>-254<005600540046>-254<0042>]TJ +/F50 11.3574 Tf 1.02 0 0 1 143.404 535.052 Tm [<00470050004F005500540051>-6<0046>-7<0044>]TJ +/F46 11.3574 Tf 1.02 0 0 1 184.399 535.052 Tm [<00550046>-6<00440049004F0050004D00500048005A>57<000F>-353<002A0047>-254<005A>7<00500056>-254<00510053>7<0046004700460053>-253<00550050>-254<005600540046>-254<0042>]TJ 1 0 0 1 36 520.257 Tm [<00510053>8<00500047004600540054004A0050004F0042004D>-250<00470050004F0055000D>-250<004A0055>-250<0058004A004D004D>-250<0043>-10<0046>-250<004600420054005A>-250<00550050>-250<004D005000420045>-250<0042004F0045>-250<005600540046>-250<004A004F>-250<005600550047000E0A28000F>]TJ 1.02 0 0 1 53.036 505.461 Tm [<002E0042004F005A>-339<005400550042004F004500420053>7<0045>-338<002D00420035>60<00460039>-338<00440050004E004E0042004F00450054>-339<00420053>7<0046>-339<0045004A005400420043004D0046>-7<0045000F>-609<09AB004A0054>-339<0058004A004D004D>-340<0043>-9<0046>]TJ 0.98 0 0 1 36 490.666 Tm [<00540056005300510053004A0054004A004F0048>-227<00420055>-228<098B005300540055000F>-331<002300560055>]TJ -/F49 11.3574 Tf 0.98 0 0 1 138.827 490.666 Tm [<004F0050>7<0057>8<0046004D>]TJ -/F45 11.3574 Tf 0.98 0 0 1 165.349 490.666 Tm [<004A0054>-227<00470050>-8<0044005600540046>-7<0045>-227<0050004F>-228<0050004F0046>-228<00550049004A004F0048>-228<0050004F004D005A>59<000F>-330<0022004F005A00550049004A004F0048>]TJ +/F50 11.3574 Tf 0.98 0 0 1 138.827 490.666 Tm [<004F0050>7<0057>8<0046004D>]TJ +/F46 11.3574 Tf 0.98 0 0 1 165.349 490.666 Tm [<004A0054>-227<00470050>-8<0044005600540046>-7<0045>-227<0050004F>-228<0050004F0046>-228<00550049004A004F0048>-228<0050004F004D005A>59<000F>-330<0022004F005A00550049004A004F0048>]TJ 0.986 0 0 1 36 475.87 Tm [<0055004900420055>-254<004E004A004800490055>-254<004A004F005500460053004700460053>7<0046>-254<0058004A00550049>-254<0055004900420055>-254<0051005600530051>-7<005000540046>-255<004E0042005A>-254<004900420057>7<0046>-254<0043>-10<0046>-7<0046004F>-254<00550050005400540046>-7<0045>-255<00420054004A00450046>10<000F>]TJ 0.98 0 0 1 36 461.075 Tm [<00340050>10<000D>-231<0043>-10<0046>-226<005400560053>7<0046>-224<0055004900420055>-226<005A>7<00500056>-225<0053>8<004600420045>-225<005500490046>-226<00450050>-7<00440056004E0046004F005500420055004A0050004F0002>-331<002A0047>-225<005A>7<00500056>-225<00550042004C0046>-226<0042004F>-225<0046>6<0059004A00540055004A004F0048>]TJ 0.98 0 0 1 36 446.28 Tm [<002D00420035>64<00460039>-173<00450050>-8<00440056004E0046004F0055>-174<0042004F0045>-174<004B005600540055>-174<004400490042004F00480046>-175<005500490046>-174<0044004D004200540054>-174<00550050>]TJ -/F49 11.3574 Tf 0.98 0 0 1 237.08 446.28 Tm [<004F0050>7<0057>8<0046004D000D>]TJ -/F45 11.3574 Tf 0.98 0 0 1 264.884 446.28 Tm [<004A0055>-174<004A0054>-174<0057>7<00460053>-14<005A>-175<0056004F004D004A004C0046004D005A>]TJ +/F50 11.3574 Tf 0.98 0 0 1 237.08 446.28 Tm [<004F0050>7<0057>8<0046004D000D>]TJ +/F46 11.3574 Tf 0.98 0 0 1 264.884 446.28 Tm [<004A0055>-174<004A0054>-174<0057>7<00460053>-14<005A>-175<0056004F004D004A004C0046004D005A>]TJ 1 0 0 1 36 431.484 Tm [<00550050>-250<0058>8<00500053004C>-250<00420054>-250<0046>7<00590051>-7<0046>-7<004400550046>-7<0045000F>]TJ 1.02 0 0 1 53.036 416.689 Tm [<002E0042004F005A>-273<004F0046>6<0058>-274<00440050004E004E0042004F00450054>-273<00420053>7<0046>-273<00510053>6<0050>7<0057004A00450046>-6<0045000F>-413<09AB0046>6<005A>-273<00420053>7<0046>-273<00470050>-7<0044005600540046>-7<0045>-274<0050004F>-273<005500490046>]TJ 0.98 0 0 1 36 401.894 Tm [<004F0046>-7<0046>-7<00450054>-239<00500047>-240<00510053004A004F0055>-240<098B00440055004A0050004F>-239<00580053004A0055004600530054000D>-243<0051>-7<00460053004A0050>-7<0045000F>-335<0022004F0045000D>]TJ -/F49 11.3574 Tf 0.98 0 0 1 231.129 401.894 Tm [<004F0050>7<0057>8<0046004D>]TJ -/F45 11.3574 Tf 0.98 0 0 1 257.782 401.894 Tm [<004900420054>-239<00430056004A004D0055000E004A004F>-240<00310025002700100039>]TJ +/F50 11.3574 Tf 0.98 0 0 1 231.129 401.894 Tm [<004F0050>7<0057>8<0046004D>]TJ +/F46 11.3574 Tf 0.98 0 0 1 257.782 401.894 Tm [<004900420054>-239<00430056004A004D0055000E004A004F>-240<00310025002700100039>]TJ 0.98 0 0 1 36 387.098 Tm [<00550046>-7<00440049004F0050004D00500048005A>-185<0055004900420055>-186<0046>6<005900440046>-6<0046>-7<00450054>-186<005500490046>-185<00440042005100420043004A004D004A0055004A00460054>-186<0044005600530053>7<0046004F0055004D005A>-184<004200570042004A004D00420043004D0046>-186<0057004A0042>-186<00500055004900460053>]TJ 1 0 0 1 36 372.303 Tm [<002D00420035>63<00460039>-250<005100420044004C0042004800460054000F>]TJ -/F45 13.62884 Tf 1 0 0 1 36 346.801 Tm [<0013000F>-333<00240050004E0051004D004600550046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>]TJ -/F45 11.3574 Tf 1.012 0 0 1 35.455 327.917 Tm [<0038004900420055>-246<005A>7<00500056>-245<00420053>7<0046>-246<0053>7<004600420045004A004F0048>-245<004F0050>6<0058>58<000D>-246<004A0054>-246<0050004F004D005A>-246<0042004F>-247<004A004F00550053>7<0050>-6<0045005600440055004A0050004F000F>-329<09AB0046>-246<00440050004E0051004D004600550046>]TJ +/F46 13.62884 Tf 1 0 0 1 36 346.801 Tm [<0013000F>-333<00240050004E0051004D004600550046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>]TJ +/F46 11.3574 Tf 1.012 0 0 1 35.455 327.917 Tm [<0038004900420055>-246<005A>7<00500056>-245<00420053>7<0046>-246<0053>7<004600420045004A004F0048>-245<004F0050>6<0058>58<000D>-246<004A0054>-246<0050004F004D005A>-246<0042004F>-247<004A004F00550053>7<0050>-6<0045005600440055004A0050004F000F>-329<09AB0046>-246<00440050004E0051004D004600550046>]TJ 0.98 0 0 1 36 313.121 Tm [<00450050>-7<00440056004E0046004F005500420055004A0050004F>-223<004A0054>-224<004A004F>-223<0029>-38<0035002E002D>-224<004700500053004E00420055000D>-230<0045004A0053>8<0046>-7<00440055004D005A>-223<00580053004A0A1D0046004F>-224<004A004F>-223<0029>-38<0035002E002D>-224<005300420055004900460053>]TJ 0.98 0 0 1 36 298.326 Tm [<005500490042004F>-183<0046>6<0059005500530042004400550046>-6<0045>-184<00470053>7<0050004E>-183<00440050>-7<00450046>10<000F>-316<09AB00460053>7<0046>-183<00420053>8<0046>-183<004F0056004E00460053>7<005000560054>-183<0046>7<00590042004E0051004D00460054>-183<0042004F0045>-184<004A004E0042004800460054000D>]TJ 1 0 0 1 36 283.531 Tm [<00550050>-7<0050>-250<0045004600550042004A004D0046>-7<0045>-250<00550050>-250<0043>-10<0046>-250<00510053>8<004600540046004F00550046>-7<0045>-250<00420054>-250<003100250027>24<000F>]TJ -/F45 13.62884 Tf 1 0 0 1 36 258.029 Tm [<0014000F>-333<002D004A00440046004F00540046>]TJ -/F45 11.3574 Tf 1.02 0 0 1 36 239.145 Tm [<09AB0046>-331<002D00420035>61<00460039>-330<00440050>-7<00450046>9<000D>-352<0042004F0045>-331<0042004400440050004E00510042004F005A004A004F0048>-331<00450050>-7<00440056004E0046004F005500420055004A0050004F000D>-353<004A0054>-331<0053>7<0046004D0046004200540046>-6<0045>]TJ +/F46 13.62884 Tf 1 0 0 1 36 258.029 Tm [<0014000F>-333<002D004A00440046004F00540046>]TJ +/F46 11.3574 Tf 1.02 0 0 1 36 239.145 Tm [<09AB0046>-331<002D00420035>61<00460039>-330<00440050>-7<00450046>9<000D>-352<0042004F0045>-331<0042004400440050004E00510042004F005A004A004F0048>-331<00450050>-7<00440056004E0046004F005500420055004A0050004F000D>-353<004A0054>-331<0053>7<0046004D0046004200540046>-6<0045>]TJ 1 0 0 1 36 224.349 Tm [<0056004F004500460053>-250<005500490046>-250<002D0042005500460039>-250<00310053>8<0050004B0046>-7<00440055>-250<003100560043004D004A0044>-250<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<0A21000F0A230044>-250<00500053>-250<004D0042005500460053>59<000F>]TJ 0.983 0 0 1 53.036 209.554 Tm [<09AB0046>-255<00440050004E00510042004F004A0050004F>-255<00470050004F00550009>11<0054000A>-254<004A00540009>11<00420053>8<0046000A>-254<004D004A00440046004F00540046>-7<0045>-255<0056004F004500460053>-256<005500490046>-255<0034002A002D>-255<00300051>-7<0046004F>-255<00270050004F0055>]TJ 1 0 0 1 36 194.759 Tm [<002D004A00440046004F00540046>10<000D>-250<0057>8<004600530054004A0050004F>-250<0A21000F0A21000F>]TJ -/F45 13.62884 Tf 1 0 0 1 36 169.257 Tm [<0015000F>-333<0037>79<004600530054004A0050004F>]TJ -/F45 11.3574 Tf 1 0 0 1 36 150.372 Tm [<0A21000F0A240A22000E0A21000F0A240A23000F0A21000D>-250<0A220A200A210A27000E0A210A21000E0A210A22001B>-333<00440050004F0055004A004F00560046>-7<0045>-250<00450050>-7<0044>-250<004A004E00510053>7<0050>7<0057>8<0046004E0046004F0055000F>]TJ -1 0 0 1 36 135.577 Tm [<0A21000F0A240A21000D>-250<0A220A200A210A27000E0A210A20000E0A200A22001B>-333<0046>6<0057>8<0046004F>-249<0043>-10<00460A1D00460053>-250<00450050>-7<00440054000D>-250<004E004A004F00500053>-250<004A004F005500460053004F0042004D>-250<004400490042004F004800460054000F>]TJ +/F46 13.62884 Tf 1 0 0 1 36 169.257 Tm [<0015000F>-333<0037>79<004600530054004A0050004F>]TJ +/F46 11.3574 Tf 1 0 0 1 36 150.372 Tm [<0A21000F0A240A26000D>-250<0A220A200A210A27000E0A210A21000E0A210A27001B>-333<0031005000540054004A0043004D005A>-250<098B004F0042004D>-250<0057>7<004600530054004A0050004F000F>-332<003D0023004D0050>-7<0044004C002A004E004200480046>-250<004400490042004F00480046>9<000F>]TJ +1 0 0 1 36 135.577 Tm [<0A21000F0A240A21000E0A21000F0A240A23000F0A21001B>-333<002300460A1D00460053>-250<00450050>-7<00440054000D>-250<00440050>-7<00450046>-250<0044004D00460042004F00560051>9<000F>]TJ 1 0 0 1 36 120.782 Tm [<0A21000F0A240A20000D>-250<0A220A200A210A27000E0A200A29000E0A210A24001B>-333<0053>7<0046004E0050>7<0057>8<0046>-6<0045>-250<00450046004300560048>-250<004700460042005500560053>7<0046>10<000D>-249<004E0042004B00500053>-250<00450050>-7<00440054>-250<0053>7<0046>7<00580053004A00550046>10<000F>]TJ 1 0 0 1 36 105.986 Tm [<0A21000E0A230A2206D70A21000F0A230A28000D>-250<005700420053004A005000560054>-250<098B005900460054000F>]TJ 1 0 0 1 36 91.191 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 76.396 Tm [<0A21000F0A21000D>-250<0A220A200A210A27000E0A200A23000E0A200A21001B>-333<004A004F004A0055004A0042004D>-250<005100560043004D004A0044>-250<0053>7<0046004D0046004200540046>10<000F>]TJ -/F45 10.44878 Tf 1 0 0 1 186.571 39.407 Tm [<0013>]TJ +/F46 10.44878 Tf 1 0 0 1 186.571 39.407 Tm [<0013>]TJ ET endstream @@ -243,14 +243,14 @@ endobj /TrimBox[0 0 396 612]/Parent 12 0 R>> endobj 13 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F45 8 0 R/F49 11 0 R>>/ProcSet[/PDF/Text]>> +<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F46 8 0 R/F50 11 0 R>>/ProcSet[/PDF/Text]>> endobj 18 0 obj <</Length 10146 >> stream BT -/F45 13.62884 Tf 1 0 0 1 54 553.936 Tm [<0016000F>-333<0027>58<0022>34<00320054>]TJ -/F45 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 +/F46 13.62884 Tf 1 0 0 1 54 553.936 Tm [<0016000F>-333<0027>58<0022>34<00320054>]TJ +/F46 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>-333<0022>-250<0058>7<00500053>8<0045>-249<00510053>7<0050>-6<004400460054005400500053>-250<004A0054>-250<005A>7<005000560053>-249<00470053004A0046004F0045000F>]TJ @@ -274,11 +274,11 @@ BT 0.98 0 0 1 71.036 283.531 Tm [<004F0050>7<0057>8<0046004D000D>-253<004A004F0044004D00560045004A004F0048>-253<004A00550054>-253<00440050>6<0057>8<00460053>60<000D>-252<00560054004A004F0048>-253<00550049004A0054>-254<00450050>-7<00440056004E0046004F0055>-253<0044004D004200540054000F>-339<0022004D004E005000540055>-254<0042004D004D>]TJ 0.999 0 0 1 71.036 268.735 Tm [<00500047>-250<005500490046>-250<00540046005500560051>-251<005600540046>-7<0045>-250<00450046004700420056004D00550054000F>-335<09AB0046>-250<098B004D00460054>-251<000900550046>7<005900550043004D0050>-7<0044004C>-250<0042004F0045>-250<00440050>6<0057>8<00460053>17<000A>-250<0058>7<00460053>8<0046>]TJ 0.98 0 0 1 71.036 253.94 Tm [<005400560043004E004A0A1D0046>-7<0045>-254<00550050>-253<0042>-254<004E0042004B00500053>-254<0022004E00460053004A00440042004F>-254<0031>24<000F>10<0030>30<000F0025>29<000F>-253<005400460053>-15<0057004A00440046>-254<004A004F>]TJ -/F45 11.3574 Tf 0.98 0 0 1 293.018 253.94 Tm [<00310025002700100039>24<000E00120042001B0013001100110012>]TJ -/F45 11.3574 Tf 1.02 0 0 1 71.036 239.145 Tm [<004700500053004E00420055000D>-261<005500490046004F>-258<0046004D0046>-7<004400550053>7<0050004F004A00440042004D004D005A>-258<0053>7<0046>7<0057004A0046>7<0058>8<0046>-6<0045>-258<0042004F0045>-259<0042004400440046005100550046>-7<0045>]TJ -/F49 11.3574 Tf 1.02 0 0 1 310.307 239.145 Tm [<0050004F>-258<005500490046>-258<0848005300540055>]TJ +/F46 11.3574 Tf 0.98 0 0 1 293.018 253.94 Tm [<00310025002700100039>24<000E00120042001B0013001100110012>]TJ +/F46 11.3574 Tf 1.02 0 0 1 71.036 239.145 Tm [<004700500053004E00420055000D>-261<005500490046004F>-258<0046004D0046>-7<004400550053>7<0050004F004A00440042004D004D005A>-258<0053>7<0046>7<0057004A0046>7<0058>8<0046>-6<0045>-258<0042004F0045>-259<0042004400440046005100550046>-7<0045>]TJ +/F50 11.3574 Tf 1.02 0 0 1 310.307 239.145 Tm [<0050004F>-258<005500490046>-258<0848005300540055>]TJ 1.02 0 0 1 71.036 224.349 Tm [<004208680046004E00510055000F>]TJ -/F45 11.3574 Tf 1.02 0 0 1 115.343 224.349 Tm [<0022>-313<00510053004A004F00550046>-7<0045>-314<004400500051>6<005A>-314<005800420054>-314<004A004F>-314<005500490046>-314<00420056005500490050005306DD0054>-314<00490042004F00450054>-314<0058004A00550049004A004F>-314<0042>]TJ +/F46 11.3574 Tf 1.02 0 0 1 115.343 224.349 Tm [<0022>-313<00510053004A004F00550046>-7<0045>-314<004400500051>6<005A>-314<005800420054>-314<004A004F>-314<005500490046>-314<00420056005500490050005306DD0054>-314<00490042004F00450054>-314<0058004A00550049004A004F>-314<0042>]TJ 1.015 0 0 1 70.616 209.554 Tm [<0058>7<0046>-6<0046004C000F>-328<002B005600540055>-246<004D004A004C0046>-246<0055004900420055000F>-328<0035>61<0050>-6<0050004C>-246<004E0050004F005500490054>-246<00550050>-246<00580053004A00550046>9<000D>-246<00500047>-246<004400500056005300540046>9<000F>-327<00360051>-7<0045004200550046001B>]TJ 1 0 0 1 70.639 194.759 Tm [<0022004F00500055004900460053>-250<004200560055004900500053>-250<0053>8<00460051>-7<0050005300550054>-250<0054005600440044004600540054>-250<0058004A00550049>-250<0042>-250<005100560043004D004A005400490046>-7<0045>-250<0043>-10<0050>-7<0050004C000F>]TJ 1 0 0 1 54 179.963 Tm [<0032>29<000F>]TJ @@ -291,7 +291,7 @@ BT 0.98 0 0 1 71.036 91.191 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 76.396 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 61.6 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 -/F45 10.44878 Tf 1 0 0 1 204.571 39.407 Tm [<0014>]TJ +/F46 10.44878 Tf 1 0 0 1 204.571 39.407 Tm [<0014>]TJ ET endstream @@ -302,7 +302,7 @@ endobj /TrimBox[0 0 396 612]/Parent 12 0 R>> endobj 16 0 obj -<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F45 8 0 R/F49 11 0 R>>/ProcSet[/PDF/Text]>> +<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font<</F46 8 0 R/F50 11 0 R>>/ProcSet[/PDF/Text]>> endobj 1 0 obj <<>> @@ -500,11 +500,11 @@ stream endstream endobj 33 0 obj -<</Subtype/CIDFontType0C/Length 472 >> +<</Subtype/CIDFontType0C/Length 467 >> stream - + ¯ -¯ Ú Ú’
l/ +¯ Ú Ú’
endstream endobj 34 0 obj @@ -554,20 +554,20 @@ endobj <</Type/Font/Subtype/CIDFontType0/BaseFont/ETXLAD+NovelDeco/FontDescriptor 34 0 R/W 31 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>> endobj 37 0 obj -[2[288]9[298 298]13[220 338 220 323 465 465 465 465 465 465]27[236]32[435]34[695 588 646 701 557 485 685 730 297 322]45[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]1751[548 742]1757[268]1760[375 375]2442[582 560]2475[1048]2589[614]2592[465 465 465 465 465 465 465 465 465 465]] +[2[288]9[298 298]13[220 338 220 323 465 465 465 465 465 465]27[236]32[435]34[695 588 646 701 557 485 685 730 297 322]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]1751[548 742]1757[268]1760[375 375]2442[582 560]2475[1048]2589[614]2592[465 465 465 465 465 465 465 465 465 465]] endobj 38 0 obj <</Length 326 >> stream - gþ¿÷ÿð?ÿÿð + gþ¿÷ÿô?ÿÿð endstream endobj 39 0 obj -<</Subtype/CIDFontType0C/Length 18197 >> +<</Subtype/CIDFontType0C/Length 18225 >> stream - -* " - + +* " + ! @@ -578,8 +578,8 @@ $ & ' ( -) -½ º ž
…«^€MÒ€(%—Fè§ ž à ¹ • è!ê"a"ï#þ%7%Ô&Y'Ë(")¶*³+J,¦-µ.–/Y0%0ü1ì374è6"727T7w7»858°9÷;=>5>y>ÿ?·@›AMAËB„BýCÃD},‹½ø龋½ø$½½øï÷>û’û>û’©^÷>÷’÷>û’û ÷¿÷>÷’‹üû\÷¿û>÷‘÷è‹ü8ýøˆùNüˆûÇõøÆwæõ÷$ù&snxU ‹E™h”3“=‘1vŒ…Ž„•‹•‹Ž”Œ–™‹Ç˜÷ +) +½ º ž
…«^€MÒ€(%—Fè§ ž à ¹ Ñ ¸ ! ÷ «¯ÿÿü™šÿ LÍÿÿùÌÌÿ û kgÿ @@ -592,7 +592,7 @@ ffÿ € eŽ‰‹‰‰‹Š‡^W€[•‡—Š—‹¼ŸÛ¹¥Í‹¼°•eN ü‹8z†;ˆ……‹v‘…¼Œÿ ffÿ -÷,ÿ +÷,ÿ ™špÿ LÍ—‘‹–ÿÿöÌÍÿ € @@ -612,22 +612,22 @@ LÍ…ÿ LÍ…ÿ ±ÎÓ ®û22ûû'á9÷÷ÞÞ÷&÷ BÝû û‰¬÷檵w÷jØ÷j÷‹8p†Eˆ……‹v‘…¼Œÿ æ€ÿÿüæ€ÿ -€ÿÿþÌÀ–ÿ +€ÿÿþÌÀ–ÿ ¯ ¯ Ú Ú’
endstream endobj 40 0 obj -<</Type/FontDescriptor/FontName/HLBSMK+LibertinusSerif/Flags 4/FontBBox[-1082 -256 6171 1125]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle 0/StemV 73/XHeight 429/FontFile3 39 0 R/CIDSet 38 0 R>> +<</Type/FontDescriptor/FontName/SFJIAA+LibertinusSerif/Flags 4/FontBBox[-1082 -256 6171 1125]/Ascent 894/CapHeight 647/Descent -246/ItalicAngle 0/StemV 73/XHeight 429/FontFile3 39 0 R/CIDSet 38 0 R>> endobj 41 0 obj -<</Length 1875 >> +<</Length 1889 >> stream %!PS-Adobe-3.0 Resource-CMap %%DocumentNeededResources: ProcSet (CIDInit) %%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-HLBSMK-LibertinusSerif-0) -%%Title: (TeX-HLBSMK-LibertinusSerif-0 TeX HLBSMK-LibertinusSerif 0) +%%BeginResource: CMap (TeX-SFJIAA-LibertinusSerif-0) +%%Title: (TeX-SFJIAA-LibertinusSerif-0 TeX SFJIAA-LibertinusSerif 0) %%Version: 1.000 %%EndComments /CIDInit /ProcSet findresource begin @@ -635,17 +635,17 @@ stream begincmap /CIDSystemInfo << /Registry (TeX) -/Ordering (HLBSMK-LibertinusSerif) +/Ordering (SFJIAA-LibertinusSerif) /Supplement 0 >> def -/CMapName /TeX-Identity-HLBSMK-LibertinusSerif def +/CMapName /TeX-Identity-SFJIAA-LibertinusSerif def /CMapType 2 def 1 begincodespacerange <0000> <FFFF> endcodespacerange 0 beginbfrange endbfrange -85 beginbfchar +86 beginbfchar <0002> <0021> <0009> <0028> <000A> <0029> @@ -686,6 +686,7 @@ endbfrange <0039> <0058> <003A> <0059> <003B> <005A> +<003D> <005C> <0042> <0061> <0043> <0062> <0044> <0063> @@ -742,10 +743,10 @@ end endstream endobj 8 0 obj -<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/HLBSMK+LibertinusSerif/DescendantFonts[42 0 R]/ToUnicode 41 0 R>> +<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/SFJIAA+LibertinusSerif/DescendantFonts[42 0 R]/ToUnicode 41 0 R>> endobj 42 0 obj -<</Type/Font/Subtype/CIDFontType0/BaseFont/HLBSMK+LibertinusSerif/FontDescriptor 40 0 R/W 37 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>> +<</Type/Font/Subtype/CIDFontType0/BaseFont/SFJIAA+LibertinusSerif/FontDescriptor 40 0 R/W 37 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>> endobj 12 0 obj <</Type/Pages /Count 3/Kids[6 0 R 14 0 R 17 0 R]>> @@ -755,58 +756,58 @@ endobj endobj 44 0 obj << - /Title(Novel\040Document\040Class)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20171111172038-08'00')/ModDate(D:20171111172038-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) + /Title(Novel\040Document\040Class)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20171117094513-08'00')/ModDate(D:20171117094513-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) >> endobj xref 0 45 0000000000 65535 f -0000034829 00000 n -0000034849 00000 n -0000034869 00000 n +0000034772 00000 n +0000034792 00000 n +0000034812 00000 n 0000000015 00000 n 0000015166 00000 n 0000015025 00000 n 0000006731 00000 n -0000071655 00000 n -0000050123 00000 n -0000048184 00000 n -0000042512 00000 n -0000071975 00000 n -0000024240 00000 n -0000024096 00000 n +0000071642 00000 n +0000050061 00000 n +0000048127 00000 n +0000042455 00000 n +0000071962 00000 n +0000024183 00000 n +0000024039 00000 n 0000015307 00000 n -0000034708 00000 n -0000034564 00000 n -0000024361 00000 n -0000034922 00000 n -0000035058 00000 n -0000035385 00000 n -0000041240 00000 n -0000041463 00000 n -0000042657 00000 n -0000042847 00000 n -0000042965 00000 n -0000043033 00000 n -0000046938 00000 n -0000047161 00000 n -0000048331 00000 n -0000048523 00000 n -0000048551 00000 n -0000048655 00000 n -0000049206 00000 n -0000049414 00000 n -0000050254 00000 n -0000050431 00000 n -0000050848 00000 n -0000051231 00000 n -0000069507 00000 n -0000069723 00000 n -0000071792 00000 n -0000072042 00000 n -0000072365 00000 n +0000034651 00000 n +0000034507 00000 n +0000024304 00000 n +0000034865 00000 n +0000035001 00000 n +0000035328 00000 n +0000041183 00000 n +0000041406 00000 n +0000042600 00000 n +0000042790 00000 n +0000042908 00000 n +0000042976 00000 n +0000046881 00000 n +0000047104 00000 n +0000048274 00000 n +0000048466 00000 n +0000048494 00000 n +0000048598 00000 n +0000049144 00000 n +0000049352 00000 n +0000050192 00000 n +0000050369 00000 n +0000050793 00000 n +0000051176 00000 n +0000069480 00000 n +0000069696 00000 n +0000071779 00000 n +0000072029 00000 n +0000072352 00000 n trailer -<</Size 45/Root 43 0 R/Info 44 0 R/ID[<135D834E42F4DC379D451E9452488732> <135D834E42F4DC379D451E9452488732>]>> +<</Size 45/Root 43 0 R/Info 44 0 R/ID[<13CE30C19CB3C22C5593780582E45B01> <13CE30C19CB3C22C5593780582E45B01>]>> startxref -72689 +72676 %%EOF diff --git a/Master/texmf-dist/doc/lualatex/novel/novel.tex b/Master/texmf-dist/doc/lualatex/novel/novel.tex index 6009e0aceeb..2826e2fd28c 100644 --- a/Master/texmf-dist/doc/lualatex/novel/novel.tex +++ b/Master/texmf-dist/doc/lualatex/novel/novel.tex @@ -5,7 +5,7 @@ % IF YOU COMPILE THIS DOCUMENT: Be sure that both this file and % novel.pdf (if present) have read/write permissions for any user. % Otherwise, compile may fail at the point where files are written. -\documentclass{novel} % v. 1.43.1 or later +\documentclass{novel} % v. 1.46 % Almost all settings are defaults. \SetHeadFootStyle{3} \SetTitle{Novel Document Class} % only footer, with page number @@ -58,9 +58,9 @@ The companion font(s) is(are) licensed under the SIL Open Font License, version \QuickChapter{4. Version} -\noindent 1.42-1.43.1, 2017-11-12: continued doc improvement. +\noindent 1.46, 2017-11-17: Possibly final version. \string\BlockImage\space change. -\noindent 1.41, 2017-10-02: even better docs, minor internal changes. +\noindent 1.41-1.43.1: Better docs, code cleanup. \noindent 1.40, 2017-09-14: removed debug feature, major docs rewrite. diff --git a/Master/texmf-dist/fonts/opentype/novel/NovelDeco.otf b/Master/texmf-dist/fonts/opentype/novel/NovelDeco.otf Binary files differindex cef60f2dd67..728329f17ad 100644 --- a/Master/texmf-dist/fonts/opentype/novel/NovelDeco.otf +++ b/Master/texmf-dist/fonts/opentype/novel/NovelDeco.otf diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo index 496b79d02b6..4763ffe1266 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.43.1 +% Typically used in the USA. Novel file version 1.46 % 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 3f8bb3ba2c6..f4bf0a2640a 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty @@ -12,7 +12,7 @@ %% %% \ProvidesFile{novel-CalculateLayout.sty}% -[2017/11/12 v1.43.1 LaTeX file (layout calculations)] +[2017/11/17 v1.46 LaTeX file (layout calculations)] %% %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty index fd727dcb6ae..ae2f5ae073b 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-ChapterScene.sty}% -[2017/11/12 v1.43.1 LaTeX file (chapter and scene macros)] +[2017/11/17 v1.46 LaTeX file (chapter and scene macros)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo index 70c8a613219..83e85fa8d56 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.43.1 +% Typically used in Europe. Novel file version 1.46 % 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 981494211d1..2aa2a25887d 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-FileData.sty}% -[2017/11/12 v1.43.1 LaTeX file (File Data settings)] +[2017/11/17 v1.46 LaTeX file (File Data settings)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty index 154cb837a2a..28d948e9dd7 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-FontDefaults.sty}% -[2017/11/12 v1.43.1 LaTeX file (default fonts)] +[2017/11/17 v1.46 LaTeX file (default fonts)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty index 6a32695e5e5..00274f08b3d 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-Footnotes.sty}% -[2017/10/19 v1.43.1 LaTeX file (commands for footnotes and endnotes)] +[2017/11/17 v1.46 LaTeX file (commands for footnotes and endnotes)] %% @@ -179,7 +179,7 @@ \DeclareDocumentCommand \endnote { } {% \global\toggletrue{@gotendnotes}% -\stepcounter{@endnotecount}\sups{\arabic{@endnotecount}}% +\stepcounter{@endnotecount}\sups{\arabic{@endnotecount}}\obeyspaces% \long\edef\@endnotelist{\@endnotelist\space (\arabic{@endnotecount},p.\thepage)}% } %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty index ba54e9a8afc..f55f864c311 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-HeadFootStyles.sty}% -[2017/11/12 v1.43.1 LaTeX file (header and footer layouts and styles)] +[2017/11/17 v1.46 LaTeX file (header and footer layouts and styles)] %% @@ -279,6 +279,7 @@ \dimexpr\New@BottomMargin+0.5\New@MediaHeight-0.5\New@TrimHeight}% \global\temp@pgnumraise=\temp@pgnumraise% \fi% + %%%%% \ifodd\c@page% \AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{% \hspace{\dimexpr\Trim@Lx+\New@InsideMargin-0.5\temp@pgnumwidth}% @@ -306,16 +307,16 @@ \setlength\temp@pgnumraise{% \New@BottomMargin-\nbs+0.5\New@MediaHeight-0.5\New@TrimHeight}% \fi% - \ifodd\c@page% - \AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{% - \hspace{\dimexpr\Trim@Lx+\New@InsideMargin-0.5\temp@pgnumwidth}% - \charscale[1,0.5\textwidth,\temp@pgnumraise]{% - {\headfont{\addfontfeature{LetterSpace=\@looseheadnum}\pagenumberstyle}}}}}% - \else% - \AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{% - \hspace{\dimexpr\Trim@Lx+\New@OutsideMargin-0.5\temp@pgnumwidth}\raisebox{% - \temp@pgnumraise}{{\headfont{\addfontfeature{LetterSpace=\@looseheadnum}\pagenumberstyle}}}}}% - \fi% + \AddToShipoutPicture*{\@getPageXY\AtPageLowerLeft{% + \ifodd\c@page% + \hspace{\dimexpr\Trim@Lx+\New@InsideMargin-0.5\temp@pgnumwidth}% + \else% + \hspace{\dimexpr\Trim@Lx+\New@OutsideMargin-0.5\temp@pgnumwidth}% + \fi% + \charscale[1,0.5\textwidth,\temp@pgnumraise]{% + {\headfont{\addfontfeature{LetterSpace=\@looseheadnum}\pagenumberstyle}}}% + }% + }% } % end \@dropfoliobeneath %% % diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty index bf74e1c31f1..64bab0fa1ff 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-Images.sty}% -[2017/11/12 v1.43.1 LaTeX file (image placement)] +[2017/11/17 v1.46 LaTeX file (image placement)] %% @@ -72,14 +72,26 @@ \gdef\imagestarred{false} \gdef\imagefilename{unknown} % Neutralize \includegraphics, so it is no longer a user command: -\let\@includegraphics\includegraphics\relax -\let\includegraphics\relax +\LetLtxMacro\novel@includegraphics\includegraphics\relax +\LetLtxMacro\includegraphics\relax \newcommand\includegraphics[2][]{ \ClassError{novel}{Cannot use \string\includegraphics\space on page \thepage} {The `novel' class has its own commands for placing images. See docs.^^J% You cannot use the \string\includegraphics\space command.}% } % +\newcommand\pushtextdown[1]{% + \ifthenelse{\equal{#1}{} \OR \equal{#1}{ } \OR \equal{#1}{0}}{% + \def\@howmuchdown{0em}% + }{% + \def\@howmuchdown{#1}% + }% + ~\par\vspace*{-\nbs}\vspace*{\@howmuchdown}\par% +} +% +\newlength\@mytotalht +\newif\if@imgExtOK% +% % \InlineImage can be used in body, header, footer. % However, macros such as \imagefilename, \imagewidth, etc. % are only set or re-set when the image in in the body. @@ -90,7 +102,7 @@ % \ExplSyntaxOn \DeclareDocumentCommand \InlineImage { s O{0pt} m }{% - \newif\if@imgExtOK% + \@imgExtOKfalse% \IfEndWith{#3}{png}{\@imgExtOKtrue}{}% \IfEndWith{#3}{PNG}{\@imgExtOKtrue}{}% \IfEndWith{#3}{jpg}{\@imgExtOKtrue}{}% @@ -112,7 +124,7 @@ \def\@myily{0pt}}{\def\@myily{\@myilya}% }% \iftoggle{@inheadfoot}{}{\gdef\imagefilename{#3}}% for possible later use - \gdef\my@graphic{\@includegraphics[draft=false]{#3}}% + \gdef\my@graphic{\novel@includegraphics[draft=false]{#3}}% \setlength\@imagewidth{\widthof{\my@graphic}}% \global\@imagewidth=\@imagewidth% \iftoggle{@inheadfoot}{}{\setlength\imagewidth{\@imagewidth}}% @@ -159,8 +171,7 @@ % %% - - +%% RE-DEFINED in V. 1.46. Now must be placed within linegap environment. %% \BlockImage[alignment]{image}[text] % Alignment may have up to 3 comma-separated values. Default is [c] % First alignment: l, c, r (left, center, right). @@ -175,14 +186,30 @@ % If image is centered, the text will automatically be centered, so that % it necessarily overlies the image. % \forceindent or \backindent may be needed. Text may have several paragraphs. -% Subsequent text (after all that) will clear the image bottom, and also -% be at the baseline grid. Beware of using this command near bottom of page. +% Beware of using this command near bottom of page. +% Use linegap environment to clear both image and accompanying text. +% To displace accompanying text, begin it with \vspace*{length}\par. +% Use adjustwidth environment between linegap and BlockImage centered, +% if you have accompanying text that you wish to confine in width. \ExplSyntaxOn \DeclareDocumentCommand \BlockImage { O{c} m +O{} }{ \iftoggle{@inheadfoot}{% \ClassError{novel}{Cannot~use~BlockImage~in~header~or~footer}% {Header~footer~allow~InlineImage~but~not~BlockImage.}% }{}% + \@imgExtOKfalse% + \IfEndWith{#2}{png}{\@imgExtOKtrue}{}% + \IfEndWith{#2}{PNG}{\@imgExtOKtrue}{}% + \IfEndWith{#2}{jpg}{\@imgExtOKtrue}{}% + \IfEndWith{#2}{JPG}{\@imgExtOKtrue}{}% + \IfEndWith{#2}{jpeg}{\@imgExtOKtrue}{}% + \IfEndWith{#2}{JPEG}{\@imgExtOKtrue}{}% + \if@imgExtOK\else% + \ClassError{novel}{^^JImage~`#2'~format~not~allowed,~page~\thepage}% + {^^JImage~`#2'~has~file~type~not~allowed~in~`novel'~class.^^J% + Must~have~file~extension~png,~jpg,~jpeg~(or~capitalized).^^J% + Others~such~as~pdf~bmp,~tiff,~eps,~pdf,~svg~are~not~allowed.^^J}% + \fi% % Allows empty or blank to be used, and still provide default values: \ifthenelse{\equal{#1}{} \OR \equal{#1}{\space}}{% \def\@myargs{c}}{\def\@myargs{#1}% @@ -196,57 +223,64 @@ \ifthenelse{\equal{\@myyt}{}\OR\equal{\@myyt}{0}}{% \def\@myy{0pt}}{\def\@myy{\@myyt}% } - \newdimen\@sbsheight + % + \gdef\my@graphic{\novel@includegraphics[draft=false]{#2}}% + \setlength\@imagewidth{\widthof{\my@graphic}}% + \global\@imagewidth=\@imagewidth% + \setlength\@imageheight{\heightof{\my@graphic}}% + \global\@imageheight=\@imageheight% + \setlength\@imagehoffset{\@myx}% + \IfBeginWith{\@myy}{b}{% + \ClassError{novel}{Cannot~use~voffset~`b'~in~\stringBlockImage,~page~\thepage}% + {The~`b'~voffset~only~works~with~\string\InlineImage\space,~not~\string\BlockImage.} + }{% + \setlength\@imagevoffset{-\@imageheight}% + \addtolength\@imagevoffset{\@myy}% + }% + % + \setlength\@mytotalht{0pt}% + \addtolength\@mytotalht{\@imageheight}% + \addtolength\@mytotalht{-\@myy}% + \addtolength\@mytotalht{1em}% + \def\@mytotalhtnum{\strip@pt\@mytotalht}% + \FPdiv{\@mytotalhtnum}{\@mytotalhtnum}{\nbsnum}% + \FPadd{\@mytotalhtnum}{\@mytotalhtnum}{0.5}% + \FPround{\@mytotalhtnum}{\@mytotalhtnum}{0}% + % + \begin{linegap}{\@mytotalhtnum}% + % \ifthenelse{\equal{\@myalign}{c}\OR\equal{\@myalign}{}}{% - {\centering\strut\InlineImage*[{\@myx-0.5\imagewidth},{\@myy}]{#2}\par} - \vspace*{-\nbs} - {\centering\strut #3\par} - \setbox0=\vbox{{\centering #3\par}} - }{} + {\centering% + \makebox[0pt][l]{% + \hspace{\dimexpr\@myx-0.5\@imagewidth}% + \stake\smash{\raisebox{\dimexpr\@myy-\@imageheight}{\my@graphic}}% + }% + \par}% + \vspace*{-\nbs}% + {\centering #3\par}% + }{}% \ifthenelse{\equal{\@myalign}{r}}{% - \noindent\InlineImage[{\textwidth-\imagewidth+\@myx},{\@myy}]{#2}\par% - \vspace{-\nbs} - \begin{adjustwidth}{0pt}{\imagewidth+\parindent}% - #3\par% + \noindent\makebox[0pt][l]{% + \hspace{\dimexpr\textwidth+\@myx-\@imagewidth}% + \stake\smash{\raisebox{\dimexpr\@myy-\@imageheight}{\my@graphic}}% + }\par% + \vspace{-2\nbs}% + \begin{adjustwidth}{0pt}{\@imagewidth+\parindent}% + \strut\par #3\par% \end{adjustwidth}% - \setbox0=\vbox{% - \begin{adjustwidth}{0pt}{\imagewidth+\parindent}% - #3\par% - \end{adjustwidth}% - }% - }{} + }{}% \ifthenelse{\equal{\@myalign}{l}}{% - \noindent\InlineImage*[{\@myx},{\@myy}]{#2}\par% - \vspace{-\nbs} - \begin{adjustwidth}{\imagewidth+\parindent}{0pt}% - #3\par% + \noindent\makebox[0pt][l]{% + \hspace{\@myx}% + \stake\smash{\raisebox{\dimexpr\@myy-\@imageheight}{\my@graphic}}% + }\par% + \vspace{-2\nbs}% + \begin{adjustwidth}{\@imagewidth+\parindent}{0pt}% + \strut\par #3\par% \end{adjustwidth}% - \setbox0=\vbox{% - \begin{adjustwidth}{\imagewidth+\parindent}{0pt}% - #3\par% - \end{adjustwidth}% - }% - }{} - % 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} - \FPdiv{\@roughlines}{\@sbsheightnum}{\nbsnum} - \FPadd{\@roughlines}{\@roughlines}{0.5} % round up, not down - \FPround{\@roughlines}{\@roughlines}{0} - - \gdef\@imageheightnum{\strip@pt\@imageheight}% - \FPdiv{\@imagelines}{\@imageheightnum}{\nbsnum}% - \FPadd{\@imagelines}{\@imagelines}{0.5}% round up to integer, not down - \FPround{\@imagelines}{\@imagelines}{0}% - \FPclip{\@imagelines}{\@imagelines}% - \gdef\imagelineskip{\@imagelines}% - \FPclip{\@roughlines}{\@roughlines} - \FPadd{\@adjimagelines}{\imagelineskip}{1} % \imagelineskip from \InlineImage* - \FPsub{\@skipme}{\@adjimagelines}{\@roughlines} - \FPmax{\@skipme}{\@skipme}{0} - \vspace{\@skipme\nbs} -} + }{}% + \end{linegap}% +} % end \BlockImage \ExplSyntaxOff %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo index 3d915df4509..a091ea3f41b 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.43.1 +% Typically used in Japan. Novel file version 1.46 % 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 50ac4930046..ea008ff8ac8 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-LayoutSettings.sty}% -[2017/11/12 v1.43.1 LaTeX file (layout settings)] +[2017/11/17 v1.46 LaTeX file (layout settings)] %% @@ -53,6 +53,9 @@ % \newlength\normalxheight \newlength\normalXheight +\newlength\normalscxheight +\newlength\normalAringheight +\newlength\normaldescender %% @@ -243,7 +246,7 @@ } \let\SetEmblem\SetEmblems% for convenience % If you want something fancier than \thepage: -\gdef\SetPageNumberStyle#1{\gdef\pagenumberstyle{#1}} +\gdef\SetPageNumberStyle#1{\gdef\pagenumberstyle{{\addfontfeature{Letters=ResetAll}#1}}} % See novel.cls for the accompanying AtBeginDocument routine. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty index 255763e22f2..47b290e9955 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty @@ -13,96 +13,16 @@ %% %% \ProvidesFile{novel-TextMacros.sty}% -[2017/11/12 v1.43.1 LaTeX file (text macros usable within document body)] +[2017/11/17 v1.46 LaTeX file (text macros usable within document body)] %% -%% This file contains commands that are usable within the document body, +%% This file contains various commands that are usable within the document body, %% for styling and otherwise manipulating text. %% These are not commands used in Preamble for setup, although a few of them %% can be used in Preamble for setup, then again in body for change. - -%% The following commands were defined in other files of `novel' class: -%% ----------------------------------------------------------------------------- -% \theTitle returns string set by \SetTitle{} -- See novel-LayoutSettings.sty. -% \theAuthor returns string set by \SetAuthor{} -- See novel-LayoutSettings.sty. -% \nfs normal font size. May be tweaked during rework. -- See novel-CalculateLayout.sty. -% \nbs (calculated) normal baselineskip. May be tweaked during rework. -- See novel-CalculateLayout.sty. -% \theSubtitle returns string set by \SetSubtitle{} -- See novel-LayoutSettings.sty. -% \InlineImage, \BlockImage -- See novel-Images.sty. -% \scenebreak, \sceneline, \scenestars -- See novel-ChapterScene.sty. -% ChapterStart, \ChapterTitle{}, \ChapterSubtitle{}, \ChapterDeco{} -- See novel-ChapterScene.sty. -% {\chapterfont text} and other pre-defined font selection commands -- See novel-LayoutSettings.sty. -% \decoglyph{} and \acronym{} -- See novel-FontDefaults.sty. -% \frontmatter, \mainmatter -- See novel-LayoutSettings.sty. -% \footnote[]{}, \endnote, \endnotetext[]{} -- See novel-Footnotes.sty. -% \thispagestyle{choice} -- See novel-HeadFootStyles.sty. -% \SetVersoHeadText{}, \SetRectoHeadText{} -- See novel-HeadFootStyles.sty. -% \CreateFontFeature{substitutions}{feature code} fakes an Open Type feature -- See novel-LayoutSettings.sty. - - - -%% The following commands are defined on this page: -%% ----------------------------------------------------------------------------- -% \memo{text} is a memo to yourself. Does not print, is not saved. -% \forceindent and \backindent when \indent and \noindent fail. -% \smcp{text} or \textsc{text} for lowercase to small caps. -% \allsmcp{text} puts both caps and lowercase into small caps. -% \charscale[scale,x,y]{text} for brief change of text size/position. No line wrap. -% parascale environment for long change in text size. Will go off-grid. -% toc environment for table of contents. -% \tocitem[]{}{} and \tocitem*[]{}{} for one-line entries in toc. -% legalese environment uses ragged right, disables hyphenation. -% \showlength[round]{length}{units} returns the length, re-calculated in units, rounded. -% \supersub{raise}{scale}{text} alternative to superscript and subscript commands. -% \sups{text}, \subs{text}, and \sinf{text} other alternatives to super/subscripts. -% \bigemdash[raise,thickness] provides a raised rule of flexible length, a "big em dash." -% \stake inserts zero-width rule, 1pt thick, as placeholder. -% \color and \textcolor (from package xcolor) have been modified to ensure black, or grayscale when permitted. -% \hangleft{text} -- places text to left of its usual block position. Do not place text in margins! -% \lnum{number} -- lining numbers -% \squeeze{} and \crush{} for emergency text adjustment. - - -%% The following useful commands are from core code, or other pre-loaded packages. -%% ----------------------------------------------------------------------------- -%% They are listed here as a reminder of their existence. Not a complete list. -%% A description is only provided here, when it is brief and simple. -% -% {\centering text\par} centers text. Needs the \par to finish. May also use internal \\ or \par. -% \makebox[length][alignment]{text} -% \hspace{length} -% \vspace{length} Caution: may disrupt text line grid! -% \kern -% \hfill and \dotfill -% \vfill (use only with discretion) -% \linebreak (use only with discretion) -% \null inserts an empty line. See also the scene break commands. -% \clearpage begins a new page. Two consecutive \clearpage does not make 2 pages (use \null if blank page desired). -% \strut is useful for occupying the full line height. -% \smash{text} allows its included text to overlay other content. Sometimes useful when text is too tall to fit the line grid. -% \textwidth (length) is the width of the textblock. -% adjustwidth environment (package: changepage) for block indents, etc. -% \FirstLine{} (package: magaz) may be useful for first line of new chapter. Patched by me. -% \textsuperscript{} and \textsubscript{} are re-defined. - - - -%% The following commands are available, but STRONGLY DISCOURAGED. -%% ----------------------------------------------------------------------------- -%% Beware: Their usage is likely to disturb the line grid. -%% That is less of an issue on pages where the line grid does not matter. -% -% Environments: center, minipage, sloppypar -% \parbox -% \framebox or \fbox -% \raisebox BUT can be used inside \smash or \charscale. -% \linespread -% Anything involving math mode. - - %% The following commands are BANNED. %% ----------------------------------------------------------------------------- % The `novel' class disallows these commands, or neutralizes them by simply @@ -155,15 +75,15 @@ % \DeclareDocumentCommand \smcp { +m } {% - {\AddFontFeature{Letters=SmallCaps}#1}% + {\addfontfeature{Letters=SmallCaps}#1}% } % \DeclareDocumentCommand \allsmcp { +m } {% \fontspec_if_feature:nTF {c2sc}{% - {\AddFontFeatures{Letters=UppercaseSmallCaps, Letters=SmallCaps}#1}% + {\addfontfeatures{Letters=UppercaseSmallCaps, Letters=SmallCaps}#1}% }{% - {\AddFontFeature{Letters=SmallCaps}\MakeLowercase{#1}}% + {\addfontfeature{Letters=SmallCaps}\MakeLowercase{#1}}% }% } % @@ -355,12 +275,11 @@ \newlength\@tocskip \newenvironment{toc}[2][0]% {% - \begin{adjustwidth}{#2}{#2}\begingroup% + \begin{adjustwidth}{#2}{#2}% + \begingroup% lengths not global \setlength\parindent{0pt}% \setlength\@tocnumwid{\widthof{00.~}}% - \global\@tocnumwid=\@tocnumwid% \setlength\@tocskip{#1\nbs}% - \global\@tocskip=\@tocskip% }{% \endgroup\end{adjustwidth}\par% }% @@ -438,13 +357,13 @@ %% \squeeze{} and \crush{} slightly shrink the horizonal dimension of the % enclosed text. May span paragraphs. Emergency only! No compounding. -\long\gdef\squeeze#1{{\AddFontFeature{FakeStretch=0.99}#1}} -\long\gdef\crush#1{{\AddFontFeature{FakeStretch=0.98}#1}} +\long\gdef\squeeze#1{{\addfontfeature{FakeStretch=0.99}#1}} +\long\gdef\crush#1{{\addfontfeature{FakeStretch=0.98}#1}} %% %% \lnum for lining numbers. -\gdef\lnum#1{{\AddFontFeature{Numbers=Lining}#1}} +\gdef\lnum#1{{\addfontfeature{Numbers=Lining}#1}} %% @@ -453,7 +372,7 @@ \let\sups\relax \let\textsuperscript\relax \let\textsubscript\relax -\newlength\@hoAhl % Measures the height of these characters in the current font. +\newlength\@hoAhl % measured when needed. % Perhaps superscripts and subscripts (scientific) are in the font, or not. % Problem: The best fonts have these characters at size/weight designed % to mingle with normal size. But many fonts merely scaled characters, @@ -473,14 +392,14 @@ {% \iftoggle{@realmarker}{% \fontspec_if_feature:nTF {sups}{% - \ifvmode\else\unskip\fi{\AddFontFeature{VerticalPosition=Superior}\smash{#1}}% + \ifvmode\else\unskip\fi{\addfontfeature{VerticalPosition=Superior}\smash{#1}}% }{% \setlength\@hoAhl{\heightof{Ahl}}% \ifvmode\else\unskip\fi\charscale[0.7,0pt,0.5\@hoAhl]{#1}% }% }{% \setlength\@hoAhl{\heightof{Ahl}}% - \ifvmode\else\unskip\fi{\basefont\AddFontFeature{Numbers=Lining}\charscale[0.7,0pt,0.5\@hoAhl]{#1}}% + \ifvmode\else\unskip\fi{\addfontfeature{Numbers=Lining}\charscale[0.7,0pt,0.5\@hoAhl]{#1}}% }% }% end \sups % @@ -488,10 +407,10 @@ {% \iftoggle{@realmarker}{% \fontspec_if_feature:nTF {sinf}{% - \ifvmode\else\unskip\fi{\AddFontFeature{VerticalPosition=ScientificInferior}\smash{#1}}% + \ifvmode\else\unskip\fi{\addfontfeature{VerticalPosition=ScientificInferior}\smash{#1}}% }{% \fontspec_if_feature:nTF {subs}{% - \ifvmode\else\unskip\fi{\AddFontFeature{VerticalPosition=Inferior}\smash{#1}}% + \ifvmode\else\unskip\fi{\addfontfeature{VerticalPosition=Inferior}\smash{#1}}% }{% \setlength\@hoAhl{\heightof{Ahl}}% \ifvmode\else\unskip\fi\charscale[0.7,0pt,-0.2\@hoAhl]{#1}% @@ -499,19 +418,47 @@ }% }{% \setlength\@hoAhl{\heightof{Ahl}}% - \ifvmode\else\unskip\fi{\basefont\AddFontFeature{Numbers=Lining}\charscale[0.7,0pt,-0.2\@hoAhl]{#1}}% + \ifvmode\else\unskip\fi{\addfontfeature{Numbers=Lining}\charscale[0.7,0pt,-0.2\@hoAhl]{#1}}% }% }% end \subs % +\cs_new_eq:NN \textsuperscript \sups +\cs_new_eq:NN \textsubscript \subs \ExplSyntaxOff %% -\let\textsuperscipt\sups\relax -\let\textsubscript\subs\relax -%% \gdef\specialblankline{\null} % deprecated %% +%% New in v. 1.46: Allows text to be placed (potentially) off-grid, with grid resuming after. +\newcounter{currentlinegap} % 0 when not within a linegap environment, >0 otherwise. +\ExplSyntaxOn +\DeclareDocumentEnvironment {linegap} { m } {% + \FPifint{#1}\else% + \ClassError{novel}{Non-integer~linegap~on~page~\thepage}% + {Only~integer~>=~1~allowed~for~linegap.}% + \fi% + \FPiflt{#1}{1}% + \ClassError{novel}{Insufficient~linegap~on~page~\thepage}% + {Only~integer~>=~1~allowed~for~linegap.}% + \fi% + \par% + \null% + \vspace*{-\nbs}% + \begin{textblock*}{\textwidth}[0,0](0pt,0pt)% + \setcounter{currentlinegap}{#1}% + \strut\par% + \vspace*{-\nbs}% +}{% close the environment: + \end{textblock*}% + \par% + \vspace*{#1\nbs}% + \setcounter{currentlinegap}{0}% +} +\ExplSyntaxOff % end linegap environment +%% + + %% %% End of file `novel-TextMacros.sty'. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex index b7c51ac1ecd..2bee12c0745 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/11/12 v1.43.1 LaTeX file (additional glyph to unicode)] +[2017/11/17 v1.46 LaTeX file (additional glyph to unicode)] %% %% I am not sure if this is useful. But it doesn't hurt. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg index a395e09a0db..8ff8d06139d 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/11/12 v1.43.1 LaTeX file (microtype configuration file for novel class)] +[2017/11/17 v1.46 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 5ea5d75ea1e..12f00a0c0a7 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/11/12 v1.43.1 LaTeX file (PDF/X support for novel class)] +[2017/11/17 v1.46 LaTeX file (PDF/X support for novel class)] % This package supports, and is part of, class `novel'. % No support for anything but LuaLaTeX. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty index a02c45dbeb7..ca30076cee5 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/11/12 v1.43.1 LaTeX file (novel XMP packet template)] +[2017/11/17 v1.46 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 9e0e2d3f223..84ff490d429 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel.cls +++ b/Master/texmf-dist/tex/lualatex/novel/novel.cls @@ -17,9 +17,10 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] % Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016. -\ProvidesClass{novel}[2017/11/12 v1.43.1 LaTeX document class] +\ProvidesClass{novel}[2017/11/17 v1.46 LaTeX document class] %% -%% Version 1.44: General cleanup of docs and code, for improved readbaility. +%% Version 1.46: Possibly final version. +%% Version 1.43: General cleanup of docs and code, for improved readbaility. %% Version 1.42: Greatly improved HTML documentation. %% Version 1.41: Improved HTML documentation. %% Versions 1.40.x: Incremental minor changes, leading to 1.42. @@ -239,6 +240,14 @@ \DeclareOption{polyoff}{ \@polyofftrue } +% New in version 1.46: test option, primarily for developer use. +% Throws error if Liberintus and Latin Modern Roman fonts are unavailable. +% Throws error is file novel-testimage.png is not in same folder. +% Lets \lettrine relax if `lettrine' package not loaded. +\newif \if@testsuite +\DeclareOption{test}{ + \@testsuitetrue +} %% Note that document size and normal font size are not class options. %% They are set by commands in the Preamble, and have default values. % @@ -347,6 +356,25 @@ \RequirePackage{novel-Footnotes} %% + +%% Special features of test suite. +%% ----------------------------------------------------------------------------- +\newcommand\testsuiteoops[1]{% + \ClassError{novel}{#1 missing}{Install the necessary file(s).}% +} +\if@testsuite + \IfFontExistsTF{libertinusserif-regular.otf}{}{\testsuiteoops{`libertinus' fonts}} + \IfFileExists{lmodern.sty}{}{\testsuiteoops{`lmodern' package}} + \IfFileExists{novel-testimage.png}{}{\testsuiteoops{`novel-testimage.png'}} + \NewFontFamily\mustbelibertinus{Libertinus Serif} + \NewFontFamily\mustbelmodern{Latin Modern Roman} +\fi +\AtBeginDocument{\@ifpackageloaded{lettrine}{}% + {\DeclareDocumentCommand\lettrine{ O{} m m }{#2#3}}% +} +%% end special features of test suite. + + %% \AtEndPreamble sets defaults and calculates layout %% ----------------------------------------------------------------------------- \AtEndPreamble{ @@ -368,14 +396,36 @@ %% \AtBeginDocument finishes the setup %% ----------------------------------------------------------------------------- +\newlength\normalparindent \AtBeginDocument{ % + \@ifpackageloaded{lettrine}{% + \LettrineOnGridtrue% + \setlength\DiscardVskip{10\nbs}% effectively infinite + \global\DiscardVskip=\DiscardVskip% + \setlength\DefaultFindent{0.25em}% about one space + \global\DefaultFindent=\DefaultFindent% + \setlength\DefaultNindent{0em}% uniform gap + \global\DefaultNindent=\DefaultNindent% + \setcounter{DefaultLines}{3}% more likely than 2. + }{}% % Find some useful measurements: + \setlength\normalparindent{\parindent} + \global\normalparindent=\parindent \gdef\@normalxheight{\heightof{x}} \setlength\normalxheight{\@normalxheight} \global\normalxheight=\normalxheight \gdef\@normalXheight{\heightof{X}} \setlength\normalXheight{\@normalXheight} \global\normalXheight=\normalXheight + \gdef\@normalscxheight{\heightof{\textsc{x}}} + \setlength\normalscxheight{\@normalscxheight} + \global\normalscxheight=\normalscxheight + \gdef\@normalAringheight{\heightof{Ã…}} + \setlength\normalAringheight{\@normalAringheight} + \global\normalAringheight=\normalAringheight + \gdef\@normaldescender{\depthof{gjpqy}} + \setlength\normaldescender{\@normaldescender} + \global\normaldescender=\normaldescender % Activate user choice of whether or not to indent after scenebreak commands: \if@indentAfterScenebreak\else \NoIndentAfterCmd{\scenebreak} diff --git a/Master/tlpkg/tlpsrc/synctex.tlpsrc b/Master/tlpkg/tlpsrc/synctex.tlpsrc index 2c912d35caa..6c5bdfdeca6 100644 --- a/Master/tlpkg/tlpsrc/synctex.tlpsrc +++ b/Master/tlpkg/tlpsrc/synctex.tlpsrc @@ -1,4 +1,9 @@ category TLCore +shortdesc engine-level feature synchronizing output and source +longdesc SyncTeX allows navigating between the TeX source and (usually +longdesc PDF) output, in both directions, given a SyncTeX-aware front +longdesc end. It is compiled into most engines and can be enabled with +longdesc the --synctex=1 option. It is developed as part of TeX Live. binpattern f bin/${ARCH}/synctex docpattern f texmf-dist/doc/man/man1/synctex.* docpattern f texmf-dist/doc/man/man5/synctex.* |
