Skip to content

Commit

Permalink
Revert "Merge pull request #407 from googlefonts/parts"
Browse files Browse the repository at this point in the history
This reverts commit ca02334, reversing
changes made to 5c73fa2.

This PR laid the groundworks for #414, however the latter needs more work before merge.
I want to make a release now with the changes to maximum_color, so I will revert-revert this immediately afterwards.
  • Loading branch information
anthrotype committed May 3, 2022
1 parent cc72c96 commit 4d3af6f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 293 deletions.
25 changes: 1 addition & 24 deletions src/nanoemoji/nanoemoji.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,6 @@ def write_preamble(nw):
)
nw.newline()

module_rule(
nw,
"write_part_file",
f"--reuse_tolerance $reuse_tolerance --output_file $out $in",
)
nw.newline()

nw.newline()


Expand Down Expand Up @@ -312,10 +305,6 @@ def picosvg_dest(clipped: bool, input_svg: Path) -> Path:
return _dest_for_src(picosvg_dest, out_dir, input_svg, ".svg")


def part_file_dest(picosvg_file: Path) -> Path:
return picosvg_file.with_suffix(".parts.json")


def bitmap_dest(input_svg: Path) -> Path:
return _dest_for_src(bitmap_dest, bitmap_dir(), input_svg, ".png")

Expand Down Expand Up @@ -348,7 +337,6 @@ def write_picosvg_builds(
picosvg_builds: Set[Path],
nw: NinjaWriter,
clipped: bool,
reuse_tolerance: float,
master: MasterConfig,
):
rule_name = "picosvg_unclipped"
Expand All @@ -362,13 +350,6 @@ def write_picosvg_builds(
picosvg_builds.add(svg_file)
nw.build(dest, rule_name, rel_build(svg_file))

nw.build(
part_file_dest(dest),
"write_part_file",
dest,
variables={"reuse_tolerance": reuse_tolerance},
)


def write_bitmap_builds(
bitmap_builds: Set[Path],
Expand Down Expand Up @@ -642,11 +623,7 @@ def _run(argv):
for master in font_config.masters:
if font_config.has_picosvgs:
write_picosvg_builds(
picosvg_builds,
nw,
font_config.clip_to_viewbox,
font_config.reuse_tolerance,
master,
picosvg_builds, nw, font_config.clip_to_viewbox, master
)
nw.newline()

Expand Down
133 changes: 0 additions & 133 deletions src/nanoemoji/parts.py

This file was deleted.

48 changes: 0 additions & 48 deletions src/nanoemoji/write_part_file.py

This file was deleted.

88 changes: 0 additions & 88 deletions tests/parts_test.py

This file was deleted.

0 comments on commit 4d3af6f

Please sign in to comment.