From 113472b1fb39f29dd8f02f31b5be100eb3e71536 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sat, 25 Jun 2011 14:54:00 +0200 Subject: beta 2011.06.25 14:54 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/lpdf-fld.lua | 7 ++-- tex/context/base/node-mig.lua | 5 ++- tex/context/base/page-mul.mkiv | 6 +++ tex/context/base/phys-dim.lua | 3 ++ tex/context/base/status-files.pdf | Bin 23699 -> 23700 bytes tex/context/base/status-lua.pdf | Bin 157613 -> 157619 bytes tex/context/base/strc-not.mkiv | 46 ++++++++++++--------- tex/context/base/type-otf.mkiv | 2 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 13 files changed, 48 insertions(+), 31 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 7cca8bab5..b5ac8dabe 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{2011.06.25 11:24} +\newcontextversion{2011.06.25 14:54} %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 b3e8ea877..c297d5009 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{2011.06.25 11:24} +\newcontextversion{2011.06.25 14:54} %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.mkii b/tex/context/base/context.mkii index d19325005..ab1fd18bd 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{2011.06.25 11:24} +\edef\contextversion{2011.06.25 14:54} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index ba826815a..8cc20680d 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.06.25 11:24} +\edef\contextversion{2011.06.25 14:54} %D For those who want to use this: diff --git a/tex/context/base/lpdf-fld.lua b/tex/context/base/lpdf-fld.lua index f24e39e1a..1aa1377e5 100644 --- a/tex/context/base/lpdf-fld.lua +++ b/tex/context/base/lpdf-fld.lua @@ -368,14 +368,15 @@ local function fieldstates(specification,forceyes,values,default) else default = pdf_off end + local appearance if false then -- needs testing - local appearance = pdfdictionary { -- maybe also cache components + appearance = pdfdictionary { -- maybe also cache components N = pdfshareobjectreference(pdfdictionary { [forceyes or yesn] = registeredsymbol(yesn), Off = registeredsymbol(offn) }), R = pdfshareobjectreference(pdfdictionary { [forceyes or yesr] = registeredsymbol(yesr), Off = registeredsymbol(offr) }), D = pdfshareobjectreference(pdfdictionary { [forceyes or yesd] = registeredsymbol(yesd), Off = registeredsymbol(offd) }), } else - local appearance = pdfdictionary { -- maybe also cache components + appearance = pdfdictionary { -- maybe also cache components N = pdfdictionary { [forceyes or yesn] = registeredsymbol(yesn), Off = registeredsymbol(offn) }, R = pdfdictionary { [forceyes or yesr] = registeredsymbol(yesr), Off = registeredsymbol(offr) }, D = pdfdictionary { [forceyes or yesd] = registeredsymbol(yesd), Off = registeredsymbol(offd) } @@ -883,7 +884,7 @@ end local function makecheckparent(field,specification) local d = pdfdictionary { - T = pdfunicode(specification.title), + T = pdfunicode(specification.title), -- todo: when tracing use a string F = fieldplus(specification), Ff = fieldflag(specification), OC = fieldlayer(specification), diff --git a/tex/context/base/node-mig.lua b/tex/context/base/node-mig.lua index 620cb3c0e..8f1e3d71c 100644 --- a/tex/context/base/node-mig.lua +++ b/tex/context/base/node-mig.lua @@ -38,7 +38,7 @@ local function locate(head,first,last,ni,nm) local id = current.id if id == vlist_code or id == hlist_code then current.list, first, last, ni, nm = locate(current.list,first,last,ni,nm) - current= current.next + current = current.next elseif migrate_inserts and id == insert_code then local insert head, current, insert = remove_nodes(head,current) @@ -69,6 +69,7 @@ end function nodes.handlers.migrate(head,where) local done = false if head then +--~ report_nodes("migration sweep '%s'",where) local current = head while current do local id = current.id @@ -87,7 +88,7 @@ function nodes.handlers.migrate(head,where) if first then t_inserts, t_marks = t_inserts + ni, t_marks + nm if trace_migrations and (ni > 0 or nm > 0) then - report_nodes("sweep %s, %s inserts and %s marks migrated outwards",t_sweeps,ni,nm) + report_nodes("sweep %s, %s inserts and %s marks migrated outwards during '%s'",t_sweeps,ni,nm,where) end -- inserts after head local n = current.next diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/page-mul.mkiv index eddd52168..6589e63bb 100644 --- a/tex/context/base/page-mul.mkiv +++ b/tex/context/base/page-mul.mkiv @@ -1760,4 +1760,10 @@ \rigidcolumnbalance\scratchbox \egroup} +\unexpanded\def\setsimplecolumnshsize[#1]% + {\getparameters[\??kl][\c!width=\hsize,\c!distance=1.5\bodyfontsize,\c!n=2,\c!lines=0,#1]% + \let\rigidcolumnlines\@@kllines + \setrigidcolumnhsize\@@klwidth\@@kldistance\@@kln} + + \protect \endinput diff --git a/tex/context/base/phys-dim.lua b/tex/context/base/phys-dim.lua index 9fb2d031f..534e9a45a 100644 --- a/tex/context/base/phys-dim.lua +++ b/tex/context/base/phys-dim.lua @@ -201,6 +201,9 @@ local long_suffixes = { ICubic = [[-3]], } +long_prefixes.Micro = [[\textmu]] +long_units .Ohm = [[\textohm]] + mergetable(long_prefixes, loweredkeys(long_prefixes)) mergetable(long_units, loweredkeys(long_units)) mergetable(long_operators, loweredkeys(long_operators)) diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index ce585574e..f4fb8b1f2 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index c2b9d6b65..e104b3f48 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/strc-not.mkiv b/tex/context/base/strc-not.mkiv index f75ed118c..8099e7942 100644 --- a/tex/context/base/strc-not.mkiv +++ b/tex/context/base/strc-not.mkiv @@ -352,7 +352,7 @@ \to \everysetupnote \appendtoks - \processaction % todo + \processaction % todo (why doesnt it work for a global setting) [\noteparameter\c!split] [ \v!tolerant=>\notepenalty\zeropoint, \v!strict=>\notepenalty9999, @@ -727,21 +727,27 @@ \def\currentnotedescriptiontext % todo: can be other number {\ctxlua{structures.notes.title("\currentnote",\currentdescriptionnumberentry)}} -\def\@@donotetext % same as \@@doenumerationtext - {\ifcase\enumerationnumberstate - \doenumerationfullnumbernop - \or - \iftrialtypesetting - \doenumerationfullnumberyes - \doenumerationcouplingsymbol - \else - \doenumerationregistercoupling - \doenumerationfullnumberyes - \doenumerationcouplingsymbol - \fi - \or - \doenumerationfullnumbersymbol - \fi} +% \def\@@donotetext % same as \@@doenumerationtext +% {\ifcase\enumerationnumberstate +% \doenumerationfullnumbernop +% \or +% \iftrialtypesetting +% \doenumerationfullnumberyes +% \doenumerationcouplingsymbol +% \else +% \doenumerationregistercoupling +% \doenumerationfullnumberyes +% \doenumerationcouplingsymbol +% \fi +% \or +% \doenumerationfullnumbersymbol +% \fi} + +\def\@@donotetext % experiment ... we run into a problem when we migrate a note otherwise in postpone mode + {\doenumerationcheckconditions + \let\doenumerationnumber\docurrentnoteenumerationfullnumber + \let\doenumerationsymbol\docurrentnoteenumerationsymbol + \@@doenumerationtext} \def\@@donotenumber {\doifelse{\noteparameter\c!interaction}\v!no @@ -919,7 +925,7 @@ \def\dobetweenparagraphnotes % should not be too much {\noteparameter\c!inbetween} -\def\doflushgobalnotes +\def\doflushglobalnotes {\doifelse{\noteparameter\c!paragraph}\v!yes {\vbox {\beginofshapebox @@ -943,16 +949,16 @@ \def\doglobalflushnotesnormal {%\iftrialtypesetting\copy\else\box\fi\currentnoteins - \doflushgobalnotes + \doflushglobalnotes \obeydepth} % (a) added , since split footnotes will not align properly \def\doglobalflushnotescolums - {\edef\currentnotewidth{\noteparameter\c!width}% + {\edef\currentnotewidth{\noteparameter\c!width}% brrr, is no linger valid as it's description width \doifdimensionelse\currentnotewidth\donothing {\edef\currentnotewidth{\the\hsize}}% \startsimplecolumns[\c!distance=\noteparameter\c!columndistance,\c!n=\noteparameter\c!n,\c!width=\currentnotewidth]% %\iftrialtypesetting\unvcopied\else\unvboxed\fi\currentnoteins % compare with local - \doflushgobalnotes + \doflushglobalnotes \stopsimplecolumns} \def\doplacenoteinserts diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/type-otf.mkiv index 0685ec9ef..f2c9a6436 100644 --- a/tex/context/base/type-otf.mkiv +++ b/tex/context/base/type-otf.mkiv @@ -176,7 +176,7 @@ \definefontsynonym[LMMathRoman12-Bold] [LMMath10-Bold@lmroman10-boldmath] \definefontsynonym[LMMathRoman17-Bold] [LMMath10-Bold@lmroman10-boldmath] - % are these needed? + % overloads lmmath.otf usage % % \definefontsynonym[MathRoman][LMMath10-Regular@lmroman10-math] % \definefontsynonym[MathBold] [LMMath10-Bold@lmroman10-boldmath] diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index b2115c4a6..b9df76636 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 : 06/25/11 11:24:40 +-- merge date : 06/25/11 14:54:00 do -- begin closure to overcome local limits and interference -- cgit v1.2.3