From dc1f09dcd32b051eed55f5378ad4a916d177c7c7 Mon Sep 17 00:00:00 2001
From: Belleve Invis <belleve@typeof.net>
Date: Sat, 30 May 2020 19:26:01 -0700
Subject: [PATCH] Fix broken shape of U+049, U+0495 (#564).

---
 changes/3.1.1.md                    |  3 ++-
 glyphs/letters-unified-extended.ptl | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/changes/3.1.1.md b/changes/3.1.1.md
index 0e8ae8f42..0822b81b3 100644
--- a/changes/3.1.1.md
+++ b/changes/3.1.1.md
@@ -1,3 +1,4 @@
  * Fix localized form of U+045D (#560).
  * Fix broken shape of R under CV83 (#561).
- * Fix broken shape of U+235d (#563).
\ No newline at end of file
+ * Fix broken shape of U+235d (#563).
+ * Fix broken shape of U+049, U+0495 (#564).
diff --git a/glyphs/letters-unified-extended.ptl b/glyphs/letters-unified-extended.ptl
index 9fc827791..fe6428ba5 100644
--- a/glyphs/letters-unified-extended.ptl
+++ b/glyphs/letters-unified-extended.ptl
@@ -39,13 +39,14 @@ glyph-block LetterUnified-Extended : begin
 
 		save 'alpha' 0x3B1
 
+	define GammaBarLeft (SB * 1.5)
 	define [GammaShape top] : glyph-construction
-		include : VBarLeft (SB * 1.5) 0 top
-		include : HBarTop (SB * 1.5 - O) (RightSB - OX) top
+		include : VBarLeft GammaBarLeft 0 top
+		include : HBarTop (GammaBarLeft - O) (RightSB - OX) top
 		if SLAB : begin
-			include : LeftwardTopSerif (SB * 1.5) top SideJut
-			include : LeftwardBottomSerif (SB * 1.5 + HVContrast * HalfStroke) 0 Jut
-			include : RightwardBottomSerif (SB * 1.5 + HVContrast * HalfStroke) 0 MidJutSide
+			include : LeftwardTopSerif GammaBarLeft top SideJut
+			include : LeftwardBottomSerif (GammaBarLeft + HVContrast * HalfStroke) 0 Jut
+			include : RightwardBottomSerif (GammaBarLeft + HVContrast * HalfStroke) 0 MidJutSide
 			include : tagged 'serifRT' : DownwardRightSerif (RightSB - OX) top VJut
 
 	sketch # Gamma
@@ -56,7 +57,7 @@ glyph-block LetterUnified-Extended : begin
 
 		branch
 			include : nShoulder
-				left   -- (SB + Stroke)
+				left   -- (GammaBarLeft + Stroke)
 				right  -- RightSB
 				top    -- CAP * HBarPos + Stroke / 4
 				bottom -- 0
@@ -72,7 +73,7 @@ glyph-block LetterUnified-Extended : begin
 
 		branch
 			include : nShoulder
-				left   -- (SB + Stroke)
+				left   -- (GammaBarLeft + Stroke)
 				right  -- RightSB
 				top    -- XH * HBarPos + Stroke / 4
 				bottom -- 0