diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-22 21:08:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-22 21:08:59 +0000 |
commit | 15916837cb7d1e611738688cf132d91977ae99fb (patch) | |
tree | afec44db1791b6aad721043181d552c4b5863c56 | |
parent | 5c8c35e4b0a6f9a69220d617c645a3fdaeeb7ddf (diff) |
isodoc (22jun21)
git-svn-id: svn://tug.org/texlive/trunk@59676 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/isodoc/README.md | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/isodoc/isodoc.pdf | bin | 868528 -> 814485 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/isodoc/Makefile | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/isodoc/isodoc.dtx | 60 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/isodoc/isodoc.ins | 81 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/isodoc/isodoc.cls | 43 |
6 files changed, 83 insertions, 107 deletions
diff --git a/Master/texmf-dist/doc/latex/isodoc/README.md b/Master/texmf-dist/doc/latex/isodoc/README.md index 34a86831750..ce849baec36 100644 --- a/Master/texmf-dist/doc/latex/isodoc/README.md +++ b/Master/texmf-dist/doc/latex/isodoc/README.md @@ -2,8 +2,8 @@ | key | description | ---:|:--- | isodoc | LaTeX class used for typesetting of letters and invoices -|version | 1.12 -| date | 2021-02-20 +|version | 1.13 +| date | 2021-06-22 | author | Wybo Dekker | email | wybo@dekkerdocumenten.nl |license | Released under the LaTeX Project Public License v1.3c or later diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf Binary files differindex cf72b0b7dad..7c300cab73b 100644 --- a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf +++ b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf diff --git a/Master/texmf-dist/source/latex/isodoc/Makefile b/Master/texmf-dist/source/latex/isodoc/Makefile index bbf08f28900..e74cf7e05a2 100644 --- a/Master/texmf-dist/source/latex/isodoc/Makefile +++ b/Master/texmf-dist/source/latex/isodoc/Makefile @@ -33,7 +33,7 @@ files.zip: files.zip.uue uudecode files.zip.uue files.zip.uue accept.tex accept.sty invoice.tex invoice.sty letter.tex letter.sty logoletter.tex logoletter.sty ntgletter.tex ntgletter.sty: isodoc.dtx isodoc.ins luatex isodoc.ins -clean: +clean: iolang ./iolang -i 2> /dev/null echo lang iolang README Makefile files.zip{,.uue} \ {Chopin,Fontin}*.ttf acceptform.jpg body.tex listkeys.sh logo[12].pdf \ diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx index 777f91404bd..25a0034ed85 100644 --- a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx +++ b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx @@ -27,25 +27,23 @@ %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<class>\ProvidesClass{isodoc}% %<*class> - [2021/02/20 v1.12 isodoc class for letters and invoices] + [2021/06/22 v1.13 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,luatex85} +\usepackage[a4paper,margin=20mm,left=50mm,nohead]{geometry} +\usepackage{silence} \WarningFilter{latex}{Marginpar on page} \usepackage{fontspec} -\protrudechars=2 -\adjustspacing=2 -\newfontfeature{Microtype}{protrusion=default;expansion=default} -\directlua{fonts.protrusions.setups.default.factor=.5} -\setmainfont[Microtype, - Ligatures=TeX, +\usepackage{microtype} +% suppress microtype warnings - may become unnecessary with microtype > v2.8: +\makeatletter\def\MT@warn@unknown{}\makeatother +\setmainfont[Ligatures=TeX]{Fontin-Regular}[% ItalicFont=Fontin-Italic, BoldFont=Fontin-Bold, SmallCapsFont=Fontin-SmallCaps - ]{Fontin-Regular} + ] \setmonofont{DejaVuSansMono}[Scale=MatchLowercase] \usepackage{hyperref} \IndexMin=1580pt @@ -305,6 +303,11 @@ % - isodoc.ins syntax did'nt work, probably because of changes in luatex? % - small changes because of move from bitbucket to github % } +% \changes{v1.13}{2021/06/22}{ +% - Use memoir with article option for better table numbering etc. +% - Check validity of language option argument +% - Adapted to changes in new LaTeX version (headers disappeared) +% } % \DoNotIndex{% % \,\",\',\@auxout,\AtBeginDocument,\AtEndDocument,\AtEndOfClass,\ClassError, % \ClassWarning,\CurrentOption,\DeclareOption,\DescribeMacro,\ForEachX, @@ -331,11 +334,11 @@ % } % % \GetFileInfo{\jobname.dtx} -%\title{The isodoc class\thanks{This file -% describes version \fileversion, last revised \filedate.}\\ +% \title{The isodoc class\thanks{This document describes +% version \fileversion, last revised \filedate.}\\ % for letters, invoices, and more} -%\author{Wybo Dekker\thanks{E-mail: wybo@dekkerdocumenten.nl}} -%\date{Released \filedate}% +% \author{Wybo Dekker\thanks{Email: wybo@dekkerdocumenten.nl}} +% \date{\filedate}% % \maketitle % \begin{abstract}\noindent % The |isodoc| class can be used for the preparation of letters, @@ -1194,19 +1197,24 @@ % Set the language; en-GB, set at the |\EndOfClass| is the default. % \begin{macrocode} \define@key{isodoc}{language}{ - \StrSubstitute{#1}{-}{}[\@iso]\csname isodoc@\@iso\endcsname} + \StrSubstitute{#1}{-}{}[\@iso] + \ifcsname isodoc@\@iso\endcsname\csname isodoc@\@iso\endcsname\else + \ClassError{isodoc}{Unknown language #1}{} + \fi +} % \end{macrocode} % \DescribeMacro{ordinalss} % Ordinal suffixes (like st, nd, rd, th) in dates are put on the line by % default, but they can be set superscript with the |ordinalss| option: % \begin{macrocode} \define@key{isodoc}{ordinalss}[\@isodocordinalsstrue]{% - \ifx\yourlettertext\undefined% - \@isodocordinalsstrue - \else - \ClassError{isodoc}{ - You must use the ordinalss option before any language option} - \fi} + \ifx\yourlettertext\undefined% + \@isodocordinalsstrue + \else + \ClassError{isodoc}{ + You must use the ordinalss option before any language option}{} + \fi +} \newif\if@isodocordinalss\@isodocordinalssfalse % \end{macrocode} % \DescribeMacro{fill} @@ -2010,7 +2018,7 @@ accountname;payref;vatno;chamber} % |\letter| prints a letter... % The code is enclosed in an extra pair of braces, in order to keep option changes local % \begin{macrocode} -\newcommand{\letter}[2][]{{% +\newcommand{\letter}[2][]{% \clearpage{\pagestyle{empty}\cleardoublepage} \setcounter{section}{0} \setkeys{isodoc}{#1} @@ -2157,7 +2165,7 @@ accountname;payref;vatno;chamber} \end{minipage} }\fi \label{LastPageOf\thelettercount} -}} +} % end letter % \end{macrocode} % \subsection{Internal Macros} % |\isodocFootFields| creates the foot fields. Defined here so you can easily replace them @@ -3287,7 +3295,7 @@ files.zip: files.zip.uue uudecode files.zip.uue files.zip.uue accept.tex accept.sty invoice.tex invoice.sty letter.tex letter.sty logoletter.tex logoletter.sty ntgletter.tex ntgletter.sty: isodoc.dtx isodoc.ins luatex isodoc.ins -clean: +clean: iolang ./iolang -i 2> /dev/null echo lang iolang README Makefile files.zip{,.uue} \ {Chopin,Fontin}*.ttf acceptform.jpg body.tex listkeys.sh logo[12].pdf \ @@ -12728,8 +12736,8 @@ AAAADwAPAOMEAADkZAYAAAA= | key | description | ---:|:--- | isodoc | LaTeX class used for typesetting of letters and invoices -|version | 1.12 -| date | 2021-02-20 +|version | 1.13 +| date | 2021-06-22 | author | Wybo Dekker | email | wybo@dekkerdocumenten.nl |license | Released under the LaTeX Project Public License v1.3c or later diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.ins b/Master/texmf-dist/source/latex/isodoc/isodoc.ins index e7f65e50644..cdbb9d16b74 100644 --- a/Master/texmf-dist/source/latex/isodoc/isodoc.ins +++ b/Master/texmf-dist/source/latex/isodoc/isodoc.ins @@ -1,38 +1,6 @@ -%% -%% Copyright (C) 2006 by Wybo Dekker <wybo@dekkerdocumenten.nl> -%% -%% This file may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX version -%% 1999/12/01 or later. -%% \input docstrip -\askforoverwritefalse \keepsilent - -\usedir{tex/latex/isodoc} - -\preamble - -Copyright (C) 2006 by Wybo Dekker <wybo@dekkerdocumenten.nl> - -This work may be distributed and/or modified under the conditions of -the LaTeX Project Public License, either version 1.3 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.2 or later is part of all distributions of LaTeX version -2003/12/01 or later. - -\endpreamble - +\askforoverwritefalse \generate{\file{isodoc.cls}{\from{isodoc.dtx}{class}} \nopreamble\nopostamble \file{README.md}{\from{isodoc.dtx}{readme}} @@ -51,33 +19,26 @@ and version 1.2 or later is part of all distributions of LaTeX version \catcode`\ 12 \file{Makefile}{\from{isodoc.dtx}{make}} } -\directlua{ - os.rename("Makefile.tex","Makefile") -} +\directlua{os.rename("Makefile.tex","Makefile")} \obeyspaces -\Msg{************************************************************} -\Msg{* *} -\Msg{* To finish the installation you have to do the following: *} -\Msg{* *} -\Msg{* - run «make help» to see what make can do for you *} -\Msg{* *} -\Msg{* - run «make» to generate all necessary files *} -\Msg{* *} -\Msg{* - run «make inst» to install in TEXMFHOME or *} -\Msg{* *} -\Msg{* - run «sudo make install» to install in TEXMFLOCAL *} -\Msg{* *} -\Msg{* - run «make zip» to create a zip for upload to CTAN *} -\Msg{* *} -\Msg{* - run «make clean» to remove regeneratable files, except *} -\Msg{* the example files with which you can experiment *} -\Msg{* *} -\Msg{* - run «make distclean» to remove all regeneratable files *} -\Msg{* *} -\Msg{* Happy TeXing! *} -\Msg{* *} -\Msg{************************************************************} - +\Msg{============================================================} +\Msg{= To finish the installation you have to do the following: =} +\Msg{= =} +\Msg{= - run «make help» to see what make can do for you =} +\Msg{= =} +\Msg{= - run «make» to generate all necessary files =} +\Msg{= =} +\Msg{= - run «make inst» to install in TEXMFHOME or =} +\Msg{= =} +\Msg{= - run «make install» to install in TEXMFLOCAL; this uses =} +\Msg{= sudo internally, so you need sudo rights! =} +\Msg{= =} +\Msg{= - run «make zip» to create a zip for upload to CTAN =} +\Msg{= =} +\Msg{= - run «make clean» to remove regeneratable files, except =} +\Msg{= the example files with which you can experiment =} +\Msg{= =} +\Msg{= - run «make distclean» to remove all regeneratable files =} +\Msg{============================================================} \endbatchfile - diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls index e0388a81c58..4037b9d21b3 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls @@ -6,21 +6,23 @@ %% %% isodoc.dtx (with options: `class') %% -%% Copyright (C) 2006 by Wybo Dekker <wybo@dekkerdocumenten.nl> +%% IMPORTANT NOTICE: %% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.3 of this license -%% or (at your option) any later version. The latest version of this -%% license is in: +%% For the copyright see the source file. %% -%% http://www.latex-project.org/lppl.txt +%% Any modified versions of this file must be renamed +%% with new filenames distinct from isodoc.cls. %% -%% and version 1.2 or later is part of all distributions of LaTeX version -%% 2003/12/01 or later. +%% For distribution of the original source see the terms +%% for copying and modification in the file isodoc.dtx. %% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{isodoc}% - [2021/02/20 v1.12 isodoc class for letters and invoices] + [2021/06/22 v1.13 isodoc class for letters and invoices] \ifx\pdfoutput\undefined\else% \ifnum\pdfoutput=1\else% \ClassError{isodoc}{Compile me with pdflatex, lualatex or xelatex!}{} @@ -62,14 +64,19 @@ \define@key{isodoc}{cityzip}[\cityziptrue]{\cityziptrue} \newif\ifcityzip\cityzipfalse \define@key{isodoc}{language}{ - \StrSubstitute{#1}{-}{}[\@iso]\csname isodoc@\@iso\endcsname} + \StrSubstitute{#1}{-}{}[\@iso] + \ifcsname isodoc@\@iso\endcsname\csname isodoc@\@iso\endcsname\else + \ClassError{isodoc}{Unknown language #1}{} + \fi +} \define@key{isodoc}{ordinalss}[\@isodocordinalsstrue]{% - \ifx\yourlettertext\undefined% - \@isodocordinalsstrue - \else - \ClassError{isodoc}{ - You must use the ordinalss option before any language option} - \fi} + \ifx\yourlettertext\undefined% + \@isodocordinalsstrue + \else + \ClassError{isodoc}{ + You must use the ordinalss option before any language option}{} + \fi +} \newif\if@isodocordinalss\@isodocordinalssfalse \define@key{isodoc}{fill} []{\rightskip=1\rightskip} \define@key{isodoc}{nofill}[]{\rightskip=0mm plus 35mm} @@ -482,7 +489,7 @@ accountname;payref;vatno;chamber} closing={}, signature={}]{\isodoc@Tbox{35}{127}{140}{\ignorespaces#2}} } -\newcommand{\letter}[2][]{{% +\newcommand{\letter}[2][]{% \clearpage{\pagestyle{empty}\cleardoublepage} \setcounter{section}{0} \setkeys{isodoc}{#1} @@ -618,7 +625,7 @@ accountname;payref;vatno;chamber} \end{minipage} }\fi \label{LastPageOf\thelettercount} -}} +} % end letter \newcommand{\isodocFootFields}{% \footcount=35 \enlargethispage{-10mm} |