diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2011-06-01 08:54:21 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2011-06-01 08:54:21 +0000 |
commit | d7ccb42582f85acf30568913610ccf4d602023fb (patch) | |
tree | 7292e3545a420676878e7451b68892d360c62cb6 /Master/texmf-dist/tex/context/base/lxml-ctx.lua | |
parent | 2d62a6fe9b80def59c392268022f1f9a2d6e358f (diff) |
commit context 2011.05.18
git-svn-id: svn://tug.org/texlive/trunk@22719 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/lxml-ctx.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/base/lxml-ctx.lua | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/context/base/lxml-ctx.lua b/Master/texmf-dist/tex/context/base/lxml-ctx.lua index 765754953e9..1f6f6ffd3b8 100644 --- a/Master/texmf-dist/tex/context/base/lxml-ctx.lua +++ b/Master/texmf-dist/tex/context/base/lxml-ctx.lua @@ -8,6 +8,8 @@ if not modules then modules = { } end modules ['lxml-ctx'] = { -- is this still used? +local xml = xml + xml.ctx = { } xml.ctx.enhancers = { } @@ -39,8 +41,8 @@ function xml.ctx.tshow(specification) if not string.find(xmlpattern,"^[%a]+://") then xmlpattern = "xml://" .. pattern end - parsed = xml.parse_pattern(xmlpattern) - titlecommand = specification.title or "type" + local parsed = xml.lpath(xmlpattern) + local titlecommand = specification.title or "type" if parsed.state then context[titlecommand]("pattern: " .. pattern .. " (".. parsed.state .. ")") else @@ -86,9 +88,9 @@ function xml.ctx.tshow(specification) context.stoptabulate() if xmlroot and xmlroot ~= "" then if not loaded[xmlroot] then - loaded[xmlroot] = { xml.convert(buffers.content(xmlroot) or "") } + loaded[xmlroot] = xml.convert(buffers.getcontent(xmlroot)) end - local collected = xml.parse_apply(loaded[xmlroot],xmlpattern) + local collected = xml.filter(loaded[xmlroot],xmlpattern) if collected then local tc = type(collected) if not tc then |