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

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2016-12-04 13:19:31 +0200 (Sun, 04 Dec 2016)
New Revision: 210

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/mktex4ht-cnf.tex
   trunk/lit/tex4ht-4ht.tex
Log:
Moved luatex definitions to fontspec-luatex.4ht

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2016-12-03 23:52:02 UTC (rev 209)
+++ trunk/lit/ChangeLog	2016-12-04 11:19:31 UTC (rev 210)
@@ -1,3 +1,10 @@
+2016-12-04  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (fontspec.4ht, fontspec-luatex.4ht, fontspec-xetex.4ht):
+	moved luatex and xetex definitions for fontspec to fontspec-xetex.4ht and
+	fontspec-luatex.4ht
+	* mktex4ht-cnf.tex (mktex4ht.4ht): added fontspec-luatex
+
 2016-12-03  Karl Berry  <karl at freefriends.org>
 
 	* .svnignore (fontspec-4ht.lua): add.

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2016-12-03 23:52:02 UTC (rev 209)
+++ trunk/lit/Makefile	2016-12-04 11:19:31 UTC (rev 210)
@@ -36,7 +36,7 @@
   memoir.4ht multicol.4ht multirow.4ht quoting.4ht reading.4ht \
   scrartcl.4ht scrbook.4ht scrreprt.4ht spanish.4ht subscript.4ht \
   titlesec.4ht tocloft.4ht wrapfig.4ht usepackage.4ht fontspec.4ht \
-	fontspec-xetex.4ht fontspec-4ht.lua
+	fontspec-xetex.4ht fontspec-4ht.lua fontspec-luatex.4ht
 # xx and many, many more.
 
 derived += $(tex4ht_bibtex2_derived)

Modified: trunk/lit/mktex4ht-cnf.tex
===================================================================
--- trunk/lit/mktex4ht-cnf.tex	2016-12-03 23:52:02 UTC (rev 209)
+++ trunk/lit/mktex4ht-cnf.tex	2016-12-04 11:19:31 UTC (rev 210)
@@ -322,4 +322,5 @@
 \AddFile{9}{exam}
 \AddFile{9}{fontspec}
 \AddFile{9}{fontspec-xetex}
+\AddFile{9}{fontspec-luatex}
 %\AddFile{9}{mktex4ht}

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2016-12-03 23:52:02 UTC (rev 209)
+++ trunk/lit/tex4ht-4ht.tex	2016-12-04 11:19:31 UTC (rev 210)
@@ -3507,24 +3507,7 @@
 % fontspec.4ht (|version), generated from |jobname.tex
 % Copyright |CopyYear.2016. TeX Users Group
 |<TeX4ht copyright|>
-% LuaTeX support
-\ifdefined\directlua
-\RequirePackage{luatexbase}
-\RequirePackage{luacode}
-
-\begin{luacode*}
-  local fontspec = require "fontspec-4ht"
-  luatexbase.add_to_callback("pre_linebreak_filter", fontspec.char_to_entity, "Char to entity")
-  luatexbase.add_to_callback("hpack_filter", fontspec.char_to_entity, "hpack-char-to-entity")
-\end{luacode*}
-\else
-\input fontspec-xetex.4ht
-\xeuniuseblock{Latin}
-\ExplSyntaxOn
-\seq_map_inline:Nn \fontspec_ht_scripts {\typeout{use block #1}\xeuniuseblock{#1}}
-\ExplSyntaxOff
 \Hinput{fontspec}
-\fi
 
 >>> \AddFile{9}{fontspec}
 
@@ -3988,9 +3971,33 @@
 \xeuniblockdef{CJK Unified Ideographs Extension D}{\xeuniregisterblockhex{2B740}{2B81F}}
 \xeuniblockdef{CJK Unified Ideographs Extension E}{\xeuniregisterblockhex{2B820}{2CEAF}}
 \xeuniblockdef{CJK Compatibility Ideographs Supplement}{\xeuniregisterblockhex{2F800}{2FA1F}}
+% load default latin block and blocks requested through Script option in fontspec's font 
+% selection commands
+\ExplSyntaxOn
+\xeuniuseblock{Latin}
+\seq_map_inline:Nn \fontspec_ht_scripts {\typeout{use block #1}\xeuniuseblock{#1}}
+\ExplSyntaxOff
+\Hinput{fontspec-xetex}
 \endinput
 >>> \AddFile{9}{fontspec-xetex}
 
+
+\<fontspec-luatex.4ht\><<<
+% fontspec-luatex.4ht, generated from |jobname.tex
+% Copyright |CopyYear.2016. TeX Users Group
+|<TeX4ht copyright|>
+\RequirePackage{luatexbase}
+\RequirePackage{luacode}
+
+\begin{luacode*}
+  local fontspec = require "fontspec-4ht"
+  luatexbase.add_to_callback("pre_linebreak_filter", fontspec.char_to_entity, "Char to entity")
+  luatexbase.add_to_callback("hpack_filter", fontspec.char_to_entity, "hpack-char-to-entity")
+\end{luacode*}
+\Hinput{fontspec-luatex}
+\endinput
+>>> \AddFile{9}{fontspec-luatex}
+
 %%%%%%%%%%%%%%%%%%
 \Section{url.sty}
 %%%%%%%%%%%%%%%%%%