doc/fontconfig-devel.sgml | 2 +-
doc/fontconfig-user.sgml | 10 +++++-----
fontconfig/fontconfig.h | 2 +-
src/fcfreetype.c | 44 ++++++++++++++++++++++----------------------
4 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit ff037052bc27ae1c0e97879fd7333d3afdf2566e
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue May 30 19:00:02 2023 +0900
Fix a typo
diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index c2b1e2d..2ac11f5 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -215,7 +215,7 @@ convenience for the application's rendering mechanism.
fonthashint FC_FONT_HAS_HINT Bool Whether font has hinting
order FC_ORDER Int Order number of the font
desktop FC_DESKTOP_NAME String Current desktop name
- namedinstance FC_NAMED_INSTANCE Bool Whether font is a named-instance
+ namedinstance FC_NAMED_INSTANCE Bool Whether font is a named instance
</programlisting>
</sect2>
</sect1>
diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index d1c72c2..a89cab5 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -147,7 +147,7 @@ variable Bool Wheter font is Variable Font
fonthashint Bool Whether the font has hinting
order Int Order number of the font
desktop String Current desktop name
-namedinstance Bool Whether font is a named-instance
+namedinstance Bool Whether font is a named instance
</programlisting>
</refsect2>
<refsect2>
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 6f83811..28d5866 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -129,7 +129,7 @@ typedef int FcBool;
#define FC_FONT_HAS_HINT "fonthashint" /* Bool - true if font has hinting */
#define FC_ORDER "order" /* Integer */
#define FC_DESKTOP_NAME "desktop" /* String */
-#define FC_NAMED_INSTANCE "namedinstance" /* Bool - true if font is namedinstance */
+#define FC_NAMED_INSTANCE "namedinstance" /* Bool - true if font is named instance */
#define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION
#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION
commit e4987ef114122fcbac2dad2ed5bb7bf6782e1c91
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Mon May 29 22:13:23 2023 +0900
Remove the problematic language from code and doc
diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index 7dbf9f2..d1c72c2 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -384,18 +384,18 @@ Fontconfig will validate all of the configuration files and directories and
automatically rebuild the internal datastructures when this interval passes.
</para></refsect2>
<refsect2><title><literal><selectfont></literal></title><para>
-This element is used to black/white list fonts from being listed or matched
+This element is used to deny/allow list fonts from being listed or matched
against. It holds acceptfont and rejectfont elements.
</para></refsect2>
<refsect2><title><literal><acceptfont></literal></title><para>
-Fonts matched by an acceptfont element are "whitelisted"; such fonts are
+Fonts matched by an acceptfont element are "allowlisted"; such fonts are
explicitly included in the set of fonts used to resolve list and match
-requests; including them in this list protects them from being "blacklisted"
+requests; including them in this list protects them from being "denylisted"
by a rejectfont element. Acceptfont elements include glob and pattern
elements which are used to match fonts.
</para></refsect2>
<refsect2><title><literal><rejectfont></literal></title><para>
-Fonts matched by an rejectfont element are "blacklisted"; such fonts are
+Fonts matched by an rejectfont element are "denylisted"; such fonts are
excluded from the set of fonts used to resolve list and match requests as if
they didn't exist in the system. Rejectfont elements include glob and
pattern elements which are used to match fonts.
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 2104cfe..6e3aab1 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1204,7 +1204,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
int spacing;
/* Support for glyph-variation named-instances. */
- FT_MM_Var *master = NULL;
+ FT_MM_Var *mmvar = NULL;
FT_Var_Named_Style *instance = NULL;
double weight_mult = 1.0;
double width_mult = 1.0;
@@ -1258,7 +1258,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
goto bail1;
}
- ftresult = FT_Get_MM_Var (face, &master);
+ ftresult = FT_Get_MM_Var (face, &mmvar);
if (id >> 16)
{
@@ -1269,17 +1269,17 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
{
/* Query variable font itself. */
unsigned int i;
- for (i = 0; i < master->num_axis; i++)
+ for (i = 0; i < mmvar->num_axis; i++)
{
- double min_value = master->axis[i].minimum / (double) (1U << 16);
- double def_value = master->axis[i].def / (double) (1U << 16);
- double max_value = master->axis[i].maximum / (double) (1U << 16);
+ double min_value = mmvar->axis[i].minimum / (double) (1U << 16);
+ double def_value = mmvar->axis[i].def / (double) (1U << 16);
+ double max_value = mmvar->axis[i].maximum / (double) (1U << 16);
FcObject obj = FC_INVALID_OBJECT;
if (min_value > def_value || def_value > max_value || min_value == max_value)
continue;
- switch (master->axis[i].tag)
+ switch (mmvar->axis[i].tag)
{
case FT_MAKE_TAG ('w','g','h','t'):
obj = FC_WEIGHT_OBJECT;
@@ -1321,20 +1321,20 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
id &= 0xFFFF;
}
- else if ((id >> 16) - 1 < master->num_namedstyles)
+ else if ((id >> 16) - 1 < mmvar->num_namedstyles)
{
/* Pull out weight and width from named-instance. */
unsigned int i;
- instance = &master->namedstyle[(id >> 16) - 1];
+ instance = &mmvar->namedstyle[(id >> 16) - 1];
- for (i = 0; i < master->num_axis; i++)
+ for (i = 0; i < mmvar->num_axis; i++)
{
double value = instance->coords[i] / (double) (1U << 16);
- double default_value = master->axis[i].def / (double) (1U << 16);
+ double default_value = mmvar->axis[i].def / (double) (1U << 16);
double mult = default_value ? value / default_value : 1;
- //printf ("named-instance, axis %d tag %lx value %g\n", i, master->axis[i].tag, value);
- switch (master->axis[i].tag)
+ //printf ("named-instance, axis %d tag %lx value %g\n", i, mmvar->axis[i].tag, value);
+ switch (mmvar->axis[i].tag)
{
case FT_MAKE_TAG ('w','g','h','t'):
weight_mult = mult;
@@ -1359,12 +1359,12 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
if (!ftresult)
{
unsigned int i;
- for (i = 0; i < master->num_axis; i++)
+ for (i = 0; i < mmvar->num_axis; i++)
{
- switch (master->axis[i].tag)
+ switch (mmvar->axis[i].tag)
{
case FT_MAKE_TAG ('o','p','s','z'):
- if (!FcPatternObjectAddDouble (pat, FC_SIZE_OBJECT, master->axis[i].def / (double) (1U << 16)))
+ if (!FcPatternObjectAddDouble (pat, FC_SIZE_OBJECT, mmvar->axis[i].def / (double) (1U << 16)))
goto bail1;
variable_size = FcTrue;
break;
@@ -2185,13 +2185,13 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
if (foundry_)
free (foundry_);
- if (master)
+ if (mmvar)
{
#ifdef HAVE_FT_DONE_MM_VAR
if (face->glyph)
- FT_Done_MM_Var (face->glyph->library, master);
+ FT_Done_MM_Var (face->glyph->library, mmvar);
#else
- free (master);
+ free (mmvar);
#endif
}
@@ -2201,13 +2201,13 @@ bail2:
FcCharSetDestroy (cs);
bail1:
FcPatternDestroy (pat);
- if (master)
+ if (mmvar)
{
#ifdef HAVE_FT_DONE_MM_VAR
if (face->glyph)
- FT_Done_MM_Var (face->glyph->library, master);
+ FT_Done_MM_Var (face->glyph->library, mmvar);
#else
- free (master);
+ free (mmvar);
#endif
}
if (!nm_share && name_mapping)
