summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-29 20:54:18 +0000
committerKarl Berry <karl@freefriends.org>2018-05-29 20:54:18 +0000
commit1672d941a9b0a54aa2dc0b8ab41740a487608df4 (patch)
tree80f112a73cf6243e905f1ff156d681f6e5a97097
parentb662a9fb25765a931e702826962dadaf076bfd92 (diff)
isodoc (29may18)
git-svn-id: svn://tug.org/texlive/trunk@47868 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/isodoc.pdfbin1464507 -> 1532230 bytes
-rw-r--r--Master/texmf-dist/source/latex/isodoc/isodoc.dtx134
-rw-r--r--Master/texmf-dist/tex/latex/isodoc/isodoc.cls90
3 files changed, 117 insertions, 107 deletions
diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
index cccdd34021f..b630ec7884e 100644
--- a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
+++ b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
index d702e76c81d..e31f446e19b 100644
--- a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
+++ b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
@@ -19,7 +19,7 @@
% This work consists of the files isodoc.dtx and isodoc.ins
%
% \fi
-% \CheckSum{2925}
+% \CheckSum{2968}
%
% \iffalse
%<*driver>
@@ -28,21 +28,27 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{isodoc}%
%<*class>
- [2016/01/16 v1.09 isodoc class for letters and invoices]
+ [2018/05/29 v1.10 isodoc class for letters and invoices]
%</class>
%<*driver>
\documentclass{ltxdoc}
\usepackage{ctable,pdfpages,paralist,sverb,ltablex}
\usepackage[margin=20mm,left=50mm,nohead]{geometry}
-\usepackage{silence}
+\usepackage{silence,luatex85}
\WarningFilter{latex}{Marginpar on page}
\usepackage{fontspec}
-\setmainfont{Fontin-Regular}[
- BoldFont = Fontin-Bold,
- ItalicFont = Fontin-Italic,
- SmallCapsFont = Fontin-SmallCaps
-]
-\setmonofont{CMUTypewriter-Regular}
+\protrudechars=2
+\adjustspacing=2
+\newfontfeature{Microtype}{protrusion=default;expansion=default}
+\directlua{fonts.protrusions.setups.default.factor=.5}
+\setmainfont[Microtype,
+ Numbers={OldStyle, Proportional},
+ Ligatures=TeX,
+ ItalicFont=Fontin-Italic,
+ BoldFont=Fontin-Bold,
+ SmallCapsFont=Fontin-SmallCaps
+ ]{Fontin-Regular}
+\setmonofont{DejaVuSansMono}[Scale=MatchLowercase]
\usepackage{hyperref}
\IndexMin=1580pt
\hypersetup{
@@ -62,6 +68,7 @@
\includegraphics[width=.99\textwidth]{#1}\\[-.85ex]
}
}
+\def\transparent{}
\newcommand{\OPTS}[3]{
\smallskip\noindent
\subsubsection*{#1}
@@ -169,7 +176,7 @@
% - foldmarkcolor, if defined, colors foldmark
% }
% \changes{v0.08}{2010/08/24}{
-% - now compatible with XeLaTeX\\
+% - now compatible with luaLaTeX\\
% - made independent of babel and polyglossia packages:
% user must Require those, if needed\\
% - handling of font and encoding now left to the user\\
@@ -181,7 +188,7 @@
% - new translations added: italian, spanish, catalan, serbian\\
% - option fontpackage removed\\
% - option cityzip moves zip behind city\\
-% - now compatible with XeLaTeX\\
+% - now compatible with luaLaTeX\\
% - positioning of headings, subject, opening, body text fixed\\
% - repaired several minor bugs
% }
@@ -280,6 +287,9 @@
% \changes{v1.09}{2016/01/16}{
% - documentation: translations are in macros, not files
% }
+% \changes{v1.10}{2018/05/29}{
+% - honor a few luatex modifications
+% }
% \DoNotIndex{%
% \,\",\',\@auxout,\AtBeginDocument,\AtEndDocument,\AtEndOfClass,\ClassError,
% \ClassWarning,\CurrentOption,\DeclareOption,\DescribeMacro,\ForEachX,
@@ -438,7 +448,7 @@
%
% If you are not satisfied with isodoc's choices for your language, you can
% change those, but \textit{only after loading the language in the
-% preamble}, \textit{i.e.} you need to choose your language in a style file
+% preamble}, that is: you need to choose your language in a style file
% or in the |\setupdocument| statement, because otherwise isodoc will
% overwrite your changes with the definition for the |en-GB| (English)
% language.
@@ -552,7 +562,7 @@
% be translated into a date like «May 3, 2006» if the
% document language is English, or into its translation
% in the actual language. The default value is
-% «Undefined date», i.e.\ the date of \C{today} is not
+% «Undefined date», that is: the date of \C{today} is not
% the default as this would make the date untraceable
% from the document source only. However, you can force
% the use of \C{today} by providing the string |today|
@@ -1061,7 +1071,7 @@
% spacing in tables and more. |ctable| also brings us |array|, |tabularx|,
% |color|, and |xkeyval|. |eurosym| is used for the euro symbol.
% \begin{macrocode}
-\RequirePackage{ctable,xcolor,tabularx,graphicx,xstring,calc}
+\RequirePackage{xcolor,tabularx,graphicx,xstring,calc}
\RequirePackage{forarray,longtable}
% \end{macrocode}
%
@@ -1738,9 +1748,9 @@ payref;vatno;chamber}
% \begin{compactenum}
% \item yyyymmdd
% \item yyyy-mm-dd
-% \item today % i.e. the string "today" (\textit{not} |\today|!)
+% \item today % that is: the string "today" (\textit{not} |\today|!)
% \end{compactenum}
-% The resulting |\date| format depends on the language option, \textit{i.e.},
+% The resulting |\date| format depends on the language option, that is:
% the month is in that language, and the formatting is according to the
% usage in the language. The value for dd may be 00; in that case the day
% will not be reported. Some examples, assuming language=en-GB:
@@ -1833,49 +1843,49 @@ payref;vatno;chamber}
}
\def\showkeys{%
\begin{longtable}{rl}
- acceptaccount & \acceptaccount\NN
- acceptaddress & \acceptaddress\NN
- acceptcents & \acceptcents\NN
- acceptdesc & \@isodocmp{\acceptdesc}\NN
- acceptdescription & \acceptdescription\NN
- accepteuros & \accepteuros\NN
- acceptreference & \acceptreference\NN
- accountname & \accountname\NN
- accountno & \accountno\NN
- areacode & \areacode\NN
- bankname & \bankname\NN
- bic & \bic\NN
- cellphone & \cellphone\NN
- chamber & \chamber\NN
- city & \city\NN
- closing & \closing\NN
- company & \company\NN
- copyto & \@isodocmp{\copyto}\NN
- country & \country\NN
- countrycode & \countrycode\NN
- currency & \currency\NN
- email & \email\NN
- enclosures & \@isodocmp{\enclosures}\NN
- fax & \fax\NN
- iban & \iban\NN
- logoaddress & \logoaddress\NN
- opening & \opening\NN
- ourref & \ourref\NN
- payref & \payref\NN
- phone & \phone\NN
- phoneprefix & \phoneprefix\NN
- returnaddress & \@isodocmp{\returnaddress}\NN
- routingno & \routingno\NN
- signature & \@isodocmp{\signature}\NN
- street & \street\NN
- subject & \subject\NN
- term & \term\NN
- vatno & \vatno\NN
- website & \website\NN
- who & \who\NN
- yourletter & \yourletter\NN
- yourref & \yourref\NN
- zip & \zip\NN
+ acceptaccount & \acceptaccount\\
+ acceptaddress & \acceptaddress\\
+ acceptcents & \acceptcents\\
+ acceptdesc & \@isodocmp{\acceptdesc}\\
+ acceptdescription & \acceptdescription\\
+ accepteuros & \accepteuros\\
+ acceptreference & \acceptreference\\
+ accountname & \accountname\\
+ accountno & \accountno\\
+ areacode & \areacode\\
+ bankname & \bankname\\
+ bic & \bic\\
+ cellphone & \cellphone\\
+ chamber & \chamber\\
+ city & \city\\
+ closing & \closing\\
+ company & \company\\
+ copyto & \@isodocmp{\copyto}\\
+ country & \country\\
+ countrycode & \countrycode\\
+ currency & \currency\\
+ email & \email\\
+ enclosures & \@isodocmp{\enclosures}\\
+ fax & \fax\\
+ iban & \iban\\
+ logoaddress & \logoaddress\\
+ opening & \opening\\
+ ourref & \ourref\\
+ payref & \payref\\
+ phone & \phone\\
+ phoneprefix & \phoneprefix\\
+ returnaddress & \@isodocmp{\returnaddress}\\
+ routingno & \routingno\\
+ signature & \@isodocmp{\signature}\\
+ street & \street\\
+ subject & \subject\\
+ term & \term\\
+ vatno & \vatno\\
+ website & \website\\
+ who & \who\\
+ yourletter & \yourletter\\
+ yourref & \yourref\\
+ zip & \zip\\
\end{longtable}
}
% \end{macrocode}
@@ -2993,7 +3003,7 @@ cityzip
%</lettersty>
%<*logolettertex>
%<<COMMENT
-%!xelatex
+%!lualatex
%COMMENT
\documentclass[11pt,twoside]{isodoc}
\usepackage{logoletter}
@@ -3011,7 +3021,7 @@ cityzip
}
\newcommand{\letterbody}{%
This is an example of a letter made with the isodoc class.
- It has been compiled with XeLaTeX.
+ It has been compiled with luaLaTeX.
Note that the date was set to |today|, so the date above the
letter depends upon the day of compilation.
@@ -3198,7 +3208,7 @@ invoice.pdf: invoice.tex invoice.sty
letter.pdf: letter.tex letter.sty signmarked.png
texi2dvi -p -q letter.tex
logoletter.pdf: logoletter.tex logoletter.sty body.tex shiva-shakti.png signblue.png
- LATEX=xelatex texi2dvi -q logoletter.tex
+ LATEX=lualatex texi2dvi -q logoletter.tex
logo1.pdf logo2.pdf: logoletter.pdf
pdfseparate -l 2 logoletter.pdf logo%d.pdf
ntgletter.pdf: ntgletter.tex ntgletter.sty ntgcolor.png signshort.png signlong.png
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
index 977b34ecae7..8d40f94dbaf 100644
--- a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
+++ b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
@@ -20,7 +20,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{isodoc}%
- [2016/01/16 v1.09 isodoc class for letters and invoices]
+ [2018/05/29 v1.10 isodoc class for letters and invoices]
\ifx\pdfoutput\undefined\else%
\ifnum\pdfoutput=1\else%
\ClassError{isodoc}{Compile me with pdflatex, lualatex or xelatex!}{}
@@ -29,7 +29,7 @@
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions
\LoadClass{article}
-\RequirePackage{ctable,xcolor,tabularx,graphicx,xstring,calc}
+\RequirePackage{xcolor,tabularx,graphicx,xstring,calc}
\RequirePackage{forarray,longtable}
\RequirePackage[head=\baselineskip,foot=\f@size pt]{geometry}
\RequirePackage[absolute,overlay]{textpos}
@@ -391,49 +391,49 @@ payref;vatno;chamber}
}
\def\showkeys{%
\begin{longtable}{rl}
- acceptaccount & \acceptaccount\NN
- acceptaddress & \acceptaddress\NN
- acceptcents & \acceptcents\NN
- acceptdesc & \@isodocmp{\acceptdesc}\NN
- acceptdescription & \acceptdescription\NN
- accepteuros & \accepteuros\NN
- acceptreference & \acceptreference\NN
- accountname & \accountname\NN
- accountno & \accountno\NN
- areacode & \areacode\NN
- bankname & \bankname\NN
- bic & \bic\NN
- cellphone & \cellphone\NN
- chamber & \chamber\NN
- city & \city\NN
- closing & \closing\NN
- company & \company\NN
- copyto & \@isodocmp{\copyto}\NN
- country & \country\NN
- countrycode & \countrycode\NN
- currency & \currency\NN
- email & \email\NN
- enclosures & \@isodocmp{\enclosures}\NN
- fax & \fax\NN
- iban & \iban\NN
- logoaddress & \logoaddress\NN
- opening & \opening\NN
- ourref & \ourref\NN
- payref & \payref\NN
- phone & \phone\NN
- phoneprefix & \phoneprefix\NN
- returnaddress & \@isodocmp{\returnaddress}\NN
- routingno & \routingno\NN
- signature & \@isodocmp{\signature}\NN
- street & \street\NN
- subject & \subject\NN
- term & \term\NN
- vatno & \vatno\NN
- website & \website\NN
- who & \who\NN
- yourletter & \yourletter\NN
- yourref & \yourref\NN
- zip & \zip\NN
+ acceptaccount & \acceptaccount\\
+ acceptaddress & \acceptaddress\\
+ acceptcents & \acceptcents\\
+ acceptdesc & \@isodocmp{\acceptdesc}\\
+ acceptdescription & \acceptdescription\\
+ accepteuros & \accepteuros\\
+ acceptreference & \acceptreference\\
+ accountname & \accountname\\
+ accountno & \accountno\\
+ areacode & \areacode\\
+ bankname & \bankname\\
+ bic & \bic\\
+ cellphone & \cellphone\\
+ chamber & \chamber\\
+ city & \city\\
+ closing & \closing\\
+ company & \company\\
+ copyto & \@isodocmp{\copyto}\\
+ country & \country\\
+ countrycode & \countrycode\\
+ currency & \currency\\
+ email & \email\\
+ enclosures & \@isodocmp{\enclosures}\\
+ fax & \fax\\
+ iban & \iban\\
+ logoaddress & \logoaddress\\
+ opening & \opening\\
+ ourref & \ourref\\
+ payref & \payref\\
+ phone & \phone\\
+ phoneprefix & \phoneprefix\\
+ returnaddress & \@isodocmp{\returnaddress}\\
+ routingno & \routingno\\
+ signature & \@isodocmp{\signature}\\
+ street & \street\\
+ subject & \subject\\
+ term & \term\\
+ vatno & \vatno\\
+ website & \website\\
+ who & \who\\
+ yourletter & \yourletter\\
+ yourref & \yourref\\
+ zip & \zip\\
\end{longtable}
}
\AtEndOfClass{%