Upgrade fonttools to 4.37.1 am: ae8de171b8 am: ae308ea7c8 am: 14ad209ddd

Original change: https://android-review.googlesource.com/c/platform/external/fonttools/+/2193410

Change-Id: I6c8759cf0dc486db368dc2e7d569ddb3af37f018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 49 insertions, 14 deletions

diff --git a/Lib/fontTools/misc/symfont.py b/Lib/fontTools/misc/symfont.py
index a1a87300..3ff2b5df 100644
--- a/Lib/fontTools/misc/symfont.py
+++ b/Lib/fontTools/misc/symfont.py
@@ -108,16 +108,34 @@ MomentYYPen = partial(GreenPen, func=y*y)
 MomentXYPen = partial(GreenPen, func=x*y)
 
 
-def printGreenPen(penName, funcs, file=sys.stdout):
+def printGreenPen(penName, funcs, file=sys.stdout, docstring=None):
+
+	if docstring is not None:
+		print('"""%s"""' % docstring)
 
 	print(
-'''from fontTools.pens.basePen import BasePen
+'''from fontTools.pens.basePen import BasePen, OpenContourError
+try:
+	import cython
+except ImportError:
+	# if cython not installed, use mock module with no-op decorators and types
+	from fontTools.misc import cython
+
+if cython.compiled:
+	# Yep, I'm compiled.
+	COMPILED = True
+else:
+	# Just a lowly interpreted script.
+	COMPILED = False
+
+
+__all__ = ["%s"]
 
 class %s(BasePen):
 
 	def __init__(self, glyphset=None):
 		BasePen.__init__(self, glyphset)
-'''%penName, file=file)
+'''% (penName, penName), file=file)
 	for name,f in funcs:
 		print('		self.%s = 0' % name, file=file)
 	print('''
@@ -133,41 +151,58 @@ class %s(BasePen):
 		p0 = self._getCurrentPoint()
 		if p0 != self.__startPoint:
 			# Green theorem is not defined on open contours.
-			raise NotImplementedError
+			raise OpenContourError(
+							"Green theorem is not defined on open contours."
+			)
 ''', end='', file=file)
 
 	for n in (1, 2, 3):
 
+
+		subs = {P[i][j]: [X, Y][j][i] for i in range(n+1) for j in range(2)}
+		greens = [green(f, BezierCurve[n]) for name,f in funcs]
+		greens = [sp.gcd_terms(f.collect(sum(P,()))) for f in greens] # Optimize
+		greens = [f.subs(subs) for f in greens] # Convert to p to x/y
+		defs, exprs = sp.cse(greens,
+				     optimizations='basic',
+				     symbols=(sp.Symbol('r%d'%i) for i in count()))
+
+		print()
+		for name,value in defs:
+			print('	@cython.locals(%s=cython.double)' % name, file=file)
 		if n == 1:
-			print('''
+			print('''\
+	@cython.locals(x0=cython.double, y0=cython.double)
+	@cython.locals(x1=cython.double, y1=cython.double)
 	def _lineTo(self, p1):
 		x0,y0 = self._getCurrentPoint()
 		x1,y1 = p1
 ''', file=file)
 		elif n == 2:
-			print('''
+			print('''\
+	@cython.locals(x0=cython.double, y0=cython.double)
+	@cython.locals(x1=cython.double, y1=cython.double)
+	@cython.locals(x2=cython.double, y2=cython.double)
 	def _qCurveToOne(self, p1, p2):
 		x0,y0 = self._getCurrentPoint()
 		x1,y1 = p1
 		x2,y2 = p2
 ''', file=file)
 		elif n == 3:
-			print('''
+			print('''\
+	@cython.locals(x0=cython.double, y0=cython.double)
+	@cython.locals(x1=cython.double, y1=cython.double)
+	@cython.locals(x2=cython.double, y2=cython.double)
+	@cython.locals(x3=cython.double, y3=cython.double)
 	def _curveToOne(self, p1, p2, p3):
 		x0,y0 = self._getCurrentPoint()
 		x1,y1 = p1
 		x2,y2 = p2
 		x3,y3 = p3
 ''', file=file)
-		subs = {P[i][j]: [X, Y][j][i] for i in range(n+1) for j in range(2)}
-		greens = [green(f, BezierCurve[n]) for name,f in funcs]
-		greens = [sp.gcd_terms(f.collect(sum(P,()))) for f in greens] # Optimize
-		greens = [f.subs(subs) for f in greens] # Convert to p to x/y
-		defs, exprs = sp.cse(greens,
-				     optimizations='basic',
-				     symbols=(sp.Symbol('r%d'%i) for i in count()))
 		for name,value in defs:
 			print('		%s = %s' % (name, value), file=file)
+
 		print(file=file)
 		for name,value in zip([f[0] for f in funcs], exprs):
 			print('		self.%s += %s' % (name, value), file=file)