diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/back-pdf.lua | 4 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4093 -> 4103 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/lpdf-nod.lua | 16 | ||||
| -rw-r--r-- | tex/context/base/s-inf-03.pdf | bin | 1988 -> 1978 bytes | |||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24697 -> 24708 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.log | 2 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
9 files changed, 21 insertions, 7 deletions
diff --git a/tex/context/base/back-pdf.lua b/tex/context/base/back-pdf.lua index f810151a8..dc6f6b06f 100644 --- a/tex/context/base/back-pdf.lua +++ b/tex/context/base/back-pdf.lua @@ -41,8 +41,8 @@ function commands.pdfstartrotation(a) insert(stack,false) else local s, c = sind(a), cosd(a) - context(pdfsetmatrix(f_rotation(c,s,-s,c))) - insert(stack,{ -c, -s, s, -c }) + context(pdfsetmatrix(c,s,-s,c)) + insert(stack,{ c, -s, s, c }) end end diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 055a449cd..a5fdf91d7 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.08.05 10:01} +\newcontextversion{2013.08.05 22: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/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex dafe2c186..d1aaca936 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 09afdc8e4..abad00ead 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.08.05 10:01} +\edef\contextversion{2013.08.05 22:51} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/lpdf-nod.lua b/tex/context/base/lpdf-nod.lua index e820cd820..6b104d2fa 100644 --- a/tex/context/base/lpdf-nod.lua +++ b/tex/context/base/lpdf-nod.lua @@ -78,7 +78,21 @@ function nodepool.pdfsetmatrix(rx,sx,sy,ry,tx,ty) elseif ry == 0 then ry = 0.0001 end - t.data = formatters["%s %s %s %s"](rx,sx or 0,sy or 0,ry) -- todo: tx ty + if not sx then + sx = 0 + end + if not sy then + sy = 0 + end + if sx == 0 and sy == 0 then + if rx == 1 and ry == 1 then + t.data = "1 0 0 1" + else + t.data = formatters["%0.6f 0 0 %0.6f"](rx,ry) + end + else + t.data = formatters["%0.6f %0.6f %0.6f %0.6f"](rx,sx,sy,ry) + end end return t end diff --git a/tex/context/base/s-inf-03.pdf b/tex/context/base/s-inf-03.pdf Binary files differindex 8a631462b..5a4ec2f39 100644 --- a/tex/context/base/s-inf-03.pdf +++ b/tex/context/base/s-inf-03.pdf diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 5dd1312b6..e77908f5f 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log index 063113e76..2de381436 100644 --- a/tex/context/base/status-lua.log +++ b/tex/context/base/status-lua.log @@ -1,6 +1,6 @@ (cont-yes.mkiv -ConTeXt ver: 2013.08.05 10:01 MKIV beta fmt: 2013.8.5 int: english/english +ConTeXt ver: 2013.08.05 22:51 MKIV beta fmt: 2013.8.5 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index a8ae7835f..04c817c7b 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 : 08/05/13 10:01:32 +-- merge date : 08/05/13 22:51:02 do -- begin closure to overcome local limits and interference |