tex4ebook (7sep20)

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

2 files changed, 7 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.4ht b/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.4ht
index e623ac8bc24..6ee87ed3aeb 100644
--- a/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.4ht
+++ b/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.4ht
@@ -157,7 +157,7 @@ href="#1" media-type="\a:CoverMimeType" />}}
   "http://www.daisy.org/z3986/2005/ncx-2005-1.dtd">\Hnewline}}
 
 %Get sanitized value of \title
-%\def\Title{\Ref{TITLE+}}
+\ifTag{TITLE+}{\def\Title{\LikeRef{TITLE+}}}{}
 % If title contains macros, SafeTitle should be configured 
 % in the custom cfg file
 \NewConfigure{SafeTitle}[1]{\gdef\Title{#1}}
@@ -255,7 +255,7 @@ href="#1" media-type="\a:CoverMimeType" />}}
 \def\navsection#1#2{
   \ConfigureToc{#1}%
   {\expandafter\closelevels\expandafter{#2}
-  \a:NavSection\Ncx:Mark}
+  \def\curr:sect:type{#1}\a:NavSection\Ncx:Mark}
   {\c:NavSection}
   {}
   {\b:NavSection%
@@ -361,16 +361,16 @@ href="#1" media-type="\a:CoverMimeType" />}}
  \Configure{toTocLink}{}{}%
  \Configure{NavSection}{\booltrue{tocnoempty}\HCode{\Hnewline<navPoint id="navPoint-}%
   \stepnavpoint\HCode{" playOrder="}%
-  \the\navpoint\HCode{">\Hnewline<navLabel>\Hnewline<text>}%
+  \the\navpoint\HCode{">\Hnewline<navLabel>\Hnewline<text><navmark type="\curr:sect:type">}%
 }{\HCode{</text>\Hnewline%
   </navLabel>\Hnewline}%
  \HCode{<content src="\navmapsrc" />}%
-}{ }{\HCode{</navPoint>\Hnewline}}
+}{\HCode{</navmark>}}{\HCode{</navPoint>\Hnewline}}
 % Meta inf
 \ncx:head
 % Book title
 \ncx:title
-\tableofcontents%[part,chapter,likechapter,section,likesection,subsection,likesubsection]%
+\tableofcontents[part,appendix,chapter,likechapter,appendixsec,section,likesection,appendixsubsec,subsection,likesubsection]%
 %Hack to get close tag working
 \HCode{</ncx>}
 \EndNoFonts
diff --git a/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty b/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty
index 27a46b756ec..1b0114748c9 100644
--- a/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty
+++ b/Master/texmf-dist/tex/latex/tex4ebook/tex4ebook.sty
@@ -144,12 +144,12 @@
 \let\tf@orig@author\author
 \newcommand\tf@author[1]{%
   \tf@orig@author{#1}%
-  \let\Author\@author%
+  \def\Author{#1}%
 }
 
 \newcommand\tf@optauthor[2][]{%
   \tf@orig@author[#1]{#2}%
-  \let\Author\@author%
+  \def\Author{#2}%
 }
 
 % support optiona argument for \author as well