diff options
author | Karl Berry <karl@freefriends.org> | 2015-06-15 23:21:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-06-15 23:21:20 +0000 |
commit | f4d0afdee42507adc04408c96795d46b1075306f (patch) | |
tree | f478ba928672362e7593adac369ad779c55dc691 /Master/texmf-dist/source/latex/isodoc | |
parent | cf42134e440c3c49b1222d85301251e312f85fa5 (diff) |
isodoc (15jun15)
git-svn-id: svn://tug.org/texlive/trunk@37549 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/isodoc')
-rw-r--r-- | Master/texmf-dist/source/latex/isodoc/isodoc.dtx | 120 |
1 files changed, 74 insertions, 46 deletions
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 %</internal> %<*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. %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<class>\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] %</class> %<class>\ifx\pdfoutput\undefined\else% %<class>\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}} |