From f9878c576404ca87675e8411d5887f37c102ddb1 Mon Sep 17 00:00:00 2001 From: be5invis Date: Wed, 16 Dec 2015 15:19:45 +0800 Subject: [PATCH] release 1.4.0 --- buildglyphs.aki | 4 ++-- generate.js | 2 +- glyphs/letters-unified-basic.aki | 8 ++++---- glyphs/letters-unified-extended.aki | 2 +- onegroup.mk | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buildglyphs.aki b/buildglyphs.aki index 64a4326..0944a69 100644 --- a/buildglyphs.aki +++ b/buildglyphs.aki @@ -114,7 +114,7 @@ export as build : define [buildFont para recursive recursiveCodes] : begin # Progress indicator define [progress status] : if [not recursive] : begin - console.log " \(font.name.uniqueSubFamily) : Done \(status)" + #console.log " \(font.name.uniqueSubFamily) : Done \(status)" if (global && global.gc) : global.gc # Key metrics @@ -301,7 +301,7 @@ export as build : define [buildFont para recursive recursiveCodes] : begin define [create-glyph] : match [Array.prototype.slice.call arguments 0] `[@name @actions] : begin if (pickHash && nPending <= 0) : begin - console.log " *** Done recursive build for \[if (recursive.length > 3) [recursive.slice 0 3 :.concat {'...'} :.join ','] [recursive.join ',']] in \(font.name.uniqueSubFamily)" + #console.log " *** Done recursive build for \[if (recursive.length > 3) [recursive.slice 0 3 :.concat {'...'} :.join ','] [recursive.join ',']] in \(font.name.uniqueSubFamily)" throw {.glyfMap glyphs} if (pickHash && [not pickHash.(name)]) : return nothing diff --git a/generate.js b/generate.js index 7476575..b122035 100644 --- a/generate.js +++ b/generate.js @@ -10,7 +10,7 @@ var emptyFont = toml.parse(fs.readFileSync(path.join(path.dirname(require.m var para = parameters.build(parametersData, argv._); var fontUniqueName = para.family + ' ' + para.style + ' ' + para.version + ' (' + para.codename + ')' -console.log(' Start build font' + fontUniqueName); +console.log(' Start build font ' + fontUniqueName); var font = buildGlyphs.build.call(emptyFont, para); // glyf list construction font.glyfMap = null; diff --git a/glyphs/letters-unified-basic.aki b/glyphs/letters-unified-basic.aki index 97dd12b..5815571 100644 --- a/glyphs/letters-unified-basic.aki +++ b/glyphs/letters-unified-basic.aki @@ -1605,11 +1605,11 @@ symbol-block 'g' flat [mix SB RIGHTSB 0.435] groundy [widths 0 STROKE] curl [mix RIGHTSB SB 0.435] groundy archv 4 - g4 grightx [mix (DESCENDER + O) groundy 0.53] + g4 grightx [mix (DESCENDER + O) groundy (1.06 * SMALLSMOOTHA / (SMALLSMOOTHA + SMALLSMOOTHB))] arcvh - g4 MIDDLE (DESCENDER + O) + g4 (MIDDLE + CORRECTION_OMIDS) (DESCENDER + O) archv - g4 gleftx [mix (DESCENDER + O) groundy 0.53] + g4 gleftx [mix (DESCENDER + O) groundy (1.06 * SMALLSMOOTHB / (SMALLSMOOTHA + SMALLSMOOTHB))] arcvh g4 [mix SB RIGHTSB 0.435] groundy [heading RIGHTWARD] local gm : mix SB (RIGHTSB - 0.3 * SB) 0.5 @@ -2657,7 +2657,7 @@ symbol-block 'S' set-width WIDTH assign-unicode 's' include eMarks - define smooth : adviceSSmooth XH (-1 - globalTransform.yx * (8.5 - (WIDTH / 500) * 5.5) * [clamp 0 1 : linreg 126 1 135 0.5 STROKE]) + define smooth : adviceSSmooth XH (-1 - globalTransform.yx * (15 - (WIDTH / 500) * 12) * [clamp 0 1 : linreg 126 1 135 0.5 STROKE]) include : dispiro widths.lhs g4 RIGHTSB (XH - SHOOK) diff --git a/glyphs/letters-unified-extended.aki b/glyphs/letters-unified-extended.aki index da97fc7..54434ca 100644 --- a/glyphs/letters-unified-extended.aki +++ b/glyphs/letters-unified-extended.aki @@ -874,7 +874,7 @@ symbol-block 'CyrTse' symbol-block 'CyrDe' define [CyrDeShape top] : glyph-construction local descenderOverflow : if SLAB SIDEJUT ((RIGHTSB - SB) * 0.05) - local cutleft : if SLAB SB (SB + descenderOverflow) + local cutleft SB local cutright : if SLAB RIGHTSB (RIGHTSB - descenderOverflow) local topleft : mix cutleft cutright 0.15 include : HBarBottom (cutleft - descenderOverflow) (cutright + descenderOverflow) 0 diff --git a/onegroup.mk b/onegroup.mk index 66986e5..4748d07 100644 --- a/onegroup.mk +++ b/onegroup.mk @@ -20,7 +20,7 @@ NODE_FDT = node --expose-gc NODE = node UPRIGHT = $(OBJDIR)/$(PREFIX)-thin.ttf $(OBJDIR)/$(PREFIX)-extralight.ttf $(OBJDIR)/$(PREFIX)-light.ttf $(OBJDIR)/$(PREFIX)-regular.ttf $(OBJDIR)/$(PREFIX)-medium.ttf $(OBJDIR)/$(PREFIX)-bold.ttf $(OBJDIR)/$(PREFIX)-heavy.ttf -ITALIC = $(OBJDIR)/$(PREFIX)-thinitalic.ttf $(OBJDIR)/$(PREFIX)-extralightitalic.ttf $(OBJDIR)/$(PREFIX)-lightitalic.ttf $(OBJDIR)/$(PREFIX)-italic.ttf $(OBJDIR)/$(PREFIX)-mediumitalic.ttf $(OBJDIR)/$(PREFIX)-heavyitalic.ttf +ITALIC = $(OBJDIR)/$(PREFIX)-thinitalic.ttf $(OBJDIR)/$(PREFIX)-extralightitalic.ttf $(OBJDIR)/$(PREFIX)-lightitalic.ttf $(OBJDIR)/$(PREFIX)-italic.ttf $(OBJDIR)/$(PREFIX)-mediumitalic.ttf $(OBJDIR)/$(PREFIX)-bolditalic.ttf $(OBJDIR)/$(PREFIX)-heavyitalic.ttf EXTUPRG = EXTITAL = OUTPUTS = $(UPRIGHT) $(ITALIC)