diff options
| -rw-r--r-- | scripts/context/lua/mtxrun.lua | 6 | ||||
| -rw-r--r-- | scripts/context/stubs/mswin/mtxrun.lua | 6 | ||||
| -rwxr-xr-x | scripts/context/stubs/unix/mtxrun | 6 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4101 -> 4093 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/l-io.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24699 -> 24697 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.log | 49 | ||||
| -rw-r--r-- | tex/context/base/util-sql-imp-swiglib.lua | 3 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 17 insertions, 61 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 61f2b8f4f..c98e118bc 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -2012,7 +2012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 8818, stripped down to: 6340 +-- original size: 8817, stripped down to: 6340 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -16261,8 +16261,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 : 663501 --- stripped bytes : 233130 +-- original bytes : 663500 +-- stripped bytes : 233129 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 61f2b8f4f..c98e118bc 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -2012,7 +2012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 8818, stripped down to: 6340 +-- original size: 8817, stripped down to: 6340 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -16261,8 +16261,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 : 663501 --- stripped bytes : 233130 +-- original bytes : 663500 +-- stripped bytes : 233129 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 61f2b8f4f..c98e118bc 100755 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -2012,7 +2012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 8818, stripped down to: 6340 +-- original size: 8817, stripped down to: 6340 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -16261,8 +16261,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 : 663501 --- stripped bytes : 233130 +-- original bytes : 663500 +-- stripped bytes : 233129 -- end library merge diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index fdba7e712..055a449cd 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2013.08.03 22:06} +\newcontextversion{2013.08.05 10:01} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex a23aea2f1..dafe2c186 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index d8ab85675..09afdc8e4 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.08.03 22:06} +\edef\contextversion{2013.08.05 10:01} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/l-io.lua b/tex/context/base/l-io.lua index e3a443be8..52f166af9 100644 --- a/tex/context/base/l-io.lua +++ b/tex/context/base/l-io.lua @@ -60,7 +60,7 @@ io.readall = readall function io.loaddata(filename,textmode) -- return nil if empty local f = io.open(filename,(textmode and 'r') or 'rb') if f then --- local data = f:read('*all') + -- local data = f:read('*all') local data = readall(f) f:close() if #data > 0 then diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 0e0344510..5dd1312b6 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log index f937b365d..063113e76 100644 --- a/tex/context/base/status-lua.log +++ b/tex/context/base/status-lua.log @@ -1,6 +1,6 @@ (cont-yes.mkiv -ConTeXt ver: 2013.08.03 22:06 MKIV beta fmt: 2013.8.3 int: english/english +ConTeXt ver: 2013.08.05 10:01 MKIV beta fmt: 2013.8.5 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) @@ -13,16 +13,7 @@ interface > macros > processed mkvi file 'c:/data/develop/context/sources/ system > files > jobname 's-inf-03', input './s-inf-03.mkiv', result 'status-lua.pdf' fonts > latin modern fonts are not preloaded languages > language 'en' is active -(c:/data/develop/context/texmf/tex/context/base/s-inf-03.mkiv (c:/data/develop/context/sources/type-loc.mkiv) (type-imp-dejavu.mkiv) (type-imp-xits.mkiv (type-imp-texgyre.mkiv)) -system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/data/names.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/data/names.tmc' -system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/data/names.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/data/names.tmc' stripped -system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tmc' -system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tmc' stripped -system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tmc' -system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tmc' stripped -system > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tmc' -system > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tmc' stripped -{c:/data/develop/tex-context/tex/texmf-context/fonts/map/pdftex/context/mkiv-base.map} (virtual://buffer.noname.1 +(c:/data/develop/context/texmf/tex/context/base/s-inf-03.mkiv (c:/data/develop/context/sources/type-loc.mkiv) (type-imp-dejavu.mkiv) (type-imp-xits.mkiv (type-imp-texgyre.mkiv)){c:/data/develop/tex-context/tex/texmf-context/fonts/map/pdftex/context/mkiv-base.map} (virtual://buffer.noname.1 references > unknown reference '[][]' references > unknown reference '[][attributes]' references > unknown reference '[][backends]' @@ -85,39 +76,3 @@ references > unknown reference '[][mbox]' references > unknown reference '[][md5]' references > unknown reference '[][metapost]' references > unknown reference '[][mime]' -references > unknown reference '[][moduledata]' -references > unknown reference '[][modules]' -references > unknown reference '[][mplib]' -references > unknown reference '[][noads]' -references > unknown reference '[][node]' -references > unknown reference '[][nodes]' -references > unknown reference '[][number]' -references > unknown reference '[][os]' -references > unknown reference '[][package]' -references > unknown reference '[][pagebuilders]' -references > unknown reference '[][parametersets]' -references > unknown reference '[][pdf]' -references > unknown reference '[][pdfscanner]' -references > unknown reference '[][physics]' -references > unknown reference '[][profiler]' -references > unknown reference '[][regimes]' -references > unknown reference '[][resolvers]' -references > unknown reference '[][scripts]' -references > unknown reference '[][set]' -references > unknown reference '[][socket]' -references > unknown reference '[][sorters]' -references > unknown reference '[][statistics]' -references > unknown reference '[][status]' -references > unknown reference '[][storage]' -references > unknown reference '[][streams]' -references > unknown reference '[][string]' -references > unknown reference '[][structures]' -references > unknown reference '[][table]' -references > unknown reference '[][tex]' -references > unknown reference '[][texconfig]' -references > unknown reference '[][texio]' -references > unknown reference '[][thirddata]' -references > unknown reference '[][token]' -references > unknown reference '[][tokens]' -references > unknown reference '[][tracers]' -references
\ No newline at end of file diff --git a/tex/context/base/util-sql-imp-swiglib.lua b/tex/context/base/util-sql-imp-swiglib.lua index 758c81746..5d64c02d4 100644 --- a/tex/context/base/util-sql-imp-swiglib.lua +++ b/tex/context/base/util-sql-imp-swiglib.lua @@ -453,7 +453,8 @@ local function execute(specification) end local wraptemplate = [[ -local mysql = require("swigluamysql") -- will be stored in method +----- mysql = require("swigluamysql") -- will be stored in method +local mysql = require("swiglib.mysql.core") -- will be stored in method ----- mysql_fetch_row = mysql.mysql_fetch_row ----- mysql_fetch_lengths = mysql.mysql_fetch_lengths diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 8c9c2d660..a8ae7835f 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 08/03/13 22:06:03 +-- merge date : 08/05/13 10:01:32 do -- begin closure to overcome local limits and interference |