summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLog.pre-1-109
-rw-r--r--ChangeLog.pre-1-29
-rw-r--r--ChangeLog.pre-1-49
-rw-r--r--ChangeLog.pre-1-69
-rw-r--r--ChangeLog.pre-1-89
-rw-r--r--docs/tmpl/fonts.sgml10
-rw-r--r--pango/pango-attributes.h1
-rw-r--r--pango/pango-font.h11
-rw-r--r--pango/pango-fontmap.h4
-rw-r--r--pango/pango-fontset.h4
11 files changed, 68 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index ecd8a083..015638c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
-Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+Tue Dec 10 18:37:19 2002 Owen Taylor <otaylor@redhat.com>
* === Released 1.1.5 ===
+ * pango/pango-attributes.h pango/pango-font.h
+ pango/pango-fontset.h pango/pango-fontmap.h: Add
+ explicit /*< public >*/ /*< private *>/ guards.
+ (See #95398 for gtk-doc changes making this necessary)
+
+Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+
* configure.in: Version 1.1.5, interface age 1.
* NEWS: Update.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index ecd8a083..015638c8 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,7 +1,14 @@
-Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+Tue Dec 10 18:37:19 2002 Owen Taylor <otaylor@redhat.com>
* === Released 1.1.5 ===
+ * pango/pango-attributes.h pango/pango-font.h
+ pango/pango-fontset.h pango/pango-fontmap.h: Add
+ explicit /*< public >*/ /*< private *>/ guards.
+ (See #95398 for gtk-doc changes making this necessary)
+
+Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+
* configure.in: Version 1.1.5, interface age 1.
* NEWS: Update.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index ecd8a083..015638c8 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,7 +1,14 @@
-Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+Tue Dec 10 18:37:19 2002 Owen Taylor <otaylor@redhat.com>
* === Released 1.1.5 ===
+ * pango/pango-attributes.h pango/pango-font.h
+ pango/pango-fontset.h pango/pango-fontmap.h: Add
+ explicit /*< public >*/ /*< private *>/ guards.
+ (See #95398 for gtk-doc changes making this necessary)
+
+Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+
* configure.in: Version 1.1.5, interface age 1.
* NEWS: Update.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index ecd8a083..015638c8 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,7 +1,14 @@
-Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+Tue Dec 10 18:37:19 2002 Owen Taylor <otaylor@redhat.com>
* === Released 1.1.5 ===
+ * pango/pango-attributes.h pango/pango-font.h
+ pango/pango-fontset.h pango/pango-fontmap.h: Add
+ explicit /*< public >*/ /*< private *>/ guards.
+ (See #95398 for gtk-doc changes making this necessary)
+
+Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+
* configure.in: Version 1.1.5, interface age 1.
* NEWS: Update.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index ecd8a083..015638c8 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,7 +1,14 @@
-Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+Tue Dec 10 18:37:19 2002 Owen Taylor <otaylor@redhat.com>
* === Released 1.1.5 ===
+ * pango/pango-attributes.h pango/pango-font.h
+ pango/pango-fontset.h pango/pango-fontmap.h: Add
+ explicit /*< public >*/ /*< private *>/ guards.
+ (See #95398 for gtk-doc changes making this necessary)
+
+Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+
* configure.in: Version 1.1.5, interface age 1.
* NEWS: Update.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index ecd8a083..015638c8 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,7 +1,14 @@
-Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+Tue Dec 10 18:37:19 2002 Owen Taylor <otaylor@redhat.com>
* === Released 1.1.5 ===
+ * pango/pango-attributes.h pango/pango-font.h
+ pango/pango-fontset.h pango/pango-fontmap.h: Add
+ explicit /*< public >*/ /*< private *>/ guards.
+ (See #95398 for gtk-doc changes making this necessary)
+
+Tue Dec 10 14:51:01 2002 Owen Taylor <otaylor@redhat.com>
+
* configure.in: Version 1.1.5, interface age 1.
* NEWS: Update.
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 49a96eaa..1aacbf32 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -691,16 +691,11 @@ The #PangoFontMapClass structure holds the virtual functions for
a particular #PangoFontMap implementation.
</para>
-@parent_class:
@load_font: a function to load a font with a given description. See
pango_font_map_load_font()
@list_families: A function to list available font families. See
pango_font_map_list_families().
@load_fontset:
-@_pango_reserved1:
-@_pango_reserved2:
-@_pango_reserved3:
-@_pango_reserved4:
<!-- ##### MACRO PANGO_FONT_MAP_CLASS ##### -->
<para>
@@ -783,16 +778,11 @@ The #PangoFontsetClass structure holds the virtual functions for
a particular #PangoFontset implementation.
</para>
-@parent_class:
@get_font: a function to get the font in the fontset that contains the
best glyph for the given unicode character; see pango_fontset_get_font().
@get_metrics: a function to get overall metric information for the fonts
in the fontset; see pango_fontset_get_metrics().
@get_language: a function to get the language of the fontset.
-@_pango_reserved1:
-@_pango_reserved2:
-@_pango_reserved3:
-@_pango_reserved4:
<!-- ##### FUNCTION pango_fontset_get_font ##### -->
<para>
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 3860a6d9..5a29f706 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -102,6 +102,7 @@ typedef gboolean (*PangoAttrFilterFunc) (PangoAttribute *attribute,
struct _PangoAttrClass
{
+ /*< public >*/
PangoAttrType type;
PangoAttribute * (*copy) (const PangoAttribute *attr);
void (*destroy) (PangoAttribute *attr);
diff --git a/pango/pango-font.h b/pango/pango-font.h
index 95031376..4750300d 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -210,12 +210,16 @@ struct _PangoFontFamily
struct _PangoFontFamilyClass
{
GObjectClass parent_class;
+
+ /*< public >*/
void (*list_faces) (PangoFontFamily *family,
PangoFontFace ***faces,
int *n_faces);
const char * (*get_name) (PangoFontFamily *family);
+ /*< private >*/
+
/* Padding for future expansion */
void (*_pango_reserved1) (void);
void (*_pango_reserved2) (void);
@@ -254,10 +258,14 @@ struct _PangoFontFace
struct _PangoFontFaceClass
{
GObjectClass parent_class;
+
+ /*< public >*/
const char * (*get_face_name) (PangoFontFace *face);
PangoFontDescription * (*describe) (PangoFontFace *face);
+ /*< private >*/
+
/* Padding for future expansion */
void (*_pango_reserved1) (void);
void (*_pango_reserved2) (void);
@@ -306,6 +314,8 @@ struct _PangoFont
struct _PangoFontClass
{
GObjectClass parent_class;
+
+ /*< public >*/
PangoFontDescription *(*describe) (PangoFont *font);
PangoCoverage * (*get_coverage) (PangoFont *font,
@@ -319,6 +329,7 @@ struct _PangoFontClass
PangoRectangle *logical_rect);
PangoFontMetrics * (*get_metrics) (PangoFont *font,
PangoLanguage *language);
+ /*< private >*/
/* Padding for future expansion */
void (*_pango_reserved1) (void);
diff --git a/pango/pango-fontmap.h b/pango/pango-fontmap.h
index ce5e45c0..ddf7d173 100644
--- a/pango/pango-fontmap.h
+++ b/pango/pango-fontmap.h
@@ -63,6 +63,8 @@ struct _PangoFontMap
struct _PangoFontMapClass
{
GObjectClass parent_class;
+
+ /*< public >*/
PangoFont * (*load_font) (PangoFontMap *fontmap,
PangoContext *context,
@@ -75,6 +77,8 @@ struct _PangoFontMapClass
const PangoFontDescription *desc,
PangoLanguage *language);
+ /*< private >*/
+
/* Padding for future expansion */
void (*_pango_reserved1) (void);
void (*_pango_reserved2) (void);
diff --git a/pango/pango-fontset.h b/pango/pango-fontset.h
index ea9e3ddd..8a118328 100644
--- a/pango/pango-fontset.h
+++ b/pango/pango-fontset.h
@@ -62,12 +62,16 @@ struct _PangoFontsetClass
{
GObjectClass parent_class;
+ /*< public >*/
+
PangoFont * (*get_font) (PangoFontset *fontset,
guint wc);
PangoFontMetrics *(*get_metrics) (PangoFontset *fontset);
PangoLanguage * (*get_language) (PangoFontset *fontset);
+ /*< private >*/
+
/* Padding for future expansion */
void (*_pango_reserved1) (void);
void (*_pango_reserved2) (void);
View Lorry Controller Status