From f3d4c3eb9b808f3b7fd0b95b67911ff2527f380a Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 31 Jan 2013 02:00:34 +0200 Subject: beta 2013.01.30 23:53 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4123 -> 4127 bytes tex/context/base/context-version.png | Bin 40148 -> 40206 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/l-file.lua | 3 +- tex/context/base/status-files.pdf | Bin 24756 -> 24734 bytes tex/context/base/status-lua.pdf | Bin 208623 -> 208676 bytes tex/context/base/strc-tag.mkiv | 73 +++++++++++++++++++-- tex/generic/context/luatex/luatex-fonts-merged.lua | 5 +- 11 files changed, 78 insertions(+), 11 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 012c223a1..7dc1dac5e 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{2013.01.27 21:24} +\newcontextversion{2013.01.30 23:53} %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 b0e8ca3f6..a1cef62f0 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{2013.01.27 21:24} +\newcontextversion{2013.01.30 23:53} %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 b694eabe1..c915c2200 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-version.png b/tex/context/base/context-version.png index 3dc8937ea..3dc78cb88 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 4caa6812b..2952b640c 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{2013.01.27 21:24} +\edef\contextversion{2013.01.30 23:53} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index e56e89ca1..140acf364 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.01.27 21:24} +\edef\contextversion{2013.01.30 23:53} %D For those who want to use this: diff --git a/tex/context/base/l-file.lua b/tex/context/base/l-file.lua index e91eeac4c..fcf4d65e3 100644 --- a/tex/context/base/l-file.lua +++ b/tex/context/base/l-file.lua @@ -166,7 +166,8 @@ end -- inspect(file.nametotable("dir/file.ext")) -- inspect(file.nametotable("/dir/file.ext")) -local pattern = Cs(((period * noperiod^1 * -1)/"" + 1)^1) +----- pattern = Cs(((period * noperiod^1 * -1) / "" + 1)^1) +local pattern = Cs(((period * (1-period-slashes)^1 * -1) / "" + 1)^1) function file.removesuffix(name) return name and lpegmatch(pattern,name) diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 757113224..52f361b10 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 0520a2f96..9a4b03e67 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-tag.mkiv b/tex/context/base/strc-tag.mkiv index 6563e884e..88377a600 100644 --- a/tex/context/base/strc-tag.mkiv +++ b/tex/context/base/strc-tag.mkiv @@ -256,13 +256,78 @@ [\c!state=\v!stop, \c!method=\v!auto] +% \unexpanded\def\startparagraph +% {\dostarttagged\t!paragraph\empty} +% +% \unexpanded\def\stopparagraph +% {% \removeunwantedspaces % yes or no +% \dostoptagged +% \par} + +% Cf suggestion by Wolfgang we now have named paragraphs. Watch out, the content +% is grouped but only when we have an instance. +% +% \defineparagraph[red] [color=red] +% \defineparagraph[bold][style=bold] +% +% \startparagraph \input ward \stopparagraph +% \startparagraph[red] \input ward \stopparagraph +% \startparagraph[bold] \input ward \stopparagraph + +\installcorenamespace {paragraph} +\installcommandhandler \??paragraph {paragraph} \??paragraph + +\setupparagraph % someday maybe also strut (beg/end) and align + [\c!color=, + \c!style=] + \unexpanded\def\startparagraph - {\dostarttagged\t!paragraph\empty} + {\dodoubleempty\paragraph_start} + +\def\paragraph_start + {\iffirstargument + \ifsecondargument + \doubleexpandafter\paragraph_start_two + \else + \doubleexpandafter\paragraph_start_one + \fi + \else + \expandafter\paragraph_start_zero + \fi} + +\def\paragraph_start_two[#1][#2]% + {\endgraf % we end before the group + \begingroup + \let\stopparagraph\paragraph_stop_indeed + \edef\currentparagraph{#1}% + \setupcurrentparagraph[#2]% + \paragraph_start_indeed} + +\def\paragraph_start_one[#1][#2]% + {\endgraf % we end before the group + \begingroup + \let\stopparagraph\paragraph_stop_indeed + \doifassignmentelse{#1} + {\let\currentparagraph\empty + \setupcurrentparagraph[#1]} + {\edef\currentparagraph{#1}}% + \paragraph_start_indeed} + +\def\paragraph_start_indeed + {\useparagraphstyleandcolor\c!style\c!color + \dostarttagged\t!paragraph\currentparagraph} + +\def\paragraph_start_zero[#1][#2]% + {\let\currentparagraph\empty + \paragraph_start_indeed} + +\unexpanded\def\paragraph_stop_indeed + {\dostoptagged + \endgraf % we end inside the group + \endgroup} \unexpanded\def\stopparagraph - {% \removeunwantedspaces % yes or no - \dostoptagged - \par} + {\dostoptagged} \let\startpar\startparagraph \let\stoppar \stopparagraph diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index b73c7da6a..ba0d0d4ef 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 : 01/27/13 21:24:19 +-- merge date : 01/30/13 23:53:42 do -- begin closure to overcome local limits and interference @@ -2375,7 +2375,8 @@ end -- inspect(file.nametotable("dir/file.ext")) -- inspect(file.nametotable("/dir/file.ext")) -local pattern = Cs(((period * noperiod^1 * -1)/"" + 1)^1) +----- pattern = Cs(((period * noperiod^1 * -1) / "" + 1)^1) +local pattern = Cs(((period * (1-period-slashes)^1 * -1) / "" + 1)^1) function file.removesuffix(name) return name and lpegmatch(pattern,name) -- cgit v1.2.3