From a6994b024b0e60c9d69ddbedc399f0d7a823c70d Mon Sep 17 00:00:00 2001 From: Marius Date: Tue, 23 Oct 2012 01:20:13 +0300 Subject: beta 2012.10.22 23:51 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4140 -> 4146 bytes tex/context/base/context-version.png | Bin 105087 -> 106825 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/math-int.mkiv | 2 ++ tex/context/base/math-noa.lua | 5 +++-- tex/context/base/math-vfu.lua | 17 +++++++++++------ tex/context/base/status-files.pdf | Bin 24597 -> 24598 bytes tex/context/base/status-lua.pdf | Bin 195718 -> 195723 bytes 11 files changed, 20 insertions(+), 12 deletions(-) (limited to 'tex/context/base') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index caf666d45..591c83703 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.10.22 11:01} +\newcontextversion{2012.10.22 23:51} %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 918e0c07f..db527eb3b 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.10.22 11:01} +\newcontextversion{2012.10.22 23: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 index 585e96594..2b98f662f 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 2579cab97..e829e7e07 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 6fbd684de..70fc132e0 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.10.22 11:01} +\edef\contextversion{2012.10.22 23:51} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index dba8823fc..75890dd02 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.10.22 11:01} +\edef\contextversion{2012.10.22 23:51} %D For those who want to use this: diff --git a/tex/context/base/math-int.mkiv b/tex/context/base/math-int.mkiv index 8699cbc1c..f03df3fdc 100644 --- a/tex/context/base/math-int.mkiv +++ b/tex/context/base/math-int.mkiv @@ -55,6 +55,8 @@ % \else % \limits % \fi + \else + % none \fi} \letvalue{\??mathintegral nolimits}\zerocount diff --git a/tex/context/base/math-noa.lua b/tex/context/base/math-noa.lua index 5b7760452..5ac6d125d 100644 --- a/tex/context/base/math-noa.lua +++ b/tex/context/base/math-noa.lua @@ -851,10 +851,11 @@ italics[math_char] = function(pointer,what,n,parent) end end if sub then - parent.sub = insert_kern(sub,new_kern(-correction)) +local correction = - correction + parent.sub = insert_kern(sub,new_kern(correction)) if trace_italics then report_italics("method %s: adding %s italic correction before subscript after %s (0x%05X)", - method,number.points(-correction),utfchar(char),char) + method,number.points(correction),utfchar(char),char) end end else diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/math-vfu.lua index b46e06a01..9b86ddbca 100644 --- a/tex/context/base/math-vfu.lua +++ b/tex/context/base/math-vfu.lua @@ -17,6 +17,7 @@ if not modules then modules = { } end modules ['math-vfu'] = { local type, next = type, next local max = math.max local format = string.format +local utfchar = utf.char local fonts, nodes, mathematics = fonts, nodes, mathematics @@ -620,9 +621,9 @@ function vfmath.define(specification,set,goodies) local ru = rv[unicode] if not ru then if trace_virtual then - report_virtual( "unicode point U+%05X has no index %04X in vector %s for font %s",unicode,index,vectorname,fontname) + report_virtual("unicode point U+%05X has no index %04X in vector %s for font %s",unicode,index,vectorname,fontname) elseif not already_reported then - report_virtual( "the mapping is incomplete for '%s' at %s",name,number.topoints(size)) + report_virtual("the mapping is incomplete for '%s' at %s",name,number.topoints(size)) already_reported = true end rv[unicode] = true @@ -636,9 +637,12 @@ function vfmath.define(specification,set,goodies) local kerns = fci.kerns local width = fci.width local italic = fci.italic - if italic and isextension then - -- int_a^b - width = width + italic + if italic and italic > 0 then +-- report_virtual("unicode char %s (U+%05X) in font %s has italic correction %s",utfchar(unicode),unicode,fs.properties.name or "unknown",italic) + -- int_a^b + if isextension then +-- width = width + italic + end end if kerns then local krn = { } @@ -691,7 +695,8 @@ function vfmath.define(specification,set,goodies) end local italic = fci.italic local t = { - width = fci.width + italic, -- watch this ! +-- width = fci.width + italic, -- watch this ! + width = fci.width, height = fci.height, depth = fci.depth, italic = italic, diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 05448f95f..e69c31644 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 27cd5d084..8dd3e74b1 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ -- cgit v1.2.3