summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2011-08-04 02:00:13 +0300
committerMarius <mariausol@gmail.com>2011-08-04 02:00:13 +0300
commitee4f24d635e0db2029f026a1c098ae76d1e537d3 (patch)
treef7556301a37485e08c0476bca6689715e9153f04 /tex
parent5056d7a854142aa63032b0a3ca4d41c496e41faf (diff)
downloadcontext-ee4f24d635e0db2029f026a1c098ae76d1e537d3.tar.gz
beta 2011.08.04 00:42
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/anch-pgr.mkiv84
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin0 -> 4090 bytes
-rw-r--r--tex/context/base/context-version.pngbin0 -> 105681 bytes
-rw-r--r--tex/context/base/context.css20
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/l-lpeg.lua19
-rw-r--r--tex/context/base/m-markdown.lua863
-rw-r--r--tex/context/base/m-markdown.mkiv6
-rw-r--r--tex/context/base/m-zint.mkiv4
-rw-r--r--tex/context/base/node-ref.lua2
-rw-r--r--tex/context/base/status-files.pdfbin23755 -> 23848 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin162227 -> 162226 bytes
-rw-r--r--tex/context/base/strc-flt.mkiv6
-rw-r--r--tex/context/base/trac-fil.lua15
-rw-r--r--tex/context/base/trac-lmx.lua4
-rw-r--r--tex/context/base/trac-log.lua2
-rw-r--r--tex/context/base/type-otf.mkiv18
-rw-r--r--tex/context/base/typo-dir.lua2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua21
22 files changed, 626 insertions, 448 deletions
diff --git a/tex/context/base/anch-pgr.mkiv b/tex/context/base/anch-pgr.mkiv
index 8b5853029..ebfd67083 100644
--- a/tex/context/base/anch-pgr.mkiv
+++ b/tex/context/base/anch-pgr.mkiv
@@ -754,9 +754,80 @@
\newskip\textbackgroundskip
+% \def\dostarttextbackgroundpar
+% {\endgraf % new
+% \textbackgroundparameter\c!before
+% \noindent
+% \ifgridsnapping
+% \doassignsomeskip\textbackgroundparameter\c!topoffset\to\textbackgroundskip
+% \ifdim\textbackgroundskip>\zeropoint
+% \struttedbox{\hbox{\raise\textbackgroundskip\hbox{\fpos\currentparbackground}}}%
+% \else
+% \fpos\currentparbackground
+% \fi
+% \else
+% \fpos\currentparbackground
+% \fi
+% \bgroup
+% \endgraf % we need a vertical nobreak - 29/06/2004
+% \nobreak \vskip-\lineheight \nobreak
+% \ifgridsnapping \else
+% \doassignsomeskip\textbackgroundparameter\c!topoffset\to\textbackgroundskip
+% \ifdim\textbackgroundskip>\zeropoint
+% \kern\textbackgroundskip\nobreak
+% \fi
+% \fi
+% \dosetleftskipadaption{\textbackgroundparameter\c!leftoffset}%
+% \advance\leftskip\leftskipadaption
+% \dosetleftskipadaption{\textbackgroundparameter\c!rightoffset}%
+% \advance\rightskip\leftskipadaption
+% % new
+% \dosetraggedcommand{\textbackgroundparameter\c!align}%
+% \raggedcommand
+% %
+% \dostartattributes{\??td\currenttextbackground}\c!style\c!color\empty
+% \nowhitespace
+% \nobreak % new per 23/04/2006 (else potential break when whitespace)
+% \seteffectivehsize
+% \doinhibitblank % \blank[\v!disable]% new
+% \par}
+
+% \def\dostoptextbackgroundpar
+% {\par
+% \removelastskip % new
+% \dostopattributes
+% \doassignsomeskip\textbackgroundparameter\c!bottomoffset\to\textbackgroundskip
+% \ifdim\lastskip>\zeropoint
+% \advance\textbackgroundskip-\lastskip
+% \fi
+% \ifgridsnapping \else \ifdim\textbackgroundskip>\zeropoint
+% \kern\textbackgroundskip\nobreak
+% \fi \fi
+% \nobreak \vskip-\dimexpr\lineheight+\parskip\relax \nobreak
+% %\nobreak \vskip-\lineheight \nobreak \nowhitespace % does not work
+% \egroup
+% \bgroup \forgeteverypar % NOT REALLY NEEDED, SAVES HASH/MEM
+% \nobreak \noindent \strut \hfill \kern\zeropoint
+% \doassignsomeskip\textbackgroundparameter\c!bottomoffset\to\textbackgroundskip
+% \ifgridsnapping % experimental, pascal (todo: topoffset in same way)
+% \ifdim\textbackgroundskip>\zeropoint
+% \struttedbox\plusone{\hbox{\lower\textbackgroundskip\hbox{\tpos\currentparbackground}}}%
+% \else
+% \tpos\currentparbackground
+% \fi
+% \else
+% \tpos\currentparbackground
+% \fi
+% \egroup
+% \endgraf % new
+% \textbackgroundparameter\c!after}
+
\def\dostarttextbackgroundpar
{\endgraf % new
\textbackgroundparameter\c!before
+ \bgroup
+\begingroup
+\resetallattributes % \attribute\linenumberattribute \attributeunsetvalue
\noindent
\ifgridsnapping
\doassignsomeskip\textbackgroundparameter\c!topoffset\to\textbackgroundskip
@@ -768,8 +839,8 @@
\else
\fpos\currentparbackground
\fi
- \bgroup
\endgraf % we need a vertical nobreak - 29/06/2004
+\endgroup
\nobreak \vskip-\lineheight \nobreak
\ifgridsnapping \else
\doassignsomeskip\textbackgroundparameter\c!topoffset\to\textbackgroundskip
@@ -807,17 +878,19 @@
% \nobreak \vskip-\lineheight \nobreak \nowhitespace % does not work
\egroup
\bgroup \forgeteverypar % NOT REALLY NEEDED, SAVES HASH/MEM
+\resetallattributes % \attribute\linenumberattribute \attributeunsetvalue
\nobreak \noindent \strut \hfill \kern\zeropoint
\doassignsomeskip\textbackgroundparameter\c!bottomoffset\to\textbackgroundskip
\ifgridsnapping % experimental, pascal (todo: topoffset in same way)
\ifdim\textbackgroundskip>\zeropoint
- \struttedbox{\hbox{\lower\textbackgroundskip\hbox{\tpos\currentparbackground}}}%
+ \struttedbox\plusone{\hbox{\lower\textbackgroundskip\hbox{\tpos\currentparbackground}}}%
\else
\tpos\currentparbackground
\fi
\else
\tpos\currentparbackground
\fi
+\endgraf
\egroup
\endgraf % new
\textbackgroundparameter\c!after}
@@ -904,10 +977,9 @@
\c!leftoffset,\c!rightoffset,\c!topoffset,\c!bottomoffset]%
\getparameters[\??td#1][#2]%
\doifvalue{\??td#1\c!state}\v!start\checktextbackgrounds
- \setuvalue{#1}%
- {\groupedcommand{\starttextbackground[#1]}{\stoptextbackground}}%
- \setvalue{\e!start#1}{\starttextbackground[#1]}%
- \setvalue{\e!stop #1}{\stoptextbackground}%
+ \setuvalue{#1}{\groupedcommand{\starttextbackground[#1]}{\stoptextbackground}}%
+ \setuvalue{\e!start#1}{\starttextbackground[#1]}%
+ \setuvalue{\e!stop #1}{\stoptextbackground}%
\fi}
\unexpanded\def\setuptextbackground
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index e6ede8ea3..ab9b2c0c8 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{2011.07.26 09:17}
+\newcontextversion{2011.08.04 00:42}
%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 e6907e393..3a3d255bf 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{2011.07.26 09:17}
+\newcontextversion{2011.08.04 00:42}
%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-version.pdf b/tex/context/base/context-version.pdf
new file mode 100644
index 000000000..37f99f05f
--- /dev/null
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
new file mode 100644
index 000000000..92421e41a
--- /dev/null
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.css b/tex/context/base/context.css
index f332ae242..1214d2cef 100644
--- a/tex/context/base/context.css
+++ b/tex/context/base/context.css
@@ -18,6 +18,26 @@ a.dir-view:link, a.dir-view:active, a.dir-view:visited {
.invalid {
color: #FF0000 ;
}
+button, .commonlink, .smallbutton {
+ font-weight: bold ;
+ font-size: 12px ;
+ text-decoration: none ;
+ color: #000000 ;
+ border-color: #7F7F7F ;
+ border-style: solid ;
+ border-width: .125ex ;
+ background-color: #FFFFFF ;
+ padding: .5ex ;
+}
+.smallbutton {
+ width: 1em ;
+}
+a.commonlink:link, a.commonlink:active, a.commonlink:visited, a.smalllink:link, a.smalllink:active, a.smalllink:visited {
+ font-weight: bold ;
+ font-size: 12px ;
+ text-decoration: none ;
+ color: #000000 ;
+}
h1, .title {
font-style: normal ;
font-weight: normal ;
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 87b7cd40f..9bde019ef 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{2011.07.26 09:17}
+\edef\contextversion{2011.08.04 00:42}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 1d29337c6..3fca14cff 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.07.26 09:17}
+\edef\contextversion{2011.08.04 00:42}
%D For those who want to use this:
diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/l-lpeg.lua
index de9d9e5e3..dbfc7401c 100644
--- a/tex/context/base/l-lpeg.lua
+++ b/tex/context/base/l-lpeg.lua
@@ -154,25 +154,6 @@ patterns.unspacer = ((patterns.spacer^1)/"")^0
patterns.somecontent = (anything - newline - space)^1 -- (utf8char - newline - space)^1
patterns.beginline = #(1-newline)
--- local unquoted = Cs(patterns.unquoted * endofstring) -- not C
---
--- function string.unquoted(str)
--- return match(unquoted,str) or str
--- end
---
--- more efficient on long strings:
-
-local unquoted = (
- squote * Cs((1 - P(-2))^0) * squote
- + dquote * Cs((1 - P(-2))^0) * dquote
-)
-
-function string.unquoted(str)
- return match(unquoted,str) or str
-end
-
-patterns.unquoted = unquoted
-
-- print(string.unquoted("test"))
-- print(string.unquoted([["t\"est"]]))
-- print(string.unquoted([["t\"est"x]]))
diff --git a/tex/context/base/m-markdown.lua b/tex/context/base/m-markdown.lua
index bddc38280..1f9402f60 100644
--- a/tex/context/base/m-markdown.lua
+++ b/tex/context/base/m-markdown.lua
@@ -1,6 +1,6 @@
-if not modules then modules = { } end modules ['x-markdown'] = {
- version = 1.001,
- comment = "companion to x-markdown.mkiv",
+if not modules then modules = { } end modules ['m-markdown'] = {
+ version = 1.002,
+ comment = "companion to m-markdown.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
copyright = "see below",
license = "see context related readme files"
@@ -35,66 +35,42 @@ are mine. Eventually I might also adapt the parser code a bit more. When I ran i
closure stack limitations I decided to flatten the code. The following implementation
seems to be a couple of hundred times faster than what I started with which is not that
bad.
+
+This is a second rewrite. The mentioned speed gain largely depended on the kind of
+content: blocks, references and items can be rather demanding. Also, There were
+some limitations with respect to the captures. So, table storage has been removed in
+favor of strings, and nesting has been simplified. The first example at the end of this
+file now takes .33 seconds for 567KB code (resulting in over 1MB) so we're getting there.
+
+There will be a third rewrite eventually.
]]--
-- todo: we have better quote and tag scanners in ctx
-- todo: provide an xhtml mapping
+-- todo: add a couple of extensions
+-- todo: check patches to the real peg
-local type, next = type, next
+local type, next, tonumber = type, next, tonumber
local lower, upper, gsub, rep, gmatch, format, length = string.lower, string.upper, string.gsub, string.rep, string.gmatch, string.format, string.len
local concat = table.concat
local P, R, S, V, C, Ct, Cg, Cb, Cmt, Cc, Cf, Cs = lpeg.P, lpeg.R, lpeg.S, lpeg.V, lpeg.C, lpeg.Ct, lpeg.Cg, lpeg.Cb, lpeg.Cmt, lpeg.Cc, lpeg.Cf, lpeg.Cs
local lpegmatch = lpeg.match
-local utfbyte = utf.byte
+local utfbyte, utfchar = utf.byte, utf.char
+moduledata = moduledata or { }
moduledata.markdown = moduledata.markdown or { }
local markdown = moduledata.markdown
local nofruns, nofbytes, nofhtmlblobs = 0, 0, 0
-local function process(func,t)
- if func then
- for i=1,#t do
- t[i] = func(t[i])
- end
- return t
- else
- return "ERROR: NO FUNCTION"
- end
-end
+---------------------------------------------------------------------------------------------
-local function traverse_tree(t,buffer,n)
- for k, v in next, t do
- if type(v) == "string" then
- n = n + 1
- buffer[n] = v
- else
- n = traverse_tree(v,buffer,n)
- end
- end
- return n
-end
-
-local function to_string(t)
- local buffer = { }
- traverse_tree(t, buffer, 0)
- return concat(buffer)
-end
+local nestedparser
+local syntax
-local function normalize_label(a)
- return upper(gsub(a, "[\n\r\t ]+", " "))
-end
+nestedparser = function(str) return lpegmatch(syntax,str) end
--- generic
-
-local blocktags = table.tohash {
- "address", "blockquote" , "center", "dir", "div", "p", "pre",
- "li", "ol", "ul", "dl", "dd",
- "form", "fieldset", "isindex", "menu", "noframes", "frameset",
- "h1", "h2", "h3", "h4", "h5", "h6",
- "hr", "ht", "script", "noscript",
- "table", "tbody", "tfoot", "thead", "th", "td", "tr",
-}
+---------------------------------------------------------------------------------------------
local asterisk = P("*")
local dash = P("-")
@@ -117,6 +93,7 @@ local slash = P("/")
local equal = P("=")
local colon = P(":")
local semicolon = P(";")
+local exclamation = P("!")
local digit = R("09")
local hexdigit = R("09","af","AF")
@@ -131,6 +108,7 @@ local always = P("")
local tab = P("\t")
local spacechar = S("\t ")
+local spacing = S(" \n\r\t")
local newline = P("\r")^-1 * P("\n")
local spaceornewline = spacechar + newline
local nonspacechar = any - spaceornewline
@@ -143,20 +121,16 @@ local blanklines = blankline^0
local skipblanklines = (optionalspace * newline)^0
local linechar = P(1 - newline)
local indent = fourspaces + (nonindentspace * tab) / ""
-local indentedline = indent * C(linechar^1 * (newline + eof))
-local optionallyindentedline = indent^-1 * C(linechar^1 * (newline + eof))
+local indentedline = indent /"" * C(linechar^1 * (newline + eof))
+local optionallyindentedline = indent^-1 /"" * C(linechar^1 * (newline + eof))
local spnl = optionalspace * (newline * optionalspace)^-1
local specialchar = S("*_`*&[]<!\\")
local normalchar = any - (specialchar + spaceornewline)
local line = C((any - newline)^0 * newline)
+ C(any^1 * eof)
local nonemptyline = (any - newline)^1 * newline
-local htmlattributevalue = squote * C((any - (blankline + squote))^0) * squote
- + dquote * C((any - (blankline + dquote))^0) * dquote
- + (any - S("\t >"))^1 -- any - tab - space - more
-local htmlattribute = (alphanumeric + S("_-"))^1 * spnl * (equal * spnl * htmlattributevalue)^-1 * spnl
-local htmlcomment = P("<!--") * (any - P("-->"))^0 * P("-->")
-local htmltag = less * spnl * slash^-1 * alphanumeric^1 * spnl * htmlattribute^0 * slash^-1 * spnl * more
+
+---------------------------------------------------------------------------------------------
local function lineof(c)
return (nonindentspace * (P(c) * optionalspace)^3 * newline * blankline^1)
@@ -169,6 +143,8 @@ local lineof_underscores = lineof(underscore)
local bullet = nonindentspace * (plus + (asterisk - lineof_asterisks) + (dash - lineof_dashes)) * spaces
local enumerator = nonindentspace * digit^1 * period * spaces
+---------------------------------------------------------------------------------------------
+
local openticks = Cg(backtick^1, "ticks")
local closeticks = space^-1 * Cmt(C(backtick^1) * Cb("ticks"), function(s,i,a,b) return #a == #b and i end)
local intickschar = (any - S(" \n\r`"))
@@ -177,19 +153,148 @@ local intickschar = (any - S(" \n\r`"))
+ (backtick^1 - closeticks)
local inticks = openticks * space^-1 * C(intickschar^1) * closeticks
+---------------------------------------------------------------------------------------------
+
+local leader = space^-3
+local nestedbrackets = P { lbracket * ((1 - lbracket - rbracket) + V(1))^0 * rbracket }
+local tag = lbracket * C((nestedbrackets + 1 - rbracket)^0) * rbracket
+local url = less * C((1-more)^0) * more
+ + C((1-spacing- rparent)^1) -- sneaky: ) for resolver
+local title_s = squote * lpeg.C((1-squote )^0) * squote
+local title_d = dquote * lpeg.C((1-dquote )^0) * dquote
+local title_p = lparent * lpeg.C((1-rparent)^0) * rparent
+local title = title_s + title_d + title_p
+local optionaltitle = ((spacing^0 * title * spacechar^0) + lpeg.Cc(""))
+
+local references = { }
+
+local function register_link(tag,url,title)
+ tag = lower(gsub(tag, "[ \n\r\t]+", " "))
+ references[tag] = { url, title }
+end
+
+local function direct_link(label,url,title) -- title is typical html thing
+ return label, url, title
+end
+
+local function indirect_link(label,tag)
+ if tag == "" then
+ tag = label
+ end
+ tag = lower(gsub(tag, "[ \n\r\t]+", " "))
+ local r = references[tag]
+ if r then
+ return label, r[1], r[2]
+ else
+ return label, tag, ""
+ end
+end
+
+local define_reference_parser = (leader * tag * colon * spacechar^0 * url * optionaltitle) / register_link
+local direct_link_parser = tag * spacechar^0 * lparent * (url + Cc("")) * optionaltitle * rparent / direct_link
+local indirect_link_parser = tag * spacechar^0 * tag / indirect_link
+
+local rparser = (define_reference_parser+1)^0
+
+local function referenceparser(str)
+ references = { }
+ lpegmatch(rparser,str)
+end
+
+-- local reftest = [[
+-- [1]: <http://example.com/>
+-- [3]:http://example.com/ (Optional Title Here)
+-- [2]: http://example.com/ 'Optional Title Here'
+-- [a]: http://example.com/ "Optional *oeps* Title Here"
+-- ]]
+--
+-- local linktest = [[
+-- [This link] (http://example.net/)
+-- [an example] (http://example.com/ "Title")
+-- [an example][1]
+-- [an example] [2]
+-- ]]
+--
+-- lpeg.match((define_reference_parser+1)^0,reftest)
+--
+-- inspect(references)
+--
+-- lpeg.match((direct_link_parser/print + indirect_link_parser/print + 1)^0,linktest)
+
+---------------------------------------------------------------------------------------------
+
+local blocktags = table.tohash {
+ "address", "blockquote" , "center", "dir", "div", "p", "pre",
+ "li", "ol", "ul", "dl", "dd",
+ "form", "fieldset", "isindex", "menu", "noframes", "frameset",
+ "h1", "h2", "h3", "h4", "h5", "h6",
+ "hr", "ht", "script", "noscript",
+ "table", "tbody", "tfoot", "thead", "th", "td", "tr",
+}
+
+----- htmlattributevalue = squote * C((any - (blankline + squote))^0) * squote
+----- + dquote * C((any - (blankline + dquote))^0) * dquote
+----- + (any - S("\t >"))^1 -- any - tab - space - more
+----- htmlattribute = (alphanumeric + S("_-"))^1 * spnl * (equal * spnl * htmlattributevalue)^-1 * spnl
+----- htmlcomment = P("<!--") * (any - P("-->"))^0 * P("-->")
+
+----- htmltag = less * spnl * slash^-1 * alphanumeric^1 * spnl * htmlattribute^0 * slash^-1 * spnl * more
+-----
+----- blocktag = Cmt(C(alphanumeric^1), function(s,i,a) return blocktags[lower(a)] and i, a end)
+-----
+----- openblocktag = less * Cg(blocktag, "opentag") * spnl * htmlattribute^0 * more
+----- closeblocktag = less * slash * Cmt(C(alphanumeric^1) * Cb("opentag"), function(s,i,a,b) return lower(a) == lower(b) and i end) * spnl * more
+----- selfclosingblocktag = less * blocktag * spnl * htmlattribute^0 * slash * more
+-----
+----- displayhtml = Cs { "HtmlBlock",
+----- InBlockTags = openblocktag * (V("HtmlBlock") + (any - closeblocktag))^0 * closeblocktag,
+----- HtmlBlock = C(V("InBlockTags") + selfclosingblocktag + htmlcomment),
+----- }
+-----
+----- inlinehtml = Cs(htmlcomment + htmltag)
+
+-- There is no reason to support crappy html, so we expect proper attributes.
+
+local htmlattributevalue = squote * C((any - (blankline + squote))^0) * squote
+ + dquote * C((any - (blankline + dquote))^0) * dquote
+local htmlattribute = (alphanumeric + S("_-"))^1 * spnl * equal * spnl * htmlattributevalue * spnl
+
+local htmlcomment = P("<!--") * (any - P("-->"))^0 * P("-->")
+local htmlinstruction = P("<?") * (any - P("?>" ))^0 * P("?>" )
+
+-- We don't care too much about matching elements and there is no reason why display elements could not
+-- have inline elements so the above should be patched then. Well, markdown mixed with html is not meant
+-- for anything else than webpages anyway.
+
local blocktag = Cmt(C(alphanumeric^1), function(s,i,a) return blocktags[lower(a)] and i, a end)
-local openblocktag = less * spnl * Cg(blocktag, "opentag") * spnl * htmlattribute^0 * more
-local closeblocktag = less * spnl * slash * Cmt(C(alphanumeric^1) * Cb("opentag"), function(s,i,a,b) return lower(a) == lower(b) and i end) * spnl * more
-local selfclosingblocktag = less * spnl * slash^-1 * blocktag * spnl * htmlattribute^0 * slash * spnl * more
+local openelement = less * alphanumeric^1 * spnl * htmlattribute^0 * more
+local closeelement = less * slash * alphanumeric^1 * spnl * more
+local emptyelement = less * alphanumeric^1 * spnl * htmlattribute^0 * slash * more
+
+local displaytext = (any - less)^1
+local inlinetext = displaytext / nestedparser
+
+local displayhtml = #(less * blocktag * spnl * htmlattribute^0 * more)
+ * Cs { "HtmlBlock",
+ InBlockTags = openelement * (V("HtmlBlock") + displaytext)^0 * closeelement,
+ HtmlBlock = (V("InBlockTags") + emptyelement + htmlcomment + htmlinstruction),
+ }
--- yields a blank line unless we're at the beginning of the document -- can be made more efficient
+local inlinehtml = Cs { "HtmlBlock",
+ InBlockTags = openelement * (V("HtmlBlock") + inlinetext)^0 * closeelement,
+ HtmlBlock = (V("InBlockTags") + emptyelement + htmlcomment + htmlinstruction),
+ }
-interblockspace = Cmt(blanklines, function(s,i) if i == 1 then return i, "" else return i, "\n" end end)
+---------------------------------------------------------------------------------------------
-local nestedparser -- forward reference
+local hexentity = ampersand * hash * S("Xx") * C(hexdigit ^1) * semicolon
+local decentity = ampersand * hash * C(digit ^1) * semicolon
+local tagentity = ampersand * C(alphanumeric^1) * semicolon
--- helper stuff
+---------------------------------------------------------------------------------------------
+
+-- --[[
local escaped = {
["{" ] = "",
@@ -207,150 +312,67 @@ for k, v in next, escaped do
escaped[k] = "\\char" .. utfbyte(k) .. "{}"
end
-local itemsignal = "\001"
-
-local itemsplitter = lpeg.tsplitat(itemsignal)
-
--- what is lab.inline
+local function c_string(s) -- has to be done more often
+ return (gsub(s,".",escaped))
+end
local c_linebreak = "\\crlf\n" -- is this ok?
-local c_entity = "?" -- todo, no clue of usage (use better entity handler)
local c_space = " "
-local function c_string(s)
- return (gsub(s,".",escaped))
-end
-
local function c_paragraph(c)
- return { c, "\n" } -- { "\\startparagraph ", c, " \\stopparagraph\n" }
+ return c .. "\n\n" -- { "\\startparagraph ", c, " \\stopparagraph\n" }
end
--- local function c_plain(c)
--- return c
--- end
-
--- itemize
-
local function listitem(c)
- return {
- "\\startitem\n",
- process(nestedparser, lpegmatch(itemsplitter,c) or c),
- "\n\\stopitem\n"
- }
+ return format("\n\\startitem\n%s\n\\stopitem\n",nestedparser(c))
end
local function c_tightbulletlist(c)
- return {
- "\\startmarkdownitemize[packed]\n",
- process(listitem, c),
- "\\stopmarkdownitemize\n"
- }
+ return format("\n\\startmarkdownitemize[packed]\n%s\\stopmarkdownitemize\n",c)
end
local function c_loosebulletlist(c)
- return {
- "\\startmarkdownitemize\n",
- process(listitem, c),
- "\\stopmarkdownitemize\n"
- }
+ return format("\n\\startmarkdownitemize\n\\stopmarkdownitemize\n",c)
end
local function c_tightorderedlist(c)
- return {
- "\\startmarkdownitemize[n,packed]\n",
- process(listitem, c),
- "\\stopmarkdownitemize\n"
- }
+ return format("\n\\startmarkdownitemize[n,packed]\n%s\\stopmarkdownitemize\n",c)
end
local function c_looseorderedlist(c)
- return {
- "\\startmarkdownitemize[n]\n",
- process(listitem, c),
- "\\stopmarkdownitemize\n"
- }
+ return format("\n\\startmarkdownitemize[n]\n%s\\stopmarkdownitemize\n",c)
end
--- html
-
-local showhtml = false
-
-local function c_inline_html(c)
+local function c_inline_html(content)
nofhtmlblobs = nofhtmlblobs + 1
- if showhtml then
- local x = xml.convert(c)
- return {
- "\\type{",
- xml.tostring(x),
- "}"
- }
- else
- return ""
- end
+ return format("\\markdowninlinehtml{%s}",content)
end
-local function c_display_html(c)
+local function c_display_html(content)
nofhtmlblobs = nofhtmlblobs + 1
- if showhtml then
- local x = xml.convert(c)
- return {
- "\\starttyping\n",
- xml.tostring(x),
- "\\stoptyping\n"
- }
- else
- return ""
- end
+ return format("\\startmarkdowndisplayhtml\n%s\n\\stopmarkdowndisplayhtml",content)
end
--- highlight
-
local function c_emphasis(c)
- return {
- "\\markdownemphasis{",
- c,
- "}"
- }
+ return format("\\markdownemphasis{%s}",c)
end
local function c_strong(c)
- return {
- "\\markdownstrong{",
- c,
- "}"
- }
+ return format("\\markdownstrong{%s}",c)
end
--- blockquote
-
local function c_blockquote(c)
- return {
- "\\startmarkdownblockquote\n",
- nestedparser(concat(c,"\n")),
- "\\stopmarkdownblockquote\n"
- }
+ return format("\\startmarkdownblockquote\n%s\\stopmarkdownblockquote\n",nestedparser(c))
end
--- verbatim
-
local function c_verbatim(c)
- return {
- "\\startmarkdowntyping\n",
- concat(c),
- "\\stopmarkdowntyping\n"
- }
+ return format("\\startmarkdowntyping\n%s\\stopmarkdowntyping\n",c)
end
local function c_code(c)
- return {
- "\\markdowntype{",
- c,
- "}"
- }
+ return format("\\markdowntype{%s}",c)
end
--- sectioning (only relative, so no # -> ###)
-
local levels = { "", "", "", "", "", "" }
local function c_start_document()
@@ -371,307 +393,285 @@ local function c_heading(level,c)
levels[i] = ""
end
levels[level] = "\\stopstructurelevel"
- return {
- finish,
- "\\startstructurelevel[markdown][title={",
- c,
- "}]\n"
- }
+ return format("%s\\startstructurelevel[markdown][title={%s}]\n",finish,c)
end
---
-
local function c_hrule()
return "\\markdownrule\n"
end
local function c_link(lab,src,tit)
- return {
- "\\goto{",
- lab.inlines,
- "}[url(",
- src,
- ")]"
- }
+ return format("\\goto{%s}[url(%s)]",nestedparser(lab),src)
end
local function c_image(lab,src,tit)
- return {
- "\\externalfigure[",
- src,
- "]"
- }
-end
-
-local function c_email_link(addr)
- return c_link(addr,"mailto:"..addr)
+ return format("\\externalfigure[%s]",src)
end
--- Instead of local lpeg definitions we defne the nested parser first (this trick
--- could be backported to the original code if needed).
-
-local references = { }
-
-local function f_reference_set(lab,src,tit)
- return {
- key = normalize_label(lab.raw),
- label = lab.inlines,
- source = src,
- title = tit
- }
+local function c_email_link(address)
+ return format("\\goto{%s}[url(mailto:%s)]",c_string(address),address)
end
-local function f_reference_link_double(s,i,l)
- local key = normalize_label(l.raw)
- if references[key] then
- return i, references[key].source, references[key].title
- else
- return false
- end
+local function c_url_link(url)
+ return format("\\goto{%s}[url(%s)]",c_string(url),url)
end
-local function f_reference_link_single(s,i,l)
- local key = normalize_label(l.raw)
- if references[key] then
- return i, l, references[key].source, references[key].title
- else
- return false
- end
+local function f_heading(c,n)
+ return c_heading(n,c)
end
-local function f_label_collect(a)
- return { "[", a.inlines, "]" }
+local function c_hex_entity(s)
+ return utfchar(tonumber(s,16))
end
-local function f_label(a,b)
- return {
- raw = a,
- inlines = b
- }
+local function c_dec_entity(s)
+ return utfchar(tonumber(s))
end
-local function f_pack_list(a)
- return itemsignal .. concat(a)
+local function c_tag_entity(s)
+ return s -- we can use the default resolver
end
-local function f_reference(ref)
- references[ref.key] = ref
-end
+--]]
-local function f_append(a,b)
- return a .. b
-end
+---------------------------------------------------------------------------------------------
-local function f_level_one_heading(c)
- return c_heading(1,c)
-end
+--[[
-local function f_level_two_heading(c)
- return c_heading(2,c)
-end
+local escaped = {
+ ["<"] = "&lt;",
+ [">"] = "&gt;",
+ ["&"] = "&amp;",
+ ['"'] = "&quot;",
+}
-local function f_link(a)
- return c_link({ inlines = c_string(a) }, a, "")
+local function c_string(s) -- has to be done more often
+ return (gsub(s,".",escaped))
end
-local syntax
-
-nestedparser = function(inp) return to_string(lpegmatch(syntax,inp)) end
-
-syntax = { "Document", -- still rather close to the original but reformatted etc etc
-
- Document = #(Cmt(V("References"), function(s,i,a) return i end)) -- what does this do
- * Ct((interblockspace * V("Block"))^0)
- * blanklines * eof,
-
- References = (V("Reference") / f_reference + (nonemptyline^1 * blankline^1) + line)^0
- * blanklines * eof,
-
- Block = V("Blockquote")
- + V("Verbatim")
- + V("Reference") / { }
- + V("HorizontalRule")
- + V("Heading")
- + V("OrderedList")
- + V("BulletList")
- + V("HtmlBlock")
- + V("Para")
- + V("Plain"),
-
- Heading = V("AtxHeading")
- + V("SetextHeading"),
-
- AtxStart = C(hash * hash^-5) / length,
-
- AtxInline = V("Inline") - V("AtxEnd"),
-
- AtxEnd = optionalspace * hash^0 * optionalspace * newline * blanklines,
-
- AtxHeading = V("AtxStart") * optionalspace * Ct(V("AtxInline")^1) * V("AtxEnd") / c_heading,
-
- SetextHeading = V("SetextHeading1")
- + V("SetextHeading2"),
-
- SetextHeading1 = Ct((V("Inline") - V("Endline"))^1) * newline * equal^3 * newline * blanklines / f_level_one_heading,
- SetextHeading2 = Ct((V("Inline") - V("Endline"))^1) * newline * dash ^3 * newline * blanklines / f_level_two_heading,
-
- BulletList = V("BulletListTight")
- + V("BulletListLoose"),
-
- BulletListTight = Ct((bullet * V("ListItem"))^1) * blanklines * -bullet / c_tightbulletlist,
+local c_linebreak = "<br/>"
+local c_space = " "
- BulletListLoose = Ct((bullet * V("ListItem") * C(blanklines) / f_append)^1) / c_loosebulletlist, -- just Cs
+local function c_paragraph(c)
+ return format("<p>%s</p>\n", c)
+end
- OrderedList = V("OrderedListTight") + V("OrderedListLoose"),
+local function listitem(c)
+ return format("<li>%s</li>",nestedparser(c))
+end
- OrderedListTight = Ct((enumerator * V("ListItem"))^1) * blanklines * -enumerator / c_tightorderedlist,
+local function c_tightbulletlist(c)
+ return format("<ul>\n%s\n</ul>\n",c)
+end
- OrderedListLoose = Ct((enumerator * V("ListItem") * C(blanklines) / f_append)^1) / c_looseorderedlist, -- just Cs
+local function c_loosebulletlist(c)
+ return format("<ul>\n%s\n</ul>\n",c)
+end
- ListItem = Ct(V("ListBlock") * (V("NestedList") + V("ListContinuationBlock")^0)) / concat,
+local function c_tightorderedlist(c)
+ return format("<ol>\n%s\n</ol>\n",c)
+end
- ListBlock = Ct(line * V("ListBlockLine")^0) / concat,
+local function c_looseorderedlist(c)
+ return format("<ol>\n%s\n</ol>\n",c)
+end
- ListContinuationBlock = blanklines * indent * V("ListBlock"),
+local function c_inline_html(content)
+ nofhtmlblobs = nofhtmlblobs + 1
+ return content
+end
- NestedList = Ct((optionallyindentedline - (bullet + enumerator))^1) / f_pack_list,
+local function c_display_html(content)
+ nofhtmlblobs = nofhtmlblobs + 1
+ return format("\n%s\n",content)
+end
- ListBlockLine = -blankline * -(indent^-1 * (bullet + enumerator)) * optionallyindentedline,
+local function c_emphasis(c)
+ return format("<em>%s</em>",c)
+end
- InBlockTags = openblocktag * (V("HtmlBlock") + (any - closeblocktag))^0 * closeblocktag,
+local function c_strong(c)
+ return format("<strong>%s</strong>",c)
+end
- HtmlBlock = C(V("InBlockTags") + selfclosingblocktag + htmlcomment) * blankline^1 / c_display_html,
+local function c_blockquote(c)
+ return format("<blockquote>\n%s\n</blockquote>",nestedparser(c))
+end
- BlockquoteLine = ((nonindentspace * more * space^-1 * C(linechar^0) * newline)^1 * ((C(linechar^1) - blankline) * newline)^0 * C(blankline)^0 )^1,
+local function c_verbatim(c)
+ return format("<pre><code>%s</code></pre>",c)
+end
- Blockquote = Ct((V("BlockquoteLine"))^1) / c_blockquote,
+local function c_code(c)
+ return format("<code>%s</code>",c)
+end
- VerbatimChunk = blanklines * (indentedline - blankline)^1,
+local c_start_document = ""
+local c_stop_document = ""
- Verbatim = Ct(V("VerbatimChunk")^1) * (blankline^1 + eof) / c_verbatim,
+local function c_heading(level,c)
+ return format("<h%d>%s</h%d>\n",level,c,level)
+end
- Label = lbracket * Cf(Cc("") * #((C(V("Label") + V("Inline")) - rbracket)^1), f_append) *
- Ct((V("Label") / f_label_collect + V("Inline") - rbracket)^1) * rbracket / f_label,
+local function c_hrule()
+ return "<hr/>\n"
+end
- RefTitle = dquote * C((any - (dquote ^-1 * blankline))^0) * dquote +
- squote * C((any - (squote ^-1 * blankline))^0) * squote +
- lparent * C((any - (rparent * blankline))^0) * rparent +
- Cc(""),
+local function c_link(lab,src,tit)
+ local titattr = #tit > 0 and format(" title=%q",tit) or ""
+ return format("<a href=%q%s>%s</a>",src,titattr,nestedparser(lab))
+end
- RefSrc = C(nonspacechar^1),
+local function c_image(lab,src,tit)
+ return format("<img href=%q title=%q>%s</a>",src,tit,nestedparser(lab))
+end
- Reference = nonindentspace * V("Label") * colon * spnl * V("RefSrc") * spnl * V("RefTitle") * blanklines / f_reference_set,
+local function c_email_link(address)
+ return format("<a href=%q>%s</a>","mailto:",address,c_escape(address))
+end
- HorizontalRule = (lineof_asterisks + lineof_dashes + lineof_underscores) / c_hrule,
+local function c_url_link(url)
+ return format("<a href=%q>%s</a>",url,c_string(url))
+end
- Para = nonindentspace * Ct(V("Inline")^1) * newline * blankline^1 / c_paragraph,
+local function f_heading(c,n)
+ return c_heading(n,c)
+end
- Plain = Ct(V("Inline")^1), -- / c_plain,
+local function c_hex_entity(s)
+ return utfchar(tonumber(s,16))
+end
- Inline = V("Str")
- + V("Endline")
- + V("UlOrStarLine")
- + V("Space")
- + V("Strong")
- + V("Emphasis")
- + V("Image")
- + V("Link")
- + V("Code")
- + V("RawHtml")
- + V("Entity")
- + V("EscapedChar")
- + V("Symbol"),
+local function c_dec_entity(s)
+ return utfchar(tonumber(s))
+end
- RawHtml = C(htmlcomment + htmltag) / c_inline_html,
+local function c_tag_entity(s)
+ return format("&%s;",s)
+end
- EscapedChar = P("\\") * C(P(1 - newline)) / c_string,
+--]]
- -- we will use the regular entity handler
+---------------------------------------------------------------------------------------------
- Entity = V("HexEntity")
- + V("DecEntity")
- + V("CharEntity") / c_entity,
+local Str = normalchar^1 / c_string
+local Space = spacechar^1 / c_space
+local Symbol = specialchar / c_string
+local Code = inticks / c_code
- HexEntity = C(ampersand * hash * S("Xx") * hexdigit^1 * semicolon),
- DecEntity = C(ampersand * hash * digit^1 * semicolon),
- CharEntity = C(ampersand * alphanumeric^1 * semicolon),
+local HeadingStart = C(hash * hash^-5) / length
+local HeadingStop = optionalspace * hash^0 * optionalspace * newline * blanklines
+local HeadingLevel = equal^3 * Cc(1)
+ + dash ^3 * Cc(2)
- --
+local NormalEndline = optionalspace * newline * -(
+ blankline
+ + more
+ + HeadingStart
+ + ( line * (P("===")^3 + P("---")^3) * newline )
+ ) / c_space
- Endline = V("LineBreak")
- + V("TerminalEndline")
- + V("NormalEndline"),
+local LineBreak = P(" ") * NormalEndline / c_linebreak
- NormalEndline = optionalspace * newline * -(
- blankline
- + more
- + V("AtxStart")
- + ( line * (P("===")^3 + P("---")^3) * newline )
- ) / c_space,
+local TerminalEndline = optionalspace * newline * eof / ""
- TerminalEndline = optionalspace * newline * eof / "",
+local Endline = LineBreak
+ + TerminalEndline
+ + NormalEndline
- LineBreak = P(" ") * V("NormalEndline") / c_linebreak,
+local AutoLinkUrl = less * C(alphanumeric^1 * P("://") * (any - (newline + more))^1) * more / c_url_link
+local AutoLinkEmail = less * C((alphanumeric + S("-_+"))^1 * P("@") * (any - (newline + more))^1) * more / c_email_link
- Code = inticks / c_code,
+local DirectLink = direct_link_parser / c_link
+local IndirectLink = indirect_link_parser / c_link
- -- This keeps the parser from getting bogged down on long strings of '*' or '_'
- UlOrStarLine = asterisk^4
- + underscore^4
- + (spaces * S("*_")^1 * #spaces) / c_string,
+local ImageLink = exclamation * (direct_link_parser + indirect_link_parser) / c_image -- we can combine this with image ... smaller lpeg
- Emphasis = V("EmphasisStar")
- + V("EmphasisUl"),
+local UlOrStarLine = asterisk^4
+ + underscore^4
+ + (spaces * S("*_")^1 * #spaces) / c_string
- EmphasisStar = asterisk * -spaceornewline * Ct((V("Inline") - asterisk )^1) * asterisk / c_emphasis,
- EmphasisUl = underscore * -spaceornewline * Ct((V("Inline") - underscore)^1) * underscore / c_emphasis,
+local EscapedChar = P("\\") * C(P(1 - newline)) / c_string
- Strong = V("StrongStar")
- + V("StrongUl"),
+local InlineHtml = inlinehtml / c_inline_html
+local DisplayHtml = displayhtml / c_display_html
+local HtmlEntity = hexentity / c_hex_entity
+ + decentity / c_dec_entity
+ + tagentity / c_tag_entity
- StrongStar = doubleasterisks * -spaceornewline * Ct((V("Inline") - doubleasterisks )^1) * doubleasterisks / c_strong,
- StrongUl = doubleunderscores * -spaceornewline * Ct((V("Inline") - doubleunderscores)^1) * doubleunderscores / c_strong,
+local NestedList = Cs(optionallyindentedline - (bullet + enumerator))^1 / nestedparser
- Image = P("!") * (V("ExplicitLink") + V("ReferenceLink")) / c_image,
+local ListBlockLine = -blankline * -(indent^-1 * (bullet + enumerator)) * optionallyindentedline
- Link = V("ExplicitLink") / c_link
- + V("ReferenceLink") / c_link
- + V("AutoLinkUrl")
- + V("AutoLinkEmail"),
+local Verbatim = Cs(blanklines * (indentedline - blankline)^1) / c_verbatim
+ * (blankline^1 + eof) -- not really needed, probably capture trailing? we can do that beforehand
- ReferenceLink = V("ReferenceLinkDouble")
- + V("ReferenceLinkSingle"),
+local Blockquote = Cs((
+ ((nonindentspace * more * space^-1)/"" * linechar^0 * newline)^1
+ * ((linechar - blankline)^1 * newline)^0
+ * blankline^0
+ )^1) / c_blockquote
- ReferenceLinkDouble = V("Label") * spnl * Cmt(V("Label"), f_reference_link_double),
+local HorizontalRule = (lineof_asterisks + lineof_dashes + lineof_underscores) / c_hrule
- ReferenceLinkSingle = Cmt(V("Label"), f_reference_link_single) * (spnl * P("[]"))^-1,
+local Reference = define_reference_parser / ""
- AutoLinkUrl = less * C(alphanumeric^1 * P("://") * (any - (newline + more))^1) * more / f_link,
+-- could be a mini grammar
- AutoLinkEmail = less * C((alphanumeric + S("-_+"))^1 * P("@") * (any - (newline + more))^1) * more / c_email_link,
+local ListBlock = line * ListBlockLine^0
+local ListContinuationBlock = blanklines * indent * ListBlock
+local ListItem = Cs(ListBlock * (NestedList + ListContinuationBlock^0)) / listitem
- BasicSource = (nonspacechar - S("()>"))^1 + (lparent * V("Source") * rparent)^1 + always,
+---- LeadingLines = blankline^0 / ""
+---- TrailingLines = blankline^1 * #(any) / "\n"
- AngleSource = less * C(V("BasicSource")) * more,
+syntax = Cs { "Document",
- Source = V("AngleSource")
- + C(V("BasicSource")),
+ Document = V("Display")^0,
- LinkTitle = dquote * C((any - (dquote * optionalspace * rparent))^0) * dquote +
- squote * C((any - (squote * optionalspace * rparent))^0) * squote +
- Cc(""),
+ Display = blankline -- ^1/"\n"
+ + Blockquote
+ + Verbatim
+ + Reference
+ + HorizontalRule
+ + HeadingStart * optionalspace * Cs((V("Inline") - HeadingStop)^1) * HeadingStop / c_heading
+ + Cs((V("Inline") - Endline)^1) * newline * HeadingLevel * newline * blanklines / f_heading
+ + Cs((bullet /"" * ListItem)^1) * blanklines * -bullet / c_tightbulletlist
+ + Cs((bullet /"" * ListItem * C(blanklines))^1) / c_loosebulletlist
+ + Cs((enumerator /"" * ListItem)^1) * blanklines * -enumerator / c_tightorderedlist
+ + Cs((enumerator /"" * ListItem * C(blanklines))^1) / c_looseorderedlist
+ + DisplayHtml
+ + nonindentspace * Cs(V("Inline")^1)* newline * blankline^1 / c_paragraph
+ + V("Inline")^1,
- ExplicitLink = V("Label") * spnl * lparent * optionalspace * V("Source") * spnl * V("LinkTitle") * optionalspace * rparent,
+ Inline = Str
+ + Space
+ + Endline
+ + UlOrStarLine -- still needed ?
+ + doubleasterisks * -spaceornewline * Cs((V("Inline") - doubleasterisks )^1) * doubleasterisks / c_strong
+ + doubleunderscores * -spaceornewline * Cs((V("Inline") - doubleunderscores)^1) * doubleunderscores / c_strong
+ + asterisk * -spaceornewline * Cs((V("Inline") - asterisk )^1) * asterisk / c_emphasis
+ + underscore * -spaceornewline * Cs((V("Inline") - underscore )^1) * underscore / c_emphasis
+ + ImageLink
+ + DirectLink
+ + IndirectLink
+ + AutoLinkUrl
+ + AutoLinkEmail
+ + Code
+ + InlineHtml
+ + HtmlEntity
+ + EscapedChar
+ + Symbol,
- Str = normalchar^1 / c_string,
- Space = spacechar^1 / c_space,
- Symbol = specialchar / c_string,
}
+---------------------------------------------------------------------------------------------
+
local function convert(str)
nofruns = nofruns + 1
nofbytes = nofbytes + #str
statistics.starttiming(markdown)
+ referenceparser(str)
local result = c_start_document() .. nestedparser(str) .. c_stop_document()
statistics.stoptiming(markdown)
return result
@@ -704,8 +704,121 @@ statistics.register("markdown",function()
end
end)
--- test
+---------------------------------------------------------------------------------------------
--~ context.starttext()
--~ moduledata.markdown.convert(str)
--~ context.stoptext()
+
+if not tex.jobname then
+
+ local one = [[
+Test *123*
+==========
+
+<b>BOLD *BOLD* BOLD</b>
+
+<pre>PRE <b>PRE</b> PRE</pre>
+
+
+* Test
+** Test
+* Test1
+ * Test2
+* Test
+
+Test
+====
+
+> test
+> test **123** *123*
+> test `code`
+
+test
+
+Test
+====
+
+> test
+> test
+> test
+
+test
+oeps
+
+more
+
+ code
+ code
+
+oeps
+
+[an example][a]
+
+[an example] [2]
+
+[a]: http://example.com/ "Optional *oeps* Title Here"
+[2]: http://example.com/ 'Optional Title Here'
+[3]: http://example.com/ (Optional Title Here)
+
+[an example][a]
+
+[an example] [2]
+
+[an [tricky] example](http://example.com/ "Title")
+
+[This **xx** link](http://example.net/)
+ ]]
+
+-- This snippet takes some 4 seconds in the original parser (the one that is
+-- a bit clearer from the perspective of grammars but somewhat messy with
+-- respect to the captures. In the above parser it takes .1 second. Also,
+-- in the later case only memory is the limit.
+
+ local two = [[
+Test
+====
+* Test
+** Test
+* Test
+** Test
+* Test
+
+Test
+====
+
+> test
+> test
+> test
+
+test
+
+Test
+====
+
+> test
+> test
+> test
+
+test
+ ]]
+
+ local function test(str)
+ local n = 1 -- 000
+ local t = os.clock()
+ local one = convert(str)
+ -- print("runtime",1,#str,#one,os.clock()-t)
+ str = string.rep(str,n)
+ local t = os.clock()
+ local two = convert(str)
+ print(two)
+ -- print("runtime",n,#str,#two,os.clock()-t)
+ -- print(format("==============\n%s\n==============",one))
+ end
+
+ -- test(one)
+ -- test(two)
+ -- test(io.read("*all"))
+
+
+end
diff --git a/tex/context/base/m-markdown.mkiv b/tex/context/base/m-markdown.mkiv
index 016e18ea2..6e0036513 100644
--- a/tex/context/base/m-markdown.mkiv
+++ b/tex/context/base/m-markdown.mkiv
@@ -47,6 +47,12 @@
\definetype
[markdowntype]
+\definetype
+ [markdowninlinehtml]
+
+\definetyping
+ [markdowndisplayhtml]
+
\definedelimitedtext
[markdownblockquote]
[quotation]
diff --git a/tex/context/base/m-zint.mkiv b/tex/context/base/m-zint.mkiv
index 04af806a0..c439476c2 100644
--- a/tex/context/base/m-zint.mkiv
+++ b/tex/context/base/m-zint.mkiv
@@ -67,12 +67,12 @@ function moduledata.zint.generate(code,data,suffix,options)
io.savedata(temp,data)
os.execute(format('%s --barcode=%s --output="%s" --input="%s"',zint,code,name,temp,options or ""))
end
- return name
+ return name
end
\stopluacode
-\doifnotmode{demo}{\endinput}
+\continueifinputfile{m-zint.mkiv}
\starttext
diff --git a/tex/context/base/node-ref.lua b/tex/context/base/node-ref.lua
index e0c241b35..fd01f4fba 100644
--- a/tex/context/base/node-ref.lua
+++ b/tex/context/base/node-ref.lua
@@ -104,7 +104,7 @@ end
local function inject_range(head,first,last,reference,make,stack,parent,pardir,txtdir)
local width, height, depth = dimensions(parent,first,last)
- if pardir == "TRT" or txtdir == "+TRT" then
+ if txtdir == "+TRT" or (txtdir == "===" and pardir == "TRT") then -- KH: textdir == "===" test added
width = - width
end
local result, resolved = make(width,height,depth,reference)
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 5e3950fce..c1fa5d434 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 24525ddd3..4f9165dd7 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/strc-flt.mkiv b/tex/context/base/strc-flt.mkiv
index c3366b855..71a15d4af 100644
--- a/tex/context/base/strc-flt.mkiv
+++ b/tex/context/base/strc-flt.mkiv
@@ -152,8 +152,8 @@
\c!sidespacebefore=\floatsharedparameter\c!spacebefore,
\c!sidespaceafter=\floatsharedparameter\c!spaceafter,
\c!sidealign=\v!normal,
- \c!textmethod=\ifgridsnapping2\else0\fi, % 0=raw 1=safe (.99pg) 2=tight (-1pt)
- \c!sidemethod=\ifgridsnapping2\else1\fi, % 0=raw 1=safe (.99pg) 2=tight (-1pt)
+ \c!textmethod=\ifgridsnapping2\else0\fi, % 0=raw 1=safe (.99pg) 2=tight (-1pt) % THIS WILL CHANGE
+ \c!sidemethod=\ifgridsnapping2\else1\fi, % 0=raw 1=safe (.99pg) 2=tight (-1pt) % THIS WILL CHANGE
\c!indentnext=\v!no,
\c!margin=1em,
\c!method=1,
@@ -594,7 +594,7 @@
% the global settings.
\unexpanded\def\docomplexplacefloat[#1][#2]% [#3]#4%
- {\edef\currentfloat{#1}%
+ {\edef\currentfloat{#1}% TODO: IF UNDEFINED THEN FALLBACK TO figure
\doifnothing\currentfloat{\let\currentfloat\v!figure}%
\doifelsenothing{#2}
{\edef\floatlocation{\floatparameter\c!default}}
diff --git a/tex/context/base/trac-fil.lua b/tex/context/base/trac-fil.lua
index 54ca6ac6b..bf291ff6b 100644
--- a/tex/context/base/trac-fil.lua
+++ b/tex/context/base/trac-fil.lua
@@ -9,11 +9,13 @@ if not modules then modules = { } end modules ['trac-fil'] = {
local format, concat = string.format, table.concat
local openfile = io.open
local date = os.date
+local rawset, tonumber = rawset, tonumber
local P, C, Cc, Cg, Cf, Ct, Cs = lpeg.P, lpeg.C, lpeg.Cc, lpeg.Cg, lpeg.Cf, lpeg.Ct, lpeg.Cs
-local patterns = lpeg.patterns
-local cardinal = patterns.cardinal
+local patterns = lpeg.patterns
+local cardinal = patterns.cardinal
+local whitespace = patterns.whitespace^0
patterns.timestamp = Cf(Ct("") * (
Cg (Cc("year") * (cardinal/tonumber)) * P("-")
@@ -26,10 +28,13 @@ patterns.timestamp = Cf(Ct("") * (
* Cg (Cc("tminute") * (cardinal/tonumber))
)^0, rawset)
+patterns.keysvalues = Cf(Ct("") * (
+ Cg(C(patterns.letter^0) * whitespace * "=" * whitespace * Cs(patterns.unquoted) * whitespace)
+)^0, rawset)
+
patterns.statusline = Cf(Ct("") * (
- P("[") * Cg(Cc("timestamp") * patterns.timestamp) * P("]")
- * patterns.whitespace^0
- * Cg(Cc("status") * Cf(Ct("") * (Cg(C(patterns.letter^0) * "=" * Cs(patterns.unquoted)) * patterns.whitespace^0)^0, rawset))
+ whitespace * P("[") * Cg(Cc("timestamp") * patterns.timestamp ) * P("]")
+ * whitespace * Cg(Cc("status" ) * patterns.keysvalues)
),rawset)
diff --git a/tex/context/base/trac-lmx.lua b/tex/context/base/trac-lmx.lua
index b4bfc36d6..8e7c60a37 100644
--- a/tex/context/base/trac-lmx.lua
+++ b/tex/context/base/trac-lmx.lua
@@ -83,9 +83,9 @@ function lmx.loadedfile(name)
end
local function do_include(filename)
- local stylepath = do_variable('includepath')
+ local stylepath = do_variable('includepath') -- todo: store paths of loaded files
local data = lmx.loadedfile(filename)
- if (not data or data == "") and stylepath ~= "" then
+ if (not data or data == "") and stylepath and stylepath ~= "" then
data = lmx.loadedfile(file.join(stylepath,filename))
end
if not data or data == "" then
diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua
index c843236de..b46075321 100644
--- a/tex/context/base/trac-log.lua
+++ b/tex/context/base/trac-log.lua
@@ -46,7 +46,7 @@ local report, subreport, status, settarget, setformats, settranslations
local direct, subdirect, writer, pushtarget, poptarget
-if tex and tex.jobname or tex.formatname then
+if tex and (tex.jobname or tex.formatname) then
local valueiskey = { __index = function(t,k) t[k] = k return k end } -- will be helper
diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/type-otf.mkiv
index 5224a8012..df4809e05 100644
--- a/tex/context/base/type-otf.mkiv
+++ b/tex/context/base/type-otf.mkiv
@@ -669,7 +669,7 @@
% Antykwa Torunska (GUST)
- \starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond]
+ \starttypescript [serif] [antykwa,antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond]
\definefontsynonym [AntykwaTorunska-Regular] [\s!file:AntykwaTorunska-Regular] [\s!features=\s!default]
\definefontsynonym [AntykwaTorunska-Italic] [\s!file:AntykwaTorunska-Italic] [\s!features=\s!default]
\definefontsynonym [AntykwaTorunska-Bold] [\s!file:AntykwaTorunska-Bold] [\s!features=\s!default]
@@ -705,7 +705,7 @@
\definefontsynonym [AntykwaTorunska-CondMedItalicCap] [\s!file:AntykwaTorunskaCondMed-Italic] [\s!features=\s!smallcaps]
\stoptypescript
- \starttypescript [math][antykwa-torunska][all]
+ \starttypescript [math][antykwa,antykwa-torunska][all]
\loadfontgoodies[antykwa-math]
\definefontsynonym[MathRoman][antykwamath@antykwa-math]
\stoptypescript
@@ -725,7 +725,7 @@
\definefontsynonym[MathRoman][antykwalightcondmath@antykwa-lightcond-math]
\stoptypescript
- \starttypescript [serif] [antykwa-torunska] [name]
+ \starttypescript [serif] [antykwa,antykwa-torunska] [name]
\definefontsynonym [Serif] [AntykwaTorunska-Regular]
\definefontsynonym [SerifBold] [AntykwaTorunska-Bold]
\definefontsynonym [SerifItalic] [AntykwaTorunska-Italic]
@@ -765,7 +765,7 @@
\definefontsynonym [SerifCaps] [AntykwaTorunska-CondLightCap]
\stoptypescript
- \starttypescript [serif] [antykwa-torunska] [name]
+ \starttypescript [serif] [antykwa,antykwa-torunska] [name]
\definefontsynonym [SerifRegular] [Serif]
\definefontsynonym [SerifRegularCaps] [AntykwaTorunska-Cap]
\definefontsynonym [SerifBoldCaps] [AntykwaTorunska-BoldCap]
@@ -873,11 +873,11 @@
\definefontsynonym [SerifCapsExp] [AntykwaTorunska-LightCap]
\stoptypescript
- \starttypescript [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond]
- \definetypeface[antykwa][rm][serif][\typescriptone] [default]
- \definetypeface[antykwa][ss][sans] [modern] [default] [rscale=1.05]
- \definetypeface[antykwa][tt][mono] [modern] [default] [rscale=1.05]
- \definetypeface[antykwa][mm][math] [\typescriptone] [default]
+ \starttypescript [antykwa,antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond]
+ \definetypeface[\typescriptone][rm][serif][\typescriptone] [default]
+ \definetypeface[\typescriptone][ss][sans] [modern] [default] [rscale=1.05]
+ \definetypeface[\typescriptone][tt][mono] [modern] [default] [rscale=1.05]
+ \definetypeface[\typescriptone][mm][math] [\typescriptone] [default]
\quittypescriptscanning
\stoptypescript
diff --git a/tex/context/base/typo-dir.lua b/tex/context/base/typo-dir.lua
index 54c2e6e98..cdc1427a1 100644
--- a/tex/context/base/typo-dir.lua
+++ b/tex/context/base/typo-dir.lua
@@ -53,7 +53,7 @@ local endmath_code = mathcodes.endmath
local fonthashes = fonts.hashes
local fontdata = fonthashes.identifiers
-local chardata = fonthashes.characters
+local fontchar = fonthashes.characters
local chardata = characters.data
local chardirs = characters.directions -- maybe make a special mirror table
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6f35d4d43..e4f752770 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 : 07/26/11 09:17:48
+-- merge date : 08/04/11 00:42:26
do -- begin closure to overcome local limits and interference
@@ -1246,25 +1246,6 @@ patterns.unspacer = ((patterns.spacer^1)/"")^0
patterns.somecontent = (anything - newline - space)^1 -- (utf8char - newline - space)^1
patterns.beginline = #(1-newline)
--- local unquoted = Cs(patterns.unquoted * endofstring) -- not C
---
--- function string.unquoted(str)
--- return match(unquoted,str) or str
--- end
---
--- more efficient on long strings:
-
-local unquoted = (
- squote * Cs((1 - P(-2))^0) * squote
- + dquote * Cs((1 - P(-2))^0) * dquote
-)
-
-function string.unquoted(str)
- return match(unquoted,str) or str
-end
-
-patterns.unquoted = unquoted
-
-- print(string.unquoted("test"))
-- print(string.unquoted([["t\"est"]]))
-- print(string.unquoted([["t\"est"x]]))