summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/anch-pgr.mkiv39
-rw-r--r--tex/context/base/anch-pos.mkiv29
-rw-r--r--tex/context/base/buff-ini.lua2
-rw-r--r--tex/context/base/cont-new.tex2
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/page-par.mkiv10
-rw-r--r--tex/context/base/strc-ren.mkiv32
-rw-r--r--tex/context/base/tabl-tab.mkiv11
-rw-r--r--tex/generic/context/luatex-fonts-merged.lua2
9 files changed, 42 insertions, 87 deletions
diff --git a/tex/context/base/anch-pgr.mkiv b/tex/context/base/anch-pgr.mkiv
index 35f2191bf..957fd25af 100644
--- a/tex/context/base/anch-pgr.mkiv
+++ b/tex/context/base/anch-pgr.mkiv
@@ -631,6 +631,7 @@
\appendtoks
% a position can be mid paragraph in which case we're behind
+ % this will change when we move positions to lua
\initializeparbackgrounds
\to \everystarttext
@@ -846,42 +847,6 @@
\def\calculatenexttextpardimensions
{\docalculatetextpardimensions\nextbtbanchor\nextetbanchor\relax}
-% \def\docalculatetextpardimensions#1#2#3% #1=\btbanchor #2=\etbanchor
-% {\scratchcounter\numexpr\MPp#2-\MPp#1\relax
-% \edef\textparpages{\the\scratchcounter}%
-% \ifcase\scratchcounter
-% % one page
-% \scratchdimen\dimexpr\MPy#1-\MPy#2\relax
-% \else
-% % two or more pages
-% \ifnum\scratchcounter>2
-% \ifnum\scratchcounter<5
-% % more pages
-% \scratchdimen\textheight
-% \advance\scratchcounter \minusone
-% \multiply\scratchdimen \scratchcounter
-% \else
-% % keep'm small
-% \scratchdimen5\textheight
-% \fi
-% \else
-% \scratchdimen\dimexpr\MPy#1-\MPy#2-\MPy\textanchor+\MPy\textanchor+\MPh\textanchor\relax
-% \fi
-% \fi
-% \edef\textparheight{\the\scratchdimen}%
-% \ifcase\scratchcounter
-% % one page
-% \scratchdimen\dimexpr\MPx#2-\MPx#1\relax
-% \else
-% % two or more pages / maybe also hang
-% \ifx#3\relax
-% \scratchdimen\makeupwidth % \textwidth
-% \else
-% \scratchdimen\dimexpr\MPw\MPparanchor-\MPl\MPparanchor-\MPr\MPparanchor\relax
-% \fi
-% \fi
-% \edef\textparwidth{\the\scratchdimen}}
-
\def\docalculatetextpardimensions#1#2#3% #1=\btbanchor #2=\etbanchor (adapted 8/6/2009)
{\scratchcounter\numexpr\MPp#2-\MPp#1\relax
\edef\textparpages
@@ -1021,8 +986,6 @@
\ifx\basegrid\undefined \else \letvalue\v!grid=\basegrid \fi
-% lelijk, aanpassen, opties
-
\setupMPvariables
[mpos:connect]
[linecolor=red,
diff --git a/tex/context/base/anch-pos.mkiv b/tex/context/base/anch-pos.mkiv
index 6fdd7324a..e19cab0c2 100644
--- a/tex/context/base/anch-pos.mkiv
+++ b/tex/context/base/anch-pos.mkiv
@@ -516,16 +516,27 @@
\let\registerparoptions\relax
+% \def\doregisterparoptions
+% {\ifpositioningpar \ifpositioning \iftrialtypesetting \else
+% \ifinpagebody \else \ifmmode \else \ifinformula \else
+% % \ifprocessingverbatim
+% % \iflinepar
+% % % obsolete: \dodoregisterparoptions
+% % \fi
+% % \else
+% \dodoregisterparoptions
+% % \fi
+% \fi \fi \fi
+% \fi \fi \fi}
+
\def\doregisterparoptions
- {\ifpositioningpar \ifpositioning \iftrialtypesetting \else
- \ifinpagebody \else \ifmmode \else \ifinformula \else
- \ifprocessingverbatim
- \iflinepar \dodoregisterparoptions \fi
- \else
- \dodoregisterparoptions
- \fi
- \fi \fi \fi
- \fi \fi \fi}
+ {%\ifpositioningpar \ifpositioning % true anyway
+ \iftrialtypesetting \else
+ \ifinpagebody \else \ifmmode \else \ifinformula \else
+ \dodoregisterparoptions
+ \fi \fi \fi
+ \fi
+ }%\fi \fi}
\def\dodoregisterparoptions
{\global\advance\parposcounter\plusone
diff --git a/tex/context/base/buff-ini.lua b/tex/context/base/buff-ini.lua
index 611280dfc..c7fb8f99e 100644
--- a/tex/context/base/buff-ini.lua
+++ b/tex/context/base/buff-ini.lua
@@ -46,7 +46,7 @@ local function exists(name)
return data[name] ~= nil
end
-local function getcontent(name)
+local function getcontent(name) -- == raw
return data[name] or ""
end
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index f3beb3cc0..3f0f7f318 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2010.12.02 16:13}
+\newcontextversion{2010.12.02 18:37}
%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.tex b/tex/context/base/context.tex
index 5abd31a1f..bdcc50f61 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2010.12.02 16:13}
+\edef\contextversion{2010.12.02 18:37}
%D For those who want to use this:
diff --git a/tex/context/base/page-par.mkiv b/tex/context/base/page-par.mkiv
index fb8631eec..c687c424d 100644
--- a/tex/context/base/page-par.mkiv
+++ b/tex/context/base/page-par.mkiv
@@ -38,11 +38,13 @@
\kern\@@phdistance}}
\def\doshowparagraphnumberA
- {\ifprocessingverbatim
- \iflinepar\dodoshowparagraphnumber\fi
- \else
+ {%\ifprocessingverbatim
+ % \iflinepar
+ % % obsolete: \dodoshowparagraphnumber
+ % \fi
+ %\else
\dodoshowparagraphnumber
- \fi}
+ }%\fi}
\def\doshowparagraphnumberB
{\ifnumberinglines
diff --git a/tex/context/base/strc-ren.mkiv b/tex/context/base/strc-ren.mkiv
index 5737fc165..1639a5a49 100644
--- a/tex/context/base/strc-ren.mkiv
+++ b/tex/context/base/strc-ren.mkiv
@@ -372,11 +372,6 @@
\def\presetnumberheadalternative
{\doifelsevalue{\??ns:\numberheadalternative}\v!horizontal\setfalse\settrue\structureheadisdisplay}
-% \def\normalplacehead
-% {\executeifdefined
-% {\??ns::\numberheadalternative}
-% {\getvalue{\??ns::\v!normal}}}
-
\def\normalplacehead
{\csname\??ns::\ifcsname\??ns::\numberheadalternative\endcsname\numberheadalternative\else\v!normal\fi\endcsname}
@@ -389,23 +384,6 @@
\fi
#2}}
-% \defineheadplacement[\v!normal][\v!vertical]#1#2%
-% {\ifconditional\structureheadshownumber % \ifheadnumbercontent
-% \setbox0\hbox{{#1}\hskip\numberheaddistance}%
-% \vbox
-% {\localheadsetup
-% \hangindent 1\wd0
-% \hangafter 1
-% \noindent
-% \unhbox0 % don't use \strut's here!
-% #2}%
-% \else
-% \vbox
-% {\localheadsetup\noindent#2}%
-% \fi}
-%
-% enhanced version:
-
% \setuphead
% [chapter]
% [numberwidth=2cm,hang=line,after={\blank[3*line]}]
@@ -419,7 +397,7 @@
\edef\headwidth {\structureheadparameter\c!width }%
\edef\headnumberwidth{\structureheadparameter\c!numberwidth}%
\edef\headtextwidth {\structureheadparameter\c!textwidth }%
- \ifconditional\structureheadshownumber % \ifheadnumbercontent
+ \ifconditional\structureheadshownumber
\ifx\headwidth\empty
\else
\ifx\headnumberwidth\empty
@@ -463,7 +441,7 @@
{\localheadsetup
\begstrut % use one \strut here!
\dontleavehmode % in case there is no strut, else side effects with llap
- \ifconditional\structureheadshownumber % \ifheadnumbercontent
+ \ifconditional\structureheadshownumber
\llap{\hbox{\hfill{#1}\hskip\localheadskip\hskip\leftmargindistance}}% introduces whitespace
% maybe better:
% \inleftmargin{\hbox{\hss{#1}\hskip\localheadskip}}%
@@ -479,7 +457,7 @@
\veryraggedcenter
\let\\\endgraf
\let\crlf\endgraf
- \ifconditional\structureheadshownumber % \ifheadnumbercontent
+ \ifconditional\structureheadshownumber
\strut#1\par
\fi
\begstrut#2}}
@@ -487,14 +465,14 @@
\defineheadplacement[\v!text][\v!horizontal]#1#2%
{\bgroup
\localheadsetup % no stretch in distance
- \ifconditional\structureheadshownumber % \ifheadnumbercontent
+ \ifconditional\structureheadshownumber
{#1}\kern\numberheaddistance
\fi
{\begstrut#2}%
\egroup}
\unexpanded\def\placeheadlohi#1#2#3%
- {\ifconditional\structureheadshownumber % \ifheadnumbercontent
+ {\ifconditional\structureheadshownumber
\setbox0\hbox{#2}
\setbox2=#1{\localheadsetup\advance\hsize-\wd0\relax#3}%
\hbox{\box0\hskip\numberheaddistance\box2}%
diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/tabl-tab.mkiv
index cf4c8b657..e724b0188 100644
--- a/tex/context/base/tabl-tab.mkiv
+++ b/tex/context/base/tabl-tab.mkiv
@@ -751,10 +751,10 @@
\!taDimenB=#2\relax
\let\!TsSpaceFactor\empty
\ifmmode
- \expandafter \mathpalette
- \expandafter \!TsEnlargeMath
+ \expandafter\mathpalette
+ \expandafter\!TsEnlargeMath
\else
- \expandafter \!TsEnlargeOther
+ \expandafter\!TsEnlargeOther
\fi}
\def\!TsEnlargeOther#1%
@@ -870,11 +870,12 @@
% INSERT VRULE
\newcount\noftablevrules \noftablevrules\plusone
-\def\@VLd{.125em}
\let\tablecurrentvrulecolor\empty
\let\tablecurrenthrulecolor\empty
+\def\@VLd{.125em}
+
\def\do!ttInsertVrule % will be merged in 2005
{\vrule\!!width
\ifnum\!tgCode=\plusone
@@ -931,7 +932,7 @@
\def\next % added
{\global\advance\currenttablecolumn #1% % added
\global\advance\currenttablecolumn \minusone % added
- \scratchcounter#1% \mscount is in Plain
+ \scratchcounter#1%
\advance\scratchcounter \minusone
\advance\scratchcounter \scratchcounter
\!thLoop
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 4fde4ebb4..06ef44251 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 12/02/10 16:13:50
+-- merge date : 12/02/10 18:37:42
do -- begin closure to overcome local limits and interference