summaryrefslogtreecommitdiff
path: root/Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-11-13 07:32:27 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-11-13 07:32:27 +0000
commit31c15130a103fbd3517f42309188fbcb65ea27f5 (patch)
tree381ed32bdc26a9209cba7ceb160fc29970cf3f97 /Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h
parent1c7ded83a3eef46f44c46128e3dd85118846ca4b (diff)
graphite2 1.3.9
git-svn-id: svn://tug.org/texlive/trunk@42499 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h')
-rw-r--r--Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h b/Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h
index bcbf3a22490..84008128ab4 100644
--- a/Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h
+++ b/Build/source/libs/graphite2/graphite2-src/src/inc/Collider.h
@@ -54,7 +54,8 @@ public:
COLL_KERN = 16, // collisions with this glyph are fixed by adding kerning space after it
COLL_ISCOL = 32, // this glyph has a collision
COLL_KNOWN = 64, // we've figured out what's happening with this glyph
- COLL_TEMPLOCK = 128, // Lock glyphs that have been given priority positioning
+ COLL_ISSPACE = 128, // treat this glyph as a space with regard to kerning
+ COLL_TEMPLOCK = 256, // Lock glyphs that have been given priority positioning
////COLL_JUMPABLE = 128, // moving glyphs may jump this stationary glyph in any direction - DELETE
////COLL_OVERLAP = 256, // use maxoverlap to restrict - DELETE
};
@@ -93,6 +94,7 @@ public:
SLOTCOLSETUINTPROP(seqValignWt, setSeqValignWt)
float getKern(int dir) const;
+ bool ignore() const;
private:
Rect _limit;
@@ -191,7 +193,7 @@ public:
const Position &currShift, const Position &offsetPrev, int dir,
float ymin, float ymax, json * const dbgout);
bool mergeSlot(Segment *seg, Slot *slot, const Position &currShift, float currSpace, int dir, json * const dbgout);
- Position resolve(Segment *seg, Slot *slot, int dir, float margin, json * const dbgout);
+ Position resolve(Segment *seg, Slot *slot, int dir, json * const dbgout);
void shift(const Position &mv, int dir);
CLASS_NEW_DELETE;