projects
/
matthijs
/
master-project
/
report.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ec9c92c
)
Update the pret-lam to current context beta.
author
Matthijs Kooijman
<matthijs@stdin.nl>
Tue, 25 Aug 2009 15:02:34 +0000
(17:02 +0200)
committer
Matthijs Kooijman
<matthijs@stdin.nl>
Tue, 25 Aug 2009 15:03:03 +0000
(17:03 +0200)
pret-lam.lua
patch
|
blob
|
history
diff --git
a/pret-lam.lua
b/pret-lam.lua
index f14b962ba2cd162a8f9743e73aeef8e30b695776..eb7d3530395529a0b6ce1b934a4aa6ce4b38c467 100644
(file)
--- a/
pret-lam.lua
+++ b/
pret-lam.lua
@@
-6,11
+6,9
@@
local utf = unicode.utf8
local utf = unicode.utf8
-if not buffers then buffers = { } end
-if not buffers.visualizers then buffers.visualizers = { } end
-if not buffers.visualizers.lam then buffers.visualizers.lam = { } end
+vis = buffers.newvisualizer("lam")
-
buffers.visualizers.lam.
colors = {
+
local
colors = {
"prettytwo",
"prettyone",
"prettythree",
"prettytwo",
"prettyone",
"prettythree",
@@
-18,7
+16,7
@@
buffers.visualizers.lam.colors = {
}
-- Symbols that should have a different representation
}
-- Symbols that should have a different representation
-
buffers.visualizers.lam.
symbols = {
+
local
symbols = {
[' '] = {repr = '\\obs '},
['_'] = {repr = '\\_'},
['->'] = {repr = '\\rightarrow'},
[' '] = {repr = '\\obs '},
['_'] = {repr = '\\_'},
['->'] = {repr = '\\rightarrow'},
@@
-30,7
+28,7
@@
buffers.visualizers.lam.symbols = {
-- Keywords that should be bold
-- Keywords that should be bold
-
buffers.visualizers.lam.
keywords = {
+
local
keywords = {
['case'] = {},
['of'] = {},
['let'] = {},
['case'] = {},
['of'] = {},
['let'] = {},
@@
-41,8
+39,8
@@
buffers.visualizers.lam.keywords = {
-- symbol. If no symbol from the table is matched, just returns the first
-- character. We can do a lookup directly, since symbols can be different in
-- length, so we just loop over all symbols, trying them in turn.
-- symbol. If no symbol from the table is matched, just returns the first
-- character. We can do a lookup directly, since symbols can be different in
-- length, so we just loop over all symbols, trying them in turn.
-
function buffers.visualizers.lam.
take_symbol(str)
- for symbol,props in pairs(
buffers.visualizers.lam.
symbols) do
+
local function
take_symbol(str)
+ for symbol,props in pairs(symbols) do
-- Try to remove symbol from the start of str
symbol, newstr = utf.match(str, "^(" .. symbol .. ")(.*)")
if symbol then
-- Try to remove symbol from the start of str
symbol, newstr = utf.match(str, "^(" .. symbol .. ")(.*)")
if symbol then
@@
-62,7
+60,7
@@
end
-- Take a single word from str, if posible. Returns the rest of the string and
-- the word taken.
-- Take a single word from str, if posible. Returns the rest of the string and
-- the word taken.
-
function buffers.visualizers.lam.
take_word(str)
+
local function
take_word(str)
-- A word must always start with a-z (in particular, λ is not a valid
-- start of a word).
res, newstr = utf.match(str, "^([a-zA-Z][%a%d_]+)(.*)")
-- A word must always start with a-z (in particular, λ is not a valid
-- start of a word).
res, newstr = utf.match(str, "^([a-zA-Z][%a%d_]+)(.*)")
@@
-72,7
+70,7
@@
end
-- Tries to match each of the patterns and returns the captures of the first
-- matching pattern (up to 5 captures are supported). Returns nil when nothing
-- matches.
-- Tries to match each of the patterns and returns the captures of the first
-- matching pattern (up to 5 captures are supported). Returns nil when nothing
-- matches.
-
function buffers.visualizers.lam.
match_mul(str, patterns)
+
local function
match_mul(str, patterns)
for i, pat in ipairs(patterns) do
a, b, c, d, e = utf.match(str, pat)
if a then
for i, pat in ipairs(patterns) do
a, b, c, d, e = utf.match(str, pat)
if a then
@@
-83,8
+81,7
@@
function buffers.visualizers.lam.match_mul(str, patterns)
end
-- Find any subscripts in the given word and typeset them
end
-- Find any subscripts in the given word and typeset them
-function buffers.visualizers.lam.do_subscripts(word)
- local match_mul = buffers.visualizers.lam.match_mul
+local function do_subscripts(word)
base, sub = match_mul(res, submatches)
if sub then
word = base .. "\\low{" .. sub .. "}"
base, sub = match_mul(res, submatches)
if sub then
word = base .. "\\low{" .. sub .. "}"
@@
-100,7
+97,7
@@
function buffers.visualizers.lam.do_subscripts(word)
return word
end
return word
end
-function
buffers.visualizers.lam.begin_of_buffer(type, name
)
+function
vis.begin_of_display(
)
-- Initially allow subscripts using _ or just appending a number (later,
-- we will add extra patterns here.
submatches = {"^(.*)_([%a%d,]+)$", "^(.*[^%d])(%d+)$"}
-- Initially allow subscripts using _ or just appending a number (later,
-- we will add extra patterns here.
submatches = {"^(.*)_([%a%d,]+)$", "^(.*[^%d])(%d+)$"}
@@
-110,21
+107,18
@@
function buffers.visualizers.lam.begin_of_buffer(type, name)
bases = {}
end
bases = {}
end
-function
buffers.visualizers.lam
.flush_line(str,nested)
+function
vis
.flush_line(str,nested)
local result, state = { }, 0
local finish, change = buffers.finish_state, buffers.change_state
local result, state = { }, 0
local finish, change = buffers.finish_state, buffers.change_state
- local take_symbol = buffers.visualizers.lam.take_symbol
- local take_word = buffers.visualizers.lam.take_word
- local do_subscripts = buffers.visualizers.lam.do_subscripts
-- Set the colorscheme, which is used by finish_state and change_state
-- Set the colorscheme, which is used by finish_state and change_state
- buffers.currentcolors =
buffers.visualizers.lam.
colors
+ buffers.currentcolors = colors
while str ~= "" do
local found = false
local word, symbol
-- See if the next token is a word
word, str = take_word(str)
if word then
while str ~= "" do
local found = false
local word, symbol
-- See if the next token is a word
word, str = take_word(str)
if word then
- if
buffers.visualizers.lam.
keywords[res] then
+ if keywords[res] then
-- Make all keywords bold
word = "{\\bold " .. word .. "}"
else
-- Make all keywords bold
word = "{\\bold " .. word .. "}"
else