[tex4ht-commits] [SCM] tex4ht updated: r811 - trunk/lit

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2020-10-16 21:39:11 +0300 (Fri, 16 Oct 2020)
New Revision: 811

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-4ht.tex
   trunk/lit/tex4ht-cond4ht.tex
Log:
Fix for quoted files in \@filelist

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2020-10-08 16:45:47 UTC (rev 810)
+++ trunk/lit/ChangeLog	2020-10-16 18:39:11 UTC (rev 811)
@@ -1,3 +1,11 @@
+2020-10-16  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-cond4ht.tex (cond4ht.4ht, docbook.4ht, html0.4ht, html32.4ht,
+	html4.4ht, mktex4ht.4ht, ooffice.4ht, ooimpress.4ht, tei.4ht): strip leading
+	quotes from files that we try to find .4ht files for.
+	https://puszcza.gnu.org.ua/bugs/?486#postcomment
+	* tex4ht-4ht.tex (catchfile-sty-hooks.4ht): removed unnecessary file
+
 2020-10-08  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-sty.tex (tex4ht.sty): new mechanism for early package

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2020-10-08 16:45:47 UTC (rev 810)
+++ trunk/lit/tex4ht-4ht.tex	2020-10-16 18:39:11 UTC (rev 811)
@@ -23964,34 +23964,7 @@
 >>> 
 \AddFile{9}{minted-sty-hooks}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\Section{catchfile}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-Catchfile package adds quoted file to @addtofilelist.
-This causes compilation error. I don't know what it is
-even useful for, but this fix should work.
-
-\<catchfile-sty-hooks.4ht\><<<
-% catchfile-sty-hook.4ht, generated from |jobname.tex
-% Copyright 2020 TeX Users Group
-|<TeX4ht license text|>
-\AddToHook{package/after/catchfile}{
-  \def\CatchFile at CheckFileExists#1{%
-    \IfFileExists{#1}{%
-      \expandafter\CatchFile at DefFile\@filef at und\@nil
-      \begingroup\expandafter\expandafter\expandafter\endgroup
-      \expandafter\ifx\csname @addtofilelist\endcsname\relax
-      \else
-      \@addtofilelist{#1}
-      \fi
-    }{%
-      \let\CatchFile at File\relax
-    }%
-  }%
-}
->>> \AddFile{9}{catchfile-sty-hooks}
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \Section{pythontex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%

Modified: trunk/lit/tex4ht-cond4ht.tex
===================================================================
--- trunk/lit/tex4ht-cond4ht.tex	2020-10-08 16:45:47 UTC (rev 810)
+++ trunk/lit/tex4ht-cond4ht.tex	2020-10-16 18:39:11 UTC (rev 811)
@@ -339,19 +339,21 @@
 \fi%
 \Hinclude{\input #1.4ht}{fontmath}
 |<*.4ht out of order|>
+\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi}
 \def\h:input#1.#2.#3?<par del?>{%
-   \:CheckOption{no_#1}\if:Option 
+   \edef\:current:package{\:strip:quotes"#1""\relax}
+   \:CheckOption{no_\:current:package}\if:Option
       \let\:temp\empty
-   \else 
+   \else
       \let\:temp\empty
-      \no:dupl{#1}{%
+      \no:dupl{\:current:package}{%
         \def\:warn:msg{}
-        \:CheckOption{debug}\if:Option 
+        \:CheckOption{debug}\if:Option
           \def\:warn:msg{%
-            \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}%
+            \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}%
           }
         \fi%
-        \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}%
+        \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}%
        }%
    \fi  \:temp}
 \edef\:temp{\noexpand\Hinclude