isodoc (26nov13)

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

6 files changed, 51 insertions, 37 deletions

diff --git a/Master/texmf-dist/doc/latex/isodoc/README b/Master/texmf-dist/doc/latex/isodoc/README
index 324df7c8b0a..07af3840e25 100644
--- a/Master/texmf-dist/doc/latex/isodoc/README
+++ b/Master/texmf-dist/doc/latex/isodoc/README
@@ -13,17 +13,10 @@ documents. Documents are easily configured to the user's requirements
 through key=value options.
 At the origin of this class was Victor Eijkhout’s NTG brief class,
 which implements the NEN1026 standard.
+The package contains several examples, that are used in the documentation.
+These can individually be compiled, which may be useful for users to
+experiment with.
 
 Installation:
 Execute the inst script with the --help option for more information.
 
-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/inst b/Master/texmf-dist/doc/latex/isodoc/inst
index d458c8a2c62..d605163b9c4 100644
--- a/Master/texmf-dist/doc/latex/isodoc/inst
+++ b/Master/texmf-dist/doc/latex/isodoc/inst
@@ -4,7 +4,7 @@
     DOCTYPE=class
         EXT=cls
     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)
+EXECUTABLES=(pdfseparate zip unzip getopt pdflatex xelatex)
 
 function die {
    echo -e "$*"
@@ -17,24 +17,27 @@ function help {
 	Options:
 	-h, --help	print this help
 	-c, --clean     remove all files created by the installation, except the zip file
-	-C, --Clean	remove all files that can be regenerated
-	-z, --zip	Create zip for CTAN (developer only)
+	-z, --zip	Create zip for CTAN (no install, developer only)
 
-	Without any options, inst creates $NAME.{$EXT,ins,pdf} and installs these, 
-	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.
+        Without any options, inst installs $NAME in the first writable
+        TEXMFMAIN, TEXMFLOCAL or TEXMFHOME tree.
 	EOD
    exit
 }
 
 function setdir { # create installation directory
-   TREE=$(kpsewhich --expand-var '$TEXMFLOCAL')
-   test -w $TREE || TREE=$(kpsewhich --expand-var '$TEXMFHOME')
-   test "$TREE" = "" && die Could not find value for $TREE
-   INSTDIR=${TREE}/tex/latex/$NAME
-   SOURCE=$TREE/source/latex/$NAME
-   mkdir -p $INSTDIR || die could not create $INSTDIR
-   mkdir -p $SOURCE || die could not create $SOURCE
+   for i in MAIN LOCAL HOME; do
+      TREE=$(kpsewhich --expand-var \$TEXMF$i)
+      test -w $TREE && break
+      TREE=
+   done
+   test "$TREE" = "" && die "Could not find a writable TeX tree"
+   INSTTEX=${TREE}/tex/latex/$NAME
+   INSTSRC=$TREE/source/latex/$NAME
+   INSTDOC=$TREE/doc/latex/$NAME
+   mkdir -p $INSTTEX || die could not create $INSTTEX
+   mkdir -p $INSTSRC || die could not create $INSTSRC
+   mkdir -p $INSTDOC || die could not create $INSTDOC
 }
 
 function testexecs { # test presence of executables
@@ -58,13 +61,13 @@ sed    's/^%//;s/\\\\$//
 }
 
 function clean { # clean but keep what goes in the zip
-   rm -f $NAME.{aux,fls,glo,gls,idx,ilg,ind,log,out,toc}
+   rm -f $NAME.{aux,fls,glo,gls,idx,ilg,ind,log,out,toc,$EXT}
    rm -f examples/*/{$NAME*,*.{pdf,aux,log,out}}
 }
 
 function Clean {
    clean
-   rm -f $NAME.{$EXT,pdf} README
+   rm -f $NAME.pdf README
 }
 
 function makeall {
@@ -74,12 +77,12 @@ function makeall {
    find examples -name '*.ttf' -exec cp {} ~/.fonts \;
    fc-cache ~/.fonts
 
-   # compile all examples
+   # create the README file
+   readme
 
+   # compile all examples
    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,languages/isodoc*.ldf}; do ln -sf $j; done
       read TEX <$i.tex
@@ -101,17 +104,18 @@ function makeall {
 
 function installall {
    # install and cleanup
-   echo installing in $INSTDIR
-   mv -f $NAME.{$EXT,pdf} $INSTDIR
-   cp -a languages $INSTDIR
-   cp -a $NAME.{ins,dtx} $SOURCE
+   echo installing in $TREE
+
+   rm -rf $INSTTEX/* $INSTSRC/* $INSTDOC/*
+   cp -f $NAME.$EXT languages/iso* $INSTTEX
+   cp -a $NAME.{ins,dtx} $INSTSRC
+   cp -a README inst languages/template.ldf $NAME.pdf examples/* $INSTDOC
    mktexlsr $TREE 2>/dev/null
    clean
 }
 
 function mkzip {
    clean
-   readme
    cd ..
    zipfile=$NAME/$NAME-$VERSION.zip
    rm -f $zipfile
diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
index daddcb80650..79241374cc1 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.tex b/Master/texmf-dist/doc/latex/isodoc/letter/letter.tex
index a9026144596..b92972fb97c 100644
--- a/Master/texmf-dist/doc/latex/isodoc/letter/letter.tex
+++ b/Master/texmf-dist/doc/latex/isodoc/letter/letter.tex
@@ -11,7 +11,7 @@
  enclosures = isodoc documentation\\LPPL documentation,
     subject = An example letter using the isodoc class --
 		with an extra long subject extending over two lines.,
-  autograph,
+  autograph,foreign
 }
 
 \begin{document}
diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
index 520ad047246..5bf62b5c6ff 100644
--- a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
+++ b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
@@ -18,6 +18,9 @@ documents. Documents are easily configured to the user's requirements
 through key=value options.
 At the origin of this class was Victor Eijkhout’s NTG brief class,
 which implements the NEN1026 standard.
+The package contains several examples, that are used in the documentation.
+These can individually be compiled, which may be useful for users to
+experiment with.
 
 Installation:
 Execute the inst script with the --help option for more information.
@@ -32,7 +35,7 @@ Execute the inst script with the --help option for more information.
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{isodoc}%
 %<*class>
-   [2013/08/27 v1.01 isodoc class for letters and invoices]
+   [2013/11/26 v1.02 isodoc class for letters and invoices]
 %</class>
 %<class>\ifx\pdfoutput\undefined\else%
 %<class>\ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{}
@@ -40,7 +43,7 @@ Execute the inst script with the --help option for more information.
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage[l2tabu,orthodox]{nag}
-\usepackage{isodocsymbols,charter}
+\usepackage{charter}
 \usepackage{ctable,pdfpages,paralist,sverb,ltablex}
 \usepackage[a4paper,margin=20mm,left=50mm,nohead]{geometry}
 \usepackage{hyperref}
@@ -81,6 +84,20 @@ Execute the inst script with the --help option for more information.
 \def\T#1{\texttt{#1}}
 \def\C#1{\texttt{$\mathtt{\backslash}$#1}}
 \def\CMP#1{\C{#1}\marginpar{\C{#1}}}
+% Finally need to repeat some definition from the class here:
+\makeatletter
+\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
+\makeatother
 \begin{document}
   \DocInput{isodoc.dtx}
   \PrintChanges
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
index f47269e5f25..d9689397b54 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.01 isodoc class for letters and invoices]
+   [2013/11/26 v1.02 isodoc class for letters and invoices]
 \ifx\pdfoutput\undefined\else%
 \ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{}
 \fi\fi