summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-07-26 23:02:37 +0000
committerKarl Berry <karl@freefriends.org>2014-07-26 23:02:37 +0000
commit4a9987c60ecf28083f2701f4a5abfa724d6a56f0 (patch)
treeb3410eaaab486db7c6bcb1543c52be917156a50f
parentc54b2d0c22863e4548e7fe974af8c2dd48659015 (diff)
isodoc/ (26jul14)
git-svn-id: svn://tug.org/texlive/trunk@34734 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/README5
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/inst35
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/isodoc.pdfbin1351746 -> 1351938 bytes
-rw-r--r--Master/texmf-dist/doc/latex/isodoc/logoletter/logoletter.tex1
-rw-r--r--Master/texmf-dist/source/latex/isodoc/isodoc.dtx14
-rw-r--r--Master/texmf-dist/tex/latex/isodoc/isodoc.cls8
6 files changed, 43 insertions, 20 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
Binary files differ
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.
diff --git a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
index 20ee1ad61fe..4d9a904a8f1 100644
--- a/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
+++ b/Master/texmf-dist/source/latex/isodoc/isodoc.dtx
@@ -37,7 +37,7 @@ Execute the inst script with the --help option for more information.
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{isodoc}%
%<*class>
- [2014/04/20 v1.05 isodoc class for letters and invoices]
+ [2014/07/24 v1.06 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!}{}
@@ -262,6 +262,10 @@ Execute the inst script with the --help option for more information.
% \changes{v1.05}{2014/04/20}{
% - README and inst script reorganized
% }
+% \changes{v1.06}{2014/07/26}{
+% - bug causing "No line here to end" error
+% - font and footskip warnings removed
+% }
% \DoNotIndex{%
% \ , \", \', \@auxout, \AtBeginDocument, \AtEndDocument, \Cbox,
% \CurrentOption, \DeclareOption, \DescribeMacro, \ForEachX, \IfInteger,
@@ -579,7 +583,7 @@ Execute the inst script with the --help option for more information.
% those are found, the starting text will be
% \textbf{Enclosures:}. It appears under the closing, with a white
% line in between.\footnote{The whitespace in between can be influenced
-% (preferable in a style file) with the dimen |\enclosureskip|, default
+% (preferably in a style file) with the dimen |\enclosureskip|, default
% |\baselineskip|. Alternatively, set |\encldowntrue| to move the
% enclosures to the bottom of the page.}\NN
% \T{copyto = ...} & This keyword can be used to add a note, at the end of the document,
@@ -1016,7 +1020,7 @@ Execute the inst script with the --help option for more information.
% 35mm each: a left margin, 4 fields, and a right margin.
%
% \begin{macrocode}
-\RequirePackage[nofoot,head=\baselineskip]{geometry}
+\RequirePackage[head=\baselineskip,foot=\f@size pt]{geometry}
\RequirePackage[absolute,overlay]{textpos}
\geometry{papersize={210mm,297mm},margin=35mm}
\TPGrid{210}{297}
@@ -1902,7 +1906,7 @@ Execute the inst script with the --help option for more information.
{ \parskip=0pt\parindent=0pt
\begin{textblock}{\@addresswidth}[0,.5](\xaddress,\@addresscenter)%
\ifreturn
- {\def\\{\unskip\enspace\textbullet\enspace\ignorespaces}%
+ {\def\\{\unskip\enspace{\rmfamily\mdseries\textbullet}\enspace\ignorespaces}%
\sffamily\bfseries\scriptsize\returnaddress
}\\[-.8\baselineskip]
\rule{\hsize}{.2pt}\\
@@ -1970,7 +1974,7 @@ Execute the inst script with the --help option for more information.
\vspace{\textskip mm}
\thispagestyle{empty}
\noindent\ignorespaces#2
- \ifclosing{\\[\closingskip]
+ \ifclosing{\vskip\closingskip\vskip-\baselineskip
\parindent=0pt\parskip=\baselineskip\noindent
\begin{minipage}[t]{\hsize}
\ifcase\autographversion
diff --git a/Master/texmf-dist/tex/latex/isodoc/isodoc.cls b/Master/texmf-dist/tex/latex/isodoc/isodoc.cls
index b3398ddd2ab..32aaa8e4e20 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}%
- [2014/04/20 v1.05 isodoc class for letters and invoices]
+ [2014/07/24 v1.06 isodoc class for letters and invoices]
\ifx\pdfoutput\undefined\else%
\ifnum\pdfoutput=1\else\ClassError{isodoc}{Compile me with pdflatex or xelatex!}{}
\fi\fi
@@ -32,7 +32,7 @@
\LoadClass{article}
\RequirePackage{ctable,color,tabularx,graphicx,xstring,calc}
\RequirePackage{forarray,longtable}
-\RequirePackage[nofoot,head=\baselineskip]{geometry}
+\RequirePackage[head=\baselineskip,foot=\f@size pt]{geometry}
\RequirePackage[absolute,overlay]{textpos}
\geometry{papersize={210mm,297mm},margin=35mm}
\TPGrid{210}{297}
@@ -481,7 +481,7 @@
{ \parskip=0pt\parindent=0pt
\begin{textblock}{\@addresswidth}[0,.5](\xaddress,\@addresscenter)%
\ifreturn
- {\def\\{\unskip\enspace\textbullet\enspace\ignorespaces}%
+ {\def\\{\unskip\enspace{\rmfamily\mdseries\textbullet}\enspace\ignorespaces}%
\sffamily\bfseries\scriptsize\returnaddress
}\\[-.8\baselineskip]
\rule{\hsize}{.2pt}\\
@@ -546,7 +546,7 @@
\vspace{\textskip mm}
\thispagestyle{empty}
\noindent\ignorespaces#2
- \ifclosing{\\[\closingskip]
+ \ifclosing{\vskip\closingskip\vskip-\baselineskip
\parindent=0pt\parskip=\baselineskip\noindent
\begin{minipage}[t]{\hsize}
\ifcase\autographversion