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.pdfbin4135 -> 4147 bytes
-rw-r--r--tex/context/base/context-version.pngbin40298 -> 40467 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/page-bck.mkiv14
-rw-r--r--tex/context/base/status-files.pdfbin24737 -> 24740 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin210272 -> 210149 bytes
-rw-r--r--tex/context/base/trac-log.lua36
-rw-r--r--tex/context/base/util-str.lua26
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 39 insertions, 47 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 8221b3118..f0997eac9 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{2013.03.13 12:15}
+\newcontextversion{2013.03.13 12:53}
%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 224cb5d53..446916461 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{2013.03.13 12:15}
+\newcontextversion{2013.03.13 12:53}
%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 45d05b1e5..ad7781917 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 871adf0d0..232ef41d6 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 dc9025023..47b2c735b 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{2013.03.13 12:15}
+\edef\contextversion{2013.03.13 12:53}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 60b1aea52..dc81d3fe5 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{2013.03.13 12:15}
+\edef\contextversion{2013.03.13 12:53}
%D For those who want to use this:
diff --git a/tex/context/base/page-bck.mkiv b/tex/context/base/page-bck.mkiv
index cc4db92fb..0246e8eb6 100644
--- a/tex/context/base/page-bck.mkiv
+++ b/tex/context/base/page-bck.mkiv
@@ -498,29 +498,29 @@
\def\v_page_backgrounds_single_set{\v!text,\v!hidden,\v!paper,\v!page,\v!leftpage,\v!rightpage}
\def\v_page_backgrounds_common_set{\v!leftedge,\v!leftmargin,\v!text,\v!rightmargin,\v!rightedge}
-\def\page_backgrounds_setup_double[#1][#2][#3]% if needed we can speed this up
+\unexpanded\def\page_backgrounds_setup_double[#1][#2][#3]% if needed we can speed this up
{\global\settrue\c_page_backgrounds_some
\def\page_backgrounds_setup_step##1%
{\doifinsetelse{##1}\v_page_backgrounds_double_set
{\page_backgrounds_setup_and_check{##1}{#3}}
{\def\page_backgrounds_setup_step_nested####1{\page_backgrounds_setup_and_check{##1####1}{#3}}%
- \processcommalist[#2]\page_backgrounds_setup_step_nested}}%
- \processcommalist[#1]\page_backgrounds_setup_step
+ \processcommacommand[#2]\page_backgrounds_setup_step_nested}}%
+ \processcommacommand[#1]\page_backgrounds_setup_step
\the\everybackgroundssetup}
-\def\page_backgrounds_setup_single[#1][#2][#3]%
+\unexpanded\def\page_backgrounds_setup_single[#1][#2][#3]%
{\global\settrue\c_page_backgrounds_some
\doifcommonelse{#1}\v_page_backgrounds_single_set
{\def\page_backgrounds_setup_step##1{\page_backgrounds_setup_and_check{##1}{#2}}%
- \processcommalist[#1]\page_backgrounds_setup_step
+ \processcommacommand[#1]\page_backgrounds_setup_step
\the\everybackgroundssetup}%
{\page_backgrounds_setup_double[#1][\v_page_backgrounds_common_set][#2]}}
-\def\page_backgrounds_setup_basics[#1][#2][#3]%
+\unexpanded\def\page_backgrounds_setup_basics[#1][#2][#3]%
{\setupframed[\??layoutbackgrounds][#1]%
\the\everybackgroundssetup}
-\def\page_backgrounds_setup_and_check#1#2% tag settings
+\unexpanded\def\page_backgrounds_setup_and_check#1#2% tag settings
{\edef\currentotrbackground{\??layoutbackgrounds#1}%
\setupframed[\currentotrbackground][#2]%
\page_backgrounds_check_background}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 106bf08a9..db91fd850 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 cbf32dc38..fb42b1ac2 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua
index 22d46e7bd..2b84ba487 100644
--- a/tex/context/base/trac-log.lua
+++ b/tex/context/base/trac-log.lua
@@ -490,32 +490,24 @@ function logs.stop_page_number() -- the first page can includes the initializati
average = (stoptime - starttime) / (real - 1)
end
lasttime = stoptime
- if real > 0 then
- if user > 0 then
- if sub > 0 then
- report_pages("flushing realpage %s, userpage %s, subpage %s, time %0.04f / %0.04f",real,user,sub,elapsed,average)
- else
- report_pages("flushing realpage %s, userpage %s, time %0.04f / %0.04f",real,user,elapsed,average)
- end
- else
- report_pages("flushing realpage %s, time %0.04f / %0.04f",real,elapsed,average)
- end
- else
+ if real <= 0 then
report_pages("flushing page, time %0.04f / %0.04f",elapsed,average)
+ elseif user <= 0 then
+ report_pages("flushing realpage %s, time %0.04f / %0.04f",real,elapsed,average)
+ elseif sub <= 0 then
+ report_pages("flushing realpage %s, userpage %s, time %0.04f / %0.04f",real,user,elapsed,average)
+ else
+ report_pages("flushing realpage %s, userpage %s, subpage %s, time %0.04f / %0.04f",real,user,sub,elapsed,average)
end
else
- if real > 0 then
- if user > 0 then
- if sub > 0 then
- report_pages("flushing realpage %s, userpage %s, subpage %s",real,user,sub)
- else
- report_pages("flushing realpage %s, userpage %s",real,user)
- end
- else
- report_pages("flushing realpage %s",real)
- end
- else
+ if real <= 0 then
report_pages("flushing page")
+ elseif user <= 0 then
+ report_pages("flushing realpage %s",real)
+ elseif sub <= 0 then
+ report_pages("flushing realpage %s, userpage %s",real,user)
+ else
+ report_pages("flushing realpage %s, userpage %s, subpage %s",real,user,sub)
end
end
logs.flush()
diff --git a/tex/context/base/util-str.lua b/tex/context/base/util-str.lua
index 25882d9e3..965eff46d 100644
--- a/tex/context/base/util-str.lua
+++ b/tex/context/base/util-str.lua
@@ -153,19 +153,19 @@ function strings.nice(str)
return str
end
--- Work in progress. Interesting is that compared to the built-in this
--- is faster in luatex than in luajittex where we have a comparable speed.
--- It only makes sense to use the formatter when a (somewhat) complex format
--- is used a lot. Each formatter is a function so there is some overhead
--- and not all formatted output is worth that overhead. Keep in mind that
--- there is an extra function call involved. In principle we end up with a
--- string concatination so one could inline such a sequence but often at the
--- cost of less readabinity. So, it's a sort of (visual) compromise. Of course
--- there is the benefit of more variants. (Concerning the speed: a simple format
--- like %05fpt is better off with format than with a formatter, but as soon as
--- you put something in front formatters become faster. Passing the pt as extra
--- argument makes formatters behave better. Of course this is rather
--- implementation dependent.)
+-- Work in progress. Interesting is that compared to the built-in this is faster in
+-- luatex than in luajittex where we have a comparable speed. It only makes sense
+-- to use the formatter when a (somewhat) complex format is used a lot. Each formatter
+-- is a function so there is some overhead and not all formatted output is worth that
+-- overhead. Keep in mind that there is an extra function call involved. In principle
+-- we end up with a string concatination so one could inline such a sequence but often
+-- at the cost of less readabinity. So, it's a sort of (visual) compromise. Of course
+-- there is the benefit of more variants. (Concerning the speed: a simple format like
+-- %05fpt is better off with format than with a formatter, but as soon as you put
+-- something in front formatters become faster. Passing the pt as extra argument makes
+-- formatters behave better. Of course this is rather implementation dependent. Also,
+-- when a specific format is only used a few times the overhead in creating it is not
+-- compensated by speed.)
--
-- More info can be found in cld-mkiv.pdf so here I stick to a simple list.
--
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 3b919f1bd..e1e12bb43 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 : 03/13/13 12:15:24
+-- merge date : 03/13/13 12:53:56
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 15:30:47 +0000