From 4c30ec7a1d7f8a2ba19eb9a918723ca4369a8b7f Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Tue, 25 Dec 2012 15:14:00 +0100 Subject: beta 2012.12.25 15:14 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4112 -> 4114 bytes tex/context/base/context-version.png | Bin 40425 -> 40509 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/meta-imp-txt.mkiv | 30 ++++++++++--------- tex/context/base/mult-sys.mkiv | 2 ++ tex/context/base/status-files.pdf | Bin 24410 -> 24417 bytes tex/context/base/status-lua.pdf | Bin 203150 -> 203077 bytes tex/context/base/syst-con.lua | 32 +++++++++++---------- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 40 insertions(+), 34 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index e5cdd0410..68730a17e 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{2012.12.24 20:08} +\newcontextversion{2012.12.25 15:14} %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 4e62d04f2..95bd37a2e 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{2012.12.24 20:08} +\newcontextversion{2012.12.25 15:14} %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 4feb1ffe5..988b0384d 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 882ca4262..b588b612d 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 d1b87a40f..f297d8c1e 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{2012.12.24 20:08} +\edef\contextversion{2012.12.25 15:14} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 56e4b0dc1..6604732fd 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{2012.12.24 20:08} +\edef\contextversion{2012.12.25 15:14} %D For those who want to use this: diff --git a/tex/context/base/meta-imp-txt.mkiv b/tex/context/base/meta-imp-txt.mkiv index 08373c0c4..3a9ad5927 100644 --- a/tex/context/base/meta-imp-txt.mkiv +++ b/tex/context/base/meta-imp-txt.mkiv @@ -28,6 +28,8 @@ \unprotect +\definesystemvariable {sh} % ShapedText .. todo: commandhandler + \startMPextensions if unknown context_text: input "mp-text.mpiv" ; fi; \stopMPextensions @@ -36,8 +38,8 @@ % \def\newchar#1{\chardef#1=0 } -\ifdefined\MPtoks \else \newtoks\MPtoks \fi -\ifdefined\MPbox \else \newbox \MPbox \fi +\ifdefined\MPtoks \else \newtoks\MPtoks \fi +\ifdefined\MPbox \else \newbox \MPbox \fi \ifdefined\parwidth \else \newdimen\parwidth \fi \ifdefined\parheight \else \newdimen\parheight \fi @@ -49,7 +51,7 @@ \newif \ifparseries \ifdefined\parfirst \else \chardef \parfirst=0 \fi -\def\startshapetext[#1]% +\unexpanded\def\startshapetext[#1]% {\global\newcounter\currentshapetext \global\setbox\shapetextbox\vbox\bgroup \expanded{\switchtobodyfont[\@@shbodyfont]}% @@ -76,14 +78,14 @@ \ifparseries\def\par{\endgraf\adaptparshape}\fi \EveryPar{\begstrut}} -\def\stopshapetext +\unexpanded\def\stopshapetext {\endstrut %\removebottomthings \egroup \global\newcounter\currentshapetext \getshapecharacteristics} -\def\adaptparshape% +\unexpanded\def\adaptparshape {\def\docommand##1% {\ifcase\!!counta \expandafter\appendtoks\space##1 \to\!!toksa @@ -100,7 +102,7 @@ \expanded{\parshape\totalparlines\the\partoks}% }%\fi} -\def\getshapecharacteristics% +\unexpanded\def\getshapecharacteristics {\doglobal\increment\currentshapetext \doifdefinedelse{parlines:\currentshapetext} {\global\parlines \getvalue{parlines:\currentshapetext}% @@ -116,7 +118,7 @@ \global\parwidth \hsize \global\parheight \vsize}} -\def\setshapecharacteristics% +\unexpanded\def\setshapecharacteristics {\doglobal\increment\currentshapetext \setxvalue{parlines:\currentshapetext }{\the\parlines}% \setxvalue{parfirst:\currentshapetext }{\the\parfirst}% @@ -125,7 +127,7 @@ \setxvalue{parwidth:\currentshapetext }{\the\parwidth}% \setxvalue{parheight:\currentshapetext }{\the\parheight}} -\def\getshapetext% option: unvbox +\unexpanded\def\getshapetext % option: unvbox {\vbox\bgroup \forgetall \setbox\scratchbox\vbox to \parheight @@ -142,17 +144,17 @@ \getshapecharacteristics \egroup} -\def\setupshapetexts% +\unexpanded\def\setupshapetexts {\dodoubleempty\getparameters[\??sh]} -\setupshapetexts% +\setupshapetexts [\c!bodyfont=] %%%%%%% rotfont nog definieren \doifundefined{RotFont}{\definefont[RotFont][RegularBold]} -\def\processfollowingtoken#1% strut toegevoegd +\unexpanded\def\processfollowingtoken#1% strut toegevoegd {\appendtoks#1\to\MPtoks \setbox\MPbox=\hbox{\RotFont\setstrut\strut\the\MPtoks}% \startMPdrawing @@ -168,7 +170,7 @@ % we default to nothing \stopuseMPgraphic -\def\followtokens#1% +\unexpanded\def\followtokens#1% {\vbox\bgroup \forgetall \dontcomplain @@ -280,7 +282,7 @@ fill z1..z2..z3 & z3..z4..z1 & cycle withcolor \MPvar{color} ; \stopuniqueMPgraphic -\def\EnglishRule% +\unexpanded\def\EnglishRule {\startlinecorrection[EnglishRule] \setlocalhsize \noindent \reuseMPgraphic{EnglishRule} \stoplinecorrection} @@ -294,7 +296,7 @@ %D \TightText{\ss\bf 123}{0cm}{3cm}{red} %D \stoplinecorrection -\def\TightText#1#2#3#4% +\unexpanded\def\TightText#1#2#3#4% {\hbox % \ruledhbox {\startMPcode picture p ; p := image (graphictext "#1" withfillcolor red) ; diff --git a/tex/context/base/mult-sys.mkiv b/tex/context/base/mult-sys.mkiv index be653f643..b487ceaba 100644 --- a/tex/context/base/mult-sys.mkiv +++ b/tex/context/base/mult-sys.mkiv @@ -478,6 +478,8 @@ \definesystemvariable {fo} % xml FO (xtag) \definesystemvariable {fx} % FoXet +% mkiv + %D Next we define some language independant one letter variables and keywords. We can %D actually make these system variables. diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 53465a6bc..43c9014a6 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 55b0cb780..588c718a3 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/syst-con.lua b/tex/context/base/syst-con.lua index 3a9b966ca..48f02da3a 100644 --- a/tex/context/base/syst-con.lua +++ b/tex/context/base/syst-con.lua @@ -43,18 +43,20 @@ end local cosd, sind, tand = math.cosd, math.sind, math.tand local cos, sin, tan = math.cos, math.sin, math.tan --- function commands.sind(n) context("%0.6f",sind(n)) end --- function commands.cosd(n) context("%0.6f",cosd(n)) end --- function commands.tand(n) context("%0.6f",tand(n)) end - --- function commands.sin (n) context("%0.6f",sin (n)) end --- function commands.cos (n) context("%0.6f",cos (n)) end --- function commands.tan (n) context("%0.6f",tan (n)) end - -function commands.sind(n) context(sind(n)) end -function commands.cosd(n) context(cosd(n)) end -function commands.tand(n) context(tand(n)) end - -function commands.sin (n) context(sin (n)) end -function commands.cos (n) context(cos (n)) end -function commands.tan (n) context(tan (n)) end +-- unfortunately %s spits out: 6.1230317691119e-017 +-- +-- function commands.sind(n) context(sind(n)) end +-- function commands.cosd(n) context(cosd(n)) end +-- function commands.tand(n) context(tand(n)) end +-- +-- function commands.sin (n) context(sin (n)) end +-- function commands.cos (n) context(cos (n)) end +-- function commands.tan (n) context(tan (n)) end + +function commands.sind(n) context("%0.6f",sind(n)) end +function commands.cosd(n) context("%0.6f",cosd(n)) end +function commands.tand(n) context("%0.6f",tand(n)) end + +function commands.sin (n) context("%0.6f",sin (n)) end +function commands.cos (n) context("%0.6f",cos (n)) end +function commands.tan (n) context("%0.6f",tan (n)) end diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 2b1f94b14..f302df378 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 : 12/24/12 20:08:31 +-- merge date : 12/25/12 15:14:15 do -- begin closure to overcome local limits and interference -- cgit v1.2.3