From ee0c98aae1cb839800f88eb439b5b36db24bc036 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 31 Jan 2011 22:04:00 +0100 Subject: beta 2011.01.31 22:04 --- 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/core-con.mkiv | 44 +++++++++++++--------------- tex/context/base/data-res.lua | 18 ++++++------ tex/context/base/status-files.pdf | Bin 23824 -> 23920 bytes tex/generic/context/luatex-fonts-merged.lua | 2 +- 8 files changed, 35 insertions(+), 37 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 557f5abf7..66f85572f 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.01.31 21:17} +\newcontextversion{2011.01.31 22:04} %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 280cbaea0..a14c47ccd 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.01.31 21:17} +\newcontextversion{2011.01.31 22:04} %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 4c279ada9..7bde466f4 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.01.31 21:17} +\edef\contextversion{2011.01.31 22:04} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 55e9bf48c..fda6d071e 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.01.31 21:17} +\edef\contextversion{2011.01.31 22:04} %D For those who want to use this: diff --git a/tex/context/base/core-con.mkiv b/tex/context/base/core-con.mkiv index 67c378b6d..9af435c26 100644 --- a/tex/context/base/core-con.mkiv +++ b/tex/context/base/core-con.mkiv @@ -412,7 +412,7 @@ %D \getbuffer %D \stoplines -\def\kenmerkdatumpatroon{j,mm,dd} % jj,mm,dd changed at januari 1-1-2000 +\def\referraldatepattern{j,mm,dd} % jj,mm,dd changed at januari 1-1-2000 \newsignal\datesignal @@ -422,27 +422,19 @@ \hskip\datesignal\relax \fi} -\newtoks \everycurrentdate +\def\dodobetweendates + {\let\betweendates\dobetweendates}% -\def\complexcurrentdate[#1]% - {\bgroup - \the\everycurrentdate - \def\betweendates{\let\betweendates\dobetweendates}% - \processcommacommand[\ascii]\docomplexcurrentdate - \ifdim\lastskip=\datesignal\relax - \unskip - \fi - \egroup} +\newtoks \everycurrentdate \def\docomplexcurrentdate#1% - {\lowercase{\edef\!!stringa{#1}}% permits usage in \smallcapped - \expanded{\processaction[\!!stringa]}% [#1] + {\normalexpanded{\noexpand\processallactionsinset[#1]} [ \v!day=>\betweendates\the\normalday, \v!day+=>\betweendates\convertnumber{\v!day+}\normalday, \v!month=>\betweendates\month\normalmonth, \v!year=>\betweendates\the\normalyear, - \v!space=>\unskip\ \hskip\datesignal,% optimization -) - \ =>\unskip\ \hskip\datesignal,% optimization -) + \v!space=>\unskip\ \hskip\datesignal, + \ =>\unskip\ \hskip\datesignal, d=>\convertnumber\v!day\normalday, d+=>\convertnumber{\v!day+}\normalday, m=>\convertnumber\v!month\normalmonth, @@ -455,16 +447,22 @@ jj=>\expandafter\gobbletwoarguments\the\normalyear, yy=>\expandafter\gobbletwoarguments\the\normalyear, \v!weekday=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear, - \v!referral=>\expanded{\complexcurrentdate[\kenmerkdatumpatroon]}, - \s!unknown=>\unskip - % #1 and not the lowercased \commalistelement, vietnamese has text - % {} because #1 can have comma, like: {\ ,} - {#1}% - \hskip\datesignal - \def\betweendates{\let\betweendates\dobetweendates}]} + \v!referral=>\docomplexcurrentdate\referraldatepattern, + \s!default=>, + \s!unknown=>\unskip\commalistelement\hskip\datesignal\let\betweendates\dodobetweendates]} + +\def\complexcurrentdate[#1]% + {\bgroup + \the\everycurrentdate + \let\betweendates\dodobetweendates + \docomplexcurrentdate{#1}% + \ifdim\lastskip=\datesignal\relax + \unskip + \fi + \egroup} \def\simplecurrentdate - {\expanded{\complexcurrentdate[\currentdatespecification]}} + {\complexcurrentdate[\currentdatespecification]} \definecomplexorsimple\currentdate diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua index 0ed5c17e4..4231997ab 100644 --- a/tex/context/base/data-res.lua +++ b/tex/context/base/data-res.lua @@ -51,15 +51,15 @@ resolvers.luacnfname = 'texmfcnf.lua' resolvers.luacnfstate = "unknown" -- resolvers.luacnfspec = '{$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}' -- what a rubish path --- resolvers.luacnfspec = 'selfautoparent:{/texmf{-local,}{,/web2c},}}' - -resolvers.luacnfspec = { - "selfautoparent:/texmf-local", - "selfautoparent:/texmf-local/web2c", - "selfautoparent:/texmf", - "selfautoparent:/texmf/web2c", - "selfautoparent:", -} +resolvers.luacnfspec = 'selfautoparent:{/texmf{-local,}{,/web2c},}}' + +--~ resolvers.luacnfspec = { +--~ "selfautoparent:/texmf-local", +--~ "selfautoparent:/texmf-local/web2c", +--~ "selfautoparent:/texmf", +--~ "selfautoparent:/texmf/web2c", +--~ "selfautoparent:", +--~ } local unset_variable = "unset" diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 4cf22e78e..714c4a10c 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index b37d10f76..4abca9d6f 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 01/31/11 21:17:09 +-- merge date : 01/31/11 22:04:14 do -- begin closure to overcome local limits and interference -- cgit v1.2.3