summaryrefslogtreecommitdiff
path: root/macros/luatex/latex/novel/lualatex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/latex/novel/lualatex')
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-CGATSTR001.clo2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-CalculateLayout.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-ChapterScene.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-DropCap.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-FOGRA39.clo2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-FileData.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-Fonts.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-Footnotes.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-HeadFootStyles.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-Images.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-JC200103.clo2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-LayoutSettings.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-PostLayout.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-Sandbox.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-TextMacros.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-microtype.cfg2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-pdfx.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel-xmppacket.sty2
-rw-r--r--macros/luatex/latex/novel/lualatex/novel.cls67
19 files changed, 48 insertions, 55 deletions
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%