summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-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.pdfbin4148 -> 4147 bytes
-rw-r--r--tex/context/base/context-version.pngbin40693 -> 40295 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv6
-rw-r--r--tex/context/base/page-mix.mkiv28
-rw-r--r--tex/context/base/spac-hor.mkiv20
-rw-r--r--tex/context/base/status-files.pdfbin24561 -> 24562 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin196457 -> 196456 bytes
-rw-r--r--tex/context/base/strc-ref.lua2
-rw-r--r--tex/context/base/supp-box.mkiv4
-rw-r--r--tex/context/base/util-sql-tickets.lua299
-rw-r--r--tex/context/base/util-sql.lua2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
15 files changed, 228 insertions, 141 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 11ee9406f..ebccc4a61 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{2012.11.16 23:51}
+\newcontextversion{2012.11.19 19:04}
%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 48d6ee885..c991e3994 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{2012.11.16 23:51}
+\newcontextversion{2012.11.19 19:04}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 906069e4b..2ee599fd6 100644
--- a/tex/context/base/context-version.pdf
+++ 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
index 8953936f2..615372947 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 1ed4838ea..3ffce1140 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{2012.11.16 23:51}
+\edef\contextversion{2012.11.19 19:04}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index ec54cd356..ff6ebc421 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.11.16 23:51}
+\edef\contextversion{2012.11.19 19:04}
%D For those who want to use this:
@@ -69,6 +69,8 @@
\newtoks\contextversiontoks \contextversiontoks\expandafter{\contextversion}
+% \normaleverypar{\wait} % uncomment for test of funny injections
+
%D Now the more fundamental code gets defined.
\loadmarkfile{norm-ctx}
@@ -496,6 +498,4 @@
\ctxlua{statistics.savefmtstatus("\jobname","\contextversion","context.mkiv")}% can become automatic
\to \everydump
-% \tracingall
-
\errorstopmode \dump \endinput
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv
index a4ef619bb..6c1c26667 100644
--- a/tex/context/base/page-mix.mkiv
+++ b/tex/context/base/page-mix.mkiv
@@ -64,6 +64,7 @@
\c!alternative=\v!local,
\c!maxheight=\textheight,
\c!maxwidth=\makeupwidth,
+ \c!grid=\v!tolerant,
\c!step=.25\lineheight, % needs some experimenting
\c!method=\ifinner\s!box\else\s!otr\fi] % automatic as suggested by WS
@@ -189,9 +190,23 @@
%D The interceptor is quite simple, at least for the moment.
+% \def\page_mix_routine_intercept
+% {\global\setbox\b_page_mix_preceding\vbox
+% {\page_otr_command_flush_top_insertions
+% \unvbox\normalpagebox}}
+
\def\page_mix_routine_intercept
- {\global\setbox\b_page_mix_preceding\vbox
+ {\ifdim\pagetotal>\pagegoal
+ % testcase: preceding-001 ... if we don't do this, text can disappear as
+ % preceding is overwritten ... needs to be figured out some day
+ \page_one_command_routine
+ \fi
+ \global\setbox\b_page_mix_preceding\vbox
{\page_otr_command_flush_top_insertions
+ \ifdim\ht\b_page_mix_preceding=\zeropoint \else
+ \writestatus\m!columns{preceding error}%
+ \unvbox\b_page_mix_preceding
+ \fi
\unvbox\normalpagebox}}
%D The error routine is there but unlikely to be called. It is a left-over from
@@ -241,9 +256,14 @@
%D mechamism.
\def\page_mix_enable_grid_snapping
- {\gridsnappingtrue
- \setsystemmode\v!grid
- \spac_grids_snap_value_set\v!yes}
+ {\edef\p_grid{\mixedcolumnsparameter\c!grid}%
+ \ifx\p_grid\empty
+ % maybe listen to main grid setting
+ \else
+ \gridsnappingtrue
+ \setsystemmode\v!grid
+ \spac_grids_snap_value_set\p_grid
+ \fi}
%D Between columns there is normally just spacing unless one enforces a rule.
%D
diff --git a/tex/context/base/spac-hor.mkiv b/tex/context/base/spac-hor.mkiv
index 8da1ce69e..d40bcf3ee 100644
--- a/tex/context/base/spac-hor.mkiv
+++ b/tex/context/base/spac-hor.mkiv
@@ -541,16 +541,16 @@
\def\spac_narrower_initialize[#1]% hm, can be dorepeat directly
{\dorepeatwithcommand[#1]\spac_narrower_method_analyze}
-\installnarrowermethod \v!left {\global\advance\s_spac_narrower_left \narrowerparameter\c!left \relax}
-\installnarrowermethod \v!middle{\global\advance\s_spac_narrower_mid \narrowerparameter\c!middle\relax}
-\installnarrowermethod \v!right {\global\advance\s_spac_narrower_right \narrowerparameter\c!right \relax}
-\installnarrowermethod-\v!left {\global\advance\s_spac_narrower_left -\narrowerparameter\c!left \relax}
-\installnarrowermethod-\v!middle{\global\advance\s_spac_narrower_mid -\narrowerparameter\c!middle\relax}
-\installnarrowermethod-\v!right {\global\advance\s_spac_narrower_right-\narrowerparameter\c!right \relax}
-\installnarrowermethod \v!reset {\global \s_spac_narrower_left \zeropoint
- \global \s_spac_narrower_mid \zeropoint
- \global \s_spac_narrower_right \zeropoint\relax}
-\installnarrowermethod\v!none {}
+\installnarrowermethod \v!left {\global\advance\s_spac_narrower_left \narrowerparameter\c!left \relax}
+\installnarrowermethod \v!middle {\global\advance\s_spac_narrower_mid \narrowerparameter\c!middle\relax}
+\installnarrowermethod \v!right {\global\advance\s_spac_narrower_right \narrowerparameter\c!right \relax}
+\installnarrowermethod{-\v!left }{\global\advance\s_spac_narrower_left -\narrowerparameter\c!left \relax}
+\installnarrowermethod{-\v!middle}{\global\advance\s_spac_narrower_mid -\narrowerparameter\c!middle\relax}
+\installnarrowermethod{-\v!right }{\global\advance\s_spac_narrower_right-\narrowerparameter\c!right \relax}
+\installnarrowermethod \v!reset {\global \s_spac_narrower_left \zeropoint
+ \global \s_spac_narrower_mid \zeropoint
+ \global \s_spac_narrower_right \zeropoint\relax}
+\installnarrowermethod \v!none {}
\unexpanded\def\spac_narrower_start#1%
{\begingroup
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index b8e1c70e4..a6baf6a3f 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 96d57a76d..b2727e3ca 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-ref.lua b/tex/context/base/strc-ref.lua
index ab2d366cc..06a70cc28 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -892,7 +892,7 @@ local function loadproductreferences(productname,componentname,utilitydata)
local prefix = references.referenceprefix or ""
local component = references.component
local ctarget, ptarget
- if component and component == componentname then
+ if not component or component == componentname then
-- skip
else
-- one level up
diff --git a/tex/context/base/supp-box.mkiv b/tex/context/base/supp-box.mkiv
index a8774e482..84ae00da1 100644
--- a/tex/context/base/supp-box.mkiv
+++ b/tex/context/base/supp-box.mkiv
@@ -1456,10 +1456,10 @@
\dowithnextboxcs\syst_boxes_struttedbox_finish\hbox}
\def\syst_boxes_struttedbox_finish
- {\ht\nextbox\strutdepth
+ {\dp\nextbox\strutdepth
\ht\nextbox\strutheight
\box\nextbox
- \egroup}%
+ \egroup}
%D \macros
%D {topskippedbox}
diff --git a/tex/context/base/util-sql-tickets.lua b/tex/context/base/util-sql-tickets.lua
index 1dfe1e376..f54ec433f 100644
--- a/tex/context/base/util-sql-tickets.lua
+++ b/tex/context/base/util-sql-tickets.lua
@@ -6,8 +6,10 @@ if not modules then modules = { } end modules ['util-sql-tickets'] = {
license = "see context related readme files"
}
+-- TODO: MAKE SOME INTO STORED PROCUDURES
+
-- This is experimental code and currently part of the base installation simply
--- because it's easier to dirtribute this way. Eventually it will be documented
+-- because it's easier to distribute this way. Eventually it will be documented
-- and the related scripts will show up as well.
local tonumber = tonumber
@@ -29,20 +31,35 @@ local execute = sql.execute
tickets.newtoken = sql.tokens.new
-local statustags = { [0] = -- beware index can be string or number, maybe status should be a string in the database
+-- Beware as an index can be a string or a number, we will create
+-- a combination of hash and index.
+
+local statustags = { [0] =
"unknown",
"pending",
"busy",
"finished",
+ "dependent", -- same token but different subtoken (so we only need to find the first)
+ "reserved-1",
+ "reserved-2",
"error",
"deleted",
}
-local status = table.swapped(statustags)
-
+local status = table.swapped(statustags)
tickets.status = status
tickets.statustags = statustags
+local s_unknown = status.unknown
+local s_pending = status.pending
+local s_busy = status.busy
+local s_finished = status.finished
+local s_dependent = status.dependent
+local s_error = status.error
+local s_deleted = status.deleted
+
+local s_rubish = s_error -- and higher
+
local function checkeddb(presets,datatable)
return sql.usedatabase(presets,datatable or presets.datatable or "tickets")
end
@@ -105,10 +122,7 @@ function tickets.deletedb(presets,datatable)
end
-local template =[[
- LOCK TABLES
- %basename%
- WRITE ;
+local template_push =[[
INSERT INTO %basename% (
`token`,
`subtoken`,
@@ -130,23 +144,39 @@ local template =[[
'%[data]%',
'%[comment]%'
) ;
+]]
+
+local template_fetch =[[
SELECT
- LAST_INSERT_ID() AS `id` ;
- UNLOCK TABLES ;
+ *
+ FROM
+ %basename%
+ WHERE
+ `token` = '%token%'
+ AND
+ `subtoken` = '%subtoken%'
+ ;
]]
function tickets.create(db,ticket)
- local token = ticket.token or tickets.newtoken()
+ -- We assume a unique token .. if not we're toast anyway. We used to lock and
+ -- get the last id etc etc but there is no real need for that.
+
+ -- we could check for dependent here but we don't want the lookup
+
+ local token = ticket.token or tickets.newtoken()
local time = ostime()
- local status = ticket.status or 0
- local category = ticket.category or 0
- local subtoken = ticket.subtoken or 0
+ local status = ticket.status
+ local category = ticket.category or 0
+ local subtoken = ticket.subtoken or 0
local usertoken = ticket.usertoken or ""
- local comment = ticket.comment or ""
+ local comment = ticket.comment or ""
+
+ status = not status and subtoken > 1 and s_dependent or s_pending
local result, message = db.execute {
- template = template,
+ template = template_push,
variables = {
basename = db.basename,
token = token,
@@ -160,62 +190,55 @@ function tickets.create(db,ticket)
},
}
- if trace_sql then
- report("created: %s at %s",token,osfulltime(time))
- end
-
- local id = result and result.id
+ -- We could stick to only fetching the id and make the table here
+ -- but we're not pushing that many tickets so we can as well follow
+ -- the lazy approach and fetch the whole.
- if id then
-
- return {
- id = id,
+ local result, message = db.execute {
+ template = template_fetch,
+ variables = {
+ basename = db.basename,
token = token,
subtoken = subtoken,
- created = time,
- accessed = time,
- status = status,
- category = category,
- usertoken = usertoken,
- data = data,
- comment = comment,
- }
+ },
+ }
+ if result and #result > 0 then
+ if trace_sql then
+ report("created: %s at %s",token,osfulltime(time))
+ end
+ return result[1]
+ else
+ report("failed: %s at %s",token,osfulltime(time))
end
+
end
local template =[[
- LOCK TABLES
+ UPDATE
%basename%
- WRITE ;
- UPDATE %basename% SET
+ SET
`data` = '%[data]%',
`status` = %status%,
`accessed` = %time%
WHERE
`id` = %id% ;
- UNLOCK TABLES ;
]]
function tickets.save(db,ticket)
- local time = ostime()
- local data = db.serialize(ticket.data or { },"return")
- local status = ticket.status or 0
- local id = ticket.id
-
- if not status then
- status = 0
- ticket.status = 0
- end
+ local time = ostime()
+ local data = db.serialize(ticket.data or { },"return")
+ local status = ticket.status or s_error
+ ticket.status = status
ticket.accessed = time
db.execute {
template = template,
variables = {
basename = db.basename,
- id = id,
+ id = ticket.id,
time = ostime(),
status = status,
data = data,
@@ -336,11 +359,14 @@ function tickets.collect(db,nodata)
end
+-- We aleays keep the last select in the execute so one can have
+-- an update afterwards.
+
local template =[[
DELETE FROM
%basename%
WHERE
- `accessed` < %time% OR `status` = 5 ;
+ `accessed` < %time% OR `status` >= %rubish% ;
]]
local template_cleanup_yes =[[
@@ -352,11 +378,7 @@ local template_cleanup_yes =[[
`accessed` < %time%
ORDER BY
`created` ;
- DELETE FROM
- %basename%
- WHERE
- `accessed` < %time% OR `status` = 5 ;
-]]
+]] .. template
local template_cleanup_nop =[[
SELECT
@@ -371,11 +393,7 @@ local template_cleanup_nop =[[
`accessed` < %time%
ORDER BY
`created` ;
- DELETE FROM
- %basename%
- WHERE
- `accessed` < %time% OR `status` = 5 ;
-]]
+]] .. template
function tickets.cleanupdb(db,delta,nodata) -- maybe delta in db
@@ -386,6 +404,7 @@ function tickets.cleanupdb(db,delta,nodata) -- maybe delta in db
variables = {
basename = db.basename,
time = time,
+ rubish = s_rubish,
},
}
@@ -424,7 +443,7 @@ function tickets.getstatus(db,token)
local record = record and record[1]
- return record and record.status or 0
+ return record and record.status or s_unknown
end
@@ -434,7 +453,7 @@ local template =[[
FROM
%basename%
WHERE
- `status` = 5 OR `accessed` < %time% ;
+ `status` >= %rubish% OR `accessed` < %time% ;
]]
function tickets.getobsolete(db,delta)
@@ -446,6 +465,7 @@ function tickets.getobsolete(db,delta)
variables = {
basename = db.basename,
time = time,
+ rubish = s_rubish,
},
}
@@ -468,15 +488,15 @@ local template =[[
function tickets.hasstatus(db,status)
- local record = db.execute {
+ local records = db.execute {
template = template,
variables = {
basename = db.basename,
- status = status or 0,
+ status = status or s_unknown,
},
}
- return record and #record > 0 or false
+ return records and #records > 0 or false
end
@@ -492,13 +512,13 @@ local template =[[
function tickets.setstatus(db,id,status)
- local record, keys = db.execute {
+ db.execute {
template = template,
variables = {
basename = db.basename,
id = id,
time = ostime(),
- status = status or 0,
+ status = status or s_error,
},
}
@@ -521,7 +541,7 @@ function tickets.prunedb(db,status)
template = template,
variables = {
basename = db.basename,
- status = status or 0,
+ status = status or s_unknown,
},
}
@@ -531,76 +551,61 @@ function tickets.prunedb(db,status)
end
+-- START TRANSACTION ; ... COMMIT ;
+-- LOCK TABLES %basename% WRITE ; ... UNLOCK TABLES ;
+
local template_a = [[
- LOCK TABLES
- %basename%
- WRITE ;
SET
- @first_token = "?" ;
- SELECT
- `token`
- INTO
- @first_token
- FROM
- %basename%
- WHERE
- `status` = %status%
- ORDER BY
- `id`
- LIMIT 1 ;
+ @last_ticket_token = '' ;
UPDATE
%basename%
SET
+ `token` = (@last_ticket_token := `token`),
`status` = %newstatus%,
`accessed` = %time%
WHERE
- `token` = @first_token ;
+ `status` = %status%
+ ORDER BY
+ `id`
+ LIMIT
+ 1
+ ;
SELECT
*
FROM
%basename%
WHERE
- `token` = @first_token
+ `token` = @last_ticket_token
ORDER BY
- `id` ;
- UNLOCK TABLES ;
+ `id`
+ ;
]]
local template_b = [[
- SET
- @first_token = "?" ;
SELECT
- `token`
- INTO
- @first_token
+ *
FROM
- %basename%
+ tickets
WHERE
`status` = %status%
ORDER BY
`id`
- LIMIT 1 ;
- SELECT
- *
- FROM
- %basename%
- WHERE
- `token` = @first_token
- ORDER BY
- `id` ;
+ LIMIT
+ 1
+ ;
]]
function tickets.getfirstwithstatus(db,status,newstatus)
local records
- if type(newstatus) == "number" then
+ if type(newstatus) == "number" then -- todo: also accept string
records = db.execute {
template = template_a,
variables = {
basename = db.basename,
- status = status or 0,
+ status = status or s_pending,
newstatus = newstatus,
time = ostime(),
},
@@ -613,7 +618,7 @@ function tickets.getfirstwithstatus(db,status,newstatus)
template = template_b,
variables = {
basename = db.basename,
- status = status or 0,
+ status = status or s_pending,
},
}
@@ -624,7 +629,7 @@ function tickets.getfirstwithstatus(db,status,newstatus)
for i=1,#records do
local record = records[i]
record.data = db.deserialize(record.data or "")
- record.status = newstatus
+ record.status = newstatus or s_busy
end
return records
@@ -632,13 +637,82 @@ function tickets.getfirstwithstatus(db,status,newstatus)
end
end
+-- The next getter assumes that we have a sheduler running so that there is
+-- one process in charge of changing the status.
+
+local template = [[
+ SET
+ @last_ticket_token = '' ;
+ UPDATE
+ %basename%
+ SET
+ `token` = (@last_ticket_token := `token`),
+ `status` = %newstatus%,
+ `accessed` = %time%
+ WHERE
+ `status` = %status%
+ ORDER BY
+ `id`
+ LIMIT
+ 1
+ ;
+ SELECT
+ @last_ticket_token AS `token`
+ ;
+]]
+
+function tickets.getfirstinqueue(db,status,newstatus)
+
+ local records = db.execute {
+ template = template,
+ variables = {
+ basename = db.basename,
+ status = status or s_pending,
+ newstatus = newstatus or s_busy,
+ time = ostime(),
+ },
+ }
+
+ local token = type(records) == "table" and #records > 0 and records[1].token
+
+ return token ~= "" and token
+
+end
+
local template =[[
SELECT
*
FROM
%basename%
WHERE
- `usertoken` = '%usertoken%' AND `status` != 5
+ `token` = '%token%'
+ ORDER BY
+ `created` ;
+]]
+
+function tickets.getticketsbytoken(db,token)
+
+ local records, keys = db.execute {
+ template = template,
+ variables = {
+ basename = db.basename,
+ token = token,
+ },
+ }
+
+ db.unpackdata(records)
+
+ return records
+
+end
+
+local template =[[
+ SELECT
+ *
+ FROM
+ %basename%
+ WHERE
+ `usertoken` = '%usertoken%' AND `status` < %rubish%
ORDER BY
`created` ;
]]
@@ -654,6 +728,7 @@ function tickets.getusertickets(db,usertoken)
variables = {
basename = db.basename,
usertoken = usertoken,
+ rubish = s_rubish,
},
}
@@ -664,14 +739,10 @@ function tickets.getusertickets(db,usertoken)
end
local template =[[
- LOCK TABLES
- %basename%
- WRITE ;
UPDATE %basename% SET
- `status` = 5
+ `status` >= %rubish%
WHERE
`usertoken` = '%usertoken%' ;
- UNLOCK TABLES ;
]]
function tickets.removeusertickets(db,usertoken)
@@ -681,6 +752,7 @@ function tickets.removeusertickets(db,usertoken)
variables = {
basename = db.basename,
usertoken = usertoken,
+ rubish = s_rubish,
},
}
@@ -689,10 +761,3 @@ function tickets.removeusertickets(db,usertoken)
end
end
-
--- -- left-overs --
-
--- LOCK TABLES `m4alltickets` WRITE ;
--- CREATE TEMPORARY TABLE ticketset SELECT * FROM m4alltickets WHERE token = @first_token ;
--- DROP TABLE ticketset ;
--- UNLOCK TABLES ;
diff --git a/tex/context/base/util-sql.lua b/tex/context/base/util-sql.lua
index 02a818c54..6096ffe7b 100644
--- a/tex/context/base/util-sql.lua
+++ b/tex/context/base/util-sql.lua
@@ -6,6 +6,8 @@ if not modules then modules = { } end modules ['util-sql'] = {
license = "see context related readme files"
}
+-- todo: templates as table (saves splitting)
+
-- Of course we could use a library but we don't want another depedency and there is
-- a bit of flux in these libraries. Also, we want the data back in a way that we
-- like.
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b44e4e89e..3dce8b9ac 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 : 11/16/12 23:51:01
+-- merge date : 11/19/12 19:04:18
do -- begin closure to overcome local limits and interference