From 2c2eda14a58c11f032a2d916c9aa5c3442fd5db6 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Fri, 1 Apr 2016 13:20:48 +0200 Subject: 2016-04-01 13:04:00 --- tex/context/base/context-version.pdf | Bin 4258 -> 4248 bytes tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 9286 -> 9118 bytes tex/context/base/mkiv/status-lua.pdf | Bin 267495 -> 267492 bytes tex/context/base/mkiv/strc-flt.mkvi | 61 +++++++++++++++++---- tex/context/base/mkiv/strc-lst.lua | 4 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 8 files changed, 56 insertions(+), 15 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index e8a938c9d..4e5d56b7b 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/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 8cfd414d0..c0ff11262 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.03.31 19:47} +\newcontextversion{2016.04.01 13:01} %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 7ffeea63d..b85e16f7b 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.03.31 19:47} +\edef\contextversion{2016.04.01 13:01} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index f0c78c1f1..70ffa14c3 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index e9e7ae6af..5739174e5 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/base/mkiv/strc-flt.mkvi b/tex/context/base/mkiv/strc-flt.mkvi index 3f1261cb4..e83e036fa 100644 --- a/tex/context/base/mkiv/strc-flt.mkvi +++ b/tex/context/base/mkiv/strc-flt.mkvi @@ -269,21 +269,25 @@ \namedtaggedlabeltexts \t!floatlabel \currentfloat \t!floatnumber\currentfloat - {\floatcaptionparameter\c!numbercommand + {\begstrut + \floatcaptionparameter\c!numbercommand {\clf_savedlistprefixednumber{\currentfloat}\currentfloatnumber\relax - \thecurrentfloatnumbersuffix}}% + \thecurrentfloatnumbersuffix}% + \endstrut}% \fi \fi \fi} \unexpanded\def\thecurrentfloatcaption - {\ifnofloatcaption \else + {\ifnofloatcaption \else \ifemptyfloatcaption \else \ifx\currentfloatnumber\relax\else \dostarttagged\t!floattext\empty + \begstrut \floatcaptionparameter\c!textcommand - {\clf_savedlisttitle{\currentfloat}\currentfloatnumber\relax}% + {\clf_savedlisttitle{\currentfloat}\numexpr\currentfloatnumber\relax}% + \endstrut \dostoptagged \fi - \fi} + \fi \fi} %D Captions. @@ -327,9 +331,12 @@ \gdef\lastcaptiontag{\strut\thecurrentfloatnumber}% was xdef ... needs checking \begingroup \usefloatcaptionstyleandcolor\c!style\c!color + \clf_doifelselisthastitle{\currentfloat}\numexpr\currentfloatnumber\relax + \donothing + \emptyfloatcaptiontrue \ifnofloatnumber \else - \hbox{\usefloatcaptionstyleandcolor\c!headstyle\c!headcolor\strut\thecurrentfloatnumber}% + \hbox{\usefloatcaptionstyleandcolor\c!headstyle\c!headcolor\thecurrentfloatnumber}% \ifnofloatcaption \else \ifemptyfloatcaption \else \doifelsenothing{\floatcaptionparameter\c!spaceinbetween} {\scratchskip\floatcaptionparameter\c!distance\relax @@ -344,7 +351,7 @@ \usefloatcaptionstyleandcolor\c!textstyle\c!textcolor \global\d_strc_floats_caption_height\strutheight \global\d_strc_floats_caption_depth \strutdepth - \begstrut\thecurrentfloatcaption\endstrut\endgraf + \thecurrentfloatcaption\endgraf \fi \endgroup \doifsomething{\floatcaptionparameter\c!spaceafter}{\blank[\floatcaptionparameter\c!spaceafter]}} @@ -522,12 +529,22 @@ \strc_floats_set_current_tag{#tag}% \dodoubleempty\strc_floats_place_indeed} +\newtoks\c_floats_every_table_float + +\appendtoks + \edef\floatlocation{\v!force,\v!always,\floatlocation}% + \setupfloat[\c!spacebefore=\v!none,\c!spaceafter=\v!none]% +\to \c_floats_every_table_float + \def\strc_floats_place_indeed[#location][#reference]#caption% {\strc_floats_reset_variables \edef\floatlocation{#location}% \ifx\floatlocation\empty \edef\floatlocation{\floatparameter\c!default}% beware of a clash between alignment locations \fi + \ifintable + \the\c_floats_every_table_float + \fi \strc_floats_analyze_location % todo: use \lets \setupcurrentfloatcaption[\c!reference={#reference},\c!title={#caption},\c!marking=,\c!list=,\c!bookmark=]% @@ -867,9 +884,11 @@ \ifnofloatnumber \else \ifnofloatcaption \else \ifx\currentfloatgroup\empty % independent + \iftrialtypesetting\strc_counters_save\currentfloatcounter\fi \strc_counters_increment\currentfloatcounter \else\ifcase\strc_floats_group_index % first in group + \iftrialtypesetting\strc_counters_save\currentfloatcounter\fi \strc_counters_increment\currentfloatcounter \else % next in group @@ -915,6 +934,7 @@ \ifnofloatcaption \vss \fi}% gets rid of the depth (unless tabulate) + \iftrialtypesetting\strc_counters_restore\currentfloatcounter\fi \egroup % place the float \strc_floats_set_box @@ -1162,23 +1182,44 @@ \unexpanded\def\betweenfloatblanko % assumes that spaceafter is present {\blank[\rootfloatparameter\c!spacebefore]} % or v!back,.... +% keep as old 1 +% +% \unexpanded\def\doplacefloatbox % used elsewhere +% {%\forgetall % NO +% \whitespace +% \blank[\rootfloatparameter\c!spacebefore] +% \page_otr_command_flush_float_box +% \blank[\rootfloatparameter\c!spaceafter]} +% +% keep as old 2 +% % \unexpanded\def\doplacefloatbox % used elsewhere % {%\forgetall % NO % \whitespace % \blank[\rootfloatparameter\c!spacebefore] +% \nointerlineskip +% \flushnotes % new per 2014-05-29 : todo: move them up in the mvl +% \nointerlineskip % \page_otr_command_flush_float_box +% \nointerlineskip % \blank[\rootfloatparameter\c!spaceafter]} +\def\strc_floats_apply_skip#1% + {\edef\m_space{\rootfloatparameter#1}% + \ifx\m_space\empty \else\ifx\m_space\v!none \else + \directvspacing\m_space + \fi\fi} + \unexpanded\def\doplacefloatbox % used elsewhere {%\forgetall % NO \whitespace - \blank[\rootfloatparameter\c!spacebefore] + \strc_floats_apply_skip\c!spacebefore \nointerlineskip \flushnotes % new per 2014-05-29 : todo: move them up in the mvl \nointerlineskip \page_otr_command_flush_float_box - \nointerlineskip - \blank[\rootfloatparameter\c!spaceafter]} + % \nointerlineskip % interferes with depth of caption + \strc_floats_apply_skip\c!spaceafter} % test case: % diff --git a/tex/context/base/mkiv/strc-lst.lua b/tex/context/base/mkiv/strc-lst.lua index 37bdf07d6..0f5d8e0d7 100644 --- a/tex/context/base/mkiv/strc-lst.lua +++ b/tex/context/base/mkiv/strc-lst.lua @@ -903,7 +903,7 @@ function lists.hastitledata(name,n,tag) if data then local titledata = data.titledata if titledata then - return (titledata[tag] or titledata.title or "") == "" + return (titledata[tag] or titledata.title or "") ~= "" end end return false @@ -924,7 +924,7 @@ function lists.hasnumberdata(name,n) local data = lists.result[n] if data then local numberdata = data.numberdata - if numberdata and not numberdata.hidenumber then -- th ehide number is true + if numberdata and not numberdata.hidenumber then -- the hide number is true return true end end diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 39ae24d0d..c8cf3f626 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 03/31/16 19:47:51 +-- merge date : 04/01/16 13:01:46 do -- begin closure to overcome local limits and interference -- cgit v1.2.3