texlive[46768] Master/texmf-dist: luaxml (28feb18)

[commits+karl at tug.org]

Revision: 46768
          http://tug.org/svn/texlive?view=revision&revision=46768
Author:   karl
Date:     2018-03-01 00:46:36 +0100 (Thu, 01 Mar 2018)
Log Message:
-----------
luaxml (28feb18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/luatex/luaxml/README
    trunk/Master/texmf-dist/doc/luatex/luaxml/luaxml.pdf
    trunk/Master/texmf-dist/doc/luatex/luaxml/luaxml.tex
    trunk/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua

Modified: trunk/Master/texmf-dist/doc/luatex/luaxml/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luaxml/README	2018-02-28 23:46:15 UTC (rev 46767)
+++ trunk/Master/texmf-dist/doc/luatex/luaxml/README	2018-02-28 23:46:36 UTC (rev 46768)
@@ -29,7 +29,7 @@
 ------
 Michal Hoftich
 Email: michal.h21 at gmail.com
-Version: 0.1a
+Version: 0.1b
 
 Original authors: Paul Chakravarti and Manoel Campos (http://manoelcampos.com)
 

Modified: trunk/Master/texmf-dist/doc/luatex/luaxml/luaxml.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/luatex/luaxml/luaxml.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luaxml/luaxml.tex	2018-02-28 23:46:15 UTC (rev 46767)
+++ trunk/Master/texmf-dist/doc/luatex/luaxml/luaxml.tex	2018-02-28 23:46:36 UTC (rev 46768)
@@ -7,7 +7,7 @@
 \usepackage{framed}
 % Version is defined in the makefile, use default values when compiled directly
 \ifdefined\version\else
-\def\version{0.1a}
+\def\version{0.1b}
 \let\gitdate\date
 \fi
 \newcommand\modulename[1]{\subsection{#1}\label{sec:#1}}

Modified: trunk/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua	2018-02-28 23:46:15 UTC (rev 46767)
+++ trunk/Master/texmf-dist/tex/luatex/luaxml/luaxml-domobject.lua	2018-02-28 23:46:36 UTC (rev 46768)
@@ -103,7 +103,7 @@
     text_content = text_content:gsub('"nil"','')
     text_content = text_content:gsub('%s*$','')
     attributes = {}
-  elseif xtype == "ELEMENT" and void[name] then
+  elseif xtype == "ELEMENT" and void[name] and #current._children < 1 then
     local format = get_action(xtype, "void")
     insert(format, name, prepare_attributes(attributes))
     return output
@@ -238,6 +238,7 @@
     )
     local current = current or self
     local text = {}
+    if current:is_text() then return current._text or "" end
     for _, el in ipairs(current:get_children()) do
       if el:is_text() then
         text[#text+1] = el._text or ""
@@ -314,7 +315,9 @@
     return el._parent
   end
 
-  --- Execute function on the current element and all it's children elements
+  --- Execute function on the current element and all it's children elements.
+  -- The traversing of child elements of a given node can be disabled when the executed
+  -- function returns false.
   -- @return nothing
   function DOM_Object:traverse_elements(
     fn, --- function which will be executed on the current element and all it's children