Few cleanups

aitikgupta · aitikgupta · commit a2876b320c1d · 2021-08-07T06:54:30.000+05:30
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -692,7 +692,6 @@ def __init__(self, filename, metadata=None):
         # differently encoded Type-1 fonts may share the same descriptor
         self.type1Descriptors = {}
         self._character_tracker = _backend_pdf_ps.CharacterTracker()
-        # self._char_to_font = None
 
         self.alphaStates = {}   # maps alpha values to graphics state objects
         self._alpha_state_seq = (Name(f'A{i}') for i in itertools.count(1))
@@ -916,7 +915,6 @@ def dviFontName(self, dvifont):
         return pdfname
 
     def writeFonts(self):
-        print("fonts: ", self.fontNames)
         fonts = {}
         for dviname, info in sorted(self.dviFontInfo.items()):
             Fx = info.pdfname
@@ -933,7 +931,6 @@ def writeFonts(self):
                 # a normal TrueType font
                 _log.debug('Writing TrueType font.')
                 chars = self._character_tracker.used.get(filename)
-                print("chars:", chars, " for font:", filename)
                 if chars:
                     fonts[Fx] = self.embedTTF(filename, chars)
         self.writeObject(self.fontObject, fonts)
@@ -1076,11 +1073,10 @@ def createType1Descriptor(self, t1font, fontfile):
 
     def _get_xobject_symbol_name(self, filename, symbol_name):
         Fx = self.fontName(filename)
-        x = "-".join([
+        return "-".join([
             Fx.name.decode(),
             os.path.splitext(os.path.basename(filename))[0],
             symbol_name])
-        return x
 
     _identityToUnicodeCMap = b"""/CIDInit /ProcSet findresource begin
 12 dict begin
@@ -1107,7 +1103,6 @@ def embedTTF(self, filename, characters):
         """Embed the TTF font from the named file into the document."""
 
         font = get_font(filename)
-        print("embedding:", font.fname)
         fonttype = mpl.rcParams['pdf.fonttype']
 
         def cvt(length, upe=font.units_per_EM, nearest=True):
@@ -1339,7 +1334,7 @@ def embedTTFType42(font, characters, descriptor):
             # Add XObjects for unsupported chars
             glyph_ids = []
             for ccode in characters:
-                if _font_supports_char(fonttype, chr(ccode)):
+                if not _font_supports_char(fonttype, chr(ccode)):
                     gind = full_font.get_char_index(ccode)
                     glyph_ids.append(gind)
 
@@ -1929,8 +1924,6 @@ class RendererPdf(_backend_pdf_ps.RendererPDFPSBase):
     def __init__(self, file, image_dpi, height, width):
         super().__init__(width, height)
         self.file = file
-        self.char_to_font = {}
-        self.glyph_to_font = {}
         self.gc = self.new_gc()
         self.image_dpi = image_dpi
 
@@ -2421,7 +2414,6 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             # Emit all the 1-byte characters in a BT/ET group.
 
             self.file.output(Op.begin_text)
-            # ft, fontsize, Op.selectfont
             prev_start_x = 0
             for ft_object, start_x, kerns_or_chars in singlebyte_chunks:
                 ft_name = self.file.fontName(ft_object.fname)
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -443,7 +443,7 @@ int FT2Font::get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode, bool fallbac
         FT2Font *left_ft_object = glyph_to_font[left];
         FT2Font *right_ft_object = glyph_to_font[right];
         if (left_ft_object != right_ft_object) {
-            printf("Prev FT2Font != Curr FT2Font!\n");
+            // could potentially do something different?
         }
         // if left_ft_object is not the same the right_ft_object,
         // do the exact same thing which set_text does.

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ int FT2Font::get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode, bool fallbac`
`443`	`443`	`FT2Font *left_ft_object = glyph_to_font[left];`
`444`	`444`	`FT2Font *right_ft_object = glyph_to_font[right];`
`445`	`445`	`if (left_ft_object != right_ft_object) {`
`446`		`- printf("Prev FT2Font != Curr FT2Font!\n");`
	`446`	`+ // could potentially do something different?`
`447`	`447`	`}`
`448`	`448`	`// if left_ft_object is not the same the right_ft_object,`
`449`	`449`	`// do the exact same thing which set_text does.`