isodoc/ (26jul14)

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

4 files changed, 30 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/isodoc/README b/Master/texmf-dist/doc/latex/isodoc/README
index fea8a670b32..eb4f40231d4 100644
--- a/Master/texmf-dist/doc/latex/isodoc/README
+++ b/Master/texmf-dist/doc/latex/isodoc/README
@@ -22,5 +22,6 @@ https://bitbucket.org/wybodekker/isodoc/downloads/isodoc.pdf
 Installation:
 Execute the inst script with the --help option for more information.
 
-Changes in version 1.05:
-  - README and inst script reorganized
+Changes in version 1.06:
+  - bug causing "No line here to end" error
+  - font and footskip warnings removed
diff --git a/Master/texmf-dist/doc/latex/isodoc/inst b/Master/texmf-dist/doc/latex/isodoc/inst
index 71ecdf11af3..555af87cbe8 100644
--- a/Master/texmf-dist/doc/latex/isodoc/inst
+++ b/Master/texmf-dist/doc/latex/isodoc/inst
@@ -2,7 +2,7 @@
     dtxname=isodoc
     dtxtype=class
         ext=cls
-     delete=($dtxname.$ext README.tex)
+     delete=$dtxname.$ext
  dtxversion=$(grep " v[0-9.]\+[a-z]\{0,1\} $dtxname $dtxtype" $dtxname.dtx |sed 's/.* v\([0-9.]\+[a-z]\{,1\}\) .*/\1/')
 executables=(mk texlog_extract zip getopt pdfseparate pdflatex)
 
@@ -82,9 +82,15 @@ sed    's/^%//;s/\\\\$//
   grep "Changes in version" README >/dev/null || die changes not detected
 }
 
+clean() { # clean but keep what goes in the zip
+   rm -f $dtxname.{aux,fls,glo,gls,idx,ilg,ind,log,out,toc}
+   rm -f examples/*/{$dtxname*,*.{pdf,aux,log,fls,out}}
+   find examples -type l -delete
+}
+
 makeall() {
    grep '%<\*install>' $dtxname.dtx >/dev/null && # for self-extracting dtx files
-      delete+=($dtxname.ins) ||
+      delete+=" $dtxname.ins" ||
       echo y |tex $dtxname.ins >/dev/null
 
    # install any .ttf files
@@ -97,6 +103,7 @@ makeall() {
    # compile all examples
    cd examples
    for i in *; do
+      echo compiling $i
       cd $i
       for j in ../../{$dtxname.cls,languages/isodoc*.ldf}; do ln -sf $j; done
       mk --noprint --noview $i && mk -c $i
@@ -104,32 +111,40 @@ makeall() {
       cd ..
    done
    cd ..
-  
-   mk --noprint --noview $dtxname.dtx && mk -c $dtxname.dtx # make $dtxname.pdf
+   # make $dtxname.pdf
+   echo compiling the manual
+   pdflatex --recorder --interaction=batchmode $dtxname.dtx >/dev/null ||
+      die "$(texlog_extract $dtxname.log)"
+   test -f $dtxname.glo && makeindex -q -s gglo.ist -o $dtxname.gls $dtxname.glo
+   test -f $dtxname.idx && makeindex -q -s gind.ist -o $dtxname.ind $dtxname.idx
+   pdflatex --interaction=batchmode $dtxname.dtx > /dev/null
+   pdflatex --interaction=batchmode $dtxname.dtx > /dev/null
 }
 
 installall() {
    # install and cleanup
    echo installing in $tree
+   clean
 
-   rm -rf $insttex/* $instsrc/* $instdoc/*
-   find examples \( -type l -o -name '*.pdf' \) -delete
+   rm -rf $insttex/* $instsrc/* $instdoc/* # remove old data in the tree
    cp -f $dtxname.$ext languages/iso* $insttex
    cp -a $dtxname.{ins,dtx} $instsrc
    cp -a README inst languages/isodoc-template.ldf $dtxname.pdf examples/* $instdoc
    mktexlsr $tree 2>/dev/null
-   for i in ${delete[@]}; do rm -f $i; done 
+   rm -f $delete 
    cd ..
    zipfile=$dtxname/$dtxname-$dtxversion.zip
    rm -f $zipfile
    zip -rq $zipfile $dtxname/*
    cd $dtxname
+   rm -f $dtxname.pdf README
 }
 
+clean=false
 options=$(getopt \
    -n $myname \
-   -o hHV \
-   -l help,Help,version \
+   -o hHVc \
+   -l help,Help,version,clean \
    -- "$@"
 ) || exit 1
 eval set -- "$options"
@@ -138,6 +153,7 @@ while [ $# -gt 0 ]; do
    (-h|--help)	  help;;
    (-H|--Help)	  helpall;;
    (-V|--version) version;;
+   (-c|--clean)	  clean=true;shift;;
    (--)		  shift;  break;;
    (*)			  break;;
    esac
@@ -146,5 +162,6 @@ done
 
 testexecs
 setdir
+$clean && clean && rm -f $delete $dtxname-*.zip $dtxname.pdf README && exit 0 
 makeall
 installall
diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf
index 498f8de09b4..4ed5607f1fe 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/logoletter/logoletter.tex b/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.tex
index f3809d5ffc5..87feade3d3a 100644
--- a/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.tex
+++ b/Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.tex
@@ -11,6 +11,7 @@
   enclosures = Isodoc documentatie,
      subject = Sample letter with the isodoc class,
    autograph = 2,
+    language = en-GB
 }
 \newcommand{\letterbody}{%
   This is an example of a letter made with the isodoc class.