[tex4ht-commits] [SCM] tex4ht updated: r738 - in trunk: doc/mn lit

[karl at gnu.org.ua]

Author: karl
Date: 2020-06-11 18:28:50 +0300 (Thu, 11 Jun 2020)
New Revision: 738

Modified:
   trunk/doc/mn/Makefile
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/checklog.lua
Log:
Makefile and checklog tweaks

Modified: trunk/doc/mn/Makefile
===================================================================
--- trunk/doc/mn/Makefile	2020-06-10 21:08:22 UTC (rev 737)
+++ trunk/doc/mn/Makefile	2020-06-11 15:28:50 UTC (rev 738)
@@ -25,7 +25,7 @@
 	diff -u0 $(inst_dir) .
 
 # have to add new files by hand.
-inst:
+install:
 	cp -p `(cd $(inst_dir) && \ls)` $(inst_dir)
 
 clean:

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2020-06-10 21:08:22 UTC (rev 737)
+++ trunk/lit/ChangeLog	2020-06-11 15:28:50 UTC (rev 738)
@@ -1,3 +1,9 @@
+2020-06-11  Karl Berry  <karl at freefriends.org>
+
+	* Makefile (all): run checklog.lua here, instead of in
+	individual rules.
+	* texlog.lua: fiddle with formatting.
+
 2020-06-10 Michal Hoftich  <michal.h21 at gmail.com>
 
 	* checklog.lua: pass checked log file name to the log parser function.

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2020-06-10 21:08:22 UTC (rev 737)
+++ trunk/lit/Makefile	2020-06-11 15:28:50 UTC (rev 738)
@@ -30,7 +30,6 @@
 dev_null = </dev/null    # when we don't call tex directly.
 
 HTTEX = ht "tex $(tex_opts)"  # set tex options for plain tex
-CHECKLOG = texlua checklog.lua 
 
 # Although many of the source files say to use xhlatex, we always use
 # htlatex instead. xhlatex generates XHTML from the literate source and
@@ -326,10 +325,10 @@
 
 # 

 all: $(derived)
+	texlua checklog.lua *.log
 
 $(tex4ht_4ht_derived): tex4ht-4ht.tex cond4ht.4ht $(common)
 	tex $(tex_opts) $<
-	$(CHECKLOG) $<
 
 $(tex4ht_bibtex2_derived): tex4ht-bibtex2.tex $(common)
 	latex $(tex_opts) $<
@@ -391,7 +390,6 @@
 $(tex4ht_html4_derived): tex4ht-html4.tex $(common)
 	latex $(tex_opts) $<
 	latex $(tex_opts) $<
-	$(CHECKLOG) $<
 
 $(tex4ht_info_html4_derived): tex4ht-info-html4.tex $(common_info)
 	htlatex $< "html,3,sections+" "" "" $(tex_1opt)
@@ -461,7 +459,6 @@
 
 $(tex4ht_sty_derived): tex4ht-sty.tex $(common_no_cond_sty)
 	$(HTTEX) $< ""
-	$(CHECKLOG) $<
 
 $(tex4ht_svg_derived): tex4ht-svg.tex $(common)
 	htlatex $< "html,3,sections+" "" "" $(tex_1opt)

Modified: trunk/lit/checklog.lua
===================================================================
--- trunk/lit/checklog.lua	2020-06-10 21:08:22 UTC (rev 737)
+++ trunk/lit/checklog.lua	2020-06-11 15:28:50 UTC (rev 738)
@@ -1,3 +1,5 @@
+-- $Id$
+-- Public domain. Originally written by Michal Hoftich, 2020.
 -- this script parses log files for errors
 -- pass the .log file as a first argument
 -- 
@@ -3,6 +5,5 @@
 -- Usage:
 -- texlua checklog.lua <filename>.log
---
--- 
+
 kpse.set_program_name "luatex"
 -- the following library is part of make4ht
@@ -15,10 +16,10 @@
   if content:match("\n!") then
     local errors = error_logparser.parse(content)
     if #errors > 0 then
-      print("Checking " .. input_file)
-      print("Errors found:")
+      print(input_file .. ": errors found:")
       for _, err in ipairs(errors) do
-        print(err.filename or "?", err.line or "?", err.error)
+        print((err.filename or "?") .. ":"
+              .. (err.line or "?") .. ":" .. err.error)
       end
       os.exit(1)
     end