From 66db77c6c85c275101199dac3fead77cf6ef4315 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Tue, 11 Aug 2015 18:15:04 +0200 Subject: 2015-08-11 17:32:00 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4202 -> 4209 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/pack-rul.lua | 3 ++- tex/context/base/page-lin.lua | 13 +++++++++---- tex/context/base/page-lin.mkvi | 21 --------------------- tex/context/base/page-mix.mkiv | 3 ++- tex/context/base/page-mul.mkiv | 8 ++++---- tex/context/base/status-files.pdf | Bin 24443 -> 24453 bytes tex/context/base/status-lua.pdf | Bin 255541 -> 255546 bytes tex/context/base/typo-mar.lua | 3 +-- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 21 insertions(+), 36 deletions(-) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 7dcd2c989..9e4040348 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{2015.08.11 10:10} +\newcontextversion{2015.08.11 17:29} %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 c842ed576..ba019303e 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index e9a8ee7cb..2ed90c88c 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2015.08.11 10:10} +\edef\contextversion{2015.08.11 17:29} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/pack-rul.lua b/tex/context/base/pack-rul.lua index a8c5de321..f1e91a4ae 100644 --- a/tex/context/base/pack-rul.lua +++ b/tex/context/base/pack-rul.lua @@ -73,7 +73,8 @@ local function doreshapeframedbox(n) if repack then local subtype = getsubtype(n) if subtype == box_code or subtype == line_code then - lastlinelength = node_dimensions(l,getfield(n,"dir")) -- used to be: hpack(copy(l)).width + -- used to be: hpack(copy(l)).width + lastlinelength = node_dimensions(l,getfield(n,"dir")) else lastlinelength = getfield(n,"width") end diff --git a/tex/context/base/page-lin.lua b/tex/context/base/page-lin.lua index d129e6694..d2476b2da 100644 --- a/tex/context/base/page-lin.lua +++ b/tex/context/base/page-lin.lua @@ -67,6 +67,7 @@ local getid = nuts.getid local getsubtype = nuts.getsubtype local getnext = nuts.getnext local getattr = nuts.getattr +local setattr = nuts.setattr local getlist = nuts.getlist local getbox = nuts.getbox local getfield = nuts.getfield @@ -291,16 +292,19 @@ function boxed.stage_one(n,nested) else local list = getlist(n) local a = getattr(list,a_linenumber) +-- if a and a < 0 then +-- break +-- end if not a or a == 0 then local n = getnext(list) while n do local id = getid(n) - if id == whatsit_code and getsubtype(n) == textdir_code then + if id == glyph_code then + break + elseif id == whatsit_code and getsubtype(n) == textdir_code then n = getnext(n) - elseif id == glue_code and getsubtype(n) == leftskip_code then + elseif id == glue_code and getsubtype(n) == leftskip_code then -- first in list n = getnext(n) - elseif id == glyph_code then - break else -- can be hlist or skip (e.g. footnote line) n = getnext(n) @@ -337,6 +341,7 @@ function boxed.stage_one(n,nested) end skip = false end +-- setattr(list,a_linenumber,-1) end end end diff --git a/tex/context/base/page-lin.mkvi b/tex/context/base/page-lin.mkvi index 07d088eff..4b87b335a 100644 --- a/tex/context/base/page-lin.mkvi +++ b/tex/context/base/page-lin.mkvi @@ -300,27 +300,6 @@ \ifx\p_align\v!left \let\p_align\v!right \else \ifx\p_align\v!right \let\p_align\v!left \fi\fi\fi\fi\fi\fi} -\def\page_lines_add_numbers_to_box#box#column#max#nesting% - {\bgroup - \b_page_lines_number #box\relax - \c_page_lines_column #column\relax - \c_page_lines_last_column#max\relax - \c_page_lines_nesting #nesting\relax - \fullrestoreglobalbodyfont - \let\makelinenumber\page_lines_make_number % used at lua end - \setbox\b_page_lines_scratch\vbox - {\forgetall - \offinterlineskip - \clf_linenumbersstageone - \b_page_lines_number - \ifcase\c_page_lines_nesting false\else true\fi - \relax}% - \clf_linenumbersstagetwo - \b_page_lines_number - \b_page_lines_scratch - \fi - \egroup} - \let\page_lines_make_number_indeed\relax % \def\page_lines_rlap{\ifconditional\c_page_lines_dir_left_to_right\expandafter\rlap\else\expandafter\llap\fi} diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv index 6d7f144a6..7d9f4935c 100644 --- a/tex/context/base/page-mix.mkiv +++ b/tex/context/base/page-mix.mkiv @@ -595,6 +595,7 @@ \def\page_mix_routine_package_step {% needs packaging anyway \setbox\scratchbox\page_mix_command_package_column +\page_lines_add_numbers_to_box\scratchbox\recurselevel\c_page_mix_n_of_columns\plusone % new \page_marks_synchronize_column\plusone\c_page_mix_n_of_columns\recurselevel\scratchbox % backgrounds \anch_mark_column_box\scratchbox @@ -617,7 +618,7 @@ {\clf_mixfinalize \setbox\b_page_mix_collected\vbox \bgroup \ifvoid\b_page_mix_preceding \else - \page_postprocessors_linenumbers_deepbox\b_page_mix_preceding + % \page_postprocessors_linenumbers_deepbox\b_page_mix_preceding % already done \vbox\bgroup \box\b_page_mix_preceding \egroup diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/page-mul.mkiv index 8db5a4773..631232368 100644 --- a/tex/context/base/page-mul.mkiv +++ b/tex/context/base/page-mul.mkiv @@ -452,6 +452,9 @@ \box\columnpagebox \egroup} +\def\page_mul_synchronize_marks + {\dohandleallcolumns{\page_marks_synchronize_column\plusone\nofcolumns\mofcolumns\currentcolumnbox}} + \def\page_mul_flush_packaged_columns_indeed {\ifvoid\b_page_mul_preceding \setfalse\c_page_mul_preceding_present % will be set elsewhere @@ -463,10 +466,7 @@ \page_mul_initialize_variables \page_mul_calculate_column_result_dimensions \page_mul_postprocess_linenumbers - \dohandleallcolumns - {\page_postprocessors_column\currentcolumnbox}% - \dohandleallcolumns - {\page_marks_synchronize_column\plusone\nofcolumns\mofcolumns\currentcolumnbox}% + \page_mul_synchronize_marks \page_mul_postprocess_lines \page_mul_postprocess_columns \dohandleallcolumns diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index a16202a94..d00f7e0c0 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 f3659e01c..cce7cb7b7 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/typo-mar.lua b/tex/context/base/typo-mar.lua index fad37b99e..5829174b3 100644 --- a/tex/context/base/typo-mar.lua +++ b/tex/context/base/typo-mar.lua @@ -181,6 +181,7 @@ local registertogether = builders.paragraphs.registertogether -- tonode local a_margindata = attributes.private("margindata") local a_specialcontent = attributes.private("specialcontent") +local a_linenumber = attributes.private('linenumber') local inline_mark = nodepool.userids["margins.inline"] @@ -747,8 +748,6 @@ local function flushinline(parent,head) return head, done, continue end -local a_linenumber = attributes.private('linenumber') - local function flushed(scope,parent) -- current is hlist local head = getlist(parent) local done = false diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f237a1ba9..f35530a3d 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 : 08/11/15 10:10:14 +-- merge date : 08/11/15 17:29:57 do -- begin closure to overcome local limits and interference -- cgit v1.2.3