# HG changeset patch
# User cslag
# Date 1465130518 -7200
# Node ID dcb7157392f1a20bb5250c8a1b9a8180799d6845
# Parent  7aab1a3cb1723db0b3d69dd9d6bb74c18f7b7ce1
- manual: fixed html output of tables rendered as .png, using tex multirow

diff -r 7aab1a3cb172 -r dcb7157392f1 ToDo
--- a/ToDo	Sat Jun 04 21:50:03 2016 +0200
+++ b/ToDo	Sun Jun 05 14:41:58 2016 +0200
@@ -86,11 +86,10 @@
 
 manual:
 -------
-- callconv diagrams
-  * for html output, the brackets are completely off... doesn't happen for pdf
-    output, which is weird
+- callconv diagrams:
   * good idea to review it all, anyways, if the calling conventions are actually
-    represented correctly
+    represented correctly (and if they are in sync with the .pdf, we used to have
+    problems with multirow.4ht)
 - provide more examples on how to use dyncall, dynload and dyncallback
   * e.g. enhance manual with a couple of examples (e.g. calling MessageBoxA on windows, etc.)
 - manuals for bindings (as stated in bindings-section, above)
diff -r 7aab1a3cb172 -r dcb7157392f1 doc/manual/Makefile.generic
--- a/doc/manual/Makefile.generic	Sat Jun 04 21:50:03 2016 +0200
+++ b/doc/manual/Makefile.generic	Sun Jun 05 14:41:58 2016 +0200
@@ -14,7 +14,7 @@
 	# html
 	cd "${VPATH}" && ( \
 		for i in 4ct 4tc css dvi html idv lg tmp xref; do rm -f manual.$$i || true; done; \
-		for i in manual*x.png manual*.html texput.log manual_*.log zzmanual.eps zzmanual.ps custom_tex4ht.env; do rm -f $$i || true; done; \
+		for i in manual*x.png manual*.html texput.log manual_*.log zzmanual.eps zzmanual.ps custom_tex4ht.env multirow.4ht; do rm -f $$i || true; done; \
 		rm -r html || true; \
 	)
 
@@ -23,8 +23,16 @@
 
 
 html/manual.html: manual_tex4ht.cfg sources
-	# Create tex4ht.env from default one, but with better bitmaps
+	# The following runs htlatex, but sets up a few things beforehand to control
+	# it's behavior:
+	# - create custom, local version of tex4ht.env based on default one, but with
+	#   better bitmaps
+	# - create empty multirow.4ht file, to simply override tex4ht's default one,
+	#   which produces wrong output in our case - since all the tables where we
+	#   use the multirow package are rendered into .pngs for our html doc, we don't
+	#   need any tex4ht specific version outputing html
 	cd "${VPATH}" &&  ( \
+		:>./multirow.4ht; \
 		cp $$(dirname $$(which tex4ht))/../share/texmf-dist/tex4ht/base/unix/tex4ht.env ./custom_tex4ht.env; \
 		sed -E -i '' 's/(Text|Graphics)(AlphaBits)=[1,2,3]([^0-9])/\1\2=4\3/g' custom_tex4ht.env; \
 		mkdir -p ./html/; \