From 657b5cfe19672cc27026ed2ab78b667062af6e68 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 31 Mar 2016 21:17:00 +0000
Subject: tex4ebook (31mar16)

git-svn-id: svn://tug.org/texlive/trunk@40199 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/doc/support/tex4ebook/changelog.tex  |  10 ++++++++++
 .../doc/support/tex4ebook/tex4ebook-doc.pdf         | Bin 67026 -> 67170 bytes
 .../doc/support/tex4ebook/tex4ebook-doc.tex         |   2 +-
 Master/texmf-dist/scripts/tex4ebook/tex4ebook       |  10 ++++------
 Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty |   2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'Master')

diff --git a/Master/texmf-dist/doc/support/tex4ebook/changelog.tex b/Master/texmf-dist/doc/support/tex4ebook/changelog.tex
index eb45a1fd524..e280b766cac 100644
--- a/Master/texmf-dist/doc/support/tex4ebook/changelog.tex
+++ b/Master/texmf-dist/doc/support/tex4ebook/changelog.tex
@@ -1,6 +1,16 @@
 \section{Changes}\label{changes}
 
 \begin{itemize}
+\item
+  31/03/2016 Version 0.1d
+
+  \begin{itemize}
+  \itemsep1pt\parskip0pt\parsep0pt
+  \item
+    bug fix: Unicode wasn't used by default
+  \item
+    bug fix: Formats weren't preserved
+  \end{itemize}
 \item
   06/12/2015 Version 0.1c
 
diff --git a/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf
index 89000dc6dad..0bb5a6e8aba 100644
Binary files a/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf and b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf differ
diff --git a/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.tex b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.tex
index f2437dd4907..b354d948167 100644
--- a/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.tex
+++ b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.tex
@@ -14,7 +14,7 @@
 
 \title{The \texttt{tex4ebook} package}
 \author{Michal Hoftich\footnote{\url{michal.h21@gmail.com}}}
-\date{Version 0.1c\\12/11/2015}
+\date{Version 0.1d\\2016/03/31}
 \begin{document}
 \maketitle
 \tableofcontents
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)
diff --git a/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty b/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty
index b8fbfaf4d39..68740341cc3 100644
--- a/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty
+++ b/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty
@@ -1,6 +1,6 @@
 % Package odsfile. Author Michal Hoftich <michal.h21@gmail.com>
 % This package is subject of LPPL license, version 1.3 
-\ProvidesPackage{tex4ebook}[2015/12/11 version 0.1c]
+\ProvidesPackage{tex4ebook}[2016/03/31 version 0.1d]
 \RequirePackage{etoolbox}
 \RequirePackage{kvoptions}
 \RequirePackage{graphicx}
-- 
cgit v1.2.3