Commits

Brian Mearns committed 0c45750

Fixed issue #22 - Wrong type checked on html-esc templ function.
Changed version number for dev.
Added rel=next link to toc.xhtml.

Comments (0)

Files changed (5)

+Rel 4 - DEVELOPMENT
+    [p] Fixed issue #22 - Wrong type checked in html-esc templ function.
+    [p] Added rel="next" link to toc.xhtml in the default epub template.
+
 Rel 3 - v1.2.0.0 - 2013-01-28
     [n] Added support for part- and book- title pages to EPUB output
         writer. (multiple cs, primarily the "epub parts and books"

src/tome/res/epub-template/endnotes.xhtml.tmpl

         <link rel="contents" href="toc.xhtml" />
         <link rel="start" href="frontcover.xhtml" />
 
-        <link rel="prev" href="{$ LAST-CHAP-FILE-HTML}" />
+        <link rel="prev" href="{$ LAST-GEN-FILE-HTML}" />
     </head>
     <body class='backmatter rearnotes'>
         <div class='title'>

src/tome/res/epub-template/toc.xhtml.tmpl

         <link rel="start" href="frontcover.xhtml" />
 
         <link rel='prev' href='titlepage.xhtml' />
+        <link rel='next' href='{html-esc {@ 0 {$ GEN-FILE-LIST}}}' />
         
     </head>
     <body class="frontmatter toc" id="toc">
 DAY         = 28
 COPYRIGHT   = YEAR
 
-TAG         = None
+TAG         = "dev"
 
 
 

src/tome/writeEpub.py

     __mnemonics__ = ("html-esc",)
     def execute(self, name, args, ostream, stack):
         self.checkArgCount(name, args, exact=[1,])
-        xstr = self.checkArgType(name, 0, args, str)
+        xstr = self.checkArgType(name, 0, args, templ.ttypes.String).str
         return templ.ttypes.String(htmlEscape(xstr))