Skip to content

Commit

Permalink
narrow colon
Browse files Browse the repository at this point in the history
  • Loading branch information
@arpruss
arpruss committed Sep 10, 2019
1 parent 7d4814e commit e4a1092
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 104 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
applicationId "omegacentauri.mobi.simplestopwatch"
minSdkVersion 4
targetSdkVersion 28
versionCode 10
versionCode 11
versionName "1.10"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand Down
78 changes: 39 additions & 39 deletions app/src/main/java/omegacentauri/mobi/simplestopwatch/DSEG7ClassicBoldItalicDigitsColon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,48 +508,48 @@ public Path makePath() {
return path;
}
});
addCharacter((char)58,200f,20f,new PathMaker() {
addCharacter((char)58,160f,20f,new PathMaker() {
@Override
public Path makePath() {
Path path = new Path();
path.moveTo(100f,-486f);
path.lineTo(100f,-486f);
path.close();
path.moveTo(61f,-717f);
path.quadTo(65f,-728f,74f,-736f);
path.quadTo(84f,-746f,94f,-750f);
path.quadTo(103f,-754f,118f,-754f);
path.quadTo(133f,-754f,142f,-750f);
path.quadTo(153f,-746f,162f,-736f);
path.quadTo(170f,-728f,175f,-717f);
path.quadTo(180f,-705f,180f,-693f);
path.quadTo(180f,-681f,175f,-669f);
path.quadTo(170f,-657f,162f,-649f);
path.quadTo(154f,-641f,142f,-636f);
path.quadTo(130f,-631f,118f,-631f);
path.quadTo(106f,-631f,94f,-636f);
path.quadTo(82f,-641f,74f,-649f);
path.quadTo(66f,-657f,61f,-669f);
path.quadTo(56f,-681f,56f,-693f);
path.quadTo(56f,-705f,61f,-717f);
path.close();
path.moveTo(25f,-305f);
path.quadTo(29f,-316f,38f,-324f);
path.quadTo(48f,-334f,58f,-338f);
path.quadTo(67f,-342f,82f,-342f);
path.quadTo(97f,-342f,106f,-338f);
path.quadTo(116f,-334f,126f,-324f);
path.quadTo(134f,-316f,139f,-305f);
path.quadTo(144f,-293f,144f,-281f);
path.quadTo(144f,-269f,139f,-257f);
path.quadTo(134f,-245f,126f,-237f);
path.quadTo(118f,-229f,106f,-224f);
path.quadTo(94f,-219f,82f,-219f);
path.quadTo(70f,-219f,58f,-224f);
path.quadTo(46f,-229f,38f,-237f);
path.quadTo(30f,-245f,25f,-257f);
path.quadTo(20f,-269f,20f,-281f);
path.quadTo(20f,-293f,25f,-305f);
path.moveTo(80f,-486f);
path.lineTo(80f,-486f);
path.close();
path.moveTo(41f,-717f);
path.quadTo(45f,-728f,54f,-736f);
path.quadTo(64f,-746f,74f,-750f);
path.quadTo(83f,-754f,98f,-754f);
path.quadTo(113f,-754f,122f,-750f);
path.quadTo(133f,-746f,142f,-736f);
path.quadTo(150f,-728f,155f,-717f);
path.quadTo(160f,-705f,160f,-693f);
path.quadTo(160f,-681f,155f,-669f);
path.quadTo(150f,-657f,142f,-649f);
path.quadTo(134f,-641f,122f,-636f);
path.quadTo(110f,-631f,98f,-631f);
path.quadTo(86f,-631f,74f,-636f);
path.quadTo(62f,-641f,54f,-649f);
path.quadTo(46f,-657f,41f,-669f);
path.quadTo(36f,-681f,36f,-693f);
path.quadTo(36f,-705f,41f,-717f);
path.close();
path.moveTo(5f,-305f);
path.quadTo(9f,-316f,18f,-324f);
path.quadTo(28f,-334f,38f,-338f);
path.quadTo(47f,-342f,62f,-342f);
path.quadTo(77f,-342f,86f,-338f);
path.quadTo(96f,-334f,106f,-324f);
path.quadTo(114f,-316f,119f,-305f);
path.quadTo(124f,-293f,124f,-281f);
path.quadTo(124f,-269f,119f,-257f);
path.quadTo(114f,-245f,106f,-237f);
path.quadTo(98f,-229f,86f,-224f);
path.quadTo(74f,-219f,62f,-219f);
path.quadTo(50f,-219f,38f,-224f);
path.quadTo(26f,-229f,18f,-237f);
path.quadTo(10f,-245f,5f,-257f);
path.quadTo(3.55271e-15f,-269f,3.55271e-15f,-281f);
path.quadTo(3.55271e-15f,-293f,5f,-305f);
path.close();
return path;
}
Expand Down
38 changes: 19 additions & 19 deletions app/src/main/java/omegacentauri/mobi/simplestopwatch/SansBoldDigitsColon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,31 +317,31 @@ public Path makePath() {
return path;
}
});
addCharacter((char)58,578f,125f,new PathMaker() {
addCharacter((char)58,462.4f,125f,new PathMaker() {
@Override
public Path makePath() {
Path path = new Path();
// addComponent period (1, 0, 0, 1, -1, 0)
path.moveTo(125f,-142f);
path.quadTo(125f,-211f,171.5f,-254f);
path.quadTo(218f,-297f,288f,-297f);
path.quadTo(359f,-297f,405.5f,-254f);
path.quadTo(452f,-211f,452f,-142f);
path.quadTo(452f,-74f,406f,-31.5f);
path.quadTo(360f,11f,288f,11f);
path.quadTo(217f,11f,171f,-31.5f);
path.quadTo(125f,-74f,125f,-142f);
path.moveTo(67.2f,-142f);
path.quadTo(67.2f,-211f,113.7f,-254f);
path.quadTo(160.2f,-297f,230.2f,-297f);
path.quadTo(301.2f,-297f,347.7f,-254f);
path.quadTo(394.2f,-211f,394.2f,-142f);
path.quadTo(394.2f,-74f,348.2f,-31.5f);
path.quadTo(302.2f,11f,230.2f,11f);
path.quadTo(159.2f,11f,113.2f,-31.5f);
path.quadTo(67.2f,-74f,67.2f,-142f);
path.close();
// addComponent period (1, 0, 0, 1, -1, 819)
path.moveTo(125f,-961f);
path.quadTo(125f,-1030f,171.5f,-1073f);
path.quadTo(218f,-1116f,288f,-1116f);
path.quadTo(359f,-1116f,405.5f,-1073f);
path.quadTo(452f,-1030f,452f,-961f);
path.quadTo(452f,-893f,406f,-850.5f);
path.quadTo(360f,-808f,288f,-808f);
path.quadTo(217f,-808f,171f,-850.5f);
path.quadTo(125f,-893f,125f,-961f);
path.moveTo(67.2f,-961f);
path.quadTo(67.2f,-1030f,113.7f,-1073f);
path.quadTo(160.2f,-1116f,230.2f,-1116f);
path.quadTo(301.2f,-1116f,347.7f,-1073f);
path.quadTo(394.2f,-1030f,394.2f,-961f);
path.quadTo(394.2f,-893f,348.2f,-850.5f);
path.quadTo(302.2f,-808f,230.2f,-808f);
path.quadTo(159.2f,-808f,113.2f,-850.5f);
path.quadTo(67.2f,-893f,67.2f,-961f);
path.close();
return path;
}
Expand Down
38 changes: 19 additions & 19 deletions app/src/main/java/omegacentauri/mobi/simplestopwatch/SansDigitsColon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,31 +312,31 @@ public Path makePath() {
return path;
}
});
addCharacter((char)58,496f,134f,new PathMaker() {
addCharacter((char)58,396.8f,134f,new PathMaker() {
@Override
public Path makePath() {
Path path = new Path();
// addComponent period (1, 0, 0, 1, -10, 0)
path.moveTo(134f,-97f);
path.quadTo(134f,-145f,162.5f,-177f);
path.quadTo(191f,-209f,248f,-209f);
path.quadTo(305f,-209f,334.5f,-177f);
path.quadTo(364f,-145f,364f,-97f);
path.quadTo(364f,-51f,334.5f,-20f);
path.quadTo(305f,11f,248f,11f);
path.quadTo(191f,11f,162.5f,-20f);
path.quadTo(134f,-51f,134f,-97f);
path.moveTo(84.4f,-97f);
path.quadTo(84.4f,-145f,112.9f,-177f);
path.quadTo(141.4f,-209f,198.4f,-209f);
path.quadTo(255.4f,-209f,284.9f,-177f);
path.quadTo(314.4f,-145f,314.4f,-97f);
path.quadTo(314.4f,-51f,284.9f,-20f);
path.quadTo(255.4f,11f,198.4f,11f);
path.quadTo(141.4f,11f,112.9f,-20f);
path.quadTo(84.4f,-51f,84.4f,-97f);
path.close();
// addComponent period (1, 0, 0, 1, -9, 883)
path.moveTo(135f,-980f);
path.quadTo(135f,-1028f,163.5f,-1060f);
path.quadTo(192f,-1092f,249f,-1092f);
path.quadTo(306f,-1092f,335.5f,-1060f);
path.quadTo(365f,-1028f,365f,-980f);
path.quadTo(365f,-934f,335.5f,-903f);
path.quadTo(306f,-872f,249f,-872f);
path.quadTo(192f,-872f,163.5f,-903f);
path.quadTo(135f,-934f,135f,-980f);
path.moveTo(85.4f,-980f);
path.quadTo(85.4f,-1028f,113.9f,-1060f);
path.quadTo(142.4f,-1092f,199.4f,-1092f);
path.quadTo(256.4f,-1092f,285.9f,-1060f);
path.quadTo(315.4f,-1028f,315.4f,-980f);
path.quadTo(315.4f,-934f,285.9f,-903f);
path.quadTo(256.4f,-872f,199.4f,-872f);
path.quadTo(142.4f,-872f,113.9f,-903f);
path.quadTo(85.4f,-934f,85.4f,-980f);
path.close();
return path;
}
Expand Down
38 changes: 19 additions & 19 deletions app/src/main/java/omegacentauri/mobi/simplestopwatch/SansMediumDigitsColon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,31 +314,31 @@ public Path makePath() {
return path;
}
});
addCharacter((char)58,543f,130f,new PathMaker() {
addCharacter((char)58,434.4f,130f,new PathMaker() {
@Override
public Path makePath() {
Path path = new Path();
// addComponent period (1, 0, 0, 1, -5, 0)
path.moveTo(271f,-256f);
path.quadTo(339f,-256f,376f,-217.5f);
path.quadTo(413f,-179f,413f,-121f);
path.quadTo(413f,-64f,376f,-26.5f);
path.quadTo(339f,11f,271f,11f);
path.quadTo(206f,11f,168f,-26f);
path.quadTo(130f,-63f,130f,-121f);
path.quadTo(130f,-179f,167f,-217.5f);
path.quadTo(204f,-256f,271f,-256f);
path.moveTo(216.7f,-256f);
path.quadTo(284.7f,-256f,321.7f,-217.5f);
path.quadTo(358.7f,-179f,358.7f,-121f);
path.quadTo(358.7f,-64f,321.7f,-26.5f);
path.quadTo(284.7f,11f,216.7f,11f);
path.quadTo(151.7f,11f,113.7f,-26f);
path.quadTo(75.7f,-63f,75.7f,-121f);
path.quadTo(75.7f,-179f,112.7f,-217.5f);
path.quadTo(149.7f,-256f,216.7f,-256f);
path.close();
// addComponent period (1, 0, 0, 1, -5, 849)
path.moveTo(271f,-1105f);
path.quadTo(339f,-1105f,376f,-1066.5f);
path.quadTo(413f,-1028f,413f,-970f);
path.quadTo(413f,-913f,376f,-875.5f);
path.quadTo(339f,-838f,271f,-838f);
path.quadTo(206f,-838f,168f,-875f);
path.quadTo(130f,-912f,130f,-970f);
path.quadTo(130f,-1028f,167f,-1066.5f);
path.quadTo(204f,-1105f,271f,-1105f);
path.moveTo(216.7f,-1105f);
path.quadTo(284.7f,-1105f,321.7f,-1066.5f);
path.quadTo(358.7f,-1028f,358.7f,-970f);
path.quadTo(358.7f,-913f,321.7f,-875.5f);
path.quadTo(284.7f,-838f,216.7f,-838f);
path.quadTo(151.7f,-838f,113.7f,-875f);
path.quadTo(75.7f,-912f,75.7f,-970f);
path.quadTo(75.7f,-1028f,112.7f,-1066.5f);
path.quadTo(149.7f,-1105f,216.7f,-1105f);
path.close();
return path;
}
Expand Down
18 changes: 11 additions & 7 deletions dumpfont.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
from sys import argv

charsToDump = "0123456789:\u2212"
charsToNarrow = ":"
narrowFraction = 0.8
maximizeDigitBounds = True
fontName = "Roboto-Regular.ttf" if len(argv) < 2 else argv[1]
className = "SansDigitsColon" if len(argv) < 3 else argv[2]
Expand Down Expand Up @@ -92,23 +94,25 @@ def addComponent(self, glyphName, t):
""" % (className, className, "true" if maximizeDigitBounds else "false", maxY-minY))

for c in charsToDump:
forcePath = None
try:
glyph = glyphs[map[ord(c)]]
except:
if c == '\u2212':
glyph = glyphs[map[ord('-')]]


if c in charsToNarrow:
dx = -glyph.width * (1-narrowFraction) * 0.5
w = glyph.width * narrowFraction
else:
dx = 0
w = glyph.width

print(" addCharacter((char)%d,%gf,%gf,new PathMaker() {" % (ord(c),glyph.width,glyph.lsb))
print(" addCharacter((char)%d,%gf,%gf,new PathMaker() {" % (ord(c),w,glyph.lsb))
print(" @Override")
print(" public Path makePath() {")
print(" Path path = new Path();")

if forcePath:
print(path)
else:
glyph.draw(MyPen(indent=" "))
glyph.draw(MyPen(indent=" ", transformation=[[1,0,dx],[0,-1,0],[0,0,1]]))

print(" return path;")
print(" }")
Expand Down

0 comments on commit e4a1092

Please sign in to comment.