[pango/pangowin32-more-harfbuzz] Revert "PangoWin32: Filter out Type 1 fonts"

[Khaled Hosny <khaledh src gnome org>]

commit 9b9ca26cdb1ba2bca618d2fe4ffc8d1d3817881a
Author: Khaled Hosny <khaledhosny eglug org>
Date:   Fri Jul 26 17:09:30 2019 +0200

    Revert "PangoWin32: Filter out Type 1 fonts"
    
    This reverts commit 68c6c746c8c8af668ddef610c7cc507a64e006b9.
    
    Apparently this causes also non-Type 1 fonts to get missing.

 pango/pangowin32-fontmap.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 658f5dbc..1c0b70f2 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -53,6 +53,10 @@ struct _PangoWin32Family
 # define NTM_PS_OPENTYPE 0x20000
 #endif
 
+#if !defined(NTM_TYPE1)
+# define NTM_TYPE1 0x100000
+#endif
+
 #define PANGO_WIN32_TYPE_FAMILY              (pango_win32_family_get_type ())
 #define PANGO_WIN32_FAMILY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_WIN32_TYPE_FAMILY, 
PangoWin32Family))
 #define PANGO_WIN32_IS_FAMILY (object)       (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_WIN32_TYPE_FAMILY))
@@ -205,7 +209,7 @@ pango_win32_enum_proc (LOGFONTW       *lfp,
 
   PING (("%S: %lu %lx", lfp->lfFaceName, fontType, metrics->ntmFlags));
 
-  if (fontType == TRUETYPE_FONTTYPE || metrics->ntmFlags & NTM_PS_OPENTYPE)
+  if (fontType == TRUETYPE_FONTTYPE || ((metrics->ntmFlags & NTM_PS_OPENTYPE) || (metrics->ntmFlags & 
NTM_TYPE1)))
     {
       lf = *lfp;