isodoc (3Mar)

git-svn-id: svn://tug.org/texlive/trunk@33075 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 69 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/isodoc/README b/Master/texmf-dist/doc/latex/isodoc/README
index f420fe10a06..870542fba6d 100644
--- a/Master/texmf-dist/doc/latex/isodoc/README
+++ b/Master/texmf-dist/doc/latex/isodoc/README
@@ -20,7 +20,7 @@ experiment with.
 Installation:
 Execute the inst script with the --help option for more information.
 
-Changes in version 1.03:
-  - added logo and nologo options
-  - changed definitions for fancy headings and footings to allow for easy
-    adaptation in style files.
+Changes in version 1.04:
+  - footers and copyto did not work correctly.
+  - closingskip option removed; use dimen signatureskip in style file.
+  - some skips now have own dimen for easier adaptation in style file.
diff --git a/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty b/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty
index a28f36b3cec..7fa98e875b5 100644
--- a/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty
+++ b/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty
@@ -11,14 +11,11 @@ accountno     = 304046221,
 areacode      = 31,
 bic           = rabonl2u,
 city          = Deil,
-closing       = Met vriendelijke groet,
-closingskip   = 4\baselineskip,
 company       = Wybo Dekker,
 country       = The Netherlands,
 countrycode   = NL,
 language      = nl-NL,
 email         = wybo@xs4all.nl,
-fax           = 842\,234393,
 fold3,
 footer,
 iban          = nl94rabo0304046221,
@@ -26,8 +23,6 @@ opening       = L.S.,
 phone         = 87\,8748496, % phone numbers without leading 0:
 cellphone     = 6\,3033\,3955,
 return,
-returnaddress = W.H.\ Dekker\\Deilsedijk 60\\4158 CH Deil,
-signature     = Wybo Dekker,
 street        = Deilsedijk 60,
 website       = www.xs4all.nl,
 who           = Wybo Dekker,
diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
index 0d1b552c5b8..64c880d9166 100644
--- a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
+++ b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
diff --git a/Master/texmf-dist/doc/latex/isodoc/letter/letter.sty b/Master/texmf-dist/doc/latex/isodoc/letter/letter.sty
index 778e4b0a1f9..f70540db96f 100644
--- a/Master/texmf-dist/doc/latex/isodoc/letter/letter.sty
+++ b/Master/texmf-dist/doc/latex/isodoc/letter/letter.sty
@@ -2,31 +2,28 @@
 \ProvidesPackage{letter}
   [2010/08/21 v1.1 Letter Company style file for isodoc]
 \RequirePackage{pxfonts}
+\definecolor{headcolor}{gray}{.3}
+\definecolor{headingcolor}{gray}{.3}
+\encldowntrue
 
 \setupdocument{return,footer,fold3,
+  areacode        = 31,
   autograph       = 0,
-  company         = The Letter Company,
-  returnaddress   = Letter Cy\\Deilsedijk 60\\Deil,
-  who             = Wybo Dekker,
-  street          = Deilsedijk 60,
+% cellphone       = 6\,15492070,
   city            = Deil,
-  zip             = 4158 CH,
+  closing         = Best regards,
+  company         = The Letter Company,
   country         = The Netherlands,
   countrycode     = NL,
-  areacode        = 31,
-  phone           = {87\,8748496},
-  cellphone       = {6\,15492070},
-  fax             = {},
-  website         = www.xs4all.nl,
   email           = wybo@xs4all.nl,
-  accountno       = {304046221},
-  iban            = nl61pstb0006238747,
-  bic             = pstbnl21,
-  vatno           = 28750482B01,
-  chamber         = 11023220,
   opening         = L.S.,
-  closing         = Best regards,
+  phone           = 87\,8748496,
+  returnaddress   = Letter Cy\\Deilsedijk 60\\Deil,
   signature       = W.H.~Dekker,
+  street          = Deilsedijk 60,
+  website         = www.xs4all.nl,
+  who             = Wybo Dekker,
+  zip             = 4158 CH,
 }
 \autograph{2}{35mm}{34}{83}{28}{signmarked}
 \endinput
diff --git a/Master/texmf-dist/doc/latex/isodoc/letter/letter.tex b/Master/texmf-dist/doc/latex/isodoc/letter/letter.tex
index b92972fb97c..ae1f7e57b30 100644
--- a/Master/texmf-dist/doc/latex/isodoc/letter/letter.tex
+++ b/Master/texmf-dist/doc/latex/isodoc/letter/letter.tex
@@ -1,6 +1,5 @@
 \documentclass{isodoc}
 \usepackage{letter}
-\definecolor{headcolor}{gray}{.5}
 \setupdocument{
          to = {TeX Users Group\\
                1466 NW Naito Parkway, Suite 3141\\
@@ -9,13 +8,13 @@
               },
      ourref = 1029,
  enclosures = isodoc documentation\\LPPL documentation,
+     copyto = {Dutch TeX User group, NTG},
     subject = An example letter using the isodoc class --
 		with an extra long subject extending over two lines.,
   autograph,foreign
 }
-
 \begin{document}
-\letter[language=it-IT]{
+\letter[language=itIT]{
 This letter was composed using the \LaTeX{} isodoc class. 
   \par\input{thuan} % for some body
 }
diff --git a/Master/texmf-dist/doc/latex/isodoc/listkeys b/Master/texmf-dist/doc/latex/isodoc/listkeys
new file mode 100755
index 00000000000..cd2e9336fd2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/isodoc/listkeys
@@ -0,0 +1,50 @@
+#!/bin/bash
+#shopt -s extglob
+
+# after the addition of new options, two regions of the documentation in
+# isodoc.dtx need to be updated:
+# 1. the body of the definition of \showkeys
+#    listkeys will print that body with the argument `show'
+# 2. The body of the tabular (in the section `Commands'), which shows
+#    the options having a corresponding command.
+#    listkeys will print that body with the argument `defs'
+#    
+# An easy way to replace the data in isodoc.dtx is, using the vim editor: 
+# 1. select the lines (the contents of \def\showkeys, say) with V and then
+# 2. type :!listkeys show 
+
+
+usage() { echo "Usage: listkeys defs|show"; exit; }
+[[ -z $1 ]] && usage
+
+type=$1
+[[ $type =~ ^(defs|show)$ ]] || usage
+
+minipage='^(acceptdesc|copyto|enclosures|logoaddres|signature|returnaddress)$'
+undef='^(accountname|accountno|bic|iban|routingno|vatno)$'
+# find keys which have a corresponding command:
+a=($(
+   while read -r x; do
+     [[ $x =~ define@key ]] || continue
+     # \define@key{isodoc}{closing}     {\def\closing{#1}}
+     re='\\define@key\{isodoc\}\{([[:alpha:]]+)\}.*\\def\\\1\{'
+     #                            ----word----            ^^-same word  
+     [[ $x =~ $re ]] || continue
+     echo ${BASH_REMATCH[1]}
+   done<isodoc.dtx |sort
+))
+
+if [[ $type == defs ]]; then
+   for i in ${a[@]}; do 
+      if [[ $i =~ $minipage ]]; then
+         printf "%20s & \\%s\\NN\n" $i "@isodocmp{$i}"
+      elif [[ $i =~ $undef ]]; then
+         printf "%20s & \\%s\\NN\n" $i "@isodocun{$i}"
+      else
+         printf "%20s & \\%s\\NN\n" $i $i
+      fi
+   done
+else
+   for i in ${a[@]}; do echo $i; done |
+	cols -5 --squeeze --sep=' & ' --suf='\NN' --pre='% '
+fi