Skip to content

Commit af5f36a

Browse files
msaktypemsaktype
authored
Merge pull request #83 from 0xType/bold-weight
Introduce 0xProto-Bold
2 parents 7bd7475 + 2a2354d commit af5f36a

File tree

853 files changed

+23909
-8759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

853 files changed

+23909
-8759
lines changed

‎Makefile‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FONT_NAME = 0xProto
22
MAIN_WEIGHT = Regular
3+
BOLD_WEIGHT = Bold
34
ITALIC = Italic
45
SOURCE_DIR = sources
56
MAIN_GLYPHS_FILE = $(SOURCE_DIR)/$(FONT_NAME).glyphspackage
@@ -20,49 +21,38 @@ build:
2021
$(MAKE) clean
2122
$(MAKE) compile-all
2223

23-
compile-otf-main: $(MAIN_GLYPHS_FILE)
24-
fontmake -a -g $(MAIN_GLYPHS_FILE) -o otf --output-dir $(OUTPUT_DIR)
25-
26-
compile-otf-italic: $(ITALIC_GLYPHS_FILE)
27-
fontmake -a -g $(ITALIC_GLYPHS_FILE) -o otf --output-dir $(OUTPUT_DIR)
28-
29-
compile-ttf-main: $(MAIN_GLYPHS_FILE)
30-
fontmake -a -g $(MAIN_GLYPHS_FILE) -o ttf --output-dir $(OUTPUT_DIR)
31-
32-
compile-ttf-italic: $(ITALIC_GLYPHS_FILE)
33-
fontmake -a -g $(ITALIC_GLYPHS_FILE) -o ttf --output-dir $(OUTPUT_DIR)
34-
35-
compile-woff2-main: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).ttf
24+
compile-woff2-roman: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).ttf $(OUTPUT_DIR)/$(FONT_NAME)-$(BOLD_WEIGHT).ttf
3625
./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).ttf
26+
./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$(BOLD_WEIGHT).ttf
3727

3828
compile-woff2-italic: $(OUTPUT_DIR)/$(FONT_NAME)-$(ITALIC).ttf
3929
./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$(ITALIC).ttf
4030

41-
compile-main: $(MAIN_GLYPHS_FILE)
42-
$(MAKE) compile-otf-main
43-
$(MAKE) compile-ttf-main && $(MAKE) compile-woff2-main
31+
compile-roman: $(MAIN_GLYPHS_FILE)
32+
fontmake -a -g $(MAIN_GLYPHS_FILE) -i --output-dir $(OUTPUT_DIR) && $(MAKE) compile-woff2-roman
4433

4534
compile-italic: $(ITALIC_GLYPHS_FILE)
46-
$(MAKE) compile-otf-italic
47-
$(MAKE) compile-ttf-italic && $(MAKE) compile-woff2-italic
35+
fontmake -a -g $(ITALIC_GLYPHS_FILE) --output-dir $(OUTPUT_DIR) && $(MAKE) compile-woff2-italic
4836

4937
compile-all:
50-
$(MAKE) compile-main
38+
$(MAKE) compile-roman
5139
$(MAKE) compile-italic
5240

5341
.PHONY: clean
5442
clean:
5543
if [ -e $(OUTPUT_DIR) ]; then rm -rf $(OUTPUT_DIR); fi
5644

57-
install-otf-main: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).otf
45+
install-otf-roman: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).otf $(OUTPUT_DIR)/$(FONT_NAME)-$(BOLD_WEIGHT).otf
5846
cp $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).otf $(HOME)/Library/Fonts
47+
cp $(OUTPUT_DIR)/$(FONT_NAME)-$(BOLD_WEIGHT).otf $(HOME)/Library/Fonts
5948

6049
install-otf-italic: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).otf
6150
cp $(OUTPUT_DIR)/$(FONT_NAME)-$(ITALIC).otf $(HOME)/Library/Fonts
6251

63-
install-latest:
52+
.PHONY: install
53+
install:
6454
$(MAKE) build
65-
$(MAKE) install-otf-main
55+
$(MAKE) install-otf-roman
6656
$(MAKE) install-otf-italic
6757

6858
close-vscode:
@@ -72,8 +62,6 @@ close-vscode:
7262

7363
debug:
7464
$(MAKE) close-vscode
75-
$(MAKE) clean
76-
$(MAKE) ufo
77-
$(MAKE) compile-otf-main
78-
$(MAKE) install-otf-main
65+
$(MAKE) build
66+
$(MAKE) install
7967
code .

‎sources/0xProto-Italic.glyphspackage/fontinfo.plist‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,17 @@ m01 = 1;
969969
isItalic = 1;
970970
linkStyle = Regular;
971971
name = Italic;
972+
properties = (
973+
{
974+
key = postscriptFullNames;
975+
values = (
976+
{
977+
language = dflt;
978+
value = "0xProto Italic";
979+
}
980+
);
981+
}
982+
);
972983
}
973984
);
974985
metrics = (
@@ -1007,10 +1018,6 @@ key = manufacturerURL;
10071018
value = "https://0xtype.dev/";
10081019
},
10091020
{
1010-
key = postscriptFontName;
1011-
value = "0xProto Italic";
1012-
},
1013-
{
10141021
key = postscriptFullNames;
10151022
values = (
10161023
{
@@ -1021,7 +1028,7 @@ value = "0xProto Italic";
10211028
},
10221029
{
10231030
key = vendorID;
1024-
value = 0xType;
1031+
value = 0x;
10251032
}
10261033
);
10271034
unitsPerEm = 1000;

‎sources/0xProto.glyphspackage/fontinfo.plist‎

Lines changed: 104 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
.appVersion = "3260";
33
.formatVersion = 3;
4+
axes = (
5+
{
6+
name = Weight;
7+
tag = wght;
8+
}
9+
);
410
classes = (
511
{
612
automatic = 1;
@@ -778,6 +784,9 @@ tag = dlig;
778784
);
779785
fontMaster = (
780786
{
787+
axesValues = (
788+
400
789+
);
781790
customParameters = (
782791
{
783792
name = strikeoutPosition;
@@ -808,20 +817,104 @@ over = -16;
808817
{
809818
over = -16;
810819
pos = -250;
820+
},
821+
{
811822
}
812823
);
813824
name = Regular;
814825
userData = {
815826
GSCornerRadius = 218;
816827
};
828+
visible = 1;
829+
},
830+
{
831+
axesValues = (
832+
700
833+
);
834+
customParameters = (
835+
{
836+
name = strikeoutPosition;
837+
value = 330;
838+
},
839+
{
840+
name = strikeoutSize;
841+
value = 50;
842+
}
843+
);
844+
iconName = SemiBold;
845+
id = m002;
846+
metricValues = (
847+
{
848+
over = 16;
849+
pos = 750;
850+
},
851+
{
852+
over = 16;
853+
pos = 710;
854+
},
855+
{
856+
over = 16;
857+
pos = 550;
858+
},
859+
{
860+
over = -16;
861+
},
862+
{
863+
over = -16;
864+
pos = -250;
865+
},
866+
{
867+
}
868+
);
869+
name = Bold;
870+
userData = {
871+
GSCornerRadius = 218;
872+
};
873+
visible = 1;
817874
}
818875
);
819876
instances = (
820877
{
878+
axesValues = (
879+
400
880+
);
821881
instanceInterpolations = {
822882
m01 = 1;
823883
};
824884
name = Regular;
885+
properties = (
886+
{
887+
key = postscriptFullNames;
888+
values = (
889+
{
890+
language = dflt;
891+
value = "0xProto Regular";
892+
}
893+
);
894+
}
895+
);
896+
},
897+
{
898+
axesValues = (
899+
700
900+
);
901+
instanceInterpolations = {
902+
m002 = 1;
903+
};
904+
isBold = 1;
905+
name = Bold;
906+
properties = (
907+
{
908+
key = postscriptFullNames;
909+
values = (
910+
{
911+
language = dflt;
912+
value = "0xProto Bold";
913+
}
914+
);
915+
}
916+
);
917+
weightClass = 700;
825918
}
826919
);
827920
metrics = (
@@ -840,6 +933,9 @@ type = baseline;
840933
},
841934
{
842935
type = descender;
936+
},
937+
{
938+
type = "italic angle";
843939
}
844940
);
845941
properties = (
@@ -857,26 +953,20 @@ key = manufacturerURL;
857953
value = "https://0xtype.dev/";
858954
},
859955
{
860-
key = postscriptFontName;
861-
value = "0xProto Regular";
862-
},
863-
{
864-
key = postscriptFullNames;
865-
values = (
866-
{
867-
language = dflt;
868-
value = "0xProto Regular";
869-
}
870-
);
871-
},
872-
{
873956
key = vendorID;
874-
value = 0xType;
957+
value = 0x;
875958
}
876959
);
877960
unitsPerEm = 1000;
878961
userData = {
879962
GSDimensionPlugin.Dimensions = {
963+
m002 = {
964+
HH = "130";
965+
HV = "138";
966+
nV = "131";
967+
nd = "118";
968+
tH = "122";
969+
};
880970
m01 = {
881971
};
882972
};

‎sources/0xProto.glyphspackage/glyphs/A_.glyph‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,61 @@ nodes = (
5555
}
5656
);
5757
width = 620;
58+
},
59+
{
60+
anchors = (
61+
{
62+
name = bottom;
63+
pos = (310,0);
64+
},
65+
{
66+
name = ogonek;
67+
pos = (598,0);
68+
},
69+
{
70+
name = top;
71+
pos = (310,710);
72+
}
73+
);
74+
layerId = m002;
75+
shapes = (
76+
{
77+
closed = 1;
78+
nodes = (
79+
(160,0,l),
80+
(225,302,o),
81+
(291,541,o),
82+
(375,710,c),
83+
(244,710,l),
84+
(163,540,o),
85+
(91,304,o),
86+
(22,0,c)
87+
);
88+
},
89+
{
90+
closed = 1;
91+
nodes = (
92+
(529,304,o),
93+
(457,540,o),
94+
(376,710,c),
95+
(245,710,l),
96+
(329,541,o),
97+
(395,302,o),
98+
(460,0,c),
99+
(598,0,l)
100+
);
101+
},
102+
{
103+
closed = 1;
104+
nodes = (
105+
(155,148,l),
106+
(466,148,l),
107+
(466,281,l),
108+
(155,281,l)
109+
);
110+
}
111+
);
112+
width = 620;
58113
}
59114
);
60115
unicode = 65;

0 commit comments

Comments
 (0)