summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Kluger2020-03-06 01:15:27 -0500
committerAndy Kluger2020-03-06 01:18:23 -0500
commitb74395af41532eecd093efb4476c3667b82a3686 (patch)
tree78f20fea1de3a3b15d6b2205493e2aed268ee453
parentf078ef77b0629dcfabb6c661ae2d5d2576776ba1 (diff)
downloadaur-b74395af41532eecd093efb4476c3667b82a3686.tar.gz
include disabled G-patch; update node modules; use new names in pptoml; remove slab plans; seems to build ok despite gyp error, see open issue on iosevka's tracker
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore5
-rw-r--r--PKGBUILD19
-rw-r--r--private-build-plans.toml.example225
-rw-r--r--toothless-G.patch32
5 files changed, 133 insertions, 152 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ccdce08b71..0f6d6caf5f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,8 +14,10 @@ pkgbase = ttf-iosevka-term-custom-git
depends = xorg-font-utils
source = git+https://github.com/be5invis/Iosevka
source = private-build-plans.toml.example
+ source = toothless-G.patch
sha256sums = SKIP
- sha256sums = 930cc4b63f9076e6cb40599ef7d51fc7fdab2eaac6a76bf344eb2d79ee4a950e
+ sha256sums = 6004e471b9188445cc8c6c371384a42bedeecb1935765db1d82b4677b1342bc2
+ sha256sums = 56d1d97b421ab462d71875ecadf57d65ee45fe26edee50922ae9ae96350cff52
pkgname = ttf-iosevka-term-custom-git
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8bcadf27153..00000000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*
-!/PKGBUILD
-!/.SRCINFO
-!/.gitignore
-!/private-build-plans.toml.example
diff --git a/PKGBUILD b/PKGBUILD
index d682bb470bd..4c18963e283 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,12 +12,14 @@ depends=('fontconfig' 'xorg-font-utils')
conflicts=()
provides=()
source=(
- "git+https://github.com/be5invis/Iosevka"
- "private-build-plans.toml.example"
+ 'git+https://github.com/be5invis/Iosevka'
+ 'private-build-plans.toml.example'
+ 'toothless-G.patch'
)
sha256sums=(
'SKIP'
- '930cc4b63f9076e6cb40599ef7d51fc7fdab2eaac6a76bf344eb2d79ee4a950e'
+ '6004e471b9188445cc8c6c371384a42bedeecb1935765db1d82b4677b1342bc2'
+ '56d1d97b421ab462d71875ecadf57d65ee45fe26edee50922ae9ae96350cff52'
)
pkgver() {
@@ -31,13 +33,22 @@ prepare() {
cp "$buildplans" Iosevka/
else
echo ">>> $buildplans not found, using private-build-plans.toml.example"
- cp ../private-build-plans.toml.example Iosevka/
+ cp private-build-plans.toml.example Iosevka/private-build-plans.toml
fi
+
+ cd Iosevka
+
+ # patch -p1 < ../toothless-G.patch
+
+ # Uncomment the above line to get back the smoother capital G,
+ # as seen in this image (look for "LIGHT"):
+ # https://raw.githubusercontent.com/be5invis/Iosevka/47023ab4058987f58844f6308d8175e735106b8a/images/preview-all.png
}
build() {
cd Iosevka
npm install
+ npm update
npm run build -- ttf::iosevka-term-custom
}
diff --git a/private-build-plans.toml.example b/private-build-plans.toml.example
index bfa075752b7..649cb91a387 100644
--- a/private-build-plans.toml.example
+++ b/private-build-plans.toml.example
@@ -1,5 +1,7 @@
# docs:
# https://github.com/be5invis/Iosevka
+# https://github.com/be5invis/Iosevka/blob/master/private-build-plans.sample.toml
+# https://github.com/be5invis/Iosevka#build-your-own-style
# ss## stylistic sets:
# https://raw.githubusercontent.com/be5invis/Iosevka/master/images/stylesets.png
@@ -10,151 +12,90 @@
# ligset-* ligature sets:
# https://raw.githubusercontent.com/be5invis/Iosevka/master/images/ligations.png
-[buildPlans.iosevka-custom] # Plan name
-family = "Iosevka Custom" # Font menu family name
-design = [ # Common styles
-
- "cv05", # hooky i
- "cv14", # dotted 0
- "cv24", # open double story g
- "cv26", # short leg m
- "cv27", # tailed l
- "cv33", # short @
- "cv46", # flat top 3
- "cv53", # tailed f
- "cv54", # open short $
- "cv60", # hex *
- "cv69", # curly kK
- "cv72", # curly vV
- "cv74", # curly A
- "cv76", # curly wW
- "cv78", # curly xX
- "cv79", # curly y
- "cv81", # curly Y
- "cv83", # curly R
+[buildPlans.iosevka-custom] # Plan name
+family = "Iosevka Custom" # Font menu family name
+design = [ # Common styles
+
+ "cv05", # hooky i
+ "cv14", # dotted 0
+ "cv24", # open double story g
+ "cv26", # short leg m
+ "cv27", # tailed l
+ "cv33", # short @
+ "cv46", # flat top 3
+ "cv53", # tailed f
+ "cv54", # open short $
+ "cv60", # hex *
+ "cv69", # curly kK
+ "cv72", # curly vV
+ "cv74", # curly A
+ "cv76", # curly wW
+ "cv78", # curly xX
+ "cv79", # curly y
+ "cv81", # curly Y
+ "cv83", # curly R
]
-# upright = [] # Upright-only styles
-# italic = [] # Italic-only styles
-# oblique = [] # Oblique-only styles
-
-[buildPlans.iosevka-slab-custom] # Plan name
-family = "Iosevka Slab Custom" # Font menu family name
-design = [ # Common styles
-
- "slab",
-
- "cv05", # hooky i
- "cv14", # dotted 0
- "cv24", # open double story g
- "cv26", # short leg m
- "cv27", # tailed l
- "cv33", # short @
- "cv46", # flat top 3
- "cv53", # tailed f
- "cv54", # open short $
- "cv60", # hex *
- "cv69", # curly kK
- "cv72", # curly vV
- "cv74", # curly A
- "cv76", # curly wW
- "cv78", # curly xX
- "cv79", # curly y
- "cv81", # curly Y
- "cv83", # curly R
-
-]
-# upright = [] # Upright-only styles
-# italic = [] # Italic-only styles
-# oblique = [] # Oblique-only styles
-
-[buildPlans.iosevka-term-custom] # Plan name
-family = "Iosevka Term Custom" # Font menu family name
-design = [ # Common styles
-
- "term", # strict mono; no ligatures
-
- "cv05", # hooky i
- "cv14", # dotted 0
- "cv24", # open double story g
- "cv26", # short leg m
- "cv27", # tailed l
- "cv33", # short @
- "cv46", # flat top 3
- "cv53", # tailed f
- "cv54", # open short $
- "cv60", # hex *
- "cv69", # curly kK
- "cv72", # curly vV
- "cv74", # curly A
- "cv76", # curly wW
- "cv78", # curly xX
- "cv79", # curly y
- "cv81", # curly Y
- "cv83", # curly R
+# upright = [] # Upright-only styles
+# italic = [] # Italic-only styles
+# oblique = [] # Oblique-only styles
+
+[buildPlans.iosevka-fixed-custom] # Plan name
+family = "Iosevka Fixed Custom" # Font menu family name
+design = [ # Common styles
+
+ "fixed", # strict mono; no ligatures
+
+ "cv05", # hooky i
+ "cv14", # dotted 0
+ "cv24", # open double story g
+ "cv26", # short leg m
+ "cv27", # tailed l
+ "cv33", # short @
+ "cv46", # flat top 3
+ "cv53", # tailed f
+ "cv54", # open short $
+ "cv60", # hex *
+ "cv69", # curly kK
+ "cv72", # curly vV
+ "cv74", # curly A
+ "cv76", # curly wW
+ "cv78", # curly xX
+ "cv79", # curly y
+ "cv81", # curly Y
+ "cv83", # curly R
]
-# upright = [] # Upright-only styles
-# italic = [] # Italic-only styles
-# oblique = [] # Oblique-only styles
-
-[buildPlans.iosevka-termlig-custom] # Plan name
-family = "Iosevka TermLig Custom" # Font menu family name
-design = [ # Common styles
-
- "termlig", # strict mono; with ligatures
-
- "cv05", # hooky i
- "cv14", # dotted 0
- "cv24", # open double story g
- "cv26", # short leg m
- "cv27", # tailed l
- "cv33", # short @
- "cv46", # flat top 3
- "cv53", # tailed f
- "cv54", # open short $
- "cv60", # hex *
- "cv69", # curly kK
- "cv72", # curly vV
- "cv74", # curly A
- "cv76", # curly wW
- "cv78", # curly xX
- "cv79", # curly y
- "cv81", # curly Y
- "cv83", # curly R
-
-]
-# upright = [] # Upright-only styles
-# italic = [] # Italic-only styles
-# oblique = [] # Oblique-only styles
-
-[buildPlans.iosevka-term-slab-custom] # Plan name
-family = "Iosevka Term Slab Custom" # Font menu family name
-design = [ # Common styles
-
- "term", # strict mono; no ligatures
- "slab",
-
- "cv05", # hooky i
- "cv14", # dotted 0
- "cv24", # open double story g
- "cv26", # short leg m
- "cv27", # tailed l
- "cv33", # short @
- "cv46", # flat top 3
- "cv53", # tailed f
- "cv54", # open short $
- "cv60", # hex *
- "cv69", # curly kK
- "cv72", # curly vV
- "cv74", # curly A
- "cv76", # curly wW
- "cv78", # curly xX
- "cv79", # curly y
- "cv81", # curly Y
- "cv83", # curly R
+# upright = [] # Upright-only styles
+# italic = [] # Italic-only styles
+# oblique = [] # Oblique-only styles
+
+[buildPlans.iosevka-term-custom] # Plan name
+family = "Iosevka Term Custom" # Font menu family name
+design = [ # Common styles
+
+ "term", # strict mono; with ligatures
+
+ "cv05", # hooky i
+ "cv14", # dotted 0
+ "cv24", # open double story g
+ "cv26", # short leg m
+ "cv27", # tailed l
+ "cv33", # short @
+ "cv46", # flat top 3
+ "cv53", # tailed f
+ "cv54", # open short $
+ "cv60", # hex *
+ "cv69", # curly kK
+ "cv72", # curly vV
+ "cv74", # curly A
+ "cv76", # curly wW
+ "cv78", # curly xX
+ "cv79", # curly y
+ "cv81", # curly Y
+ "cv83", # curly R
]
-# upright = [] # Upright-only styles
-# italic = [] # Italic-only styles
-# oblique = [] # Oblique-only styles
+# upright = [] # Upright-only styles
+# italic = [] # Italic-only styles
+# oblique = [] # Oblique-only styles
diff --git a/toothless-G.patch b/toothless-G.patch
new file mode 100644
index 00000000000..3e8f1fd6111
--- /dev/null
+++ b/toothless-G.patch
@@ -0,0 +1,32 @@
+diff --git a/glyphs/letters-unified-basic.ptl b/glyphs/letters-unified-basic.ptl
+index 40fb8784..5cd2ffae 100644
+--- a/glyphs/letters-unified-basic.ptl
++++ b/glyphs/letters-unified-basic.ptl
+@@ -2753,8 +2753,6 @@ export : define [apply] : begin
+ do "G and related ============================================================================="
+ define [GShape top sma smb] : glyph-construction
+ local yBar : top * 0.52 + STROKE * 0.25
+- local fine SHOULDERFINE
+- local sb : shoulderMidSlope fine nothing (-1)
+ include : dispiro
+ widths.lhs
+ g4 RIGHTSB (top - HOOK)
+@@ -2762,12 +2760,13 @@ export : define [apply] : begin
+ flat (SB + OX) (top - sma)
+ curl (SB + OX) smb
+ arcvh
+- g4.right.mid (MIDDLE + (CORRECTION_OMIDX - sb) * STROKE) O [widths.heading STROKE 0 {.y (1) .x (sb)}]
++ g4 (MIDDLE + CORRECTION_OMIDS) O
+ archv
+- straight.up.end (RIGHTSB - (STROKE - fine) * HVCONTRAST) sma [widths.heading fine 0 UPWARD]
+- include : HBarTop MIDDLE RIGHTSB yBar
+- include : VBarRight RIGHTSB sma yBar
+- include : VBarRight RIGHTSB sma 0 (STROKE - fine / 2)
++ flat RIGHTSB sma
++ curl RIGHTSB yBar [heading UPWARD]
++ include : dispiro
++ flat MIDDLE yBar [widths 0 STROKE]
++ curl RIGHTSB yBar [heading RIGHTWARD]
+
+ sketch # G
+ set-width WIDTH