summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-02 21:05:54 +0000
committerKarl Berry <karl@freefriends.org>2019-11-02 21:05:54 +0000
commitcd516af31cb2636de100df528f2fc0f98e99c73c (patch)
tree0fd202f2708346154445e3b4fbedbcf13e299221
parenta6533ee0e9b4a659454300277fc787a14d44afd6 (diff)
tex4ebook (2nov19)
git-svn-id: svn://tug.org/texlive/trunk@52616 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tex4ebook/tex4ebook4
-rw-r--r--Master/texmf-dist/doc/support/tex4ebook/changelog.tex12
-rw-r--r--Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdfbin78095 -> 78439 bytes
-rw-r--r--Master/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf (renamed from Master/texmf-dist/doc/support/tex4ebook/tidyconf.conf)0
-rwxr-xr-xMaster/texmf-dist/scripts/tex4ebook/config-t4e.lua19
-rwxr-xr-xMaster/texmf-dist/scripts/tex4ebook/list-fonts.lua145
-rwxr-xr-xMaster/texmf-dist/scripts/tex4ebook/tex4ebook4
-rwxr-xr-xMaster/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub.lua (renamed from Master/texmf-dist/scripts/tex4ebook/exec_epub.lua)7
-rwxr-xr-xMaster/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub3.lua (renamed from Master/texmf-dist/scripts/tex4ebook/exec_epub3.lua)2
-rwxr-xr-xMaster/texmf-dist/scripts/tex4ebook/tex4ebook-exec_mobi.lua (renamed from Master/texmf-dist/scripts/tex4ebook/exec_mobi.lua)2
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/dviout.win32.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/pdfjam.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/texworks.tlpsrc2
14 files changed, 26 insertions, 181 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/tex4ebook/tex4ebook b/Build/source/texk/texlive/linked_scripts/tex4ebook/tex4ebook
index 731607fc5b4..ebd7485c2d1 100755
--- a/Build/source/texk/texlive/linked_scripts/tex4ebook/tex4ebook
+++ b/Build/source/texk/texlive/linked_scripts/tex4ebook/tex4ebook
@@ -67,7 +67,7 @@ else
end
if args.version then
- print "tex4ebook v0.3"
+ print "tex4ebook v0.3a"
return
end
@@ -180,7 +180,7 @@ params["config_file"] = config_file
if output_formats[output_format] then
- executor=require("exec_"..output_format)
+ executor=require("tex4ebook-exec_"..output_format)
params=executor.prepare(params)
if #extensions > 0 then
params = ebookutils.extensions_prepare_parameters(extensions,params)
diff --git a/Master/texmf-dist/doc/support/tex4ebook/changelog.tex b/Master/texmf-dist/doc/support/tex4ebook/changelog.tex
index 0d3393cca58..4cb5c8c7ca9 100644
--- a/Master/texmf-dist/doc/support/tex4ebook/changelog.tex
+++ b/Master/texmf-dist/doc/support/tex4ebook/changelog.tex
@@ -8,6 +8,18 @@
\begin{itemize}
\tightlist
\item
+ released version \texttt{0.3a}
+ \item
+ added \texttt{tex4ebook-} prefix to the output formats.
+ \item
+ removed unused files.
+ \end{itemize}
+\item
+ 2019/11/01
+
+ \begin{itemize}
+ \tightlist
+ \item
released version \texttt{0.3}
\end{itemize}
\item
diff --git a/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf
index 8372406fd9d..1f956367135 100644
--- a/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf
+++ b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/tex4ebook/tidyconf.conf b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf
index abac96362bd..abac96362bd 100644
--- a/Master/texmf-dist/doc/support/tex4ebook/tidyconf.conf
+++ b/Master/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf
diff --git a/Master/texmf-dist/scripts/tex4ebook/config-t4e.lua b/Master/texmf-dist/scripts/tex4ebook/config-t4e.lua
deleted file mode 100755
index 9cc6681efec..00000000000
--- a/Master/texmf-dist/scripts/tex4ebook/config-t4e.lua
+++ /dev/null
@@ -1,19 +0,0 @@
--- Config file for tex4ebook
-
--- Font config
-
-Font{
- name = "cmr",
- file = "lmroman10-regular.otf",
- family = "Latin Modern",
- weight = "normal",
- style = "normal"
-}
-
-Font{
- name = "cmmi",
- file = "lmroman10-italic.otf",
- family = "Latin Modern",
- weight = "normal",
- style = "italic"
-}
diff --git a/Master/texmf-dist/scripts/tex4ebook/list-fonts.lua b/Master/texmf-dist/scripts/tex4ebook/list-fonts.lua
deleted file mode 100755
index 9acd1665f60..00000000000
--- a/Master/texmf-dist/scripts/tex4ebook/list-fonts.lua
+++ /dev/null
@@ -1,145 +0,0 @@
-kpse.set_program_name("luatex")
-local function exists(fn)
- local f = io.open(fn,"r")
- if f~=nil then io.close(f) return true else return false end
-end
-local function load_fontbase(pathtable)
- -- path should point to possible location of luaotfload font database
- -- pathtable should be array of strings
- -- each path should not end with lua
-
- local path = pathtable
- if type(pathtable) =="string" then path = {pathtable} end
- if #path == 0 then return nil end
- local currentpath = table.remove(path,1)
- if exists(currentpath ..".lua") then return require(currentpath)
- else return load_fontbase(path) end
-end
-
---local fontbase = require(kpse.expand_var("$TEXMFSYSVAR") .. "/luatex-cache/generic/names/luaotfload-names.lua")
-local sysvar = kpse.expand_var("$TEXMFSYSVAR")
-local var = kpse.expand_var("$TEXMFVAR")
-local namespath = "/luatex-cache/generic/names/"
-local oldnames = "otfl-names"
-local newnames = "luaotfload-names"
-local compose_path = function(path, name) return path .. namespath .. name end
-local fontbase_path = {
- compose_path(sysvar, newnames),
- compose_path(var, newnames),
- compose_path(sysvar, oldnames),
- compose_path(var,oldnames)
-}
-
-local fontbase = load_fontbase(fontbase_path) or {}
-fontbase.mappings = fontbase.mappings or {}
--- assert(fontbase, "Cannot load font names")
-
-
--- [[
--- This is code for querying the database
---
-local search = arg[1] or ""
-search = unicode.utf8.lower(search)
---]]
-local fonts = {}
-for _,record in pairs(fontbase.mappings) do
- local familyname = record.familyname
- local styles = fonts[familyname] or {}
- local sanitized = record.sanitized or record.names
- local subfamily = sanitized.subfamily --record.sanitized.subfamily or record.names.subfamily
- styles[subfamily] = record -- We add subfamily as key to prevent duplicates
- fonts[familyname] = styles
-end
-
-local FontLoader = {}
-
-FontLoader.__index = FontLoader
-
-FontLoader.load_family = function(familyname)
- local self = setmetatable({},FontLoader)
- local family = fonts[familyname]
- --[[ for _, record in pairs(fontbase.mappings) do
- if record.familyname == familyname then
- local style = record.sanitized.subfamily
- family[style] = record
- end
- end
- --]]
- self.family = family
- return self
-end
-FontLoader.get_path =function(self,style)
- local rec = self.family[style]
- local filename = rec.filename
- if type(filename) == "table" then
- filename = filename[1]
- end
- return kpse.find_file(filename,'opentype fonts') or kpse.find_file(filename,'truetype fonts')
-end
-
-
-FontLoader.list = function(self)
- for style,rec in pairs(self.family) do
- print(style, self:get_path(style))
- end
-end
-
-
-local FontNames = {}
-FontNames.__index = FontNames
-
-FontNames.new = function()
- self = setmetatable({},FontNames)
- self.names = {}
- return self
-end
-
-FontNames.add_family = function(self,properties)
- local properties = properties or {}
- return function(names)
- local names = names or {}
- for _,n in pairs(names) do
- self.names[n] = properties
- end
- end
-end
-
-FontNames.list = function(self)
- for name,prop in pairs(self.names) do
- local p = {}
- for k,v in pairs(prop) do
- table.insert(p,k..'='..v)
- end
- print(name, table.concat(p))
- end
-end
-
---[[
-local fontnames = {}
-for fontname,_ in pairs(fonts) do
- local lowername = unicode.utf8.lower(fontname)
- if lowername:find(search) then
- table.insert(fontnames, fontname)
- end
-end
-
-table.sort(fontnames)
---for fontname, styles in pairs (fonts) do
-for _, name in pairs(fontnames) do
- local fontname = name
- local styles = fonts[fontname]
- local t = {}
- for n,_ in pairs(styles) do table.insert(t,n) end
- print(fontname, table.concat(t,', '))
-end
---]]
-
-local testfont = FontLoader.load_family("math")
---testfont:list()
-
-local n= FontNames.new()
-n:add_family {type = "serif", name = "LMMono10"} {"cmr"}
-n:add_family {type = "serif", name = "TeXGyreTermes"} {"ts1-qtmr", "ec-qtmr","ec-qtmri"}
---n:list()
-
-return {FontLoader = FontLoader, FontNames = n}
diff --git a/Master/texmf-dist/scripts/tex4ebook/tex4ebook b/Master/texmf-dist/scripts/tex4ebook/tex4ebook
index 731607fc5b4..ebd7485c2d1 100755
--- a/Master/texmf-dist/scripts/tex4ebook/tex4ebook
+++ b/Master/texmf-dist/scripts/tex4ebook/tex4ebook
@@ -67,7 +67,7 @@ else
end
if args.version then
- print "tex4ebook v0.3"
+ print "tex4ebook v0.3a"
return
end
@@ -180,7 +180,7 @@ params["config_file"] = config_file
if output_formats[output_format] then
- executor=require("exec_"..output_format)
+ executor=require("tex4ebook-exec_"..output_format)
params=executor.prepare(params)
if #extensions > 0 then
params = ebookutils.extensions_prepare_parameters(extensions,params)
diff --git a/Master/texmf-dist/scripts/tex4ebook/exec_epub.lua b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub.lua
index 24cc626aad3..52e2ab6134d 100755
--- a/Master/texmf-dist/scripts/tex4ebook/exec_epub.lua
+++ b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub.lua
@@ -1,13 +1,10 @@
-module("exec_epub",package.seeall)
+module(...,package.seeall)
local lfs = require("lfs")
local os = require("os")
local io = require("io")
local log = logging.new("exec_epub")
--local ebookutils = require("ebookutils")
local ebookutils = require "mkutils"
--- font loading doesn't work, font database format changes often
--- and it is different between TL and Miktex
--- local load_font = require("list-fonts")
local outputdir_name="OEBPS"
local metadir_name = "META-INF"
local mimetype_name="mimetype"
@@ -173,7 +170,7 @@ function make_opf()
end
local tidyconf = nil
if tidy then
- tidyconf = kpse.find_file("tidyconf.conf")
+ tidyconf = kpse.find_file("tex4ebook-tidyconf.conf")
end
--local opf_first_part = outputdir .. "/content.opf"
local opf_first_part = "content.opf"
diff --git a/Master/texmf-dist/scripts/tex4ebook/exec_epub3.lua b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub3.lua
index edf6df01c22..650eea4e6db 100755
--- a/Master/texmf-dist/scripts/tex4ebook/exec_epub3.lua
+++ b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_epub3.lua
@@ -1,5 +1,5 @@
module(...,package.seeall)
-local eb = require("exec_epub")
+local eb = require("tex4ebook-exec_epub")
local dom = require("luaxml-domobject")
local log = logging.new "exec_epub3"
diff --git a/Master/texmf-dist/scripts/tex4ebook/exec_mobi.lua b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_mobi.lua
index ce10b6da760..92b70af71c3 100755
--- a/Master/texmf-dist/scripts/tex4ebook/exec_mobi.lua
+++ b/Master/texmf-dist/scripts/tex4ebook/tex4ebook-exec_mobi.lua
@@ -1,5 +1,5 @@
module(...,package.seeall)
-local eb = require("exec_epub")
+local eb = require("tex4ebook-exec_epub")
local ebookutils = require("mkutils")
local log = logging.new "exec_mobi"
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index ae8cab02f99..f4ae253a241 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -526,7 +526,7 @@ depend glossaries-polish
depend glossaries-portuges
depend glossaries-serbian
depend glossaries-slovene
-depend glossaries-spanish
+depend glossaries-spanish
depend gmdoc
depend gmdoc-enhance
depend gmiflink
diff --git a/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc b/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc
index e234965b4ad..506dfaa2861 100644
--- a/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dviout.win32.tlpsrc
@@ -2,7 +2,7 @@ category TLCore
binpattern d/win32 tlpkg/dviout
binpattern f/win32 bin/win32/dviout
postaction shortcut type=menu name="DVIOUT DVI viewer" \
- cmd=TEXDIR/bin/win32/dviout.exe
+ cmd=TEXDIR/bin/win32/dviout.exe
postaction filetype name=TL.DVIOUT.view \
cmd='"TEXDIR/bin/win32/dviout.exe" "%1"'
postaction fileassoc extension=.dvi filetype=TL.DVIOUT.view
diff --git a/Master/tlpkg/tlpsrc/pdfjam.tlpsrc b/Master/tlpkg/tlpsrc/pdfjam.tlpsrc
index 0abd4f34917..5a1a2e4e697 100644
--- a/Master/tlpkg/tlpsrc/pdfjam.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdfjam.tlpsrc
@@ -9,7 +9,7 @@ binpattern f bin/${ARCH}/pdfjam-slides6up
binpattern f bin/${ARCH}/pdfjam
binpattern f bin/${ARCH}/pdfjoin
binpattern f bin/${ARCH}/pdfnup
-binpattern f bin/${ARCH}/pdfpun
+binpattern f bin/${ARCH}/pdfpun
#
runpattern f texmf-dist/scripts/pdfjam/pdf180
runpattern f texmf-dist/scripts/pdfjam/pdf270
@@ -22,7 +22,7 @@ runpattern f texmf-dist/scripts/pdfjam/pdfjam-slides6up
runpattern f texmf-dist/scripts/pdfjam/pdfjam
runpattern f texmf-dist/scripts/pdfjam/pdfjoin
runpattern f texmf-dist/scripts/pdfjam/pdfnup
-runpattern f texmf-dist/scripts/pdfjam/pdfpun
+runpattern f texmf-dist/scripts/pdfjam/pdfpun
#
docpattern +f texmf-dist/doc/man/man1/pdf180.*
docpattern +f texmf-dist/doc/man/man1/pdf270.*
@@ -35,4 +35,4 @@ docpattern +f texmf-dist/doc/man/man1/pdfjam-slides6up.*
docpattern +f texmf-dist/doc/man/man1/pdfjam.*
docpattern +f texmf-dist/doc/man/man1/pdfjoin.*
docpattern +f texmf-dist/doc/man/man1/pdfnup.*
-docpattern +f texmf-dist/doc/man/man1/pdfpun.*
+docpattern +f texmf-dist/doc/man/man1/pdfpun.*
diff --git a/Master/tlpkg/tlpsrc/texworks.tlpsrc b/Master/tlpkg/tlpsrc/texworks.tlpsrc
index 0449ab496cd..9c62911e3e1 100644
--- a/Master/tlpkg/tlpsrc/texworks.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texworks.tlpsrc
@@ -4,7 +4,7 @@ longdesc See http://tug.org/texworks for information and downloads.
longdesc TeX Live includes executables and support files only for Windows.
postaction shortcut type=menu name="TeXworks editor" \
- cmd=TEXDIR/bin/win32/texworks.exe
+ cmd=TEXDIR/bin/win32/texworks.exe
postaction filetype name=TL.TeXworks.edit \
cmd='"TEXDIR/bin/win32/texworks.exe" "%1"'
postaction fileassoc extension=.tex filetype=TL.TeXworks.edit