tex4ht: ignore savetrees.sty (via new general ignore feature), tex4ht r173

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

2 files changed, 54 insertions, 57 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
index 59cf6fd59a9..16384d26175 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
@@ -1,33 +1,27 @@
 \ifnum\the\catcode`\%=14\else\expandafter\edef\csname
   \string:RestoreCatcodes\endcsname{\catcode`\%\the
   \catcode`\%}\catcode`\%14\fi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht.sty                           2008-10-27-17:23  %
-% Copyright (C) 1996--2008      Eitan M. Gurari          %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3 of this license or (at your option) any    %
-% later version. The latest version of this license is   %
-% in                                                     %
-%   http://www.latex-project.org/lppl.txt                %
-% and version 1.3 or later is part of all distributions  %
-% of LaTeX version 2003/12/01 or later.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2008-10-27-17:23}
+% tex4ht.sty (2016-07-01-09:18), generated from tex4ht-sty.tex
+% Copyright 2009-2016 TeX Users Group
+% Copyright 1996-2009 Eitan M. Gurari
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2016-07-01-09:18}
+
 
 \ifx  \Preamble\UnDef  \else
    \csname expand:after\endcsname{\csname
@@ -640,8 +634,14 @@
 \fi
 
 \fi
+\def\:dontusepackage#1{%
+  \typeout{tex4ht warning: package #1 was prevented from loading}
+  \@namedef{ver@#1.sty}{9999/12/31}%
+  \@namedef{opt@#1.sty}{\:currentoptions}
+}
+
 \let\:onefilewithoptions\@onefilewithoptions
-\def\@onefilewithoptions#1[{%
+\def\@onefilewithoptions#1[#2]{%
    \let\:temp\@reset@ptions
    \def\@reset@ptions{%
       \let\@reset@ptions\:temp
@@ -652,7 +652,8 @@
 \a:usepackage
       \TivhTcats
 }%
-   \:onefilewithoptions#1[}
+      \def\:currentoptions{#2}
+ \:onefilewithoptions#1[#2]}
 \def\a:usepackage{\input usepackage.4ht }
 
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index 04b07cb1f34..e8211820ab0 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
@@ -1,30 +1,23 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% usepackage.4ht                        2009-05-21-09:32 %
-% Copyright (C) 2003--2009       Eitan M. Gurari         %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. The latest version of this license is   %
-% in                                                     %
-%   http://www.latex-project.org/lppl.txt                %
-% and version 1.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
+% usepackage.4ht (2016-07-01-09:18), generated from tex4ht-4ht.tex
+% Copyright 2003-2009 Eitan M. Gurari
+% Copyright 2009-2016 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2016-07-01-09:18}
 
    \def\:temp{tex4ht}\ifx \:temp\@currname
    \:warning{\string\usepackage{tex4ht} again?}
@@ -40,7 +33,7 @@
 \fi
 
 \fi
-\gdef\a:usepackage{\use:package xr,xr-hyper,,!*?: }
+\gdef\a:usepackage{\use:package xr,xr-hyper,savetrees,,!*?: }
 \gdef\use:package#1,{%
    \if :#1:\def\:temp##1!*?: {}\else
       \def\:temp{#1}\ifx \@currname\:temp
@@ -61,6 +54,9 @@
 }
 
 \fi
+\def\:temp{savetrees}\ifx \@currname\:temp
+\:dontusepackage{savetrees}
+\fi
 
 
 \endinput