CTAN sync 202402180301

author: Norbert Preining <norbert@preining.info> 2024-02-18 03:01:45 +0000
committer: Norbert Preining <norbert@preining.info> 2024-02-18 03:01:45 +0000
commit: a3b386e8476527e1b87ec71f7156cd7751f8f325 (patch)
tree: cd6442374d94f7e42f3d8e2c018a448aacedb846 /macros/luatex/latex/novel
parent: 8886ad587a305595ce543a74b0fc779f0732a6e9 (diff)
26 files changed, 270 insertions, 257 deletions
diff --git a/macros/luatex/latex/novel/README.md b/macros/luatex/latex/novel/README.md
index 81ab14b3e2..a95f9d4034 100644
--- a/macros/luatex/latex/novel/README.md
+++ b/macros/luatex/latex/novel/README.md
@@ -4,9 +4,19 @@ The `novel` document class is intended for popular fiction books,
 printed to paper: murder mystery, historical romance, etc.
 Special attention to the needs of print-on-demand.
 
-Due to changes in print technology over the years, much of `novel` code
-is now unnecessary. Also, it offers many rarely-used features that bloat
-the code and its documentation. If you have not already used `novel`,
-the simpler `novelette` document class might be better for your
-purpose. Expected 2024.
+Author: Robert Allgeyer. (Aptos, California, USA).
+
+Project Page: https://github.com/rallg/novel
+
+Contact: Username `rallg` at GitHub or tex.stackexchange.com.
+
+Licenses: Fonts are licensed Open Font License 1.1.
+TeX code is licensed Latex Project Public License 1.3c, with some code snippets
+attributed under terms of Creative Commons CC-BY-SA 4.0. 
+
+Additional Information: Due to changes in print technology over the years,
+much of `novel` code is now unnecessary. Also, it offers many rarely-used
+features that bloat the code and its documentation.
+If you have not already used `novel`, the simpler `novelette` document class
+might be better for your purpose. Expected 2024.
 
diff --git a/macros/luatex/latex/novel/doc/extras/novel-example.pdf b/macros/luatex/latex/novel/doc/extras/novel-example.pdf
index 55fecc38d9..f1be15667f 100644
--- a/macros/luatex/latex/novel/doc/extras/novel-example.pdf
+++ b/macros/luatex/latex/novel/doc/extras/novel-example.pdf
@@ -8,10 +8,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>2024-02-16T08:47:23-08:00</xmp:ModifyDate>
-       <xmp:CreateDate>2024-02-16T08:47:23-08:00</xmp:CreateDate>
+       <xmp:ModifyDate>2024-02-16T20:48:20-08:00</xmp:ModifyDate>
+       <xmp:CreateDate>2024-02-16T20:48:20-08:00</xmp:CreateDate>
        <xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool>
-      <xmp:MetadataDate>2024-02-16T08:47:23-08:00</xmp:MetadataDate>
+      <xmp:MetadataDate>2024-02-16T20:48:20-08:00</xmp:MetadataDate>
      </rdf:Description>
      <rdf:Description rdf:about=""
          xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -30,7 +30,7 @@ stream
      <rdf:Description rdf:about=""
          xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
        <xmpMM:DocumentID>uuid:fe9cc407-f91f-4054-81c7-abb5a9adb176</xmpMM:DocumentID>
-       <xmpMM:InstanceID>uuid:faaf12f1-b72a-4382-84d4-28a9277ad9e9</xmpMM:InstanceID>
+       <xmpMM:InstanceID>uuid:cec135d7-5db3-459b-85f9-8bc4d20095ab</xmpMM:InstanceID>
        <xmpMM:RenditionClass>default</xmpMM:RenditionClass>
        <xmpMM:VersionID>1</xmpMM:VersionID>
      </rdf:Description>
@@ -268,7 +268,7 @@ endobj
 <<  /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R  /ProcSet [ /PDF ] >>
 endobj
 30 0 obj
-<< /Length 7553 >>       
+<< /Length 7815 >>       
 stream
 0 g 0 G
 0 g 0 G
@@ -283,24 +283,24 @@ BT
 1.02 0 0 1 53.455 335.327 Tm [<0038004A00540049004A004F00550042004D0046>24<06DF0054>-256<00520056004200530055004600530054000F>-359<003400420045004D005A>58<000D>-258<002D00500053>7<0045>-255<0038004A005500490046004F0054>-256<005800420054>-256<004F00500055>-256<0050004F>-256<004A0055000D>-259<004900420057004A004F0048>]TJ
 0.982 0 0 1 54 320.533 Tm [<0054004D004A00510051>-7<0046>-7<0045>-255<00500938>-256<0049004A0054>-255<0054004200450045004D0046>-256<0042004D0050004F0048>-255<005500490046>-255<00580042005A>60<000F>-341<0035004900420055>-255<005800420054>-256<0043>-10<0046>-7<00440042005600540046>-255<005500490046>-256<0058>8<004600420055004900460053>]TJ
 1 0 0 1 53.58 305.738 Tm [<005800420054>-250<0054005500500053004E005A>59<000F>]TJ
-0.98 0 0 1 71.036 290.944 Tm [<002D00500053>8<0046004E>-248<004A005100540056004E>-248<00450050004D00500053>-249<0054004A0055>-248<0042004E00460055000D>-250<00440050004F00540046>-7<0044005500460055005600460053>-249<00420045004A0051004A00540044004A004F0048>-249<0046004D004A0055000F>-337<00360055>-249<00510056000E>]TJ
-0.985 0 0 1 54 276.149 Tm [<005300560054>-253<0046004D004A0055000D>-253<0057>7<004600540055004A00430056004D0056004E>-252<00560055000D>-253<0051004D004200440046005300420055>-253<00420044000D>-254<00420045004A0051004A00540044004A004F0048>-253<0057004A005500420046>10<000D>-253<00470046004D004A0054000F>-338<00240056005300420043004A005500560053>]TJ
-1.02 0 0 1 54 261.355 Tm [<0045004A004400550056004E>-243<0048005300420057004A00450042>-243<004E004200560053004A0054000F>-327<002F0042004E>-243<00420053>7<00440056>-243<004D004A0043>-10<00460053>7<0050>10<000D>-242<004F0050004F0056004E004E005A>-244<0046004800460055000D>-244<00440050004F00540046>-7<0044000E>]TJ
-1.02 0 0 1 54 246.56 Tm [<005500460055005600460053>-335<004A0045000D>-358<00570056004D005100560055004200550046>-335<0042000D>-358<004E00420048004F0042000F>-598<00250050004F0046>-7<0044>-335<0057>7<00460049004A00440056004D0042>-335<00420056004800560046>-335<00460056>-335<004F0046>-7<005200560046>9<000F>]TJ
-1.02 0 0 1 54 231.766 Tm [<00310046004D004D0046004F005500460054005200560046>-319<004900420043004A00550042004F0055>-320<004E005000530043004A>-320<00550053004A00540055004A005200560046>-320<00540046004F0046>-7<0044005500560054>-320<00460055>-320<004F0046005500560054>-320<00460055>-320<004E0042004D0046000E>]TJ
-1.02 0 0 1 54 216.971 Tm [<00540056004200450042>-261<00470042004E00460054>-262<00420044>-261<0055005600530051004A0054>-262<0046004800460054005500420054000F>-376<002E004200560053004A0054>-262<00560055>-262<004D0046>-7<0050>10<000F>-376<0024005300420054>-261<0057004A0057>7<0046005300530042>-261<004E0046005500560054>]TJ
-0.98 0 0 1 54 202.177 Tm [<005300490050004F004400560054>-226<00540046004E000F>-331<002F0056004D004D0042>-227<00460055>-226<004D0046>-8<0044005500560054>-226<0057>7<004600540055004A00430056004D0056004E>-226<00560053004F0042>-227<00470053004A004F0048004A004D004D0042>-226<0056004D00550053004A004400460054000F>-331<0031>-13<00490042000E>]TJ
-1.004 0 0 1 54 187.382 Tm [<00540046004D004D00560054>-248<00460056>-249<00550046004D004D00560054>-249<0054004A0055>-249<0042004E00460055>-249<005500500053005500500053>-249<0048005300420057004A00450042>-249<0051004D004200440046005300420055000F>-332<002A004F00550046004800460053>-249<005400420051004A0046004F>-249<004600540055000D>]TJ
-0.99 0 0 1 54 172.588 Tm [<004A004200440056004D004A0054>-253<004A004F000D>-253<00510053>7<00460055004A0056004E>-253<00520056004A0054000D>-253<0057004A0057>7<0046005300530042>-252<00420044000D>-254<004F0056004F0044000F>-339<003100530042004600540046004F0055>-253<0046004800460055>-254<00540046004E>-253<0057>7<0046004D>-252<004D0046>-7<0050>]TJ
-0.99 0 0 1 54 157.793 Tm [<0056004D00550053004A004400460054>-252<0043004A0043>-11<0046004F00450056004E000F>-337<0022>12<0046004F00460042004F>-252<0047004200560044004A004300560054000F>-337<002E005000530043004A>-253<00450050004D00500053>-253<004F0056004D004D0042000D>-252<004E0042004D004600540056004200450042>]TJ
-1.02 0 0 1 54 142.999 Tm [<00460056000D>-331<00510056004D0057004A004F00420053>-314<00420055000D>-332<004E0050004D004D004A0054>-314<00420044000D>-332<004F0056004D004D0042000F>-534<00240056005300420043004A005500560053>-315<004200560044005500500053>-314<00540046004E0051>-7<00460053>-314<004F0056004D004D0042000F>]TJ
-1.02 0 0 1 54 128.204 Tm [<00250050004F0046>-7<0044>-252<005700420053004A00560054>-253<00500053>7<0044004A>-251<0046004800460055>-253<0053004A005400560054000F>-349<00250056004A0054>-252<004F004A00430049>-253<004E004A000D>-254<00440050004F004800560046>-253<00460056000D>-254<0042004400440056004E00540042004F>]TJ
-1.007 0 0 1 54 113.41 Tm [<0046004D0046004A00470046004F0045000D>-249<005400420048004A00550055004A0054>-249<00520056004A0054000D>-249<0045004A0042004E000F>-334<00250056004A0054>-249<0046004800460055>-249<00500053>7<0044004A>-249<0054004A0055>-249<0042004E00460055>-249<00500053>7<0044004A>-248<0045004A0048004F004A00540054004A004E>]TJ
-1 0 0 1 54 98.615 Tm [<00530056005500530056004E000F>]TJ
-1.02 0 0 1 71.036 83.82 Tm [<002F0042004E>-328<00450056004A>-328<004D004A00480056004D0042000D>-349<00470053004A004F0048004A004D004D0042>-329<0042000D>-349<00460056004A0054004E0050>-7<0045>-328<00540050>-7<00450042004D00460054000D>-349<00540050004D004D004A0044004A005500560045004A004F>-329<0057>7<0046004D000D>]TJ
-1.016 0 0 1 53.58 69.026 Tm [<0058004A0054004A000F>-328<002E005000530043004A>-245<004200560044005500500053>-246<004D00500053>7<0046004E>-245<004F0050004F>-246<004B0056005400550050>9<000F>-327<002F0042004E>-245<004D0042004400560054>-246<004D004A0043>-10<00460053>7<0050>10<000D>-245<00510053>7<00460055004A0056004E>-245<00420055000D>]TJ
-0.98 0 0 1 54 54.231 Tm [<004D00500043>-10<005000530055004A0054>-215<0057004A005500420046>10<000D>-222<0056004D00550053004A0044004A00460054>-215<00460055000D>-223<00550046004D004D00560054000F>-327<00250050004F0046>-7<0044>-215<0042004D004A0052005600460055000D>-223<005500500053005500500053>-215<00540046>-7<0045>-215<0042004400440056004E00540042004F>]TJ
-0.995 0 0 1 54 39.437 Tm [<0043004A0043>-10<0046004F00450056004E000D>-251<0046005300420055>-250<004D004A00480056004D0042>-251<0042004D004A0052005600460055>-251<004E00420048004F0042000D>-250<0057004A005500420046>-251<00500053004F00420053>7<0046>-250<0050>-7<0045004A0050>-251<004E0046005500560054>-250<0042>-251<004E004A000F>]TJ
+1.02 0 0 1 71.036 290.944 Tm [<002D00500053>8<0046004E>-328<004A005100540056004E>-329<00450050004D00500053>-328<0054004A0055>-329<0042004E00460055000D>-328<00440050004F00540046>-7<0044005500460055005600460053>-328<00420045004A0051004A00540044004A004F0048>-329<0046004D004A0055000F>-328<00360055>]TJ
+1.02 0 0 1 54 276.149 Tm [<00510056005300560054>-321<0046004D004A0055000D>-322<0057>7<004600540055004A00430056004D0056004E>-321<00560055000D>-322<0051004D004200440046005300420055>-322<00420044000D>-321<00420045004A0051004A00540044004A004F0048>-322<0057004A005500420046>9<000D>-321<00470046004D004A0054000F>-322<00240056000E>]TJ
+1.02 0 0 1 54 261.355 Tm [<005300420043004A005500560053>-284<0045004A004400550056004E>-285<0048005300420057004A00450042>-285<004E004200560053004A0054000F>-285<002F0042004E>-285<00420053>7<00440056>-284<004D004A0043>-10<00460053>7<0050>10<000D>-284<004F0050004F0056004E004E005A>-285<0046004800460055000D>]TJ
+0.98 0 0 1 54 246.56 Tm [<00440050004F00540046>-7<0044005500460055005600460053>-184<004A0045000D>-185<00570056004D005100560055004200550046>-184<0042000D>-184<004E00420048004F0042000F>-185<00250050004F0046>-7<0044>-184<0057>7<00460049004A00440056004D0042>-184<00420056004800560046>-184<00460056>-184<004F0046>-7<005200560046>9<000F>]TJ
+0.98 0 0 1 54 231.766 Tm [<00310046004D004D0046004F005500460054005200560046>-195<004900420043004A00550042004F0055>-196<004E005000530043004A>-196<00550053004A00540055004A005200560046>-196<00540046004F0046>-8<0044005500560054>-195<00460055>-196<004F0046005500560054>-196<00460055>-196<004E0042004D004600540056004200450042>]TJ
+0.996 0 0 1 54 216.971 Tm [<00470042004E00460054>-251<00420044>-252<0055005600530051004A0054>-252<0046004800460054005500420054000F>-252<002E004200560053004A0054>-252<00560055>-252<004D0046>-7<0050>10<000F>-251<0024005300420054>-252<0057004A0057>7<0046005300530042>-251<004E0046005500560054>-252<005300490050004F004400560054>]TJ
+1.02 0 0 1 54 202.177 Tm [<00540046004E000F>-307<002F0056004D004D0042>-307<00460055>-307<004D0046>-7<0044005500560054>-308<0057>7<004600540055004A00430056004D0056004E>-306<00560053004F0042>-307<00470053004A004F0048004A004D004D0042>-308<0056004D00550053004A004400460054000F>-307<0031>-12<0049004200540046004D004D00560054>]TJ
+0.992 0 0 1 54 187.382 Tm [<00460056>-252<00550046004D004D00560054>-253<0054004A0055>-253<0042004E00460055>-252<005500500053005500500053>-253<0048005300420057004A00450042>-253<0051004D004200440046005300420055000F>-252<002A004F00550046004800460053>-253<005400420051004A0046004F>-253<004600540055000D>-253<004A004200440056004D004A0054>]TJ
+1.018 0 0 1 54 172.588 Tm [<004A004F000D>-246<00510053>7<00460055004A0056004E>-245<00520056004A0054000D>-247<0057004A0057>7<0046005300530042>-245<00420044000D>-247<004F0056004F0044000F>-246<003100530042004600540046004F0055>-247<0046004800460055>-246<00540046004E>-247<0057>7<0046004D>-245<004D0046>-7<0050>-247<0056004D00550053004A000E>]TJ
+1.011 0 0 1 54 157.793 Tm [<004400460054>-246<0043004A0043>-10<0046004F00450056004E000F>-247<0022>12<0046004F00460042004F>-246<0047004200560044004A004300560054000F>-247<002E005000530043004A>-246<00450050004D00500053>-247<004F0056004D004D0042000D>-246<004E0042004D004600540056004200450042>-247<00460056000D>]TJ
+0.996 0 0 1 54 142.999 Tm [<00510056004D0057004A004F00420053>-251<00420055000D>-251<004E0050004D004D004A0054>-252<00420044000D>-251<004F0056004D004D0042000F>-252<00240056005300420043004A005500560053>-251<004200560044005500500053>-251<00540046004E0051>-8<00460053>-251<004F0056004D004D0042000F>-251<00250050004F0046>-8<0044>]TJ
+0.996 0 0 1 53.716 128.204 Tm [<005700420053004A00560054>-250<00500053>7<0044004A>-250<0046004800460055>-250<0053004A005400560054000F>-251<00250056004A0054>-251<004F004A00430049>-250<004E004A000D>-251<00440050004F004800560046>-251<00460056000D>-250<0042004400440056004E00540042004F>-251<0046004D0046004A00470046004F0045000D>]TJ
+1 0 0 1 54 113.41 Tm [<005400420048004A00550055004A0054>-250<00520056004A0054000D>-250<0045004A0042004E000F>-250<00250056004A0054>-250<0046004800460055>-250<00500053>8<0044004A>-250<0054004A0055>-250<0042004E00460055>-250<00500053>8<0044004A>-250<0045004A0048004F004A00540054004A004E>-250<00530056005500530056004E000F>]TJ
+1.02 0 0 1 71.036 98.615 Tm [<002F0042004E>-336<00450056004A>-336<004D004A00480056004D0042000D>-336<00470053004A004F0048004A004D004D0042>-336<0042000D>-336<00460056004A0054004E0050>-7<0045>-336<00540050>-7<00450042004D00460054000D>-336<00540050004D004D004A0044004A005500560045004A004F>-337<0057>7<0046004D000D>]TJ
+1.02 0 0 1 53.58 83.82 Tm [<0058004A0054004A000F>-251<002E005000530043004A>-252<004200560044005500500053>-252<004D00500053>7<0046004E>-251<004F0050004F>-251<004B0056005400550050>9<000F>-251<002F0042004E>-252<004D0042004400560054>-252<004D004A0043>-10<00460053>7<0050>10<000D>-251<00510053>7<00460055004A0056004E>-250<00420055000D>]TJ
+0.98 0 0 1 54 69.026 Tm [<004D00500043>-10<005000530055004A0054>-230<0057004A005500420046>10<000D>-230<0056004D00550053004A0044004A00460054>-230<00460055000D>-230<00550046004D004D00560054000F>-230<00250050004F0046>-7<0044>-230<0042004D004A0052005600460055000D>-230<005500500053005500500053>-230<00540046>-7<0045>-230<0042004400440056004E00540042004F>]TJ
+1.02 0 0 1 54 54.231 Tm [<0043004A0043>-10<0046004F00450056004E000D>-342<0046005300420055>-342<004D004A00480056004D0042>-342<0042004D004A0052005600460055>-343<004E00420048004F0042000D>-342<0057004A005500420046>-342<00500053004F00420053>7<0046>-341<0050>-7<0045004A0050>-343<004E0046005500560054>-342<0042>]TJ
+1.02 0 0 1 54 39.437 Tm [<004E004A000F>-303<002E005000530043004A>-303<00420044>-304<00500053>7<0044004A>-302<00460055>-303<004F004A0054004D>-304<00490046004F00450053>7<00460053004A0055>-302<004E0050004D004D004A0054000F>-303<0034005600540051>-7<0046004F0045004A005400540046>-304<00560055>-303<004E0042005400540042000F>]TJ
 0 g 0 G
 0 g 0 G
 ET
@@ -316,7 +316,7 @@ endobj
 <<  /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R  /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >>
 endobj
 33 0 obj
-<< /Length 10995 >>      
+<< /Length 11014 >>      
 stream
 0 g 0 G
 BT
@@ -326,41 +326,41 @@ BT
 1 0 0 1 151.292 565.121 Tm [<0025>-50<0964>-50<096C>-50<095B>-341<0029>-50<095C>-50<096C>-50<095F>-50<095E>-50<095C>-50<096D>-50<0960>]TJ
 0 g 0 G
 /F83 11.3574 Tf
-1.011 0 0 1 36 542.451 Tm [<002E005000530043004A>-247<00420044>-248<00500053>7<0044004A>-246<00460055>-248<004F004A0054004D>-247<00490046004F00450053>7<00460053004A0055>-247<004E0050004D004D004A0054000F>-330<0034005600540051>-8<0046004F0045004A005400540046>-247<00560055>-248<004E0042005400540042000F>-330<0024005300420054>]TJ
-1.02 0 0 1 36 527.656 Tm [<004F0046>-7<0044>-283<0042004F00550046>9<000F>-443<00310046004D004D0046004F005500460054005200560046>-284<0042>-283<004F0056004D004D0042000F>-444<00240056004E>-284<00540050>-6<0044004A004A0054>-284<004F004200550050>-7<005200560046>-284<0051>-7<0046004F00420055004A004300560054>-284<00460055>]TJ
-1.02 0 0 1 36 512.862 Tm [<004E00420048004F004A0054>-316<0045004A0054>-316<005100420053005500560053004A0046004F0055>-317<004E0050004F005500460054000D>-334<004F0042005400440046005500560053>-316<0053004A0045004A00440056004D00560054>-316<004E00560054000F>-541<0022004D004A005200560042004E>]TJ
-0.999 0 0 1 36 498.067 Tm [<0055004A004F0044004A00450056004F0055>-250<00560053004F0042000F>-336<002F0056004D004D0042>-251<0056004D004D0042004E0044005000530051>-7<00460053>-251<0057>7<004600540055004A00430056004D0056004E>-250<0055005600530051004A0054000F>-335<00310046004D004D0046004F005500460054005200560046>]TJ
-1 0 0 1 36 483.273 Tm [<004400560053005400560054>-250<004D00560044005500560054>-250<004E004200560053004A0054000F>]TJ
-1.011 0 0 1 53.036 468.478 Tm [<002F0056004D004D0042>-248<004E0042004D004600540056004200450042>-248<0051>-7<0050005300550055004A005500500053>-249<0045004A0042004E000F>-332<00250050004F0046>-7<0044>-249<00470046004D004A0054>-248<0046005300420055000D>-249<00440050004F004800560046>-248<004F0050004F000D>]TJ
-0.992 0 0 1 35.716 453.684 Tm [<0057>8<0050004D00560055005100420055>-251<00420055000D>-252<0055004A004F0044004A00450056004F0055>-251<00550053004A00540055004A005200560046>9<000D>-251<004D004A0043>-10<00460053>7<0050>10<000F>-335<0037004A00570042004E00560054>-251<0057004A0057>7<0046005300530042>-251<004700460053004E0046004F00550056004E>]TJ
-0.98 0 0 1 36 438.889 Tm [<00470046004D004A0054000F>-329<00250050004F0046>-7<0044>-222<004F0050004F0056004E004E005A>-221<0051>-7<0046004D004D0046004F005500460054005200560046>-222<0042004F00550046>9<000F>-328<0031>-12<0049004200540046004D004D00560054>-222<00420045004A0051004A00540044004A004F0048>-222<00540046004E000E>]TJ
-0.98 0 0 1 36 424.095 Tm [<0051>-7<00460053>-226<0046004D004A0055000F>-330<00310053>7<0050004A004F>-225<004700460053004E0046004F00550056004E>-226<004E0042005400540042>-226<00420044>-226<005200560042004E000F>-331<00340046>-7<0045>-226<0045004A0042004E>-226<0055005600530051004A0054000D>-232<004E0050004D004600540055004A0046>]TJ
-1.02 0 0 1 35.716 409.3 Tm [<0057004A005500420046>10<000D>-250<0051004D004200440046005300420055>-249<0042000D>-251<004E0050004D004600540055004A0046>-249<004F0046>-7<0044000D>-251<004D0046>-7<0050>9<000F>-338<002E00420046>-7<00440046004F00420054>-250<004D00420044004A004F004A0042000F>-339<002F0042004E>-250<004A005100540056004E>]TJ
-1.015 0 0 1 36 394.506 Tm [<004D004A00480056004D0042000D>-246<0046004D0046004A00470046004F0045>-247<00420055000D>-246<0042004400440056004E00540042004F>-247<004F0046>-7<0044000D>-246<0054005600540044004A0051004A0055>-247<0042000D>-247<004A005100540056004E000F>-329<002E005000530043004A>-246<0043004D0042004F0045004A0055>]TJ
-1.017 0 0 1 36 379.711 Tm [<004D004A00480056004D0042>-244<0047004600560048004A00420055>-245<004E00420048004F0042000F>-328<002F0056004F0044>-245<0046004D0046004A00470046004F0045>-245<00440050004F00540046>-7<0052005600420055>-245<004D00500053>8<0046004E000F>-327<00340046>-7<0045>-245<004D00420044004A004F004A0042>]TJ
-1.02 0 0 1 36 364.917 Tm [<004F0056004D004D0042>-305<0057004A005500420046>-306<0046004F004A004E000F>-510<00310046004D004D0046004F005500460054005200560046>-306<0055004A004F0044004A00450056004F0055>-306<00510056005300560054>-305<0057>7<0046004D>-305<004E00420048004F0042000F>-510<002A004F00550046000E>]TJ
-1.004 0 0 1 36 350.122 Tm [<004800460053>-248<004F0050004F>-249<0046004F004A004E000F>-332<003100530042004600540046004F0055>-248<00460056004A0054004E0050>-7<0045>-249<004F0056004F0044>-249<00460056>-248<00510056005300560054000F>-332<00250050004F0046>-7<0044>-249<0043004A0043>-10<0046004F00450056004E>]TJ
-1.014 0 0 1 36 335.327 Tm [<005200560042004E>-247<004A004F>-247<00550046004D004D00560054000F>-331<002F0056004D004D0042004E>-247<004400560053005400560054>-247<00510056004D0057004A004F00420053>-247<004D0046>-7<0044005500560054000F>-331<00250050004F0046>-7<0044>-247<00460055>-248<004E004A000F>-330<002F0042004E>]TJ
-1 0 0 1 35.716 320.533 Tm [<00570056004D005100560055004200550046>-250<004E0046005500560054>-250<00460056>-250<0046004F004A004E000F>-333<0037>79<004600540055004A00430056004D0056004E>-249<0051>-7<0046004D004D0046004F005500460054005200560046>-250<00470046004D004A0054>-250<00460056>-250<004E0042005400540042000F>]TJ
-0.98 0 0 1 53.036 305.738 Tm [<09550056004A0054005200560046>-228<0056004D004D0042004E0044005000530051>-7<00460053>-228<0051004D004200440046005300420055>-228<004A005100540056004E000F>-331<0024005300420054>-228<004F004A00430049000F>-331<002E005000530043004A>-228<0057>7<0046004D>-227<004B0056005400550050>]TJ
-0.98 0 0 1 35.716 290.944 Tm [<0057004A005500420046>-236<004D0042004400560054>-237<0055004A004F0044004A00450056004F0055>-236<0056004D00550053004A004400460054000F>-334<002D00500053>7<0046004E>-235<004A005100540056004E>-237<00450050004D00500053>-236<0054004A0055>-237<0042004E00460055000D>-240<00440050004F00540046>-7<004400550046000E>]TJ
-0.98 0 0 1 36 276.149 Tm [<0055005600460053>-193<00420045004A0051004A00540044004A004F0048>-193<0046004D004A0055000F>-319<002A004F>-193<004900420044>-193<004900420043004A00550042005400540046>-194<0051004D0042005500460042>-193<0045004A004400550056004E00540055000F>-319<002A004F00550046004800460053>-193<00550046004E005100560054>]TJ
-0.996 0 0 1 36 261.355 Tm [<00440050004F00570042004D004D004A0054>-250<00420056004800560046>9<000F>-333<00260055004A0042004E>-251<004700420044004A004D004A0054004A0054000F>-334<002F0056004F0044>-251<0046004D0046004E0046004F00550056004E>-250<004700460053004E0046004F00550056004E>-251<0058004A0054004A000F>]TJ
-1.01 0 0 1 35.602 246.56 Tm [<0022>12<0046004F00460042004F>-246<0051004D004200440046005300420055000F>-330<00360055>-247<004A004E0051>-7<00460053>7<0045004A00460055000D>-246<0046004F004A004E>-247<00540046>-7<0045>-247<0048005300420057004A00450042>-246<00540050004D004D004A0044004A005500560045004A004F000D>-247<00470046004D004A0054>]TJ
-1.02 0 0 1 36 231.766 Tm [<0050>-7<0045004A0050>-259<0051004D004200440046005300420055>-260<005200560042004E000D>-264<00420044>-260<00510056004D0057004A004F00420053>-260<0046004D004A0055>-260<00510056005300560054>-260<0046004800460055>-260<0046004F004A004E000F>-371<002F0056004F0044>-260<0057004A005500420046>]TJ
-1.014 0 0 1 36 216.971 Tm [<005500500053005500500053>59<000F>-330<00310053>7<0050004A004F>-246<00550046004E005100560054>-247<004F004A00430049>-247<0054004A0055>-247<0042004E00460055>-247<004F004A0054004D000F>-331<0037004A00570042004E00560054>-247<00520056004A0054>-247<005500500053005500500053>-247<0057004A005500420046>]TJ
-1 0 0 1 36 202.177 Tm [<0053004A005400560054>-250<0051>-7<0050005300550042>-250<0057>8<00460049004A00440056004D0042000F>]TJ
-0.999 0 0 1 53.036 187.382 Tm [<00270056005400440046>-250<004E004200560053004A0054000F>-333<0037>80<004600540055004A00430056004D0056004E>-249<004D00560044005500560054>-250<004F004A00430049>-250<00420055>-251<004D0046>-7<0044005500560054000F>-333<00340046>-7<0045>-251<0043004A0043>-10<0046004F00450056004E000D>]TJ
-1.004 0 0 1 36 172.588 Tm [<004F0056004D004D0042>-248<0042>-248<0047004200560044004A004300560054>-248<00540046004E0051>-7<00460053>59<000D>-247<004D0046>-7<0050>-248<0057>7<0046004D004A0055>-247<0056004D00550053004A0044004A00460054>-248<00550046004D004D00560054000D>-248<00420044>-248<0057>7<0046004F0046004F00420055004A0054>-247<00420053>7<00440056>]TJ
-1.016 0 0 1 35.58 157.793 Tm [<0058004A0054004A>-246<0057>7<0046004D>-245<004F004A0054004D000F>-328<0037>79<004600540055004A00430056004D0056004E>-245<0045004A0042004E000F>-329<0022004D004A005200560042004E>-246<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-245<00420056004800560046>-246<00520056004A0054>]TJ
-1.007 0 0 1 36 142.999 Tm [<005400420048004A00550055004A0054>-247<0051>-7<00500054005600460053>7<0046>10<000D>-247<0055005600530051004A0054>-247<004D0042004400560054>-248<00440050004F004800560046>-248<005200560042004E000D>-247<004A004F>-248<00490046004F00450053>7<00460053004A0055>-247<0053004A005400560054>-247<00460053>7<00500054>]TJ
-0.98 0 0 1 36 128.204 Tm [<0046004800460055>-237<00470046004D004A0054000F>-334<002E00420046>-7<00440046004F00420054>-237<0046004800460055>-237<0046005300420055>-237<004A004F>-237<005400420051004A0046004F>-237<004E004200550055004A0054>-237<0051>-8<0050005300550055004A005500500053>61<000F>-333<0037>82<004600540055004A00430056004D0056004E>]TJ
-1.02 0 0 1 36 113.41 Tm [<0051>-7<0050005300550055004A005500500053>59<000F>-483<002F0056004D004D0042>-298<004700420044004A004D004A0054004A000F>-483<00340046>-7<0045>-297<0042>-298<0055005600530051004A0054>-297<00460056>-298<004D0042004400560054>-297<00440050004E004E0050>-7<00450050>-297<004700420044004A004D004A0054004A0054000F>]TJ
-0.982 0 0 1 36 98.615 Tm [<002E005000530043004A>-254<00470053004A004F0048004A004D004D0042000D>-254<0058004A0054004A>-254<004A004F>-254<0045004A0048004F004A00540054004A004E>-254<004A004F005500460053>8<00450056004E000D>-254<004B0056005400550050>-254<004D0046>-7<0044005500560054>-254<005400420048004A00550055004A0054>-254<00450056004A000D>]TJ
-1.02 0 0 1 36 83.82 Tm [<00460055>-258<0057>7<00460049004A00440056004D0042>-258<004D004A0043>-10<00460053>7<0050>-258<00450056004A>-259<004400560053005400560054>-258<00450056004A000F>-368<002E004200560053004A0054>-259<00550046004E0051>-7<00500053>-259<004D004A00480056004D0042>-258<00540046>-7<0045>-259<004D0042004400560054000F>]TJ
-1.02 0 0 1 36 69.026 Tm [<00250056004A0054>-341<004400560053005400560054>-341<0046004F004A004E>-341<00560055>-341<00420056004800560046>9<000F>-614<0024005300420054>-341<00420044>-341<004E00420048004F0042000F>-615<0024005300420054>-341<004F0056004D004D0042000F>-615<002F0056004D004D0042>]TJ
-1.02 0 0 1 36 54.231 Tm [<0046004800460054005500420054000F>-526<00240056005300420043004A005500560053>-312<0042>-311<004D0046>-7<0050>9<000F>-526<09550056004A0054005200560046>-312<0046004800460054005500420054>-311<0058004A0054004A>-312<0046004800460055>-312<004F0056004F0044000F>-526<002F0042004E>]TJ
-1 0 0 1 36 39.437 Tm [<0047004600560048004A00420055>-250<004D0042004400560054>-250<0057>8<0046004D>-250<004600540055000F>-333<00240056005300420043004A005500560053>-250<00440050004F00540046>-7<0044005500460055005600460053>58<000F>]TJ
+1.002 0 0 1 36 542.451 Tm [<0024005300420054>-249<004F0046>-7<0044>-250<0042004F00550046>9<000F>-248<00310046004D004D0046004F005500460054005200560046>-250<0042>-249<004F0056004D004D0042000F>-250<00240056004E>-249<00540050>-7<0044004A004A0054>-250<004F004200550050>-7<005200560046>-249<0051>-8<0046004F00420055004A004300560054>]TJ
+1.009 0 0 1 36 527.656 Tm [<00460055>-247<004E00420048004F004A0054>-248<0045004A0054>-248<005100420053005500560053004A0046004F0055>-247<004E0050004F005500460054000D>-248<004F0042005400440046005500560053>-248<0053004A0045004A00440056004D00560054>-247<004E00560054000F>-248<0022004D004A005200560042004E>]TJ
+1.006 0 0 1 36 512.862 Tm [<0055004A004F0044004A00450056004F0055>-247<00560053004F0042000F>-248<002F0056004D004D0042>-248<0056004D004D0042004E0044005000530051>-7<00460053>-248<0057>7<004600540055004A00430056004D0056004E>-247<0055005600530051004A0054000F>-248<00310046004D004D0046004F005500460054005200560046>]TJ
+1 0 0 1 36 498.067 Tm [<004400560053005400560054>-250<004D00560044005500560054>-250<004E004200560053004A0054000F>]TJ
+1.015 0 0 1 53.036 483.273 Tm [<002F0056004D004D0042>-246<004E0042004D004600540056004200450042>-247<0051>-7<0050005300550055004A005500500053>-246<0045004A0042004E000F>-247<00250050004F0046>-7<0044>-246<00470046004D004A0054>-247<0046005300420055000D>-246<00440050004F004800560046>-247<004F0050004F000D>]TJ
+0.995 0 0 1 35.716 468.478 Tm [<0057>8<0050004D00560055005100420055>-251<00420055000D>-252<0055004A004F0044004A00450056004F0055>-252<00550053004A00540055004A005200560046>9<000D>-251<004D004A0043>-10<00460053>7<0050>10<000F>-251<0037004A00570042004E00560054>-252<0057004A0057>7<0046005300530042>-251<004700460053004E0046004F00550056004E>]TJ
+0.98 0 0 1 36 453.684 Tm [<00470046004D004A0054000F>-252<00250050004F0046>-7<0044>-253<004F0050004F0056004E004E005A>-252<0051>-7<0046004D004D0046004F005500460054005200560046>-252<0042004F00550046>9<000F>-251<0031>-13<0049004200540046004D004D00560054>-252<00420045004A0051004A00540044004A004F0048>-253<00540046004E000E>]TJ
+0.98 0 0 1 36 438.889 Tm [<0051>-7<00460053>-247<0046004D004A0055000F>-248<00310053>8<0050004A004F>-247<004700460053004E0046004F00550056004E>-248<004E0042005400540042>-247<00420044>-248<005200560042004E000F>-247<00340046>-8<0045>-247<0045004A0042004E>-248<0055005600530051004A0054000D>-247<004E0050004D004600540055004A0046>]TJ
+1.02 0 0 1 35.716 424.095 Tm [<0057004A005500420046>10<000D>-269<0051004D004200440046005300420055>-270<0042000D>-270<004E0050004D004600540055004A0046>-270<004F0046>-7<0044000D>-270<004D0046>-7<0050>10<000F>-269<002E00420046>-7<00440046004F00420054>-270<004D00420044004A004F004A0042000F>-270<002F0042004E>-270<004A005100540056004E>]TJ
+1.019 0 0 1 36 409.3 Tm [<004D004A00480056004D0042000D>-244<0046004D0046004A00470046004F0045>-244<00420055000D>-244<0042004400440056004E00540042004F>-244<004F0046>-7<0044000D>-244<0054005600540044004A0051004A0055>-244<0042000D>-245<004A005100540056004E000F>-244<002E005000530043004A>-244<0043004D0042004F0045004A0055>]TJ
+1.02 0 0 1 36 394.506 Tm [<004D004A00480056004D0042>-255<0047004600560048004A00420055>-256<004E00420048004F0042000F>-256<002F0056004F0044>-256<0046004D0046004A00470046004F0045>-256<00440050004F00540046>-7<0052005600420055>-255<004D00500053>7<0046004E000F>-255<00340046>-7<0045>-256<004D00420044004A004F004A0042>]TJ
+1.014 0 0 1 36 379.711 Tm [<004F0056004D004D0042>-247<0057004A005500420046>-248<0046004F004A004E000F>-248<00310046004D004D0046004F005500460054005200560046>-247<0055004A004F0044004A00450056004F0055>-248<00510056005300560054>-248<0057>7<0046004D>-246<004E00420048004F0042000F>-248<002A004F00550046004800460053>]TJ
+0.98 0 0 1 36 364.917 Tm [<004F0050004F>-233<0046004F004A004E000F>-233<003100530042004600540046004F0055>-233<00460056004A0054004E0050>-7<0045>-234<004F0056004F0044>-233<00460056>-233<00510056005300560054000F>-233<00250050004F0046>-7<0044>-234<0043004A0043>-10<0046004F00450056004E>-233<005200560042004E>]TJ
+0.98 0 0 1 36 350.122 Tm [<004A004F>-204<00550046004D004D00560054000F>-205<002F0056004D004D0042004E>-205<004400560053005400560054>-204<00510056004D0057004A004F00420053>-205<004D0046>-7<0044005500560054000F>-205<00250050004F0046>-7<0044>-205<00460055>-205<004E004A000F>-204<002F0042004E>-205<00570056004D005100560055004200550046>]TJ
+1 0 0 1 36 335.327 Tm [<004E0046005500560054>-250<00460056>-250<0046004F004A004E000F>-250<0037>80<004600540055004A00430056004D0056004E>-250<0051>-7<0046004D004D0046004F005500460054005200560046>-250<00470046004D004A0054>-250<00460056>-250<004E0042005400540042000F>]TJ
+0.98 0 0 1 53.036 320.533 Tm [<09550056004A0054005200560046>-253<0056004D004D0042004E0044005000530051>-8<00460053>-253<0051004D004200440046005300420055>-254<004A005100540056004E000F>-254<0024005300420054>-254<004F004A00430049000F>-253<002E005000530043004A>-254<0057>7<0046004D>-253<004B0056005400550050>]TJ
+0.98 0 0 1 35.716 305.738 Tm [<0057004A005500420046>-247<004D0042004400560054>-248<0055004A004F0044004A00450056004F0055>-248<0056004D00550053004A004400460054000F>-247<002D00500053>7<0046004E>-247<004A005100540056004E>-248<00450050004D00500053>-247<0054004A0055>-248<0042004E00460055000D>-248<00440050004F00540046>-7<004400550046000E>]TJ
+0.98 0 0 1 36 290.944 Tm [<0055005600460053>-221<00420045004A0051004A00540044004A004F0048>-221<0046004D004A0055000F>-221<002A004F>-221<004900420044>-221<004900420043004A00550042005400540046>-222<0051004D0042005500460042>-221<0045004A004400550056004E00540055000F>-221<002A004F00550046004800460053>-221<00550046004E005100560054>]TJ
+1.003 0 0 1 36 276.149 Tm [<00440050004F00570042004D004D004A0054>-247<00420056004800560046>9<000F>-246<00260055004A0042004E>-248<004700420044004A004D004A0054004A0054000F>-247<002F0056004F0044>-248<0046004D0046004E0046004F00550056004E>-247<004700460053004E0046004F00550056004E>-248<0058004A0054004A000F>]TJ
+1.013 0 0 1 35.602 261.355 Tm [<0022>12<0046004F00460042004F>-247<0051004D004200440046005300420055000F>-247<00360055>-247<004A004E0051>-7<00460053>7<0045004A00460055000D>-247<0046004F004A004E>-247<00540046>-7<0045>-248<0048005300420057004A00450042>-247<00540050004D004D004A0044004A005500560045004A004F000D>-247<00470046004D004A0054>]TJ
+1.02 0 0 1 36 246.56 Tm [<0050>-7<0045004A0050>-271<0051004D004200440046005300420055>-271<005200560042004E000D>-272<00420044>-271<00510056004D0057004A004F00420053>-272<0046004D004A0055>-271<00510056005300560054>-272<0046004800460055>-271<0046004F004A004E000F>-272<002F0056004F0044>-271<0057004A005500420046>]TJ
+1.02 0 0 1 36 231.766 Tm [<005500500053005500500053>59<000F>-248<00310053>7<0050004A004F>-247<00550046004E005100560054>-248<004F004A00430049>-248<0054004A0055>-248<0042004E00460055>-248<004F004A0054004D000F>-249<0037004A00570042004E00560054>-248<00520056004A0054>-248<005500500053005500500053>-248<0057004A005500420046>]TJ
+1 0 0 1 36 216.971 Tm [<0053004A005400560054>-250<0051>-7<0050005300550042>-250<0057>8<00460049004A00440056004D0042000F>]TJ
+1.006 0 0 1 53.036 202.177 Tm [<00270056005400440046>-248<004E004200560053004A0054000F>-249<0037>80<004600540055004A00430056004D0056004E>-248<004D00560044005500560054>-249<004F004A00430049>-249<00420055>-248<004D0046>-7<0044005500560054000F>-249<00340046>-7<0045>-249<0043004A0043>-10<0046004F00450056004E000D>]TJ
+1.004 0 0 1 36 187.382 Tm [<004F0056004D004D0042>-248<0042>-248<0047004200560044004A004300560054>-248<00540046004E0051>-7<00460053>59<000D>-247<004D0046>-7<0050>-248<0057>7<0046004D004A0055>-247<0056004D00550053004A0044004A00460054>-248<00550046004D004D00560054000D>-248<00420044>-248<0057>7<0046004F0046004F00420055004A0054>-247<00420053>7<00440056>]TJ
+1.02 0 0 1 35.58 172.588 Tm [<0058004A0054004A>-253<0057>7<0046004D>-253<004F004A0054004D000F>-254<0037>79<004600540055004A00430056004D0056004E>-252<0045004A0042004E000F>-254<0022004D004A005200560042004E>-254<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-253<00420056004800560046>-253<00520056004A0054>]TJ
+1.007 0 0 1 36 157.793 Tm [<005400420048004A00550055004A0054>-247<0051>-7<00500054005600460053>7<0046>10<000D>-247<0055005600530051004A0054>-247<004D0042004400560054>-248<00440050004F004800560046>-248<005200560042004E000D>-247<004A004F>-248<00490046004F00450053>7<00460053004A0055>-246<0053004A005400560054>-248<00460053>7<00500054>]TJ
+0.981 0 0 1 36 142.999 Tm [<0046004800460055>-255<00470046004D004A0054000F>-256<002E00420046>-7<00440046004F00420054>-255<0046004800460055>-256<0046005300420055>-255<004A004F>-256<005400420051004A0046004F>-255<004E004200550055004A0054>-256<0051>-7<0050005300550055004A005500500053>60<000F>-254<0037>82<004600540055004A00430056004D0056004E>]TJ
+1.02 0 0 1 36 128.204 Tm [<0051>-7<0050005300550055004A005500500053>59<000F>-338<002F0056004D004D0042>-339<004700420044004A004D004A0054004A000F>-339<00340046>-7<0045>-339<0042>-338<0055005600530051004A0054>-339<00460056>-339<004D0042004400560054>-339<00440050004E004E0050>-6<00450050>-339<004700420044004A004D004A0054004A0054000F>]TJ
+0.982 0 0 1 36 113.41 Tm [<002E005000530043004A>-254<00470053004A004F0048004A004D004D0042000D>-254<0058004A0054004A>-254<004A004F>-254<0045004A0048004F004A00540054004A004E>-254<004A004F005500460053>8<00450056004E000D>-254<004B0056005400550050>-254<004D0046>-7<0044005500560054>-254<005400420048004A00550055004A0054>-254<00450056004A000D>]TJ
+1.02 0 0 1 36 98.615 Tm [<00460055>-269<0057>7<00460049004A00440056004D0042>-269<004D004A0043>-10<00460053>7<0050>-269<00450056004A>-269<004400560053005400560054>-270<00450056004A000F>-270<002E004200560053004A0054>-269<00550046004E0051>-7<00500053>-270<004D004A00480056004D0042>-270<00540046>-7<0045>-269<004D0042004400560054000F>]TJ
+0.98 0 0 1 36 83.82 Tm [<00250056004A0054>-199<004400560053005400560054>-199<0046004F004A004E>-199<00560055>-199<00420056004800560046>10<000F>-198<0024005300420054>-199<00420044>-199<004E00420048004F0042000F>-199<0024005300420054>-199<004F0056004D004D0042000F>-199<002F0056004D004D0042>-199<0046004800460054005500420054000F>]TJ
+0.99 0 0 1 36 69.026 Tm [<00240056005300420043004A005500560053>-251<0042>-252<004D0046>-7<0050>10<000F>-251<09550056004A0054005200560046>-251<0046004800460054005500420054>-252<0058004A0054004A>-251<0046004800460055>-252<004F0056004F0044000F>-251<002F0042004E>-252<0047004600560048004A00420055>-251<004D0042004400560054>]TJ
+1 0 0 1 35.716 54.231 Tm [<0057>8<0046004D>-250<004600540055000F>-250<00240056005300420043004A005500560053>-250<00440050004F00540046>-7<0044005500460055005600460053>59<000F>]TJ
+0.982 0 0 1 53.036 39.437 Tm [<0034005600540051>-7<0046004F0045004A005400540046>-253<0057>7<0046004D>-253<00470046004D004A0054000F>-254<00360055>-253<004D00500053>7<0046004E>-253<004D00500053>8<0046004E000D>-253<004A004F005500460053>7<00450056004E>-252<00460056000D>-254<0055004A004F0044004A00450056004F0055>-254<0054004A0055>]TJ
 0 g 0 G
 0 g 0 G
 ET
@@ -376,7 +376,7 @@ endobj
 <<  /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R  /Font << /F83 16 0 R >> /ProcSet [ /PDF /Text ] >>
 endobj
 36 0 obj
-<< /Length 6171 >>       
+<< /Length 5830 >>       
 stream
 0 g 0 G
 BT
@@ -386,25 +386,24 @@ BT
 1 0 0 1 355.141 565.121 Tm [<0014>]TJ
 0 g 0 G
 /F83 11.3574 Tf
-0.98 0 0 1 71.036 542.451 Tm [<0034005600540051>-7<0046004F0045004A005400540046>-249<0057>7<0046004D>-248<00470046004D004A0054000F>-339<00360055>-249<004D00500053>7<0046004E>-248<004D00500053>7<0046004E000D>-249<004A004F005500460053>7<00450056004E>-249<00460056000D>-250<0055004A004F0044004A00450056004F0055>-250<0054004A0055>]TJ
-1.015 0 0 1 54 527.656 Tm [<0042004E00460055000D>-246<004D004200500053>7<0046>-6<00460055>-247<0057004A005500420046>9<000D>-246<00420053>7<00440056000F>-329<0022>11<0046004F00460042004F>-245<0047004200560044004A004300560054>-247<0051>-7<0046>-7<00450046>-247<00460056>-247<0042004F00550046>10<000F>-329<003100530042004600540046004F0055>]TJ
-1.02 0 0 1 54 512.862 Tm [<0046004F004A004E>-282<0046004D004A0055000D>-293<00530056005500530056004E>-283<00420055000D>-292<004E0050004D004600540055004A0046>-283<004F0050004F000D>-292<004F0050004F0056004E004E005A>-283<0057>7<0046004D000D>-291<004F004A0054004D000F>-440<00360055>-283<004D0046>-7<0044005500560054>]TJ
-1.02 0 0 1 54 498.067 Tm [<00460053>8<00500054000D>-318<004E0042004D004600540056004200450042>-304<0054004A0055>-304<0042004E00460055000D>-319<004700460053004E0046004F00550056004E>-304<00460056000D>-319<00540050>-6<00450042004D00460054>-304<004400560053005400560054000D>-319<004E00420048004F0042000F>]TJ
-1.007 0 0 1 54 483.273 Tm [<00250050004F0046>-7<0044>-248<00460056>-249<00510056005300560054000F>-332<09550056004A0054005200560046>-249<0057>7<00460049004A00440056004D0042000D>-248<00560053004F0042>-248<00540046>-8<0045>-248<0056004D00550053004A0044004A00460054>-249<004200560044005500500053>59<000D>-248<0051>-7<0046>-7<00450046>]TJ
-1.02 0 0 1 54 468.478 Tm [<004D00500053>8<0046004E>-316<0046004800460054005500420054>-316<00450056004A000D>-335<00460055>-316<00440050004F00570042004D004D004A0054>-317<0046004D004A0055>-316<0046005300420055>-316<00540046>-7<0045>-317<004F0056004D004D0042000F>-541<00250050004F0046>-7<0044>-316<004D00560044005500560054000F>]TJ
-0.98 0 0 1 54 453.684 Tm [<00240056005300420043004A005500560053>-241<00460055>-242<004F0056004F0044000F>-336<0022004D004A005200560042004E>-242<00450050004D00500053>-242<0050>-7<0045004A0050>10<000D>-244<00440050004E004E0050>-7<00450050>-242<00510053>7<00460055004A0056004E000D>-243<0056004D00550053004A0044004A00460054>]TJ
-1.018 0 0 1 54 438.889 Tm [<004F0050004F000D>-244<0051004900420053>7<0046005500530042>-243<004A004F000D>-245<0057>7<0046004D004A0055000F>-326<002A004F00550046004800460053>-244<00420053>7<00440056>-244<004600540055000D>-244<004F0050004F0056004E004E005A>-244<004A004F000D>-245<004700460053004E0046004F00550056004E>]TJ
-1 0 0 1 54 424.095 Tm [<0047004200560044004A004300560054000D>-250<0046004800460054005500420054>-250<0057>8<0046004D000D>-250<0050>-7<0045004A0050>10<000F>]TJ
-1.005 0 0 1 71.036 409.3 Tm [<00340046>-7<0045>-247<00440050004E004E0050>-7<00450050>-248<0051>-7<00500054005600460053>8<0046>-247<0051>-7<0046>-7<00450046>9<000F>-330<002E004200560053004A0054>-248<00560055>-247<004600540055000F>-331<00360055>-248<00520056004A0054>-247<00510056005300560054000F>-332<00340046>-7<0045>]TJ
-1.01 0 0 1 54 394.506 Tm [<00420044>-247<0050>-7<0045004A0050>9<000F>-330<00340046>-7<0045>-248<0057>7<00460049004A00440056004D0042>-247<00490046004F00450053>7<00460053004A0055>-247<00540046004E000F>-331<00250056004A0054>-248<004F0050004F>-247<0050>-8<0045004A0050>10<000F>-330<002E005000530043004A>-248<00560055>-248<00450056004A000F>]TJ
-1.02 0 0 1 54 379.711 Tm [<00340046>-7<0045>-316<0042004400440056004E00540042004F>-317<0053004A005400560054>-316<0046004800460055>-317<0050>-7<0045004A0050>9<000F>-541<002A004F>-316<004900420044>-317<004900420043004A00550042005400540046>-317<0051004D0042005500460042>-316<0045004A004400550056004E00540055000F>]TJ
-1.02 0 0 1 54 364.917 Tm [<00310046004D004D0046004F005500460054005200560046>-361<004F0050004F>-362<0046004D004A0055000F>-677<00270056005400440046>-361<00540046>-7<0045>-362<004B0056005400550050>-362<00460056>-362<00560053004F0042>-361<0051>-7<0050005300550042>-362<0055004A004F0044004A00450056004F0055000F>]TJ
-0.981 0 0 1 54 350.122 Tm [<002E004200560053004A0054>-255<00470046004D004A0054>-255<0050>-7<0045004A0050>9<000D>-254<00540050004D004D004A0044004A005500560045004A004F>-255<00540046>-8<0045000D>-255<0057>7<0050004D0056>1<0055005100420055>-255<0042000D>-255<00500053004F00420053>7<0046>-254<00420044000D>-255<0046005300420055000F>-341<002E005000530043004A>]TJ
-1.02 0 0 1 54 335.327 Tm [<00520056004A0054>-270<00450050004D00500053>59<000F>-401<00250050004F0046>-7<0044>-270<0051>-7<0046004D004D0046004F005500460054005200560046>9<000D>-275<0046005300420055>-270<00420044>-270<005400420048004A00550055004A0054>-270<00540046004E0051>-7<00460053>58<000D>-275<004F0056004F0044>-270<00450056004A>]TJ
-1.02 0 0 1 54 320.533 Tm [<004D00500043>-10<005000530055004A0054>-269<00510056005300560054000D>-275<00520056004A0054>-269<00440050004F004800560046>-269<00510056005300560054>-269<004E0046005500560054>-269<0056004D00550053004A0044004A00460054>-269<00550046004D004D00560054000F>-398<00310053>7<0050004A004F>-268<00460055>]TJ
-1.02 0 0 1 54 305.738 Tm [<005200560042004E000F>-341<0024004D004200540054>-250<0042005100550046004F0055>-250<005500420044004A0055004A>-250<00540050>-7<0044004A0050005400520056>-250<00420045>-250<004D004A0055005000530042>-250<005500500053>7<005200560046004F0055>-249<0051>-7<00460053>-250<00440050004F00560043004A0042>]TJ
-0.98 0 0 1 54 290.944 Tm [<004F00500054005500530042000D>-241<0051>-7<00460053>-239<004A004F004400460051005500500054>-238<0049005A004E0046004F00420046>-7<00500054000F>-334<003100530042004600540046004F0055>-238<005400420051004A0046004F>-239<0055005600530051004A0054000D>-241<004700460053004E0046004F00550056004E>]TJ
-1 0 0 1 53.716 276.149 Tm [<0057>8<0046004D000D>-250<0046004D0046004A00470046004F0045>-250<0047004200560044004A004300560054000D>-250<0057>8<00460049004A00440056004D0042>-250<00460056000D>-250<004D0042004400560054000F>]TJ
+1.02 0 0 1 54 542.451 Tm [<0042004E00460055000D>-250<004D004200500053>7<0046>-6<00460055>-251<0057004A005500420046>9<000D>-250<00420053>7<00440056000F>-250<0022>12<0046004F00460042004F>-250<0047004200560044004A004300560054>-251<0051>-7<0046>-7<00450046>-251<00460056>-250<0042004F00550046>9<000F>-250<003100530042004600540046004F0055>]TJ
+1.02 0 0 1 54 527.656 Tm [<0046004F004A004E>-302<0046004D004A0055000D>-302<00530056005500530056004E>-303<00420055000D>-302<004E0050004D004600540055004A0046>-302<004F0050004F000D>-303<004F0050004F0056004E004E005A>-302<0057>7<0046004D000D>-301<004F004A0054004D000F>-303<00360055>-302<004D0046>-7<0044005500560054>]TJ
+1.02 0 0 1 54 512.862 Tm [<00460053>8<00500054000D>-311<004E0042004D004600540056004200450042>-311<0054004A0055>-312<0042004E00460055000D>-311<004700460053004E0046004F00550056004E>-311<00460056000D>-312<00540050>-6<00450042004D00460054>-312<004400560053005400560054000D>-311<004E00420048004F0042000F>]TJ
+1.011 0 0 1 54 498.067 Tm [<00250050004F0046>-7<0044>-246<00460056>-246<00510056005300560054000F>-246<09550056004A0054005200560046>-247<0057>8<00460049004A00440056004D0042000D>-246<00560053004F0042>-246<00540046>-7<0045>-246<0056004D00550053004A0044004A00460054>-246<004200560044005500500053>58<000D>-245<0051>-7<0046>-7<00450046>]TJ
+1.02 0 0 1 54 483.273 Tm [<004D00500053>8<0046004E>-340<0046004800460054005500420054>-341<00450056004A000D>-341<00460055>-340<00440050004F00570042004D004D004A0054>-341<0046004D004A0055>-341<0046005300420055>-340<00540046>-7<0045>-341<004F0056004D004D0042000F>-341<00250050004F0046>-7<0044>-340<004D00560044005500560054000F>]TJ
+0.98 0 0 1 54 468.478 Tm [<00240056005300420043004A005500560053>-254<00460055>-254<004F0056004F0044000F>-254<0022004D004A005200560042004E>-255<00450050004D00500053>-254<0050>-7<0045004A0050>9<000D>-253<00440050004E004E0050>-7<00450050>-254<00510053>7<00460055004A0056004E000D>-253<0056004D00550053004A0044004A00460054>]TJ
+1.02 0 0 1 54 453.684 Tm [<004F0050004F000D>-247<0051004900420053>7<0046005500530042>-247<004A004F000D>-248<0057>7<0046004D004A0055000F>-247<002A004F00550046004800460053>-248<00420053>7<00440056>-247<004600540055000D>-247<004F0050004F0056004E004E005A>-248<004A004F000D>-248<004700460053004E0046004F00550056004E>]TJ
+1 0 0 1 54 438.889 Tm [<0047004200560044004A004300560054000D>-250<0046004800460054005500420054>-250<0057>8<0046004D000D>-250<0050>-7<0045004A0050>10<000F>]TJ
+1.016 0 0 1 71.036 424.095 Tm [<00340046>-7<0045>-245<00440050004E004E0050>-7<00450050>-245<0051>-7<00500054005600460053>7<0046>-244<0051>-7<0046>-7<00450046>9<000F>-244<002E004200560053004A0054>-245<00560055>-246<004600540055000F>-245<00360055>-245<00520056004A0054>-245<00510056005300560054000F>-246<00340046>-7<0045>]TJ
+1.02 0 0 1 54 409.3 Tm [<00420044>-246<0050>-7<0045004A0050>9<000F>-246<00340046>-7<0045>-247<0057>7<00460049004A00440056004D0042>-245<00490046004F00450053>7<00460053004A0055>-246<00540046004E000F>-247<00250056004A0054>-246<004F0050004F>-247<0050>-7<0045004A0050>9<000F>-246<002E005000530043004A>-246<00560055>-247<00450056004A000F>]TJ
+1.02 0 0 1 54 394.506 Tm [<00340046>-7<0045>-341<0042004400440056004E00540042004F>-342<0053004A005400560054>-341<0046004800460055>-342<0050>-7<0045004A0050>9<000F>-341<002A004F>-341<004900420044>-342<004900420043004A00550042005400540046>-342<0051004D0042005500460042>-341<0045004A004400550056004E00540055000F>]TJ
+0.98 0 0 1 54 379.711 Tm [<00310046004D004D0046004F005500460054005200560046>-174<004F0050004F>-175<0046004D004A0055000F>-174<00270056005400440046>-175<00540046>-7<0045>-174<004B0056005400550050>-175<00460056>-174<00560053004F0042>-175<0051>-7<0050005300550042>-175<0055004A004F0044004A00450056004F0055000F>-174<002E004200560053004A0054>]TJ
+1.02 0 0 1 54 364.917 Tm [<00470046004D004A0054>-275<0050>-7<0045004A0050>9<000D>-274<00540050004D004D004A0044004A005500560045004A004F>-275<00540046>-7<0045000D>-276<0057>8<0050004D00560055005100420055>-275<0042000D>-275<00500053004F00420053>7<0046>-274<00420044000D>-276<0046005300420055000F>-275<002E005000530043004A>-275<00520056004A0054>]TJ
+0.98 0 0 1 54 350.122 Tm [<00450050004D00500053>61<000F>-247<00250050004F0046>-7<0044>-247<0051>-8<0046004D004D0046004F005500460054005200560046>10<000D>-247<0046005300420055>-247<00420044>-247<005400420048004A00550055004A0054>-248<00540046004E0051>-7<00460053>61<000D>-247<004F0056004F0044>-247<00450056004A>-248<004D00500043>-10<005000530055004A0054>]TJ
+1.02 0 0 1 54 335.327 Tm [<00510056005300560054000D>-358<00520056004A0054>-358<00440050004F004800560046>-358<00510056005300560054>-358<004E0046005500560054>-358<0056004D00550053004A0044004A00460054>-358<00550046004D004D00560054000F>-358<00310053>7<0050004A004F>-357<00460055>-358<005200560042004E000F>]TJ
+1.015 0 0 1 54 320.533 Tm [<0024004D004200540054>-246<0042005100550046004F0055>-246<005500420044004A0055004A>-246<00540050>-7<0044004A0050005400520056>-246<00420045>-246<004D004A0055005000530042>-246<005500500053>7<005200560046004F0055>-245<0051>-7<00460053>-246<00440050004F00560043004A0042>-247<004F00500054005500530042000D>]TJ
+1.02 0 0 1 54 305.738 Tm [<0051>-7<00460053>-302<004A004F004400460051005500500054>-302<0049005A004E0046004F00420046>-7<00500054000F>-303<003100530042004600540046004F0055>-302<005400420051004A0046004F>-302<0055005600530051004A0054000D>-303<004700460053004E0046004F00550056004E>-302<0057>7<0046004D000D>]TJ
+1 0 0 1 54 290.944 Tm [<0046004D0046004A00470046004F0045>-250<0047004200560044004A004300560054000D>-250<0057>8<00460049004A00440056004D0042>-250<00460056000D>-250<004D0042004400560054000F>]TJ
 0 g 0 G
 0 g 0 G
 ET
@@ -430,7 +429,7 @@ BT
 /F83 11.3574 Tf
 0.988 0 0 1 35.659 394.506 Tm [<003500490046>-254<004F004A004800490055>-253<005800420054>-254<00540055004A004D004D>-254<004500420053004C>-254<0042004F0045>-254<0054005500500053004E005A>60<000F>-339<00350049004A0054>-254<0054004900500056004D0045>-254<004F00500055>-254<0043>-11<0046>-253<00540056005300510053004A0054004A004F0048000D>]TJ
 0.989 0 0 1 36 379.711 Tm [<00540046>-7<0046004A004F0048>-253<00420054>-254<00490050>7<0058>-253<0050004F004D005A>-253<00490042004D0047>-253<0042004F>-254<0049005000560053>-253<004900420054>-254<0046004D0042005100540046>-7<0045>-253<0054004A004F00440046>-254<005500490046>-253<0939005300540055>-253<0044004900420051005500460053>60<000F>]TJ
-1.02 0 0 1 35.659 364.917 Tm [<0035004900420055>-281<004A004F004700500053004E00420055004A0050004F>-282<005800420054>-282<004F0046>-7<004400460054005400420053>-15<005A>59<000D>-290<004A004F>-282<0044004200540046>-282<005A>7<00500056>-280<005100560055>-282<005500490046>-282<0043>-10<0050>-7<0050004C>-281<00450050>6<0058004F>]TJ
+1.02 0 0 1 35.659 364.917 Tm [<0035004900420055>-281<004A004F004700500053004E00420055004A0050004F>-282<005800420054>-282<004F0046>-7<004400460054005400420053>-15<005A>58<000D>-289<004A004F>-282<0044004200540046>-282<005A>7<00500056>-280<005100560055>-282<005500490046>-282<0043>-10<0050>-7<0050004C>-281<00450050>6<0058004F>]TJ
 1 0 0 1 36 350.122 Tm [<0042004F0045>-250<004900420057>8<0046004F06DF0055>-250<0053>8<004600420045>-250<0042004F005A>-250<00500047>-250<004A0055>-250<004700500053>-250<005500490046>-250<004D004200540055>-250<00550058>8<0050>-250<0058>8<0046>-7<0046004C0054000F>]TJ
 0.98 0 0 1 53.036 335.327 Tm [<002D00500053>8<0045>-209<0038004A005500490046004F0054000D>-220<0058>8<00460055>-209<0042004F0045>-210<004300530056004A00540046>-8<0045000D>-219<0939004F0042004D004D005A>-210<004200530053004A0057>7<0046>-6<0045>-210<00420055>-210<0049004A0054>-210<0045004600540055004A004F00420055004A0050004F000F>]TJ
 0.98 0 0 1 35.659 320.533 Tm [<003500490046>-234<0053>7<0046004200540050004F>-234<00490046>-234<005800420054>-235<0058>7<00460055>-233<005800420054>-235<0043>-10<0046>-8<00440042005600540046>10<000D>-238<00420054>-235<004900420054>-234<0043>-11<0046>-7<0046004F>-235<004F005000550046>-7<0045000D>-239<005500490046>-235<0058>8<004600420055004900460053>]TJ
@@ -1034,92 +1033,92 @@ endobj
 << /Type /Catalog /Pages 77 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ]/PageLabels<</Nums[0<</S/r>>6<</S/D>>]>> >>
 endobj
 79 0 obj
-<<  /Title(Dark\040and\040Stormy)/Author(Dirk\040Hardcase)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20240216084723-08'00')/ModDate(D:20240216084723-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) >>
+<<  /Title(Dark\040and\040Stormy)/Author(Dirk\040Hardcase)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20240216204820-08'00')/ModDate(D:20240216204820-08'00')/Producer(LuaLaTeX\040with\040novel-pdfx\040and\040hyperref)/Trapped/False/GTS_PDFXVersion(PDF/X-1a:2001)/GTS_PDFXConformance(PDF/X-1a:2001) >>
 endobj
 xref
 0 80
 0000000000 65535 f 
-0000062159 00000 n 
-0000062179 00000 n 
-0000062199 00000 n 
+0000062099 00000 n 
+0000062119 00000 n 
+0000062139 00000 n 
 0000000020 00000 n 
 0000003415 00000 n 
 0000003264 00000 n 
 0000002770 00000 n 
-0000095381 00000 n 
-0000095740 00000 n 
+0000095321 00000 n 
+0000095680 00000 n 
 0000003781 00000 n 
 0000003627 00000 n 
 0000003535 00000 n 
 0000005375 00000 n 
 0000005221 00000 n 
 0000003873 00000 n 
-0000091329 00000 n 
-0000077152 00000 n 
+0000091269 00000 n 
+0000077092 00000 n 
 0000008045 00000 n 
 0000007891 00000 n 
 0000005520 00000 n 
-0000075154 00000 n 
+0000075094 00000 n 
 0000009244 00000 n 
 0000009090 00000 n 
 0000008168 00000 n 
 0000009625 00000 n 
 0000009471 00000 n 
 0000009379 00000 n 
-0000017484 00000 n 
-0000017330 00000 n 
+0000017746 00000 n 
+0000017592 00000 n 
 0000009717 00000 n 
-0000028815 00000 n 
-0000028661 00000 n 
-0000017606 00000 n 
-0000035322 00000 n 
-0000035168 00000 n 
-0000028937 00000 n 
-0000043519 00000 n 
-0000043365 00000 n 
-0000035444 00000 n 
-0000054866 00000 n 
-0000054711 00000 n 
-0000043641 00000 n 
-0000095878 00000 n 
-0000061359 00000 n 
-0000061204 00000 n 
-0000054988 00000 n 
-0000061728 00000 n 
-0000061573 00000 n 
-0000061481 00000 n 
-0000062067 00000 n 
-0000061912 00000 n 
-0000061820 00000 n 
-0000062252 00000 n 
-0000073276 00000 n 
-0000062674 00000 n 
-0000063018 00000 n 
-0000073518 00000 n 
-0000075313 00000 n 
-0000075518 00000 n 
-0000076214 00000 n 
-0000075551 00000 n 
-0000075658 00000 n 
-0000076440 00000 n 
-0000077298 00000 n 
-0000077490 00000 n 
-0000089327 00000 n 
-0000077959 00000 n 
-0000078322 00000 n 
-0000089568 00000 n 
-0000091489 00000 n 
-0000091695 00000 n 
-0000094234 00000 n 
-0000091822 00000 n 
-0000091894 00000 n 
-0000094473 00000 n 
-0000095537 00000 n 
-0000095975 00000 n 
-0000096044 00000 n 
-0000096411 00000 n 
+0000029096 00000 n 
+0000028942 00000 n 
+0000017868 00000 n 
+0000035262 00000 n 
+0000035108 00000 n 
+0000029218 00000 n 
+0000043459 00000 n 
+0000043305 00000 n 
+0000035384 00000 n 
+0000054806 00000 n 
+0000054651 00000 n 
+0000043581 00000 n 
+0000095818 00000 n 
+0000061299 00000 n 
+0000061144 00000 n 
+0000054928 00000 n 
+0000061668 00000 n 
+0000061513 00000 n 
+0000061421 00000 n 
+0000062007 00000 n 
+0000061852 00000 n 
+0000061760 00000 n 
+0000062192 00000 n 
+0000073216 00000 n 
+0000062614 00000 n 
+0000062958 00000 n 
+0000073458 00000 n 
+0000075253 00000 n 
+0000075458 00000 n 
+0000076154 00000 n 
+0000075491 00000 n 
+0000075598 00000 n 
+0000076380 00000 n 
+0000077238 00000 n 
+0000077430 00000 n 
+0000089267 00000 n 
+0000077899 00000 n 
+0000078262 00000 n 
+0000089508 00000 n 
+0000091429 00000 n 
+0000091635 00000 n 
+0000094174 00000 n 
+0000091762 00000 n 
+0000091834 00000 n 
+0000094413 00000 n 
+0000095477 00000 n 
+0000095915 00000 n 
+0000095984 00000 n 
+0000096351 00000 n 
 trailer
-<< /Size 80 /Root 78 0 R /Info 79 0 R /ID [ <B4EA57253E694850063E8CE805F03E33> <B4EA57253E694850063E8CE805F03E33> ] >>
+<< /Size 80 /Root 78 0 R /Info 79 0 R /ID [ <81E01F05068F4B29390B30B993AE6DF3> <81E01F05068F4B29390B30B993AE6DF3> ] >>
 startxref
-96755
+96695
 %%EOF
diff --git a/macros/luatex/latex/novel/doc/extras/novel-example.tex b/macros/luatex/latex/novel/doc/extras/novel-example.tex
index 13258f0eba..1f925b3584 100644
--- a/macros/luatex/latex/novel/doc/extras/novel-example.tex
+++ b/macros/luatex/latex/novel/doc/extras/novel-example.tex
@@ -11,7 +11,7 @@
 %   have read/write permissions for any user. If they don't, then
 %   compile will fail at the point where files are written.
 
-\documentclass[v2,american,latin]{novel} % v. 2.00.
+\documentclass[v2,american]{novel} % v. 2.1.
 \SetTitle{Dark and Stormy}
 \SetSubtitle{A Tale of Nights}
 \SetAuthor{Dirk Hardcase}
@@ -109,7 +109,7 @@ It was a dark and stormy night. Lord Withens rode his horse through the gloom, w
 
 Moving right along, his horse arrived at the back door of Lady Wishintale's quarters. Sadly, Lord Withens was not on it, having slipped off his saddle along the way. That was because the weather was stormy.
 
-\lipsum
+\foreignlanguage{latin}{\lipsum}
 
 % Chapter Two:
 \clearpage % next chapter may begin recto or verso
@@ -122,7 +122,7 @@ The night was still dark and stormy. This should not be surprising, seeing as ho
 
 Lord Withens, wet and bruised, finally arrived at his destination. The reason he was wet was because, as has been noted, the weather was stormy. It was dark, too.
 
-\lipsum
+\foreignlanguage{latin}{\lipsum}
 
 
 \end{document}
diff --git a/macros/luatex/latex/novel/doc/extras/novel-extras-README.html b/macros/luatex/latex/novel/doc/extras/novel-extras-README.html
index 5631974cfb..17ee0e61df 100644
--- a/macros/luatex/latex/novel/doc/extras/novel-extras-README.html
+++ b/macros/luatex/latex/novel/doc/extras/novel-extras-README.html
@@ -9,7 +9,7 @@
 
 <h2>README for novel extras</h2>
 
-<p>This folder contains items that may be helpful, but are not essential to operation of the <i>novel</i> document class. Version 2.00.</p>
+<p>This folder contains items that may be helpful, but are not essential to operation of the <i>novel</i> document class. Version 2.1.</p>
 
 <p>File <i>novel-example.tex</i> is a fake short novel. If you wish to compile it, place a copy in your user home folder (or other place where you have read/write privilege) and compile it there.</p>
 
diff --git a/macros/luatex/latex/novel/doc/novel-documentation.html b/macros/luatex/latex/novel/doc/novel-documentation.html
index 4f4b3171e9..080086130a 100644
--- a/macros/luatex/latex/novel/doc/novel-documentation.html
+++ b/macros/luatex/latex/novel/doc/novel-documentation.html
@@ -492,7 +492,7 @@ p.overhang {margin-left:32px; text-indent:-16px;}
 <!-- **************************************************************************************** -->
 
 <h1 id="h0" style="padding-top:16px">Document class <i>novel</i> - documentation.</h1>
-<p>V. 2.00, 2024/02/16</p>
+<p>V. 2.1, 2024/02/17</p>
 
 <p class="item">ALERT: If you have been using this document class prior to version 1.80 (February 2023),
 see <a href="#hZ">Appendix Z</a>.</p>
@@ -538,20 +538,31 @@ Expected in early 2024.</p>
 
 <h4 id="h1.1.3">1.1.3. Language Support. CHANGED IN VERSION 2.</h4>
 <div class="d4" id="d1.1.3">
-<p class="item">Prior to version 2 (February 2024), the polyglossia package was the only
-method for language support. With version 2, you may use babel instead.</p>
-<p>To use version 2, write <code>v2</code> as d document class option, along with your choice
-of babel language option(s). You may also use other novel class options, as before.</p>
-<p>Example: <code>\documentclass[v2,french]{novel}</code>.</p>
-<p>If you do not write <code>v2</code> as option, then any language will be ignored there,
-and polyglossia will load instead. That was the behavior prior to version 2.</p>
+<p class="item"><b>A.</b> Prior to version 2 (February 2024), the polyglossia package was the only
+method for language support. With version 2, you may use either polyglossia or babel.</p>
+<p class="item"><b>B.</b> Do not write <code>\usepackage</code> or <code>\RequirePackage</code>
+for polyglossia or babel. The correct package will be loaded automatically.</p>
+<p class="item"><b>C.</b> To use polyglossia, write
+<code>\setmainlanguage[<i>options</i>]{<i>language</i>}</code> in preamble.
+You may also use other polyglossia commands. Do not use the document class options
+to set language. See the polyglossia package documentation.</p>
+<p class="item"><b>D.</b> To use babel, write <code>v2</code> as a document class option, along with your choice
+of babel language options. See babel documentation.</p>
+<p class="item"><b>E.</b> If you do not choose either method, then the default language
+will be US English, using polyglossia.</p>
+<p class="item"><b>F.</b> Some examples:</p>
+<p>&bull; <code>\documentclass{novel}</code> Polyglossia.</p>
+<p><span style="visibility:hidden">&bull;</span> <code>\setmainlanguage{french}</code>. french.</p>
+<p>&bull; <code>\documentclass[v2,french]{novel}</code>. Babel, french.</p>
+<p>&bull; <code>\documentclass[french]{novel}</code>. Uses polyglossia, because no <code>v2</code>
+as class option. The request for <code>french</code> is ignored, and triggers
+"unknown class option".</p>
 </div><!-- end 1.1.3 -->
 
 <h4 id="h1.1.4">1.1.4. Use Open Type Fonts</h4>
 <div class="d4" id="d1.1.4">
 <p class="item"><b>A.</b> The built-in <i>fontspec</i> package requires utf-8 encoding. It is able to load Open Type fonts, and access their internal feature sets. Forget Type 1 fonts and special encodings! If you wish to use Greek or Cyrillic, all you need are compatible fonts.</p>
 <p class="item"><b>B.</b> If you accept the pre-configured fonts (from package <i>libertinus-fonts</i>), then you do not need to know anything about <i>fontspec</i>. But if you wish to configure your own fonts, <a href="#hE">Appendix E</a> reviews the most important parts of <i>fontspec</i> syntax.</p>
-<div style="clear:both"></div>
 </div><!-- end 1.1.4 -->
 
 <h4 id="h1.1.5">1.1.5. Read About Book Design</h4>
@@ -3121,12 +3132,12 @@ Some text {\baskf\addfontfeature{Numbers=Monospaced} hello 123} is here.
 <div id="pageZ" class="page">
 
 
-<h2 id="hZ">Appendix Z. &nbsp; Changes in v.2.00.</h2>
+<h2 id="hZ">Appendix Z. &nbsp; Changes in v.2.1.</h2>
 <div class="d2" id="dZ">
 
 <h4>Important Changes</h4>
 <div class="d3">
-<p>Version 2.00 (2024) Added choice babel/polyglossia. Revised uuid.</p>
+<p>Version 2.1  (2024) Added choice babel/polyglossia. Revised uuid.</p>
 <p>Version 1.86 (2024) docs edited.</p>
 <p>Version 1.84 (2023) docs edited. Probably final update.</p>
 <p>Version 1.83 (2023) corrected minor typo. Will not affect most users.</p>
diff --git a/macros/luatex/latex/novel/doc/novel.pdf b/macros/luatex/latex/novel/doc/novel.pdf
index afe784e6e5..181ab08a5c 100644
--- a/macros/luatex/latex/novel/doc/novel.pdf
+++ b/macros/luatex/latex/novel/doc/novel.pdf
@@ -8,10 +8,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>2024-02-16T08:29:32-08:00</xmp:ModifyDate>
-       <xmp:CreateDate>2024-02-16T08:29:32-08:00</xmp:CreateDate>
+       <xmp:ModifyDate>2024-02-16T20:46:42-08:00</xmp:ModifyDate>
+       <xmp:CreateDate>2024-02-16T20:46:42-08:00</xmp:CreateDate>
        <xmp:CreatorTool>LuaLaTeX with novel and microtype</xmp:CreatorTool>
-      <xmp:MetadataDate>2024-02-16T08:29:32-08:00</xmp:MetadataDate>
+      <xmp:MetadataDate>2024-02-16T20:46:42-08:00</xmp:MetadataDate>
      </rdf:Description>
      <rdf:Description rdf:about=""
          xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -25,7 +25,7 @@ stream
      <rdf:Description rdf:about=""
          xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
        <xmpMM:DocumentID>uuid:8be8dbc2-8185-4bd3-89d9-3e8e2e6caf20</xmpMM:DocumentID>
-       <xmpMM:InstanceID>uuid:fe42ffd2-8326-4588-8b41-6b5184d4ec27</xmpMM:InstanceID>
+       <xmpMM:InstanceID>uuid:07b883d2-6d54-4e3f-8435-88147e89e625</xmpMM:InstanceID>
        <xmpMM:RenditionClass>default</xmpMM:RenditionClass>
        <xmpMM:VersionID>1</xmpMM:VersionID>
      </rdf:Description>
@@ -49,7 +49,7 @@ stream
 endstream
 endobj
 7 0 obj
-<< /Length 8456 >>       
+<< /Length 8460 >>       
 stream
 0 g 0 G
 0 g 0 G
@@ -60,7 +60,7 @@ BT
 /F95 13.62884 Tf
 1 0 0 1 105.124 508.167 Tm [<0022>-250<00250050>-7<00440056004E0046004F0055>-250<0024004D004200540054>-250<004700500053>-250<005500490046>-250<0033004600540055>-250<00500047>-250<00360054>]TJ
 /F95 11.3574 Tf
-1 0 0 1 141.246 493.372 Tm [<0037>80<004600530054004A0050004F>-250<09CA000F09C809C8>-250<00090027004600430053005600420053>-15<005A>-250<09CA09C809CA09CC000A>]TJ
+1 0 0 1 139.997 493.372 Tm [<0037>80<004600530054004A0050004F>-250<09CA000F09C8000F09C9>-250<00090027004600430053005600420053>-15<005A>-250<09CA09C809CA09CC000A>]TJ
 /F97 11.3574 Tf
 1 0 0 1 53.421 446.202 Tm [<0038004900460053>8<0046>-250<004A0054>-250<005500490046>-250<00450050>-7<00440056004E0046004F005500420055004A0050004F00200020>]TJ
 /F95 11.3574 Tf
@@ -421,44 +421,44 @@ endobj
 << /Type /Catalog /Pages 11 0 R /Metadata 4 0 R/OutputIntents [ <</Type/OutputIntent/S/GTS_PDFX/OutputCondition (SWOP (Publication) printing in USA (Printing process definition: ANSI CGATS.6).)/OutputConditionIdentifier (CGATS TR 001)/Info (U.S. Web Coated (SWOP) v2)/RegistryName (http://www.color.org)>> ] >>
 endobj
 31 0 obj
-<<  /Title(Novel\040Document\040Class)/Creator(LuaLaTeX\040with\040novel\040and\040microtype)/CreationDate(D:20240216082932-08'00')/ModDate(D:20240216082932-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:20240216204642-08'00')/ModDate(D:20240216204642-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 32
 0000000000 65535 f 
-0000011462 00000 n 
-0000011482 00000 n 
-0000011502 00000 n 
+0000011466 00000 n 
+0000011486 00000 n 
+0000011506 00000 n 
 0000000020 00000 n 
-0000011319 00000 n 
-0000011167 00000 n 
+0000011323 00000 n 
+0000011171 00000 n 
 0000002652 00000 n 
-0000030846 00000 n 
-0000019433 00000 n 
-0000014089 00000 n 
-0000031211 00000 n 
-0000011555 00000 n 
-0000013000 00000 n 
-0000011634 00000 n 
-0000011705 00000 n 
-0000013242 00000 n 
-0000014248 00000 n 
-0000014453 00000 n 
-0000018160 00000 n 
-0000014631 00000 n 
-0000014703 00000 n 
-0000018399 00000 n 
-0000019589 00000 n 
-0000019792 00000 n 
-0000029062 00000 n 
-0000020128 00000 n 
-0000020503 00000 n 
-0000029303 00000 n 
-0000031005 00000 n 
-0000031272 00000 n 
-0000031599 00000 n 
+0000030850 00000 n 
+0000019437 00000 n 
+0000014093 00000 n 
+0000031215 00000 n 
+0000011559 00000 n 
+0000013004 00000 n 
+0000011638 00000 n 
+0000011709 00000 n 
+0000013246 00000 n 
+0000014252 00000 n 
+0000014457 00000 n 
+0000018164 00000 n 
+0000014635 00000 n 
+0000014707 00000 n 
+0000018403 00000 n 
+0000019593 00000 n 
+0000019796 00000 n 
+0000029066 00000 n 
+0000020132 00000 n 
+0000020507 00000 n 
+0000029307 00000 n 
+0000031009 00000 n 
+0000031276 00000 n 
+0000031603 00000 n 
 trailer
-<< /Size 32 /Root 30 0 R /Info 31 0 R /ID [ <5828568D4751CD080DCDD3C64B1EDDCD> <5828568D4751CD080DCDD3C64B1EDDCD> ] >>
+<< /Size 32 /Root 30 0 R /Info 31 0 R /ID [ <D7D34C8ADBD93CEEFC0DDE591F50331E> <D7D34C8ADBD93CEEFC0DDE591F50331E> ] >>
 startxref
-31923
+31927
 %%EOF
diff --git a/macros/luatex/latex/novel/doc/novel.tex b/macros/luatex/latex/novel/doc/novel.tex
index 50e81a5baa..91f2ffb290 100644
--- a/macros/luatex/latex/novel/doc/novel.tex
+++ b/macros/luatex/latex/novel/doc/novel.tex
@@ -12,7 +12,7 @@
 %   novel.pdf (if present) have read/write permissions for any user.
 %   Otherwise, compile may fail at the point where files are written.
 
-\documentclass[v2]{novel} % v. 2.00.
+\documentclass{novel} % v. 2.1.
 % Almost all settings are defaults.
 \SetHeadFootStyle{3}
 \SetTitle{Novel Document Class} % only footer, with page number
@@ -26,7 +26,7 @@
 \ChapterTitle{NOVEL}
 \vspace{\nbs}
 \ChapterSubtitle{A Document Class for the Rest of Us}
-{\centering Version 2.00 (February 2024)\par}
+{\centering Version 2.0.1 (February 2024)\par}
 \end{ChapterStart}
 
 \textbf{Where is the documentation??} It is HTML.\\
diff --git a/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo b/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo
index 29dac06b40..35ed97ea57 100644
--- a/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo
+++ b/macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo
@@ -2,7 +2,7 @@
 %% The values of the arguments are public industry standards.
 %%
 \ProvidesFile{novel-CGATSTR001.clo}%
-[2024/02/16 any version. (novel Output Intent CGATS TR 001)]
+[2024/02/17 any version. (novel Output Intent CGATS TR 001)]
 %%
 
 % Typically used in the USA.
diff --git a/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty b/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty
index 5d607de9f1..c99872fbb3 100644
--- a/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/ 
 %%
 \ProvidesFile{novel-CalculateLayout.sty}%
-[2024/02/16 v2.00 LaTeX file (layout calculations)]
+[2024/02/17 v2.1 LaTeX file (layout calculations)]
 %%
 
 %%
diff --git a/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty b/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty
index 672a5ee5b0..df53dfc96e 100644
--- a/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-ChapterScene.sty}%
-[2024/02/16 v2.00 LaTeX file (chapter and scene macros)]
+[2024/02/17 v2.1 LaTeX file (chapter and scene macros)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-DropCap.sty b/macros/luatex/latex/novel/lualatex/novel-DropCap.sty
index 9f7094fc90..6e2359b465 100644
--- a/macros/luatex/latex/novel/lualatex/novel-DropCap.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-DropCap.sty
@@ -9,7 +9,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-DropCap.sty}%
-[2024/02/16 v2.00 (Drop Caps)]
+[2024/02/17 v2.1 (Drop Caps)]
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %
 %
diff --git a/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo b/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo
index a4e3e30606..c2cd2c3314 100644
--- a/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo
+++ b/macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo
@@ -1,7 +1,7 @@
 %% This is file `novel-FOGRA39.clo', part of `novel' document class.
 %% The values of the arguments are public industry standards.
 \ProvidesFile{novel-FOGRA39.clo}%
-[2024/02/16 any version. (novel Output Intent FOGRA39)]
+[2024/02/17 any version. (novel Output Intent FOGRA39)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-FileData.sty b/macros/luatex/latex/novel/lualatex/novel-FileData.sty
index 474ede64a1..54d4c3a7f9 100644
--- a/macros/luatex/latex/novel/lualatex/novel-FileData.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-FileData.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-FileData.sty}%
-[2024/02/16 v2.00 LaTeX file (File Data settings)]
+[2024/02/17 v2.1 LaTeX file (File Data settings)]
 %% 
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-Fonts.sty b/macros/luatex/latex/novel/lualatex/novel-Fonts.sty
index 7ad8209c4a..b5b27b3aac 100644
--- a/macros/luatex/latex/novel/lualatex/novel-Fonts.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-Fonts.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-Fonts.sty}%
-[2024/02/16 v2.00 LaTeX file (font settings and defaults)]
+[2024/02/17 v2.1 LaTeX file (font settings and defaults)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty b/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty
index c3c75067f2..abfa3a4042 100644
--- a/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-Footnotes.sty
@@ -7,7 +7,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-Footnotes.sty}%
-[2024/02/16 v2.00 LaTeX file (commands for footnotes and endnotes)]
+[2024/02/17 v2.1 LaTeX file (commands for footnotes and endnotes)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty b/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty
index 86f69bd8c9..5b0f063d8f 100644
--- a/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-HeadFootStyles.sty}%
-[2024/02/16 v2.00 LaTeX file (header and footer layouts and styles)]
+[2024/02/17 v2.1 LaTeX file (header and footer layouts and styles)]
 %% 
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-Images.sty b/macros/luatex/latex/novel/lualatex/novel-Images.sty
index da054d4385..ab891595f2 100644
--- a/macros/luatex/latex/novel/lualatex/novel-Images.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-Images.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-Images.sty}%
-[2024/02/16 v2.00 LaTeX file (image placement)]
+[2024/02/17 v2.1 LaTeX file (image placement)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-JC200103.clo b/macros/luatex/latex/novel/lualatex/novel-JC200103.clo
index b422f3af32..06ba7d98de 100644
--- a/macros/luatex/latex/novel/lualatex/novel-JC200103.clo
+++ b/macros/luatex/latex/novel/lualatex/novel-JC200103.clo
@@ -2,7 +2,7 @@
 %% The values of the arguments are public industry standards.
 %%
 \ProvidesFile{novel-JC200103.clo}%
-[2024/02/16 any version. (novel Output Intent JC200103)]
+[2024/02/17 any version. (novel Output Intent JC200103)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty b/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty
index 5ccdac3471..7dba9a0dd1 100644
--- a/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-LayoutSettings.sty}%
-[2024/02/16 v2.00 LaTeX file (layout settings)]
+[2024/02/17 v2.1 LaTeX file (layout settings)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty b/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty
index b47e9e0d3f..68b269535e 100644
--- a/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-PostLayout.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-PostLayout.sty}%
-[2024/02/16 v2.00 LaTeX file (post-layout modifications)]
+[2024/02/17 v2.1 LaTeX file (post-layout modifications)]
 %%
 
 %%
diff --git a/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty b/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty
index ff0978735a..2045a31ab5 100644
--- a/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-Sandbox.sty
@@ -11,7 +11,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-Sandbox.sty}%
-[2024/02/16 v2.00 LaTeX file (used only with sandbox class option)]
+[2024/02/17 v2.1 LaTeX file (used only with sandbox class option)]
 %%
 
 %%
diff --git a/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty b/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty
index fd080cc247..b30e2e814b 100644
--- a/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-TextMacros.sty
@@ -6,7 +6,7 @@
 %% License URL:  https://www.latex-project.org/lppl/lppl-1-3c/
 %%
 \ProvidesFile{novel-TextMacros.sty}%
-[2024/02/16 v2.00 LaTeX file (text macros usable within document body)]
+[2024/02/17 v2.1 LaTeX file (text macros usable within document body)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-microtype.cfg b/macros/luatex/latex/novel/lualatex/novel-microtype.cfg
index d0dab63518..2cbac7bf30 100644
--- a/macros/luatex/latex/novel/lualatex/novel-microtype.cfg
+++ b/macros/luatex/latex/novel/lualatex/novel-microtype.cfg
@@ -10,7 +10,7 @@
 %% ------------------------------------------------------------------------ 
 %%
 \ProvidesFile{novel-microtype.cfg}%
-[2024/02/16 any version. (default microtype configuration for novel class)]
+[2024/02/17 any version. (default microtype configuration for novel class)]
 
 %%% ---------------------------------------------------------------------------
 %%% FONT SETS
diff --git a/macros/luatex/latex/novel/lualatex/novel-pdfx.sty b/macros/luatex/latex/novel/lualatex/novel-pdfx.sty
index 5c91a405b0..5edcb5d212 100644
--- a/macros/luatex/latex/novel/lualatex/novel-pdfx.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-pdfx.sty
@@ -16,7 +16,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{novel-pdfx.sty}%
-[2024/02/16 v2.00 LaTeX file (PDF/X support for novel class)]
+[2024/02/17 v2.1 LaTeX file (PDF/X support for novel class)]
 % This package supports, and is part of, class `novel'.
 % No support for anything but LuaLaTeX.
 
diff --git a/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty b/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty
index 0251b4f3ab..5326f25249 100644
--- a/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty
+++ b/macros/luatex/latex/novel/lualatex/novel-xmppacket.sty
@@ -14,7 +14,7 @@
 %% ----------------------------------------------------------------------------
 %%
 \ProvidesFile{novel-xmppacket.sty}%
-[2024/02/16 any version. (novel XMP packet template)]
+[2024/02/17 any version. (novel XMP packet template)]
 %%
 
 
diff --git a/macros/luatex/latex/novel/lualatex/novel.cls b/macros/luatex/latex/novel/lualatex/novel.cls
index 4d0ce25da7..51ba0094c6 100644
--- a/macros/luatex/latex/novel/lualatex/novel.cls
+++ b/macros/luatex/latex/novel/lualatex/novel.cls
@@ -8,7 +8,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 % Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016.
-\ProvidesClass{novel}[2024/02/16 v2.00 LaTeX document class]
+\ProvidesClass{novel}[2024/02/17 v2.1 LaTeX document class]
 %%
 
 %% During the years since `novel' was introduced, there have been
@@ -22,8 +22,11 @@
 %% In addition to a minimal LaTeX setup, with luatex, you will need these:
 %% textpos magaz xcolor adjustbox eso-pic pdfpages unicode-math fp iftex
 %% libertinus-fonts makecmds xkeyval lm-math xstring xifthen silence
-%% collectbox pgf lipsum wrapfig pdflscape microtype hyperref babel
+%% collectbox pgf lipsum wrapfig pdflscape microtype hyperref
 %% You will need language support, for your language(s).
+%% Default support is polyglossia. Write \setmainlanguage[options]{language}
+%% in preamble. Alternative babel, write `v2' as a document class option,
+%% and write choice of language as a document class option.
 %% If using lipsum, you will need hyphen-latin.
 
 
@@ -68,6 +71,7 @@
     Command line:  lualatex your-document.tex}
 \fi
 \pdfimageresolution=300 % default dpi if image does not say
+\nofiles
 %
 \RequirePackage{etoolbox} % general good stuff
 \RequirePackage{xifthen} % improved ifthenelse handling
@@ -128,35 +132,8 @@
 %% ----------------------------------------------------------------------------
 % Allowed option list:
 %   draft xml shademargins cropmarks cropview closecrop
-%   coverart sandbox unblock mtoff test revert v2 (with babel languages)
-% Yes, I realize that this could have been done another way, but I want
-%   to issue error messages from `novel' rather than (say) `keyval':
-\gdef\@mycol{\@classoptionslist,}
-\StrDel{\@mycol}{ }[\@mycol]
-\StrDel{\@mycol}{revert,}[\@mycol]
-\StrDel{\@mycol}{draft,}[\@mycol]
-\StrDel{\@mycol}{xml,}[\@mycol]
-\StrDel{\@mycol}{shademargins,}[\@mycol]
-\StrDel{\@mycol}{graytext,}[\@mycol] % Obsolete. Now always allows graytext.
-\StrDel{\@mycol}{greytext,}[\@mycol] % See above.
-\StrDel{\@mycol}{cropmarks,}[\@mycol]
-\StrDel{\@mycol}{cropview,}[\@mycol]
-\StrDel{\@mycol}{closecrop,}[\@mycol]
-\StrDel{\@mycol}{coverart,}[\@mycol]
-\StrDel{\@mycol}{unblock,}[\@mycol]
-\StrDel{\@mycol}{mtoff,}[\@mycol]
-\StrDel{\@mycol}{test,}[\@mycol]
-\StrDel{\@mycol}{sandbox,}[\@mycol]
-%
-\newif\ifusing@babel % New in novel version 2.
-\IfSubStr{\@mycol}{v2}{
-  \StrDel{\@mycol}{v2,}[\@mycol]
-  \ifthenelse{\equal{\@mycol}{}}{\def\@mycol{american}}{}
-  \RequirePackage[\@mycol]{babel}
-}{
-  \RequirePackage{polyglossia}
-  \setmainlanguage[variant=american]{english}
-}
+%   coverart sandbox unblock mtoff test revert v2 (babel languages)
+% Version 2 change allows language support from polyglossia or babel.
 % Version 1.80 has minor tweaks. Option `revert' for version 1.52 behavior.
 \newif \if@novrevert
 \DeclareOption{revert}{\@novreverttrue}
@@ -222,7 +199,8 @@
 % Option test. Primarily for developer use.
 \newif \if@testsuite
 \DeclareOption{test}{\@testsuitetrue}
-\DeclareOption{v2}{\using@babeltrue}
+\newif \ifusing@vtwo
+\DeclareOption{v2}{\using@vtwotrue} % Reserved for future use.
 %
 % Option sandbox. for artwork and tables. Max 4 pages.
 \newif \if@sandbox
@@ -299,7 +277,7 @@
 % In draft mode only, the `shademargins' option requires `grayscale',
 %   which will be temporarily enabled, even if not specifically requested.
 %
-\RequirePackage[gray,hyperref]{xcolor}
+\RequirePackage[gray]{xcolor}
 %
 % adjustbox and eso-pic cannot precede xcolor.
 \RequirePackage{adjustbox} % for scaling and moving
@@ -321,6 +299,20 @@
   \@setfontsize\normalsize{\@TentativeEmN}{\@TentativeBLSkipN}%
 }
 \normalsize
+%%
+\ifusing@vtwo\else
+  \RequirePackage{polyglossia}
+  \ExplSyntaxOn
+  \pretocmd\xpg@set@alias@values{%
+	\prop_if_exist:cF { xpg@alias@keyvals@#1@#4 }
+	{ \prop_new:c {xpg@alias@keyvals@#1@#4} }
+  }{}{}
+  \ExplSyntaxOff
+  \setmainlanguage[variant=american]{english}
+\fi
+%%
+
+
 \RequirePackage[no-math]{fontspec} % For LuaLaTeX. NOT package `fontenc'.
 % The `novel' class is not intended for math. But TeX assumes you do math,
 %   so it needs a math font, whether you like it or not.
@@ -434,6 +426,11 @@
   \RequirePackage{novel-PostLayout} % calculates shademargins, cropmarks, etc.
   \RequirePackage{novel-pdfx}% also provides an \AtBeginDocument macro
   \@GetInitialYpos% in `novel-TextMacros.sty
+  \ifdefined\setmainlanguage\else
+    \ifusing@vtwo
+      \@ifpackageloaded{babel}{}{\RequirePackage[american]{babel}}
+    \fi
+  \fi
 }%
 %% end AtEndPreamble
 
@@ -622,10 +619,6 @@
 \AtEndDocument{%
   \if@coverart\else%
     \if@sandbox\else%
-      \immediate\write\@auxout{%
-        \string\xdef\string\@AllGoodImages{\@AllGoodImages}^^J%
-        \string\xdef\string\@UnknownImages{\@UnknownImages}^^J%
-      }%
       \ifnocle@rtoend\else\cleartoend\fi%
     \fi%
   \fi%
author	Norbert Preining <norbert@preining.info>	2024-02-18 03:01:45 +0000
committer	Norbert Preining <norbert@preining.info>	2024-02-18 03:01:45 +0000
commit	a3b386e8476527e1b87ec71f7156cd7751f8f325 (patch)
tree	cd6442374d94f7e42f3d8e2c018a448aacedb846 /macros/luatex/latex/novel
parent	8886ad587a305595ce543a74b0fc779f0732a6e9 (diff)