From 015a7d6d2e968aea69870190cceb5309ee0766ca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Feb 2012 23:28:03 +0000 Subject: isodoc (20feb12) git-svn-id: svn://tug.org/texlive/trunk@25445 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/isodoc/Entries | 16 ++--- Master/texmf-dist/doc/latex/isodoc/README | 39 ++++-------- Master/texmf-dist/doc/latex/isodoc/doc/letter.tex | 21 ------- Master/texmf-dist/doc/latex/isodoc/inst | 36 +++++------ Master/texmf-dist/doc/latex/isodoc/invoice.tex | 4 +- Master/texmf-dist/doc/latex/isodoc/isodoc.pdf | Bin 880544 -> 707552 bytes .../texmf-dist/doc/latex/isodoc/isodocsymbols.sty | 15 +++++ Master/texmf-dist/doc/latex/isodoc/isontg.sty | 4 +- Master/texmf-dist/doc/latex/isodoc/isowybo.sty | 6 +- Master/texmf-dist/doc/latex/isodoc/letter.tex | 66 +++++---------------- Master/texmf-dist/doc/latex/isodoc/logostyle.sty | 6 +- Master/texmf-dist/doc/latex/isodoc/mystyle.sty | 6 +- 12 files changed, 83 insertions(+), 136 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/isodoc/doc/letter.tex create mode 100644 Master/texmf-dist/doc/latex/isodoc/isodocsymbols.sty (limited to 'Master/texmf-dist/doc/latex/isodoc') diff --git a/Master/texmf-dist/doc/latex/isodoc/Entries b/Master/texmf-dist/doc/latex/isodoc/Entries index a0a20bd69e3..0f5bfc2dcd0 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// -/invoice.tex/1.2/Sun Nov 5 15:38:52 2006// /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// -/inst/1.17/Sat Aug 21 15:26:13 2010// -/isontg.sty/1.10/Tue Aug 24 19:20:55 2010// -/isowybo.sty/1.8/Tue Aug 24 19:20:55 2010// -/mystyle.sty/1.6/Tue Aug 24 19:20:55 2010// -/logostyle.sty/1.6/Tue Aug 24 19:23:57 2010// -/logoletter.tex/1.5/Tue Aug 24 19:24:45 2010// -/letter.tex/1.4/Tue Aug 24 19:26:39 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// +/logostyle.sty/1.9/Sun Feb 19 20:17:55 2012// +/mystyle.sty/1.9/Sun Feb 19 20:18:01 2012// +/inst/1.20/Sun Feb 19 20:18:18 2012// D diff --git a/Master/texmf-dist/doc/latex/isodoc/README b/Master/texmf-dist/doc/latex/isodoc/README index 0d5c85cebf3..eed3ce5c5e5 100644 --- a/Master/texmf-dist/doc/latex/isodoc/README +++ b/Master/texmf-dist/doc/latex/isodoc/README @@ -1,6 +1,7 @@ -This is version 0.8 of the isodoc class +This is version 0.9 of the isodoc class License: LPPL +Short description: The isodoc class can be used for the preparation of letters, invoices, and, in the future, similar documents. Documents are set up with options, thus making the class easily adaptable to user’s @@ -8,30 +9,14 @@ 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.8 relative to v0.7: -- 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 -- 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 -- positioning of headings, subject, opening, body text fixed -- repaired several minor bugs +major changes of v0.9 relative to v0.8: +- 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 +- added some missing \NN +- removed some unwanted whitespace -$Id: README,v 1.6 2010-08-24 19:56:44 wybo Exp $ +$Id: README,v 1.10 2012/02/19 20:46:13 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/doc/letter.tex b/Master/texmf-dist/doc/latex/isodoc/doc/letter.tex deleted file mode 100644 index 3a7518da2b0..00000000000 --- a/Master/texmf-dist/doc/latex/isodoc/doc/letter.tex +++ /dev/null @@ -1,21 +0,0 @@ -\documentclass[11pt]{isodoc} -\usepackage{mystyle} -\definecolor{headcolor}{gray}{.5} -\setupdocument{ - to = {TeX Users Group\\ - 1466 NW Naito Parkway, Suite 3141\\ - Portland, OR 97208-2311\\ - U.S.A - }, - ourref = 1029, - enclosures = isodoc documentation\\LPPL documentation, - subject = An example letter using the isodoc class, - autograph = 2, -} - -\begin{document} -\letter[language=italian]{This letter was composed using the \LaTeX{} isodoc class. - \par\input{thuan} % for some body -} -\end{document} -$Id: letter.tex,v 1.4 2010-08-24 19:26:39 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/inst b/Master/texmf-dist/doc/latex/isodoc/inst index 74e7566223f..59611d549d0 100644 --- a/Master/texmf-dist/doc/latex/isodoc/inst +++ b/Master/texmf-dist/doc/latex/isodoc/inst @@ -1,7 +1,8 @@ #!/bin/bash -# this script creates and installs the isodoc class and its -# documentation +NAME=isodoc +# this script creates and installs the NAME class and its +# documentation, and can make a zip for CTAN uploads # ./inst : create everything, install in local tree, make zip for CTAN # ./inst clean : remove all that can be restored @@ -13,13 +14,14 @@ function die { } function clean() { # remove all that can be restored, - # except isodoc.cls and isodoc.pdf + # except NAME.cls and NAME.pdf for i in *.tex; do mk -C $i done - mk -c isodoc + mk -c $NAME rm -f chopin* *.png *.jpg # these are in binaries.m64 rm -f logo[12].pdf *.txt + rm -f isodocsymbols.sty } # The script needs: @@ -32,15 +34,15 @@ for i in mk vpp unzip uudecode; do type $i &> /dev/null || die executable $i not found done -NAME=isodoc LOCAL=`kpsewhich --expand-var '$TEXMFLOCAL'` # local tex dir if [ "$LOCAL" = "" ]; then echo 'Could not find value for $TEXMFLOCAL' exit 1 fi -LOCAL=${LOCAL}tex/latex/isodoc -ln -sf ../isodoc.dtx -ln -sf ../isodoc.ins +LOCAL=${LOCAL}tex/latex/$NAME +ln -sf ../$NAME.dtx +ln -sf ../$NAME.ins +ln -sf ../isodocsymbols.sty # binary files are stored cvs as a mime64-encoded zip file binaries.m64 @@ -53,18 +55,18 @@ ln -sf ../isodoc.ins case "$1" in clean) clean - rm -f isodoc.{cls,pdf,ins,dtx} + rm -f $NAME.{cls,pdf,ins,dtx} isodocsymbols.sty ;; zip) echo make zip - mv isodoc.cls isodoc.pdf .. + mv $NAME.cls $NAME.pdf .. clean - rm isodoc.dtx isodoc.ins + rm $NAME.dtx $NAME.ins cd .. - version=`grep ' v[0-9.]\+ isodoc class' isodoc.dtx |sed 's/.* v\([0-9.]\+\) .*/\1/' ` - zipfile=isodoc-$version.zip + version=`grep " v[0-9.]\+ $NAME class" $NAME.dtx |sed 's/.* v\([0-9.]\+\) .*/\1/' ` + zipfile=$NAME-$version.zip zip -Drq $zipfile * -x CVS/* - rm isodoc.cls isodoc.pdf + rm $NAME.cls $NAME.pdf ;; "") echo unpack binaries @@ -91,12 +93,12 @@ 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 isodoc + texlog_extract $NAME echo install in local tree rm -rf $LOCAL mkdir -p $LOCAL - cp $NAME.{dtx,cls,pdf} $LOCAL # install in local tex tree + cp $NAME.{dtx,cls,pdf} isodocsymbols.sty $LOCAL # install in local tex tree mktexlsr $LOCAL ;; *) @@ -104,4 +106,4 @@ zip) exit 1 ;; esac -# $Id: inst,v 1.17 2010-08-21 15:26:13 wybo Exp $ +# $Id: inst,v 1.20 2012/02/19 20:18:18 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/invoice.tex b/Master/texmf-dist/doc/latex/isodoc/invoice.tex index 2eecd30650c..860a1ac0893 100644 --- a/Master/texmf-dist/doc/latex/isodoc/invoice.tex +++ b/Master/texmf-dist/doc/latex/isodoc/invoice.tex @@ -7,7 +7,7 @@ to=NTG\\Maasstraat 2\\5836 BB Sambeek } \begin{document} -\invoice{% +\invoice{ \itable{ \iitem{enveloppen}{6,60} \iitem{postzegels}{9,00} @@ -16,4 +16,4 @@ \\[3ex]\accountdata } \end{document} -$Id: invoice.tex,v 1.2 2006-11-05 15:38:52 wybo Exp $ +$Id: invoice.tex,v 1.3 2012/02/19 20:16:12 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf index 003a54706fc..7169b6879e9 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/isodocsymbols.sty b/Master/texmf-dist/doc/latex/isodoc/isodocsymbols.sty new file mode 100644 index 00000000000..79456e4d7f4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/isodoc/isodocsymbols.sty @@ -0,0 +1,15 @@ +\ProvidesPackage{isodocsymbols} + [2010/12/04 v1.0 Symbols for isodoc] +\IfFileExists{marvosym.sty}{}{\ClassError{isodoc}{package marvosym is not installed}{}} +\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 +\endinput +$Id: isodocsymbols.sty,v 1.1 2010/12/05 22:27:25 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/isontg.sty b/Master/texmf-dist/doc/latex/isodoc/isontg.sty index 3930410caca..0e2177ce023 100644 --- a/Master/texmf-dist/doc/latex/isodoc/isontg.sty +++ b/Master/texmf-dist/doc/latex/isodoc/isontg.sty @@ -17,7 +17,7 @@ company = NTG, country = The Netherlands, countrycode = NL, dutch, -email = wybo@servalys.nl, +email = wybo@ntg.nl, fax = 842--23\,43\,93, fold3, footer, @@ -56,4 +56,4 @@ cityzip \end{textblock} } \endinput -$Id: isontg.sty,v 1.10 2010-08-24 19:20:55 wybo Exp $ +$Id: isontg.sty,v 1.13 2012/02/19 20:17:37 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/isowybo.sty b/Master/texmf-dist/doc/latex/isodoc/isowybo.sty index c57778ab4d6..7d567cb181b 100644 --- a/Master/texmf-dist/doc/latex/isodoc/isowybo.sty +++ b/Master/texmf-dist/doc/latex/isodoc/isowybo.sty @@ -18,7 +18,7 @@ company = Wybo Dekker, country = The Netherlands, countrycode = NL, dutch, -email = wybo@servalys.nl, +email = wybo@xs4all.nl, fax = 842--234393, fold3, footer, @@ -29,7 +29,7 @@ return, returnaddress = W.H.\ Dekker\\Deilsedijk 60\\4158 CH Deil, signature = Wybo Dekker, street = Deilsedijk 60, -website = www.servalys.nl, +website = www.xs4all.nl, who = Wybo Dekker, addresscenter = 67, zip = 4158 CH, @@ -37,4 +37,4 @@ zip = 4158 CH, \autograph{2}{.15}{82bp}{15bp}{290bp}{370bp}{signw.png} \autograph{3}{.20}{65bp}{61bp}{263bp}{260bp}{signws.png} \endinput -$Id: isowybo.sty,v 1.8 2010-08-24 19:20:55 wybo Exp $ +$Id: isowybo.sty,v 1.11 2012/02/19 20:17:46 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/letter.tex b/Master/texmf-dist/doc/latex/isodoc/letter.tex index 1a06daa2fbc..ff709861b41 100644 --- a/Master/texmf-dist/doc/latex/isodoc/letter.tex +++ b/Master/texmf-dist/doc/latex/isodoc/letter.tex @@ -1,56 +1,22 @@ -\documentclass[10pt]{isodoc} -\usepackage[english,dutch]{babel} +\documentclass[11pt]{isodoc} +\usepackage{mystyle} +\definecolor{headcolor}{gray}{.5} \setupdocument{ - yourletter = 1 Marzo 2010, - yourref = 4532, - ourref = 1029, - date = 20100325, - opening = Egregi signori, - closing = Cordiali saluti, + to = {TeX Users Group\\ + 1466 NW Naito Parkway, Suite 3141\\ + Portland, OR 97208-2311\\ + U.S.A + }, + ourref = 1029, enclosures = isodoc documentation\\LPPL documentation, - subject = Esempio di lettera che utilizza isodoc.cls, -%noheader, - autograph = 1, - language = italian, - company = Wybo Dekker, - street = Deilsedijk 60, - zip = 4158 CH, - city = Deil, - country= The Netherlands, - who = {}, - email = wybo@servalys.nl, -%bodyshift = 10, - footer + subject = An example letter using the isodoc class, + autograph = 2, } \begin{document} -\letter[ - signature = Wybo, - to = {TeX Users Group\\ - 1466 NW Naito Parkway, Suite 3141\\ - Portland, OR 97208-2311\\ - U.S.A - }, -]{ \par\input{thuan} } - -\selectlanguage{english} -\letter[english, - signature = Wybo, - to = {TeX Users Group\\ - 1466 NW Naito Parkway, Suite 3141\\ - Portland, OR 97208-2311\\ - U.S.A - }, -]{ \par\input{thuan} } - -\selectlanguage{dutch} -\letter[dutch, - signature = Wybo, - to = {TeX Users Group\\ - 1466 NW Naito Parkway, Suite 3141\\ - Portland, OR 97208-2311\\ - U.S.A - }, -]{ \par\input{sample-dutch} } +\letter[language=italian]{ +This letter was composed using the \LaTeX{} isodoc class. + \par\input{thuan} % for some body +} \end{document} -$Id: letter.tex,v 1.2 2006-11-05 15:49:44 wybo Exp $ +$Id: letter.tex,v 1.5 2012/02/19 20:15:59 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/logostyle.sty b/Master/texmf-dist/doc/latex/isodoc/logostyle.sty index ebe00df5e05..dff8881d1ba 100644 --- a/Master/texmf-dist/doc/latex/isodoc/logostyle.sty +++ b/Master/texmf-dist/doc/latex/isodoc/logostyle.sty @@ -15,8 +15,8 @@ phone = {87-87\,48\,496}, cellphone = {6-15\,49\,20\,70}, fax = {}, - website = www.servalys.nl, - email = wybo@servalys.nl, + website = www.xs4all.nl, + email = wybod@xs4all, accountno = {3040\,46221}, iban = nl61pstb0006238747, bic = pstbnl21, @@ -50,4 +50,4 @@ \setdefaultlanguage{english} \setotherlanguage{dutch} \endinput -$Id: logostyle.sty,v 1.6 2010-08-24 19:23:57 wybo Exp $ +$Id: logostyle.sty,v 1.9 2012/02/19 20:17:55 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/mystyle.sty b/Master/texmf-dist/doc/latex/isodoc/mystyle.sty index 4eb97d6d06f..02703aa5850 100644 --- a/Master/texmf-dist/doc/latex/isodoc/mystyle.sty +++ b/Master/texmf-dist/doc/latex/isodoc/mystyle.sty @@ -17,8 +17,8 @@ phone = {87-87\,48\,496}, cellphone = {6-15\,49\,20\,70}, fax = {}, - website = www.servalys.nl, - email = wybo@servalys.nl, + website = www.xs4all.nl, + email = wybo@xs4all.nl, accountno = {3040\,46221}, iban = nl61pstb0006238747, bic = pstbnl21, @@ -31,4 +31,4 @@ \graphicspath{{./graphics/}} \autograph{2}{.30}{75bp}{87bp}{216bp}{261bp}{signw_marked} \endinput -$Id: mystyle.sty,v 1.6 2010-08-24 19:20:55 wybo Exp $ +$Id: mystyle.sty,v 1.9 2012/02/19 20:18:01 wybo Exp $ -- cgit v1.2.3