beta 2013.03.22 18:23

13 files changed, 33 insertions, 18 deletions

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
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index ecec9716f..b842d1fd2 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
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
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index c05736dfb..8401d8091 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
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("_-+")