Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use fontTools.cu2qu instead of cu2qu #461

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Lib/ufo2ft/filters/cubicToQuadratic.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging

from cu2qu.pens import Cu2QuPointPen
from cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR
from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR
from fontTools.pens.cu2quPen import Cu2QuPointPen

from ufo2ft.filters import BaseFilter
from ufo2ft.fontInfoData import getAttrWithFallback
Expand Down
4 changes: 2 additions & 2 deletions Lib/ufo2ft/preProcessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def __init__(
layerNames=None,
skipExportGlyphs=None,
):
from cu2qu.ufo import DEFAULT_MAX_ERR
from fontTools.cu2qu.ufo import DEFAULT_MAX_ERR

self.ufos = ufos
self.inplace = inplace
Expand Down Expand Up @@ -249,7 +249,7 @@ def __init__(
self.postFilters.append(post)

def process(self):
from cu2qu.ufo import fonts_to_quadratic
from fontTools.cu2qu.ufo import fonts_to_quadratic

# first apply all custom pre-filters
for funcs, ufo, glyphSet in zip(self.preFilters, self.ufos, self.glyphSets):
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
fonttools[ufo,lxml]==4.17.1
defcon==0.7.2
cu2qu==1.6.7
compreffor==0.5.0
booleanOperations==0.9.0
cffsubr==0.2.7
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
tests_require=["pytest>=2.8"],
install_requires=[
"fonttools[ufo]>=4.17.1",
"cu2qu>=1.6.7",
"compreffor>=0.4.6",
"booleanOperations>=0.9.0",
],
Expand Down
2 changes: 1 addition & 1 deletion tests/outlineCompiler_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os

import pytest
from cu2qu.ufo import font_to_quadratic
from fontTools.cu2qu.ufo import font_to_quadratic
from fontTools.ttLib import TTFont
from fontTools.ttLib.tables._g_l_y_f import USE_MY_METRICS

Expand Down
2 changes: 1 addition & 1 deletion tests/preProcessor_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import os

import pytest
from cu2qu.ufo import CURVE_TYPE_LIB_KEY
from fontTools import designspaceLib
from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY

import ufo2ft
from ufo2ft.constants import (
Expand Down