[Git][freetype/freetype][master] 4 commits: s/this is,/that is,/

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

cfe54d6a
by Werner Lemberg at 2023-04-27T06:24:48+02:00
```
s/this is,/that is,/
```

9a3d05d9

by Werner Lemberg at 2023-04-27T06:24:48+02:00

* src/ttgxvar.c: Minor changes.

(TT_Get_MM_Var): Improve tracing messages.
(tt_set_mm_blend): Minor speed-up.

13df1c7d
by Werner Lemberg at 2023-04-28T06:39:32+02:00
```
Minor documentation updates.
```

4908c1e8

by Werner Lemberg at 2023-04-28T06:54:25+02:00

* src/cid/cidgload.c (cid_load_glyph): Fix compiler warnings.

19 changed files:

docs/CHANGES
docs/formats.txt
include/freetype/freetype.h
include/freetype/ftdriver.h
include/freetype/ftimage.h
include/freetype/ftoutln.h
include/freetype/internal/tttypes.h
src/autofit/afblue.dat
src/autofit/aflatin.c
src/autofit/afshaper.c
src/base/ftcalc.c
src/base/ftsystem.c
src/cff/cffload.c
src/cff/cffparse.c
src/cid/cidgload.c
src/pshinter/pshalgo.c
src/sdf/ftsdf.c
src/truetype/ttgxvar.c
src/truetype/ttinterp.c

Changes:

docs/CHANGES

@@ -2424,7 +2424,7 @@ CHANGES BETWEEN 2.3.8 and 2.3.7
        is provided for x86 and ARM.  See FT_CONFIG_OPTION_INLINE_MULFIX
        and FT_CONFIG_OPTION_NO_ASSEMBLER (in ftoption.h) for more.
 -    - The handling of `tricky' fonts  (this is, fonts which don't work
 +    - The handling of `tricky' fonts  (that is, fonts which don't work
        with the  autohinter, needing the font  format's hinting engine)
        has been generalized and changed slightly:
@@ -2881,7 +2881,7 @@ CHANGES BETWEEN 2.2 and 2.1.10
    II. IMPORTANT CHANGES
 -    - Version 2.2 no longer exposes its internals, this is, the header
 +    - Version 2.2 no longer exposes its internals, that is, the header
        files  located in  the `include/freetype/internal'  directory of
        the source package are not  copied anymore by the `make install'
        command.  Consequently, a number of rogue clients which directly

docs/formats.txt

@@ -57,7 +57,7 @@ Notes
    (`*') in the table below.
    FreeType can  be configured to  support Mac  files (on older  Mac OS
 -  versions, a `file' is stored as a data and a resource fork, this is,
 +  versions, a `file' is stored as a data and a resource fork, that is,
    within two  separate data chunks).  If  a file can't be  opened as a
    font, FreeType then checks whether it  is a resource fork, trying to
    extract  the contained  font data  from  either a  `POST' or  `sfnt'

include/freetype/freetype.h

@@ -918,7 +918,7 @@ FT_BEGIN_HEADER
     *     If we have the third named instance of face~4, say, `face_index` is
     *     set to 0x00030004.
+    *
 -   *     Bit 31 is always zero (this is, `face_index` is always a positive
 +   *     Bit 31 is always zero (that is, `face_index` is always a positive
     *     value).
+    *
     *     [Since 2.9] Changing the design coordinates with
@@ -936,7 +936,7 @@ FT_BEGIN_HEADER
+    *
     *     [Since 2.6.1] Bits 16-30 hold the number of named instances
     *     available for the current face if we have a GX or OpenType variation
 -   *     (sub)font.  Bit 31 is always zero (this is, `style_flags` is always
 +   *     (sub)font.  Bit 31 is always zero (that is, `style_flags` is always
     *     a positive value).  Note that a variation font has always at least
     *     one named instance, namely the default instance.
+    *
@@ -1205,13 +1205,13 @@ FT_BEGIN_HEADER
     *     successfully; in all other cases you get an
     *     `FT_Err_Invalid_Argument` error.
+    *
 -   *     Note that CID-keyed fonts that are in an SFNT wrapper (this is, all
 +   *     Note that CID-keyed fonts that are in an SFNT wrapper (that is, all
     *     OpenType/CFF fonts) don't have this flag set since the glyphs are
     *     accessed in the normal way (using contiguous indices); the
     *     'CID-ness' isn't visible to the application.
+    *
     *   FT_FACE_FLAG_TRICKY ::
 -   *     The face is 'tricky', this is, it always needs the font format's
 +   *     The face is 'tricky', that is, it always needs the font format's
     *     native hinting engine to get a reasonable result.  A typical example
     *     is the old Chinese font `mingli.ttf` (but not `mingliu.ttc`) that
     *     uses TrueType bytecode instructions to move and scale all of its
@@ -1233,8 +1233,8 @@ FT_BEGIN_HEADER
     *   FT_FACE_FLAG_VARIATION ::
     *     [Since 2.9] Set if the current face (or named instance) has been
     *     altered with @FT_Set_MM_Design_Coordinates,
 -   *     @FT_Set_Var_Design_Coordinates, or @FT_Set_Var_Blend_Coordinates.
 -   *     This flag is unset by a call to @FT_Set_Named_Instance.
 +   *     @FT_Set_Var_Design_Coordinates, @FT_Set_Var_Blend_Coordinates, or
 +   *     @FT_Set_MM_WeightVector to select a non-default instance.
+    *
     *   FT_FACE_FLAG_SVG ::
     *     [Since 2.12] The face has an 'SVG~' OpenType table.
@@ -1449,8 +1449,8 @@ FT_BEGIN_HEADER
+    *
     * @description:
     *   A macro that returns true whenever a face object has been altered by
 -   *   @FT_Set_MM_Design_Coordinates, @FT_Set_Var_Design_Coordinates, or
 -   *   @FT_Set_Var_Blend_Coordinates.
 +   *   @FT_Set_MM_Design_Coordinates, @FT_Set_Var_Design_Coordinates,
 +   *   @FT_Set_Var_Blend_Coordinates, or @FT_Set_MM_WeightVector.
+    *
     * @since:
     *   2.9
@@ -2449,7 +2449,7 @@ FT_BEGIN_HEADER
     *   Each new face object created with this function also owns a default
     *   @FT_Size object, accessible as `face->size`.
+    *
 -   *   One @FT_Library instance can have multiple face objects, this is,
 +   *   One @FT_Library instance can have multiple face objects, that is,
     *   @FT_Open_Face and its siblings can be called multiple times using the
     *   same `library` argument.
+    *
@@ -2677,7 +2677,7 @@ FT_BEGIN_HEADER
     *   silently uses outlines if there is no bitmap for a given glyph index.
+    *
     *   For GX and OpenType variation fonts, a bitmap strike makes sense only
 -   *   if the default instance is active (this is, no glyph variation takes
 +   *   if the default instance is active (that is, no glyph variation takes
     *   place); otherwise, FreeType simply ignores bitmap strikes.  The same
     *   is true for all named instances that are different from the default
     *   instance.
@@ -2974,7 +2974,7 @@ FT_BEGIN_HEADER
     *   glyph may be transformed.  See @FT_Set_Transform for the details.
+    *
     *   For subsetted CID-keyed fonts, `FT_Err_Invalid_Argument` is returned
 -   *   for invalid CID values (this is, for CID values that don't have a
 +   *   for invalid CID values (that is, for CID values that don't have a
     *   corresponding glyph in the font).  See the discussion of the
     *   @FT_FACE_FLAG_CID_KEYED flag for more details.
+    *
@@ -4264,9 +4264,10 @@ FT_BEGIN_HEADER
+    *
     *   [Since 2.9] Special PostScript names for named instances are only
     *   returned if the named instance is set with @FT_Set_Named_Instance (and
 -   *   the font has corresponding entries in its 'fvar' table).  If
 -   *   @FT_IS_VARIATION returns true, the algorithmically derived PostScript
 -   *   name is provided, not looking up special entries for named instances.
 +   *   the font has corresponding entries in its 'fvar' table or is the
 +   *   default named instance).  If @FT_IS_VARIATION returns true, the
 +   *   algorithmically derived PostScript name is provided, not looking up
 +   *   special entries for named instances.
     */
    FT_EXPORT( const char* )
    FT_Get_Postscript_Name( FT_Face  face );

include/freetype/ftdriver.h

@@ -134,7 +134,7 @@ FT_BEGIN_HEADER
     *   each being rounded to the nearest pixel edge, taking care of overshoot
     *   suppression at small sizes, stem darkening, and scaling.
+    *
 -   *   Hstems (this is, hint values defined in the font to help align
 +   *   Hstems (that is, hint values defined in the font to help align
     *   horizontal features) that fall within a blue zone are said to be
     *   'captured' and are aligned to that zone.  Uncaptured stems are moved
     *   in one of four ways, top edge up or down, bottom edge up or down.
@@ -446,7 +446,7 @@ FT_BEGIN_HEADER
     *   at smaller sizes.
+    *
     *   For the auto-hinter, stem-darkening is experimental currently and thus
 -   *   switched off by default (this is, `no-stem-darkening` is set to TRUE
 +   *   switched off by default (that is, `no-stem-darkening` is set to TRUE
     *   by default).  Total consistency with the CFF driver is not achieved
     *   right now because the emboldening method differs and glyphs must be
     *   scaled down on the Y-axis to keep outline points inside their

include/freetype/ftimage.h


    *   @FT_SpanFunc that takes the y~coordinate of the span as a parameter.
    *
    *   The anti-aliased rasterizer produces coverage values from 0 to 255,
-   *   this is, from completely transparent to completely opaque.
+   *   that is, from completely transparent to completely opaque.
    */
   typedef struct  FT_Span_
   {

include/freetype/ftoutln.h

@@ -118,7 +118,7 @@ FT_BEGIN_HEADER
     *   attachement.
+    *
     *   Similarly, the function returns success for an empty outline also
 -   *   (doing nothing, this is, not calling any emitter); if necessary, you
 +   *   (doing nothing, that is, not calling any emitter); if necessary, you
     *   should filter this out, too.
     */
    FT_EXPORT( FT_Error )

include/freetype/internal/tttypes.h

@@ -1200,12 +1200,16 @@ FT_BEGIN_HEADER
     *   mm ::
     *     A pointer to the Multiple Masters service.
+    *
 -   *   var ::
 -   *     A pointer to the Metrics Variations service.
 +   *   tt_var ::
 +   *     A pointer to the Metrics Variations service for the "truetype"
 +   *     driver.
+    *
 -   *   hdmx ::
 -   *     The face's horizontal device metrics ('hdmx' table).  This table is
 -   *     optional in TrueType/OpenType fonts.
 +   *   face_var ::
 +   *     A pointer to the Metrics Variations service for this `TT_Face`'s
 +   *     driver.
 +   *
 +   *   psaux ::
 +   *     A pointer to the PostScript Auxiliary service.
+    *
     *   gasp ::
     *     The grid-fitting and scaling properties table ('gasp').  This table
@@ -1357,14 +1361,6 @@ FT_BEGIN_HEADER
     *     A mapping between the strike indices exposed by the API and the
     *     indices used in the font's sbit table.
+    *
 -   *   cpal ::
 -   *     A pointer to data related to the 'CPAL' table.  `NULL` if the table
 -   *     is not available.
 -   *
 -   *   colr ::
 -   *     A pointer to data related to the 'COLR' table.  `NULL` if the table
 -   *     is not available.
 -   *
     *   kern_table ::
     *     A pointer to the 'kern' table.
+    *
@@ -1405,6 +1401,18 @@ FT_BEGIN_HEADER
+    *
     *   ebdt_size ::
     *     The size of the sbit data table.
 +   *
 +   *   cpal ::
 +   *     A pointer to data related to the 'CPAL' table.  `NULL` if the table
 +   *     is not available.
 +   *
 +   *   colr ::
 +   *     A pointer to data related to the 'COLR' table.  `NULL` if the table
 +   *     is not available.
 +   *
 +   *   svg ::
 +   *     A pointer to data related to the 'SVG' table.  `NULL` if the table
 +   *     is not available.
     */
    typedef struct  TT_FaceRec_
+   {
@@ -1462,7 +1470,7 @@ FT_BEGIN_HEADER
      /* a typeless pointer to the FT_Service_MetricsVariationsRec table */
      /* used to handle the HVAR, VVAR, and MVAR OpenType tables by this */
      /* TT_Face's driver                                                */
 -    void*                 face_var;
 +    void*                 face_var;             /* since 2.13.1 */
  #endif
      /* a typeless pointer to the PostScript Aux service */

src/autofit/afblue.dat

@@ -89,7 +89,7 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN:
      "ت ث ط ظ ك"
    // We don't necessarily have access to medial forms via Unicode in case
    // Arabic presentational forms are missing.  The only character that is
 -  // guaranteed to have the same vertical position with joining (this is,
 +  // guaranteed to have the same vertical position with joining (that is,
    // non-isolated) forms is U+0640, ARABIC TATWEEL, which must join both
    // round and flat curves.
    AF_BLUE_STRING_ARABIC_JOIN

src/autofit/aflatin.c

@@ -2038,7 +2038,7 @@
              max = seg2->max_coord;
            /* compute maximum coordinate difference of the two segments */
 -          /* (this is, how much they overlap)                          */
 +          /* (that is, how much they overlap)                          */
            len = max - min;
            if ( len >= len_threshold )
+           {

src/autofit/afshaper.c

@@ -258,7 +258,7 @@
      /*
       * We now check whether we can construct blue zones, using glyphs
       * covered by the feature only.  In case there is not a single zone
 -     * (this is, not a single character is covered), we skip this coverage.
 +     * (that is, not a single character is covered), we skip this coverage.
+      *
       */
      if ( style_class->coverage != AF_COVERAGE_DEFAULT )
@@ -313,9 +313,9 @@
       * hinted and usually rendered glyph.
+      *
       * Consider the superscript feature of font `pala.ttf': Some of the
 -     * glyphs are `real', this is, they have a zero vertical offset, but
 +     * glyphs are `real', that is, they have a zero vertical offset, but
       * most of them are small caps glyphs shifted up to the superscript
 -     * position (this is, the `sups' feature is present in both the GSUB and
 +     * position (that is, the `sups' feature is present in both the GSUB and
       * GPOS tables).  The code for blue zones computation actually uses a
       * feature's y offset so that the `real' glyphs get correct hints.  But
       * later on it is impossible to decide whether a glyph index belongs to,

src/base/ftcalc.c

@@ -1061,7 +1061,7 @@
      /*                                                           */
      /* This approach has the advantage that the angle between    */
      /* `in' and `out' is not checked.  In case one of the two    */
 -    /* vectors is `dominant', this is, much larger than the      */
 +    /* vectors is `dominant', that is, much larger than the      */
      /* other vector, we thus always have a flat corner.          */
      /*                                                           */
      /*                hypotenuse                                 */

src/base/ftsystem.c

@@ -206,7 +206,7 @@
     *     The number of bytes to read from the stream.
+    *
     * @Return:
 -   *   The number of bytes actually read.  If `count' is zero (this is,
 +   *   The number of bytes actually read.  If `count' is zero (that is,
     *   the function is used for seeking), a non-zero return value
     *   indicates an error.
     */

src/cff/cffload.c

@@ -400,7 +400,7 @@
    /* Allocate a table containing pointers to an index's elements. */
    /* The `pool' argument makes this function convert the index    */
 -  /* entries to C-style strings (this is, null-terminated).       */
 +  /* entries to C-style strings (that is, null-terminated).       */
    static FT_Error
    cff_index_get_pointers( CFF_Index   idx,
                            FT_Byte***  table,
@@ -1612,7 +1612,7 @@
      FT_Service_MultiMasters  mm = (FT_Service_MultiMasters)face->mm;
 -    if (mm)
 +    if ( mm )
        mm->done_blend( FT_FACE( face ) );
+   }

src/cff/cffparse.c

@@ -622,7 +622,7 @@
        dict->has_font_matrix = TRUE;
 -      /* We expect a well-formed font matrix, this is, the matrix elements */
 +      /* We expect a well-formed font matrix, that is, the matrix elements */
        /* `xx' and `yy' are of approximately the same magnitude.  To avoid  */
        /* loss of precision, we use the magnitude of the largest matrix     */
        /* element to scale all other elements.  The scaling factor is then  */

src/cid/cidgload.c


              (cid->fd_bytes == 2 && fd_select == 0xFFFFU ) )
         {
           FT_TRACE1(( "cid_load_glyph: fail for glyph_index=%d, "
-                      "FD number %d is the max integer fitting into %d byte%s\n",
+                      "FD number %ld is the max integer fitting into %d byte%s\n",
                       glyph_index, fd_select, cid->fd_bytes,
                       cid->fd_bytes == 1 ? "" : "s" ));
         }
         else
         {
           FT_TRACE0(( "cid_load_glyph: fail for glyph_index=%d, "
-                      "FD number %d > number of dicts %d\n",
+                      "FD number %ld > number of dicts %d\n",
                       glyph_index, fd_select, cid->num_dicts ));
         }
         error = FT_THROW( Invalid_Offset );

src/pshinter/pshalgo.c

@@ -516,7 +516,7 @@
              if ( !psh_hint_is_fitted( parent ) )
                psh_hint_align( parent, globals, dimension, glyph );
 -            /* keep original relation between hints, this is, use the */
 +            /* keep original relation between hints, that is, use the */
              /* scaled distance between the centers of the hints to    */
              /* compute the new position                               */
              par_org_center = parent->org_pos + ( parent->org_len >> 1 );

src/sdf/ftsdf.c


      *     ```
      *
      * (6) Our task is to find a value of `t` such that the above equation
-     *     `Q(t)` becomes zero, this is, the point-to-curve vector makes
+     *     `Q(t)` becomes zero, that is, the point-to-curve vector makes
      *     90~degrees with the curve.  We solve this with the Newton-Raphson
      *     method.
      *

      *     ```
      *
      * (6) Our task is to find a value of `t` such that the above equation
-     *     `Q(t)` becomes zero, this is, the point-to-curve vector makes
+     *     `Q(t)` becomes zero, that is, the point-to-curve vector makes
      *     90~degree with curve.  We solve this with the Newton-Raphson
      *     method.
      *

src/truetype/ttgxvar.c

@@ -2544,7 +2544,7 @@
            goto Exit;
+       }
 -      FT_TRACE5(( "%d instance%s\n",
 +      FT_TRACE5(( "%d named instance%s\n",
                    fvar_head.instanceCount,
                    fvar_head.instanceCount == 1 ? "" : "s" ));
@@ -2602,7 +2602,7 @@
            (void)FT_STREAM_SEEK( pos );
 -          FT_TRACE5(( "  instance %d (%s%s%s, %s%s%s)\n",
 +          FT_TRACE5(( "  named instance %d (%s%s%s, %s%s%s)\n",
                        i,
                        strname ? "name: `" : "",
                        strname ? strname : "unnamed",
@@ -2845,26 +2845,29 @@
+         }
+       }
 -      if ( FT_IS_NAMED_INSTANCE( FT_FACE( face ) ) )
 +      if ( !have_diff )
+       {
 -        FT_UInt  instance_index = (FT_UInt)face->root.face_index >> 16;
 +        if ( FT_IS_NAMED_INSTANCE( FT_FACE( face ) ) )
 +        {
 +          FT_UInt  instance_index = (FT_UInt)face->root.face_index >> 16;
 -        c = blend->normalizedcoords + i;
 -        n = blend->normalized_stylecoords            +
 -            ( instance_index - 1 ) * mmvar->num_axis +
 -            i;
 +          c = blend->normalizedcoords + i;
 +          n = blend->normalized_stylecoords            +
 +              ( instance_index - 1 ) * mmvar->num_axis +
 +              i;
 -        for ( j = i; j < mmvar->num_axis; j++, n++, c++ )
 -          if ( *c != *n )
 -            have_diff = 1;
 -      }
 -      else
 -      {
 -        c = blend->normalizedcoords + i;
 -        for ( j = i; j < mmvar->num_axis; j++, c++ )
 -          if ( *c != 0 )
 -            have_diff = 1;
 +          for ( j = i; j < mmvar->num_axis; j++, n++, c++ )
 +            if ( *c != *n )
 +              have_diff = 1;
 +        }
 +        else
 +        {
 +          c = blend->normalizedcoords + i;
 +          for ( j = i; j < mmvar->num_axis; j++, c++ )
 +            if ( *c != 0 )
 +              have_diff = 1;
 +        }
+       }
        /* return value -1 indicates `no change' */
@@ -2962,7 +2965,8 @@
     *     An array of `num_coords', each between [-1,1].
+    *
     * @Return:
 -   *   FreeType error code.  0 means success.
 +   *   FreeType error code.  0 means success, -1 means success and unchanged
 +   *   axis values.
     */
    FT_LOCAL_DEF( FT_Error )
    TT_Set_MM_Blend( TT_Face    face,
@@ -3009,7 +3013,8 @@
     *     An array of `num_coords', each between [-1,1].
+    *
     * @Return:
 -   *   FreeType error code.  0 means success.
 +   *   FreeType error code.  0 means success, -1 means success and unchanged
 +   *   axis values.
     */
    FT_LOCAL_DEF( FT_Error )
    TT_Get_MM_Blend( TT_Face    face,

src/truetype/ttinterp.c

@@ -7837,7 +7837,7 @@
          /* a variable number of arguments             */
          /* it is the job of the application to `activate' GX handling, */
 -        /* this is, calling any of the GX API functions on the current */
 +        /* that is, calling any of the GX API functions on the current */
          /* font to select a variation instance                         */
          if ( exc->face->blend )
            exc->new_top = exc->args + exc->face->blend->num_axis;
@@ -8397,7 +8397,7 @@
  #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
          case 0x91:
            /* it is the job of the application to `activate' GX handling, */
 -          /* this is, calling any of the GX API functions on the current */
 +          /* that is, calling any of the GX API functions on the current */
            /* font to select a variation instance                         */
            if ( exc->face->blend )
              Ins_GETVARIATION( exc, args );

From:	Werner Lemberg (@wl)
Subject:	[Git][freetype/freetype][master] 4 commits: s/this is,/that is,/
Date:	Fri, 28 Apr 2023 04:56:19 +0000