summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/isodoc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-15 23:21:20 +0000
committerKarl Berry <karl@freefriends.org>2015-06-15 23:21:20 +0000
commitf4d0afdee42507adc04408c96795d46b1075306f (patch)
treef478ba928672362e7593adac369ad779c55dc691 /Master/texmf-dist/doc/latex/isodoc
parentcf42134e440c3c49b1222d85301251e312f85fa5 (diff)
isodoc (15jun15)
git-svn-id: svn://tug.org/texlive/trunk@37549 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/isodoc')
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/README25
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/accept/accept.sty15
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/accept/accept.tex5
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/inst14
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty47
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/invoice/invoice.tex2
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/isodoc.pdfbin1351938 -> 1403873 bytes
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty2
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/logoletter/shiva-shakti.pngbin501950 -> 494931 bytes
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty4
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.tex2
11 files changed, 64 insertions, 52 deletions
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
--- 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/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
--- a/Master/texmf-dist/doc/latex/isodoc/logoletter/shiva-shakti.png
+++ b/Master/texmf-dist/doc/latex/isodoc/logoletter/shiva-shakti.png
Binary files 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}