tex4ebook (31mar16)

git-svn-id: svn://tug.org/texlive/trunk@40199 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 4 insertions, 6 deletions

diff --git a/Master/texmf-dist/scripts/tex4ebook/tex4ebook b/Master/texmf-dist/scripts/tex4ebook/tex4ebook
index 64dcd0d7e1d..b305c806c57 100755
--- a/Master/texmf-dist/scripts/tex4ebook/tex4ebook
+++ b/Master/texmf-dist/scripts/tex4ebook/tex4ebook
@@ -52,7 +52,7 @@ else
 end
 
 if args.version then
-  print "tex4ebook version 0.1c"
+  print "tex4ebook version 0.1d"
   return 
 end
 
@@ -61,10 +61,6 @@ if args.lua then
   latex_cmd="dvilualatex"
 end
 
---if args.utf8 then
-tex4ht_sty_par=tex4ht_sty_par .. ", charset=utf-8"
-tex4ht_par=tex4ht_par .. " -cmozhtf -utf8"
---end
 
 if args["shell-escape"] then 
   latex_par = latex_par .. " -shell-escape"
@@ -114,7 +110,7 @@ end--]]
 
 local input = ebookutils.remove_extension(input_file)
 local config=ebookutils.remove_extension(args.config)
-local tex4ht_sty_par = config ..tex4ht_sty_par..","+args.format
+-- local tex4ht_sty_par = config ..tex4ht_sty_par..","+args.format
 --local sty_args =  args[2] and ", " .. args[2]  or ""
 local sty_args = ""
 if args[2] then 
@@ -154,6 +150,8 @@ for k,v in pairs(oldparams) do
   params[k] = v
 end
 
+params.tex4ht_sty_par=params.tex4ht_sty_par .. ",charset=utf-8,"..args.format
+params.tex4ht_par= " -cmozhtf -utf8" .. params.tex4ht_par
 
 if output_formats[args.format] then
   executor=require("exec_"..args.format)