Merge pull request #88 from 0xType/tweak-glyphs-202409

Update some glyphs
0xType · Sep 6, 2024 · 65c709d · 65c709d
2 parents 15afb89 + d35988e
commit 65c709d
Show file tree

Hide file tree

Showing 27 changed files with 2,194 additions and 396 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,2 @@
 .DS_Store
 woff2
-
-0xProto-Regular.ufo/glyphs*
-!0xProto-Regular.ufo/glyphs
-
diff --git a/Makefile b/Makefile
@@ -1,10 +1,8 @@
 FONT_NAME = 0xProto
-MAIN_WEIGHT = Regular
-BOLD_WEIGHT = Bold
-ITALIC = Italic
+FAMILIES = Regular Italic Bold
 SOURCE_DIR = sources
-MAIN_GLYPHS_FILE = $(SOURCE_DIR)/$(FONT_NAME).glyphspackage
-ITALIC_GLYPHS_FILE = $(SOURCE_DIR)/$(FONT_NAME)-$(ITALIC).glyphspackage
+ROMAN_GLYPHS_FILE = $(SOURCE_DIR)/$(FONT_NAME).glyphspackage
+ITALIC_GLYPHS_FILE = $(SOURCE_DIR)/$(FONT_NAME)-Italic.glyphspackage
 OUTPUT_DIR = fonts
 WOFF2_DIR = woff2
 
@@ -28,40 +26,29 @@ compile-woff2-roman: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).ttf $(OUTPUT_DIR)
 compile-woff2-italic: $(OUTPUT_DIR)/$(FONT_NAME)-$(ITALIC).ttf
 	./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$(ITALIC).ttf
 
-compile-roman: $(MAIN_GLYPHS_FILE)
-	fontmake -a -g $(MAIN_GLYPHS_FILE) -i --output-dir $(OUTPUT_DIR) && $(MAKE) compile-woff2-roman
+compile-roman: $(ROMAN_GLYPHS_FILE)
+	fontmake -a -g $(ROMAN_GLYPHS_FILE) -i --output-dir $(OUTPUT_DIR)
 
 compile-italic: $(ITALIC_GLYPHS_FILE)
-	fontmake -a -g $(ITALIC_GLYPHS_FILE) --output-dir $(OUTPUT_DIR) && $(MAKE) compile-woff2-italic
+	fontmake -a -g $(ITALIC_GLYPHS_FILE) --output-dir $(OUTPUT_DIR)
+
+compile-woff2: compile-roman compile-italic
+	@for family in $(FAMILIES); do \
+		./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$$family.ttf; \
+	done
 
 compile-all:
-	$(MAKE) compile-roman
-	$(MAKE) compile-italic
+	$(MAKE) compile-woff2
 
 .PHONY: clean
 clean:
 	if [ -e $(OUTPUT_DIR) ]; then rm -rf $(OUTPUT_DIR); fi
 
-install-otf-roman: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).otf $(OUTPUT_DIR)/$(FONT_NAME)-$(BOLD_WEIGHT).otf
-	cp $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).otf $(HOME)/Library/Fonts
-	cp $(OUTPUT_DIR)/$(FONT_NAME)-$(BOLD_WEIGHT).otf $(HOME)/Library/Fonts
-
-install-otf-italic: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).otf
-	cp $(OUTPUT_DIR)/$(FONT_NAME)-$(ITALIC).otf $(HOME)/Library/Fonts
+install-otf: $(OUTPUT_DIR)
+	@for family in $(FAMILIES); do \
+		cp $(OUTPUT_DIR)/$(FONT_NAME)-$$family.otf $(HOME)/Library/Fonts; \
+	done
 
 .PHONY: install
 install:
-	$(MAKE) build
-	$(MAKE) install-otf-roman
-	$(MAKE) install-otf-italic
-
-close-vscode:
-	@osascript -e 'if application "Visual Studio Code" is running then' \
-	           -e 'tell application "Visual Studio Code" to quit' \
-	           -e 'end if'
-
-debug:
-	$(MAKE) close-vscode
-	$(MAKE) build
-	$(MAKE) install
-	code .
+	$(MAKE) build && $(MAKE) install-otf
diff --git a/sources/0xProto-Italic.glyphspackage/fontinfo.plist b/sources/0xProto-Italic.glyphspackage/fontinfo.plist
@@ -1,5 +1,5 @@
 {
-.appVersion = "3260";
+.appVersion = "3316";
 .formatVersion = 3;
 classes = (
 {

diff --git a/sources/0xProto-Italic.glyphspackage/glyphs/approxequal.glyph b/sources/0xProto-Italic.glyphspackage/glyphs/approxequal.glyph
@@ -7,39 +7,51 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(431,281,o),
-(452,294,o),
-(606,442,c),
-(552,496,l),
-(433,386,o),
-(438,378,o),
-(361,453,cs),
-(251,559,o),
-(225,544,o),
-(61,405,c),
-(114,348,l),
-(246,459,o),
-(246,452,o),
-(321,383,cs)
+(503,315,o),
+(580,368,o),
+(610,509,c),
+(525,509,l),
+(507,427,o),
+(468,399,o),
+(427,399,cs),
+(361,399,o),
+(351,525,o),
+(243,525,cs),
+(159,525,o),
+(84,464,o),
+(52,331,c),
+(137,331,l),
+(157,407,o),
+(191,441,o),
+(235,441,cs),
+(299,441,o),
+(310,315,o),
+(419,315,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(396,65,o),
-(417,78,o),
-(571,226,c),
-(517,280,l),
-(398,170,o),
-(403,162,o),
-(326,237,cs),
-(216,343,o),
-(190,328,o),
-(26,189,c),
-(79,132,l),
-(211,243,o),
-(211,236,o),
-(286,167,cs)
+(473,100,o),
+(550,153,o),
+(580,294,c),
+(495,294,l),
+(477,212,o),
+(438,184,o),
+(397,184,cs),
+(331,184,o),
+(321,310,o),
+(213,310,cs),
+(129,310,o),
+(54,249,o),
+(22,116,c),
+(107,116,l),
+(127,192,o),
+(161,226,o),
+(205,226,cs),
+(269,226,o),
+(280,100,o),
+(389,100,cs)
 );
 }
 );
@@ -229,6 +241,52 @@ nodes = (
 }
 );
 width = 620;
+},
+{
+associatedMasterId = m01;
+layerId = "CC787936-B114-4C2B-B752-6B41B9A82E36";
+name = "Sep 6, 24 at 16:14";
+shapes = (
+{
+closed = 1;
+nodes = (
+(431,281,o),
+(452,294,o),
+(606,442,c),
+(552,496,l),
+(433,386,o),
+(438,378,o),
+(361,453,cs),
+(251,559,o),
+(225,544,o),
+(61,405,c),
+(114,348,l),
+(246,459,o),
+(246,452,o),
+(321,383,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(396,65,o),
+(417,78,o),
+(571,226,c),
+(517,280,l),
+(398,170,o),
+(403,162,o),
+(326,237,cs),
+(216,343,o),
+(190,328,o),
+(26,189,c),
+(79,132,l),
+(211,243,o),
+(211,236,o),
+(286,167,cs)
+);
+}
+);
+width = 620;
 }
 );
 unicode = 8776;

diff --git a/sources/0xProto-Italic.glyphspackage/glyphs/asciitilde.glyph b/sources/0xProto-Italic.glyphspackage/glyphs/asciitilde.glyph
@@ -8,20 +8,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(409,172,o),
-(430,185,o),
-(584,333,c),
-(530,387,l),
-(411,277,o),
-(416,269,o),
-(339,344,cs),
-(229,450,o),
-(203,435,o),
-(39,296,c),
-(92,239,l),
-(224,350,o),
-(224,343,o),
-(299,274,cs)
+(482,205,o),
+(561,274,o),
+(589,421,c),
+(504,421,l),
+(482,333,o),
+(447,289,o),
+(408,289,cs),
+(340,289,o),
+(336,435,o),
+(222,435,cs),
+(138,435,o),
+(61,366,o),
+(31,219,c),
+(116,219,l),
+(140,309,o),
+(170,351,o),
+(212,351,cs),
+(277,351,o),
+(283,205,o),
+(398,205,cs)
 );
 }
 );
@@ -134,6 +140,34 @@ nodes = (
 }
 );
 width = 620;
+},
+{
+associatedMasterId = m01;
+layerId = "8F0A01A0-59B6-4322-ADC3-44DE849F4FB3";
+name = "Sep 3, 24 at 15:42";
+shapes = (
+{
+closed = 1;
+nodes = (
+(409,172,o),
+(430,185,o),
+(584,333,c),
+(530,387,l),
+(411,277,o),
+(416,269,o),
+(339,344,cs),
+(229,450,o),
+(203,435,o),
+(39,296,c),
+(92,239,l),
+(224,350,o),
+(224,343,o),
+(299,274,cs)
+);
+}
+);
+visible = 1;
+width = 620;
 }
 );
 unicode = 126;

diff --git a/sources/0xProto-Italic.glyphspackage/glyphs/brevecomb_tildecomb.glyph b/sources/0xProto-Italic.glyphspackage/glyphs/brevecomb_tildecomb.glyph
@@ -11,26 +11,32 @@ pos = (350,550);
 layerId = m01;
 shapes = (
 {
+ref = brevecomb;
+},
+{
 closed = 1;
 nodes = (
-(496,937,l),
-(440,880,o),
-(443,883,o),
-(396,915,cs),
-(336,955,o),
-(325,960,o),
-(237,871,c),
-(283,832,l),
-(336,887,o),
-(338,886,o),
-(388,851,cs),
-(445,812,o),
-(462,812,o),
-(541,898,c)
+(490,824,o),
+(532,859,o),
+(546,936,c),
+(486,936,l),
+(478,895,o),
+(460,883,o),
+(444,883,cs),
+(411,883,o),
+(398,944,o),
+(341,944,cs),
+(289,944,o),
+(244,909,o),
+(230,832,c),
+(290,832,l),
+(299,872,o),
+(318,885,o),
+(332,885,cs),
+(363,885,o),
+(375,824,o),
+(435,824,cs)
 );
-},
-{
-ref = brevecomb;
 }
 );
 width = 620;
@@ -70,6 +76,43 @@ ref = brevecomb;
 }
 );
 width = 620;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (350,550);
+}
+);
+associatedMasterId = m01;
+layerId = "1D199299-D9DD-4977-A0D2-B8A17DC4691D";
+name = "Sep 3, 24 at 16:58";
+shapes = (
+{
+closed = 1;
+nodes = (
+(496,937,l),
+(440,880,o),
+(443,883,o),
+(396,915,cs),
+(336,955,o),
+(325,960,o),
+(237,871,c),
+(283,832,l),
+(336,887,o),
+(338,886,o),
+(388,851,cs),
+(445,812,o),
+(462,812,o),
+(541,898,c)
+);
+},
+{
+ref = brevecomb;
+}
+);
+visible = 1;
+width = 620;
 }
 );
 }