From e97544a7390b53bdf899a29c7a739e8056d07b7a Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sat, 28 Jan 2023 17:04:38 +0100
Subject: [PATCH] Minor changes.

Comment fixes, typos, removing of unnecessary parentheses.
---
 builds/unix/freetype2.m4 |  2 +-
 docs/CHANGES             |  5 ++++-
 src/base/ftsynth.c       |  1 +
 src/pfr/pfrobjs.c        |  2 +-
 src/sfnt/ttcolr.c        | 38 +++++++++++++++++++-------------------
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/builds/unix/freetype2.m4 b/builds/unix/freetype2.m4
index e0a5c2949..09ead4304 100644
--- a/builds/unix/freetype2.m4
+++ b/builds/unix/freetype2.m4
@@ -15,7 +15,7 @@
 # generated by Autoconf, under the same distribution terms as the rest of
 # that program.
 #
-# serial 6
+# serial 7
 
 # AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 # Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
diff --git a/docs/CHANGES b/docs/CHANGES
index 1c1537a58..6d48e1528 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -7,6 +7,8 @@ CHANGES BETWEEN 2.12.1 and 2.13
     graphical FreeType  demo programs into a  single application based
     on the Qt framework.  This was Charlie Jiang's GSoC 2022 project.
 
+  - The 'COLR' v1 API is now considered as stable.
+
 
   III. MISCELLANEOUS
 
@@ -18,7 +20,8 @@ CHANGES BETWEEN 2.12.1 and 2.13
 
       https://github.com/harfbuzz/boring-expansion-spec/blob/main/avar2.md
 
-    for the specification.
+    for the specification.  To deactivate it, define the configuration
+    macro 'TT_CONFIG_OPTION_NO_BORING_EXPANSION'.
 
   - A new API  `FT_GlyphSlot_Slant` to slant a glyph by  a given angle
     has been added.   Note that this function is  part of `ftsynth.h`,
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index c24a32992..ed17be4b3 100644
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -46,6 +46,7 @@
   FT_EXPORT_DEF( void )
   FT_GlyphSlot_Oblique( FT_GlyphSlot  slot )
   {
+    /* Value '0x0366A' corresponds to a shear angle of about 12 degrees. */
     FT_GlyphSlot_Slant( slot, 0x0366A );
   }
 
diff --git a/src/pfr/pfrobjs.c b/src/pfr/pfrobjs.c
index 4c816ddf4..3db8f0a06 100644
--- a/src/pfr/pfrobjs.c
+++ b/src/pfr/pfrobjs.c
@@ -490,7 +490,7 @@
     glyph1--;
     glyph2--;
 
-    /* check the array bounds, .notdef is automacally out */
+    /* check the array bounds, .notdef is automatically out */
     if ( glyph1 >= phy_font->num_chars ||
          glyph2 >= phy_font->num_chars )
       goto Exit;
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index d888423f5..5d98dcab8 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -1025,14 +1025,14 @@
       /* Base values set, now handle variations. */
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-      if ( ( (FT_PaintFormat_Internal)apaint->format ==
-               FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE                ||
-             (FT_PaintFormat_Internal)apaint->format ==
-               FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER         ||
-             (FT_PaintFormat_Internal)apaint->format ==
-               FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM        ||
-             (FT_PaintFormat_Internal)apaint->format ==
-               FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER ) )
+      if ( (FT_PaintFormat_Internal)apaint->format ==
+             FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE                ||
+           (FT_PaintFormat_Internal)apaint->format ==
+             FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER         ||
+           (FT_PaintFormat_Internal)apaint->format ==
+             FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM        ||
+           (FT_PaintFormat_Internal)apaint->format ==
+             FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER )
       {
         ENSURE_READ_BYTES( 4 );
         var_index_base = FT_NEXT_ULONG( p );
@@ -1124,10 +1124,10 @@
       }
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-      if ( ( (FT_PaintFormat_Internal)apaint->format ==
-               FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE        ||
-             (FT_PaintFormat_Internal)apaint->format ==
-               FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER ) )
+      if ( (FT_PaintFormat_Internal)apaint->format ==
+             FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE        ||
+           (FT_PaintFormat_Internal)apaint->format ==
+             FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER )
       {
         FT_UInt  num_deltas = 0;
 
@@ -1197,10 +1197,10 @@
 
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-      if ( ( (FT_PaintFormat_Internal)apaint->format ==
-               FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW        ||
-             (FT_PaintFormat_Internal)apaint->format ==
-               FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER ) )
+      if ( (FT_PaintFormat_Internal)apaint->format ==
+             FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW        ||
+           (FT_PaintFormat_Internal)apaint->format ==
+             FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER )
       {
         ENSURE_READ_BYTES( 4 );
         var_index_base = FT_NEXT_ULONG( p );
@@ -1452,7 +1452,7 @@
           FT_ItemVarDelta  item_deltas[4] = { 0, 0, 0, 0 };
 
 
-          /* Check whether we can extract a 32-bit VarIdxBase now. */
+          /* Check whether we can extract a 32-bit varIndexBase now. */
           if ( p1 > limit - 4 )
             return 0;
 
@@ -1559,8 +1559,8 @@
      * Before reading, ensure that `p` is within 'COLR' v1 and we can read a
      * 4-byte ULONG.
      */
-    if ( p < colr->layers_v1                                  ||
-         p > ( (FT_Byte*)colr->table + colr->table_size - 4 ) )
+    if ( p < colr->layers_v1                              ||
+         p > (FT_Byte*)colr->table + colr->table_size - 4 )
       return 0;
 
     paint_offset =