iso with new pdfs entering tlpkg-ctan-check

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

4 files changed, 17 insertions, 184 deletions

diff --git a/Master/texmf-dist/tex/latex/iso/isofwdbp.tex b/Master/texmf-dist/tex/latex/iso/isofwdbp.tex
deleted file mode 100644
index 4b900f63ec7..00000000000
--- a/Master/texmf-dist/tex/latex/iso/isofwdbp.tex
+++ /dev/null
@@ -1,45 +0,0 @@
-%%
-%% This is file `isofwdbp.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% isoe.dtx  (with options: `fwd1')
-%% 
-%%      This work has been partially funded by the US government and is
-%%  not subject to copyright.
-%% 
-%%      This program is provided under the terms of the
-%%  LaTeX Project Public License distributed from CTAN
-%%  archives in directory macros/latex/base/lppl.txt.
-%% 
-%%  Author: Peter Wilson (CUA and NIST)
-%%          now at: peter.r.wilson@boeing.com
-%% 
-\ProvidesFile{isofwdbp.tex}[2002/01/10 ISO Foreword boilerplate]
-\ProvidesFile{isofwdbp.tex}[2001/08/29 Boilerplate for start of Foreword]
-
-ISO (the International Organization for Standardization) is a worldwide
-federation of national standards bodies (ISO member bodies). The work
-of preparing International Standards is normally carried out through
-ISO technical committees. Each member body interested in a subject for
-which a technical committee has been established has the right to be
-represented on that committee. International organizations,
-governmental and non-governmental, in liaison with ISO, also take part
-in the work. ISO collaborates closely with the International
-Electrotechnical Commission (IEC) on all matters of electrotechnical
-standardization.
-
-International Standards are drafted in accordance with the rules given
-in the ISO/IEC Directives, Part~2.
-
-The main task of technical committees is to prepare International Standards.
-Draft International Standards adopted by the technical committees are
-circulated to the member bodies for voting. Publication as an
-International Standard requires approval by at least 75\% of the member
-bodies casting a vote.
-\par
-
-\endinput
-%%
-%% End of file `isofwdbp.tex'.
diff --git a/Master/texmf-dist/tex/latex/iso/isov2.cls b/Master/texmf-dist/tex/latex/iso/isov2.cls
index 824f15df728..de674518415 100644
--- a/Master/texmf-dist/tex/latex/iso/isov2.cls
+++ b/Master/texmf-dist/tex/latex/iso/isov2.cls
@@ -438,7 +438,7 @@
     \refstepcounter{annex}
     \ifnum 9=\value{annex} \refstepcounter{annex}\fi
     \ifnum 15=\value{annex} \refstepcounter{annex}\fi
-    \ifnum 1=\value{annex}
+%%%    \ifnum 1=\value{annex}
        \renewcommand{\clause}{%
          \ClassWarning{iso}{%
            \protect\clause\space commands are not allowed after starting Annexes}{%
@@ -451,7 +451,7 @@
          \renewcommand{\theHtable}{\theHannex.\arabic{table}}
          \renewcommand{\theHfigure}{\theHannex.\arabic{figure}}
        \fi
-     \fi
+%%%     \fi
      \global\@topnum\z@
      \@afterindentfalse
 }
@@ -1077,34 +1077,38 @@
 \newcommand{\v@rid}[2]{%
     \ifchangemarks
        \ifdr@ftd@c
-           \marginpar[#1]{#2}
+           \marginpar[#1]{#2}%
     \fi\fi}
 \newcommand{\editorial}[1]{%
+  \@bsphack
     \ifchangemarks
         \v@rid{\small\hfill$^{#1}$ED}%
-        {\small ED$^{#1}$\hfill}
-    \fi}
+        {\small ED$^{#1}$\hfill}%
+    \fi\@esphack}
 \long\def\added#1#2{%
+  \@bsphack
     \ifchangemarks
         \v@rid{\small\hfill$^{#2}\Rightarrow$}%
-        {\small $\Leftarrow^{#2}$\hfill}
-        \emph{#1}
+        {\small $\Leftarrow^{#2}$\hfill}%
+        \emph{#1}%
     \else
        #1
-    \fi}
+    \fi\@esphack}
 \newcommand{\deleted}[1]{%
+  \@bsphack
     \ifchangemarks
         \v@rid{\small\hfill$^{#1}\Leftarrow$}%
-        {\small $\Rightarrow^{#1}$\hfill}
-    \fi}
+        {\small $\Rightarrow^{#1}$\hfill}%
+    \fi\@esphack}
 \long\def\moved#1#2{%
+  \@bsphack
     \ifchangemarks
         \v@rid{\small\hfill$^{#2}\Leftrightarrow$}%
-        {\small $\Leftrightarrow^{#2}$\hfill}
-        \emph{#1}
+        {\small $\Leftrightarrow^{#2}$\hfill}%
+        \emph{#1}%
     \else
        #1
-    \fi}
+    \fi\@esphack}
 \newenvironment{foreword}%
   {\tableofcontents
    \listoffigures
diff --git a/Master/texmf-dist/tex/latex/iso/trfwd1.tex b/Master/texmf-dist/tex/latex/iso/trfwd1.tex
deleted file mode 100644
index 02556adcc39..00000000000
--- a/Master/texmf-dist/tex/latex/iso/trfwd1.tex
+++ /dev/null
@@ -1,63 +0,0 @@
-%%
-%% This is file `trfwd1.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% isoe.dtx  (with options: `trfwd1')
-%% 
-%%      This work has been partially funded by the US government and is
-%%  not subject to copyright.
-%% 
-%%      This program is provided under the terms of the
-%%  LaTeX Project Public License distributed from CTAN
-%%  archives in directory macros/latex/base/lppl.txt.
-%% 
-%%  Author: Peter Wilson (CUA and NIST)
-%%          now at: peter.r.wilson@boeing.com
-%% 
-\ProvidesFile{trfwd1.tex}[2002/01/10 PAS/TS Foreword boilerplate]
-   %% trfwd1.tex  Boilerplate for start of a tech rep Foreword clause
-
-    ISO (the International Organization for Standardization) is a worldwide
-federation of national standards bodies (ISO member bodies). The work
-of preparing International Standards is normally carried out through
-ISO technical committees. Each member body interested in a subject for
-which a technical committee has been established has the right to be
-represented on that committee. International organizations,
-governmental and non-governmental, in liaison with ISO, also take part
-in the work. ISO collaborates closely with the International
-Electrotechnical Commission (IEC) on all matters of electrotechnical
-standardization.
-
-    International Standards are drafted in accordance with the rules
-given in the ISO/IEC Directives, Part 3.
-
-    The main task of technical committees is to prepare International
-Standards. Draft International Standards adopted by the technical
-committees are circulated to the member bodies for voting. Publication
-as an International Standard requires approval by at least 75\% of the
-member bodies casting a vote.
-
-    In other circumstances, particularly when there is an urgent market
-requirement for such documents, a technical committee may decide to
-publish other types of normative document:
-\begin{itemize}
-\item an ISO Publicly Available Specification (ISO/PAS) represents an
-agreement between technical experts in an ISO working group and is
-accepted for publication if it is approved by more than 50\% of the
-members of the parent committee casting a vote;
-
-\item an ISO Technical Specification (ISO/TS) represents an agreement
-between the members of a technical committee and is accepted for
-publication if it is approved by 2/3 of the members of the committee
-casting a vote.
-\end{itemize}
-
-    An ISO/PAS or ISO/TS is reviewed every three years with a view to
-deciding whether it can be transformed into an International Standard.
-\par
-
-\endinput
-%%
-%% End of file `trfwd1.tex'.
diff --git a/Master/texmf-dist/tex/latex/iso/tspasfwdbp.tex b/Master/texmf-dist/tex/latex/iso/tspasfwdbp.tex
deleted file mode 100644
index 969b3c30dc4..00000000000
--- a/Master/texmf-dist/tex/latex/iso/tspasfwdbp.tex
+++ /dev/null
@@ -1,63 +0,0 @@
-%%
-%% This is file `tspasfwdbp.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% isoe.dtx  (with options: `tspasfwd1')
-%% 
-%%      This work has been partially funded by the US government and is
-%%  not subject to copyright.
-%% 
-%%      This program is provided under the terms of the
-%%  LaTeX Project Public License distributed from CTAN
-%%  archives in directory macros/latex/base/lppl.txt.
-%% 
-%%  Author: Peter Wilson (CUA and NIST)
-%%          now at: peter.r.wilson@boeing.com
-%% 
-\ProvidesFile{tspasfwdbp.tex}[2001/07/06 Boilerplate for start of TS/PAS Foreword]
-
-ISO (the International Organization for Standardization) is a worldwide
-federation of national standards bodies (ISO member bodies). The work
-of preparing International Standards is normally carried out through
-ISO technical committees. Each member body interested in a subject for
-which a technical committee has been established has the right to be
-represented on that committee. International organizations,
-governmental and non-governmental, in liaison with ISO, also take part
-in the work. ISO collaborates closely with the International
-Electrotechnical Commission (IEC) on all matters of electrotechnical
-standardization.
-
-International Standards are drafted in accordance with the rules given
-in the ISO/IEC Directives, Part~2.
-
-    The main task of technical committees is to prepare International
-Standards.
-Draft International Standards adopted by the technical committees are
-circulated to the member bodies for voting. Publication as an
-International Standard requires approval by at least 75\% of the member
-bodies casting a vote.
-
-    In other circumstances, particularly when there is an urgent market
-requirement for such documents, a technical committee may decide to
-publish other types of normative document:
-\begin{itemize}
-\item an ISO Publicly Available Specification (ISO/PAS) represents an
-agreement between technical experts in an ISO working group and is
-accepted for publication if it is approved by more than 50\% of the
-members of the parent committee casting a vote;
-
-\item an ISO Technical Specification (ISO/TS) represents an agreement
-between the members of a technical committee and is accepted for
-publication if it is approved by 2/3 of the members of the committee
-casting a vote.
-\end{itemize}
-
-    An ISO/PAS or ISO/TS is reviewed every three years with a view to
-deciding whether it can be transformed into an International Standard.
-\par
-
-\endinput
-%%
-%% End of file `tspasfwdbp.tex'.