From 3423f915f85ae4f10272c97cc7d1ed6473928328 Mon Sep 17 00:00:00 2001 From: MalikIdreesHasa <77000356+MalikIdreesHasanKhan@users.noreply.github.com> Date: Mon, 27 Sep 2021 08:41:22 +0000 Subject: [PATCH 1/2] Fixed typos --- doc/users/prev_whats_new/changelog.rst | 2 +- extern/ttconv/pprdrv_tt.cpp | 26 +++++++++++++------------- extern/ttconv/pprdrv_tt2.cpp | 6 +++--- lib/matplotlib/backend_bases.py | 2 +- lib/matplotlib/cm.py | 2 +- lib/matplotlib/legend.py | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/users/prev_whats_new/changelog.rst b/doc/users/prev_whats_new/changelog.rst index 483f6eda53c3..3fe8de2ae3f4 100644 --- a/doc/users/prev_whats_new/changelog.rst +++ b/doc/users/prev_whats_new/changelog.rst @@ -4786,7 +4786,7 @@ the `API changes <../../api/api_changes.html>`_. Added Nick's picker "among" patch - JDH 2005-06-05 - Fixed a TeX/LaTeX font discrepency in backend_ps. - DSD + Fixed a TeX/LaTeX font discrepancy in backend_ps. - DSD 2005-06-05 Added a ps.distill option in rc settings. If True, postscript output will diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp index a0c724c8aa11..41123020ae3e 100644 --- a/extern/ttconv/pprdrv_tt.cpp +++ b/extern/ttconv/pprdrv_tt.cpp @@ -619,7 +619,7 @@ void sfnts_end_string(TTStreamWriter& stream) /* ** This is called at the start of each new table. -** The argement is the length in bytes of the table +** The argument is the length in bytes of the table ** which will follow. If the new table will not fit ** in the current string, a new one is started. */ @@ -742,7 +742,7 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font) ULONG checksum; } tables[9]; - BYTE *ptr; /* A pointer into the origional table directory. */ + BYTE *ptr; /* A pointer into the original table directory. */ ULONG x,y; /* General use loop countes. */ int c; /* Input character. */ int diff; @@ -821,7 +821,7 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font) debug("only %d tables selected",count); - /* Now, emmit the table directory. */ + /* Now, emit the table directory. */ for (x=0; x < 9; x++) { if ( tables[x].length == 0 ) /* Skip missing tables */ @@ -910,7 +910,7 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font) ** ** If we are creating a type 3 instead of a type 42 font, ** this array will instead convert PostScript character names -** to executable proceedures. +** to executable procedures. --------------------------------------------------------------*/ const char *Apple_CharStrings[]= { @@ -1022,7 +1022,7 @@ void ttfont_CharStrings(TTStreamWriter& stream, struct TTFONT *font, std::vector /* The 'post' table format number. */ post_format = getFixed( font->post_table ); - /* Emmit the start of the PostScript code to define the dictionary. */ + /* Emit the start of the PostScript code to define the dictionary. */ stream.printf("/CharStrings %d dict dup begin\n", glyph_ids.size()+1); /* Section 5.8.2 table 5.7 of the PS Language Ref says a CharStrings dictionary must contain an entry for .notdef */ stream.printf("/.notdef 0 def\n"); @@ -1051,13 +1051,13 @@ void ttfont_CharStrings(TTStreamWriter& stream, struct TTFONT *font, std::vector } /* end of ttfont_CharStrings() */ /*---------------------------------------------------------------- -** Emmit the code to finish up the dictionary and turn +** Emit the code to finish up the dictionary and turn ** it into a font. ----------------------------------------------------------------*/ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font) { /* If we are generating a type 3 font, we need to provide */ - /* a BuildGlyph and BuildChar proceedures. */ + /* a BuildGlyph and BuildChar procedures. */ if (font->target_type == PS_TYPE_3 || font->target_type == PS_TYPE_42_3_HYBRID) { @@ -1072,7 +1072,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font) stream.put_char('\n'); - /* This proceedure is for compatibility with */ + /* This procedure is for compatibility with */ /* level 1 interpreters. */ stream.putline("/BuildChar {"); stream.putline(" 1 index /Encoding get exch get"); @@ -1127,7 +1127,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font) /* is a procedure. If it is, it executes it, otherwise, it */ /* lets the TrueType rasterizer loose on it. */ - /* When this proceedure is executed the stack contains */ + /* When this procedure is executed the stack contains */ /* the font dictionary and the character name. We */ /* exchange arguments and move the dictionary to the */ /* dictionary stack. */ @@ -1151,7 +1151,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font) stream.putline(" get dup xcheck"); /* stack: CharStrings_entry */ - /* If is a proceedure. Execute according to RBIIp 277-278. */ + /* If is a procedure. Execute according to RBIIp 277-278. */ stream.putline(" {currentdict systemdict begin begin exec end end}"); /* Is a TrueType character index, let the rasterizer at it. */ @@ -1294,7 +1294,7 @@ void read_font(const char *filename, font_type_enum target_type, std::vector Date: Mon, 27 Sep 2021 14:21:51 +0000 Subject: [PATCH 2/2] Undid external fix. --- extern/ttconv/pprdrv_tt.cpp | 26 +++++++++++++------------- extern/ttconv/pprdrv_tt2.cpp | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp index 41123020ae3e..a0c724c8aa11 100644 --- a/extern/ttconv/pprdrv_tt.cpp +++ b/extern/ttconv/pprdrv_tt.cpp @@ -619,7 +619,7 @@ void sfnts_end_string(TTStreamWriter& stream) /* ** This is called at the start of each new table. -** The argument is the length in bytes of the table +** The argement is the length in bytes of the table ** which will follow. If the new table will not fit ** in the current string, a new one is started. */ @@ -742,7 +742,7 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font) ULONG checksum; } tables[9]; - BYTE *ptr; /* A pointer into the original table directory. */ + BYTE *ptr; /* A pointer into the origional table directory. */ ULONG x,y; /* General use loop countes. */ int c; /* Input character. */ int diff; @@ -821,7 +821,7 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font) debug("only %d tables selected",count); - /* Now, emit the table directory. */ + /* Now, emmit the table directory. */ for (x=0; x < 9; x++) { if ( tables[x].length == 0 ) /* Skip missing tables */ @@ -910,7 +910,7 @@ void ttfont_sfnts(TTStreamWriter& stream, struct TTFONT *font) ** ** If we are creating a type 3 instead of a type 42 font, ** this array will instead convert PostScript character names -** to executable procedures. +** to executable proceedures. --------------------------------------------------------------*/ const char *Apple_CharStrings[]= { @@ -1022,7 +1022,7 @@ void ttfont_CharStrings(TTStreamWriter& stream, struct TTFONT *font, std::vector /* The 'post' table format number. */ post_format = getFixed( font->post_table ); - /* Emit the start of the PostScript code to define the dictionary. */ + /* Emmit the start of the PostScript code to define the dictionary. */ stream.printf("/CharStrings %d dict dup begin\n", glyph_ids.size()+1); /* Section 5.8.2 table 5.7 of the PS Language Ref says a CharStrings dictionary must contain an entry for .notdef */ stream.printf("/.notdef 0 def\n"); @@ -1051,13 +1051,13 @@ void ttfont_CharStrings(TTStreamWriter& stream, struct TTFONT *font, std::vector } /* end of ttfont_CharStrings() */ /*---------------------------------------------------------------- -** Emit the code to finish up the dictionary and turn +** Emmit the code to finish up the dictionary and turn ** it into a font. ----------------------------------------------------------------*/ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font) { /* If we are generating a type 3 font, we need to provide */ - /* a BuildGlyph and BuildChar procedures. */ + /* a BuildGlyph and BuildChar proceedures. */ if (font->target_type == PS_TYPE_3 || font->target_type == PS_TYPE_42_3_HYBRID) { @@ -1072,7 +1072,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font) stream.put_char('\n'); - /* This procedure is for compatibility with */ + /* This proceedure is for compatibility with */ /* level 1 interpreters. */ stream.putline("/BuildChar {"); stream.putline(" 1 index /Encoding get exch get"); @@ -1127,7 +1127,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font) /* is a procedure. If it is, it executes it, otherwise, it */ /* lets the TrueType rasterizer loose on it. */ - /* When this procedure is executed the stack contains */ + /* When this proceedure is executed the stack contains */ /* the font dictionary and the character name. We */ /* exchange arguments and move the dictionary to the */ /* dictionary stack. */ @@ -1151,7 +1151,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font) stream.putline(" get dup xcheck"); /* stack: CharStrings_entry */ - /* If is a procedure. Execute according to RBIIp 277-278. */ + /* If is a proceedure. Execute according to RBIIp 277-278. */ stream.putline(" {currentdict systemdict begin begin exec end end}"); /* Is a TrueType character index, let the rasterizer at it. */ @@ -1294,7 +1294,7 @@ void read_font(const char *filename, font_type_enum target_type, std::vector