isodoc (24nov13)

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

8 files changed, 40 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/latex/isodoc/README b/Master/texmf-dist/doc/latex/isodoc/README
index 2ca35405b22..324df7c8b0a 100644
--- a/Master/texmf-dist/doc/latex/isodoc/README
+++ b/Master/texmf-dist/doc/latex/isodoc/README
@@ -17,26 +17,13 @@ which implements the NEN1026 standard.
 Installation:
 Execute the inst script with the --help option for more information.
 
-Changes in version 1.00:
-  This version has incompatibilites with previous versions:
-  - languages renamed according to ISO 3166
-  - options dutch, english, american, german, french now obsolete, use
-    language option with argument nl-NL, en-GB, en-US, de-DE, fr-FR
-    respectively.
-  - localbank option removed, as IBAN is now used for all accounts
-  - footer fields appear in the order in which they were defined with
-    the footorder option.
-  - the autograph command has been completely redefined and simplified.
-  Other changes:
-  - documentation improved
-  - empty foot fields can be added with extra semicolons in the
-    footorder option.
-  - copyto option added
-  - vertical bar in invoices is automatically extended for
-    multiline entries.
-  - vertical bar in invoices can be suppressed with option novertical
-  - if class option twoside is set, letters and invoices start recto.
-  - the itotal command got an optional argument.
-  - closingcomma did not work
-  - added pdfauthor and pdfcreator (isodoc) to pdf-comment
-  - reorganized documentation directory and install script
+Changes in version 1.01:
+  - vattext was missing in all language files
+  - aus => von; subjecttext => empty for de-DE
+  - closing parts in minipages for better page break
+  - more comment on toname, today, language, subject
+  - moved contents of isodocsymbols.sty into isodoc.dtx and removed it
+  - empty subjectext generates bold subject line (habit in de-DE)
+  - page headings forced in one line
+  - more instructions for first line of address
+  - phone number prefix +nn\, instead of +nn--
diff --git a/Master/texmf-dist/doc/latex/isodoc/accept/accept.sty b/Master/texmf-dist/doc/latex/isodoc/accept/accept.sty
index 27aff13eaac..99508290b94 100644
--- a/Master/texmf-dist/doc/latex/isodoc/accept/accept.sty
+++ b/Master/texmf-dist/doc/latex/isodoc/accept/accept.sty
@@ -17,12 +17,12 @@ country       = The Netherlands,
 countrycode   = NL,
 language      = nl-NL,
 email         = wybo@ntg.nl,
-fax           = 842--23\,43\,93,
+fax           = 842\,234393,
 fold3,
 footer,
 iban          = nl05pstb0001306238,
 opening       = L.S.,
-phone         = 87--87\,48\,496, % phone numbers without leading 0:
+phone         = 87\,8748496, % phone numbers without leading 0:
 return,
 signature     = {Wybo Dekker,\\Treasurer NTG},
 street        = Deilsedijk 60,
diff --git a/Master/texmf-dist/doc/latex/isodoc/inst b/Master/texmf-dist/doc/latex/isodoc/inst
index a2d66124f91..d458c8a2c62 100644
--- a/Master/texmf-dist/doc/latex/isodoc/inst
+++ b/Master/texmf-dist/doc/latex/isodoc/inst
@@ -3,7 +3,7 @@
        NAME=isodoc
     DOCTYPE=class
         EXT=cls
-    VERSION=`grep " v[0-9.]\+ $NAME $DOCTYPE" $NAME.dtx |sed 's/.* v\([0-9.]\+\) .*/\1/' `
+    VERSION=`grep " v[0-9.]\+[a-z]\{,1\} $NAME $DOCTYPE" $NAME.dtx |sed 's/.* v\([0-9.]\+[a-z]\{,1\}\) .*/\1/' `
 EXECUTABLES=(pdfseparate zip unzip getopt)
 
 function die {
@@ -21,7 +21,6 @@ function help {
 	-z, --zip	Create zip for CTAN (developer only)
 
 	Without any options, inst creates $NAME.{$EXT,ins,pdf} and installs these, 
-	together with isodocsymbols.sty,
 	in the local TeX tree (\$TEXMFLOCAL) or, if that is not writable,
 	in the user´s TeX tree (\$TEXMFHOME). Also, a zip file is created for upload to CTAN.
 	EOD
@@ -45,8 +44,17 @@ function testexecs { # test presence of executables
 }
 
 function readme { # generate the README file
-  sed -n "/^%<\*readme>/,/^%<\/readme>/p;/\\\\changes{v$VERSION}/,/^% }/p" $NAME.dtx  |
-  sed  "s/^%//;s/\\\\\\\\$//;/<.readme>/d;/^ }/d;s/ \\\\changes.*/Changes in version $VERSION:/" >README
+sed -n '/^%<\*readme>/,/^%<\/readme>/p
+	/\\changes{v'$VERSION'}/,/^% }/p' $NAME.dtx  |
+sed    's/^%//;s/\\\\$//
+	/<.readme>/d
+	/^ }/d
+	s/ \\changes.*/Changes in version '$VERSION':/
+	s/$\\Rightarrow\$/=>/g
+	s/\\textbackslash/\\/g
+	s/\\text\(sl\|it\){\([^}]\+\)}/\/\2\//g		# \textsl{...} -> /.../
+	s/{\([^}]*\)}/\1/g 				# keep last, removes all {...}
+       ' >README
 }
 
 function clean { # clean but keep what goes in the zip
@@ -70,8 +78,10 @@ function makeall {
 
    cd examples
    for i in *; do
+      # skip dirs that aren't yet added:
+      test "$(hg st $i|wc -l)" = "$(ls $i|wc -l)" && continue
       cd $i
-      for j in ../../{$NAME.cls,isodocsymbols.sty,languages/isodoc*.ldf}; do ln -sf $j; done
+      for j in ../../{$NAME.cls,languages/isodoc*.ldf}; do ln -sf $j; done
       read TEX <$i.tex
       if [[ $TEX =~ ^%! ]]; then TEX=${TEX#%!}; else TEX=pdflatex;fi
       $TEX --interaction=batchmode $i >/dev/null || die error compiling $i
@@ -93,7 +103,7 @@ function installall {
    # install and cleanup
    echo installing in $INSTDIR
    mv -f $NAME.{$EXT,pdf} $INSTDIR
-   cp -a isodocsymbols.sty languages $INSTDIR
+   cp -a languages $INSTDIR
    cp -a $NAME.{ins,dtx} $SOURCE
    mktexlsr $TREE 2>/dev/null
    clean
diff --git a/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty b/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty
index 60b8fa21dcf..a28f36b3cec 100644
--- a/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty
+++ b/Master/texmf-dist/doc/latex/isodoc/invoice/invoice.sty
@@ -18,13 +18,13 @@ country       = The Netherlands,
 countrycode   = NL,
 language      = nl-NL,
 email         = wybo@xs4all.nl,
-fax           = 842--234393,
+fax           = 842\,234393,
 fold3,
 footer,
 iban          = nl94rabo0304046221,
 opening       = L.S.,
-phone         = 87--8748496, % phone numbers without leading 0:
-cellphone     = 6--30333955,
+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,
diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
index a1530bfd2ac..daddcb80650 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 643a5af0f8c..778e4b0a1f9 100644
--- a/Master/texmf-dist/doc/latex/isodoc/letter/letter.sty
+++ b/Master/texmf-dist/doc/latex/isodoc/letter/letter.sty
@@ -14,12 +14,12 @@
   country         = The Netherlands,
   countrycode     = NL,
   areacode        = 31,
-  phone           = {87-87\,48\,496},
-  cellphone       = {6-15\,49\,20\,70},
+  phone           = {87\,8748496},
+  cellphone       = {6\,15492070},
   fax             = {},
   website         = www.xs4all.nl,
   email           = wybo@xs4all.nl,
-  accountno       = {3040\,46221},
+  accountno       = {304046221},
   iban            = nl61pstb0006238747,
   bic             = pstbnl21,
   vatno           = 28750482B01,
diff --git a/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty b/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty
index 92959cbe1fc..332fca3d6ea 100644
--- a/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty
+++ b/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.sty
@@ -13,15 +13,14 @@
   country         = The Netherlands,
   countrycode     = IN,
   areacode        = 31,
-  phone           = {87-87\,48\,496},
-  cellphone       = {6-15\,49\,20\,70},
+  phone           = {87\,8748496},
+  cellphone       = {6\,15492070},
   fax             = {},
   website         = wybo.xs4all.nl,
   email           = wybo@xs4all,
-  accountno       = {3040\,46221},
+  accountno       = {304046221},
   iban            = nl61pstb0006238747,
   bic             = pstbnl21,
-  language        = en-GB,
   addresscenter   = 70,
   rightaddress
 }
diff --git a/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty b/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty
index fc6b53252d2..40b82854d92 100644
--- a/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty
+++ b/Master/texmf-dist/doc/latex/isodoc/ntgletter/ntgletter.sty
@@ -11,7 +11,7 @@ accountno     = 1306238,
 areacode      = 31,
 autograph     = 0,
 bic           = pstbnl21,
-cellphone     = 6--3033\,3955,
+cellphone     = 6\,3033\,3955,
 city          = Deil,
 closing       = Met vriendelijke groet,
 company       = NTG,
@@ -19,12 +19,12 @@ country       = The Netherlands,
 countrycode   = NL,
 language      = nl-NL,
 email         = wybo@ntg.nl,
-fax           = 842--23\,43\,93,
+fax           = 842\,234393,
 fold3,
 footer,
 iban          = nl05pstb0001306238,
 opening       = L.S.,
-phone         = 87--87\,48\,496, % phone numbers without leading 0:
+phone         = 87\,8748496, % phone numbers without leading 0:
 return,
 signature     = {Wybo Dekker,\\Treasurer NTG},
 street        = Deilsedijk 60,