More optimize
This commit is contained in:
parent
ce4212a639
commit
acb58469f1
3 changed files with 37 additions and 29 deletions
|
@ -15,7 +15,7 @@ glyph-block Mark-Above : begin
|
||||||
glyph-block-import Common-Derivatives
|
glyph-block-import Common-Derivatives
|
||||||
|
|
||||||
glyph-block-import Mark-Shared-Metrics : markExtend markStroke markHalfStroke markStress markFine
|
glyph-block-import Mark-Shared-Metrics : markExtend markStroke markHalfStroke markStress markFine
|
||||||
glyph-block-import Mark-Shared-Metrics : markMiddle markDotsRadius
|
glyph-block-import Mark-Shared-Metrics : markMiddle markDotsRadius dialytikaRadius
|
||||||
|
|
||||||
glyph-block-export aboveMarkTop aboveMarkBot aboveMarkMid aboveMarkStack
|
glyph-block-export aboveMarkTop aboveMarkBot aboveMarkMid aboveMarkStack
|
||||||
define aboveMarkTop (XH + AccentClearance + AccentHeight)
|
define aboveMarkTop (XH + AccentClearance + AccentHeight)
|
||||||
|
@ -67,8 +67,8 @@ glyph-block Mark-Above : begin
|
||||||
|
|
||||||
create-glyph "dialytikaAbove.\(suffix)" : glyph-proc
|
create-glyph "dialytikaAbove.\(suffix)" : glyph-proc
|
||||||
set-width 0
|
set-width 0
|
||||||
include : DrawAt (markMiddle - markExtend * 1.25) aboveMarkMid (markDotsRadius * kdr)
|
include : DrawAt (markMiddle - markExtend * 1.25) aboveMarkMid (dialytikaRadius * kdr)
|
||||||
include : DrawAt (markMiddle + markExtend * 1.25) aboveMarkMid (markDotsRadius * kdr)
|
include : DrawAt (markMiddle + markExtend * 1.25) aboveMarkMid (dialytikaRadius * kdr)
|
||||||
|
|
||||||
select-variant 'dotAbove' 0x307 (follow -- 'diacriticDot')
|
select-variant 'dotAbove' 0x307 (follow -- 'diacriticDot')
|
||||||
select-variant 'dieresisAbove' 0x308 (follow -- 'diacriticDot')
|
select-variant 'dieresisAbove' 0x308 (follow -- 'diacriticDot')
|
||||||
|
@ -105,7 +105,7 @@ glyph-block Mark-Above : begin
|
||||||
include : StdAnchors.medium
|
include : StdAnchors.medium
|
||||||
include : dispiro
|
include : dispiro
|
||||||
flat (markMiddle + markStress) aboveMarkBot [widths markFine markFine]
|
flat (markMiddle + markStress) aboveMarkBot [widths markFine markFine]
|
||||||
curl (markMiddle - markExtend) aboveMarkTop [widths markStress markStress]
|
curl (markMiddle - 0.875 * markExtend) aboveMarkTop [widths markStress markStress]
|
||||||
|
|
||||||
create-glyph 'asciiGrave/body/straight' : glyph-proc
|
create-glyph 'asciiGrave/body/straight' : glyph-proc
|
||||||
local df : DivFrame para.diversityF
|
local df : DivFrame para.diversityF
|
||||||
|
@ -119,7 +119,7 @@ glyph-block Mark-Above : begin
|
||||||
include : StdAnchors.medium
|
include : StdAnchors.medium
|
||||||
include : dispiro
|
include : dispiro
|
||||||
flat (markMiddle - markStress) aboveMarkBot [widths markFine markFine]
|
flat (markMiddle - markStress) aboveMarkBot [widths markFine markFine]
|
||||||
curl (markMiddle + markExtend) aboveMarkTop [widths markStress markStress]
|
curl (markMiddle + 0.875 * markExtend) aboveMarkTop [widths markStress markStress]
|
||||||
|
|
||||||
create-glyph 'latin1acute' 0xB4 : glyph-proc
|
create-glyph 'latin1acute' 0xB4 : glyph-proc
|
||||||
local df : DivFrame para.diversityF
|
local df : DivFrame para.diversityF
|
||||||
|
@ -601,13 +601,11 @@ glyph-block Mark-Above : begin
|
||||||
create-glyph 'barAbove' 0x30D : glyph-proc
|
create-glyph 'barAbove' 0x30D : glyph-proc
|
||||||
set-width 0
|
set-width 0
|
||||||
include : StdAnchors.narrow
|
include : StdAnchors.narrow
|
||||||
|
|
||||||
include : VBar.m markMiddle aboveMarkBot aboveMarkTop markStroke
|
include : VBar.m markMiddle aboveMarkBot aboveMarkTop markStroke
|
||||||
|
|
||||||
create-glyph 'ascenderBarAbove' : glyph-proc
|
create-glyph 'ascenderBarAbove' : glyph-proc
|
||||||
set-width 0
|
set-width 0
|
||||||
include : StdAnchors.narrow
|
include : StdAnchors.narrow
|
||||||
|
|
||||||
include : VBar.m markMiddle [mix XH aboveMarkBot 0.5] CAP markStroke
|
include : VBar.m markMiddle [mix XH aboveMarkBot 0.5] CAP markStroke
|
||||||
|
|
||||||
create-glyph 'dblBarAbove' 0x30E : glyph-proc
|
create-glyph 'dblBarAbove' 0x30E : glyph-proc
|
||||||
|
@ -653,13 +651,20 @@ glyph-block Mark-Above : begin
|
||||||
include : ApparentTranslate 0 (fine * 0.5)
|
include : ApparentTranslate 0 (fine * 0.5)
|
||||||
include : StdAnchors.mediumWide
|
include : StdAnchors.mediumWide
|
||||||
|
|
||||||
|
|
||||||
select-variant 'candrabinduAbove' 0x310 (follow -- 'diacriticDot')
|
select-variant 'candrabinduAbove' 0x310 (follow -- 'diacriticDot')
|
||||||
turned 'turncandrabinduAbove' 0x352 'candrabinduAbove' markMiddle aboveMarkMid
|
turned 'turncandrabinduAbove' 0x352 'candrabinduAbove' markMiddle aboveMarkMid
|
||||||
|
|
||||||
|
create-glyph 'tonosAbove' : glyph-proc
|
||||||
|
set-width 0
|
||||||
|
include : StdAnchors.narrow
|
||||||
|
local shift : 0.05 * markExtend + (markStress - markFine) * HVContrast
|
||||||
|
include : dispiro
|
||||||
|
flat (markMiddle + shift) (aboveMarkTop + 0.4 * markStress) [widths.center.heading (markStress * 2) Downward]
|
||||||
|
curl (markMiddle - 0.5 * shift) aboveMarkBot [widths.center.heading (markFine * 2) Downward]
|
||||||
|
|
||||||
create-glyph 'tonosGrekUpperTonos' : glyph-proc
|
create-glyph 'tonosGrekUpperTonos' : glyph-proc
|
||||||
set-width 0
|
set-width 0
|
||||||
include : refer-glyph 'barAbove'
|
include : refer-glyph 'tonosAbove'
|
||||||
include : StdAnchors.impl 'grekUpperTonos' 0 0
|
include : StdAnchors.impl 'grekUpperTonos' 0 0
|
||||||
|
|
||||||
create-glyph 'variaAbove' 0x340 : glyph-proc
|
create-glyph 'variaAbove' 0x340 : glyph-proc
|
||||||
|
@ -697,20 +702,22 @@ glyph-block Mark-Above : begin
|
||||||
|
|
||||||
create-glyph 'dialytikaTonosAbove' 0x0344 : glyph-proc
|
create-glyph 'dialytikaTonosAbove' 0x0344 : glyph-proc
|
||||||
set-width 0
|
set-width 0
|
||||||
include : refer-glyph 'dialytikaAbove'
|
include : WithTransform [ApparentTranslate 0 (-1/8 * AccentHeight)] : refer-glyph 'dialytikaAbove'
|
||||||
include : refer-glyph 'barAbove'
|
include : WithTransform [ApparentTranslate 0 0] : refer-glyph 'tonosAbove'
|
||||||
include : StdAnchors.wide
|
include : StdAnchors.wide
|
||||||
|
|
||||||
create-glyph 'dialytikaVariaAbove' : glyph-proc
|
create-glyph 'dialytikaVariaAbove' : glyph-proc
|
||||||
set-width 0
|
set-width 0
|
||||||
include : refer-glyph 'dialytikaAbove'
|
local shift : 0.125 * (markExtend * 0.875 - markStress)
|
||||||
include : refer-glyph 'variaAbove'
|
include : WithTransform [ApparentTranslate 0 (-1/8 * AccentHeight)] : refer-glyph 'dialytikaAbove'
|
||||||
|
include : WithTransform [ApparentTranslate shift 0] : refer-glyph 'variaAbove'
|
||||||
include : StdAnchors.wide
|
include : StdAnchors.wide
|
||||||
|
|
||||||
create-glyph 'dialytikaOxiaAbove' : glyph-proc
|
create-glyph 'dialytikaOxiaAbove' : glyph-proc
|
||||||
set-width 0
|
set-width 0
|
||||||
include : refer-glyph 'dialytikaAbove'
|
local shift : 0.125 * (markExtend * 0.875 - markStress)
|
||||||
include : refer-glyph 'oxiaAbove'
|
include : WithTransform [ApparentTranslate 0 (-1/8 * AccentHeight)] : refer-glyph 'dialytikaAbove'
|
||||||
|
include : WithTransform [ApparentTranslate (-shift) 0] : refer-glyph 'oxiaAbove'
|
||||||
include : StdAnchors.wide
|
include : StdAnchors.wide
|
||||||
|
|
||||||
create-glyph 'crossAbove' 0x33D : glyph-proc
|
create-glyph 'crossAbove' 0x33D : glyph-proc
|
||||||
|
|
|
@ -20,6 +20,7 @@ glyph-block Mark-Shared-Metrics : begin
|
||||||
define markStress : markHalfStroke * 1.1
|
define markStress : markHalfStroke * 1.1
|
||||||
define markFine : Math.min (markHalfStroke * 0.9) (0.5 * [AdviceStroke2 3.875 4.25 XH])
|
define markFine : Math.min (markHalfStroke * 0.9) (0.5 * [AdviceStroke2 3.875 4.25 XH])
|
||||||
|
|
||||||
glyph-block-export markMiddle markDotsRadius
|
glyph-block-export markMiddle markDotsRadius dialytikaRadius
|
||||||
define markMiddle (-Middle)
|
define markMiddle (-Middle)
|
||||||
define markDotsRadius : DotRadius * [Math.min 1 (markStress / HalfStroke)]
|
define markDotsRadius : DotRadius * [Math.min 1 (markStress / HalfStroke)]
|
||||||
|
define dialytikaRadius : DotRadius * [Math.min 1 ([AdviceStroke 5] / Stroke)]
|
||||||
|
|
|
@ -8,7 +8,7 @@ export : define ogonekBelowToTRTf_Y : object
|
||||||
'ogonekBelow' 'ogonekTR_Y'
|
'ogonekBelow' 'ogonekTR_Y'
|
||||||
|
|
||||||
export : define upperGrekMarkToTonosTf : object
|
export : define upperGrekMarkToTonosTf : object
|
||||||
'barAbove' 'tonosGrekUpperTonos'
|
'tonosAbove' 'tonosGrekUpperTonos'
|
||||||
'variaAbove' 'variaGrekUpperTonos'
|
'variaAbove' 'variaGrekUpperTonos'
|
||||||
'oxiaAbove' 'oxiaGrekUpperTonos'
|
'oxiaAbove' 'oxiaGrekUpperTonos'
|
||||||
'graveAbove' 'variaGrekUpperTonos'
|
'graveAbove' 'variaGrekUpperTonos'
|
||||||
|
@ -130,14 +130,14 @@ export : define decompOverrides : object
|
||||||
0x38E { 'grek/Upsilon' 'tonosGrekUpperTonos' }
|
0x38E { 'grek/Upsilon' 'tonosGrekUpperTonos' }
|
||||||
0x38F { 'grek/Omega' 'tonosGrekUpperTonos' }
|
0x38F { 'grek/Omega' 'tonosGrekUpperTonos' }
|
||||||
0x390 { 'grek/iota' 'dialytikaTonosAbove' }
|
0x390 { 'grek/iota' 'dialytikaTonosAbove' }
|
||||||
0x3AC { 'grek/alpha' 'barAbove' }
|
0x3AC { 'grek/alpha' 'tonosAbove' }
|
||||||
0x3AD { 'grek/epsilon' 'barAbove' }
|
0x3AD { 'grek/epsilon' 'tonosAbove' }
|
||||||
0x3AE { 'grek/eta' 'barAbove' }
|
0x3AE { 'grek/eta' 'tonosAbove' }
|
||||||
0x3AF { 'grek/iota' 'barAbove' }
|
0x3AF { 'grek/iota' 'tonosAbove' }
|
||||||
0x3B0 { 'grek/upsilon' 'dialytikaTonosAbove' }
|
0x3B0 { 'grek/upsilon' 'dialytikaTonosAbove' }
|
||||||
0x3CC { 'grek/omicron' 'barAbove' }
|
0x3CC { 'grek/omicron' 'tonosAbove' }
|
||||||
0x3CD { 'grek/upsilon' 'barAbove' }
|
0x3CD { 'grek/upsilon' 'tonosAbove' }
|
||||||
0x3CE { 'grek/omega' 'barAbove' }
|
0x3CE { 'grek/omega' 'tonosAbove' }
|
||||||
|
|
||||||
0x1FD2 { 'grek/iota' 'dialytikaVariaAbove' }
|
0x1FD2 { 'grek/iota' 'dialytikaVariaAbove' }
|
||||||
0x1FD3 { 'grek/iota' 'dialytikaOxiaAbove' }
|
0x1FD3 { 'grek/iota' 'dialytikaOxiaAbove' }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue