From f4d0afdee42507adc04408c96795d46b1075306f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Jun 2015 23:21:20 +0000 Subject: isodoc (15jun15) git-svn-id: svn://tug.org/texlive/trunk@37549 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/isodoc/README | 25 +++-- .../texmf-dist/doc/latex/isodoc/accept/accept.sty | 15 +-- .../texmf-dist/doc/latex/isodoc/accept/accept.tex | 5 +- Master/texmf-dist/doc/latex/isodoc/inst | 14 ++- .../doc/latex/isodoc/invoice/invoice.sty | 47 ++++---- .../doc/latex/isodoc/invoice/invoice.tex | 2 +- Master/texmf-dist/doc/latex/isodoc/isodoc.pdf | Bin 1351938 -> 1403873 bytes .../doc/latex/isodoc/logoletter/logoletter.sty | 2 +- .../doc/latex/isodoc/logoletter/shiva-shakti.png | Bin 501950 -> 494931 bytes .../doc/latex/isodoc/ntgletter/ntgletter.sty | 4 +- .../doc/latex/isodoc/ntgletter/ntgletter.tex | 2 +- Master/texmf-dist/source/latex/isodoc/isodoc.dtx | 120 +++++++++++++-------- .../texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf | 29 +++-- .../texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf | 2 +- .../texmf-dist/tex/latex/isodoc/isodoc-sv-SE.ldf | 39 +++++++ .../tex/latex/isodoc/isodoc-template.ldf | 29 +++-- Master/texmf-dist/tex/latex/isodoc/isodoc.cls | 33 +++--- 26 files changed, 248 insertions(+), 138 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/isodoc/isodoc-sv-SE.ldf (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/isodoc/README b/Master/texmf-dist/doc/latex/isodoc/README index eb4f40231d4..a9939c017d5 100644 --- a/Master/texmf-dist/doc/latex/isodoc/README +++ b/Master/texmf-dist/doc/latex/isodoc/README @@ -1,9 +1,11 @@ -isodoc --- LaTeX class used for typesetting of letters and invoices -Author: Wybo Dekker -E-mail: wybo@dekkerdocumenten.nl -License: Released under the LaTeX Project Public License v1.3c or later -See: http://www.latex-project.org/lppl.txt -------------------------------------------------------------------------------------- +| +-------:|:-------------------------------------- + isodoc:| LaTeX class used for typesetting of letters and invoices +Version:| 1.07 + Author:| Wybo Dekker + E-mail:| wybo@dekkerdocumenten.nl +License:| Released under the LaTeX Project Public License v1.3c or later + See:| http://www.latex-project.org/lppl.txt Short description: The isodoc class is used for the preparation of letters and invoices. @@ -22,6 +24,11 @@ https://bitbucket.org/wybodekker/isodoc/downloads/isodoc.pdf Installation: Execute the inst script with the --help option for more information. -Changes in version 1.06: - - bug causing "No line here to end" error - - font and footskip warnings removed +Changes in version 1.07: + - use xcolor, not color package; minor changes in example style files + - swedish-Sweden (sv-SE) language added + - ordinal suffixes can be superscripted with ordinalss option + - removed boldface from the smallcaps invoice opening to prevent font problems + - using the term "paymentdata" instead of "accountdata", but both do work. + - improved documentation, in particular about footer fields. + - accountno did not appear (typo). diff --git a/Master/texmf-dist/doc/latex/isodoc/accept/accept.sty b/Master/texmf-dist/doc/latex/isodoc/accept/accept.sty index 99508290b94..d73ab197732 100644 --- a/Master/texmf-dist/doc/latex/isodoc/accept/accept.sty +++ b/Master/texmf-dist/doc/latex/isodoc/accept/accept.sty @@ -5,11 +5,9 @@ \RequirePackage{ucs}\RequirePackage[utf8x]{inputenc} \RequirePackage{pxfonts} -\setupdocument{% +\setupdocument{ accountname = NTG, -accountno = 1306238, areacode = 31, -bic = pstbnl21, city = Deil, closing = Met vriendelijke groet, company = NTG, @@ -20,12 +18,13 @@ email = wybo@ntg.nl, fax = 842\,234393, fold3, footer, -iban = nl05pstb0001306238, +iban = nl53ingb0001306238, opening = L.S., phone = 87\,8748496, % phone numbers without leading 0: return, signature = {Wybo Dekker,\\Treasurer NTG}, street = Deilsedijk 60, +term, website = www.ntg.nl, who = Wybo Dekker, addresscenter = 67, @@ -44,11 +43,15 @@ cityzip \rule{\hsize}{.3pt} \end{textblock} \begin{textblock}{35}[0,0](140,22) - \noindent\@hft + \noindent\footnotesize\sffamily\textcolor{headcolor}{% \ifx\undefined\tbfigures\else\tbfigures\fi \ifx\who\empty\else\who\\\fi \ifx\who\empty\else\street\\\fi - \prezip\ \zip\ \city\\ + \prezip\ \zip\ \city} + \end{textblock} + % not needed for preprinted paper: this is for example only: + \begin{textblock}{210}(0,199.5) + \noindent\includegraphics[width=210mm]{acceptform.jpg} \end{textblock} } \endinput diff --git a/Master/texmf-dist/doc/latex/isodoc/accept/accept.tex b/Master/texmf-dist/doc/latex/isodoc/accept/accept.tex index dc4cc925443..317183e29ac 100644 --- a/Master/texmf-dist/doc/latex/isodoc/accept/accept.tex +++ b/Master/texmf-dist/doc/latex/isodoc/accept/accept.tex @@ -16,9 +16,6 @@ acceptcents=00, ourref=308, ]{\itable{\iitem{Contributie NTG voor 2006}{40,00}}\\[3ex] - \accountdata - \begin{textblock}{210}(0,199.5) - \noindent\includegraphics[width=210mm]{acceptform.jpg} - \end{textblock} + \paymentdata } \end{document} diff --git a/Master/texmf-dist/doc/latex/isodoc/inst b/Master/texmf-dist/doc/latex/isodoc/inst index 555af87cbe8..f63c94a15d7 100644 --- a/Master/texmf-dist/doc/latex/isodoc/inst +++ b/Master/texmf-dist/doc/latex/isodoc/inst @@ -21,6 +21,7 @@ TEXMFMAIN, TEXMFLOCAL or TEXMFHOME tree. Options: -h,--help print this help and exit -H,--Help print full documentation via less and exit +-c,--clean cleanup -V,--version print version and exit @@ -41,10 +42,12 @@ DOC die() { echo -e "$myname: $Err$@$Nor" 1>&2; exit 1; } help() { sed -n '/^= Synopsis/,/^= /p' $0|sed '1s/.*/Usage:/;/^= /d'; exit; } helpall() { sed -n '/^<<.DOC.$/,/^DOC$/p' $0|sed -n '1d;$d;p'|less; exit; } + Warn() { echo -e "$myname: $War$@$Nor" 1>&2; } version() { echo $version; exit; } Nor='\e[0m' # reset color ] Err='\e[31;1m' # light red ] +War='\e[35;1m' # light magenta ] setdir() { # create installation directory for i in MAIN LOCAL HOME; do @@ -59,6 +62,7 @@ setdir() { # create installation directory mkdir -p $insttex || die could not create $insttex mkdir -p $instsrc || die could not create $instsrc mkdir -p $instdoc || die could not create $instdoc + $clean || echo installing in $tree } testexecs() { # test presence of executables @@ -71,6 +75,8 @@ readme() { # generate the README file sed -n '/^%<\*readme>/,/^%<\/readme>/p /\\changes{v'$dtxversion'}/,/^% }/p' $dtxname.dtx | sed 's/^%//;s/\\\\$// + / Author:/i\ +Version:| '$dtxversion' /<.readme>/d /^ }/d s/ \\changes.*/Changes in version '$dtxversion':/ @@ -123,7 +129,6 @@ makeall() { installall() { # install and cleanup - echo installing in $tree clean rm -rf $insttex/* $instsrc/* $instdoc/* # remove old data in the tree @@ -137,7 +142,10 @@ installall() { rm -f $zipfile zip -rq $zipfile $dtxname/* cd $dtxname - rm -f $dtxname.pdf README + rm -f $dtxname.pdf + lfi=$(ltxfileinfo -l isodoc.cls) + [[ $lfi != $insttex/isodoc.cls ]] && + Warn "currently active: $lfi,\n not the installed $insttex/isodoc.cls" } clean=false @@ -162,6 +170,6 @@ done testexecs setdir -$clean && clean && rm -f $delete $dtxname-*.zip $dtxname.pdf README && exit 0 +$clean && clean && rm -f $delete $dtxname-*.zip $dtxname.pdf && exit 0 makeall installall diff --git a/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty b/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty index 7fa98e875b5..66e8fed2ffe 100644 --- a/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty +++ b/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty @@ -2,31 +2,28 @@ \ProvidesPackage{invoice} [2010/08/21 v1.1 example style for isodoc] \RequirePackage[english,dutch]{babel} -\RequirePackage{ucs}\RequirePackage[utf8x]{inputenc} -\RequirePackage{pxfonts} -\setupdocument{% -accountname = W.H.\ Dekker, -accountno = 304046221, -areacode = 31, -bic = rabonl2u, -city = Deil, -company = Wybo Dekker, -country = The Netherlands, -countrycode = NL, -language = nl-NL, -email = wybo@xs4all.nl, -fold3, -footer, -iban = nl94rabo0304046221, -opening = L.S., -phone = 87\,8748496, % phone numbers without leading 0: -cellphone = 6\,3033\,3955, -return, -street = Deilsedijk 60, -website = www.xs4all.nl, -who = Wybo Dekker, -addresscenter = 67, -zip = 4158 CH, +\setupdocument{ + accountname = W.H.\,Dekker, + addresscenter = 67, + areacode = 31, + cellphone = 6\,3033\,3955, + city = Deil, + company = Wybo Dekker, + country = The Netherlands, + countrycode = NL, + email = wybo@xs4all.nl, + fold3, + footer, + iban = \scshape nl94rabo0304046221, + language = nl-NL, + opening = L.S., + phone = 87\,8748496, % phone numbers without leading 0: + return, + street = Deilsedijk 60, + term = 14, + website = www.xs4all.nl, + who = Wybo Dekker, + zip = 4158 CH, } \endinput diff --git a/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.tex b/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.tex index 63dafa63929..17f8c1171b1 100644 --- a/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.tex +++ b/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.tex @@ -13,6 +13,6 @@ \iitem{postzegels}{9,00} \itotal[Subtotaal]{15,60} } - \\[3ex]\accountdata + \\[3ex]\paymentdata } \end{document} diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf index 4ed5607f1fe..b54014b95da 100644 Binary files a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf and b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty b/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty index 55271dfdb78..ca4c579485d 100644 --- a/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty +++ b/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty @@ -32,7 +32,7 @@ \renewcommand{\logo}{\if@isodoclogo \pagecolor{shivaback} - \begin{textblock}{2}(10,13) + \begin{textblock}{70}(15,13) \includegraphics[scale=.3]{shiva-shakti.png} \end{textblock} \begin{textblock}{105}(88,15) diff --git a/Master/texmf-dist/doc/latex/isodoc/logoletter/shiva-shakti.png b/Master/texmf-dist/doc/latex/isodoc/logoletter/shiva-shakti.png index 1a1c67a90e5..8f8847b50ce 100644 Binary files a/Master/texmf-dist/doc/latex/isodoc/logoletter/shiva-shakti.png and b/Master/texmf-dist/doc/latex/isodoc/logoletter/shiva-shakti.png differ diff --git a/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty b/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty index 40b82854d92..4ca0f898a1d 100644 --- a/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty +++ b/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty @@ -49,11 +49,11 @@ cityzip \rule{\hsize}{.3pt} \end{textblock} \begin{textblock}{35}[0,0](140,22) - \noindent\@hft + \noindent\footnotesize\sffamily\textcolor{headcolor}{% \ifx\undefined\tbfigures\else\tbfigures\fi \ifx\who\empty\else\who\\\fi \ifx\who\empty\else\street\\\fi - \prezip\ \zip\ \city\\ + \prezip\ \zip\ \city} \end{textblock} } \endinput diff --git a/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.tex b/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.tex index 7495128d45c..2a728d4dddb 100644 --- a/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.tex +++ b/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.tex @@ -15,6 +15,6 @@ Wil je bijgaand formulier even tekenen en naar de postbank doorsturen? Het adres staat erop. Reden: ik krijg nog maar eens per maand een afschrift, dus als iemand per accceptgiro betaald, dan zie ik soms pas na een maand wie dat is geweest. -Kost 60 cent per week extra. +Kost 60 cent per week extra. } \end{document} diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx index 4d9a904a8f1..830a38564bd 100644 --- a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx +++ b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx @@ -3,12 +3,13 @@ \iffalse % %<*readme> -isodoc --- LaTeX class used for typesetting of letters and invoices -Author: Wybo Dekker -E-mail: wybo@dekkerdocumenten.nl -License: Released under the LaTeX Project Public License v1.3c or later -See: http://www.latex-project.org/lppl.txt -------------------------------------------------------------------------------------- +| +-------:|:-------------------------------------- + isodoc:| LaTeX class used for typesetting of letters and invoices + Author:| Wybo Dekker + E-mail:| wybo@dekkerdocumenten.nl +License:| Released under the LaTeX Project Public License v1.3c or later + See:| http://www.latex-project.org/lppl.txt Short description: The isodoc class is used for the preparation of letters and invoices. @@ -37,7 +38,7 @@ Execute the inst script with the --help option for more information. %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{isodoc}% %<*class> - [2014/07/24 v1.06 isodoc class for letters and invoices] + [2015/01/14 v1.07 isodoc class for letters and invoices] % %\ifx\pdfoutput\undefined\else% %\ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{} @@ -65,9 +66,9 @@ Execute the inst script with the --help option for more information. bookmarksopen, hidelinks } -\newcommand{\FIG}[3]{ % pdfname label caption +\newcommand{\FIG}[3]{% pdfname label caption \ctable[label={#2},caption={#3},figure,botcap,framerule=.5pt]{@{}c@{}}{}{% - \includegraphics[width=\textwidth]{#1} + \includegraphics[width=.99\textwidth]{#1}\\[-.85ex] } } \newcommand{\OPTS}[3]{ @@ -131,7 +132,7 @@ Execute the inst script with the --help option for more information. % - expect printer to have more unprintable border\\ % - ascriptiontext $\Rightarrow$ accountnametext for dutch\\ % - Interdocument language changes now work\\ -% - Vatno, if defined, is reported with accountdata\\ +% - Vatno, if defined, is reported with paymentdata\\ % - country in returnaddress now separated with dot\\ % - option changes kept local to the letter/invoice\\ % - English/American accountname text adapted @@ -263,9 +264,18 @@ Execute the inst script with the --help option for more information. % - README and inst script reorganized % } % \changes{v1.06}{2014/07/26}{ -% - bug causing "No line here to end" error +% - bug causing "No line here to end" error\\ % - font and footskip warnings removed % } +% \changes{v1.07}{2015/06/15}{ +% - use xcolor, not color package; minor changes in example style files\\ +% - swedish-Sweden (sv-SE) language added\\ +% - ordinal suffixes can be superscripted with ordinalss option\\ +% - removed boldface from the smallcaps invoice opening to prevent font problems\\ +% - using the term "paymentdata" instead of "accountdata", but both do work.\\ +% - improved documentation, in particular about footer fields.\\ +% - accountno did not appear (typo). +% } % \DoNotIndex{% % \ , \", \', \@auxout, \AtBeginDocument, \AtEndDocument, \Cbox, % \CurrentOption, \DeclareOption, \DescribeMacro, \ForEachX, \IfInteger, @@ -395,7 +405,7 @@ Execute the inst script with the --help option for more information. % |company|) and some only in the document source (such as |to| or |opening|). % % \OPTS{Language}{The options described here relate to the language used -% for the isodoc interface (headings, footings, date, banking data and so +% for the isodoc interface (headings, footings, date, payment data and so % on.) This language is independent of the language you set with the |babel| % or |polyglossia| packages. So, for example, you can write your document in English and % use Dutch for the interface. Also, use of |babel| or |polyglossia| is not required. @@ -412,6 +422,9 @@ Execute the inst script with the --help option for more information. % Currently these are: en-GB, en-US, fr-FR, de-DE, nl-NL, nl-BE % it-IT, es-ES, ca-ES, nb-NO, sr-RS; the hyphens in these names are % optional, so you can, for example, also write enGB.\NN +% \T{ordinalss} & sets ordinal suffixes in dates (like st, nd, rd, th) superscripted. +% The default is to keep them on the line. Note that you must use this +% option \textsl{before} any language option.\NN % } % The definitions for the languages are in language definition files named % |isodoc-|\textsl{xx-YY}|.ldf|, where xx stands for the language, and YY for regional @@ -602,22 +615,21 @@ Execute the inst script with the --help option for more information. % one will appear in the right margin.\NN % \T{footorder = ...} & changes the order of footer fields. The argument % should be a semicolon (;) separated list of field names. -% The default is \T{website;phone;cellphone;email}. Empty fields can -% be inserted with extra |;|'s. \NN +% By default this string is defined as \T{website;phone;cellphone;email}. +% Empty fields can be inserted with extra |;|'s. \NN % \T{phoneprefix} & prefix for phone numbers. The default is `0'; will be changed % into |+nn\,| (where |nn| is the area code) if the \T{foreign} option % is used.\NN -% \T{phone = ...} & if defined\footnote{You \textsl{can} define the footer entries as -% an empty string, such as |phone=,| or |phone={},|; this may be -% useful in style files used by more than one user, each with -% their own phone number. If such a user forgets to use the -% |phone| key, the phone number will be displayed as -% \textsl{undefined} on a pink background.}, and phone occurs in -% the footorder string, prints `phone' in the page footer, with -% the contents under it, prefixed with a~0 or, if the \T{foreign} -% option was used, the area code (set with the \T{areacode} -% option.) Telephone numbers should thus be entered without a -% prefix.\NN +% \T{phone = ...} & if defined\footnote{If you leave the footer entries undefined, or you +% define them as an empty string such as |phone=|, or |phone={}|, the +% entry will be displayed as `undefined' on a pink background. This may +% be useful in style files used by more than one user, each with their +% own values for these footer entries. If such a user forgets to use the +% corresponding key, he will be warned by the pink background.}, +% and phone occurs in the footorder string, prints `phone' in the page +% footer, with the contents under it, prefixed with a~0 or, if the +% \T{foreign} option was used, the area code (set with the \T{areacode} +% option.) Telephone numbers should thus be entered without a prefix.\NN % \T{cellphone = ...} & same for cellphone...\NN % \T{fax = ...} & fax...\NN % \T{email = ...} & email...\NN @@ -645,7 +657,7 @@ Execute the inst script with the --help option for more information. % \newpage % \OPTS{Payment data}{In invoices you probably want to make clear where you want % your debtor to transfer his money to. You can do so by calling -% the \C{accountdata} command, which generates a little table containing these data. +% the \C{paymentdata} command, which generates a little table containing these data. % The contents of this table can be defined with the following keywords:}{ % \T{term = ...} & Payment term in days; default is 30.\NN % \T{currency = ...} & Currency; default is euro.\NN @@ -731,7 +743,7 @@ Execute the inst script with the --help option for more information. % opening, a closing, an autograph, a signature and a remark about any % enclosures. The first page of each letter will be decorated with a logo, % the addressee's address, a return address, -% various reference fields, a footer, a folding mark---all as defined by +% various reference fields, a footer, a folding mark\,---\,all as defined by % |key=value| pairs in |\setupdocument| or in the |\letter| command itself. % % The second an following pages will have a heading, quoting the name of the @@ -740,9 +752,9 @@ Execute the inst script with the --help option for more information. % % \DescribeMacro{\invoice} % The |\invoice| command is essentially the same as the |\letter| command, except -% that the opening is always ``\textbf{\textsc{invoice}}'', and the content +% that the opening is always ``\textsc{invoice}'', and the content % (argument 2) is largely composed using the |\itable|, |\iitem|, |\itotal|, and -% |\accountdata| commands described hereafter. Closing, autograph, and signature +% |\paymentdata| commands described hereafter. Closing, autograph, and signature % are disabled. % % In the Netherlands, invoices can be provided with an accept form on the lower @@ -784,10 +796,10 @@ Execute the inst script with the --help option for more information. % \itotal[Subtotal]{amount} % ... % \iitem{item n}{amount n} -% \total{amount} +% \itotal{amount} % \end{verbatim} -% \DescribeMacro{\accountdata} -% The |\accountdata| command prints a little table with accounting +% \DescribeMacro{\paymentdata} +% The |\paymentdata| command prints a little table with accounting % information needed by the creditor for paying the invoice. It is % constructed using the values of the options |term|, |accountno|, |iban|, % |bic|, |accountname|, |routingno|, |ourref|, and |vatno|, in that order, @@ -828,7 +840,7 @@ Execute the inst script with the --help option for more information. % (\textsl{layer $\Rightarrow$ transparency $\Rightarrow$ color to alpha}) and save it as a % \textsc{png} image. Removing the background is only necessary if you plan % to move the image over the text body, which would then be covered by the -% white background --- closing and signature will be printed \textsl{over} +% white background\,---\,closing and signature will be printed \textsl{over} % the image. % \item Guess where you want the closing's baseline to appear in the image, % expressed as an integer percentage of the image height from the top of @@ -984,6 +996,8 @@ Execute the inst script with the --help option for more information. % % An example, as usual, is most instructive: % \verbinput{examples/invoice/invoice.tex} +% The invoice style file used here looks like: +% \verbinput{examples/invoice/invoice.sty} % The result is shown in figure~\ref{invoice}. % % \subsection{Invoice with redefined logo} @@ -1010,7 +1024,7 @@ Execute the inst script with the --help option for more information. % 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,color,tabularx,graphicx,xstring,calc} +\RequirePackage{ctable,xcolor,tabularx,graphicx,xstring,calc} \RequirePackage{forarray,longtable} % \end{macrocode} % @@ -1110,6 +1124,18 @@ Execute the inst script with the --help option for more information. \define@key{isodoc}{french} []{\isodoc@frFR\ClassWarning{isodoc}{the option french is obsolete: use language=fr-FR}} \define@key{isodoc}{language}{\StrSubstitute{#1}{-}{}[\@iso]\csname isodoc@\@iso\endcsname} % \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} + \newif\if@isodocordinalss\@isodocordinalssfalse +% \end{macrocode} % \DescribeMacro{fill} % \DescribeMacro{nofill} % The default is to have left, but not right justification, allowing for hyphenation @@ -1494,12 +1520,12 @@ Execute the inst script with the --help option for more information. % \begin{macrocode} \def\xacceptdescription{105}\def\yacceptdescription{200}\def\wacceptdescription{100} %T \def\xacceptref{7} \def\yacceptref{212} \def\wacceptref{30} %T -\def\xaccepteuros{60} \def\yaccepteuros{216} \def\waccepteuros{32} %C -\def\xacceptcents{89} \def\yacceptcents{216} \def\wacceptcents{13} %C -\def\xacceptreference{125} \def\yacceptreference{216} \def\wacceptreference{55} %C -\def\xaccepteur{14.4} \def\yaccepteur{228.5} \def\waccepteur{21} %C -\def\xacceptct{32} \def\yacceptct{228.5} \def\wacceptct{9} %C -\def\xacceptaccount{75} \def\yacceptaccount{228.5} \def\wacceptaccount{65} %C +\def\xaccepteuros{60} \def\yaccepteuros{219} \def\waccepteuros{32} %C +\def\xacceptcents{89} \def\yacceptcents{219} \def\wacceptcents{13} %C +\def\xacceptreference{125} \def\yacceptreference{219} \def\wacceptreference{55} %C +\def\xaccepteur{14.4} \def\yaccepteur{231.5} \def\waccepteur{21} %C +\def\xacceptct{32} \def\yacceptct{231.5} \def\wacceptct{9} %C +\def\xacceptaccount{75} \def\yacceptaccount{231.5} \def\wacceptaccount{65} %C \def\xacceptdesc{7} \def\yacceptdesc{241} \def\wacceptdesc{26} %T \def\xacceptaddress{58} \def\yacceptaddress{241} \def\wacceptaddress{90} %T % \end{macrocode} @@ -1677,16 +1703,16 @@ Execute the inst script with the --help option for more information. \else\@forcedate\fi } % \end{macrocode} -% \DescribeMacro{\accountdata} -% Print a table with banking information. Show all data as far as defined/not empty: +% \DescribeMacro{\paymentdata} +% Print a table with payment information. Show all data as far as defined/not empty: % \begin{macrocode} -\def\accountdata{ - \textbf{\accountdatatext:}\\ +\def\paymentdata{ + \textbf{\paymentdatatext:}\\ \begin{tabular}{@{}rl@{}} \ifx\term\empty\else \termtext: & \term\ \daystext\\ \fi - \ifx\accounto\undefined\else + \ifx\accountno\undefined\else \accountnotext: & \accountno\\ \fi \ifx\iban\undefined\else @@ -1709,6 +1735,8 @@ Execute the inst script with the --help option for more information. \fi \end{tabular} } +\let\accountdata\paymentdata +\let\accountdatatext\paymentdatatext % \end{macrocode} % The |\showkeys| command is useful for debugging. It prints a table showing the % current values of most keys. @@ -1846,7 +1874,7 @@ Execute the inst script with the --help option for more information. \newcommand{\invoice}[2][]{% \closingfalse \letter[#1, - opening={\bfseries\scshape\Large\invoicetext}, + opening={\scshape\Large\invoicetext}, openingcomma={}, closing={}, signature={}]{\Tbox{35}{127}{140}{\ignorespaces#2}} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf index c16fe706aee..79c37fb37d3 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-ca-ES.ldf @@ -1,6 +1,6 @@ % contributed by Cristian Peraferrer: \def\isodoc@caES{% - \gdef\accountdatatext {Dades banc\`aries} + \gdef\paymentdatatext {Detalls del pagament} \gdef\accountnametext {a nom de} \gdef\accountnotext {N\'um. de compte} \gdef\amounttext {Quantitat} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf index 5d0638c72f3..866e7b30ec7 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-de-DE.ldf @@ -1,5 +1,5 @@ \def\isodoc@deDE{% - \gdef\accountdatatext {Zahlungsdaten} + \gdef\paymentdatatext {Zahlungsdaten} \gdef\accountnametext {Name} \gdef\accountnotext {Konto-Nr.} \gdef\amounttext {Betrag} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf index e2864472826..2e6cc3f7b61 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-GB.ldf @@ -1,5 +1,16 @@ \def\isodoc@enGB{% - \gdef\accountdatatext {Banking data} + \if@isodocordinalss + \gdef\@st{\textsuperscript{st}} + \gdef\@nd{\textsuperscript{nd}} + \gdef\@rd{\textsuperscript{rd}} + \gdef\@th{\textsuperscript{th}} + \else + \gdef\@st{st} + \gdef\@nd{nd} + \gdef\@rd{rd} + \gdef\@th{th} + \fi + \gdef\paymentdatatext {Payment details} \gdef\accountnametext {in the name of} \gdef\accountnotext {Account no.} \gdef\amounttext {Amount} @@ -21,7 +32,7 @@ \gdef\pagetext {Page} \gdef\phonetext {telephone} \gdef\referencetext {Reference} - \gdef\routingnotext {Routing no} + \gdef\routingnotext {Sort code} \gdef\subjecttext {Subject:} \gdef\termtext {term of payment} \gdef\totaltext {Total} @@ -32,13 +43,13 @@ \gdef\yourlettertext {Your letter of} \gdef\yourreftext {Your reference} \gdef\@isodate {\ifcase\day\or - 1st\or 2nd\or 3rd\or 4th\or 5th\or - 6th\or 7th\or 8th\or 9th\or 10th\or - 11th\or 12th\or 13th\or 14th\or 15th\or - 16th\or 17th\or 18th\or 19th\or 20th\or - 21st\or 22nd\or 23rd\or 24th\or 25th\or - 26th\or 27th\or 28th\or 29th\or 30th\or - 31st\fi\space\ifcase\month\or + 1\@st\or 2\@nd\or 3\@rd\or 4\@th\or 5\@th\or + 6\@th\or 7\@th\or 8\@th\or 9\@th\or 10\@th\or + 11\@th\or 12\@th\or 13\@th\or 14\@th\or 15\@th\or + 16\@th\or 17\@th\or 18\@th\or 19\@th\or 20\@th\or + 21\@st\or 22\@nd\or 23\@rd\or 24\@th\or 25\@th\or + 26\@th\or 27\@th\or 28\@th\or 29\@th\or 30\@th\or + 31\@st\fi\space\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space \number\year} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf index 1a059550fbf..5c60cd56dc2 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-en-US.ldf @@ -1,5 +1,5 @@ \def\isodoc@enUS{% - \gdef\accountdatatext {Bank details} + \gdef\paymentdatatext {Payment details} \gdef\accountnametext {in the name of} \gdef\accountnotext {Account no.} \gdef\amounttext {Amount} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf index c7adf949f80..01cda147be6 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-es-ES.ldf @@ -1,7 +1,7 @@ % contributed by Cristian Peraferrer: \def\isodoc@esES{% \def\openingcomma {:} - \gdef\accountdatatext {Datos bancarios} + \gdef\paymentdatatext {Detalles de pago} \gdef\accountnametext {a nombre de} \gdef\accountnotext {N\'um. de cuenta} \gdef\amounttext {Cantidad} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf index f6c82807b45..c3505b4c300 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-fr-FR.ldf @@ -1,5 +1,5 @@ \def\isodoc@frFR{% - \gdef\accountdatatext {Donn\'ees banquaires} + \gdef\paymentdatatext {Détails de paiement} \gdef\accountnametext {au nom de} \gdef\accountnotext {no. compte} \gdef\amounttext {Montant} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf index bba1c0ca56f..e70586a2de4 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-it-IT.ldf @@ -1,6 +1,6 @@ % contributed by Walter Giocoso: \def\isodoc@itIT{% - \gdef\accountdatatext {Coordinate bancarie} + \gdef\paymentdatatext {Dettagli di pagamento} \gdef\accountnametext {intestato a} \gdef\accountnotext {n$^o$~del conto} \gdef\amounttext {Prezzo} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf index 9335445e044..a0ab6a8ad9c 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nb-NO.ldf @@ -1,6 +1,6 @@ % contributed by Sveinung Heggen: \def\isodoc@nbNO{% - \gdef\accountdatatext {betales til} + \gdef\paymentdatatext {Betalingsdetaljer} \gdef\accountnametext {til} \gdef\accountnotext {faktura nr} \gdef\amounttext {Bel\o{}p} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf index f7b9cfca9e2..98ff475bf4b 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-BE.ldf @@ -1,6 +1,6 @@ % contributed by Serge Stroobandt: \def\isodoc@nlBE{% - \gdef\accountdatatext {Betalingsgegevens} + \gdef\paymentdatatext {Betaalgegevens} \gdef\accountnametext {op naam van} \gdef\accountnotext {rekeningnummer} \gdef\amounttext {Bedrag} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf index b311f7ddd7d..9c2fe4c2d9c 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-nl-NL.ldf @@ -1,5 +1,5 @@ \def\isodoc@nlNL{% - \gdef\accountdatatext {Betalingsgegevens} + \gdef\paymentdatatext {Betaalgegevens} \gdef\accountnametext {ten name van} \gdef\accountnotext {rekeningnummer} \gdef\amounttext {Bedrag} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf index 8ca6417fbdf..9d31d945971 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-sr-RS.ldf @@ -1,6 +1,6 @@ % contributed by Zoran T. Filipovic: \def\isodoc@srRS{% - \gdef\accountdatatext {Podaci o bankarskom sektoru} + \gdef\paymentdatatext {Podaci o bankarskom sektoru} \gdef\accountnametext {na ime} \gdef\accountnotext {Ra\v cun br.} \gdef\amounttext {Iznos} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-sv-SE.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-sv-SE.ldf new file mode 100644 index 00000000000..33eb8c9cac8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-sv-SE.ldf @@ -0,0 +1,39 @@ +% contributed by Joakim Verona: +\def\isodoc@svSE{% + \gdef\paymentdatatext {Betalningsdetaljer} + \gdef\accountnametext {Konto\"agare} + \gdef\accountnotext {Kontonummer} + \gdef\amounttext {Summa} + \gdef\bictext {\scshape bic} + \gdef\cellphonetext {Mobil} + \gdef\chambertext {ch.comm.} + \gdef\copytotext {cc} + \gdef\datetext {Datum} + \gdef\daystext {dagar} + \gdef\descriptiontext {Beskrivning} + \gdef\emailtext {email} + \gdef\enclosurestext {Bifogat:} + \gdef\enclosuretext {Bifogat:} + \gdef\faxtext {telefax} + \gdef\ibantext {\scshape iban} + \gdef\invoicetext {Faktura} + \gdef\oftext {av} + \gdef\ourreftext {V\r{a}r referens} + \gdef\pagetext {Sida} + \gdef\phonetext {Telefon} + \gdef\referencetext {Faktura} + \gdef\routingnotext {Routing no} + \gdef\subjecttext {\"Arende:} + \gdef\termtext {Betalningsvillkor} + \gdef\totaltext {Total} + \gdef\totext {Till} + \gdef\vatnotext {Momsregistrering.} + \gdef\vattext {Moms} + \gdef\websitetext {Web} + \gdef\yourlettertext {Ert brev} + \gdef\yourreftext {Er Referens} + \gdef\@isodate {\ifcase\month\or + Januari\or Februari\or Mars\or April\or Maj\or Juni\or + Juli\or Augusti\or September\or Oktober\or November\or December\fi + \space\number\day, \number\year} +} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc-template.ldf b/Master/texmf-dist/tex/latex/isodoc/isodoc-template.ldf index 55018c52077..8c6c2f771d8 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc-template.ldf +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc-template.ldf @@ -1,5 +1,16 @@ \def\isodoc@xxYY{% - \gdef\accountdatatext {...} % Banking data + \if@isodocordinalss % no need for these if you don't use \@st et cetera below + \gdef\@st{\textsuperscript{st}} + \gdef\@nd{\textsuperscript{nd}} + \gdef\@rd{\textsuperscript{rd}} + \gdef\@th{\textsuperscript{th}} + \else + \gdef\@st{st} + \gdef\@nd{nd} + \gdef\@rd{rd} + \gdef\@th{th} + \fi + \gdef\paymentdatatext {...} % Payment details \gdef\accountnametext {...} % in the name of \gdef\accountnotext {...} % Account no. \gdef\amounttext {...} % Amount @@ -14,7 +25,7 @@ \gdef\enclosurestext {...} % Enclosures: \gdef\enclosuretext {...} % Enclosure: \gdef\faxtext {...} % telefax - \gdef\invoicetext {...} % \textbf{\textsc{\Large invoice}} + \gdef\invoicetext {...} % \textsc{\Large invoice} \gdef\oftext {...} % of \gdef\ourreftext {...} % Our reference \gdef\pagetext {...} % Page @@ -31,13 +42,13 @@ \gdef\yourlettertext {...} % Your letter of \gdef\yourreftext {...} % Your reference \gdef\@isodate {\ifcase\day\or - 1st\or 2nd\or 3rd\or 4th\or 5th\or - 6th\or 7th\or 8th\or 9th\or 10th\or - 11th\or 12th\or 13th\or 14th\or 15th\or - 16th\or 17th\or 18th\or 19th\or 20th\or - 21st\or 22nd\or 23rd\or 24th\or 25th\or - 26th\or 27th\or 28th\or 29th\or 30th\or - 31st\fi\space\ifcase\month\or + 1\@st\or 2\@nd\or 3\@rd\or 4\@th\or 5\@th\or + 6\@th\or 7\@th\or 8\@th\or 9\@th\or 10\@th\or + 11\@th\or 12\@th\or 13\@th\or 14\@th\or 15\@th\or + 16\@th\or 17\@th\or 18\@th\or 19\@th\or 20\@th\or + 21\@st\or 22\@nd\or 23\@rd\or 24\@th\or 25\@th\or + 26\@th\or 27\@th\or 28\@th\or 29\@th\or 30\@th\or + 31\@st\fi\space\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space \number\year} diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls index 32aaa8e4e20..efd23c85a8a 100644 --- a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls +++ b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{isodoc}% - [2014/07/24 v1.06 isodoc class for letters and invoices] + [2015/01/14 v1.07 isodoc class for letters and invoices] \ifx\pdfoutput\undefined\else% \ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{} \fi\fi @@ -30,7 +30,7 @@ \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} \ProcessOptions \LoadClass{article} -\RequirePackage{ctable,color,tabularx,graphicx,xstring,calc} +\RequirePackage{ctable,xcolor,tabularx,graphicx,xstring,calc} \RequirePackage{forarray,longtable} \RequirePackage[head=\baselineskip,foot=\f@size pt]{geometry} \RequirePackage[absolute,overlay]{textpos} @@ -63,6 +63,13 @@ \define@key{isodoc}{american}[]{\isodoc@enUS\ClassWarning{isodoc}{the option american is obsolete: use language=en-US}} \define@key{isodoc}{french} []{\isodoc@frFR\ClassWarning{isodoc}{the option french is obsolete: use language=fr-FR}} \define@key{isodoc}{language}{\StrSubstitute{#1}{-}{}[\@iso]\csname isodoc@\@iso\endcsname} +\define@key{isodoc}{ordinalss}[\@isodocordinalsstrue]{% + \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} \rightskip=0mm plus 35mm @@ -209,12 +216,12 @@ \def\acceptreference{\Undefined{ref}} \def\xacceptdescription{105}\def\yacceptdescription{200}\def\wacceptdescription{100} %T \def\xacceptref{7} \def\yacceptref{212} \def\wacceptref{30} %T -\def\xaccepteuros{60} \def\yaccepteuros{216} \def\waccepteuros{32} %C -\def\xacceptcents{89} \def\yacceptcents{216} \def\wacceptcents{13} %C -\def\xacceptreference{125} \def\yacceptreference{216} \def\wacceptreference{55} %C -\def\xaccepteur{14.4} \def\yaccepteur{228.5} \def\waccepteur{21} %C -\def\xacceptct{32} \def\yacceptct{228.5} \def\wacceptct{9} %C -\def\xacceptaccount{75} \def\yacceptaccount{228.5} \def\wacceptaccount{65} %C +\def\xaccepteuros{60} \def\yaccepteuros{219} \def\waccepteuros{32} %C +\def\xacceptcents{89} \def\yacceptcents{219} \def\wacceptcents{13} %C +\def\xacceptreference{125} \def\yacceptreference{219} \def\wacceptreference{55} %C +\def\xaccepteur{14.4} \def\yaccepteur{231.5} \def\waccepteur{21} %C +\def\xacceptct{32} \def\yacceptct{231.5} \def\wacceptct{9} %C +\def\xacceptaccount{75} \def\yacceptaccount{231.5} \def\wacceptaccount{65} %C \def\xacceptdesc{7} \def\yacceptdesc{241} \def\wacceptdesc{26} %T \def\xacceptaddress{58} \def\yacceptaddress{241} \def\wacceptaddress{90} %T \newdimen\acceptreferenceskip\acceptreferenceskip=5.15mm @@ -317,13 +324,13 @@ \ifnum\year=0\Undefined{date}\else\@isodate\fi \else\@forcedate\fi } -\def\accountdata{ - \textbf{\accountdatatext:}\\ +\def\paymentdata{ + \textbf{\paymentdatatext:}\\ \begin{tabular}{@{}rl@{}} \ifx\term\empty\else \termtext: & \term\ \daystext\\ \fi - \ifx\accounto\undefined\else + \ifx\accountno\undefined\else \accountnotext: & \accountno\\ \fi \ifx\iban\undefined\else @@ -346,6 +353,8 @@ \fi \end{tabular} } +\let\accountdata\paymentdata +\let\accountdatatext\paymentdatatext \def\@isodocmp#1{\begin{minipage}[t]{\hsize}\mbox{}#1\\[-1.8ex]\mbox{}\end{minipage}} \def\@isodocun#1{\ifx#1\undefined (undefined, so not shown)\else#1\fi} \def\showkeys{% @@ -434,7 +443,7 @@ \newcommand{\invoice}[2][]{% \closingfalse \letter[#1, - opening={\bfseries\scshape\Large\invoicetext}, + opening={\scshape\Large\invoicetext}, openingcomma={}, closing={}, signature={}]{\Tbox{35}{127}{140}{\ignorespaces#2}} -- cgit v1.2.3