summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2022-01-10 09:25:03 -0500
committerMatthias Clasen <mclasen@redhat.com>2022-02-17 14:01:09 -0600
commitc847530b104516c07c497d5f8285b1863a6f65c2 (patch)
tree59a521f32a9209b605beb39a8a2b3da40bb62d3e
parent9bb614133480c294ea31c80c469b5bb8c458aaaf (diff)
downloadpango-c847530b104516c07c497d5f8285b1863a6f65c2.tar.gz
Drop remnants of engines and modules
Drop all of this.
-rw-r--r--pango/fonts.c20
-rw-r--r--pango/meson.build4
-rw-r--r--pango/modules.c101
-rw-r--r--pango/pango-engine.c82
-rw-r--r--pango/pango-engine.h457
-rw-r--r--pango/pango-font.h6
-rw-r--r--pango/pango-fontmap-private.h3
-rw-r--r--pango/pango-fontmap.c21
-rw-r--r--pango/pango-fontmap.h3
-rw-r--r--pango/pango-item.h5
-rw-r--r--pango/pango-layout.c1
-rw-r--r--pango/pango-modules.h84
-rw-r--r--pango/pango-types.h6
-rw-r--r--pango/pango.h1
-rw-r--r--pango/pangocoretext-fontmap.c1
-rw-r--r--pango/pangocoretext-private.h8
-rw-r--r--pango/pangofc-font-private.h9
-rw-r--r--pango/pangofc-fontmap.c1
-rw-r--r--pango/pangoft2.h14
-rw-r--r--pango/pangowin32-fontmap.c1
-rw-r--r--pango/pangowin32.h8
-rw-r--r--pango/pangoxft.h14
22 files changed, 1 insertions, 849 deletions
diff --git a/pango/fonts.c b/pango/fonts.c
index 004089fc..8cc02b48 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -1864,26 +1864,6 @@ pango_font_get_coverage (PangoFont *font,
}
/**
- * pango_font_find_shaper:
- * @font: a `PangoFont`
- * @language: the language tag
- * @ch: a Unicode character.
- *
- * Finds the best matching shaper for a font for a particular
- * language tag and character point.
- *
- * Return value: (transfer none): the best matching shaper.
- * Deprecated: Shape engines are no longer used
- */
-PangoEngineShape *
-pango_font_find_shaper (PangoFont *font,
- PangoLanguage *language,
- guint32 ch)
-{
- return NULL;
-}
-
-/**
* pango_font_get_glyph_extents:
* @font: (nullable): a `PangoFont`
* @glyph: the glyph index
diff --git a/pango/meson.build b/pango/meson.build
index 9f4c49be..aca5b1e8 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -4,14 +4,12 @@ pango_sources = [
'fonts.c',
'glyphstring.c',
'itemize.c',
- 'modules.c',
'pango-attributes.c',
'pango-bidi-type.c',
'pango-color.c',
'pango-context.c',
'pango-coverage.c',
'pango-emoji.c',
- 'pango-engine.c',
'pango-fontmap.c',
'pango-fontset.c',
'pango-fontset-simple.c',
@@ -42,7 +40,6 @@ pango_headers = [
'pango-context.h',
'pango-coverage.h',
'pango-direction.h',
- 'pango-engine.h',
'pango-font.h',
'pango-fontmap.h',
'pango-fontset.h',
@@ -55,7 +52,6 @@ pango_headers = [
'pango-layout.h',
'pango-matrix.h',
'pango-markup.h',
- 'pango-modules.h',
'pango-renderer.h',
'pango-script.h',
'pango-tabs.h',
diff --git a/pango/modules.c b/pango/modules.c
deleted file mode 100644
index 4aea37c5..00000000
--- a/pango/modules.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Pango
- * modules.c:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include "pango-modules.h"
-
-/**
- * pango_find_map: (skip)
- * @language: the language tag for which to find the map
- * @engine_type_id: the engine type for the map to find
- * @render_type_id: the render type for the map to find
- *
- * Do not use. Does not do anything.
- *
- * Return value: (transfer none) (nullable): %NULL.
- *
- * Deprecated: 1.38
- **/
-PangoMap *
-pango_find_map (PangoLanguage *language G_GNUC_UNUSED,
- guint engine_type_id G_GNUC_UNUSED,
- guint render_type_id G_GNUC_UNUSED)
-{
- return NULL;
-}
-
-/**
- * pango_map_get_engine: (skip)
- * @map: a `PangoMap`
- * @script: a `PangoScript`
- *
- * Do not use. Does not do anything.
- *
- * Return value: (transfer none) (nullable): %NULL.
- *
- * Deprecated: 1.38
- **/
-PangoEngine *
-pango_map_get_engine (PangoMap *map G_GNUC_UNUSED,
- PangoScript script G_GNUC_UNUSED)
-{
- return NULL;
-}
-
-/**
- * pango_map_get_engines: (skip)
- * @map: a `PangoMap`
- * @script: a `PangoScript`
- * @exact_engines: (nullable): location to store list of engines that exactly
- * handle this script.
- * @fallback_engines: (nullable): location to store list of engines that
- * approximately handle this script.
- *
- * Do not use. Does not do anything.
- *
- * Since: 1.4
- * Deprecated: 1.38
- **/
-void
-pango_map_get_engines (PangoMap *map G_GNUC_UNUSED,
- PangoScript script G_GNUC_UNUSED,
- GSList **exact_engines,
- GSList **fallback_engines)
-{
- if (exact_engines)
- *exact_engines = NULL;
- if (fallback_engines)
- *fallback_engines = NULL;
-}
-
-/**
- * pango_module_register: (skip)
- * @module: a `PangoIncludedModule`
- *
- * Do not use. Does not do anything.
- *
- * Deprecated: 1.38
- **/
-void
-pango_module_register (PangoIncludedModule *module G_GNUC_UNUSED)
-{
-}
diff --git a/pango/pango-engine.c b/pango/pango-engine.c
deleted file mode 100644
index bda8eef1..00000000
--- a/pango/pango-engine.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Pango
- * pango-engine.c: Engines for script and language specific processing
- *
- * Copyright (C) 2003 Red Hat Software
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include "pango-engine.h"
-#include "pango-impl-utils.h"
-
-
-G_DEFINE_ABSTRACT_TYPE (PangoEngine, pango_engine, G_TYPE_OBJECT);
-
-static void
-pango_engine_init (PangoEngine *self)
-{
-}
-
-static void
-pango_engine_class_init (PangoEngineClass *klass)
-{
-}
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-G_DEFINE_ABSTRACT_TYPE (PangoEngineLang, pango_engine_lang, PANGO_TYPE_ENGINE);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-static void
-pango_engine_lang_init (PangoEngineLang *self)
-{
-}
-
-static void
-pango_engine_lang_class_init (PangoEngineLangClass *klass)
-{
-}
-
-
-static PangoCoverageLevel
-pango_engine_shape_real_covers (PangoEngineShape *engine G_GNUC_UNUSED,
- PangoFont *font,
- PangoLanguage *language,
- gunichar wc)
-{
- PangoCoverage *coverage = pango_font_get_coverage (font, language);
- PangoCoverageLevel result = pango_coverage_get (coverage, wc);
-
- g_object_unref (coverage);
-
- return result;
-}
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-G_DEFINE_ABSTRACT_TYPE (PangoEngineShape, pango_engine_shape, PANGO_TYPE_ENGINE);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-static void
-pango_engine_shape_init (PangoEngineShape *klass)
-{
-}
-
-static void
-pango_engine_shape_class_init (PangoEngineShapeClass *class)
-{
- class->covers = pango_engine_shape_real_covers;
-}
diff --git a/pango/pango-engine.h b/pango/pango-engine.h
deleted file mode 100644
index faa683a4..00000000
--- a/pango/pango-engine.h
+++ /dev/null
@@ -1,457 +0,0 @@
-/* Pango
- * pango-engine.h: Engines for script and language specific processing
- *
- * Copyright (C) 2000,2003 Red Hat Software
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __PANGO_ENGINE_H__
-#define __PANGO_ENGINE_H__
-
-#include <pango/pango-types.h>
-#include <pango/pango-item.h>
-#include <pango/pango-font.h>
-#include <pango/pango-glyph.h>
-#include <pango/pango-script.h>
-
-G_BEGIN_DECLS
-
-/* All of this is deprecated and entirely useless for bindings.
- * Leave it out of the gir file.
- */
-#ifndef __GI_SCANNER__
-
-#ifndef PANGO_DISABLE_DEPRECATED
-
-/**
- * PANGO_RENDER_TYPE_NONE:
- *
- * A string constant defining the render type
- * for engines that are not rendering-system specific.
- *
- * Deprecated: 1.38
- */
-#define PANGO_RENDER_TYPE_NONE "PangoRenderNone"
-
-#define PANGO_TYPE_ENGINE (pango_engine_get_type ())
-#define PANGO_ENGINE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE, PangoEngine))
-#define PANGO_IS_ENGINE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE))
-#define PANGO_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE, PangoEngineClass))
-#define PANGO_IS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE))
-#define PANGO_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE, PangoEngineClass))
-
-typedef struct _PangoEngine PangoEngine;
-typedef struct _PangoEngineClass PangoEngineClass;
-
-/**
- * PangoEngine:
- *
- * `PangoEngine` is the base class for all types of language and
- * script specific engines. It has no functionality by itself.
- *
- * Deprecated: 1.38
- **/
-struct _PangoEngine
-{
- /*< private >*/
- GObject parent_instance;
-};
-
-/**
- * PangoEngineClass:
- *
- * Class structure for `PangoEngine`
- *
- * Deprecated: 1.38
- **/
-struct _PangoEngineClass
-{
- /*< private >*/
- GObjectClass parent_class;
-};
-
-PANGO_DEPRECATED_IN_1_38
-GType pango_engine_get_type (void) G_GNUC_CONST;
-
-/**
- * PANGO_ENGINE_TYPE_LANG:
- *
- * A string constant defining the engine type for language engines.
- * These engines derive from `PangoEngineLang`.
- *
- * Deprecated: 1.38
- */
-#define PANGO_ENGINE_TYPE_LANG "PangoEngineLang"
-
-#define PANGO_TYPE_ENGINE_LANG (pango_engine_lang_get_type ())
-#define PANGO_ENGINE_LANG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE_LANG, PangoEngineLang))
-#define PANGO_IS_ENGINE_LANG(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE_LANG))
-#define PANGO_ENGINE_LANG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE_LANG, PangoEngineLangClass))
-#define PANGO_IS_ENGINE_LANG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE_LANG))
-#define PANGO_ENGINE_LANG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE_LANG, PangoEngineLangClass))
-
-typedef struct _PangoEngineLangClass PangoEngineLangClass;
-
-/**
- * PangoEngineLang:
- *
- * The `PangoEngineLang` class is implemented by engines that
- * customize the rendering-system independent part of the
- * Pango pipeline for a particular script or language. For
- * instance, a custom `PangoEngineLang` could be provided for
- * Thai to implement the dictionary-based word boundary
- * lookups needed for that language.
- *
- * Deprecated: 1.38
- **/
-struct _PangoEngineLang
-{
- /*< private >*/
- PangoEngine parent_instance;
-};
-
-/**
- * PangoEngineLangClass:
- * @script_break: (nullable): Provides a custom implementation of
- * pango_break(). If %NULL, pango_default_break() is used instead. If
- * not %NULL, for Pango versions before 1.16 (module interface version
- * before 1.6.0), this was called instead of pango_default_break(),
- * but in newer versions, pango_default_break() is always called and
- * this is called after that to allow tailoring the breaking results.
- *
- * Class structure for `PangoEngineLang`
- *
- * Deprecated: 1.38
- **/
-struct _PangoEngineLangClass
-{
- /*< private >*/
- PangoEngineClass parent_class;
-
- /*< public >*/
- void (*script_break) (PangoEngineLang *engine,
- const char *text,
- int len,
- PangoAnalysis *analysis,
- PangoLogAttr *attrs,
- int attrs_len);
-};
-
-PANGO_DEPRECATED_IN_1_38
-GType pango_engine_lang_get_type (void) G_GNUC_CONST;
-
-/**
- * PANGO_ENGINE_TYPE_SHAPE:
- *
- * A string constant defining the engine type for shaping engines.
- * These engines derive from `PangoEngineShape`.
- *
- * Deprecated: 1.38
- */
-#define PANGO_ENGINE_TYPE_SHAPE "PangoEngineShape"
-
-#define PANGO_TYPE_ENGINE_SHAPE (pango_engine_shape_get_type ())
-#define PANGO_ENGINE_SHAPE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ENGINE_SHAPE, PangoEngineShape))
-#define PANGO_IS_ENGINE_SHAPE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ENGINE_SHAPE))
-#define PANGO_ENGINE_SHAPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ENGINE_SHAPE, PangoEngine_ShapeClass))
-#define PANGO_IS_ENGINE_SHAPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ENGINE_SHAPE))
-#define PANGO_ENGINE_SHAPE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ENGINE_SHAPE, PangoEngineShapeClass))
-
-typedef struct _PangoEngineShapeClass PangoEngineShapeClass;
-
-/**
- * PangoEngineShape:
- *
- * The `PangoEngineShape` class is implemented by engines that
- * customize the rendering-system dependent part of the
- * Pango pipeline for a particular script or language.
- * A `PangoEngineShape` implementation is then specific to both
- * a particular rendering system or group of rendering systems
- * and to a particular script. For instance, there is one
- * `PangoEngineShape` implementation to handle shaping Arabic
- * for Fontconfig-based backends.
- *
- * Deprecated: 1.38
- **/
-struct _PangoEngineShape
-{
- PangoEngine parent_instance;
-};
-
-/**
- * PangoEngineShapeClass:
- * @script_shape: Given a font, a piece of text, and a `PangoAnalysis`
- * structure, converts characters to glyphs and positions the
- * resulting glyphs. The results are stored in the `PangoGlyphString`
- * that is passed in. (The implementation should resize it
- * appropriately using pango_glyph_string_set_size()). All fields
- * of the @log_clusters and @glyphs array must be filled in, with
- * the exception that Pango will automatically generate
- * `glyphs->glyphs[i].attr.is_cluster_start`
- * using the @log_clusters array. Each input character must occur in one
- * of the output logical clusters;
- * if no rendering is desired for a character, this may involve
- * inserting glyphs with the `PangoGlyph` ID %PANGO_GLYPH_EMPTY, which
- * is guaranteed never to render. If the shaping fails for any reason,
- * the shaper should return with an empty (zero-size) glyph string.
- * If the shaper has not set the size on the glyph string yet, simply
- * returning signals the failure too.
- * @covers: Returns the characters that this engine can cover
- * with a given font for a given language. If not overridden, the default
- * implementation simply returns the coverage information for the
- * font itself unmodified.
- *
- * Class structure for `PangoEngineShape`
- *
- * Deprecated: 1.38
- **/
-struct _PangoEngineShapeClass
-{
- /*< private >*/
- PangoEngineClass parent_class;
-
- /*< public >*/
- void (*script_shape) (PangoEngineShape *engine,
- PangoFont *font,
- const char *item_text,
- unsigned int item_length,
- const PangoAnalysis *analysis,
- PangoGlyphString *glyphs,
- const char *paragraph_text,
- unsigned int paragraph_length);
- PangoCoverageLevel (*covers) (PangoEngineShape *engine,
- PangoFont *font,
- PangoLanguage *language,
- gunichar wc);
-};
-
-PANGO_DEPRECATED_IN_1_38
-GType pango_engine_shape_get_type (void) G_GNUC_CONST;
-
-typedef struct _PangoEngineInfo PangoEngineInfo;
-typedef struct _PangoEngineScriptInfo PangoEngineScriptInfo;
-
-/**
- * PangoEngineScriptInfo:
- * @script: a `PangoScript`. The value %PANGO_SCRIPT_COMMON has
- * the special meaning here of "all scripts"
- * @langs: a semicolon separated list of languages that this
- * engine handles for this script. This may be empty,
- * in which case the engine is saying that it is a
- * fallback choice for all languages for this range,
- * but should not be used if another engine
- * indicates that it is specific for the language for
- * a given code point. An entry in this list of "*"
- * indicates that this engine is specific to all
- * languages for this range.
- *
- * The `PangoEngineScriptInfo` structure contains
- * information about how the shaper covers a particular script.
- *
- * Deprecated: 1.38
- */
-struct _PangoEngineScriptInfo
-{
- PangoScript script;
- const gchar *langs;
-};
-
-/**
- * PangoEngineInfo:
- * @id: a unique string ID for the engine.
- * @engine_type: a string identifying the engine type.
- * @render_type: a string identifying the render type.
- * @scripts: array of scripts this engine supports.
- * @n_scripts: number of items in @scripts.
- *
- * The `PangoEngineInfo` structure contains information about a particular
- * engine. It contains the following fields:
- *
- * Deprecated: 1.38
- */
-struct _PangoEngineInfo
-{
- const gchar *id;
- const gchar *engine_type;
- const gchar *render_type;
- PangoEngineScriptInfo *scripts;
- gint n_scripts;
-};
-
-/**
- * script_engine_list: (skip)
- * @engines: location to store a pointer to an array of engines.
- * @n_engines: location to store the number of elements in @engines.
- *
- * Do not use.
- *
- * Deprecated: 1.38
- **/
-PANGO_DEPRECATED_IN_1_38
-void script_engine_list (PangoEngineInfo **engines,
- int *n_engines);
-
-/**
- * script_engine_init: (skip)
- * @module: a `GTypeModule` structure used to associate any
- * GObject types created in this module with the module.
- *
- * Do not use.
- *
- * Deprecated: 1.38
- **/
-PANGO_DEPRECATED_IN_1_38
-void script_engine_init (GTypeModule *module);
-
-
-/**
- * script_engine_exit: (skip)
- *
- * Do not use.
- *
- * Deprecated: 1.38
- **/
-PANGO_DEPRECATED_IN_1_38
-void script_engine_exit (void);
-
-/**
- * script_engine_create: (skip)
- * @id: the ID of an engine as reported by script_engine_list.
- *
- * Do not use.
- *
- * Deprecated: 1.38
- **/
-PANGO_DEPRECATED_IN_1_38
-PangoEngine *script_engine_create (const char *id);
-
-/* Utility macro used by PANGO_ENGINE_LANG_DEFINE_TYPE and
- * PANGO_ENGINE_LANG_DEFINE_TYPE
- */
-#define PANGO_ENGINE_DEFINE_TYPE(name, prefix, class_init, instance_init, parent_type) \
-static GType prefix ## _type; \
-static void \
-prefix ## _register_type (GTypeModule *module) \
-{ \
- const GTypeInfo object_info = \
- { \
- sizeof (name ## Class), \
- (GBaseInitFunc) NULL, \
- (GBaseFinalizeFunc) NULL, \
- (GClassInitFunc) class_init, \
- (GClassFinalizeFunc) NULL, \
- NULL, /* class_data */ \
- sizeof (name), \
- 0, /* n_prelocs */ \
- (GInstanceInitFunc) instance_init, \
- NULL /* value_table */ \
- }; \
- \
- prefix ## _type = g_type_module_register_type (module, parent_type, \
- # name, \
- &object_info, 0); \
-}
-
-/**
- * PANGO_ENGINE_LANG_DEFINE_TYPE:
- * @name: Name of the the type to register (for example:, ArabicEngineFc)
- * @prefix: Prefix for symbols that will be defined (for example:, arabic_engine_fc)
- * @class_init: (nullable): Class initialization function for the new type
- * @instance_init: (nullable): Instance initialization function for the new type
- *
- * Outputs the necessary code for GObject type registration for a
- * `PangoEngineLang` class defined in a module. Two static symbols
- * are defined.
- *
- * <programlisting>
- * static GType *prefix*_type;
- * static void *prefix*_register_type (GTypeModule module);
- *
- * The *prefix*_register_type()
- * function should be called in your script_engine_init() function for
- * each type that your module implements, and then your script_engine_create()
- * function can create instances of the object as follows:
- *
- * ```
- * PangoEngine *engine = g_object_new (prefix_type, NULL);
- * ```
- *
- * Deprecated: 1.38
- **/
-#define PANGO_ENGINE_LANG_DEFINE_TYPE(name, prefix, class_init, instance_init) \
- PANGO_ENGINE_DEFINE_TYPE (name, prefix, \
- class_init, instance_init, \
- PANGO_TYPE_ENGINE_LANG)
-
-/**
- * PANGO_ENGINE_SHAPE_DEFINE_TYPE:
- * @name: Name of the the type to register (for example:, ArabicEngineFc)
- * @prefix: Prefix for symbols that will be defined (for example:, arabic_engine_fc)
- * @class_init: (nullable): Class initialization function for the new type
- * @instance_init: (nullable): Instance initialization function for the new type
- *
- * Outputs the necessary code for GObject type registration for a
- * `PangoEngineShape` class defined in a module. Two static symbols
- * are defined.
- *
- * <programlisting>
- * static GType *prefix*_type;
- * static void *prefix*_register_type (GTypeModule module);
- * </programlisting>
- *
- * The *prefix*_register_type()
- * function should be called in your script_engine_init() function for
- * each type that your module implements, and then your script_engine_create()
- * function can create instances of the object as follows:
- *
- * ```
- * PangoEngine *engine = g_object_new (prefix_type, NULL);
- * ```
- *
- * Deprecated: 1.38
- **/
-#define PANGO_ENGINE_SHAPE_DEFINE_TYPE(name, prefix, class_init, instance_init) \
- PANGO_ENGINE_DEFINE_TYPE (name, prefix, \
- class_init, instance_init, \
- PANGO_TYPE_ENGINE_SHAPE)
-
-/* Macro used for possibly builtin Pango modules. Not useful
- * for externally build modules. If we are compiling a module standalone,
- * then we name the entry points script_engine_list, etc. But if we
- * are compiling it for inclusion directly in Pango, then we need them to
- * to have distinct names for this module, so we prepend a prefix.
- *
- * The two intermediate macros are to deal with details of the C
- * preprocessor; token pasting tokens must be function arguments,
- * and macro substitution isn't used on function arguments that
- * are used for token pasting.
- */
-#ifdef PANGO_MODULE_PREFIX
-#define PANGO_MODULE_ENTRY(func) _PANGO_MODULE_ENTRY2(PANGO_MODULE_PREFIX,func)
-#define _PANGO_MODULE_ENTRY2(prefix,func) _PANGO_MODULE_ENTRY3(prefix,func)
-#define _PANGO_MODULE_ENTRY3(prefix,func) prefix##_script_engine_##func
-#else
-#define PANGO_MODULE_ENTRY(func) script_engine_##func
-#endif
-
-#endif /* PANGO_DISABLE_DEPRECATED */
-
-#endif /* __GI_SCANNER__ */
-
-G_END_DECLS
-
-#endif /* __PANGO_ENGINE_H__ */
diff --git a/pango/pango-font.h b/pango/pango-font.h
index 350e4e29..dc689166 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -595,12 +595,6 @@ PangoFontDescription *pango_font_describe_with_absolute_size (PangoFont *
PANGO_AVAILABLE_IN_ALL
PangoCoverage * pango_font_get_coverage (PangoFont *font,
PangoLanguage *language);
-#ifndef __GI_SCANNER__
-PANGO_DEPRECATED_IN_1_44
-PangoEngineShape * pango_font_find_shaper (PangoFont *font,
- PangoLanguage *language,
- guint32 ch);
-#endif
PANGO_AVAILABLE_IN_ALL
PangoFontMetrics * pango_font_get_metrics (PangoFont *font,
PangoLanguage *language);
diff --git a/pango/pango-fontmap-private.h b/pango/pango-fontmap-private.h
index 935fd713..8d87f0fa 100644
--- a/pango/pango-fontmap-private.h
+++ b/pango/pango-fontmap-private.h
@@ -28,9 +28,6 @@
G_BEGIN_DECLS
-PANGO_DEPRECATED_IN_1_38
-const char *pango_font_map_get_shape_engine_type (PangoFontMap *fontmap);
-
G_END_DECLS
#endif /* __PANGO_FONTMAP_PRIVATE_H__ */
diff --git a/pango/pango-fontmap.c b/pango/pango-fontmap.c
index 71e3e20c..2cb1b175 100644
--- a/pango/pango-fontmap.c
+++ b/pango/pango-fontmap.c
@@ -293,27 +293,6 @@ pango_font_map_real_load_fontset (PangoFontMap *fontmap,
}
/**
- * pango_font_map_get_shape_engine_type:
- * @fontmap: a `PangoFontMap`
- *
- * Returns the render ID for shape engines for this fontmap.
- * See the `render_type` field of `PangoEngineInfo`.
- *
- * Return value (transfer none): the ID string for shape engines
- * for this fontmap
- *
- * Since: 1.4
- * Deprecated: 1.38
- */
-const char *
-pango_font_map_get_shape_engine_type (PangoFontMap *fontmap)
-{
- g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL);
-
- return PANGO_FONT_MAP_GET_CLASS (fontmap)->shape_engine_type;
-}
-
-/**
* pango_font_map_get_serial:
* @fontmap: a `PangoFontMap`
*
diff --git a/pango/pango-fontmap.h b/pango/pango-fontmap.h
index cc85899b..1f42da0f 100644
--- a/pango/pango-fontmap.h
+++ b/pango/pango-fontmap.h
@@ -60,7 +60,6 @@ struct _PangoFontMap
* pango_font_map_list_families().
* @load_fontset: a function to load a fontset with a given given description
* suitable for a particular language. See pango_font_map_load_fontset().
- * @shape_engine_type: the type of rendering-system-dependent engines that
* can handle fonts of this fonts loaded with this fontmap.
* @get_serial: a function to get the serial number of the fontmap.
* See pango_font_map_get_serial().
@@ -86,8 +85,6 @@ struct _PangoFontMapClass
const PangoFontDescription *desc,
PangoLanguage *language);
- const char *shape_engine_type;
-
guint (*get_serial) (PangoFontMap *fontmap);
void (*changed) (PangoFontMap *fontmap);
diff --git a/pango/pango-item.h b/pango/pango-item.h
index f0eebc01..a23af665 100644
--- a/pango/pango-item.h
+++ b/pango/pango-item.h
@@ -76,13 +76,8 @@ typedef struct _PangoItem PangoItem;
*/
struct _PangoAnalysis
{
-#ifndef __GI_SCANNER__
- PangoEngineShape *shape_engine;
- PangoEngineLang *lang_engine;
-#else
gpointer shape_engine;
gpointer lang_engine;
-#endif
PangoFont *font;
guint8 level;
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 9167883c..753a8a6e 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -77,7 +77,6 @@
#include "pango-glyph.h" /* For pango_shape() */
#include "pango-break.h"
#include "pango-item-private.h"
-#include "pango-engine.h"
#include "pango-impl-utils.h"
#include "pango-glyph-item.h"
#include <string.h>
diff --git a/pango/pango-modules.h b/pango/pango-modules.h
deleted file mode 100644
index 5bd707b4..00000000
--- a/pango/pango-modules.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Pango
- * pango-modules.h:
- *
- * Copyright (C) 1999 Red Hat Software
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __PANGO_MODULES_H__
-#define __PANGO_MODULES_H__
-
-#include <pango/pango-engine.h>
-
-G_BEGIN_DECLS
-
-/* All of this is deprecated and entirely useless for bindings.
- * Leave it out of the gir file.
- */
-#ifndef __GI_SCANNER__
-
-#ifndef PANGO_DISABLE_DEPRECATED
-
-typedef struct _PangoMap PangoMap;
-typedef struct _PangoMapEntry PangoMapEntry;
-
-typedef struct _PangoIncludedModule PangoIncludedModule;
-
-/**
- * PangoIncludedModule:
- * @list: a function that lists the engines defined in this module.
- * @init: a function to initialize the module.
- * @exit: a function to finalize the module.
- * @create: a function to create an engine, given the engine name.
- *
- * The `PangoIncludedModule` structure for a statically linked module
- * contains the functions that would otherwise be loaded from a dynamically
- * loaded module.
- *
- * Deprecated: 1.38
- */
-struct _PangoIncludedModule
-{
- void (*list) (PangoEngineInfo **engines,
- int *n_engines);
- void (*init) (GTypeModule *module);
- void (*exit) (void);
- PangoEngine *(*create) (const char *id);
-};
-
-PANGO_DEPRECATED_IN_1_38
-PangoMap * pango_find_map (PangoLanguage *language,
- guint engine_type_id,
- guint render_type_id);
-PANGO_DEPRECATED_IN_1_38
-PangoEngine * pango_map_get_engine (PangoMap *map,
- PangoScript script);
-PANGO_DEPRECATED_IN_1_38
-void pango_map_get_engines (PangoMap *map,
- PangoScript script,
- GSList **exact_engines,
- GSList **fallback_engines);
-PANGO_DEPRECATED_IN_1_38
-void pango_module_register (PangoIncludedModule *module);
-
-#endif /* PANGO_DISABLE_DEPRECATED */
-
-#endif /* __GI_SCANNER__ */
-
-G_END_DECLS
-
-#endif /* __PANGO_MODULES_H__ */
diff --git a/pango/pango-types.h b/pango/pango-types.h
index ed86f699..94db77d7 100644
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -31,12 +31,8 @@ G_BEGIN_DECLS
typedef struct _PangoLogAttr PangoLogAttr;
-#ifndef __GI_SCANNER__
-typedef struct _PangoEngineLang PangoEngineLang;
-typedef struct _PangoEngineShape PangoEngineShape;
-#endif
-
typedef struct _PangoFont PangoFont;
+
typedef struct _PangoFontMap PangoFontMap;
typedef struct _PangoRectangle PangoRectangle;
diff --git a/pango/pango.h b/pango/pango.h
index eca66265..a6220a8c 100644
--- a/pango/pango.h
+++ b/pango/pango.h
@@ -29,7 +29,6 @@
#include <pango/pango-context.h>
#include <pango/pango-coverage.h>
#include <pango/pango-direction.h>
-#include <pango/pango-engine.h>
#include <pango/pango-enum-types.h>
#include <pango/pango-features.h>
#include <pango/pango-font.h>
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 40e62eed..04ee9a56 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -1541,7 +1541,6 @@ pango_core_text_font_map_class_init (PangoCoreTextFontMapClass *class)
fontmap_class->load_font = pango_core_text_font_map_load_font;
fontmap_class->list_families = pango_core_text_font_map_list_families;
fontmap_class->load_fontset = pango_core_text_font_map_load_fontset;
- fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_CORE_TEXT;
fontmap_class->get_serial = pango_core_text_font_map_get_serial;
fontmap_class->changed = pango_core_text_font_map_changed;
fontmap_class->get_face = pango_core_text_font_map_get_face;
diff --git a/pango/pangocoretext-private.h b/pango/pangocoretext-private.h
index 88187df4..eae7a0c0 100644
--- a/pango/pangocoretext-private.h
+++ b/pango/pangocoretext-private.h
@@ -30,14 +30,6 @@
G_BEGIN_DECLS
-/**
- * PANGO_RENDER_TYPE_CORE_TEXT:
- *
- * A string constant identifying the CoreText renderer. The associated quark (see
- * g_quark_from_string()) is used to identify the renderer in pango_find_map().
- */
-#define PANGO_RENDER_TYPE_CORE_TEXT "PangoRenderCoreText"
-
#define PANGO_CORE_TEXT_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_CORE_TEXT_FONT, PangoCoreTextFontClass))
#define PANGO_IS_CORE_TEXT_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_CORE_TEXT_FONT))
#define PANGO_CORE_TEXT_FONT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_CORE_TEXT_FONT, PangoCoreTextFontClass))
diff --git a/pango/pangofc-font-private.h b/pango/pangofc-font-private.h
index 532aed2f..1a97a6ab 100644
--- a/pango/pangofc-font-private.h
+++ b/pango/pangofc-font-private.h
@@ -27,15 +27,6 @@
G_BEGIN_DECLS
-/**
- * PANGO_RENDER_TYPE_FC:
- *
- * A string constant used to identify shape engines that work
- * with the fontconfig based backends. See the @engine_type field
- * of `PangoEngineInfo`.
- **/
-#define PANGO_RENDER_TYPE_FC "PangoRenderFc"
-
#define PANGO_FC_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_FONT, PangoFcFontClass))
#define PANGO_IS_FC_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_FONT))
#define PANGO_FC_FONT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_FONT, PangoFcFontClass))
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 4c39ea1f..4af53122 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -1494,7 +1494,6 @@ pango_fc_font_map_class_init (PangoFcFontMapClass *class)
fontmap_class->list_families = pango_fc_font_map_list_families;
fontmap_class->get_family = pango_fc_font_map_get_family;
fontmap_class->get_face = pango_fc_font_map_get_face;
- fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_FC;
fontmap_class->changed = pango_fc_font_map_changed;
}
diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index 239eb05e..86cb84c9 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -34,20 +34,6 @@
G_BEGIN_DECLS
-#ifndef __GI_SCANNER__
-
-#ifndef PANGO_DISABLE_DEPRECATED
-/**
- * PANGO_RENDER_TYPE_FT2: (skip)
- *
- * A string constant that was used to identify shape engines that work
- * with the FreeType backend. See %PANGO_RENDER_TYPE_FC for the replacement.
- */
-#define PANGO_RENDER_TYPE_FT2 "PangoRenderFT2"
-#endif
-
-#endif /* __GI_SCANNER__ */
-
#ifdef __GI_SCANNER__
#define PANGO_FT2_TYPE_FONT_MAP (pango_ft2_font_map_get_type ())
#define PANGO_FT2_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_FT2_TYPE_FONT_MAP, PangoFT2FontMap))
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 43cffc37..f59eddf4 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -798,7 +798,6 @@ _pango_win32_font_map_class_init (PangoWin32FontMapClass *class)
/* we now need a load_fontset implementation for the Win32 backend */
fontmap_class->load_fontset = pango_win32_font_map_load_fontset;
fontmap_class->list_families = pango_win32_font_map_list_families;
- fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_WIN32;
fontmap_class->get_face = pango_win32_font_map_get_face;
class->aliases = g_hash_table_new_full ((GHashFunc)alias_hash,
(GEqualFunc)alias_equal,
diff --git a/pango/pangowin32.h b/pango/pangowin32.h
index 406c428b..a2045f0f 100644
--- a/pango/pangowin32.h
+++ b/pango/pangowin32.h
@@ -37,14 +37,6 @@ G_BEGIN_DECLS
#include <windows.h>
#undef STRICT
-/**
- * PANGO_RENDER_TYPE_WIN32:
- *
- * A string constant identifying the Win32 renderer. The associated quark (see
- * g_quark_from_string()) is used to identify the renderer in pango_find_map().
- */
-#define PANGO_RENDER_TYPE_WIN32 "PangoRenderWin32"
-
/* Calls for applications
*/
#ifndef PANGO_DISABLE_DEPRECATED
diff --git a/pango/pangoxft.h b/pango/pangoxft.h
index 105de5c2..b035d79e 100644
--- a/pango/pangoxft.h
+++ b/pango/pangoxft.h
@@ -32,20 +32,6 @@
G_BEGIN_DECLS
-#ifndef __GI_SCANNER__
-
-/**
- * PANGO_RENDER_TYPE_XFT: (skip)
- *
- * A string constant that was used to identify shape engines that work
- * with the Xft backend. See %PANGO_RENDER_TYPE_FC for the replacement.
- */
-#ifndef PANGO_DISABLE_DEPRECATED
-#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
-#endif
-
-#endif /* __GI_SCANNER__ */
-
/**
* PangoXftFontMap:
*