From f025339d0770904176dd9b32a405b23f809772ae Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Sat, 26 Mar 2016 14:38:26 +0100 Subject: 2016-03-26 13:53:00 --- tex/context/base/context-version.pdf | Bin 4157 -> 4162 bytes tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 8977 -> 8978 bytes tex/context/base/mkiv/status-lua.pdf | Bin 266913 -> 266912 bytes tex/context/base/mkiv/strc-not.mkvi | 38 +++++++++++++++++---- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index e00a93a64..ad9e2f68e 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 33e820ee3..8135b5c92 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.26 13:05} +\newcontextversion{2016.03.26 13:51} %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 52c346f62..0920795ee 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.26 13:05} +\edef\contextversion{2016.03.26 13:51} \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 941bdeb48..c6983c64a 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 a70cf80b6..ae503f08a 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-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi index 20bff7683..edbbf92b3 100644 --- a/tex/context/base/mkiv/strc-not.mkvi +++ b/tex/context/base/mkiv/strc-not.mkvi @@ -225,11 +225,32 @@ \unexpanded\def\strc_notations_reset{\strc_constructions_reset_indeed\namednotationparameter} % #1#2 %unexpanded\def\strc_notations_set {\strc_constructions_set_indeed \namednotationparameter} % #1#2 +\newconditional\c_strc_notations_anchored_next + +\def\strc_notations_finalize + {\ifconditional\c_strc_notations_anchored_next + \expandafter\strc_notations_finalize_next + \else + \expandafter\strc_notations_finalize_previous + \fi} + +\def\strc_notations_finalize_previous + {\normalexpanded{\endgroup\noteparameter\c!next}} + +\def\strc_notations_finalize_next + {\endgroup\ignorespaces} + \unexpanded\def\strc_notations_command#tag% {\begingroup \edef\currentnote{#tag}% \strc_constructions_initialize{#tag}% \strc_notes_synchronize + \edef\p_next{\noteparameter\c!anchor}% + \ifx\p_next\v!next % for now only two states + \settrue \c_strc_notations_anchored_next + \else + \setfalse\c_strc_notations_anchored_next + \fi \ifnotesenabled \strc_counters_increment_sub\currentconstructionnumber\currentconstructionlevel \fi @@ -239,7 +260,7 @@ {\strc_constructions_register[][\c!label={\descriptionparameter\c!text},\c!reference=,\c!title={#title},\c!bookmark=,\c!list=]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname \strc_constructions_finalize - \normalexpanded{\endgroup\noteparameter\c!next}} + \strc_notations_finalize} \unexpanded\def\strc_notations_command_yes[#optional]% {\doifelseassignment{#optional}\strc_notations_command_assignment\strc_notations_command_argument[#optional]} @@ -248,13 +269,13 @@ {\strc_constructions_register[][\c!label={\descriptionparameter\c!text},\c!reference=,\c!title=,\c!bookmark=,\c!list=,#settings]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname \strc_constructions_finalize - \normalexpanded{\endgroup\noteparameter\c!next}} + \strc_notations_finalize} \unexpanded\def\strc_notations_command_argument[#reference]#title% {\strc_constructions_register[][\c!label={\descriptionparameter\c!text},\c!reference={#reference},\c!title={#title},\c!bookmark=,\c!list=]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname \strc_constructions_finalize - \normalexpanded{\endgroup\noteparameter\c!next}} + \strc_notations_finalize} \unexpanded\def\strc_notations_start#tag#stoptag% {\begingroup @@ -273,13 +294,13 @@ {\strc_constructions_register[][\c!label={\descriptionparameter\c!text},\c!reference={#reference},\c!title={#title},\c!bookmark=,\c!list=]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname \strc_constructions_finalize - \normalexpanded{\endgroup\noteparameter\c!next}} + \strc_notations_finalize} \unexpanded\def\strc_notations_start_nop#title% {\strc_constructions_register[][\c!label={\descriptionparameter\c!text},\c!reference=,\c!title={#title},\c!bookmark=,\c!list=]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname \strc_constructions_finalize - \normalexpanded{\endgroup\noteparameter\c!next}} + \strc_notations_finalize} \unexpanded\def\strc_notations_stop {} @@ -326,6 +347,7 @@ \c!rule=\v!on, \c!before=\blank, \c!bodyfont=\v!small, + \c!anchor=, % can also be v!next %\c!style=, %\c!color=, %\c!after=, @@ -685,8 +707,10 @@ % \hpack to \zeropoint{\box\scratchbox\hss}}} \unexpanded\def\strc_notes_inject_symbol_indeed#synchronize% - {\removeunwantedspaces - \doifelseitalic\/\donothing % Charles IV \footnote{the fourth} + {\ifconditional\c_strc_notations_anchored_next\else + \removeunwantedspaces + \doifelseitalic\/\donothing % Charles IV \footnote{the fourth} + \fi \ifdim\lastkern=\notesignal % \kern\noteparameter\c!distance % yes or no note font? or main text \strc_notes_inject_separator diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 3f7f78c93..cd7a88469 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/26/16 13:05:11 +-- merge date : 03/26/16 13:51:14 do -- begin closure to overcome local limits and interference -- cgit v1.2.3