diff options
27 files changed, 276 insertions, 548 deletions
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 a1ce81f252f..43e7f6aa0fc 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.46 +\documentclass[coverart]{novel} % v. 1.46.2 \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.tex b/Master/texmf-dist/doc/lualatex/novel/extras/novel-example.tex index 1fb7f550275..9652439a206 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.46 +\documentclass{novel} % v. 1.46.2 \SetTitle{Dark and Stormy} \SetSubtitle{A Tale of Nights} \SetAuthor{Dirk Hardcase} diff --git a/Master/texmf-dist/doc/lualatex/novel/extras/novel-testsuite.tex b/Master/texmf-dist/doc/lualatex/novel/extras/novel-testsuite.tex index 6788c87e139..c31bd467d8c 100644 --- a/Master/texmf-dist/doc/lualatex/novel/extras/novel-testsuite.tex +++ b/Master/texmf-dist/doc/lualatex/novel/extras/novel-testsuite.tex @@ -21,7 +21,7 @@ % 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. +\documentclass[test]{novel} % v. 1.46.2. \SetTitle{Test Suite} \SetSubtitle{Novel Document Class} \SetAuthor{Author Name} diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/amb.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/amb.png Binary files differdeleted file mode 100644 index ac94695cfbc..00000000000 --- a/Master/texmf-dist/doc/lualatex/novel/html-resources/amb.png +++ /dev/null diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/originalspread.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/originalspread.png Binary files differdeleted file mode 100644 index bf68f1b0977..00000000000 --- a/Master/texmf-dist/doc/lualatex/novel/html-resources/originalspread.png +++ /dev/null diff --git a/Master/texmf-dist/doc/lualatex/novel/html-resources/reworkedspread.png b/Master/texmf-dist/doc/lualatex/novel/html-resources/reworkedspread.png Binary files differdeleted file mode 100644 index 8f1e90aafaa..00000000000 --- a/Master/texmf-dist/doc/lualatex/novel/html-resources/reworkedspread.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 bb69b1acc51..495e11a50c9 100644 --- a/Master/texmf-dist/doc/lualatex/novel/novel-documentation.html +++ b/Master/texmf-dist/doc/lualatex/novel/novel-documentation.html @@ -169,7 +169,6 @@ function closeall() { <li><a href="#h1.1.2">1.1.2 Licensing</a></li> <li><a href="#h1.1.3">1.1.3 Credits</a></li> <li><a href="#h1.1.4">1.1.4 Success Story</a></li> - <li><a href="#h1.1.5">1.1.5 Help Wanted</a></li> </ul> </li><!-- end 1.1 --> <li id="l1.2"><span class="n"></span><a href="#h1.2">1.2 Important Behavior</a> @@ -415,7 +414,6 @@ function closeall() { <ul id="u7.2"> <li><a href="#h7.2.1">7.2.1 Line Art in GIMP</a></li> <li><a href="#h7.2.2">7.2.2 Grayscale in GIMP</a></li> - <li><a href="#h7.2.3">7.2.3 Scaling After \Rework</a></li> </ul> </li><!-- end 7.2 --> <li id="l7.3"><span class="n"></span><a href="#h7.3">7.3 Placing Images</a> @@ -505,14 +503,7 @@ function closeall() { <li><i>Appendices:</i></li> - <li id="lA"><span class="n"></span><a href="#hA"><b>A. Emergency Rework</b></a> - <ul id="uA"> - <li><a href="#hA.1">A.1 \ReworkTrimSize</a></li> - <li><a href="#hA.2">A.2 \ReworkMargins</a></li> - <li><a href="#hA.3">A.3 Example of Rework</a></li> - <li><a href="#hA.4">A.4 Limitations of Rework</a></li> - <li><a href="#hA.5">A.5 Scaling Images</a></li> - </ul> + <li id="lA"><span class="n" style="visibility:hidden"></span><a href="#hA"><b>A. Sample Document</b></a> </li><!-- end A --> <li id="lB"><span class="n"></span><a href="#hB"><b>B. Six-Page Front Matter</b></a> @@ -556,10 +547,6 @@ function closeall() { </ul> </li><!-- end E --> - <li id="lF"><span class="n" style="visibility:hidden"></span><a href="#hF"><b>F. Sample Document</b></a> - </li><!-- end F --> - - <li id="lG"><span class="n" style="visibility:hidden"></span><a href="#hG"><b>G. Known Issues</b></a></li><!-- end G --> </ul><!-- end master toc ul --> @@ -574,13 +561,11 @@ function closeall() { <!-- **************************************************************************************** --> <h1 id="h0">Document class <i>novel</i> - documentation</h1> -<p class="noindent">Version: 1.46.1, 2017/11/29. <span id="screennoscript" class="screennoscript"><b>For enchanced navigation of this file, turn on JavaScript.</b></span></p> +<p class="noindent">Version: 1.46.2, 2018/01/14. <span id="screennoscript" class="screennoscript"><b>For enhanced 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>An 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> @@ -612,7 +597,7 @@ function closeall() { <h4 id="h1.1.2">1.1.2. Licensing</h4> <div class="d4" id="d1.1.2"> -<p class="noindent">The <i>novel</i> document class, including software, examples, documentation and supporting images, is distributed under the terms of the LaTeX Project Publc License, either version 1.3c of this license or (at your option) any later version. The exception is the included font NovelDeco.otf, which is distributed under terms of the SIL Open Font License, v.1.1.</p> +<p class="noindent">The <i>novel</i> document class, including software, examples, documentation and supporting images, is distributed under the terms of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The exception is the included font NovelDeco.otf, which is distributed under terms of the SIL Open Font License, v.1.1.</p> <p>To ensure that your book may be sold commercially, be careful to use only fonts that allow commercial usage. That may exclude some of the fonts in the LaTeX font catalog. See this documentation regarding fonts.</p> </div><!-- end 1.1.2 --> @@ -628,15 +613,9 @@ function closeall() { <h4 id="h1.1.4">1.1.4. Success Story</h4> <div class="d4" id="d1.1.4"> <p class="noindent">In August 2017, an original novel using this document class was published. The text block used nearly all the default settings, and was electronically submitted as PDF/X-1a:2001.</p> -<p>The color cover image was designed in RGB using <a class="external" rel="external" target="new" href="https://inkscape.org">Inkscape</a> and <a class="external" rel="external" target="new" href="https://www.gimp.org">GIMP</a>, coverted to CMYK at 240% ink limit using <a class="external" rel="external" target="new" href="http://www.graphicsmagick.org">GraphicsMagick</a> and the methods described in this documentation, then finally converted to PDF/X-1a:2001 using this document class.</p> +<p>The color cover image was designed in RGB using <a class="external" rel="external" target="new" href="https://inkscape.org">Inkscape</a> and <a class="external" rel="external" target="new" href="https://www.gimp.org">GIMP</a>, converted to CMYK at 240% ink limit using <a class="external" rel="external" target="new" href="http://www.graphicsmagick.org">GraphicsMagick</a> and the methods described in this documentation, then finally converted to PDF/X-1a:2001 using this document class.</p> <p>Both files were automatically reviewed and accepted <i>on first attempt</i>, with the actual printed books for sale within a few days of file submission.</p> </div><!-- end 1.1.4 --> - -<h4 id="h1.1.5">1.1.5. Help Wanted</h4> -<div class="d4" id="d1.1.5"> -<p class="noindent">Although this package works for me, and there are no <i>known</i> issues, bugs are always possible. You may file an issue at the <a class="external" rel="external" target="new" href="https://github.com/RobtAll/novel">GitHub project page</a>, or contact me by e-mail if you do not have a GitHub account. My e-mail address is towards the top of the <i>novel.cls</i> file.</p> -<p>I, the original author of this package, am a retiree who prefers to move on to other things. If you are of a mind to take up long-term maintenance, then contact me by e-mail. If you already are a package developer with a <a class="external" rel="external" target="new" href="https://ctan.org/contact">CTAN</a> login, also contact them. You will need to understand elementary LuaLaTeX, fontspec, Unicode, Open Type fonts, PDF/X, and the general needs of fiction writers in the printed (not e-book) market. However, Lua, XeTeX, TiKz, math, and physics are not required (possibly counterproductive).</p> -</div><!-- end 1.1.5 --> </div><!-- end 1.1 --> <h3 id="h1.2">1.2. Important Behavior</h3> @@ -957,7 +936,7 @@ function closeall() { <h4 id="h3.4.4"> 3.4.4. Other Output Intents</h4><div class="d4" id="d3.4.4"> -<p class="noindent">If you are required to use an Output Intent that is not one of the above three, then you have to code it yourself. Have a look at the three pre-configured Output Intents (files <span style="white-space:nowrap"><i>novel-CGATSTR001.clo</i></span>, <span style="white-space:nowrap"><i>novel-FOGRA39.clo</i></span>, and <span style="white-space:nowrap"><i>novel-JC200103.clo</i>).</span> Instructions are inside the files. There are several places where you can find the necessary data; the most comprehensive is at the <a class="external" rel="external" target="new" href="http://www.color.org/index.xalter">Inernational Color Consortium</a>.</p> +<p class="noindent">If you are required to use an Output Intent that is not one of the above three, then you have to code it yourself. Have a look at the three pre-configured Output Intents (files <span style="white-space:nowrap"><i>novel-CGATSTR001.clo</i></span>, <span style="white-space:nowrap"><i>novel-FOGRA39.clo</i></span>, and <span style="white-space:nowrap"><i>novel-JC200103.clo</i>).</span> Instructions are inside the files. There are several places where you can find the necessary data; the most comprehensive is at the <a class="external" rel="external" target="new" href="http://www.color.org/index.xalter">International Color Consortium</a>.</p> <p>In essence: If you create a custom Output Intent file named <span style="white-space:nowrap"><em>novel-MyFunkyPrinter.clo</em></span>, then you request <i>MyFunkyPrinter</i> (without the preceding <i>novel-</i> or the <i>.clo</i> extension) as Output Intent, and that file will be loaded.</p> </div><!-- end 3.4.4 --> @@ -1008,7 +987,6 @@ OSX: <code>/Library/Colorsync/Profiles/</code> or hidden <code>(username)/Librar <p class="code"><code>\SetTrimSize{<em>width</em>}{<em>height</em>}</code></p> <p>The width and height must have dimensions, such as <i>in</i> or <i>cm</i>.</p> <p>If you do not specify the Trim Size, the default is <i>5.5in</i> wide, <i>8.5in</i> high. This is a widely-used "trade" size for softcover print-on-demand fiction in the U.S.A. If in doubt, leave the default.</p> -<p>If you ever need to <i>retroactively</i> change Trim Size, see <a href="#hA">Appendix A</a>.</p> <p>Do not request a <em>mass-market paperback</em> Trim Size unless you really, truly, know what you are doing. Since you are not a major writer for a major publishing house, you don't know; so, don't do it.</p> </div><!-- end 4.1.1 --> @@ -1068,7 +1046,6 @@ AnotherFeature=Setting,%<br/> <p>The minimum normal font size is <i>8pt</i>, and the maximum is <i>18bp</i>. On a local basis, text may be larger or smaller than this.</p> <p>If you do not use this command, the default font size will be set to <i>11.4pt</i> more or less. That is, the size is calculated from other layout settings. When there is less available text area, the default size is <i>11pt</i>. For larger books, the default is <i>12pt</i>.</p> <p>Once you have set the Trim Size, margins, and parent font, set the font size for readability. Depending on whom you ask, each line of free-running text should average 60 to 66 characters (including spaces). If you use all of the <i>novel</i> default settings, including <i>Libertinus Serif</i> parent font, that's what you will get. But if you change anything, then do a test document to see what font size works best.</p> -<p>If you use the <code>\Rework</code> commands (<a href="#hA">Appendix A</a>), then the font size will be tweaked, whether you use the default size or set it yourself.</p> </div><!-- end 4.2.1.2 --> </div><!-- end 4.2.1 --> @@ -1091,7 +1068,7 @@ AnotherFeature=Setting,%<br/> <h4 id="h4.2.3">4.2.3. Advanced: The Deco Font</h4> <div class="d4" id="d4.2.3"> <p class="noindent">Open Type font <i>NovelDeco.otf</i> is packaged with the <i>novel</i> class. It is a special-purpose font that provides characters for the <i>\decoglyph</i> and <i>\acronym</i> commands.</p> -<p>Normally, you do not need to configure this font, as it is automatic. The only reason for changng it is if you are an advanced user, who wishes to use a substitute font with different decorations. However, you may <i>not</i> specify just any font! The substitute must be an edited version of <i>NovelDeco.otf</i>, with a different font name. If you don't know what that means, then don't do it.</p> +<p>Normally, you do not need to configure this font, as it is automatic. The only reason for changing it is if you are an advanced user, who wishes to use a substitute font with different decorations. However, you may <i>not</i> specify just any font! The substitute must be an edited version of <i>NovelDeco.otf</i>, with a different font name. If you don't know what that means, then don't do it.</p> <p class="code"> <code>\SetDecoFont[<em>features</em>]{<em>fontname</em>}</code> % <em>see section <a href="#h5.1.3.3">5.1.3.3</a></em> </p> @@ -1166,8 +1143,7 @@ Nonexistent Publications • Portland, Oregon\par<br/> <p>Mnemonic for order of margins: "TOBI, or not TOBI, that is the question."</p> <p>Each of the settings must have dimension, such as <i>in</i> or <i>mm</i>.</p> <p>If you do not use this command, then margins are pre-configured. The minimum pre-configured margins are 0.5in at top, outside, and bootm, and 0.75in at inside. This meets the requirements of nearly any printing technology, unless your book is extremely thick. If your Trim Size is among the larger ones, then the pre-configured margins are larger than these minimums.</p> -<p>If your pages have header/footer, they sit inside the rectnagle bounded by the four margins. That is, they do <i>not</i> sit inside the marginal areas.</p> -<p>If you ever need to <i>retroactively</i> change margins, see <a href="#hA">Appendix A</a>.</p> +<p>If your pages have header/footer, they sit inside the rectangle bounded by the four margins. That is, they do <i>not</i> sit inside the marginal areas.</p> <h5 id="h4.3.1.1">4.3.1.1. Gutter? Which Gutter?</h5> <div class="d5" id="d4.3.1.1"> @@ -1180,7 +1156,7 @@ Nonexistent Publications • Portland, Oregon\par<br/> <h4 id="h4.3.2">4.3.2. Lines Per Page</h4> <div class="d4" id="d4.3.2"> <p class="noindent">Lines per page refers only to the textblock, and does <em>not</em> include header/footer. Lines are not stretched to fill short pages.</p> -<p>By default, a suitable number of lines per page are set, based on other dimemsions. You can change the default with this command, in Preamble:</p> +<p>By default, a suitable number of lines per page are set, based on other dimensions. You can change the default with this command, in Preamble:</p> <p class="code"><code>\SetLinesPerPage{<em>integer</em>}</code></p> <p> Any non-integer will be rounded. There is no direct command to set the <em>leading</em>, also known as line-to-line spacing or <em>baselineskip</em>. Instead, it is calculated from the textblock height and number of lines.</p> <p>If the calculated leading is less than <i>1.2x</i> the font size, an error will result. It is difficult for TeX to honor all layout settings with such a small leading, which would normally be unacceptable for fiction in any case. If the calculated leading is at least <i>1.2x</i> the font size, but less than <i>1.25x</i> the font size, then the log file will have an Alert message, suggesting that you should consider using fewer lines per page. If the leading exceeds <i>1.4x</i> the font size, then the log will have an Alert, suggesting more lines per page. The Alert messages are friendly; you do not necessarily have to do anything.</p> @@ -1620,13 +1596,6 @@ Unfortunately, novelists of that era had so little to write about, or they would <p>That will print Chapter 1, Chapter 2, and so forth. Of course, only do this for real, numbered chapters, not for "chapter-like" sections. If your book has several parts, and each part re-sets its own chapter count, use \setcounter{novelcn}{1} prior to the first chapter in each part.</p> <p>If you would like the number to be spelled out, as in Chapter One, Chapter Two, and so forth, then try the <i>fmtcount</i> package. It can also do ordinals such as First Chapter, Second Chapter. See the <i>fmtcount</i> package documentation for details.</p> <p>If your document's language is other than English, use <code>\setdefaultlanguage</code> <i>before</i> you load the <i>fmtcount</i> package. If you do it later, then positioning will be incorrect.</p> -<p><b>Caution:</b> At the time I write this, <i>fmtcount</i> does not detect <i>luatex</i>. Without some hacking, it incorrectly positions its text, when used with <i>novel</i>. The maintainer has been informed. Until such time as <i>fmtcount</i> is fixed, here is the hack. In Preamble:</p> -<p class="code"><code> -% if necessary, use \setdefaultlanguage first.<br/> -\xetextrue % remove this command when <i>fmtcount</i> is fixed<br/> -\RequirePackage{fmtcount}<br/> -\xetexfalse % remove this command when <i>fmtcount</i> is fixed -</code></p> <p>Example usage in chapter titles:</p> <p class="code"><code> \ChapterTitle{\Ordinalstring{novelcn}\stepcounter{novelcn} Robbery} %1<br/> @@ -1994,14 +1963,12 @@ This text is in lightgray, until the group ends.<br/> <h3 id="h7.1">7.1. Raster Images Only</h3> <div class="d3" id="d7.1"> -<p class="noindent">You may place only raster images in your document. No vector artwork. No included <i>eps</i> or <i>pdf</i>. Forget about <i>pgf</i> and <i>TikZ</i>. Although you can "cheat" the <i>novel</i> commands, and circumvent these restrictions, <em>don't do it</em>. These restrictions are intentional.</p> +<p class="noindent">You may place only raster images in your document. No <i>pdf</i>, <i>eps</i> or <i>svg</i>. Although you can "cheat" the <i>novel</i> commands, and circumvent these restrictions, <em>don't do it</em>. These restrictions are intentional.</p> <p>You may think that the above paragraph is a mistake. Haven't you been told that vector artwork is always preferable to rasterized artwork, because vector artwork is scalable? The part about being scalable is true. But if you do not need scalability, vector artwork is worse.</p> <p>How so? A PDF file can incorporate vector artwork, and if properly done it will meet commercial printing standards. <em>Sadly, it is often not properly done.</em> When vector artwork has technical errors, as it often does, then the appearance will depend on which software is used to view the image. The fact that it is within a PDF does not always help.</p> -<p>Also, commercial standards don't like vector artwork where bleed is emulated using control points beyond the MediaBox. You don't know what that statement means, do you? That's another reason to avoid vector artwork.</p> <p>When you design a vector image, or perhaps acquire one, you approve its appearance based on what you see on your computer. The odds are good that a friend or editor, on a different computer, will be using the same software and thus see the same result. However, that is not true of the software built into commercial printing machines. That software may interpret erroneous or ambiguous vector instructions in a different way than you expected.</p> -<p>A good example is on pages 232-234 of the <i>Adobe PDF 1.7 Reference</i>. That's an enormous file, full of technical information. You don't need to read it. But Adobe provides an example of a vector drawing in the form of a five-pointed star, made with one continuous line that crosses itself. There are two possible rules for deciding whether the central pentagon should be filled or not. They produce different results. Adobe chooses a particular rule, and so should all compliant software. But is all software compliant? Without reading the Adobe spec, there is no particular reason to prefer one rule over the other. And, that's a simple example. Many vector drawings are very convoluted, in ways that make the artist's intent difficult to interpret.</p> <p>You normally do not need to scale images. Your finished work will be viewed at fixed size on the printed page, not at variable size in a PDF reader. So, <em>scalability is not an advantage</em>. Your image is placed on paper at its exact size and resolution. You are in complete control. If it is purely black/white line art, its detail will be about the same whether it was placed as vector or raster. If it is grayscale, it is subject to halftoning, which reduces the resolution in any case.</p> -<p>• Do not attempt to place an image by including a PDF within your TeX file. The reason is that the included PDF may carry its own File Data, which will differ from the File Data of the main PDF. There's nothing you can do about that, and commercial printers don't like it. So, don't do it. Indeed, <i>novel</i> may ban it!</p> +<p>• Do not attempt to place an image by including a PDF within your TeX file.</p> <h4 id="h7.1.1">7.1.1. Use Flattened <i>png</i> or <i>jpg</i> Image Format</h4> <div class="d4" id="d7.1.1"> @@ -2088,12 +2055,7 @@ This text is in lightgray, until the group ends.<br/> <p class="code">For jpg images: <i>JPEG-Colorspace: 1</i> and <i>JPEG-Colorspace-Name: GRAYSCALE</i></p> <p>The above codes are the only ones that matter. Even if other information claims that the image is grayscale, or lists the colors and they are all shades of gray, <em>that is not good enough</em>. When automated software reviews your PDF for compliance, it will look at the png <i>IHDR.color_type</i>, which must be 0, or the <i>JPEG-Colorspace</i>, which must be 1. Anything else fails. If the information is different, it means that you forget to change the mode from RGB to grayscale before you exported the image.</p> <p>You may ask: If the image was not really grayscale, can it be converted to grayscale using a simple command line, with ImageMagick or GraphicsMagick? The answer is yes, but don't do it that way. The reason is that there are many ways to map colors (even "gray colors") to true grayscale, and an automated conversion may produce unexpectedly light or dark results. It is better to do the conversion in a graphics program, where you can see what you are doing.</p> -</div><!-- end 7.3.2 --> - -<h4 id="h7.2.3">7.2.3. Scaling Images after <code>\Rework</code>.</h4> -<div class="d4" id="d7.2.3"> -<p class="noindent">When you use one or both of the <code>\Rework</code> commands (<a href="#hA">Appendix A</a>), the font size and/or the baselineskip will change. However, it does not scale images. In many cases, there is no problem. But in some cases, an un-scaled image will disrupt the previous flow of text or pagination. The same Appendix shows you how to scale images when you use <code>\Rework</code>.</p> -</div><!-- end 7.2.3 --> +</div><!-- end 7.2.2 --> </div><!-- end 7.2 --> <h3 id="h7.3">7.3. Placing Images In Your Document</h3> @@ -2114,7 +2076,7 @@ This text is in lightgray, until the group ends.<br/> <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"> <p class="noindent">This command places the image as an inline element, at 100% scale. The use of <i>png</i> or <i>jpg</i> images, with file extension, is required.<p> -<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>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.</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>, <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> @@ -2165,7 +2127,7 @@ He would have taken the car, had it not been stolen. But that was why he was her <h4 id="h7.3.5">7.3.5. <code>\BlockImage</code> with Accompanying Text</h4> <div class="d4" id="d7.3.5"> -<p><b>Attention:</b> Changed behavior of <code>\BlockImage</code> in v. 1.46. See <a href="#hG">issue G.3</a></p> +<p><b>Attention:</b> Changed behavior of <code>\BlockImage</code> in v. 1.46.</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> @@ -2184,7 +2146,6 @@ Lord Withens shrugged, and rode on. There was nothing to do but remain silent, t <h3 id="h7.4">7.4. Color Cover Artwork</h3> <div class="d3" id="d7.4"> <p class="noindent">This portion serves a limited purpose. It is for the benefit of those who need to submit color print cover artwork in the form of a PDF/X-1a:2001 file, with the artwork as CMYK and 240% ink limit. This is the format required by some American print-on-demand services. It is also generally acceptable to others, whose requirements are less restrictive.</p> -<p>Example cover artwork can be found at the <a class="external" rel="external" target="new" href="https://github.com/RobtAll/novel/">GitHub project page</a>, in the "other" folder.</p> <p><b>Before you begin:</b> Do you really need to do this? Many print-on-demand services are perfectly happy to accept something such as an ordinary RGB jpeg image, as long as it has the correct size (with bleed area). They can easily process it for print production in a few moments, using professional software. If they do it, then whether or not you are surprised by the resulting colors, will depend on whether or not your original image is within the printer gamut. In other cases, the print service prefers (or insists) that you do the image print production processing yourself. Then, you get to see an emulation of the print colors <em>before</em> you submit the file, and can change your artwork if the resulting colors are disappointing.</p> <p>The <em>novel</em> document class does not provide any support for creating the original artwork, either image or text. In fact, TeX is not the best way to do that. Use a graphics program (such as the free GIMP) to do your artwork, including text. In the end, your text will be rasterized, just like any background image. For this reason, avoid using small text, or consider using a sans-serif typeface on the cover (even though there is no sans-serif in the book itself).</p> <p>DO NOT PLACE A BARCODE. If your print service requests a white rectangle where the barcode will go, then include it in your image. Almost every print service is willing to create the barcode from your ISBN, and place the barcode image into your PDF during post-processing. Most of them even demand that they do it themselves. Do-it-yourself barcodes are incompatible with the following instructions.</p> @@ -2339,7 +2300,7 @@ Lord Withens shrugged, and rode on. There was nothing to do but remain silent, t <p><img class="floatright" src="html-resources/smythsewn.png" width="177" height="141" alt="perfect binding"/> The best hardcovers, suitable for library use, are made using the <b>Smyth Sewing</b> process. A Smyth Sewn book has signatures of (typically) 12 or 16 folios. But instead of removing the creases after folding, each signature is sewn through its crease using strong thread, onto a durable spine material. The pages will remain attached, even with hard usage. If the spine material is sufficiently flexible, then the book will lie flat when opened.</p> <p>Be sure to ask about spine flexibility. The most flexible methods have a soft, curved spine, and are best suited to thick novels. There is also a variety that has a square (flat) spine, which will not quite lie flat when opened. Square-spine Smyth Sewn books seem to be the fashion for documenting intellectual property.</p> <p>If a major publisher is producing a book that is sure to be ordered by many libraries, due to its author's popularity or maybe a movie tie-in, then it is likely to be released as a Smyth Sewn hardcover. That's because the production method is affordable in quantity. But on a P.O.D. basis, it is a significant expense.</p> -<p>Different bindings must have different ISBNs, because they are different products. If you need to change the dimensions of Trim Size or Margins, the <code><a href="#hA">\Rework</a></code> commands are your friends.</p> +<p>Different bindings must have different ISBNs, because they are different products.</p> </div><!-- end 8.2.2 --> <h4 id="h8.2.3">8.2.3 Other Bindings</h4> @@ -2758,74 +2719,93 @@ Dirk Hardcase is a former... etc.\par<br/> <div id="pageA" class="page"> -<h2 id="hA">Appendix A. <img src="html-resources/amb.png" width="30" height="22" alt="emergency icon"/> Emergency Clinic: Rework Layout</h2> +<h2 id="hA">Appendix A. Sample Document</h2> <div class="d2" id="dA"> -<div style="padding: 6px 0px 6px 0px; margin:0px 32px 6px 16px; background:#ffe7e7 none"> -<p class="noindent">Situation: Your book is designed for Trim Size 5.25x8, one of several widely-used American sizes. You have put many hours of work into getting just the right line breaks within paragraphs, and just the right pagination. It looks beautiful. But then you get an e-mail from a British distributor. Could you change to British size B novel format, essentially 5.06x7.81 Trim Size?</p> -<p>Sure, you say. Just needs a little math. Knock 0.095" off each margin. What could be easier? So you try that, but the printer rejects your file. It seems that your original margins were as narrow as they could be, per the printer's specifications. You cannot make them any narrower.</p> -<p>But if you re-size the book and don't knock the margins down, then the text width and height won't be the same. Your text doesn't fit the way it used to. All your lines re-flow, the page breaks are different, and all that work you put into getting just the right appearance must be re-done.</p> -<p><em>Oh, nooooo ...</em></p> -</div> -<p>Relax. Here is all you need to do: add <code>\ReworkTrimSize{5.06in}{7.81in}</code>. That's it. Your existing margins will be preserved. The font size, and line skip, will be cleverly re-scaled to fit the new dimensions. Paragraphs and pagination are the same as before.</p> -<p>There are two Rework commands available. One changes the Trim Size without changing the margins. The other changes the margins without changing the Trim Size. If you wish to change both Trim Size and margins, you may use both commands.</p> - -<h3 id="hA.1">A.1. <code>\ReworkTrimSize{<em>width</em>}{<em>height</em>}</code></h3> -<div class="d3" id="dA.1"> -<p>This command changes the <em>existing</em> Trim Size. If you do not use the <code>\SetTrimSize</code> command, then the existing Trim Size is the default. But if you do use <code>\SetTrimSize</code>, then you must leave that command as-is, and place <code>\ReworkTrimSize</code> later in the Preamble.</p> -<p>If you used <code>\SetMediaSize</code>, you may leave that command as-is, or change it if you wish; the Trim Size does not care.</p> -</div><!-- A.1 --> - -<h3 id="hA.2">A.2. <code>\ReworkMargins{<em>top</em>}{<em>outside</em>}{<em>bottom</em>}{<em>inside</em>}</code></h3> -<div class="d3" id="AF.2"> -<p>This command changes the <em>existing</em> margins. If you do not use the <code>\SetMargins</code> command, then the existing margins are the defaults. But if you do use <code>\SetMargins</code>, then you must leave that command as-is, and place <code>\ReworkMargins</code> later in the Preamble.</p> -</div><!-- end A.2 --> - -<h3 id="hA.3">A.3. Example of Rework</h3> -<div class="d3" id="dA.3"> -<p>Here is an example of the Rework commands in use. When the layout is reworked, the font size and (if necessary) baseline skip is scaled to fit the new dimensions, in a way that preserves the original paragraphs and pagination. This is done in a single pass: The method simultaneously works and re-works the layout.</p> -<p>In the following example, the original font size is 11pt, and the baselineskip (calculated based on other factors) is 14.377pt. After rework, the font size is automatically re-calculated to 10.468pt, with lineskip 13.883pt.</p> -<p class="code"> -<code>\documentclass{novel}<br/> -\SetTrimSize{5.25in}{8in} % Original. American.<br/> -\SetMargins{0.36in}{0.4in}{0.38in}{0.65in} % Original. American<br/> -\ReworkTrimSize{5.06in}{7.81in} % New. Equivalent to British 129mmW x 198mmH.<br/> -\ReworkMargins{12mm}{12mm}{12mm}{15mm} % New. British. -</code></p> -<p>Result with original layout (above Rework commands commented out):</p> -<p class="centerimg"><img src="html-resources/originalspread.png" width="726" height="544" alt="original spread, before rework"/></p> -<p>Result after Rework:</p> -<p class="centerimg"><img src="html-resources/reworkedspread.png" width="700" height="531" alt="spread after rework"/></p> -</div><!-- end A.3 --> - -<h3 id="hA.4">A.4. Limitations of Rework</h3> -<div class="d3" id="dA.4"> -<p>• The technique has been tested, but it might not always work. Be sure to inspect the result carefully.</p> -<p>• If you use Rework to make a radical size change, then the resulting font size or line skip might be unattractive.</p> -<p>• If the reworked pages have one less line than expected (or one more), this is due to roundoff in the calculations. It can usually be fixed by adding or subtracting as little as <code>0.001\nbs</code> from the top or bottom rework margin.</p> -<p>• The biggest obstacle occurs when you specify some internal length in terms of absolute units (such as pt). It is always best to use relative units (such as <i>em</i>, or sometimes <code>\nbs</code>), so that they can be scaled along with the text:</p> -<p class="code"> -Bad: <code>\hspace{6pt}</code> Good: <code>\hspace{0.5em}</code><br/> -Bad: <code>\kern1pt</code> Good: <code>\kern.08em</code><br/> -Bad: <code>\vspace{0.5in}</code> Good: <code>\vspace{2.4\nbs}</code> +<p class="noindent">If you click on a command, you will be taken to its documentation. +There are many other commands available, but they are not specific to novel class.</p> +<div class="sampledoc"> +<p>Non-empty default values are <em>shown like this</em>.<br/> + </p> +<p style="text-indent:0"> +<a href="#h1.2.3">% !TeX TS-program = LuaLaTeX</a><br/> +<a href="#h1.2.1">% !TeX encoding = UTF-8</a><br/> +<a href="#h2">\documentclass{novel}</a> % See list of class options; usually none needed.<br/> +%%% METADATA (FILE DATA):<br/> +<a href="#h3.3.1">\SetTitle{}</a> % Default: empty. Required for PDF/X.<br/> +<a href="#h3.3.3">\SetSubtitle{}</a> % Default: empty.<br/> +<a href="#h3.3.2">\SetAuthor{}</a> % Default: empty.<br/> +<a href="#h3.3.4">\SetApplication{<em>LuaLaTeX with novel and microtype</em>}</a><br/> +<a href="#h3.3.4">\SetProducer{<em>LuaLaTeX with novel-pdfx and hyperref</em>}</a><br/> +<a href="#h3.4">\SetPDFX{<em>off</em>}</a><br/> +%%% DIMENSIONS:<br/> +<a href="#h4.1.1">\SetTrimSize{<em>5.5in</em>}{<em>8.5in</em>}</a> % Sets width, height of your book.<br/> +% Default Media Size equals Trim Size.<br/> +% Rarely-used over-ride:<br/> +% <a href="#h4.1.2">\SetMediaSize[<em>alignment</em>]{<em>width</em>}{<em>height</em>}</a><br/> +% Cropmark gap is ignored unless document class option cropmarks:<br/> +<a href="#h4.1.3">\SetCropmarkGap{<em>0.125in</em>}</a><br/> +% Default margins vary with Trim Size. Defaults for {5.5in}{8.5in}:<br/> +<a href="#h4.3.1">\SetMargins{<em>0.5in</em>}{<em>0.5in</em>}{<em>0.5in</em>}{<em>0.75in</em>}</a><br/> +%%% GENERAL FONTS:<br/> +% Percent at end of line is necessary, when writing font settings multi-line:<br/> +<a href="#h4.2.1.1">\SetParentFont[%<br/> +<em>SmallCapsFeatures={Renderer=Basic},</em></a>% Effective when small caps requested locally.<br/> +<a href="#h4.2.1.1"><em>Kerning=On,</em> %<br/> +<em>Ligatures=TeX,</em> %<br/> +]{<em>Libertinus Serif</em>}</a><br/> +% Main text font automatically adds <em>Numbers=OldStyle,Ligatures=Common</em>.<br/> +% Default main font size is based on other layout settings.<br/> +% Varies from 11pt to 12pt. With all default layouts, value is 11.4pt.<br/> +% You may manually choose a different main font size:<br/> +% <a href="#h4.2.1.2">\SetFontSize{<em>length</em>}</a><br/> +% Default lines per page (main textblock) is calculated from other layout settings.<br/> +% When using all defaults, the calculated value is 35.<br/> +% If used, \SetLinesPerPage manually chooses the value:<br/> +% <a href="#h4.3.2">\SetLinesPerPage{<em>integer</em>}</a><br/> +<a href="#h4.2.3">\SetDecoFont{<em>NovelDeco.otf</em>}</a><br/> +<a href="#h4.2.4">\setsansfont{<em>Libertinus Sans</em>}</a><br/> +<a href="#h4.2.4">\setmonofont{<em>Libertinus Mono</em>}</a><br/> +<a href="#h4.2.4">\setmathfont{<em>Libertinus Math</em>}</a> % unicode-math<br/> +%%% HEADERS/FOOTERS:<br/> +<a href="#h4.3.3">\SetHeadFootStyle{<em>1</em>}</a> % This style has headers only.<br/> +<a href="#h4.3.4.1">\SetHeadJump{<em>1.5</em>}</a><br/> +<a href="#h4.3.4.1">\SetFootJump{<em>1.5</em>}</a><br/> +<a href="#h4.3.4.3">\SetLooseHead{<em>50</em>}</a><br/> +<a href="#h4.3.4.5">\SetEmblems{}{}</a> % Default blanks.<br/> +<a href="#h4.3.4.2">\SetHeadFont[<em>\parentfontfeatures,Letters=SmallCaps,Scale=0.92</em>]{<em>\parentfontname</em>}</a><br/> +<a href="#h4.3.4.4">\SetPageNumberStyle{<em>\thepage</em>}</a><br/> +<a href="#h4.3.4.6">\SetVersoHeadText{<em>\theAuthor</em>}</a><br/> +<a href="#h4.3.4.6">\SetRectoHeadText{<em>\theTitle</em>}</a><br/> +%%% CHAPTERS:<br/> +<a href="#h5.1.2.1">\SetChapterStartStyle{<em>footer</em>}</a> % Equivalent to empty, when style has no footer.<br/> +<a href="#h5.1.2.2">\SetChapterStartHeight{<em>10</em>}</a><br/> +<a href="#h5.1.3.1">\SetChapterFont[<em>Numbers=Lining,Scale=1.6</em>]{<em>\parentfontname</em>}</a><br/> +<a href="#h5.1.3.1">\SetSubchFont[<em>Numbers=Lining,Scale=1.2</em>]{<em>\parentfontname</em>}</a><br/> +<a href="#h5.3.1">\SetScenebreakIndent{<em>false</em>}</a><br/> +%%% CUSTOM FONTS:<br/> +% <a href="#h4.2.5">\NewFontFamily[]{}</a> % Optional command.<br/> +% <a href="#h4.2.5">\NewFontFace[]{}</a> % Optional command.<br/> +% <a href="#hE.2.3">\CreateFontFeature{}{}</a> % Optional command.<br/> +%%% OTHER:<br/> +<a href="#h1.2.1.1">\setdefaultlanguage[<em>variant=american</em>]{<em>english</em>}</a> % polyglossia<br/> +<a href="#h6">\microtypesetup{<em>config=novel-microtype,stretch=20,shrink=20,final</em>}</a> % microtype<br/> +%%% BEGIN DOCUMENT:<br/> +\begin{document}<br/> +<a href="#h8.3.2">\frontmatter</a> % Required.<br/> +% Typically <a href="#hB">six pages</a> of front matter, but <a href="#h8.3.2">could be more</a>.<br/> +<a href="#h8.3.3">\mainmatter</a> % Required<br/> +% <a href="#h5">Chapters</a> go here. SAMPLE Chapter structure:<br/> +<a href="#h5.1.1">\clearpage</a> % or <a href="#h5.1.1">\cleartorecto</a><br/> +<a href="#h5.1.2.3">\begin{ChapterStart}</a><br/> +\vspace*{2\nbs} % Space above chapter title. \nbs = normal baseline skip.<br/> +<a href="#h5.1.3">\ChapterTitle{</a>— 1 —<a href="#h5.1.3">}</a> % Perhaps also <a href="#h5.1.3">ChapterSubtitle</a>, <a href="#h5.1.3">ChapterDeco</a>.<br/> +<a href="#h5.1.2.3">\end{ChapterStart}</a><br/> +It was a dark and stormy night, etc.<br/> +<a href="#h5.1.1">\clearpage</a> % or <a href="#h5.1.1">\cleartorecto</a><br/> +<a href="#h8.3.4">\cleartoend</a><br/> +\end{document} </p> -<p>• When you use Rework, images are <em>not</em> scaled. Thus, they will have a different relationship to the surrounding text than they did before. In many cases, this is not a problem. However, an un-scaled image may disrupt the flow of text, or the number of lines in a page, or overlap text that was previously cleared. Look in the log file for an Alert message, which suggests an appropriate image scale, depending on how an image was placed. Problem areas can often be fixed be scaling the related image(s) in an external graphics program (see below, and also <a href="#h7">section 7</a>) then re-compiling with the scaled image(s).</p> -<p>• Note that you may see the Alert whether or not there are problem images, so scaling images will not make the Alert go away. It is a friendly message.</p> -<div style="clear:both"></div> -</div><!-- end A.4 --> - -<h3 id="hA.5">A.5. Scaling Images after <code>\Rework</code>.</h3> -<div class="d3" id="dA.5"> -<p>When you use one or both of the Rework commands, the font size and/or the baselineskip will change. However, it does not scale images. In many cases, there is no problem. But in some cases, an un-scaled image will disrupt the previous flow of text or pagination. If you look in the log file, you will see an Alert message, which suggests (only suggests) appropriate values for scaling problem images, depending on whether they are placed inline or block. Then, you should re-work the image in an external image editor. When you scale the image, be sure that the revised version is at the correct resolution of 300dpi or 600dpi, or whatever is necessary.</p> -<p>It is best to go back to your copy of the original artwork, before you exported it to <i>png</i> or <i>jpg</i>. But what if you do not have anything but the 1-bit or grayscale images that you created earlier? Then do this (in GIMP):</p> -<p>(1) If the image is 1-bit, change to Color>Mode grayscale.</p> -<p>(2) Use Image>Scale Image to get new dimensions, at 600 or 300 pixels per inch. Careful: Sometimes when you change size, it auto-changes resolution, or vice-versa. Click back and forth in the dialog box, to ensure that both the dimensions and resolution are correct. Use Cubic interpolation or better.</p> -<p>(3) Change View to something that puts the image at its approximate print size.</p> -<p>(4) If desired, play with Filters>Enhance>Sharpen.</p> -<p>(5) Image>Flatten.</p> -<p>(6) If the image is to be 1-bit line art, then use GraphicsMagick or ImageMagick as described in <a href="#h7.2.1">section 7.2.1</a>.</p> -<p>(7) If the image is to be grayscale, export as png, then use GraphicsMagick or Image Magick as described in <a href="#h7.2.2">section 7.2.2</a>.</p> -<p>The above does not take too much time, and will provide superior results. Note that when an image is placed within text, the calculation for text positioning is different than the calculation for image positioning. It is possible (although unlikely) that a <code>\Rework</code> situation will cause an unexpected page break, due to roundoff error in the placement of the final line on a page. This can be fixed by subtracting (or, in some cases, adding) as little as <code>\vspace{-0.001\nbs}</code> before or after the re-scaled image.</p> -</div><!-- end A.5 --> +</div> </div><!-- end A --> @@ -3141,138 +3121,6 @@ Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here. </div><!-- end E --> </div><!-- end Appendix E --> <!-- ************************************************************ --> -<div id="pageF" class="page"> - - -<h2 id="hF">Appendix F. Sample Document</h2> -<div class="d2" id="dF"> -<p class="noindent">If you click on a command, you will be taken to its documentation. -There are many other commands available, but they are not specific to novel class.</p> -<div class="sampledoc"> -<p>Non-empty default values are <em>shown like this</em>.<br/> - </p> -<p style="text-indent:0"> -<a href="#h1.2.3">% !TeX TS-program = LuaLaTeX</a><br/> -<a href="#h1.2.1">% !TeX encoding = UTF-8</a><br/> -<a href="#h2">\documentclass{novel}</a> % See list of class options; usually none needed.<br/> -%%% METADATA (FILE DATA):<br/> -<a href="#h3.3.1">\SetTitle{}</a> % Default: empty. Required for PDF/X.<br/> -<a href="#h3.3.3">\SetSubtitle{}</a> % Default: empty.<br/> -<a href="#h3.3.2">\SetAuthor{}</a> % Default: empty.<br/> -<a href="#h3.3.4">\SetApplication{<em>LuaLaTeX with novel and microtype</em>}</a><br/> -<a href="#h3.3.4">\SetProducer{<em>LuaLaTeX with novel-pdfx and hyperref</em>}</a><br/> -<a href="#h3.4">\SetPDFX{<em>off</em>}</a><br/> -%%% DIMENSIONS:<br/> -<a href="#h4.1.1">\SetTrimSize{<em>5.5in</em>}{<em>8.5in</em>}</a> % Sets width, height of your book.<br/> -% Default Media Size equals Trim Size (possibly after \Rework).<br/> -% Rarely-used over-ride:<br/> -% <a href="#h4.1.2">\SetMediaSize[<em>alignment</em>]{<em>width</em>}{<em>height</em>}</a><br/> -% Cropmark gap is ignored unless document class option cropmarks:<br/> -<a href="#h4.1.3">\SetCropmarkGap{<em>0.125in</em>}</a><br/> -% Default margins vary with Trim Size. Defaults for {5.5in}{8.5in}:<br/> -<a href="#h4.3.1">\SetMargins{<em>0.5in</em>}{<em>0.5in</em>}{<em>0.5in</em>}{<em>0.75in</em>}</a><br/> -%%% GENERAL FONTS:<br/> -% Percent at end of line is necessary, when writing font settings multi-line:<br/> -<a href="#h4.2.1.1">\SetParentFont[%<br/> -<em>SmallCapsFeatures={Renderer=Basic},</em></a>% Effective when small caps requested locally.<br/> -<a href="#h4.2.1.1"><em>Kerning=On,</em> %<br/> -<em>Ligatures=TeX,</em> %<br/> -]{<em>Libertinus Serif</em>}</a><br/> -% Main text font automatically adds <em>Numbers=OldStyle,Ligatures=Common</em>.<br/> -% Default main font size is based on other layout settings.<br/> -% Varies from 11pt to 12pt. With all default layouts, value is 11.4pt.<br/> -% You may manually choose a different main font size:<br/> -% <a href="#h4.2.1.2">\SetFontSize{<em>length</em>}</a><br/> -% Default lines per page (main textblock) is calculated from other layout settings.<br/> -% When using all defaults, the calculated value is 35.<br/> -% If used, \SetLinesPerPage manually chooses the value:<br/> -% <a href="#h4.3.2">\SetLinesPerPage{<em>integer</em>}</a><br/> -<a href="#h4.2.3">\SetDecoFont{<em>NovelDeco.otf</em>}</a><br/> -<a href="#h4.2.4">\setsansfont{<em>Libertinus Sans</em>}</a><br/> -<a href="#h4.2.4">\setmonofont{<em>Libertinus Mono</em>}</a><br/> -<a href="#h4.2.4">\setmathfont{<em>Libertinus Math</em>}</a> % unicode-math<br/> -%%% HEADERS/FOOTERS:<br/> -<a href="#h4.3.3">\SetHeadFootStyle{<em>1</em>}</a> % This style has headers only.<br/> -<a href="#h4.3.4.1">\SetHeadJump{<em>1.5</em>}</a><br/> -<a href="#h4.3.4.1">\SetFootJump{<em>1.5</em>}</a><br/> -<a href="#h4.3.4.3">\SetLooseHead{<em>50</em>}</a><br/> -<a href="#h4.3.4.5">\SetEmblems{}{}</a> % Default blanks.<br/> -<a href="#h4.3.4.2">\SetHeadFont[<em>\parentfontfeatures,Letters=SmallCaps,Scale=0.92</em>]{<em>\parentfontname</em>}</a><br/> -<a href="#h4.3.4.4">\SetPageNumberStyle{<em>\thepage</em>}</a><br/> -<a href="#h4.3.4.6">\SetVersoHeadText{<em>\theAuthor</em>}</a><br/> -<a href="#h4.3.4.6">\SetRectoHeadText{<em>\theTitle</em>}</a><br/> -%%% CHAPTERS:<br/> -<a href="#h5.1.2.1">\SetChapterStartStyle{<em>footer</em>}</a> % Equivalent to empty, when style has no footer.<br/> -<a href="#h5.1.2.2">\SetChapterStartHeight{<em>10</em>}</a><br/> -<a href="#h5.1.3.1">\SetChapterFont[<em>Numbers=Lining,Scale=1.6</em>]{<em>\parentfontname</em>}</a><br/> -<a href="#h5.1.3.1">\SetSubchFont[<em>Numbers=Lining,Scale=1.2</em>]{<em>\parentfontname</em>}</a><br/> -<a href="#h5.3.1">\SetScenebreakIndent{<em>false</em>}</a><br/> -%%% CUSTOM FONTS:<br/> -% <a href="#h4.2.5">\NewFontFamily[]{}</a> % Optional command.<br/> -% <a href="#h4.2.5">\NewFontFace[]{}</a> % Optional command.<br/> -% <a href="#hE.2.3">\CreateFontFeature{}{}</a> % Optional command.<br/> -%%% OTHER:<br/> -<a href="#h1.2.1.1">\setdefaultlanguage[<em>variant=american</em>]{<em>english</em>}</a> % polyglossia<br/> -<a href="#h6">\microtypesetup{<em>config=novel-microtype,stretch=20,shrink=20,final</em>}</a> % microtype<br/> -%%% EMERGENCY USE:<br/> -% <a href="#hA.1">\ReworkTrimSize{}{}</a> % Optional command.<br/> -% <a href="#hA.2">\ReworkMargins{}{}{}{}</a> % Optional command.<br/> -%%% BEGIN DOCUMENT:<br/> -\begin{document}<br/> -<a href="#h8.3.2">\frontmatter</a> % Required.<br/> -% Typically <a href="#hB">six pages</a> of front matter, but <a href="#h8.3.2">could be more</a>.<br/> -<a href="#h8.3.3">\mainmatter</a> % Required<br/> -% <a href="#h5">Chapters</a> go here. SAMPLE Chapter structure:<br/> -<a href="#h5.1.1">\clearpage</a> % or <a href="#h5.1.1">\cleartorecto</a><br/> -<a href="#h5.1.2.3">\begin{ChapterStart}</a><br/> -\vspace*{2\nbs} % Space above chapter title. \nbs = normal baseline skip.<br/> -<a href="#h5.1.3">\ChapterTitle{</a>— 1 —<a href="#h5.1.3">}</a> % Perhaps also <a href="#h5.1.3">ChapterSubtitle</a>, <a href="#h5.1.3">ChapterDeco</a>.<br/> -<a href="#h5.1.2.3">\end{ChapterStart}</a><br/> -It was a dark and stormy night, etc.<br/> -<a href="#h5.1.1">\clearpage</a> % or <a href="#h5.1.1">\cleartorecto</a><br/> -<a href="#h8.3.4">\cleartoend</a><br/> -\end{document} -</p> -</div> - - -</div><!-- end F --> -</div><!-- end Appendix F --> -<!-- ************************************************************ --> -<div id="pageG" class="page"> - - -<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 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. (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. (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 --> -</div><!-- end Appendix G --> -<!-- ************************************************************ --> diff --git a/Master/texmf-dist/doc/lualatex/novel/novel.pdf b/Master/texmf-dist/doc/lualatex/novel/novel.pdf index 8a50d6bde2c..6344727d8bf 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-29T09:05:17-08:00</xmp:ModifyDate> - <xmp:CreateDate>2017-11-29T09:05:17-08:00</xmp:CreateDate> + <xmp:ModifyDate>2018-01-12T15:29:52-08:00</xmp:ModifyDate> + <xmp:CreateDate>2018-01-12T15:29:52-08:00</xmp:CreateDate> <xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool> - <xmp:MetadataDate>2017-11-29T09:05:17-08:00</xmp:MetadataDate> + <xmp:MetadataDate>2018-01-12T15:29:52-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:7A0CBD4898C2B0E61ED2119C1964A4A5</xmpMM:InstanceID> + <xmpMM:InstanceID>uuid:2430AB7E0B2722BE01A2C97DE8DB3BCF</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 +/F56 18.17191 Tf 1 0 0 1 178.388 537.015 Tm [<002F0030>-37<00370026002D>]TJ +/F56 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 +/F58 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 +/F59 11.3574 Tf 1 0 0 1 53.432 446.295 Tm [<0038004900460053>5<0046>-250<004A0054>-249<005500490046>-250<00450050>-7<00440056004E0046004F005500420055004A0050004F00200020>]TJ +/F56 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 +/F60 11.3574 Tf 1 0 0 1 128.745 431.499 Tm [<00550046>7<005900450050>-7<0044>]TJ +/F56 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 +/F59 11.3574 Tf 1 0 0 1 54 357.522 Tm [<0025>-5<0046005400440053004A00510055004A0050004F001B>]TJ +/F56 11.3574 Tf 1.02 0 0 1 117.818 357.522 Tm [<09AB0046>]TJ +/F60 11.3574 Tf 1.02 0 0 1 138.758 357.522 Tm [<004F0050>6<0057>8<0046004D>]TJ +/F56 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 +/F56 13.62884 Tf 1 0 0 1 54 213.658 Tm [<0012000F>-333<002700460042005500560053>7<00460054>]TJ +/F56 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 +/F60 11.3574 Tf 0.98 0 0 1 103.452 165.183 Tm [<004F0050>7<0057>8<0046004D>]TJ +/F56 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 +/F56 10.44878 Tf 1 0 0 1 204.571 39.407 Tm [<0012>]TJ ET endstream @@ -187,52 +187,48 @@ 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<</F56 8 0 R/F58 9 0 R/F59 10 0 R/F60 11 0 R>>/ProcSet[/PDF/Text]>> endobj 15 0 obj -<</Length 8652 >> +<</Length 7793 >> 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 +/F56 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 +/F60 11.3574 Tf 1.02 0 0 1 143.404 535.052 Tm [<00470050004F005500540051>-6<0046>-7<0044>]TJ +/F56 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 +/F60 11.3574 Tf 0.98 0 0 1 138.827 490.666 Tm [<004F0050>7<0057>8<0046004D>]TJ +/F56 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 +/F60 11.3574 Tf 0.98 0 0 1 237.08 446.28 Tm [<004F0050>7<0057>8<0046004D000D>]TJ +/F56 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 +/F60 11.3574 Tf 0.98 0 0 1 231.129 401.894 Tm [<004F0050>7<0057>8<0046004D>]TJ +/F56 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 +/F56 13.62884 Tf 1 0 0 1 36 346.801 Tm [<0013000F>-333<00240050004E0051004D004600550046>-250<00250050>-7<00440056004E0046004F005500420055004A0050004F>]TJ +/F56 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 +/F56 13.62884 Tf 1 0 0 1 36 258.029 Tm [<0014000F>-333<002D004A00440046004F00540046>]TJ +/F56 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 [<0A21000F0A240A26000D>-250<0A220A200A210A27000E0A210A21000E0A210A27001B>-333<003D0023004D0050>-7<0044004C002A004E004200480046>-250<004400490042004F00480046>9<000F>-332<0A21000F0A240A26000F0A21001B>-334<002E004A004F00500053>-250<098B0059000F>]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 +/F56 13.62884 Tf 1 0 0 1 36 169.257 Tm [<0015000F>-333<0037>79<004600530054004A0050004F>]TJ +/F56 11.3574 Tf 1 0 0 1 36 150.372 Tm [<0A21000F0A240A26000F0A22000D>-250<0A220A200A210A28000E0A200A21000E0A210A24001B>-333<002E004A004F00500053>-250<004A004E00510053>7<0050>7<0057>8<0046004E0046004F00550054>-249<0054004A004F00440046>-250<0054005500420043004D0046>-250<0057>7<004600530054004A0050004F>-249<0A21000F0A240A26000F>]TJ +1 0 0 1 36 135.577 Tm [<0A21000F0A21000D>-250<0A220A200A210A27000E0A200A23000E0A200A21001B>-333<004A004F004A0055004A0042004D>-250<005100560043004D004A0044>-250<0053>7<0046004D0046004200540046>10<000F>]TJ +/F56 10.44878 Tf 1 0 0 1 186.571 39.407 Tm [<0013>]TJ ET endstream @@ -243,55 +239,49 @@ 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<</F56 8 0 R/F60 11 0 R>>/ProcSet[/PDF/Text]>> endobj 18 0 obj -<</Length 10146 >> +<</Length 8428 >> 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 +/F56 13.62884 Tf 1 0 0 1 54 553.936 Tm [<0016000F>-333<0027>58<0022>34<00320054>]TJ +/F56 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 -1 0 0 1 54 490.666 Tm [<0032>29<000F>-607<002A0054>-250<00550049004A0054>-250<00510053>8<0050004B0046>-7<00440055>-250<00540055004A004D004D>-250<0042004D004A0057>8<00460020>]TJ -1 0 0 1 54 475.87 Tm [<0022000F>]TJ -1.004 0 0 1 71.036 475.87 Tm [<003A>70<00460054000F>-332<002300560055>-249<004A00550054>-249<00440053>7<00460042005500500053>-249<0058>7<00500056004D0045>-248<004D004A004C0046>-249<00540050004E0046>-7<0050004F0046>-249<0046004D00540046>-250<00550050>-249<00550042004C0046>-249<0050>6<0057>8<00460053>-249<004D0050004F0048000E>]TJ -1.02 0 0 1 71.036 461.075 Tm [<005500460053004E>-313<004E0042004A004F00550046004F0042004F00440046>9<000D>-330<0043>-10<0046>-7<00440042005600540046>-314<00490046>-313<004A0054>-314<004E0050>6<0057004A004F0048>-313<0050004F>-313<00550050>-314<00500055004900460053>-314<00550049004A004F00480054000F>]TJ -1.02 0 0 1 71.036 446.28 Tm [<002A0047>-278<004A004F005500460053>7<0046005400550046>-6<0045000D>-286<00540046>-7<0046>-278<0046000E004E0042004A004D>-278<00420055>-278<005500500051>-278<00500047>-279<004F0050>6<0057>8<0046004D000F0044004D0054>-277<098B004D0046>9<000F>-425<003A>69<00500056>-278<0058004A004D004D>-278<004F0046>-7<0046>-6<0045>]TJ -1.02 0 0 1 71.036 431.484 Tm [<00550050>-306<0043>-10<0046>-306<00470042004E004A004D004A00420053>-306<0058004A00550049>-307<002D00560042002D00420035>61<00460039000D>-305<00470050004F005500540051>-7<0046>-7<0044000D>-321<00300051>-7<0046004F>-307<0035>48<005A0051>-6<0046>9<000D>-321<0042004F0045>-306<005500490046>]TJ -1.01 0 0 1 71.036 416.689 Tm [<005500460053004E004A004F0050004D00500048005A>-246<00500047>-246<098B00440055004A0050004F>-245<00580053004A>-1<0055004A004F0048000F>-329<002D00560042>-246<00440050>-7<0045004A004F0048>-246<004F00500055>-246<0053>7<0046>-6<00520056004A0053>7<0046>-6<0045000F>-329<0036004F0055004A004D>]TJ -1 0 0 1 71.036 401.894 Tm [<005500490046004F000D>-250<005500490046>-250<00500053004A0048004A004F0042004D>-250<00440053>8<00460042005500500053>-250<0058004A004D004D>-250<004E0042004A004F00550042004A004F>-250<004A0055>-250<00470053>8<0050004E>-250<0055004A004E0046>-250<00550050>-250<0055004A004E0046>10<000F>]TJ -1 0 0 1 54 387.098 Tm [<0032>29<000F>-607<002E005A>-250<0055004900460054004A0054>-250<004200450057004A005400500053>-250<00550050004D0045>-250<004E004606D8>]TJ +1 0 0 1 54 490.666 Tm [<0032>29<000F>-607<0038004900420055>-250<0049004200510051>-7<0046004F0046>-7<0045>-250<00550050>-250<098C0050004200550054>-250<0042004F0045>-250<004D004A0054005500540020>]TJ +1 0 0 1 54 475.87 Tm [<0022000F>-585<002A06DD0057>8<0046>-250<004F0046>7<0057>8<00460053>-250<00540046>-7<0046004F>-250<005500490046004E>-250<004A004F>-250<0042>-250<004F0050>7<0057>8<0046004D000F>-333<00340050>9<000D>-249<005500490046>6<005A>-249<0058>7<00460053>8<0046>-249<00550050005400540046>-7<0045>-250<005000560055000F>]TJ +1 0 0 1 54 461.075 Tm [<0032>29<000F>-607<002E005A>-250<0055004900460054004A0054>-250<004200450057004A005400500053>-250<00550050004D0045>-250<004E004606D8>]TJ +1 0 0 1 54 446.28 Tm [<0022000F>]TJ +1.02 0 0 1 71.036 446.28 Tm [<0034005500500051>-323<0053004A004800490055>-323<0055004900460053>6<0046>10<000F>-561<09AB004A0054>-323<00450050>-7<00440056004E0046004F0055>-323<0044004D004200540054>-324<004A0054>-323<0057>7<00460053>-14<005A>-324<0045004A098A00460053>7<0046004F0055>-322<00470053>7<0050004E>]TJ +1 0 0 1 71.036 431.484 Tm [<0042004F005A00550049004A004F0048>-250<005600540046>-7<0045>-250<004700500053>-250<005500490046005400460054>-250<0042004F0045>-250<00500055004900460053>-250<00420044004200450046004E004A0044>-250<005100560043004D004A004400420055004A0050004F0054000F>]TJ +1 0 0 1 54 416.689 Tm [<0032>29<000F>-607<002A0047>-250<002A>-250<005600540046>-250<0035004A004C003B>-250<004700500053>-250<00270046>7<005A004F004E0042004F>-250<0045004A0042004800530042004E0054000D>-250<005500490046004F06D8>]TJ +1 0 0 1 54 401.894 Tm [<0022000F>-585<00280050>-250<004200580042005A>59<000F>]TJ +1 0 0 1 54 387.098 Tm [<0032>29<000F>-607<002900420054>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<0046>7<0057>8<00460053>-250<0043>-10<0046>-7<0046004F>-250<005600540046>-7<0045>-250<004700500053>-250<0042004F>-250<00420044005500560042004D>-250<004F0050>7<0057>8<0046004D0020>]TJ 1 0 0 1 54 372.303 Tm [<0022000F>]TJ -1.02 0 0 1 71.036 372.303 Tm [<0034005500500051>-323<0053004A004800490055>-323<0055004900460053>6<0046>10<000F>-561<09AB004A0054>-323<00450050>-7<00440056004E0046004F0055>-323<0044004D004200540054>-324<004A0054>-323<0057>7<00460053>-14<005A>-324<0045004A098A00460053>7<0046004F0055>-322<00470053>7<0050004E>]TJ -1 0 0 1 71.036 357.508 Tm [<0042004F005A00550049004A004F0048>-250<005600540046>-7<0045>-250<004700500053>-250<005500490046005400460054>-250<0042004F0045>-250<00500055004900460053>-250<00420044004200450046004E004A0044>-250<005100560043004D004A004400420055004A0050004F0054000F>]TJ -1 0 0 1 54 342.712 Tm [<0032>29<000F>-607<002A0047>-250<002A>-250<005600540046>-250<0035004A004C003B>-250<004700500053>-250<00270046>7<005A004F004E0042004F>-250<0045004A0042004800530042004E0054000D>-250<005500490046004F06D8>]TJ -1 0 0 1 54 327.917 Tm [<0022000F>-585<00280050>-250<004200580042005A>59<000F>]TJ -1 0 0 1 54 313.121 Tm [<0032>29<000F>-607<002900420054>-250<00550049004A0054>-250<00450050>-7<00440056004E0046004F0055>-250<0044004D004200540054>-250<0046>7<0057>8<00460053>-250<0043>-10<0046>-7<0046004F>-250<005600540046>-7<0045>-250<004700500053>-250<0042004F>-250<00420044005500560042004D>-250<004F0050>7<0057>8<0046004D0020>]TJ -1 0 0 1 54 298.326 Tm [<0022000F>]TJ -1.02 0 0 1 71.036 298.326 Tm [<003A>69<00460054>-290<004A004F00450046>-7<0046>-7<00450002>-465<002A004F>-291<0022>32<00560048005600540055>-290<0A220A200A210A27>-292<005500490046>-291<004200560055004900500053>-291<005100560043004D004A005400490046>-7<0045>-291<0042>-291<00440050004E0051004D004600550046>]TJ -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 -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 -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 -1.009 0 0 1 71.036 179.963 Tm [<003800490046004F>-247<002A>-247<0058>7<0050004C0046>-247<00560051>-247<00550049004A0054>-248<004E00500053004F004A004F0048000D>-247<004E005A>-247<0049004600420045>-248<00470046004D0055>-247<004D004A004C0046>-248<0042>-247<00550050>-7<00450045004D00460053>-247<004900420045>]TJ -1.011 0 0 1 71.036 165.168 Tm [<0043>-9<0046>-7<0046004F>-248<0051>-6<00500056004F0045004A004F0048>-248<004A0055>-247<004A004F>-247<0042>-247<00540042004F00450043>-10<0050>6<0059000F>-329<002A>-247<0053>7<0050004D004D0046>-6<0045>-247<0050>6<0057>8<00460053>-246<0042004F0045>-247<004D0050>-7<0050004C0046>-7<0045>-247<00420055>-248<005500490046>]TJ -0.98 0 0 1 71.036 150.372 Tm [<004E00560048>-234<0054004900500055>-234<0050004F>-235<005500490046>-234<00580042004D004D000F>-333<002A0055>-235<005800420054>-234<0042>-234<0058>7<0050004E0042004F>-234<004A004F>-234<004900460053>-234<0047005000530055004A00460054>-235<0058004A00550049>-234<0042>-235<0045005300560048>]TJ -1.02 0 0 1 71.036 135.577 Tm [<004900420043004A0055>-266<0055004900420055>-265<005800420054>-266<004300420045000D>-272<0042004F0045>-266<0042004F>-266<00420A1D004A0055005600450046>-266<0055004900420055>-265<005800420054>-266<0046>6<0057>7<0046004F>-265<0058>7<0050005300540046>10<000F>-388<003400490046>]TJ -0.98 0 0 1 71.036 120.782 Tm [<004900420045>-232<00540046>-7<0046004F>-233<0043>-10<00460A1D00460053>-233<00450042005A0054000D>-237<004D004A004C0046>-232<005500490046>-233<0055004A004E0046>-232<002A>-233<00550050>-7<0050004C>-232<004900460053>-233<00550050>-232<005500490046>-233<0046004A0048004900550049>-233<00480053004200450046>]TJ -1.02 0 0 1 71.036 105.986 Tm [<00540050>-6<0044004C>-249<004900500051>9<000F>-337<09AB0046004F>-249<002A>-249<004800500055>-248<00560051>9<000D>-249<00580042005400490046>-7<0045000D>-250<0042004F0045>-248<004500530042004800480046>-7<0045>-249<004E005A>-249<004D0050004F0046004D005A>-248<004300560A1D>]TJ -0.98 0 0 1 71.036 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 +1.02 0 0 1 71.036 372.303 Tm [<003A>69<00460054>-290<004A004F00450046>-7<0046>-7<00450002>-465<002A004F>-291<0022>32<00560048005600540055>-290<0A220A200A210A27>-292<005500490046>-291<004200560055004900500053>-291<005100560043004D004A005400490046>-7<0045>-291<0042>-291<00440050004E0051004D004600550046>]TJ +0.98 0 0 1 71.036 357.508 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 342.712 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 327.917 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 +/F56 11.3574 Tf 0.98 0 0 1 293.018 327.917 Tm [<00310025002700100039>24<000E00120042001B0013001100110012>]TJ +/F56 11.3574 Tf 1.02 0 0 1 71.036 313.121 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 +/F60 11.3574 Tf 1.02 0 0 1 310.307 313.121 Tm [<0050004F>-258<005500490046>-258<0848005300540055>]TJ +1.02 0 0 1 71.036 298.326 Tm [<004208680046004E00510055000F>]TJ +/F56 11.3574 Tf 1.02 0 0 1 115.343 298.326 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 0 0 1 70.616 283.531 Tm [<0058>8<0046>-7<0046004C000F>-333<002B005600540055>-250<004D004A004C0046>-250<0055004900420055000F>-333<0035>62<0050>-6<0050004C>-250<004E0050004F005500490054>-250<00550050>-250<00580053004A00550046>9<000D>-249<00500047>-250<004400500056005300540046>9<000F>]TJ +1 0 0 1 88.072 268.735 Tm [<00360051>-7<0045004200550046001B>-333<0022004F00500055004900460053>-250<004200560055004900500053>-250<0053>7<00460051>-6<0050005300550054>-250<0054005600440044004600540054000F>]TJ +1 0 0 1 54 253.94 Tm [<0032>29<000F>]TJ +1.009 0 0 1 71.036 253.94 Tm [<003800490046004F>-247<002A>-247<0058>7<0050004C0046>-247<00560051>-247<00550049004A0054>-248<004E00500053004F004A004F0048000D>-247<004E005A>-247<0049004600420045>-248<00470046004D0055>-247<004D004A004C0046>-248<0042>-247<00550050>-7<00450045004D00460053>-247<004900420045>]TJ +1.011 0 0 1 71.036 239.145 Tm [<0043>-9<0046>-7<0046004F>-248<0051>-6<00500056004F0045004A004F0048>-248<004A0055>-247<004A004F>-247<0042>-247<00540042004F00450043>-10<0050>6<0059000F>-329<002A>-247<0053>7<0050004D004D0046>-6<0045>-247<0050>6<0057>8<00460053>-246<0042004F0045>-247<004D0050>-7<0050004C0046>-7<0045>-247<00420055>-248<005500490046>]TJ +0.98 0 0 1 71.036 224.349 Tm [<004E00560048>-234<0054004900500055>-234<0050004F>-235<005500490046>-234<00580042004D004D000F>-333<002A0055>-235<005800420054>-234<0042>-234<0058>7<0050004E0042004F>-234<004A004F>-234<004900460053>-234<0047005000530055004A00460054>-235<0058004A00550049>-234<0042>-235<0045005300560048>]TJ +1.02 0 0 1 71.036 209.554 Tm [<004900420043004A0055>-266<0055004900420055>-265<005800420054>-266<004300420045000D>-272<0042004F0045>-266<0042004F>-266<00420A1D004A0055005600450046>-266<0055004900420055>-265<005800420054>-266<0046>6<0057>7<0046004F>-265<0058>7<0050005300540046>10<000F>-388<003400490046>]TJ +0.98 0 0 1 71.036 194.759 Tm [<004900420045>-232<00540046>-7<0046004F>-233<0043>-10<00460A1D00460053>-233<00450042005A0054000D>-237<004D004A004C0046>-232<005500490046>-233<0055004A004E0046>-232<002A>-233<00550050>-7<0050004C>-232<004900460053>-233<00550050>-232<005500490046>-233<0046004A0048004900550049>-233<00480053004200450046>]TJ +1.02 0 0 1 71.036 179.963 Tm [<00540050>-6<0044004C>-249<004900500051>9<000F>-337<09AB0046004F>-249<002A>-249<004800500055>-248<00560051>9<000D>-249<00580042005400490046>-7<0045000D>-250<0042004F0045>-248<004500530042004800480046>-7<0045>-249<004E005A>-249<004D0050004F0046004D005A>-248<004300560A1D>]TJ +0.98 0 0 1 71.036 165.168 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 150.372 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 135.577 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 +/F56 10.44878 Tf 1 0 0 1 204.571 39.407 Tm [<0014>]TJ ET endstream @@ -302,7 +292,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<</F56 8 0 R/F60 11 0 R>>/ProcSet[/PDF/Text]>> endobj 1 0 obj <<>> @@ -554,20 +544,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]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]] +[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]1752[742]1757[268]1760[375 375]2442[582 560 540]2475[1048]2589[614]2592[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 18225 >> +<</Subtype/CIDFontType0C/Length 18212 >> stream - -* " - + +) " + ! @@ -577,9 +567,8 @@ $ % & ' -( -) -
^M(%F ! +( +
^M(%F !"a"#%7%&Y'(")*+J,-./Y0%013746"727U7889:;=??F?@AhBBCQCD,$>>^>> >\>8Nǁw$&snxU Eh3=1vǘ L kg @@ -592,7 +581,7 @@ ff e^W[۹͋eN 8z;v ff -, +, p L͗ @@ -604,30 +593,30 @@ Lf 3uxA} ~ Do Lͅ f -f +f Nluvo -3ww +3ww e^W[۹͋eN 8z;v Lͅ 22'9& B 檵wjj8pEv - + ڒ
endstream endobj 40 0 obj -<</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>> +<</Type/FontDescriptor/FontName/VEKDRV+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 1889 >> +<</Length 1865 >> stream %!PS-Adobe-3.0 Resource-CMap %%DocumentNeededResources: ProcSet (CIDInit) %%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-SFJIAA-LibertinusSerif-0) -%%Title: (TeX-SFJIAA-LibertinusSerif-0 TeX SFJIAA-LibertinusSerif 0) +%%BeginResource: CMap (TeX-VEKDRV-LibertinusSerif-0) +%%Title: (TeX-VEKDRV-LibertinusSerif-0 TeX VEKDRV-LibertinusSerif 0) %%Version: 1.000 %%EndComments /CIDInit /ProcSet findresource begin @@ -635,17 +624,17 @@ stream begincmap /CIDSystemInfo << /Registry (TeX) -/Ordering (SFJIAA-LibertinusSerif) +/Ordering (VEKDRV-LibertinusSerif) /Supplement 0 >> def -/CMapName /TeX-Identity-SFJIAA-LibertinusSerif def +/CMapName /TeX-Identity-VEKDRV-LibertinusSerif def /CMapType 2 def 1 begincodespacerange <0000> <FFFF> endcodespacerange 0 beginbfrange endbfrange -86 beginbfchar +84 beginbfchar <0002> <0021> <0009> <0028> <000A> <0029> @@ -686,7 +675,6 @@ endbfrange <0039> <0058> <003A> <0059> <003B> <005A> -<003D> <005C> <0042> <0061> <0043> <0062> <0044> <0063> @@ -713,13 +701,13 @@ endbfrange <0059> <0078> <005A> <0079> <005B> <007A> -<06D7> <2013> <06D8> <2014> <06DD> <2019> <06E0> <201C> <06E1> <201D> <098A> <00660066> <098B> <00660069> +<098C> <0066006C> <09AB> <00540068> <0A1D> <00740074> <0A20> <0030> @@ -731,7 +719,6 @@ endbfrange <0A26> <0036> <0A27> <0037> <0A28> <0038> -<0A29> <0039> endbfchar endcmap CMapName currentdict /CMap defineresource pop @@ -743,10 +730,10 @@ end endstream endobj 8 0 obj -<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/SFJIAA+LibertinusSerif/DescendantFonts[42 0 R]/ToUnicode 41 0 R>> +<</Type/Font/Subtype/Type0/Encoding/Identity-H/BaseFont/VEKDRV+LibertinusSerif/DescendantFonts[42 0 R]/ToUnicode 41 0 R>> endobj 42 0 obj -<</Type/Font/Subtype/CIDFontType0/BaseFont/SFJIAA+LibertinusSerif/FontDescriptor 40 0 R/W 37 0 R/CIDSystemInfo<</Registry (Adobe)/Ordering (Identity)/Supplement 0>>>> +<</Type/Font/Subtype/CIDFontType0/BaseFont/VEKDRV+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]>> @@ -756,58 +743,58 @@ endobj endobj 44 0 obj << - /Title(Novel\040Document\040Class)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20171129090517-08'00')/ModDate(D:20171129090517-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:20180112152952-08'00')/ModDate(D:20180112152952-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 -0000034749 00000 n -0000034769 00000 n -0000034789 00000 n +0000032172 00000 n +0000032192 00000 n +0000032212 00000 n 0000000015 00000 n 0000015166 00000 n 0000015025 00000 n 0000006731 00000 n -0000071619 00000 n -0000050038 00000 n -0000048104 00000 n -0000042432 00000 n -0000071939 00000 n -0000024160 00000 n -0000024016 00000 n +0000068994 00000 n +0000047461 00000 n +0000045527 00000 n +0000039855 00000 n +0000069314 00000 n +0000023301 00000 n +0000023157 00000 n 0000015307 00000 n -0000034628 00000 n -0000034484 00000 n -0000024281 00000 n -0000034842 00000 n -0000034978 00000 n -0000035305 00000 n -0000041160 00000 n -0000041383 00000 n -0000042577 00000 n -0000042767 00000 n -0000042885 00000 n -0000042953 00000 n -0000046858 00000 n -0000047081 00000 n -0000048251 00000 n -0000048443 00000 n -0000048471 00000 n -0000048575 00000 n -0000049121 00000 n -0000049329 00000 n -0000050169 00000 n -0000050346 00000 n -0000050770 00000 n -0000051153 00000 n -0000069457 00000 n -0000069673 00000 n -0000071756 00000 n -0000072006 00000 n -0000072329 00000 n +0000032051 00000 n +0000031907 00000 n +0000023422 00000 n +0000032265 00000 n +0000032401 00000 n +0000032728 00000 n +0000038583 00000 n +0000038806 00000 n +0000040000 00000 n +0000040190 00000 n +0000040308 00000 n +0000040376 00000 n +0000044281 00000 n +0000044504 00000 n +0000045674 00000 n +0000045866 00000 n +0000045894 00000 n +0000045998 00000 n +0000046544 00000 n +0000046752 00000 n +0000047592 00000 n +0000047769 00000 n +0000048182 00000 n +0000048565 00000 n +0000066856 00000 n +0000067072 00000 n +0000069131 00000 n +0000069381 00000 n +0000069704 00000 n trailer -<</Size 45/Root 43 0 R/Info 44 0 R/ID[<D36753FE10474A13FE5DB68CE925EE61> <D36753FE10474A13FE5DB68CE925EE61>]>> +<</Size 45/Root 43 0 R/Info 44 0 R/ID[<2AFEB31966C1DC7A8B6C9C1A2215DF1C> <2AFEB31966C1DC7A8B6C9C1A2215DF1C>]>> startxref -72653 +70028 %%EOF diff --git a/Master/texmf-dist/doc/lualatex/novel/novel.tex b/Master/texmf-dist/doc/lualatex/novel/novel.tex index 12ec45f1030..5999c0dd848 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.46.1 +\documentclass{novel} % v. 1.46.2 % Almost all settings are defaults. \SetHeadFootStyle{3} \SetTitle{Novel Document Class} % only footer, with page number @@ -58,15 +58,7 @@ The companion font(s) is(are) licensed under the SIL Open Font License, version \QuickChapter{4. Version} -\noindent 1.46, 2017-11-17: \string\BlockImage\space change. 1.46.1: Minor fix. - -\noindent 1.41-1.43.1: Better docs, code cleanup. - -\noindent 1.40, 2017-09-14: removed debug feature, major docs rewrite. - -\noindent 1-32--1.38, various fixes. - -\noindent 1.2, 2017-06-06: added code for color image artwork. +\noindent 1.46.2, 2018-01-14: Minor improvements since stable version 1.46. \noindent 1.1, 2017-03-01: initial public release. @@ -82,10 +74,10 @@ The companion font(s) is(are) licensed under the SIL Open Font License, version \end{adjustwidth} \begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{Q. }Is this project still alive? +\backindent\makebox[\parindent][l]{Q. }What happened to floats and lists? \end{adjustwidth} \begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{A. }Yes. But its creator would like someone else to take over long-term maintenance, because he is moving on to other things. If interested, see e-mail at top of novel.cls file. You will need to be familiar with LuaLaTeX, fontspec, Open Type, and the terminology of fiction writing. Lua coding not required. Until then, the original creator will maintain it from time to time. +\backindent\makebox[\parindent][l]{A. }I've never seen them in a novel. So, they were tossed out. \end{adjustwidth} \begin{adjustwidth}{\parindent}{0pt} @@ -106,7 +98,8 @@ The companion font(s) is(are) licensed under the SIL Open Font License, version \backindent\makebox[\parindent][l]{Q. }Has this document class ever been used for an actual novel? \end{adjustwidth} \begin{adjustwidth}{\parindent}{0pt} -\backindent\makebox[\parindent][l]{A. }Yes indeed! In August 2017 the author published a complete novel, including its cover, using this document class. Almost all of the setup used defaults. The files (textblock and cover) were submitted to a major American P.O.D. service in \lnum{PDF/X-1a:2001} format, then electronically reviewed and accepted \textit{on the first attempt.} A printed copy was in the author's hands within a week. Just like that. Took months to write, of course. Update: Another author reports success with a published book. +\backindent\makebox[\parindent][l]{A. }Yes indeed! In August 2017 the author published a complete novel, including its cover, using this document class. Almost all of the setup used defaults. The files (textblock and cover) were submitted to a major American P.O.D. service in \lnum{PDF/X-1a:2001} format, then electronically reviewed and accepted \textit{on the first attempt.} A printed copy was in the author's hands within a week. Just like that. Took months to write, of course.\par +Update: Another author reports success. \end{adjustwidth} \begin{adjustwidth}{\parindent}{0pt} diff --git a/Master/texmf-dist/fonts/opentype/novel/NovelDeco.otf b/Master/texmf-dist/fonts/opentype/novel/NovelDeco.otf Binary files differindex 728329f17ad..d5a62387e7c 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 4763ffe1266..9d1d8787ac5 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.46 +% Typically used in the USA. Novel file version 1.46.2 % 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 5dc925e441f..90904b3b09b 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/29 v1.46.1 LaTeX file (layout calculations)] +[2018/01/14 v1.46.2 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 d1c1110edcc..e13eb3e33f4 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/29 v1.46.1 LaTeX file (chapter and scene macros)] +[2018/01/14 v1.46.2 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 83e85fa8d56..e5d7bfa9f4e 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.46 +% Typically used in Europe. Novel file version 1.46.2 % 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 32453682baa..4cf322f3bdb 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/29 v1.46.1 LaTeX file (File Data settings)] +[2018/01/14 v1.46.2 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 7864a0d74a5..44b1478107f 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/29 v1.46.1 LaTeX file (default fonts)] +[2018/01/14 v1.46.2 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 62463021466..a2d01335dd5 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/11/29 v1.46.1 LaTeX file (commands for footnotes and endnotes)] +[2018/01/14 v1.46.2 LaTeX file (commands for footnotes and endnotes)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty index 2ae55e608c4..d86b923f011 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/29 v1.46.1 LaTeX file (header and footer layouts and styles)] +[2018/01/14 v1.46.2 LaTeX file (header and footer layouts and styles)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty index c0073154cf1..7a67b44bd22 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty @@ -13,13 +13,13 @@ %% %% \ProvidesFile{novel-Images.sty}% -[2017/11/29 v1.46.1 LaTeX file (image placement)] +[2018/01/14 v1.46.2 LaTeX file (image placement)] %% %% %% Be sure to read the separate documentation about how to prepare images. -%% In general: (1) png or jpg only. (2) Flattened, no transparency. +%% In general: (1) png, jpg only. (2) Flattened, no transparency. %% (3) 300dpi (grayscale) or 600dpi (black/white) are industry norms. %% (4) Image file must contain its resolution. (5) Exact size, without scaling. %% (6) No private metadata. (7) Be sure grayscale is 1-channel, not rgb gray. @@ -112,8 +112,8 @@ \if@imgExtOK\else% \ClassError{novel}{^^JImage~`#3'~format~not~allowed}% {^^JImage~`#3'~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}% + Must~have~file~extension~png,~jpg,~jpeg,~(or~capitalized).^^J% + Others~such~as~bmp,~tiff,~pdf,~eps,~svg~are~not~allowed.^^J}% \fi% \StrDel{#2}{\space}[\@myila]% \StrCut{\@myila}{,}{\@myilxa}{\@myilya}% @@ -133,8 +133,6 @@ \iftoggle{@inheadfoot}{}{% \setlength\imageheight{\@imageheight}% \global\imageheight=\imageheight% - \typeout{^^JClass~`novel'~Info:~An~image~was~placed~on~page~\thepage.^^J% - Review~layout~to~ensure~that~it~does~not~overflow~into~margins.^^J}% }% % \setlength\@imagehoffset{\@myilx}% @@ -207,8 +205,8 @@ \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}% + Must~have~file~extension~png,~jpg,~jpeg,~(or~capitalized).^^J% + Others~such~as~bmp,~tiff,~pdf,~eps,~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}}{% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo index a091ea3f41b..20f0ab0b1a3 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.46 +% Typically used in Japan. Novel file version 1.46.2 % 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 0ce042052dc..dc4d3d2cb52 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/29 v1.46.1 LaTeX file (layout settings)] +[2018/01/14 v1.46.2 LaTeX file (layout settings)] %% @@ -100,9 +100,8 @@ \fi } % -% Retroactively change Trim Size after layout. See documentation: -\newcommand\ReworkTrimSize[2]{% - \if@coverart % New in version 1.2 +\newcommand\ReworkTrimSize[2]{% DEPRECATED. Works, but removed from docs. + \if@coverart % \ClassError{novel}{Rework command cannot be used with coverart option}% {Instead of reworking document size, you must re-do the artwork.} \else @@ -137,8 +136,7 @@ \setlength\Old@InsideMargin{#4} \setlength\New@InsideMargin{#4} } -% Retroactively change margins after layout. See documentation: -\newcommand\ReworkMargins[4]{ +\newcommand\ReworkMargins[4]{ % DEPRECATED. Works, but removed from docs. \if@coverart % New in version 1.2 \ClassError{novel}{Rework command cannot be used with coverart option}% {Instead of reworking document size, you must re-do the artwork.} diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty index 8346676bbb8..32f874c2348 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-TextMacros.sty}% -[2017/11/29 v1.46.1 LaTeX file (text macros usable within document body)] +[2018/01/14 v1.46.2 LaTeX file (text macros usable within document body)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex deleted file mode 100644 index 05f68643182..00000000000 --- a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex +++ /dev/null @@ -1,90 +0,0 @@ -%% -%% This is file `novel-glyphtounicode.tex', part of class `novel'. -%% Copyright 2017 Robert Allgeyer. -%% -%% Additional glyph to unicode lookups, for Open Type ligatures. -%% -%% This file may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3c -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% -\ProvidesFile{novel-gyphtounicode.tex}% -[2017/11/29 v1.46.1 LaTeX file (additional glyph to unicode)] -%% - -%% I am not sure if this is useful. But it doesn't hurt. - - -\begingroup -\catcode`\_=12 % so that underscore can be used in ligature names - - -\pdfglyphtounicode{f_f}{0066 0066} -\pdfglyphtounicode{f_i}{0066 0069} -\pdfglyphtounicode{f_l}{0066 006C} -\pdfglyphtounicode{f_f_i}{0066 0066 0069} -\pdfglyphtounicode{f_f_l}{0066 0066 006C} - -\pdfglyphtounicode{f_j}{0066 006A} -\pdfglyphtounicode{f_f_j}{0066 0066 006A} - -\pdfglyphtounicode{f_t}{0066 0074} -\pdfglyphtounicode{f_f_t}{0066 0066 0074} - -\pdfglyphtounicode{f_b}{0066 0062} -\pdfglyphtounicode{f_f_b}{0066 0066 0062} - -\pdfglyphtounicode{f_k}{0066 006B} -\pdfglyphtounicode{f_f_k}{0066 0066 006B} - -\pdfglyphtounicode{f_h}{0066 0068} -\pdfglyphtounicode{f_f_h}{0066 0066 0068} - -\pdfglyphtounicode{g_g}{0067 0067} - -\pdfglyphtounicode{s_s}{0073 0073} -\pdfglyphtounicode{s_t}{0073 0074} -\pdfglyphtounicode{t_t}{0074 0074} -\pdfglyphtounicode{c_t}{0063 0074} - -\pdfglyphtounicode{c_h}{0063 0068} -\pdfglyphtounicode{c_k}{0063 006B} -\pdfglyphtounicode{t_z}{0074 007A} - -\pdfglyphtounicode{Q_y}{0051 0079} -\pdfglyphtounicode{Q_u}{0051 0075} -\pdfglyphtounicode{Q_u_i}{0051 0075 0069} - -\pdfglyphtounicode{T_h}{0054 0068} -\pdfglyphtounicode{Tcaron_h}{0164 0068} -\pdfglyphtounicode{Tcommaaccent_h}{0162 0068} - -\pdfglyphtounicode{longs_longs}{017F 017F} -\pdfglyphtounicode{longs_h}{017F 0068} -\pdfglyphtounicode{longs_i}{017F 0069} -\pdfglyphtounicode{longs_longs_i}{017F 017F 0069} -\pdfglyphtounicode{longs_l}{017F 006C} -\pdfglyphtounicode{longs_t}{017F 0074} - -\pdfglyphtounicode{exclam_exclam}{0021 0021} -\pdfglyphtounicode{question_question}{003F 003F} -\pdfglyphtounicode{exclam_question}{0021 003F} -\pdfglyphtounicode{question_exclam}{003F 0021} - -\pdfglyphtounicode{uni3097}{3097} -\pdfglyphtounicode{uni3098}{3098} - - - - -\endgroup - - - -% End of file `novel-glyphtounicode.tex'. - diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg index 2c1ce5cc53c..0b3d8440ea2 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/29 v1.46.1 LaTeX file (microtype configuration file for novel class)] +[2018/01/14 v1.46.2 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 623d4169f20..524c04620a3 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/29 v1.46.1 LaTeX file (PDF/X support for novel class)] +[2018/01/14 v1.46.2 LaTeX file (PDF/X support for novel class)] % This package supports, and is part of, class `novel'. % No support for anything but LuaLaTeX. @@ -279,16 +279,16 @@ % Calculation of Dates and Times, which must be in a specific format. % Each time you process to PDF, the current date/time is used, % for all of the several metadata date/time strings. -\def\xmp@cDate{\pdfx@getYear} -{\catcode`\D=12 \catcode`\:=12 - \gdef\pdfx@getYear D:#1#2#3#4{\edef\pdfx@xYear{#1#2#3#4}\pdfx@getMonth} -} +% The date string begins with D: then 4 digits of year, etc. +% This definition removes the D: from front: +\gdef\pdfx@getYear#1#2#3#4#5#6{\edef\pdfx@xYear{#3#4#5#6}\pdfx@getMonth} \def\pdfx@getMonth#1#2{\edef\pdfx@xMonth{#1#2}\pdfx@getDay} \def\pdfx@getDay#1#2{\edef\pdfx@xDay{#1#2}\pdfx@getHour} \def\pdfx@getHour#1#2{\edef\pdfx@xHour{#1#2}\pdfx@getMin} \def\pdfx@getMin#1#2{\edef\pdfx@xMin{#1#2}\pdfx@getSec} \def\pdfx@getSec#1#2{\edef\pdfx@xSec{#1#2}\pdfx@getTZh} \def\pdfx@getTZh{\futurelet\pdfx@next\pdfx@getTzh@branches} +\def\xmp@cDate{\pdfx@getYear} % {\catcode`\@=11 \catcode`\Z=12 \catcode`\+=12 \catcode`\-=12 % ends below \gdef\pdfx@getTzh@branches{% @@ -397,12 +397,6 @@ \@infotopdfstring{\@infoapplication}{\@novelApplication} \@infotopdfstring{\@infoproducer}{\@novelProducer} % -% Ensure Unicode glyph names: -\input{glyphtounicode.tex} % located in tex/generic/ -\input{novel-glyphtounicode.tex} % additional ligatures -\pdfgentounicode=1 -% End ensure Unicode glyph names. -% %% End prepare PDF /Info. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty index c3180f1a83b..0a75df000f2 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/29 v1.46.1 LaTeX file (novel XMP packet template)] +[2018/01/14 v1.46.2 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 c446dce77b5..78bdd95fbc8 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel.cls +++ b/Master/texmf-dist/tex/lualatex/novel/novel.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] % Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016. -\ProvidesClass{novel}[2017/11/29 v1.46.1 LaTeX document class] +\ProvidesClass{novel}[2018/01/14 v1.46.2 LaTeX document class] %% %% Version 1.46: Possibly final version. %% Version 1.43: General cleanup of docs and code, for improved readbaility. |
