Move fira to submodule

This commit is contained in:
Justin Su 2018-05-11 03:42:59 +00:00 committed by Ben Kelly
parent 81470dc27b
commit a9e24954a9
8 changed files with 8 additions and 4 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "fira"]
path = fira
url = https://github.com/tonsky/FiraCode

1
fira Submodule

@ -0,0 +1 @@
Subproject commit 30862e05b00f41c9179a9424e382755a5ef954f0

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -38,13 +38,13 @@ def get_ligature_source(fontname):
for weight in ['Bold', 'Retina', 'Medium', 'Regular', 'Light']:
if fontname.endswith('-' + weight):
# Exact match for one of the Fira Code weights
return 'fira/FiraCode-%s.otf' % weight
return 'fira/distr/otf/FiraCode-%s.otf' % weight
# No exact match. Guess that we want 'Bold' if the font name has 'Bold' in
# it, and 'Regular' otherwise.
if 'Bold' in fontname:
return 'fira/FiraCode-Bold.otf'
return 'fira/FiraCode-Regular.otf'
return 'fira/distr/otf/FiraCode-Bold.otf'
return 'fira/distr/otf/FiraCode-Regular.otf'
class LigatureCreator(object):
@ -240,7 +240,7 @@ def parse_args():
parser.add_argument("--ligature-font-path",
type=str, default='', metavar='PATH',
help="The file to copy ligatures from. If unspecified, ligaturize will"
" attempt to pick a suitable one from fira/ based on the input"
" attempt to pick a suitable one from fira/distr/otf/ based on the input"
" font's weight.")
parser.add_argument("--copy-character-glyphs",
default=False, action='store_true',