[gentium-commits] [SCM] gentium updated: r72 - trunk/gentium/source/fonts/gentium-tug/type1
Pavel Far??
INVALID.NOREPLY at gnu.org.ua
Thu Mar 31 15:48:24 CEST 2022
Author: pavel
Date: 2022-03-31 13:48:24 +0000 (Thu, 31 Mar 2022)
New Revision: 72
Modified:
trunk/gentium/source/fonts/gentium-tug/type1/kerncorrection.py
Log:
refactor kerncorrection.py a little
Modified: trunk/gentium/source/fonts/gentium-tug/type1/kerncorrection.py
===================================================================
--- trunk/gentium/source/fonts/gentium-tug/type1/kerncorrection.py 2022-03-31 13:12:40 UTC (rev 71)
+++ trunk/gentium/source/fonts/gentium-tug/type1/kerncorrection.py 2022-03-31 13:48:24 UTC (rev 72)
@@ -56,7 +56,7 @@
# also at other types of quotes, such as Polish and French; start with improving
# aacute.sc + quotedblleft and adieresis.sc + quotedblleft
# TODO: several methods could be merged (simpler code, but worse result to report to Victor)
- kernpairscapital = [
+ kern_pairs_capital = [
["V A", "V Aacute", "V Abreve", "V Acircumflex", "V Adieresis", "V AE", "V Agrave", "V Amacron", "V Aogonek", "V Aring", "V Atilde"],
["A Y", "A Yacute", "A Ydieresis", "Aacute Y", "Abreve Y", "Acircumflex Y", "Adieresis Y", "Agrave Y", "Amacron Y", "Aogonek Y", "Aring Y", "Atilde Y", "Aacute Yacute"],
["L V", "Lcommaaccent V", "Lslash V"],
@@ -101,7 +101,7 @@
["D V", "Dcaron V", "Dcroat V"]
]
- kernpairsinitialcap = [
+ kern_pairs_initial_cap = [
["V a", "V aacute", "V abreve", "V acircumflex", "V adieresis", "V ae", "V agrave", "V amacron", "V aogonek", "V aring", "V atilde"],
["V e", "V eacute", "V ecaron", "V ecircumflex", "V edieresis", "V edotaccent", "V egrave", "V emacron", "V eogonek"],
["V o", "V oacute", "V ocircumflex", "V odieresis", "V oe", "V ograve", "V ohungarumlaut", "V omacron", "V oslash", "V otilde"],
@@ -123,7 +123,7 @@
["W o", "W oacute", "W ocircumflex", "W odieresis", "W oe", "W ograve", "W ohungarumlaut", "W omacron", "W oslash", "W otilde"]
]
- kernpairssmall = [
+ kern_pairs_small = [
["v e", "v eacute", "v ecaron", "v ecircumflex", "v edieresis", "v edotaccent", "v egrave", "v emacron", "v eogonek"],
["k e", "k eacute", "k ecaron", "k ecircumflex", "k edieresis", "k edotaccent", "k egrave", "k emacron", "k eogonek", "kcommaaccent e"],
["o v", "oacute v", "ocircumflex v", "odieresis v", "ograve v", "oslash v", "otilde v"],
@@ -148,7 +148,7 @@
["r d", "r dcaron", "r dcroat", "racute d", "rcaron d", "rcommaaccent d", "rcaron dcaron"]
]
- kernpairsquotes = [
+ kern_pairs_quotes = [
# this is far from complete
# TODO: use this list also for accented small caps (using kernfactor)
["A quotedblright", "A quotedblleft", "Aacute quotedblleft", "Adieresis quotedblleft"],
@@ -161,7 +161,7 @@
["A quoteright", "quotesinglbase V", "quotesinglbase W", "quotesinglbase Y", "quotesinglbase Yacute", "quotesinglbase T", "quotesinglbase Tcaron"]
]
- rightpunctuationsmall = [
+ right_punctuation_small = [
["r comma", "racute comma", "rcaron comma", "rcommaaccent comma"],
["y comma", "yacute comma", "ydieresis comma"],
["r period", "racute period", "rcaron period", "rcommaaccent period"],
@@ -170,7 +170,7 @@
]
# first pair are Latin letters, the other pairs are Cyrillic letters; probably not very obvious
- kernpairscyrillic = [
+ kern_pairs_cyrillic = [
["T A", "Т А", "Г А"],
["A T", "А Т"],
]
@@ -197,7 +197,7 @@
extra_kern_file.write(line)
- def smallcaps(self, fromreader, kernfactor):
+ def small_caps(self, fromreader, kernfactor):
a = fromreader.getkerns("KPX [A-Z] [A-Z]")
for s in a:
parts = s.split()
@@ -205,7 +205,7 @@
".sc " + str(int(round(kernfactor * float(parts[3])))) +
'\n')
- def initialcap(self, fromreader, kernfactor):
+ def initial_cap(self, fromreader, kernfactor):
a = fromreader.getkerns("KPX [A-Z] [A-Z]")
for s in a:
parts = s.split()
@@ -212,7 +212,7 @@
self.add_to_kern_lines("KPX " + parts[1] + " " + parts[2].lower() + ".sc " +
str(int(round(kernfactor * float(parts[3])))) + '\n')
- def rightpunctuation(self, fromreader, kernfactor):
+ def right_punctuation(self, fromreader, kernfactor):
# small cap and punctuation
a = fromreader.getkerns("KPX [A-Z] period")
a.extend(fromreader.getkerns("KPX [A-Z] comma"))
@@ -223,7 +223,7 @@
self.add_to_kern_lines("KPX " + parts[1].lower() + ".sc " + parts[2] + " " +
str(int(round(kernfactor * float(parts[3])))) + '\n')
- def leftpunctuation(self, fromreader, kernfactor):
+ def left_punctuation(self, fromreader, kernfactor):
# punctuation and small cap
a = fromreader.getkerns("KPX quotedblleft [A-Z]")
a.extend(fromreader.getkerns("KPX quoteleft [A-Z]"))
@@ -232,8 +232,8 @@
self.add_to_kern_lines("KPX " + parts[1] + " " + parts[2].lower() + ".sc " +
str(int(round(kernfactor * float(parts[3])))) + '\n')
- def accentedcapitalletters(self, fromreader):
- for x in self.kernpairscapital:
+ def accented_capital_letters(self, fromreader):
+ for x in self.kern_pairs_capital:
basekern = x[0]
derivedkerns = x[1:]
a = fromreader.getkerns("KPX " + basekern + " ")
@@ -242,8 +242,8 @@
newkernline = kernline.replace(basekern, b)
self.add_to_kern_lines(newkernline)
- def accentedsmallletters(self, fromreader):
- for x in self.kernpairssmall:
+ def accented_small_letters(self, fromreader):
+ for x in self.kern_pairs_small:
basekern = x[0]
derivedkerns = x[1:]
a = fromreader.getkerns("KPX " + basekern + " ")
@@ -252,8 +252,8 @@
newkernline = kernline.replace(basekern, b)
self.add_to_kern_lines(newkernline)
- def accentedsmallcaps(self, fromreader, kernfactor):
- for x in self.kernpairscapital:
+ def accented_small_caps(self, fromreader, kernfactor):
+ for x in self.kern_pairs_capital:
basekern = x[0]
derivedkerns = x[1:]
a = fromreader.getkerns("KPX " + basekern + " ")
@@ -265,8 +265,8 @@
".sc " + str(int(round(kernfactor * float(parts[3])))) +
'\n')
- def accentedinitialcap(self, fromreader):
- for x in self.kernpairsinitialcap:
+ def accented_initial_cap(self, fromreader):
+ for x in self.kern_pairs_initial_cap:
basekern = x[0]
derivedkerns = x[1:]
a = fromreader.getkerns("KPX " + basekern + " ")
@@ -275,8 +275,8 @@
newkernline = kernline.replace(basekern, b)
self.add_to_kern_lines(newkernline)
- def accentedinitialcapsmallcap(self, fromreader, kernfactor):
- for x in self.kernpairscapital:
+ def accented_initial_cap_small_cap(self, fromreader, kernfactor):
+ for x in self.kern_pairs_capital:
basekern = x[0]
derivedkerns = x[1:]
a = fromreader.getkerns("KPX " + basekern + " ")
@@ -287,8 +287,8 @@
self.add_to_kern_lines("KPX " + parts[1] + " " + parts[2].lower() + ".sc " +
str(int(round(kernfactor * float(parts[3])))) + '\n')
- def accentedrightpunctuation(self, fromreader):
- for x in self.rightpunctuationsmall:
+ def accented_right_punctuation(self, fromreader):
+ for x in self.right_punctuation_small:
basekern = x[0]
derivedkerns = x[1:]
a = fromreader.getkerns("KPX " + basekern + " ")
@@ -298,12 +298,12 @@
newkernline = kernline.replace(basekern, b)
self.add_to_kern_lines(newkernline)
- def accentedleftpunctuation(self, fromreader):
+ def accented_left_punctuation(self, fromreader):
# nothing to be done
pass
- def czechquotes(self, fromreader):
- for x in self.kernpairsquotes:
+ def czech_quotes(self, fromreader):
+ for x in self.kern_pairs_quotes:
basekern = x[0]
derivedkerns = x[1:]
a = fromreader.getkerns("KPX " + basekern + " ")
@@ -316,11 +316,11 @@
""" Convert character to 'uniXXXX' string """
return "uni{0:04x}".format(ord(c))
- # TODO: Test the kernpairscyrillic array. First pair must be Latin letters,
+ # TODO: Test the kern_pairs_cyrillic array. First pair must be Latin letters,
# all the remaining pairs must be Cyrillic letters.
def cyrillic_kerns(self, fromreader):
- for x in self.kernpairscyrillic:
+ for x in self.kern_pairs_cyrillic:
basekern = x[0]
derivedkerns = x[1:]
a = fromreader.getkerns("KPX " + basekern + " ")
@@ -341,18 +341,18 @@
# output_generator is not a file ane more! Rename!
output_generator = KernWriter(sys.argv[2])
# letters without accents
-output_generator.smallcaps(fin, kernfactor)
-output_generator.initialcap(fin, kernfactor)
-output_generator.rightpunctuation(fin, kernfactor)
-output_generator.leftpunctuation(fin, kernfactor)
+output_generator.small_caps(fin, kernfactor)
+output_generator.initial_cap(fin, kernfactor)
+output_generator.right_punctuation(fin, kernfactor)
+output_generator.left_punctuation(fin, kernfactor)
# letters with accents
-output_generator.accentedcapitalletters(fin)
-output_generator.accentedsmallletters(fin)
-output_generator.accentedsmallcaps(fin, kernfactor)
-output_generator.accentedinitialcap(fin)
-output_generator.accentedinitialcapsmallcap(fin, kernfactor)
-output_generator.accentedrightpunctuation(fin)
-output_generator.accentedleftpunctuation(fin)
-output_generator.czechquotes(fin)
+output_generator.accented_capital_letters(fin)
+output_generator.accented_small_letters(fin)
+output_generator.accented_small_caps(fin, kernfactor)
+output_generator.accented_initial_cap(fin)
+output_generator.accented_initial_cap_small_cap(fin, kernfactor)
+output_generator.accented_right_punctuation(fin)
+output_generator.accented_left_punctuation(fin)
+output_generator.czech_quotes(fin)
output_generator.cyrillic_kerns(fin)
output_generator.write_kern_lines_to_file()
More information about the gentium-commits
mailing list.