[Fontconfig] fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 conf.d/70-no-bitmaps.conf  |    2 +-
 conf.d/70-yes-bitmaps.conf |    2 +-
 doc/fontconfig-devel.sgml  |    2 +-
 doc/fontconfig-user.sgml   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7aa647eb9ee46d98b6172c16e9727aa2bd222627
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jun 12 16:54:24 2023 +0900

    Use 'outline' instead of 'scalable' for bitmaps
    
    scalable can be true if bitmap fonts have color.
    This isn't expected behavior.
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/365

diff --git a/conf.d/70-no-bitmaps.conf b/conf.d/70-no-bitmaps.conf
index 3cde490..10203ac 100644
--- a/conf.d/70-no-bitmaps.conf
+++ b/conf.d/70-no-bitmaps.conf
@@ -6,7 +6,7 @@
  <selectfont>
   <rejectfont>
    <pattern>
-     <patelt name="scalable"><bool>false</bool></patelt>
+     <patelt name="outline"><bool>false</bool></patelt>
    </pattern>
   </rejectfont>
  </selectfont>
diff --git a/conf.d/70-yes-bitmaps.conf b/conf.d/70-yes-bitmaps.conf
index 272b292..9fd6470 100644
--- a/conf.d/70-yes-bitmaps.conf
+++ b/conf.d/70-yes-bitmaps.conf
@@ -6,7 +6,7 @@
  <selectfont>
   <acceptfont>
    <pattern>
-     <patelt name="scalable"><bool>false</bool></patelt>
+     <patelt name="outline"><bool>false</bool></patelt>
    </pattern>
   </acceptfont>
  </selectfont>
commit fb726e86bdd4dcc9018cac002d27ce44f7fb1e52
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jun 12 16:51:26 2023 +0900

    Fix a typo in scalable property
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/365

diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index 2ac11f5..2d83d13 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -175,7 +175,7 @@ convenience for the application's rendering mechanism.
                                                   face object
     rasterizer     FC_RASTERIZER          String  Which rasterizer is in use (deprecated)
     outline        FC_OUTLINE             Bool    Whether the glyphs are outlines
-    scalable       FC_SCALABLE            Bool    Whether glyphs can be scaled
+    scalable       FC_SCALABLE            Bool    Whether the glyphs are outlines or have color
     dpi            FC_DPI                 Double  Target dots per inch
     rgba           FC_RGBA                Int     unknown, rgb, bgr, vrgb,
                                                   vbgr, none - subpixel geometry
diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index a89cab5..eba13e1 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -118,7 +118,7 @@ index           Int     The index of the font within the file
 ftface          FT_Face Use the specified FreeType face object
 rasterizer      String  Which rasterizer is in use (deprecated)
 outline         Bool    Whether the glyphs are outlines
-scalable        Bool    Whether glyphs can be scaled
+scalable        Bool    Whether the glyphs are outlines or have color
 dpi             Double  Target dots per inch
 rgba            Int     unknown, rgb, bgr, vrgb, vbgr,
                         none - subpixel geometry