Skip to content

Commit

Permalink
Added //= =// =//= (closes #816)
Browse files Browse the repository at this point in the history
  • Loading branch information
tonsky committed Jun 7, 2020
1 parent d413865 commit 267a6fd
Show file tree
Hide file tree
Showing 6 changed files with 285 additions and 12 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ All notable changes to this project will be documented in this file.
- Vertically-aligned colons, greater/less signs #980 #1061
- Make U+2388 Helm Symbol `` single-width #1036
- Disable `=/` because of conflicts with paths `PATH=/...` #1056
- Fixed STAT table in FiraCode-VF.ttf #1054
- Fixed STAT table in FiraCode-VF.ttf #770 #1054
- Added `//=` `=//` `=//=` #816

#### 4.0 (May 18, 2020)

Expand Down
268 changes: 265 additions & 3 deletions FiraCode.glyphs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions clojure/fira_code/calt.clj
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@
(str " ignore sub [hyphen equal] bar' bar;\n"
" ignore sub bar' bar [hyphen equal];\n")

;; #816 //=
["slash" "slash"]
(str " ignore sub equal slash' slash;\n"
" ignore sub slash' slash equal;\n")

;; #346 <--> >--< |--|
["hyphen" "hyphen"]
(str " ignore sub [less greater bar] hyphen' hyphen;\n"
Expand Down
1 change: 1 addition & 0 deletions extras/showcases.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,4 @@ _| |_ _||_ __| ___| |__ |___
#479 #468 #424 #406 #355 #305 =< ==< =<< |=<
#574 :>=
#621 <||>
#1056 =/
12 changes: 9 additions & 3 deletions features/calt/equal_arrows.fea
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ lookup equal_arrows {
ignore sub [equal_start.seq equal_middle.seq] bar' bar bar;

# equal middle & end
sub [less_equal_start.seq less_less_equal_start.seq less_equal_middle.seq less_less_equal_middle.seq greater_equal_start.seq greater_greater_equal_start.seq greater_equal_middle.seq greater_greater_equal_middle.seq bar_equal_start.seq bar_bar_equal_start.seq bar_equal_middle.seq bar_bar_equal_middle.seq slash_equal_start.seq slash_equal_middle.seq colon_equal_middle.seq exclam_equal_middle.seq equal_start.seq equal_middle.seq] equal' [equal less greater bar slash colon exclam] by equal_middle.seq;
sub [less_equal_start.seq less_less_equal_start.seq less_equal_middle.seq less_less_equal_middle.seq greater_equal_start.seq greater_greater_equal_start.seq greater_equal_middle.seq greater_greater_equal_middle.seq bar_equal_start.seq bar_bar_equal_start.seq bar_equal_middle.seq bar_bar_equal_middle.seq slash_equal_start.seq slash_slash_equal_start.seq slash_equal_middle.seq slash_slash_equal_middle.seq colon_equal_middle.seq exclam_equal_middle.seq equal_start.seq equal_middle.seq] equal' [equal less greater bar slash colon exclam] by equal_middle.seq;

sub [less_equal_start.seq less_less_equal_start.seq less_equal_middle.seq less_less_equal_middle.seq greater_equal_start.seq greater_greater_equal_start.seq greater_equal_middle.seq greater_greater_equal_middle.seq bar_equal_start.seq bar_bar_equal_start.seq bar_equal_middle.seq bar_bar_equal_middle.seq slash_equal_start.seq slash_equal_middle.seq colon_equal_middle.seq exclam_equal_middle.seq equal_start.seq equal_middle.seq] equal' by equal_end.seq;
sub [less_equal_start.seq less_less_equal_start.seq less_equal_middle.seq less_less_equal_middle.seq greater_equal_start.seq greater_greater_equal_start.seq greater_equal_middle.seq greater_greater_equal_middle.seq bar_equal_start.seq bar_bar_equal_start.seq bar_equal_middle.seq bar_bar_equal_middle.seq slash_equal_start.seq slash_slash_equal_start.seq slash_equal_middle.seq slash_slash_equal_middle.seq colon_equal_middle.seq exclam_equal_middle.seq equal_start.seq equal_middle.seq] equal' by equal_end.seq;

# double middles
sub [equal_start.seq equal_middle.seq] less.spacer less' equal by less_less_equal_middle.seq;
Expand All @@ -16,6 +16,8 @@ lookup equal_arrows {
sub [equal_start.seq equal_middle.seq] greater' greater equal by greater.spacer;
sub [equal_start.seq equal_middle.seq] bar.spacer bar' equal by bar_bar_equal_middle.seq;
sub [equal_start.seq equal_middle.seq] bar' bar equal by bar.spacer;
sub [equal_start.seq equal_middle.seq] slash.spacer slash' equal by slash_slash_equal_middle.seq;
sub [equal_start.seq equal_middle.seq] slash' slash equal by slash.spacer;

# single middles
sub [equal_start.seq equal_middle.seq] less' equal by less_equal_middle.seq;
Expand All @@ -32,6 +34,8 @@ lookup equal_arrows {
sub [equal_start.seq equal_middle.seq] greater' greater by greater.spacer;
sub [equal_start.seq equal_middle.seq] bar.spacer bar' by bar_bar_equal_end.seq;
sub [equal_start.seq equal_middle.seq] bar' bar by bar.spacer;
sub [equal_start.seq equal_middle.seq] slash.spacer slash' by slash_slash_equal_end.seq;
sub [equal_start.seq equal_middle.seq] slash' slash by slash.spacer;

# single ends
sub [equal_start.seq equal_middle.seq] less' by less_equal_end.seq;
Expand All @@ -46,6 +50,8 @@ lookup equal_arrows {
sub greater' greater equal by greater.spacer;
sub bar.spacer bar' equal by bar_bar_equal_start.seq;
sub bar' bar equal by bar.spacer;
sub slash.spacer slash' equal by slash_slash_equal_start.seq;
sub slash' slash equal by slash.spacer;

# Disable >=< #548
sub greater' equal less [equal less] by greater_equal_start.seq;
Expand All @@ -55,7 +61,7 @@ lookup equal_arrows {
sub equal' less [equal less] by equal_start.seq;

# Disable =/ #1056
sub equal' slash equal by equal_start.seq;
sub equal' slash [equal slash] by equal_start.seq;

# single beginnings
sub less' equal by less_equal_start.seq;
Expand Down
8 changes: 3 additions & 5 deletions script/build_ttf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -euo pipefail

source venv/bin/activate

Expand All @@ -17,8 +17,6 @@ for weight in "${weights[@]}"; do
gftools fix-dsig --autofix ${file}

echo "TTFautohint " ${file}
hintedFile=${file/".ttf"/"-hinted.ttf"}
ttfautohint -I ${file} ${hintedFile} --stem-width-mode nnn --composites
# --windows-compatibility
mv ${hintedFile} ${file}
ttfautohint -I ${file} ${file}.hinted --stem-width-mode nnn --composites --windows-compatibility
mv ${file}.hinted ${file}
done

0 comments on commit 267a6fd

Please sign in to comment.