summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2012-11-29 18:40:00 +0100
committerHans Hagen <pragma@wxs.nl>2012-11-29 18:40:00 +0100
commit2ad991aa17b4444641d6dc81d1c1c9575ea66c5a (patch)
tree4a602b8bb4b811d471da0e916a85518fe87a7893 /tex
parent8695fa0837cb3ceb12a57464a51600fd319fd035 (diff)
downloadcontext-2ad991aa17b4444641d6dc81d1c1c9575ea66c5a.tar.gz
beta 2012.11.29 18:40
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/chem-str.lua31
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4105 -> 4105 bytes
-rw-r--r--tex/context/base/context-version.pngbin40633 -> 40620 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24420 -> 24440 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin199489 -> 199490 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 30 insertions, 11 deletions
diff --git a/tex/context/base/chem-str.lua b/tex/context/base/chem-str.lua
index c0892329f..83cfba6bf 100644
--- a/tex/context/base/chem-str.lua
+++ b/tex/context/base/chem-str.lua
@@ -280,7 +280,6 @@ local pattern =
-- print(lpegmatch(pattern,"RZ13=x")) -- 1 RZ false false table x
local t_initialize = 'if unknown context_chem : input mp-chem.mpiv ; fi ;'
-local t_initialize = 'input mp-chem.mpiv ;'
local t_start_structure = 'chem_start_structure(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);'
local t_stop_structure = 'chem_stop_structure;'
local t_start_component = 'chem_start_component;'
@@ -489,21 +488,23 @@ function chemistry.start(settings)
local width, height, scale, offset = settings.width or 0, settings.height or 0, settings.scale or "normal", settings.offset or 0
local l, r, t, b = settings.left or 0, settings.right or 0, settings.top or 0, settings.bottom or 0
--
- metacode = { } -- no format anyway
+ metacode = { }
--
if trace_structure then
report_chemistry("scale: %s, width: %s, height: %s, l: %s, r: %s, t: %s, b: %s", scale, width, height, l, r, t, b)
end
if scale == variables.small then
- scale = 3/1.2
+ scale = 1/1.2
elseif scale == variables.normal or scale == variables.medium or scale == 0 then
- scale = 3
+ scale = 1
elseif scale == variables.big then
- scale = 3*1.2
+ scale = 1.2
else
scale = tonumber(scale)
if not scale or scale == 0 then
- scale = 3
+ scale = 1
+ elseif scale >= 10 then
+ scale = scale / 1000
elseif scale < .01 then
scale = .01
end
@@ -512,14 +513,23 @@ function chemistry.start(settings)
width = true
else
width = tonumber(width) or 0
+ if width >= 10 then
+ width = width / 1000
+ end
if l == 0 then
if r == 0 then
l = width == 0 and 2 or width/2
r = l
elseif width ~= 0 then
+ if r > 10 or r < -10 then
+ r = r / 1000
+ end
l = width - r
end
elseif r == 0 and width ~= 0 then
+ if l > 10 or l < -10 then
+ l = l / 1000
+ end
r = width - l
end
width = false
@@ -528,14 +538,23 @@ function chemistry.start(settings)
height = true
else
height = tonumber(height) or 0
+ if height >= 10 then
+ height = height / 1000
+ end
if t == 0 then
if b == 0 then
t = height == 0 and 2 or height/2
b = t
elseif height ~= 0 then
+ if b > 10 or b < -10 then
+ b = b / 1000
+ end
t = height - b
end
elseif b == 0 and height ~= 0 then
+ if t > 10 or t < -10 then
+ t = t / 1000
+ end
b = height - t
end
height = false
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index fe0411123..50a2e3a21 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.11.29 15:54}
+\newcontextversion{2012.11.29 18:40}
%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 f265ea580..a9c3335b6 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.11.29 15:54}
+\newcontextversion{2012.11.29 18:40}
%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 7eb7e0892..c02b2e77f 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 275dbde32..5a2da6911 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index b24f95204..f1cad9278 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.11.29 15:54}
+\edef\contextversion{2012.11.29 18:40}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index c327fecb9..1e72f7bfb 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.11.29 15:54}
+\edef\contextversion{2012.11.29 18:40}
%D For those who want to use this:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 34c56b3cb..29cf0f0eb 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index d796a36f7..66438fc0d 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 317ace25e..f5965112b 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 : 11/29/12 15:54:01
+-- merge date : 11/29/12 18:40:35
do -- begin closure to overcome local limits and interference