mirror of
https://github.com/ryanoasis/nerd-fonts.git
synced 2024-11-19 16:39:20 +02:00
#4 Copying both sets of glyphs to the source font
* refactored main logic into re-usable function * clean-up needed
This commit is contained in:
ryanoasis
parent
d1211d3b57
commit
883092c7de
281
font-patcher
281
font-patcher
@ -29,8 +29,20 @@ sourceFont.appendSFNTName('English (US)', 'Compatible Full', sourceFont.fullname
|
|||||||
|
|
||||||
sourceFont_em_original = sourceFont.em
|
sourceFont_em_original = sourceFont.em
|
||||||
|
|
||||||
symbols =fontforge.open("glyph-source-fonts/original-source.otf")
|
symbols = fontforge.open("glyph-source-fonts/original-source.otf")
|
||||||
#symbols2 =fontforge.open("glyph-source-fonts/original-source.otf")
|
symbols2 = fontforge.open("glyph-source-fonts/devicons.ttf")
|
||||||
|
|
||||||
|
symbolsRangeStart = 0xE500
|
||||||
|
symbolsRangeEnd = 0xE51D
|
||||||
|
|
||||||
|
symbols2RangeStart = 0xE600
|
||||||
|
symbols2RangeEnd = 0xE6A4
|
||||||
|
|
||||||
|
sourceFontRange1Start = 0xE600
|
||||||
|
sourceFontRange1End = 0xE61D
|
||||||
|
|
||||||
|
sourceFontRange2Start = 0xE700
|
||||||
|
sourceFontRange2End = 0xE7A4
|
||||||
|
|
||||||
SYM_ATTR = {
|
SYM_ATTR = {
|
||||||
# Right/left-aligned glyphs will have their advance width reduced in order to overlap the next glyph slightly
|
# Right/left-aligned glyphs will have their advance width reduced in order to overlap the next glyph slightly
|
||||||
@ -48,6 +60,7 @@ SYM_ATTR = {
|
|||||||
|
|
||||||
# Force the em size to be equal
|
# Force the em size to be equal
|
||||||
symbols.em = sourceFont.em
|
symbols.em = sourceFont.em
|
||||||
|
symbols2.em = sourceFont.em
|
||||||
|
|
||||||
# Initial font dimensions
|
# Initial font dimensions
|
||||||
font_dim = {
|
font_dim = {
|
||||||
@ -99,174 +112,117 @@ def get_dim(glyph):
|
|||||||
'height': bbox[3] + (-bbox[1]),
|
'height': bbox[3] + (-bbox[1]),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def copy_glyphs(sourceFont, sourceFontStart, sourceFontEnd, symbolFont, symbolFontStart, symbolFontEnd):
|
||||||
|
|
||||||
#sourceFont.selection.select(("ranges","unicode"),0xE612,0xE61D)
|
#sourceFontStart = 0xE600 # hex literal, gives us a regular integer
|
||||||
#symbols.selection.select(("ranges","unicode"),0xE500,0xE51D)
|
#sourceFontEnd = 0xE61D
|
||||||
|
sourceFontList = []
|
||||||
|
sourceFontCounter = 0
|
||||||
|
|
||||||
print sourceFont.selection[0xE611] # false
|
for i in xrange(sourceFontStart, sourceFontEnd + 1):
|
||||||
print sourceFont.selection[0xE611] # false
|
print format(i, 'X')
|
||||||
print sourceFont.selection[0xE612] # true
|
sourceFontList.append(format(i, 'X'))
|
||||||
|
|
||||||
#for glyph in symbols.selection.byGlyphs:
|
|
||||||
#print 'encoding'
|
|
||||||
#print glyph.encoding
|
|
||||||
#print glyph.glyphname
|
|
||||||
# end for
|
|
||||||
|
|
||||||
#sys.exit()
|
|
||||||
|
|
||||||
sourceFontStart = 0xE600 # hex literal, gives us a regular integer
|
|
||||||
sourceFontEnd = 0xE61D
|
|
||||||
sourceFontList = []
|
|
||||||
sourceFontCounter = 0
|
|
||||||
|
|
||||||
for i in xrange(sourceFontStart, sourceFontEnd + 1):
|
|
||||||
print format(i, 'X')
|
|
||||||
sourceFontList.append(format(i, 'X'))
|
|
||||||
|
|
||||||
|
|
||||||
#print sourceFontList[0]
|
|
||||||
|
|
||||||
# Create glyphs from symbol font
|
|
||||||
#for sym_glyph in symbols.glyphs():
|
|
||||||
symbols.selection.select(("ranges","unicode"),0xE500,0xE51D)
|
|
||||||
#symbols2.selection.select(("ranges","unicode"),0xE512,0xE51D)
|
|
||||||
sourceFont.selection.select(("ranges","unicode"),0xE600,0xE61D)
|
|
||||||
#print sourceFont.selection[0xE612] # only returns true|false
|
|
||||||
#sourceFontGlyphs = sourceFont.selection.select(("ranges","unicode"),0xE612,0xE61D).byGlyphs
|
|
||||||
#print "selection 'sourceFontGlyphs'"
|
|
||||||
#print sourceFontGlyphs
|
|
||||||
#print eval(sourceFontGlyphs)
|
|
||||||
#print next(sourceFontGlyphs)
|
|
||||||
#print sourceFontGlyphs.next()
|
|
||||||
#print sourceFontGlyphs[0xE6120]
|
|
||||||
|
|
||||||
#print "byglyphs"
|
|
||||||
#print sourceFont.selection.byGlyphs
|
|
||||||
#print symbols[0xE512]
|
|
||||||
#print sourceFont.selection.select(0xE612)
|
|
||||||
#print sourceFont.selection.next()
|
|
||||||
#print sourceFont.selection.byGlyphs[0].encoding
|
|
||||||
#print symbols[0xE512].glyphname
|
|
||||||
#print sourceFont.selection.select(0).encoding
|
|
||||||
#print sourceFont.selection.byGlyphs.glyphname
|
|
||||||
#print sourceFont.selection.select(0).byGlyphs
|
|
||||||
#print sourceFont.selection.select(1)
|
|
||||||
#print "symbols"
|
|
||||||
#print symbols.selection
|
|
||||||
#for sym_glyph in range(0xE500,0xE51D):
|
|
||||||
#selectiono = symbols2.selection.byGlyphs
|
|
||||||
for sym_glyph in symbols.selection.byGlyphs:
|
|
||||||
#sym_attr = SYM_ATTR[sym_glyph.unicode]
|
|
||||||
print "updating glyph: " + str(sym_glyph)
|
|
||||||
print "updating glyph: " + str(sym_glyph.encoding)
|
|
||||||
print "updating glyph: " + str(sym_glyph.unicode)
|
|
||||||
print sourceFontCounter
|
|
||||||
print sourceFontList[sourceFontCounter]
|
|
||||||
# convince that this string really is a hex:
|
|
||||||
currentSourceFontGlyph = int("0x" + sourceFontList[sourceFontCounter], 16)
|
|
||||||
print currentSourceFontGlyph
|
|
||||||
|
|
||||||
# Prepare symbol glyph dimensions
|
|
||||||
sym_dim = get_dim(sym_glyph)
|
|
||||||
|
|
||||||
# Select and copy symbol from its encoding point
|
|
||||||
symbols.selection.select(sym_glyph.encoding)
|
|
||||||
#symbols.selection.select(sym_glyph)
|
|
||||||
symbols.copy()
|
|
||||||
|
|
||||||
# Select and paste symbol to its unicode code point
|
|
||||||
#sourceFont.selection.select(sym_glyph.unicode)
|
|
||||||
#sourceFont.selection.select(sourceFont.selection[0])
|
|
||||||
#sourceFont.selection.select(sourceFont[0xE612])
|
|
||||||
#sourceFont.selection.select(0xE612)
|
|
||||||
#currentSourceFontGlyph = "0xE600"
|
|
||||||
sourceFont.selection.select(currentSourceFontGlyph)
|
|
||||||
sourceFont.paste()
|
|
||||||
|
|
||||||
# Now that we have copy/pasted the glyph, it's time to scale and move it
|
|
||||||
|
|
||||||
# Handle glyph stretching
|
|
||||||
#if 'x' in sym_attr['stretch']:
|
|
||||||
# # Stretch the glyph horizontally
|
|
||||||
# scale_ratio = font_dim['width'] / sym_dim['width']
|
|
||||||
|
|
||||||
# sourceFont.transform(psMat.scale(scale_ratio, 1))
|
|
||||||
#if 'y' in sym_attr['stretch']:
|
|
||||||
# # Stretch the glyph vertically
|
|
||||||
# scale_ratio = font_dim['height'] / sym_dim['height']
|
|
||||||
|
|
||||||
# sourceFont.transform(psMat.scale(1, scale_ratio))
|
|
||||||
|
|
||||||
# Use the dimensions from the pasted and stretched glyph
|
|
||||||
#sym_dim = get_dim(sourceFont[sym_glyph.unicode])
|
|
||||||
#sym_dim = get_dim(sourceFont.selection.byGlyphs[0])
|
|
||||||
#sym_dim = get_dim(sourceFont[0xE612])
|
|
||||||
sym_dim = get_dim(sourceFont[currentSourceFontGlyph])
|
|
||||||
|
|
||||||
# Center-align the glyph vertically
|
|
||||||
font_ycenter = font_dim['height'] / 2
|
|
||||||
sym_ycenter = sym_dim['height'] / 2
|
|
||||||
|
|
||||||
# First move it to the ymax (top)
|
|
||||||
sourceFont.transform(psMat.translate(0, font_dim['ymax'] - sym_dim['ymax']))
|
|
||||||
|
|
||||||
# Then move it the y center difference
|
|
||||||
sourceFont.transform(psMat.translate(0, sym_ycenter - font_ycenter))
|
|
||||||
|
|
||||||
# Ensure that the glyph doesn't extend outside the font's bounding box
|
|
||||||
if sym_dim['width'] > font_dim['width']:
|
|
||||||
# The glyph is too wide, scale it down to fit
|
|
||||||
scale_matrix = psMat.scale(font_dim['width'] / sym_dim['width'], 1)
|
|
||||||
|
|
||||||
sourceFont.transform(scale_matrix)
|
|
||||||
|
|
||||||
# Use the dimensions from the stretched glyph
|
|
||||||
#sym_dim = get_dim(sourceFont[sym_glyph.unicode])
|
|
||||||
#sym_dim = get_dim(sourceFont.selection[0])
|
|
||||||
#sym_dim = get_dim(sourceFont[0xE612])
|
|
||||||
sym_dim = get_dim(sourceFont[currentSourceFontGlyph])
|
|
||||||
|
|
||||||
# Handle glyph alignment
|
|
||||||
#if sym_attr['align'] == 'c':
|
|
||||||
# # Center align
|
|
||||||
# align_matrix = psMat.translate(font_dim['width'] / 2 - sym_dim['width'] / 2 , 0)
|
|
||||||
align_matrix = psMat.translate(font_dim['width'] / 2 - sym_dim['width'] / 2 , 0)
|
|
||||||
#elif sym_attr['align'] == 'r':
|
|
||||||
# # Right align
|
|
||||||
# align_matrix = psMat.translate(font_dim['width'] - sym_dim['width'], 0)
|
|
||||||
#else:
|
|
||||||
# No alignment (left alignment)
|
|
||||||
#align_matrix = psMat.translate(0, 0)
|
|
||||||
|
|
||||||
sourceFont.transform(align_matrix)
|
|
||||||
|
|
||||||
#if sym_attr['overlap'] is True:
|
|
||||||
# overlap_width = sourceFont.em / 48
|
|
||||||
|
|
||||||
# # Stretch the glyph slightly horizontally if it should overlap
|
|
||||||
# sourceFont.transform(psMat.scale((sym_dim['width'] + overlap_width) / sym_dim['width'], 1))
|
|
||||||
|
|
||||||
# if sym_attr['align'] == 'l':
|
|
||||||
# # The glyph should be left-aligned, so it must be moved overlap_width to the left
|
|
||||||
# # This only applies to left-aligned glyphs because the glyph is scaled to the right
|
|
||||||
# sourceFont.transform(psMat.translate(-overlap_width, 0))
|
|
||||||
|
|
||||||
# Ensure the font is considered monospaced on Windows
|
|
||||||
#sourceFont[sym_glyph.unicode].width = font_dim['width']
|
|
||||||
#sourceFont[sourceFont[0]].width = font_dim['width']
|
|
||||||
#sourceFont[0xE612].width = font_dim['width']
|
|
||||||
sourceFont[currentSourceFontGlyph].width = font_dim['width']
|
|
||||||
sourceFontCounter += 1
|
|
||||||
# reset selection so iteration works propertly @todo fix? rookie misunderstanding?
|
|
||||||
symbols.selection.select(("ranges","unicode"),0xE500,0xE51D)
|
|
||||||
# end for
|
|
||||||
|
|
||||||
|
# Create glyphs from symbol font
|
||||||
|
|
||||||
|
symbolFont.selection.select(("ranges","unicode"),symbolFontStart,symbolFontEnd)
|
||||||
|
sourceFont.selection.select(("ranges","unicode"),sourceFontStart,sourceFontEnd)
|
||||||
|
|
||||||
|
for sym_glyph in symbolFont.selection.byGlyphs:
|
||||||
|
#sym_attr = SYM_ATTR[sym_glyph.unicode]
|
||||||
|
print "updating glyph: " + str(sym_glyph)
|
||||||
|
print "updating glyph: " + str(sym_glyph.encoding)
|
||||||
|
print "updating glyph: " + str(sym_glyph.unicode)
|
||||||
|
#print sourceFontCounter
|
||||||
|
#print sourceFontList[sourceFontCounter]
|
||||||
|
# convince that this string really is a hex:
|
||||||
|
currentSourceFontGlyph = int("0x" + sourceFontList[sourceFontCounter], 16)
|
||||||
|
#print currentSourceFontGlyph
|
||||||
|
|
||||||
|
# Prepare symbol glyph dimensions
|
||||||
|
sym_dim = get_dim(sym_glyph)
|
||||||
|
|
||||||
|
# Select and copy symbol from its encoding point
|
||||||
|
symbolFont.selection.select(sym_glyph.encoding)
|
||||||
|
symbolFont.copy()
|
||||||
|
|
||||||
|
# Select and paste symbol to its unicode code point
|
||||||
|
sourceFont.selection.select(currentSourceFontGlyph)
|
||||||
|
sourceFont.paste()
|
||||||
|
|
||||||
|
# Now that we have copy/pasted the glyph, it's time to scale and move it
|
||||||
|
|
||||||
|
# Handle glyph stretching
|
||||||
|
#if 'x' in sym_attr['stretch']:
|
||||||
|
# # Stretch the glyph horizontally
|
||||||
|
# scale_ratio = font_dim['width'] / sym_dim['width']
|
||||||
|
|
||||||
|
# sourceFont.transform(psMat.scale(scale_ratio, 1))
|
||||||
|
#if 'y' in sym_attr['stretch']:
|
||||||
|
# # Stretch the glyph vertically
|
||||||
|
# scale_ratio = font_dim['height'] / sym_dim['height']
|
||||||
|
|
||||||
|
# sourceFont.transform(psMat.scale(1, scale_ratio))
|
||||||
|
|
||||||
|
# Use the dimensions from the pasted and stretched glyph
|
||||||
|
sym_dim = get_dim(sourceFont[currentSourceFontGlyph])
|
||||||
|
|
||||||
|
# Center-align the glyph vertically
|
||||||
|
font_ycenter = font_dim['height'] / 2
|
||||||
|
sym_ycenter = sym_dim['height'] / 2
|
||||||
|
|
||||||
|
# First move it to the ymax (top)
|
||||||
|
sourceFont.transform(psMat.translate(0, font_dim['ymax'] - sym_dim['ymax']))
|
||||||
|
|
||||||
|
# Then move it the y center difference
|
||||||
|
sourceFont.transform(psMat.translate(0, sym_ycenter - font_ycenter))
|
||||||
|
|
||||||
|
# Ensure that the glyph doesn't extend outside the font's bounding box
|
||||||
|
if sym_dim['width'] > font_dim['width']:
|
||||||
|
# The glyph is too wide, scale it down to fit
|
||||||
|
scale_matrix = psMat.scale(font_dim['width'] / sym_dim['width'], 1)
|
||||||
|
|
||||||
|
sourceFont.transform(scale_matrix)
|
||||||
|
|
||||||
|
# Use the dimensions from the stretched glyph
|
||||||
|
sym_dim = get_dim(sourceFont[currentSourceFontGlyph])
|
||||||
|
|
||||||
|
# Handle glyph alignment
|
||||||
|
#if sym_attr['align'] == 'c':
|
||||||
|
# # Center align
|
||||||
|
# align_matrix = psMat.translate(font_dim['width'] / 2 - sym_dim['width'] / 2 , 0)
|
||||||
|
align_matrix = psMat.translate(font_dim['width'] / 2 - sym_dim['width'] / 2 , 0)
|
||||||
|
#elif sym_attr['align'] == 'r':
|
||||||
|
# # Right align
|
||||||
|
# align_matrix = psMat.translate(font_dim['width'] - sym_dim['width'], 0)
|
||||||
|
#else:
|
||||||
|
# No alignment (left alignment)
|
||||||
|
#align_matrix = psMat.translate(0, 0)
|
||||||
|
|
||||||
|
sourceFont.transform(align_matrix)
|
||||||
|
|
||||||
|
#if sym_attr['overlap'] is True:
|
||||||
|
# overlap_width = sourceFont.em / 48
|
||||||
|
|
||||||
|
# # Stretch the glyph slightly horizontally if it should overlap
|
||||||
|
# sourceFont.transform(psMat.scale((sym_dim['width'] + overlap_width) / sym_dim['width'], 1))
|
||||||
|
|
||||||
|
# if sym_attr['align'] == 'l':
|
||||||
|
# # The glyph should be left-aligned, so it must be moved overlap_width to the left
|
||||||
|
# # This only applies to left-aligned glyphs because the glyph is scaled to the right
|
||||||
|
# sourceFont.transform(psMat.translate(-overlap_width, 0))
|
||||||
|
|
||||||
|
# Ensure the font is considered monospaced on Windows
|
||||||
|
sourceFont[currentSourceFontGlyph].width = font_dim['width']
|
||||||
|
sourceFontCounter += 1
|
||||||
|
# reset selection so iteration works propertly @todo fix? rookie misunderstanding?
|
||||||
|
symbolFont.selection.select(("ranges","unicode"),symbolFontStart,symbolFontEnd)
|
||||||
|
# end for
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
copy_glyphs(sourceFont, sourceFontRange1Start, sourceFontRange1End, symbols, symbolsRangeStart, symbolsRangeEnd)
|
||||||
|
copy_glyphs(sourceFont, sourceFontRange2Start, sourceFontRange2End, symbols2, symbols2RangeStart, symbols2RangeEnd)
|
||||||
|
|
||||||
extension = os.path.splitext(sourceFont.path)[1]
|
extension = os.path.splitext(sourceFont.path)[1]
|
||||||
|
|
||||||
@ -277,5 +233,4 @@ sourceFont.generate(sourceFont.fullname + extension)
|
|||||||
|
|
||||||
print "Generated"
|
print "Generated"
|
||||||
print sourceFont.fullname
|
print sourceFont.fullname
|
||||||
#print sourceFont.fontname
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user