From 7301c500d2c7487c188a524a206b7f491c855ab3 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 22 Mar 2013 18:23:00 +0100 Subject: beta 2013.03.22 18:23 --- scripts/context/lua/mtxrun.lua | 11 ++++++---- scripts/context/stubs/mswin/mtxrun.lua | 11 ++++++---- scripts/context/stubs/unix/mtxrun | 11 ++++++---- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4135 -> 4140 bytes tex/context/base/context-version.png | Bin 40102 -> 40404 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/l-file.lua | 5 ++++- tex/context/base/s-art-01.mkiv | 6 +++++- tex/context/base/scrn-ini.mkvi | 23 +++++++++++++-------- tex/context/base/status-files.pdf | Bin 24807 -> 24799 bytes tex/context/base/status-lua.pdf | Bin 211653 -> 211540 bytes tex/context/base/symb-imp-cc.mkiv | 2 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 7 +++++-- 16 files changed, 54 insertions(+), 30 deletions(-) diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 0d89a6458..8e7c4536e 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -2700,7 +2700,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-file"] = package.loaded["l-file"] or true --- original size: 16570, stripped down to: 8991 +-- original size: 16648, stripped down to: 9051 if not modules then modules={} end modules ['l-file']={ version=1.001, @@ -3024,7 +3024,10 @@ file.readdata=io.loaddata file.savedata=io.savedata function file.copy(oldname,newname) if oldname and newname then - file.savedata(newname,io.loaddata(oldname)) + local data=io.loaddata(oldname) + if data and data~="" then + file.savedata(newname,data) + end end end local letter=R("az","AZ")+S("_-+") @@ -15565,8 +15568,8 @@ end -- of closure -- used libraries : l-lua.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-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 luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 642457 --- stripped bytes : 231846 +-- original bytes : 642535 +-- stripped bytes : 231864 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 0d89a6458..8e7c4536e 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -2700,7 +2700,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-file"] = package.loaded["l-file"] or true --- original size: 16570, stripped down to: 8991 +-- original size: 16648, stripped down to: 9051 if not modules then modules={} end modules ['l-file']={ version=1.001, @@ -3024,7 +3024,10 @@ file.readdata=io.loaddata file.savedata=io.savedata function file.copy(oldname,newname) if oldname and newname then - file.savedata(newname,io.loaddata(oldname)) + local data=io.loaddata(oldname) + if data and data~="" then + file.savedata(newname,data) + end end end local letter=R("az","AZ")+S("_-+") @@ -15565,8 +15568,8 @@ end -- of closure -- used libraries : l-lua.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-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 luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 642457 --- stripped bytes : 231846 +-- original bytes : 642535 +-- stripped bytes : 231864 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 0d89a6458..8e7c4536e 100755 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -2700,7 +2700,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-file"] = package.loaded["l-file"] or true --- original size: 16570, stripped down to: 8991 +-- original size: 16648, stripped down to: 9051 if not modules then modules={} end modules ['l-file']={ version=1.001, @@ -3024,7 +3024,10 @@ file.readdata=io.loaddata file.savedata=io.savedata function file.copy(oldname,newname) if oldname and newname then - file.savedata(newname,io.loaddata(oldname)) + local data=io.loaddata(oldname) + if data and data~="" then + file.savedata(newname,data) + end end end local letter=R("az","AZ")+S("_-+") @@ -15565,8 +15568,8 @@ end -- of closure -- used libraries : l-lua.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-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 luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 642457 --- stripped bytes : 231846 +-- original bytes : 642535 +-- stripped bytes : 231864 -- end library merge diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 8143f7ad7..7dca9e34a 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2013.03.22 12:06} +\newcontextversion{2013.03.22 18:23} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 4d7010018..e4f3c995f 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.03.22 12:06} +\newcontextversion{2013.03.22 18:23} %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 index 5f5d276e4..f6301516e 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index ecec9716f..b842d1fd2 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 0cfa4d7c1..67214fb30 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2013.03.22 12:06} +\edef\contextversion{2013.03.22 18:23} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 0734bb7c2..e87b052cd 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.03.22 12:06} +\edef\contextversion{2013.03.22 18:23} %D For those who want to use this: diff --git a/tex/context/base/l-file.lua b/tex/context/base/l-file.lua index 1bde59522..af86f9397 100644 --- a/tex/context/base/l-file.lua +++ b/tex/context/base/l-file.lua @@ -491,7 +491,10 @@ file.savedata = io.savedata function file.copy(oldname,newname) if oldname and newname then - file.savedata(newname,io.loaddata(oldname)) + local data = io.loaddata(oldname) + if data and data ~= "" then + file.savedata(newname,data) + end end end diff --git a/tex/context/base/s-art-01.mkiv b/tex/context/base/s-art-01.mkiv index c8d849d8c..046c35cc1 100644 --- a/tex/context/base/s-art-01.mkiv +++ b/tex/context/base/s-art-01.mkiv @@ -20,7 +20,8 @@ \setuphead [\v!chapter] [\c!style=\bfc, - \c!headerstate=\v!high] + \c!headerstate=\v!high, + \c!interaction=\v!all] \setuphead [\v!section] @@ -35,6 +36,9 @@ [\c!style=\bf, \c!after=] +\setuplist + [\c!interaction=\v!all] + \protect \stopmodule diff --git a/tex/context/base/scrn-ini.mkvi b/tex/context/base/scrn-ini.mkvi index a6cb495ee..88b528686 100644 --- a/tex/context/base/scrn-ini.mkvi +++ b/tex/context/base/scrn-ini.mkvi @@ -32,14 +32,19 @@ \installswitchcommandhandler \??interaction {interaction} \??interaction \appendtoks - \ifx\currentinteraction\previousinteraction - \doifelse{\interactionparameter\c!state}\v!start - {\locationtrue \setsystemmode \v!interaction}% - {\locationfalse \resetsystemmode\v!interaction}% - \fi + \ifx\previousinteraction\empty + \checkinteractionstate + \else\ifx\currentinteraction\previousinteraction + \checkinteractionstate + \fi\fi \to \everysetupinteraction -\def\doifelselocation +\unexpanded\def\checkinteractionstate + {\doifelse{\interactionparameter\c!state}\v!start + {\locationtrue \setsystemmode \v!interaction}% + {\locationfalse \resetsystemmode\v!interaction}} + +\def\doifelselocation % expandable {\iflocation \expandafter\firstoftwoarguments \else @@ -187,9 +192,9 @@ % this comes before starttext \appendtoks % not interfaced i.e. english - \doifvariable{document}{metadata:author} {\setupinteraction [author=\documentvariable{metadata:author}]}% - \doifvariable{document}{metadata:title} {\setupinteraction [title=\documentvariable{metadata:title}]}% - \doifvariable{document}{metadata:subject}{\setupinteraction[subject=\documentvariable{metadata:subject}]}% + \doifvariable{document}{metadata:author} {\setupinteraction [\c!author=\documentvariable{metadata:author}]}% + \doifvariable{document}{metadata:title} {\setupinteraction [\c!title=\documentvariable{metadata:title}]}% + \doifvariable{document}{metadata:subject}{\setupinteraction[\c!subject=\documentvariable{metadata:subject}]}% \to \everysetupdocument \setupinteraction diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index f2d760198..2272e2b65 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index c05736dfb..8401d8091 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/symb-imp-cc.mkiv b/tex/context/base/symb-imp-cc.mkiv index 6d544289b..742a19f9f 100644 --- a/tex/context/base/symb-imp-cc.mkiv +++ b/tex/context/base/symb-imp-cc.mkiv @@ -32,7 +32,7 @@ \definesymbol [remix] [\getnamedglyphdirect{creativecommons}{remix}] \definesymbol [logo] [\getnamedglyphdirect{creativecommons}{logo}] - \definesymbol [cc-by-sa-nc] [\dontleavehmode\lower.25ex\hbox\bgroup + \definesymbol [cc-by-sa-nc] [\dontleavehmode\lower.15ex\hbox\bgroup \getnamedglyphdirect{creativecommons}{cc}\enspace \getnamedglyphdirect{creativecommons}{by}\enspace \getnamedglyphdirect{creativecommons}{sa}\enspace diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 5786e460b..2b46a3175 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 : 03/22/13 12:06:35 +-- merge date : 03/22/13 18:23:22 do -- begin closure to overcome local limits and interference @@ -2400,7 +2400,10 @@ file.readdata=io.loaddata file.savedata=io.savedata function file.copy(oldname,newname) if oldname and newname then - file.savedata(newname,io.loaddata(oldname)) + local data=io.loaddata(oldname) + if data and data~="" then + file.savedata(newname,data) + end end end local letter=R("az","AZ")+S("_-+") -- cgit v1.2.3