beta 2014.08.27 12:34

author: Hans Hagen <pragma@wxs.nl> 2014-08-27 12:34:00 +0200
committer: Hans Hagen <pragma@wxs.nl> 2014-08-27 12:34:00 +0200
commit: 7eb8593f39b61673c90d12c2fc590933cedf3db0 (patch)
tree: ac058c5e9596f806edfb03969fc39764e33d391e /scripts
parent: 236b439da00fe0baaf9d7ad6ce684ecd6109555c (diff)
download: context-7eb8593f39b61673c90d12c2fc590933cedf3db0.tar.gz
5 files changed, 188 insertions, 73 deletions
diff --git a/scripts/context/lua/mtx-epub.lua b/scripts/context/lua/mtx-epub.lua
index 11f0a2024..9eb7a5c04 100644
--- a/scripts/context/lua/mtx-epub.lua
+++ b/scripts/context/lua/mtx-epub.lua
@@ -20,6 +20,7 @@ if not modules then modules = { } end modules ['mtx-epub'] = {
 
 local format, gsub = string.format, string.gsub
 local concat = table.concat
+local replace = utilities.templates.replace
 
 local helpinfo = [[
 <?xml version="1.0"?>
@@ -60,45 +61,45 @@ scripts.epub = scripts.epub or { }
 
 local mimetype = "application/epub+zip"
 
-local container = [[
+local t_container = [[
 <?xml version="1.0" encoding="UTF-8"?>
 
 <container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
     <rootfiles>
-        <rootfile full-path="OEBPS/%s" media-type="application/oebps-package+xml"/>
+        <rootfile full-path="OEBPS/%rootfile%" media-type="application/oebps-package+xml"/>
     </rootfiles>
 </container>
 ]]
 
-local package = [[
+local t_package = [[
 <?xml version="1.0" encoding="UTF-8"?>
 
-<package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="%s">
+<package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="%identifier%">
 
     <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
-        <dc:title>%s</dc:title>
-        <dc:language>%s</dc:language>
-        <dc:identifier id="%s" opf:scheme="UUID">urn:uuid:%s</dc:identifier>
-        <dc:creator>%s</dc:creator>
-        <dc:date>%s</dc:date>
-        <meta name="cover" content="%s" />
+        <dc:title>%title%</dc:title>
+        <dc:language>%language%</dc:language>
+        <dc:identifier id="%identifier%" opf:scheme="UUID">urn:uuid:%uuid%</dc:identifier>
+        <dc:creator>%creator%</dc:creator>
+        <dc:date>%date%</dc:date>
+        <meta name="cover" content="%firstpage%" />
     </metadata>
 
     <manifest>
-%s
+%manifest%
     </manifest>
 
     <spine toc="ncx">
         <itemref idref="cover-xhtml" />
-        <itemref idref="%s" />
+        <itemref idref="%rootfile%" />
     </spine>
 
 </package>
 ]]
 
-local item = [[        <item id="%s" href="%s" media-type="%s"/>]]
+local t_item = [[        <item id="%id%" href="%filename%" media-type="%mime%"/>]]
 
-local toc = [[
+local t_toc = [[
 <?xml version="1.0"?>
 
 <!DOCTYPE ncx PUBLIC "-//NISO//DTD ncx 2005-1//EN" "http://www.daisy.org/z3986/2005/ncx-2005-1.dtd">
@@ -106,29 +107,33 @@ local toc = [[
 <ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
 
     <head>
-        <meta name="dtb:uid"           content="%s" />
+        <meta name="dtb:uid"           content="%identifier%" />
         <meta name="dtb:depth"         content="2" />
         <meta name="dtb:totalPgeCount" content="0" />
         <meta name="dtb:maxPageNumber" content="0" />
     </head>
 
     <docTitle>
-        <text>%s</text>
+        <text>%title%</text>
     </docTitle>
 
+    <docAuthor>
+        <text>%author%</text>
+    </docAuthor>
+
     <navMap>
         <navPoint id="np-1" playOrder="1">
             <navLabel>
                 <text>start</text>
             </navLabel>
-            <content src="%s"/>
+            <content src="%root%"/>
         </navPoint>
     </navMap>
 
 </ncx>
 ]]
 
-local coverxhtml = [[
+local t_coverxhtml = [[
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -139,7 +144,7 @@ local coverxhtml = [[
     </head>
     <body>
         <div>
-            <img src="%s" alt="The cover image" style="max-width: 100%%;" />
+            <img src="%image%" alt="The cover image" style="max-width: 100%%;" />
         </div>
     </body>
 </html>
@@ -225,8 +230,6 @@ function scripts.epub.make()
         local specfile = file.replacesuffix(filename,"specification")
         local specification = lfs.isfile(specfile) and dofile(specfile) or { }
 
---         inspect(specification)
-
         local name       = specification.name       or file.removesuffix(filename)
         local identifier = specification.identifier or os.uuid(true)
         local files      = specification.files      or { file.addsuffix(filename,"xhtml") }
@@ -271,7 +274,11 @@ function scripts.epub.make()
                 local target = file.join(epubpath,"OEBPS",filename)
                 file.copy(filename,target)
                 application.report("copying %s to %s",filename,target)
-                used[#used+1] = format(item,idmaker(filename),filename,mime)
+                used[#used+1] = replace(t_item, {
+                    id       = idmaker(filename),
+                    filename = filename,
+                    mime     = mime,
+                } )
             end
         end
 
@@ -304,29 +311,29 @@ function scripts.epub.make()
 
         local idmaker = idmakers[file.suffix(root)] or idmakers.default
 
-        container = format(container,
-            epubroot
-        )
-        package = format(package,
-            identifier,
-            title,
-            language,
-            identifier,
-            os.uuid(),
-            creator,
-            os.date("!%Y-%m-%dT%H:%M:%SZ"),
-            idmaker(firstpage),
-            concat(used,"\n"),
-            idmaker(root)
-        )
-        toc = format(toc,
-            identifier,
-            title,
-            root
-        )
-        coverxhtml = format(coverxhtml,
-            firstpage
-        )
+        container = replace(t_container, {
+            rootfile = epubroot
+        } )
+        package = replace(t_package, {
+            identifier = identifier,
+            title      = title,
+            language   = language,
+            uuid       = os.uuid(),
+            creator    = creator,
+            date       = os.date("!%Y-%m-%dT%H:%M:%SZ"),
+            firstpage  = idmaker(firstpage),
+            manifest   = concat(used,"\n"),
+            rootfile   = idmaker(root)
+        } )
+        toc = replace(t_toc, {
+            identifier = identifier,
+            title      = title,
+            author     = author,
+            root       = root,
+        } )
+        coverxhtml = replace(t_coverxhtml, {
+            image      = firstpage
+        } )
 
         io.savedata(file.join(epubpath,"mimetype"),mimetype)
         io.savedata(file.join(epubpath,"META-INF","container.xml"),container)
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 470123046..095147e47 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -5740,7 +5740,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 23985, stripped down to: 16069
+-- original size: 24247, stripped down to: 16248
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -5830,6 +5830,15 @@ function tables.removevalue(t,value)
     end
   end
 end
+function tables.replacevalue(t,oldvalue,newvalue)
+  if oldvalue and newvalue then
+    for i=1,#t do
+      if t[i]==oldvalue then
+        t[i]=newvalue
+      end
+    end
+  end
+end
 function tables.insertbeforevalue(t,value,extra)
   for i=1,#t do
     if t[i]==extra then
@@ -11373,7 +11382,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 25695, stripped down to: 18281
+-- original size: 26026, stripped down to: 18535
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -12021,8 +12030,8 @@ function xml.finalizers.xml.cdata(collected)
   end
   return ""
 end
-function xml.insertcomment(e,str,n) 
-  table.insert(e.dt,n or 1,{
+function xml.insertcomment(e,str,n)
+  insert(e.dt,n or 1,{
     tg="@cm@",
     ns="",
     special=true,
@@ -12030,7 +12039,25 @@ function xml.insertcomment(e,str,n)
     dt={ str },
   })
 end
-function xml.setcdata(e,str) 
+function xml.insertcdata(e,str,n)
+  insert(e.dt,n or 1,{
+    tg="@cd@",
+    ns="",
+    special=true,
+    at={},
+    dt={ str },
+  })
+end
+function xml.setcomment(e,str,n)
+  e.dt={ {
+    tg="@cm@",
+    ns="",
+    special=true,
+    at={},
+    dt={ str },
+  } }
+end
+function xml.setcdata(e,str)
   e.dt={ {
     tg="@cd@",
     ns="",
@@ -17389,8 +17416,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 719054
--- stripped bytes    : 257008
+-- original bytes    : 719647
+-- stripped bytes    : 257168
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 470123046..095147e47 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -5740,7 +5740,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 23985, stripped down to: 16069
+-- original size: 24247, stripped down to: 16248
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -5830,6 +5830,15 @@ function tables.removevalue(t,value)
     end
   end
 end
+function tables.replacevalue(t,oldvalue,newvalue)
+  if oldvalue and newvalue then
+    for i=1,#t do
+      if t[i]==oldvalue then
+        t[i]=newvalue
+      end
+    end
+  end
+end
 function tables.insertbeforevalue(t,value,extra)
   for i=1,#t do
     if t[i]==extra then
@@ -11373,7 +11382,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 25695, stripped down to: 18281
+-- original size: 26026, stripped down to: 18535
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -12021,8 +12030,8 @@ function xml.finalizers.xml.cdata(collected)
   end
   return ""
 end
-function xml.insertcomment(e,str,n) 
-  table.insert(e.dt,n or 1,{
+function xml.insertcomment(e,str,n)
+  insert(e.dt,n or 1,{
     tg="@cm@",
     ns="",
     special=true,
@@ -12030,7 +12039,25 @@ function xml.insertcomment(e,str,n)
     dt={ str },
   })
 end
-function xml.setcdata(e,str) 
+function xml.insertcdata(e,str,n)
+  insert(e.dt,n or 1,{
+    tg="@cd@",
+    ns="",
+    special=true,
+    at={},
+    dt={ str },
+  })
+end
+function xml.setcomment(e,str,n)
+  e.dt={ {
+    tg="@cm@",
+    ns="",
+    special=true,
+    at={},
+    dt={ str },
+  } }
+end
+function xml.setcdata(e,str)
   e.dt={ {
     tg="@cd@",
     ns="",
@@ -17389,8 +17416,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 719054
--- stripped bytes    : 257008
+-- original bytes    : 719647
+-- stripped bytes    : 257168
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 470123046..095147e47 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -5740,7 +5740,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 23985, stripped down to: 16069
+-- original size: 24247, stripped down to: 16248
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -5830,6 +5830,15 @@ function tables.removevalue(t,value)
     end
   end
 end
+function tables.replacevalue(t,oldvalue,newvalue)
+  if oldvalue and newvalue then
+    for i=1,#t do
+      if t[i]==oldvalue then
+        t[i]=newvalue
+      end
+    end
+  end
+end
 function tables.insertbeforevalue(t,value,extra)
   for i=1,#t do
     if t[i]==extra then
@@ -11373,7 +11382,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 25695, stripped down to: 18281
+-- original size: 26026, stripped down to: 18535
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -12021,8 +12030,8 @@ function xml.finalizers.xml.cdata(collected)
   end
   return ""
 end
-function xml.insertcomment(e,str,n) 
-  table.insert(e.dt,n or 1,{
+function xml.insertcomment(e,str,n)
+  insert(e.dt,n or 1,{
     tg="@cm@",
     ns="",
     special=true,
@@ -12030,7 +12039,25 @@ function xml.insertcomment(e,str,n)
     dt={ str },
   })
 end
-function xml.setcdata(e,str) 
+function xml.insertcdata(e,str,n)
+  insert(e.dt,n or 1,{
+    tg="@cd@",
+    ns="",
+    special=true,
+    at={},
+    dt={ str },
+  })
+end
+function xml.setcomment(e,str,n)
+  e.dt={ {
+    tg="@cm@",
+    ns="",
+    special=true,
+    at={},
+    dt={ str },
+  } }
+end
+function xml.setcdata(e,str)
   e.dt={ {
     tg="@cd@",
     ns="",
@@ -17389,8 +17416,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 719054
--- stripped bytes    : 257008
+-- original bytes    : 719647
+-- stripped bytes    : 257168
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 470123046..095147e47 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -5740,7 +5740,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 23985, stripped down to: 16069
+-- original size: 24247, stripped down to: 16248
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -5830,6 +5830,15 @@ function tables.removevalue(t,value)
     end
   end
 end
+function tables.replacevalue(t,oldvalue,newvalue)
+  if oldvalue and newvalue then
+    for i=1,#t do
+      if t[i]==oldvalue then
+        t[i]=newvalue
+      end
+    end
+  end
+end
 function tables.insertbeforevalue(t,value,extra)
   for i=1,#t do
     if t[i]==extra then
@@ -11373,7 +11382,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 25695, stripped down to: 18281
+-- original size: 26026, stripped down to: 18535
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -12021,8 +12030,8 @@ function xml.finalizers.xml.cdata(collected)
   end
   return ""
 end
-function xml.insertcomment(e,str,n) 
-  table.insert(e.dt,n or 1,{
+function xml.insertcomment(e,str,n)
+  insert(e.dt,n or 1,{
     tg="@cm@",
     ns="",
     special=true,
@@ -12030,7 +12039,25 @@ function xml.insertcomment(e,str,n)
     dt={ str },
   })
 end
-function xml.setcdata(e,str) 
+function xml.insertcdata(e,str,n)
+  insert(e.dt,n or 1,{
+    tg="@cd@",
+    ns="",
+    special=true,
+    at={},
+    dt={ str },
+  })
+end
+function xml.setcomment(e,str,n)
+  e.dt={ {
+    tg="@cm@",
+    ns="",
+    special=true,
+    at={},
+    dt={ str },
+  } }
+end
+function xml.setcdata(e,str)
   e.dt={ {
     tg="@cd@",
     ns="",
@@ -17389,8 +17416,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 719054
--- stripped bytes    : 257008
+-- original bytes    : 719647
+-- stripped bytes    : 257168
 
 -- end library merge
author	Hans Hagen <pragma@wxs.nl>	2014-08-27 12:34:00 +0200
committer	Hans Hagen <pragma@wxs.nl>	2014-08-27 12:34:00 +0200
commit	7eb8593f39b61673c90d12c2fc590933cedf3db0 (patch)
tree	ac058c5e9596f806edfb03969fc39764e33d391e /scripts
parent	236b439da00fe0baaf9d7ad6ce684ecd6109555c (diff)
download	context-7eb8593f39b61673c90d12c2fc590933cedf3db0.tar.gz