From eab6a73597f38d58fc4d3cfc4fbddb7c3f6e1e8f Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 30 Oct 2009 16:59:00 +0100 Subject: beta 2009.10.30 16:59 --- tex/context/base/lxml-tab.lua | 4 +++- tex/context/base/strc-ref.lua | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'tex') 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) -- cgit v1.2.3