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

[karl at gnu.org.ua]

Author: karl
Date: 2020-06-06 01:58:00 +0300 (Sat, 06 Jun 2020)
New Revision: 726

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-html-speech-xtpipes.tex
   trunk/lit/tex4ht-javahelp-xtpipes.tex
Log:
avoid more shell errors

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2020-06-05 17:55:02 UTC (rev 725)
+++ trunk/lit/ChangeLog	2020-06-05 22:58:00 UTC (rev 726)
@@ -1,5 +1,14 @@
 2020-06-05  Karl Berry  <karl at freefriends.org>
 
+	* tex4ht-javahelp-xtpipes.tex: \input{tex4ht-dir}.
+
+2020-06-05  Vincent Bela\"iche  <vincent.belaiche at gmail.com>
+
+	* tex4ht-javahelp-xtpipes.tex,
+	* tex4ht-html-speech-xtpipes.tex: Remove reference to \XTPIPES lib
+
+2020-06-05  Karl Berry  <karl at freefriends.org>
+
 	* Makefile (do_java): conditional to enable Java derivations
 	and compilations.
 	* Makefile.exp: move "experimental section" to here from Makefile.

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2020-06-05 17:55:02 UTC (rev 725)
+++ trunk/lit/Makefile	2020-06-05 22:58:00 UTC (rev 726)
@@ -665,8 +665,15 @@
 	$(diff) $(inst_dir_4ht)/$(d) .
 
 diff-ht-fonts:
-	$(diff) -r $(ht_fonts_instdir) $(ht_fonts_devdir) | tee /tmp/htd
+# the raw diff:
+	-$(diff) -r $(ht_fonts_instdir) $(ht_fonts_devdir) >/tmp/htd
+# just the filenames:
 	sed -n 's,^diff.*ht-fonts/,,p' /tmp/htd |sort >/tmp/htf
+# for human consumption, remove generation lines (hopefully there are no
+# real diffs on those lines); also the @@ lines from diff -u and the
+# redundant diff invocations.
+	egrep -v '^(diff |\+\+\+|@@|[-+].*20[0-9][0-9]-[0-9][0-9]-[0-9][0-9])'\
+	/tmp/htd | tee /tmp/hte
 
 mostlyclean:
 	rm -f $(derived)

Modified: trunk/lit/tex4ht-html-speech-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-html-speech-xtpipes.tex	2020-06-05 17:55:02 UTC (rev 725)
+++ trunk/lit/tex4ht-html-speech-xtpipes.tex	2020-06-05 22:58:00 UTC (rev 726)
@@ -2425,9 +2425,6 @@
      mkdir -p \TEXMFTEXivBIN || exit 1
      ;
      mv \XTPIPES tex4ht.jar \TEXMFTEXivBIN . 
-     ;
-     cp \XTPIPES lib/* 
-        \TEXMFTEXivXTPIPES .
 "}}
 
 

Modified: trunk/lit/tex4ht-javahelp-xtpipes.tex
===================================================================
--- trunk/lit/tex4ht-javahelp-xtpipes.tex	2020-06-05 17:55:02 UTC (rev 725)
+++ trunk/lit/tex4ht-javahelp-xtpipes.tex	2020-06-05 22:58:00 UTC (rev 726)
@@ -13,8 +13,8 @@
 
 \input{common}
 \input{tex4ht-cpright}
+\input{tex4ht-dir}
 
-
 %%%%%%%%%%%%%%%%%%
 \part{Post Processing for Html Output Mode}
 %%%%%%%%%%%%%%%%%%
@@ -635,9 +635,6 @@
      mv tex4ht.jar \TEXMFTEXivBIN
      ;
      if [ ! -d \TEXMFTEXivXTPIPES\space]; then exit 1; fi
-     ;
-     cp \XTPIPES xtpipes/lib/* 
-        \TEXMFTEXivXTPIPES
 "}}
 
 \end{document}