diff options
author | Karl Berry <karl@freefriends.org> | 2013-11-24 22:39:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-11-24 22:39:41 +0000 |
commit | 7d8d8f2338990bb460545d4ca8b2738b0d3bb25e (patch) | |
tree | 8b8a228ae53884bb0e743634ff0d889f7fa074dc /Master/texmf-dist/tex/latex/isodoc/isodoc.cls | |
parent | 6e0f34e245fab47908d119308f36b78b2dbc833d (diff) |
isodoc (24nov13)
git-svn-id: svn://tug.org/texlive/trunk@32230 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/isodoc/isodoc.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/isodoc/isodoc.cls | 93 |
1 files changed, 56 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls index af2452ba748..f47269e5f25 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}% - [2013/08/27 v1.00 isodoc class for letters and invoices] + [2013/08/27 v1.01 isodoc class for letters and invoices] \ifx\pdfoutput\undefined\else% \ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{} \fi\fi @@ -212,7 +212,17 @@ \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 -\RequirePackage{isodocsymbols} +\newcommand{\@isodocsym}{% + \fontfamily{mvs}\fontencoding{U}% + \fontseries{m}\fontshape{n}\selectfont +} +\def\EuroSymbol {{\@isodocsym\char164}} +\def\EUROSymbol {{\@isodocsym\char99 }} +\def\LetterSymbol {{\@isodocsym\char66 }} +\def\EmailSymbol {{\@isodocsym\char107}} +\def\PhoneSymbol {{\@isodocsym\char84 }} +\def\MobileSymbol {{\@isodocsym\char72 }} +\let\EUR\EuroSymbol \newdimen\iso@outdent \newdimen\iso@signpos \newdimen\iso@down @@ -429,7 +439,7 @@ \clearpage{\pagestyle{empty}\cleardoublepage} \setcounter{section}{0} \setkeys{isodoc}{#1} - \def\isodoc@lead{\ifforeign+\areacode-\else\phoneprefix\fi} + \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 @@ -456,7 +466,7 @@ \totext: \toname\ (\date)} \else \fancyhead[L]{\color{headingcolor}% - \totext: \toname\ (\date)} + \mbox{\totext: \toname\ (\date)}} \fancyhead[R]{\color{headingcolor}% \pagetext\ \thepage\ \oftext{} \begin{NoHyper}\pageref{LastPageOf\thelettercount}\end{NoHyper}} @@ -497,9 +507,11 @@ } \ifx\subject\empty\else% \Tbox{35}{\subjectpos}{140}{\noindent - \begin{tabularx}{\hsize}{@{}l>{\raggedright}X@{}} - \@hft\subjecttext&\subject - \end{tabularx} + \ifx\subjecttext\empty{\bfseries\subject}\else% + \begin{tabularx}{\hsize}{@{}l>{\raggedright}X@{}} + \@hft\subjecttext&\subject + \end{tabularx} + \fi } \fi \else @@ -528,36 +540,43 @@ \vspace{\textskip mm} \thispagestyle{empty} \noindent\ignorespaces#2 - {\parindent=0pt\parskip=\baselineskip - \ifclosing - \ifcase\autographversion - \par\closing\closingcomma\\\signature % 0: closing on the next line - \or\par\closing\closingcomma\\[\closingskip]\signature % 1: whiteskip - \or\autographA - \or\autographB - \or\autographC - \or\autographD - \or\autographE - \or\autographF - \or\autographG - \or\autographH - \else - \par\Undefined{autograph: \autographversion}\\ - \fi - \fi - \ifx\enclosures\empty\else - \vfill - \setbox1=\vbox{\enclosures}% - \textbf{\ifdim\ht1>\baselineskip\enclosurestext\else\enclosuretext\fi}% - \\\enclosures - \fi - \ifx\copyto\empty\else - \ifx\enclosures\empty\vfill\else\\[2ex]\fi - \setbox1=\vbox{\copyto}% - \textbf{\copytotext}% - \\\copyto - \fi - } + \ifclosing + \par\noindent\begin{minipage}[t]{\hsize} + \parindent=0pt\parskip=\baselineskip + \ifcase\autographversion + \par\closing\closingcomma\\\signature % 0: closing on the next line + \or\par\closing\closingcomma\\[\closingskip]\signature % 1: whiteskip + \or\autographA + \or\autographB + \or\autographC + \or\autographD + \or\autographE + \or\autographF + \or\autographG + \or\autographH + \else + \par\Undefined{autograph: \autographversion}\\ + \fi + \end{minipage} + \fi + \ifx\enclosures\empty\else + \par\noindent\begin{minipage}[t]{\hsize} + \parindent=0pt\parskip=\baselineskip + \vfill + \setbox1=\vbox{\enclosures}% + \textbf{\ifdim\ht1>\baselineskip\enclosurestext\else\enclosuretext\fi}% + \\\enclosures + \end{minipage} + \fi + \ifx\copyto\empty\else + \par\noindent\begin{minipage}[t]{\hsize} + \parindent=0pt\parskip=\baselineskip + \ifx\enclosures\empty\vfill\else\\[2ex]\fi + \setbox1=\vbox{\copyto}% + \textbf{\copytotext}% + \\\copyto + \end{minipage} + \fi \label{LastPageOf\thelettercount} }} \def\Cbox#1#2#3#4{% |