Fix some build breaks
This commit is contained in:
parent
e7368f16e7
commit
d878ed7c70
2 changed files with 18 additions and 9 deletions
|
@ -867,7 +867,7 @@ glyph-block Autobuild-Rotated : begin
|
||||||
|
|
||||||
for-width-kinds WideWidth1 : do
|
for-width-kinds WideWidth1 : do
|
||||||
local s : (RightSB - SB - O * 4 + (MosaicWidth - Width) * 0.5) / CAP
|
local s : (RightSB - SB - O * 4 + (MosaicWidth - Width) * 0.5) / CAP
|
||||||
local df : Miniature {'eight.lnum.crossing' 'rotatedPropto' 'revS'}
|
local df : Miniature {'eight.lnum.crossing' 'rotatedPropto' 'revS.serifless'}
|
||||||
crowd -- (4 / [Math.sqrt MosaicWidthScalar])
|
crowd -- (4 / [Math.sqrt MosaicWidthScalar])
|
||||||
scale -- s
|
scale -- s
|
||||||
forceUpright -- true
|
forceUpright -- true
|
||||||
|
@ -875,6 +875,7 @@ glyph-block Autobuild-Rotated : begin
|
||||||
define [InftyLikeShape gn u gns] : begin
|
define [InftyLikeShape gn u gns] : begin
|
||||||
create-glyph [MangleName gn] [MangleUnicode u] : glyph-proc
|
create-glyph [MangleName gn] [MangleUnicode u] : glyph-proc
|
||||||
set-width MosaicWidth
|
set-width MosaicWidth
|
||||||
|
if [not : df.queryByName gns] : throw : new Error "Cannot find glyph \(gns)"
|
||||||
include : df.queryByName gns
|
include : df.queryByName gns
|
||||||
include : Translate (-(Width / 2)) (-CAP / 2)
|
include : Translate (-(Width / 2)) (-CAP / 2)
|
||||||
include : Rotate (Math.PI / 2)
|
include : Rotate (Math.PI / 2)
|
||||||
|
|
|
@ -11,13 +11,14 @@ glyph-block Common-Derivatives : begin
|
||||||
define [ApplyCv g shapeFrom follow para] : begin
|
define [ApplyCv g shapeFrom follow para] : begin
|
||||||
foreach { kPrime prime } para.variants.primes : foreach pv [prime.variants.values] : begin
|
foreach { kPrime prime } para.variants.primes : foreach pv [prime.variants.values] : begin
|
||||||
local suffix : pv.resolveFor para follow
|
local suffix : pv.resolveFor para follow
|
||||||
if (para.enableCvSs && pv.tag && pv.rank && suffix) : begin
|
if suffix : begin
|
||||||
local dstName : shapeFrom + '.' + suffix
|
local dstName : shapeFrom + '.' + suffix
|
||||||
local dst : glyphStore.queryByName dstName
|
local dstGlyph : query-glyph dstName
|
||||||
if dst : g.dependsOn dst
|
if dstGlyph : g.dependsOn dstGlyph
|
||||||
|
|
||||||
pv.set g dstName
|
if (para.enableCvSs && pv.tag && pv.rank) : begin
|
||||||
if pv.nonDeriving : pv.setPreventDeriving g
|
pv.set g dstName
|
||||||
|
if pv.nonDeriving : pv.setPreventDeriving g
|
||||||
|
|
||||||
glyph-block-export select-variant
|
glyph-block-export select-variant
|
||||||
define [select-variant] : with-params [name unicode [shapeFrom name] [follow name] [reduction null]] : begin
|
define [select-variant] : with-params [name unicode [shapeFrom name] [follow name] [reduction null]] : begin
|
||||||
|
@ -29,11 +30,18 @@ glyph-block Common-Derivatives : begin
|
||||||
throw : new Error "Variant for \(name) (selector: \(shapeFrom)) is not assigned."
|
throw : new Error "Variant for \(name) (selector: \(shapeFrom)) is not assigned."
|
||||||
|
|
||||||
create-glyph name unicode : glyph-proc
|
create-glyph name unicode : glyph-proc
|
||||||
include [refer-glyph (shapeFrom + '.' + variant)] AS_BASE ALSO_METRICS
|
local fromGlyphName : shapeFrom + '.' + variant
|
||||||
|
local fromGlyph : query-glyph fromGlyphName
|
||||||
|
if [not fromGlyph] : throw : new Error "Cannot find glyph '\(fromGlyphName)'"
|
||||||
|
|
||||||
|
include fromGlyph AS_BASE ALSO_METRICS
|
||||||
|
currentGlyph.dependsOn fromGlyph
|
||||||
|
currentGlyph.cloneRankFromGlyph fromGlyph
|
||||||
|
|
||||||
ApplyCv currentGlyph shapeFrom follow para
|
ApplyCv currentGlyph shapeFrom follow para
|
||||||
currentGlyph.cloneRankFromGlyph [query-glyph (shapeFrom + '.' + variant)]
|
|
||||||
foreach gr [items-of SvInheritableRelations] : begin
|
foreach gr [items-of SvInheritableRelations] : begin
|
||||||
local v : gr.get [query-glyph (shapeFrom + '.' + variant)]
|
local v : gr.get fromGlyph
|
||||||
if v : gr.set this v
|
if v : gr.set this v
|
||||||
|
|
||||||
glyph-block-export orthographic-italic
|
glyph-block-export orthographic-italic
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue