beta 2009.10.30 16:59

6 files changed, 15 insertions, 7 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 7507b5e6e..32e9118d2 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -3804,15 +3804,17 @@ local optionalspace    = space^0
 
 local value            = (squote * C((1 - squote)^0) * squote) + (dquote * C((1 - dquote)^0) * dquote) -- ampersand and < also invalid in value
 
+local endofattributes  = slash * close + close -- recovery of flacky html
 local whatever         = space * name * optionalspace * equal
 local wrongvalue       = C(P(1-whatever-close)^1 + P(1-close)^1) / attribute_value_error
+----- local wrongvalue = C(P(1-whatever-endofattributes)^1 + P(1-endofattributes)^1) / attribute_value_error
+local wrongvalue       = C(P(1-space-endofattributes)^1) / attribute_value_error
 
 local attributevalue   = value + wrongvalue
 
 local attribute        = (somespace * name * optionalspace * equal * optionalspace * attributevalue) / add_attribute
 ----- attributes       = (attribute)^0
 
-local endofattributes  = slash * close + close -- recovery of flacky html
 local attributes       = (attribute + somespace^-1 * (((1-endofattributes)^1)/attribute_specification_error))^0
 
 local parsedtext       = text_parsed   / add_text
diff --git a/scripts/context/lua/scite-ctx.lua b/scripts/context/lua/scite-ctx.lua
index fb10ce87d..8e6b6ebab 100644
--- a/scripts/context/lua/scite-ctx.lua
+++ b/scripts/context/lua/scite-ctx.lua
@@ -68,7 +68,7 @@
 
 -- generic functions
 
-props = props or { } setmetatable(props,{ __index = function(k,v) props[k] = "unknown" return "unknown" end } )
+props = props or { } -- setmetatable(props,{ __index = function(k,v) props[k] = "unknown" return "unknown" end } )
 
 local byte, lower, upper, gsub, sub, find, rep, match, gmatch = string.byte, string.lower, string.upper, string.gsub, string.sub, string.find, string.rep, string.match, string.gmatch
 local sort, concat = table.sort, table.concat
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 7507b5e6e..32e9118d2 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -3804,15 +3804,17 @@ local optionalspace    = space^0
 
 local value            = (squote * C((1 - squote)^0) * squote) + (dquote * C((1 - dquote)^0) * dquote) -- ampersand and < also invalid in value
 
+local endofattributes  = slash * close + close -- recovery of flacky html
 local whatever         = space * name * optionalspace * equal
 local wrongvalue       = C(P(1-whatever-close)^1 + P(1-close)^1) / attribute_value_error
+----- local wrongvalue = C(P(1-whatever-endofattributes)^1 + P(1-endofattributes)^1) / attribute_value_error
+local wrongvalue       = C(P(1-space-endofattributes)^1) / attribute_value_error
 
 local attributevalue   = value + wrongvalue
 
 local attribute        = (somespace * name * optionalspace * equal * optionalspace * attributevalue) / add_attribute
 ----- attributes       = (attribute)^0
 
-local endofattributes  = slash * close + close -- recovery of flacky html
 local attributes       = (attribute + somespace^-1 * (((1-endofattributes)^1)/attribute_specification_error))^0
 
 local parsedtext       = text_parsed   / add_text
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 7507b5e6e..32e9118d2 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -3804,15 +3804,17 @@ local optionalspace    = space^0
 
 local value            = (squote * C((1 - squote)^0) * squote) + (dquote * C((1 - dquote)^0) * dquote) -- ampersand and < also invalid in value
 
+local endofattributes  = slash * close + close -- recovery of flacky html
 local whatever         = space * name * optionalspace * equal
 local wrongvalue       = C(P(1-whatever-close)^1 + P(1-close)^1) / attribute_value_error
+----- local wrongvalue = C(P(1-whatever-endofattributes)^1 + P(1-endofattributes)^1) / attribute_value_error
+local wrongvalue       = C(P(1-space-endofattributes)^1) / attribute_value_error
 
 local attributevalue   = value + wrongvalue
 
 local attribute        = (somespace * name * optionalspace * equal * optionalspace * attributevalue) / add_attribute
 ----- attributes       = (attribute)^0
 
-local endofattributes  = slash * close + close -- recovery of flacky html
 local attributes       = (attribute + somespace^-1 * (((1-endofattributes)^1)/attribute_specification_error))^0
 
 local parsedtext       = text_parsed   / add_text
diff --git a/tex/context/base/lxml-tab.lua b/tex/context/base/lxml-tab.lua
index 97716a1c0..ca22a7eec 100644
--- a/tex/context/base/lxml-tab.lua
+++ b/tex/context/base/lxml-tab.lua
@@ -428,15 +428,17 @@ local optionalspace    = space^0
 
 local value            = (squote * C((1 - squote)^0) * squote) + (dquote * C((1 - dquote)^0) * dquote) -- ampersand and < also invalid in value
 
+local endofattributes  = slash * close + close -- recovery of flacky html
 local whatever         = space * name * optionalspace * equal
 local wrongvalue       = C(P(1-whatever-close)^1 + P(1-close)^1) / attribute_value_error
+----- local wrongvalue = C(P(1-whatever-endofattributes)^1 + P(1-endofattributes)^1) / attribute_value_error
+local wrongvalue       = C(P(1-space-endofattributes)^1) / attribute_value_error
 
 local attributevalue   = value + wrongvalue
 
 local attribute        = (somespace * name * optionalspace * equal * optionalspace * attributevalue) / add_attribute
 ----- attributes       = (attribute)^0
 
-local endofattributes  = slash * close + close -- recovery of flacky html
 local attributes       = (attribute + somespace^-1 * (((1-endofattributes)^1)/attribute_specification_error))^0
 
 local parsedtext       = text_parsed   / add_text
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index f0f660977..93783b041 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -836,9 +836,9 @@ local function current_metadata(tag)
 end
 jobreferences.current_metadata = current_metadata
 
-function jobreferences.get_current_prefixspec(default)
+function jobreferences.get_current_prefixspec(default) -- todo: message
     texsprint(ctxcatcodes,"\\getreferencestructureprefix{",
-        current_metadata("kind"), "}{", current_metadata("name"), "}{", default, "}")
+        current_metadata("kind"), "}{", current_metadata("name") or "?", "}{", default, "}")
 end
 --~ function jobreferences.get_current_prefixspec(default) -- we can consider storing the data at the lua end
 --~     context.getreferencestructureprefix(current_metadata("kind"),current_metadata("name"),default)