From a4e9c5d7905538e43846cfce2a67a41ccb495f9f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Jan 2018 22:25:57 +0000 Subject: novel (13jan18) git-svn-id: svn://tug.org/texlive/trunk@46301 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/lualatex/novel/novel-CGATSTR001.clo | 2 +- .../tex/lualatex/novel/novel-CalculateLayout.sty | 2 +- .../tex/lualatex/novel/novel-ChapterScene.sty | 2 +- .../tex/lualatex/novel/novel-FOGRA39.clo | 2 +- .../tex/lualatex/novel/novel-FileData.sty | 2 +- .../tex/lualatex/novel/novel-FontDefaults.sty | 2 +- .../tex/lualatex/novel/novel-Footnotes.sty | 2 +- .../tex/lualatex/novel/novel-HeadFootStyles.sty | 2 +- .../texmf-dist/tex/lualatex/novel/novel-Images.sty | 14 ++-- .../tex/lualatex/novel/novel-JC200103.clo | 2 +- .../tex/lualatex/novel/novel-LayoutSettings.sty | 10 +-- .../tex/lualatex/novel/novel-TextMacros.sty | 2 +- .../tex/lualatex/novel/novel-glyphtounicode.tex | 90 ---------------------- .../tex/lualatex/novel/novel-microtype.cfg | 2 +- .../texmf-dist/tex/lualatex/novel/novel-pdfx.sty | 16 ++-- .../tex/lualatex/novel/novel-xmppacket.sty | 2 +- Master/texmf-dist/tex/lualatex/novel/novel.cls | 2 +- 17 files changed, 28 insertions(+), 128 deletions(-) delete mode 100644 Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex (limited to 'Master/texmf-dist/tex/lualatex') diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo index 4763ffe1266..9d1d8787ac5 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo +++ b/Master/texmf-dist/tex/lualatex/novel/novel-CGATSTR001.clo @@ -1,4 +1,4 @@ -% Typically used in the USA. Novel file version 1.46 +% Typically used in the USA. Novel file version 1.46.2 % The values of the arguments are public industry standards. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty index 5dc925e441f..90904b3b09b 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-CalculateLayout.sty @@ -12,7 +12,7 @@ %% %% \ProvidesFile{novel-CalculateLayout.sty}% -[2017/11/29 v1.46.1 LaTeX file (layout calculations)] +[2018/01/14 v1.46.2 LaTeX file (layout calculations)] %% %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty index d1c1110edcc..e13eb3e33f4 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-ChapterScene.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-ChapterScene.sty}% -[2017/11/29 v1.46.1 LaTeX file (chapter and scene macros)] +[2018/01/14 v1.46.2 LaTeX file (chapter and scene macros)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo index 83e85fa8d56..e5d7bfa9f4e 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo +++ b/Master/texmf-dist/tex/lualatex/novel/novel-FOGRA39.clo @@ -1,4 +1,4 @@ -% Typically used in Europe. Novel file version 1.46 +% Typically used in Europe. Novel file version 1.46.2 % The values of the arguments are public industry standards. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty index 32453682baa..4cf322f3bdb 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-FileData.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-FileData.sty}% -[2017/11/29 v1.46.1 LaTeX file (File Data settings)] +[2018/01/14 v1.46.2 LaTeX file (File Data settings)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty index 7864a0d74a5..44b1478107f 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-FontDefaults.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-FontDefaults.sty}% -[2017/11/29 v1.46.1 LaTeX file (default fonts)] +[2018/01/14 v1.46.2 LaTeX file (default fonts)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty index 62463021466..a2d01335dd5 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-Footnotes.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-Footnotes.sty}% -[2017/11/29 v1.46.1 LaTeX file (commands for footnotes and endnotes)] +[2018/01/14 v1.46.2 LaTeX file (commands for footnotes and endnotes)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty index 2ae55e608c4..d86b923f011 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-HeadFootStyles.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-HeadFootStyles.sty}% -[2017/11/29 v1.46.1 LaTeX file (header and footer layouts and styles)] +[2018/01/14 v1.46.2 LaTeX file (header and footer layouts and styles)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty index c0073154cf1..7a67b44bd22 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-Images.sty @@ -13,13 +13,13 @@ %% %% \ProvidesFile{novel-Images.sty}% -[2017/11/29 v1.46.1 LaTeX file (image placement)] +[2018/01/14 v1.46.2 LaTeX file (image placement)] %% %% %% Be sure to read the separate documentation about how to prepare images. -%% In general: (1) png or jpg only. (2) Flattened, no transparency. +%% In general: (1) png, jpg only. (2) Flattened, no transparency. %% (3) 300dpi (grayscale) or 600dpi (black/white) are industry norms. %% (4) Image file must contain its resolution. (5) Exact size, without scaling. %% (6) No private metadata. (7) Be sure grayscale is 1-channel, not rgb gray. @@ -112,8 +112,8 @@ \if@imgExtOK\else% \ClassError{novel}{^^JImage~`#3'~format~not~allowed}% {^^JImage~`#3'~has~file~type~not~allowed~in~`novel'~class.^^J% - Must~have~file~extension~png,~jpg,~jpeg~(or~capitalized).^^J% - Others~such~as~pdf~bmp,~tiff,~eps,~pdf,~svg~are~not~allowed.^^J}% + Must~have~file~extension~png,~jpg,~jpeg,~(or~capitalized).^^J% + Others~such~as~bmp,~tiff,~pdf,~eps,~svg~are~not~allowed.^^J}% \fi% \StrDel{#2}{\space}[\@myila]% \StrCut{\@myila}{,}{\@myilxa}{\@myilya}% @@ -133,8 +133,6 @@ \iftoggle{@inheadfoot}{}{% \setlength\imageheight{\@imageheight}% \global\imageheight=\imageheight% - \typeout{^^JClass~`novel'~Info:~An~image~was~placed~on~page~\thepage.^^J% - Review~layout~to~ensure~that~it~does~not~overflow~into~margins.^^J}% }% % \setlength\@imagehoffset{\@myilx}% @@ -207,8 +205,8 @@ \if@imgExtOK\else% \ClassError{novel}{^^JImage~`#2'~format~not~allowed,~page~\thepage}% {^^JImage~`#2'~has~file~type~not~allowed~in~`novel'~class.^^J% - Must~have~file~extension~png,~jpg,~jpeg~(or~capitalized).^^J% - Others~such~as~pdf~bmp,~tiff,~eps,~pdf,~svg~are~not~allowed.^^J}% + Must~have~file~extension~png,~jpg,~jpeg,~(or~capitalized).^^J% + Others~such~as~bmp,~tiff,~pdf,~eps,~svg~are~not~allowed.^^J}% \fi% % Allows empty or blank to be used, and still provide default values: \ifthenelse{\equal{#1}{} \OR \equal{#1}{\space}}{% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo index a091ea3f41b..20f0ab0b1a3 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo +++ b/Master/texmf-dist/tex/lualatex/novel/novel-JC200103.clo @@ -1,4 +1,4 @@ -% Typically used in Japan. Novel file version 1.46 +% Typically used in Japan. Novel file version 1.46.2 % The values of the arguments are public industry standards. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty index 0ce042052dc..dc4d3d2cb52 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-LayoutSettings.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-LayoutSettings.sty}% -[2017/11/29 v1.46.1 LaTeX file (layout settings)] +[2018/01/14 v1.46.2 LaTeX file (layout settings)] %% @@ -100,9 +100,8 @@ \fi } % -% Retroactively change Trim Size after layout. See documentation: -\newcommand\ReworkTrimSize[2]{% - \if@coverart % New in version 1.2 +\newcommand\ReworkTrimSize[2]{% DEPRECATED. Works, but removed from docs. + \if@coverart % \ClassError{novel}{Rework command cannot be used with coverart option}% {Instead of reworking document size, you must re-do the artwork.} \else @@ -137,8 +136,7 @@ \setlength\Old@InsideMargin{#4} \setlength\New@InsideMargin{#4} } -% Retroactively change margins after layout. See documentation: -\newcommand\ReworkMargins[4]{ +\newcommand\ReworkMargins[4]{ % DEPRECATED. Works, but removed from docs. \if@coverart % New in version 1.2 \ClassError{novel}{Rework command cannot be used with coverart option}% {Instead of reworking document size, you must re-do the artwork.} diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty index 8346676bbb8..32f874c2348 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-TextMacros.sty @@ -13,7 +13,7 @@ %% %% \ProvidesFile{novel-TextMacros.sty}% -[2017/11/29 v1.46.1 LaTeX file (text macros usable within document body)] +[2018/01/14 v1.46.2 LaTeX file (text macros usable within document body)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex b/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex deleted file mode 100644 index 05f68643182..00000000000 --- a/Master/texmf-dist/tex/lualatex/novel/novel-glyphtounicode.tex +++ /dev/null @@ -1,90 +0,0 @@ -%% -%% This is file `novel-glyphtounicode.tex', part of class `novel'. -%% Copyright 2017 Robert Allgeyer. -%% -%% Additional glyph to unicode lookups, for Open Type ligatures. -%% -%% This file may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3c -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% -\ProvidesFile{novel-gyphtounicode.tex}% -[2017/11/29 v1.46.1 LaTeX file (additional glyph to unicode)] -%% - -%% I am not sure if this is useful. But it doesn't hurt. - - -\begingroup -\catcode`\_=12 % so that underscore can be used in ligature names - - -\pdfglyphtounicode{f_f}{0066 0066} -\pdfglyphtounicode{f_i}{0066 0069} -\pdfglyphtounicode{f_l}{0066 006C} -\pdfglyphtounicode{f_f_i}{0066 0066 0069} -\pdfglyphtounicode{f_f_l}{0066 0066 006C} - -\pdfglyphtounicode{f_j}{0066 006A} -\pdfglyphtounicode{f_f_j}{0066 0066 006A} - -\pdfglyphtounicode{f_t}{0066 0074} -\pdfglyphtounicode{f_f_t}{0066 0066 0074} - -\pdfglyphtounicode{f_b}{0066 0062} -\pdfglyphtounicode{f_f_b}{0066 0066 0062} - -\pdfglyphtounicode{f_k}{0066 006B} -\pdfglyphtounicode{f_f_k}{0066 0066 006B} - -\pdfglyphtounicode{f_h}{0066 0068} -\pdfglyphtounicode{f_f_h}{0066 0066 0068} - -\pdfglyphtounicode{g_g}{0067 0067} - -\pdfglyphtounicode{s_s}{0073 0073} -\pdfglyphtounicode{s_t}{0073 0074} -\pdfglyphtounicode{t_t}{0074 0074} -\pdfglyphtounicode{c_t}{0063 0074} - -\pdfglyphtounicode{c_h}{0063 0068} -\pdfglyphtounicode{c_k}{0063 006B} -\pdfglyphtounicode{t_z}{0074 007A} - -\pdfglyphtounicode{Q_y}{0051 0079} -\pdfglyphtounicode{Q_u}{0051 0075} -\pdfglyphtounicode{Q_u_i}{0051 0075 0069} - -\pdfglyphtounicode{T_h}{0054 0068} -\pdfglyphtounicode{Tcaron_h}{0164 0068} -\pdfglyphtounicode{Tcommaaccent_h}{0162 0068} - -\pdfglyphtounicode{longs_longs}{017F 017F} -\pdfglyphtounicode{longs_h}{017F 0068} -\pdfglyphtounicode{longs_i}{017F 0069} -\pdfglyphtounicode{longs_longs_i}{017F 017F 0069} -\pdfglyphtounicode{longs_l}{017F 006C} -\pdfglyphtounicode{longs_t}{017F 0074} - -\pdfglyphtounicode{exclam_exclam}{0021 0021} -\pdfglyphtounicode{question_question}{003F 003F} -\pdfglyphtounicode{exclam_question}{0021 003F} -\pdfglyphtounicode{question_exclam}{003F 0021} - -\pdfglyphtounicode{uni3097}{3097} -\pdfglyphtounicode{uni3098}{3098} - - - - -\endgroup - - - -% End of file `novel-glyphtounicode.tex'. - diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg index 2c1ce5cc53c..0b3d8440ea2 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg +++ b/Master/texmf-dist/tex/lualatex/novel/novel-microtype.cfg @@ -19,7 +19,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{novel-microtype.cfg}% -[2017/11/29 v1.46.1 LaTeX file (microtype configuration file for novel class)] +[2018/01/14 v1.46.2 LaTeX file (microtype configuration file for novel class)] %%% ----------------------------------------------------------------------- %%% FONT SETS diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty b/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty index 623d4169f20..524c04620a3 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-pdfx.sty @@ -24,7 +24,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{novel-pdfx.sty}% -[2017/11/29 v1.46.1 LaTeX file (PDF/X support for novel class)] +[2018/01/14 v1.46.2 LaTeX file (PDF/X support for novel class)] % This package supports, and is part of, class `novel'. % No support for anything but LuaLaTeX. @@ -279,16 +279,16 @@ % Calculation of Dates and Times, which must be in a specific format. % Each time you process to PDF, the current date/time is used, % for all of the several metadata date/time strings. -\def\xmp@cDate{\pdfx@getYear} -{\catcode`\D=12 \catcode`\:=12 - \gdef\pdfx@getYear D:#1#2#3#4{\edef\pdfx@xYear{#1#2#3#4}\pdfx@getMonth} -} +% The date string begins with D: then 4 digits of year, etc. +% This definition removes the D: from front: +\gdef\pdfx@getYear#1#2#3#4#5#6{\edef\pdfx@xYear{#3#4#5#6}\pdfx@getMonth} \def\pdfx@getMonth#1#2{\edef\pdfx@xMonth{#1#2}\pdfx@getDay} \def\pdfx@getDay#1#2{\edef\pdfx@xDay{#1#2}\pdfx@getHour} \def\pdfx@getHour#1#2{\edef\pdfx@xHour{#1#2}\pdfx@getMin} \def\pdfx@getMin#1#2{\edef\pdfx@xMin{#1#2}\pdfx@getSec} \def\pdfx@getSec#1#2{\edef\pdfx@xSec{#1#2}\pdfx@getTZh} \def\pdfx@getTZh{\futurelet\pdfx@next\pdfx@getTzh@branches} +\def\xmp@cDate{\pdfx@getYear} % {\catcode`\@=11 \catcode`\Z=12 \catcode`\+=12 \catcode`\-=12 % ends below \gdef\pdfx@getTzh@branches{% @@ -397,12 +397,6 @@ \@infotopdfstring{\@infoapplication}{\@novelApplication} \@infotopdfstring{\@infoproducer}{\@novelProducer} % -% Ensure Unicode glyph names: -\input{glyphtounicode.tex} % located in tex/generic/ -\input{novel-glyphtounicode.tex} % additional ligatures -\pdfgentounicode=1 -% End ensure Unicode glyph names. -% %% End prepare PDF /Info. diff --git a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty index c3180f1a83b..0a75df000f2 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty +++ b/Master/texmf-dist/tex/lualatex/novel/novel-xmppacket.sty @@ -22,7 +22,7 @@ %% %% \ProvidesFile{novel-xmppacket.sty}% -[2017/11/29 v1.46.1 LaTeX file (novel XMP packet template)] +[2018/01/14 v1.46.2 LaTeX file (novel XMP packet template)] %% diff --git a/Master/texmf-dist/tex/lualatex/novel/novel.cls b/Master/texmf-dist/tex/lualatex/novel/novel.cls index c446dce77b5..78bdd95fbc8 100644 --- a/Master/texmf-dist/tex/lualatex/novel/novel.cls +++ b/Master/texmf-dist/tex/lualatex/novel/novel.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] % Actually needs LuaLaTeX, at least version 0.95 from TeXLive 2016. -\ProvidesClass{novel}[2017/11/29 v1.46.1 LaTeX document class] +\ProvidesClass{novel}[2018/01/14 v1.46.2 LaTeX document class] %% %% Version 1.46: Possibly final version. %% Version 1.43: General cleanup of docs and code, for improved readbaility. -- cgit v1.2.3