summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-22 00:14:58 +0000
committerKarl Berry <karl@freefriends.org>2012-02-22 00:14:58 +0000
commit24e68c3d328456d62a51f80bc3be2112f6f6c89a (patch)
tree9e09ca3316da1b07a10e29365ba6fe86610b2ef0 /Master/texmf-dist
parent001c3b3f1c1276d6502d5b744a00590284ba2068 (diff)
isodoc (21feb12)
git-svn-id: svn://tug.org/texlive/trunk@25464 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/Entries14
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/README8
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/inst6
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/isodoc.pdfbin707552 -> 708539 bytes
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/listkeys9
-rw-r--r--Master/texmf-dist/source/latex/isodoc/isodoc.dtx145
-rw-r--r--Master/texmf-dist/tex/latex/isodoc/isodoc.cls70
7 files changed, 169 insertions, 83 deletions
diff --git a/Master/texmf-dist/doc/latex/isodoc/Entries b/Master/texmf-dist/doc/latex/isodoc/Entries
index 0f5bfc2dcd0..cef48bb97b2 100644
--- a/Master/texmf-dist/doc/latex/isodoc/Entries
+++ b/Master/texmf-dist/doc/latex/isodoc/Entries
@@ -1,15 +1,15 @@
/accept.tex/1.7/Fri Jan 1 21:46:57 2010//
/binaries.m64/1.5/Fri Jan 1 21:51:26 2010//
-/listkeys/1.4/Fri Jan 1 21:59:42 2010//
-/logoletter.tex/1.5/Tue Aug 24 19:24:45 2010//
-/ltxdoc.cfg/1.1/Mon Jan 11 20:50:43 2010//
-/ntgletter.tex/1.2/Sun Nov 5 15:39:16 2006//
-/typo/1.3/Sat Jan 2 16:50:16 2010//
-/letter.tex/1.5/Sun Feb 19 20:15:59 2012//
/invoice.tex/1.3/Sun Feb 19 20:16:12 2012//
/isontg.sty/1.13/Sun Feb 19 20:17:37 2012//
/isowybo.sty/1.11/Sun Feb 19 20:17:46 2012//
+/letter.tex/1.5/Sun Feb 19 20:15:59 2012//
+/logoletter.tex/1.5/Tue Aug 24 19:24:45 2010//
/logostyle.sty/1.9/Sun Feb 19 20:17:55 2012//
+/ltxdoc.cfg/1.1/Mon Jan 11 20:50:43 2010//
/mystyle.sty/1.9/Sun Feb 19 20:18:01 2012//
-/inst/1.20/Sun Feb 19 20:18:18 2012//
+/ntgletter.tex/1.2/Sun Nov 5 15:39:16 2006//
+/typo/1.3/Sat Jan 2 16:50:16 2010//
+/listkeys/1.5/Tue Feb 21 16:48:58 2012//
+/inst/1.22/Tue Feb 21 16:50:08 2012//
D
diff --git a/Master/texmf-dist/doc/latex/isodoc/README b/Master/texmf-dist/doc/latex/isodoc/README
index eed3ce5c5e5..6115a57e74f 100644
--- a/Master/texmf-dist/doc/latex/isodoc/README
+++ b/Master/texmf-dist/doc/latex/isodoc/README
@@ -1,4 +1,4 @@
-This is version 0.9 of the isodoc class
+This is version 0.10 of the isodoc class
License: LPPL
Short description:
@@ -9,6 +9,10 @@ wishes and extensible for other document types.
Victor Eijkhout’s NTG brief class, which implements the NEN1026
standard, was the starting point.
+major changes of v0.10 relative to v0.9
+- bug: missing prefixes for phone numbers
+- added option footorder, setting the order of footer fields
+
major changes of v0.9 relative to v0.8:
- subject text uses full textwidth; use newlines (\\) if needed
- introducing isodocsymbols.sty
@@ -19,4 +23,4 @@ major changes of v0.9 relative to v0.8:
- added some missing \NN
- removed some unwanted whitespace
-$Id: README,v 1.10 2012/02/19 20:46:13 wybo Exp $
+$Id: README,v 1.11 2012/02/21 16:46:43 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/isodoc/inst b/Master/texmf-dist/doc/latex/isodoc/inst
index 59611d549d0..61a91143c9b 100644
--- a/Master/texmf-dist/doc/latex/isodoc/inst
+++ b/Master/texmf-dist/doc/latex/isodoc/inst
@@ -39,7 +39,7 @@ if [ "$LOCAL" = "" ]; then
echo 'Could not find value for $TEXMFLOCAL'
exit 1
fi
-LOCAL=${LOCAL}tex/latex/$NAME
+LOCAL=${LOCAL}/tex/latex/$NAME
ln -sf ../$NAME.dtx
ln -sf ../$NAME.ins
ln -sf ../isodocsymbols.sty
@@ -93,7 +93,7 @@ zip)
test -f $NAME.glo && makeindex -q -s gglo.ist -o $NAME.gls $NAME.glo
test -f $NAME.idx && makeindex -q -s gind.ist -o $NAME.ind $NAME.idx
pdflatex --interaction=batchmode $NAME.dtx > /dev/null
- texlog_extract $NAME
+ texlog_extract $NAME |uniq
echo install in local tree
rm -rf $LOCAL
@@ -106,4 +106,4 @@ zip)
exit 1
;;
esac
-# $Id: inst,v 1.20 2012/02/19 20:18:18 wybo Exp $
+# $Id: inst,v 1.22 2012/02/21 16:50:08 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
index 7169b6879e9..e97d7f6af0f 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/doc/latex/isodoc/listkeys b/Master/texmf-dist/doc/latex/isodoc/listkeys
index 44064c02369..9ce823d1f1f 100644
--- a/Master/texmf-dist/doc/latex/isodoc/listkeys
+++ b/Master/texmf-dist/doc/latex/isodoc/listkeys
@@ -22,7 +22,12 @@ ARGV.push('isodoc.dtx')
a = []
# find keys which have a corresponding command:
-a.push($1) if ~ /\\define@key\{isodoc\}\s*\{(.*)\}\s*(\[.*?\])?\s*\{\\def\\/ while gets
+while x=gets
+ if x =~ /\\define@key\{isodoc\}\s*\{(.*?)\}/
+ a.push($1)
+ end
+end
+
a.sort!
case type
when 'defs'
@@ -48,4 +53,4 @@ case type
usage
end
-# $Id: listkeys,v 1.4 2010-01-01 21:59:42 wybo Exp $
+# $Id: listkeys,v 1.5 2012/02/21 16:48:58 wybo Exp $
diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
index e19b0f56905..76d669cf83d 100644
--- a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
+++ b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
@@ -22,7 +22,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{isodoc}%
%<*class>
- [2012/02/19 v0.9 isodoc class for letters and invoices]
+ [2012/02/21 v0.10 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!}{}
@@ -123,7 +123,32 @@
% headcolor, if defined, colors headings in header and footer;
% foldmarkcolor, if defined, colors foldmark
% }
-%
+% \changes{v0.8}{2010/08/24}{now compatible with XeLaTeX
+% made independent of babel/polyglossia packages: user must Require those, if needed
+% handling of font and encoding now left to the user
+% language names same as in babel (norwegian -> norsk)
+% option language added
+% option english is synonym for language=UKenglish
+% option american is synonym for language=USenglish
+% language options /only/ change keyword translations
+% new translations added: italian, spanish, catalan, serbian
+% option fontpackage removed
+% option cityzip moves zip behind city
+% now compatible with XeLaTeX
+% positioning of headings, subject, opening, body text fixed
+% repaired several minor bugs
+% }
+% \changes{v0.9}{2012/02/19}{subject text uses full textwidth; use newlines if needed
+% introducing isodocsymbols.sty
+% new option closingcomma
+% subject uses full textwidth
+% new option closingcomma
+% using foreach package for footfields
+% removed some unwanted whitespace
+% }
+% \changes{v0.10}{2012/02/21}{bug: missing prefixes for phone numbers
+% added option footorder, setting the order of footer fields
+% }
% \DoNotIndex{%
% \ , \", \', \@auxout, \AtBeginDocument, \AtEndDocument, \Cbox, \CurrentOption,
% \DeclareOption, \DescribeMacro, \LARGE, \Large, \LoadClass, \ML, \NN,
@@ -407,11 +432,14 @@
% }
%
% \OPTS{Footer fields}{Footer fields are shown in the order in which
-% they appear below; they are empty by default, and empty
-% fields are not displayed.}{
+% they appear below; they are empty by default, and empty fields are not displayed.
+% The order of the fields can be changed with the \T{footorder} option.}{
% \T{[no]footer} & enables or disables printing a page footer; there is room
% for upto four fields, if you set five fields, the last
% 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 fieldnames.
+% The default is \T{website;phone;cellphone;fax;email}.\NN
% \T{phoneprefix} & prefix for phone numbers. The default is `0'; will be changed
% into `+$<$areacode$>$-' if the \T{foreign} option is used.\NN
% \T{phone = ...} & if not empty, prints `phone' in the first field of the
@@ -508,17 +536,23 @@
% |listkeys show|}
%
% \noindent\begin{tabular}{@{}lllll@{}}
-% accept &addresswidth &currency &ourref &website \NN
-% acceptaccount &areacode &email &phone &who \NN
-% acceptaddress &autograph &enclosures &phoneprefix &yourletter \NN
-% acceptcents &bic &fax &returnaddress &yourref \NN
-% acceptdesc &cellphone &rightaddress &zip \NN
-% acceptdescription &chamber &forcedate &routingno & \NN
-% accepteuros &city &iban &signature & \NN
-% acceptreference &closing &leftaddress &street & \NN
-% accountname &company &logoaddress &subject & \NN
-% accountno &country &opening &term & \NN
-% addresscenter &countrycode &openingcomma &vatno & \NN
+% accept &cellphone &fold &nofill &subject \NN
+% acceptaccount &chamber &fold2 &nofold &term \NN
+% acceptaddress &city &fold3 &nofooter &to \NN
+% acceptcents &cityzip &foldleft &noheader &vatno \NN
+% acceptdesc &closing &foldright &noreturn &website \NN
+% acceptdescription &closingskip &footer &opening &who \NN
+% accepteuros &company &footorder &openingcomma &yourletter \NN
+% acceptreference &country &forcedate &ourref &yourref \NN
+% accountname &countrycode &foreign &phone &zip \NN
+% accountno &currency &french &phoneprefix & \NN
+% addresscenter &date &german &return & \NN
+% addresswidth &dutch &header &returnaddress & \NN
+% american &email &iban &rightaddress & \NN
+% areacode &enclosures &language &routingno & \NN
+% autograph &english &leftaddress &shift & \NN
+% bic &fax &localbank &signature & \NN
+% bodyshift &fill &logoaddress &street & \NN
% \end{tabular}
%
% \noindent So you could write in your letter: ``please send me the money on my bank
@@ -1009,6 +1043,8 @@
% A footer is switched on or off with the |footer| and |nofooter| options.
% The default is the have no footer.
% \begin{macrocode}
+\define@key{isodoc}{footorder} {\def\footorder{#1}}
+ \def\footorder{website;phone;cellphone;fax;email}
\define@key{isodoc}{footer} []{\footertrue}
\newif\iffooter\footerfalse
\define@key{isodoc}{nofooter}[]{\footerfalse}
@@ -1029,19 +1065,18 @@
% \begin{macrocode}
\define@key{isodoc}{areacode} {\def\areacode{#1}}
\def\areacode{\Undefined{areacode}}
-\define@key{isodoc}{phone} {\def\phone{#1}}
- \def\phone{}
+\define@key{isodoc}{phone} {\def\isodoc@phone{#1}}
+ \def\isodoc@phone{}
\define@key{isodoc}{phoneprefix}{\def\phoneprefix{#1}}
\def\phoneprefix{0}
-\define@key{isodoc}{cellphone} {\def\cellphone{#1}}
- \def\cellphone{}
-\define@key{isodoc}{fax} {\def\fax{#1}}
- \def\fax{}
+\define@key{isodoc}{cellphone} {\def\isodoc@cellphone{#1}}
+ \def\isodoc@cellphone{}
+\define@key{isodoc}{fax} {\def\isodoc@fax{#1}}
+ \def\isodoc@fax{}
\define@key{isodoc}{website} {\def\website{#1}}
\def\website{}
\define@key{isodoc}{email} {\def\email{#1}}
\def\email{}
-\def\lead{\ifforeign+\areacode-\else\phoneprefix\fi}
% \end{macrocode}
% \subsubsection{Folding mark}
% \DescribeMacro{nofold}
@@ -1385,24 +1420,6 @@
\fi
}
% \end{macrocode}
-% \DescribeMacro{\footfield}
-% Create any non-empty footfields, starting at left arguments:
-% \begin{compactenum}
-% \item fieldlabel
-% \item a prefix for the content (for phone numbers)
-% \item the content
-% \end{compactenum}
-% \begin{macrocode}
-\def\footfield#1#2#3{%
- \ifx#3\empty\else
- \Tbox{\footcount}{\footerpos}{35}{\noindent
- {\@hft#1}\\
- #2#3
- }
- \advance\footcount35
- \fi
-}
-% \end{macrocode}
% \DescribeMacro{\accountdata}
% Print a table with banking information. Show account number, account
% name + city, and a reference. If the |foreign| key was used,
@@ -1455,37 +1472,65 @@
accountno & \accountno\NN
addresscenter & \addresscenter\NN
addresswidth & \addresswidth\NN
+ american & \american\NN
areacode & \areacode\NN
autograph & \autograph\NN
bic & \bic\NN
+ bodyshift & \bodyshift\NN
cellphone & \cellphone\NN
chamber & \chamber\NN
city & \city\NN
+ cityzip & \cityzip\NN
closing & \closing\NN
- closingcomma & \closingcomma\NN
+ closingskip & \closingskip\NN
company & \company\NN
country & \country\NN
countrycode & \countrycode\NN
currency & \currency\NN
+ date & \date\NN
+ dutch & \dutch\NN
email & \email\NN
enclosures & \enclosures\NN
+ english & \english\NN
fax & \fax\NN
+ fill & \fill\NN
+ fold & \fold\NN
+ fold2 & \fold2\NN
+ fold3 & \fold3\NN
+ foldleft & \foldleft\NN
+ foldright & \foldright\NN
+ footer & \footer\NN
+ footorder & \footorder\NN
forcedate & \forcedate\NN
+ foreign & \foreign\NN
+ french & \french\NN
+ german & \german\NN
+ header & \header\NN
iban & \iban\NN
+ language & \language\NN
leftaddress & \leftaddress\NN
+ localbank & \localbank\NN
logoaddress & \logoaddress\NN
+ nofill & \nofill\NN
+ nofold & \nofold\NN
+ nofooter & \nofooter\NN
+ noheader & \noheader\NN
+ noreturn & \noreturn\NN
opening & \opening\NN
openingcomma & \openingcomma\NN
ourref & \ourref\NN
phone & \phone\NN
phoneprefix & \phoneprefix\NN
+ return & \return\NN
returnaddress & \returnaddress\NN
rightaddress & \rightaddress\NN
routingno & \routingno\NN
+ shift & \shift\NN
signature & \signature\NN
street & \street\NN
subject & \subject\NN
term & \term\NN
+ to & \to\NN
vatno & \vatno\NN
website & \website\NN
who & \who\NN
@@ -1564,6 +1609,10 @@
\newcommand{\letter}[2][]{{%
\newpage
\setkeys{isodoc}{#1}
+ \def\isodoc@lead{\ifforeign+\areacode-\else\phoneprefix\fi}
+ \ifx\isodoc@phone\empty\else\def\phone{\isodoc@lead\isodoc@phone}\fi
+ \ifx\isodoc@cellphone\empty\else\def\cellphone{\isodoc@lead\isodoc@cellphone}\fi
+ \ifx\isodoc@fax\empty\else\def\fax{\isodoc@lead\isodoc@fax}\fi
% \end{macrocode}
% By now, a language should have been chosen; if not, issue a warning
% and set the language to the default: UKenglish
@@ -1581,14 +1630,16 @@
\fancyhf{}
\if@twoside
\fancyhead[LE,RO]{\color{headingcolor}%
- \pagetext\ \thepage\ \oftext{} \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
+ \pagetext\ \thepage\ \oftext{}
+ \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
\fancyhead[RE,LO]{\color{headingcolor}%
\totext: \toname\ (\date)}
\else
\fancyhead[L]{\color{headingcolor}%
- \totext: \toname\ (\date)}
+ \totext: \toname\ (\date)}
\fancyhead[R]{\color{headingcolor}%
- \pagetext\ \thepage\ \oftext{} \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
+ \pagetext\ \thepage\ \oftext{}
+ \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
\fi
\logo
% \end{macrocode}
@@ -1641,7 +1692,7 @@
\advance\textskip-12
\fi
% \end{macrocode}
-% Create any non-empty footfields, starting at left;
+% Create any non-empty footfields, starting at the left;
% (===>must have to be made variable with an option footfieldorder):
% \begin{macrocode}
\footcount=35
@@ -1655,7 +1706,7 @@
}
\advance\footcount35
\fi
- }{website;phone;cellphone;fax;email} % variabele/optie van maken
+ }{\footorder}
\fi
{ \parskip=0pt\parindent=0pt
\begin{textblock*}{3mm}(\xfold,\yfold)%
@@ -2176,4 +2227,4 @@
% \end{macrocode}
% \Finale
\endinput
-$Id: isodoc.dtx,v 1.35 2012/02/19 20:14:36 wybo Exp $
+$Id: isodoc.dtx,v 1.36 2012/02/21 16:46:25 wybo Exp $
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
index 79b376a2a2b..5c3cb39ee02 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}%
- [2012/02/19 v0.9 isodoc class for letters and invoices]
+ [2012/02/21 v0.10 isodoc class for letters and invoices]
\ifx\pdfoutput\undefined\else%
\ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{}
\fi\fi
@@ -109,24 +109,25 @@
\newcount\subjectpos
\newcount\openingpos
\newcount\textskip
+\define@key{isodoc}{footorder} {\def\footorder{#1}}
+ \def\footorder{website;phone;cellphone;fax;email}
\define@key{isodoc}{footer} []{\footertrue}
\newif\iffooter\footerfalse
\define@key{isodoc}{nofooter}[]{\footerfalse}
\define@key{isodoc}{areacode} {\def\areacode{#1}}
\def\areacode{\Undefined{areacode}}
-\define@key{isodoc}{phone} {\def\phone{#1}}
- \def\phone{}
+\define@key{isodoc}{phone} {\def\isodoc@phone{#1}}
+ \def\isodoc@phone{}
\define@key{isodoc}{phoneprefix}{\def\phoneprefix{#1}}
\def\phoneprefix{0}
-\define@key{isodoc}{cellphone} {\def\cellphone{#1}}
- \def\cellphone{}
-\define@key{isodoc}{fax} {\def\fax{#1}}
- \def\fax{}
+\define@key{isodoc}{cellphone} {\def\isodoc@cellphone{#1}}
+ \def\isodoc@cellphone{}
+\define@key{isodoc}{fax} {\def\isodoc@fax{#1}}
+ \def\isodoc@fax{}
\define@key{isodoc}{website} {\def\website{#1}}
\def\website{}
\define@key{isodoc}{email} {\def\email{#1}}
\def\email{}
-\def\lead{\ifforeign+\areacode-\else\phoneprefix\fi}
\define@key{isodoc}{nofold}[]{\yfold=-1mm}
\newdimen\yfold\yfold=-1mm
\define@key{isodoc}{foldleft}[]{\xfold=9mm}
@@ -289,15 +290,6 @@
\ifnum \day > 31 \ClassError{isodoc}{Illegal date: day>31}{}\fi
\fi
}
-\def\footfield#1#2#3{%
- \ifx#3\empty\else
- \Tbox{\footcount}{\footerpos}{35}{\noindent
- {\@hft#1}\\
- #2#3
- }
- \advance\footcount35
- \fi
-}
\def\accountdata{
\textbf{\accountdatatext:}\\
\begin{tabular}{@{}rl@{}}
@@ -337,37 +329,65 @@
accountno & \accountno\NN
addresscenter & \addresscenter\NN
addresswidth & \addresswidth\NN
+ american & \american\NN
areacode & \areacode\NN
autograph & \autograph\NN
bic & \bic\NN
+ bodyshift & \bodyshift\NN
cellphone & \cellphone\NN
chamber & \chamber\NN
city & \city\NN
+ cityzip & \cityzip\NN
closing & \closing\NN
- closingcomma & \closingcomma\NN
+ closingskip & \closingskip\NN
company & \company\NN
country & \country\NN
countrycode & \countrycode\NN
currency & \currency\NN
+ date & \date\NN
+ dutch & \dutch\NN
email & \email\NN
enclosures & \enclosures\NN
+ english & \english\NN
fax & \fax\NN
+ fill & \fill\NN
+ fold & \fold\NN
+ fold2 & \fold2\NN
+ fold3 & \fold3\NN
+ foldleft & \foldleft\NN
+ foldright & \foldright\NN
+ footer & \footer\NN
+ footorder & \footorder\NN
forcedate & \forcedate\NN
+ foreign & \foreign\NN
+ french & \french\NN
+ german & \german\NN
+ header & \header\NN
iban & \iban\NN
+ language & \language\NN
leftaddress & \leftaddress\NN
+ localbank & \localbank\NN
logoaddress & \logoaddress\NN
+ nofill & \nofill\NN
+ nofold & \nofold\NN
+ nofooter & \nofooter\NN
+ noheader & \noheader\NN
+ noreturn & \noreturn\NN
opening & \opening\NN
openingcomma & \openingcomma\NN
ourref & \ourref\NN
phone & \phone\NN
phoneprefix & \phoneprefix\NN
+ return & \return\NN
returnaddress & \returnaddress\NN
rightaddress & \rightaddress\NN
routingno & \routingno\NN
+ shift & \shift\NN
signature & \signature\NN
street & \street\NN
subject & \subject\NN
term & \term\NN
+ to & \to\NN
vatno & \vatno\NN
website & \website\NN
who & \who\NN
@@ -409,6 +429,10 @@
\newcommand{\letter}[2][]{{%
\newpage
\setkeys{isodoc}{#1}
+ \def\isodoc@lead{\ifforeign+\areacode-\else\phoneprefix\fi}
+ \ifx\isodoc@phone\empty\else\def\phone{\isodoc@lead\isodoc@phone}\fi
+ \ifx\isodoc@cellphone\empty\else\def\cellphone{\isodoc@lead\isodoc@cellphone}\fi
+ \ifx\isodoc@fax\empty\else\def\fax{\isodoc@lead\isodoc@fax}\fi
\ifx\yourlettertext\undefined\ClassWarning{isodoc}{
You did not use the language option; using the default: UKenglish
}\isodoc@UKenglish\fi
@@ -422,14 +446,16 @@
\fancyhf{}
\if@twoside
\fancyhead[LE,RO]{\color{headingcolor}%
- \pagetext\ \thepage\ \oftext{} \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
+ \pagetext\ \thepage\ \oftext{}
+ \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
\fancyhead[RE,LO]{\color{headingcolor}%
\totext: \toname\ (\date)}
\else
\fancyhead[L]{\color{headingcolor}%
- \totext: \toname\ (\date)}
+ \totext: \toname\ (\date)}
\fancyhead[R]{\color{headingcolor}%
- \pagetext\ \thepage\ \oftext{} \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
+ \pagetext\ \thepage\ \oftext{}
+ \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}}
\fi
\logo
{ \parskip=0pt\parindent=0pt
@@ -488,7 +514,7 @@
}
\advance\footcount35
\fi
- }{website;phone;cellphone;fax;email} % variabele/optie van maken
+ }{\footorder}
\fi
{ \parskip=0pt\parindent=0pt
\begin{textblock*}{3mm}(\xfold,\yfold)%