summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.tex2
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/math-dim.lua4
-rw-r--r--tex/context/base/page-txt.mkiv22
-rw-r--r--tex/context/base/strc-des.mkiv4
-rw-r--r--tex/context/base/strc-lst.lua2
-rw-r--r--tex/context/base/strc-lst.mkiv2
-rw-r--r--tex/context/base/strc-not.mkiv5
-rw-r--r--tex/context/base/strc-ref.lua7
-rw-r--r--tex/context/base/type-hgz.tex6
-rw-r--r--tex/context/base/type-otf.mkiv6
-rw-r--r--tex/generic/context/luatex-fonts-merged.lua2
12 files changed, 40 insertions, 24 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 8f2378a3d..6687be198 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.01.03 12:54}
+\newcontextversion{2010.01.05 16:47}
%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 b01b64385..3a64eb824 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.01.03 12:54}
+\edef\contextversion{2010.01.05 16:47}
%D For those who want to use this:
diff --git a/tex/context/base/math-dim.lua b/tex/context/base/math-dim.lua
index fda1e8551..62d805126 100644
--- a/tex/context/base/math-dim.lua
+++ b/tex/context/base/math-dim.lua
@@ -118,7 +118,7 @@ local defaults = {
['default']={ "SubscriptBaselineDropMin", "sub_drop" },
},
['sub_sup_shift_down']={
- ['default']={ "SubscriptShiftDown", "sub2" },
+ ['default']={ "SubscriptShiftDown", "sub2" }, -- todo
},
['sub_top_max']={
['default']={ "SubscriptTopMax", "abs(math_x_height*4)/5" },
@@ -209,6 +209,7 @@ end
function mathematics.dimensions(dimens)
if dimens.SpaceAfterScript then
+ dimens.SubscriptShiftDownWithSuperscript = dimens.SubscriptShiftDown * 1.5
return { }, table.fastcopy(dimens)
elseif dimens.AxisHeight or dimens.axis_height then
local t = { }
@@ -284,6 +285,7 @@ function mathematics.dimensions(dimens)
StackTopShiftUp = t . stack_num_up . text_style,
SubscriptBaselineDropMin = t . sub_shift_drop . text_style,
SubscriptShiftDown = t . sub_shift_down . text_style,
+ SubscriptShiftDownWithSuperscript = t . sub_sup_shift_down . text_style,
SubscriptTopMax = t . sub_top_max . text_style,
SubSuperscriptGapMin = t . subsup_vgap . text_style,
SuperscriptBaselineDropMax = t . sup_shift_drop . text_style,
diff --git a/tex/context/base/page-txt.mkiv b/tex/context/base/page-txt.mkiv
index e13590bbc..9d5faa9f5 100644
--- a/tex/context/base/page-txt.mkiv
+++ b/tex/context/base/page-txt.mkiv
@@ -591,7 +591,7 @@
\fi
\ifdim\rightedgewidth>\zeropoint
\hskip\rightedgedistance
- \dododoplacelayouttextline\rightedgewidth\currentlayouttextline\v!edge{\thelayoutrightedgeline#1}%
+ \dododoplacelayouttextline\rightedgewidth\currentlayouttextline\v!edge{\thelayoutrightedgeline#3}%
\fi}}
\def\thelayoutleftedgeline#1%
@@ -745,25 +745,25 @@
%D The rest of this file is dedicated to setting up the
%D texts. This code is not that impressive.
-\setupheadertexts [\v!text] [] []
+\setupheadertexts [\v!text] [] []
\setupheadertexts [\v!margin] [] []
-\setupheadertexts [\v!edge] [] []
+\setupheadertexts [\v!edge] [] []
-\setupfootertexts [\v!text] [] []
+\setupfootertexts [\v!text] [] []
\setupfootertexts [\v!margin] [] []
-\setupfootertexts [\v!edge] [] []
+\setupfootertexts [\v!edge] [] []
-\setuptexttexts [\v!text] [] []
+\setuptexttexts [\v!text] [] []
\setuptexttexts [\v!margin] [] []
-\setuptexttexts [\v!edge] [] []
+\setuptexttexts [\v!edge] [] []
-\setupbottomtexts [\v!text] [] []
+\setupbottomtexts [\v!text] [] []
\setupbottomtexts [\v!margin] [] []
-\setupbottomtexts [\v!edge] [] []
+\setupbottomtexts [\v!edge] [] []
-\setuptoptexts [\v!text] [] []
+\setuptoptexts [\v!text] [] []
\setuptoptexts [\v!margin] [] []
-\setuptoptexts [\v!edge] [] []
+\setuptoptexts [\v!edge] [] []
% alternative
%
diff --git a/tex/context/base/strc-des.mkiv b/tex/context/base/strc-des.mkiv
index 6d0cc244e..a6258dd22 100644
--- a/tex/context/base/strc-des.mkiv
+++ b/tex/context/base/strc-des.mkiv
@@ -873,6 +873,10 @@
\fi
\endgroup}
+\def\reinstatedescriptionnumberentry
+ {\xdef\currentdescriptionattribute {\ctxlua {tex.write(jobreferences.getinternalreference(\currentdescriptionnumberentry))}}%
+ \xdef\currentdescriptionsynchronize{\ctxlatelua{structure.lists.enhance(\currentdescriptionnumberentry)}}}
+
\installstructurelistprocessor{description}{\usestructurelistprocessor{number+title}}
% labels, we could share with enumerations and forget about the text; anyhow, figure
diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/strc-lst.lua
index 73b20f9d2..2cf8d4947 100644
--- a/tex/context/base/strc-lst.lua
+++ b/tex/context/base/strc-lst.lua
@@ -355,7 +355,7 @@ function lists.size()
texprint(#lists.result)
end
-function lists.location(name,n)
+function lists.location(n)
local l = lists.result[n]
texsprint(l.references.internal or n)
end
diff --git a/tex/context/base/strc-lst.mkiv b/tex/context/base/strc-lst.mkiv
index fc5fba4f1..fd9675190 100644
--- a/tex/context/base/strc-lst.mkiv
+++ b/tex/context/base/strc-lst.mkiv
@@ -91,7 +91,7 @@
\endgroup}
\def\structurelistlocation
- {\ctxlua{structure.lists.location("\currentlist",\currentlistindex)}}
+ {\ctxlua{structure.lists.location(\currentlistindex)}}
\def\structurelistpagenumber
{\ctxlua{structure.lists.prefixedpage(
diff --git a/tex/context/base/strc-not.mkiv b/tex/context/base/strc-not.mkiv
index 09cf523ec..cbdf3783f 100644
--- a/tex/context/base/strc-not.mkiv
+++ b/tex/context/base/strc-not.mkiv
@@ -640,7 +640,10 @@
{\edef\currentdescription{#1}%
\edef\currentnote{#1}%
\edef\currentdescriptionnumberentry{#2}%
-% \let\currentenumerationfullnumber\currentnoteenumerationfullnumber
+ % as we can have collected notes (e.g. in tables) we need to recover
+ % \currentdescriptionattribute and \currentdescriptionsynchronize
+ \reinstatedescriptionnumberentry
+ %
\dontcomplain % should be done in startstoreddescription instead
\dostartstoreddescription\begstrut\currentnotedescriptiontext\endstrut\dostopstoreddescription}
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index 7c4efe5ba..8cd4b2cbc 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -854,6 +854,12 @@ function jobreferences.setinternalreference(prefix,tag,internal,view)
return destination
end
+function jobreferences.getinternalreference(n) -- n points into list
+ local l = structure.lists.collected[n]
+ texsprint((l and l.references.internal) or n)
+end
+
+
--
function jobreferences.get_current_metadata(tag)
@@ -873,6 +879,7 @@ function jobreferences.get_current_prefixspec(default) -- todo: message
texsprint(ctxcatcodes,"\\getreferencestructureprefix{",
current_metadata("kind"), "}{", current_metadata("name") or "?", "}{", default, "}")
end
+
--~ function jobreferences.get_current_prefixspec(default) -- we can consider storing the data at the lua end
--~ context.getreferencestructureprefix(current_metadata("kind"),current_metadata("name"),default)
--~ end
diff --git a/tex/context/base/type-hgz.tex b/tex/context/base/type-hgz.tex
index 59b5eefd8..e6a12d7e3 100644
--- a/tex/context/base/type-hgz.tex
+++ b/tex/context/base/type-hgz.tex
@@ -270,7 +270,7 @@
\definetypeface[palatino][rm][serif][palatino-nova][default][features=default]
\definetypeface[palatino][ss][sans] [palatino-sans][default][features=default]
\definetypeface[palatino][tt][mono] [latin-modern] [default][features=default,rscale=1.1]
- \definetypeface[palatino][mm][math] [latin-modern] [default][features=default,rscale=1.1]
+ \definetypeface[palatino][mm][math] [palatino] [default][features=default] % ,rscale=1.1]
\quittypescriptscanning
\stoptypescript
@@ -278,7 +278,7 @@
\definetypeface[palatino][ss][sans] [palatino-sans][default][features=default]
\definetypeface[palatino][rm][serif][palatino-nova][default][features=default]
\definetypeface[palatino][tt][mono] [latin-modern] [default][features=default,rscale=1.1]
- \definetypeface[palatino][mm][math] [latin-modern] [default][features=default,rscale=1.1]
+ \definetypeface[palatino][mm][math] [palatino] [default][features=default] % ,rscale=1.1]
\quittypescriptscanning
\stoptypescript
@@ -286,7 +286,7 @@
\definetypeface[palatino-informal][ss][sans] [palatino-informal][default][features=default]
\definetypeface[palatino-informal][rm][serif][palatino-nova] [default][features=default]
\definetypeface[palatino-informal][tt][mono] [latin-modern] [default][features=default,rscale=1.1]
- \definetypeface[palatino-informal][mm][math] [latin-modern] [default][features=default,rscale=1.1]
+ \definetypeface[palatino-informal][mm][math] [palatino] [default][features=default] % ,rscale=1.1]
\quittypescriptscanning
\stoptypescript
diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/type-otf.mkiv
index e7844fb0b..b700c5ab7 100644
--- a/tex/context/base/type-otf.mkiv
+++ b/tex/context/base/type-otf.mkiv
@@ -481,9 +481,9 @@
\stoptypescript
\starttypescript [cambria-x,cambria-y]
% test x
- \definetypeface [cambria-x] [rm] [serif] [cambria] [default]
- \definetypeface [cambria-x] [tt] [mono] [modern] [default]
- \definetypeface [cambria-x] [mm] [math] [\typescriptone] [default]
+ \definetypeface [\typescriptone] [rm] [serif] [cambria] [default]
+ \definetypeface [\typescriptone] [tt] [mono] [modern] [default]
+ \definetypeface [\typescriptone] [mm] [math] [\typescriptone] [default]
\stoptypescript
% math times
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index e6da53fad..a709be033 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua
--- merge date : 01/04/10 19:52:31
+-- merge date : 01/05/10 16:51:52
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 14:59:07 +0000