beta 2010.09.16 10:46

9 files changed, 54 insertions, 9 deletions

diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index d44e7957d..0bfc77fc2 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -827,8 +827,10 @@ local function stopexport()
     end
 end
 
+-- encoding='utf-8'
+
 local preamble = [[
-<?xml standalone='yes' encoding='utf-8' ?>
+<?xml version='1.0' standalone='yes' ?>
 
 <!-- input filename   : %- 17s -->
 <!-- processing date  : %- 17s -->
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 50bdd2dce..4c5e918ec 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2010.09.14 23:27}
+\newcontextversion{2010.09.16 10:46}
 
 %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/context.tex b/tex/context/base/context.tex
index 3e4cd9d8f..d67a066d0 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2010.09.14 23:27}
+\edef\contextversion{2010.09.16 10:46}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/font-gds.mkiv b/tex/context/base/font-gds.mkiv
index 5f400e119..083cd9128 100644
--- a/tex/context/base/font-gds.mkiv
+++ b/tex/context/base/font-gds.mkiv
@@ -20,7 +20,6 @@
 \def\loadfontgoodies[#1]%
   {\ctxlua{fonts.goodies.get("#1")}}
 
-
 % this will become colorgroups and move to font-col or so
 
 \definecolor[colorscheme:1:1][s=.75]
diff --git a/tex/context/base/s-pre-67.tex b/tex/context/base/s-pre-67.tex
index b22d37ce2..88043aa24 100644
--- a/tex/context/base/s-pre-67.tex
+++ b/tex/context/base/s-pre-67.tex
@@ -124,13 +124,13 @@
 
 \def\titlepage#1#2%
   {\startstandardmakeup
-     \definefont[LargeFont][Normal at 120pt]
+     \definefont[LargeFont][Normal at 100pt]
      \setlayerframed
         [title]
         [preset=lefttop,x=1cm,y=.25cm]
         [align=flushleft,foregroundstyle=\LargeFont,offset=0pt,foregroundcolor=lightcolor,frame=off]
         {#1}
-     \definefont[SmallFont][Normal at  60pt]
+     \definefont[SmallFont][Normal at  50pt]
      \setlayerframed
         [title]
         [preset=rightbottom,x=1cm,y=.5cm]
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index 6cc1004e9..4962b8d8f 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -653,7 +653,14 @@ local function resolve(prefix,reference,args,set) -- we start with prefix,refere
                 if var then
                     var.reference = ri
                     if not var.outer and var.inner then
-                        local d = defined[prefix][var.inner] or defined[""][var.inner]
+--~                         local d = defined[prefix]
+--~                         d = d and d[var.inner]
+--~                         if not d then
+--~                             d = defined[""]
+--~                             d = d and d[var.inner]
+--~                         end
+                        local d = defined[prefix] or defined[""]
+                        d = d and d[var.inner]
                         if d then
                             resolve(prefix,d[2],var.arguments,set) -- args can be nil
                         else
diff --git a/tex/context/fonts/demo.lfg b/tex/context/fonts/demo.lfg
new file mode 100644
index 000000000..b27db8545
--- /dev/null
+++ b/tex/context/fonts/demo.lfg
@@ -0,0 +1,37 @@
+local yes = "yes"
+
+local default = {
+    analyze  = yes,
+    mode     = "node",
+    language = "dflt",
+    script   = "dflt",
+}
+
+local smallcaps = {
+    smcp = yes,
+}
+
+return {
+    name = "demo",
+    version = "1.00",
+    comment = "An example of goodies.",
+    author = "Hans Hagen",
+    featuresets = {
+        default = {
+            default,
+        },
+        smallcaps = {
+            default, smallcaps,
+        },
+    },
+    colorschemes = {
+        default = {
+            [1] = {
+                "one", "three", "five", "seven", "nine",
+            },
+            [2] = {
+                "two", "four", "six", "eight", "ten",
+            },
+        }
+    }
+}
diff --git a/tex/context/fonts/husayni.lfg b/tex/context/fonts/husayni.lfg
index f334316a5..ff456f63c 100644
--- a/tex/context/fonts/husayni.lfg
+++ b/tex/context/fonts/husayni.lfg
@@ -1,4 +1,4 @@
-local yes = "yes", "node"
+local yes = "yes"
 
 local basics = {
     analyze  = yes,
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 251622137..102f0db3b 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 09/14/10 23:27:52
+-- merge date  : 09/16/10 10:46:45
 
 do -- begin closure to overcome local limits and interference