diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | docs/pango-sections.txt | 3 | ||||
| -rw-r--r-- | docs/tmpl/fonts.sgml | 21 | ||||
| -rw-r--r-- | docs/tmpl/main.sgml | 11 | ||||
| -rw-r--r-- | docs/tmpl/pango-x.sgml | 145 | ||||
| -rw-r--r-- | pango/pango-context.c | 7 |
14 files changed, 98 insertions, 149 deletions
@@ -1,3 +1,11 @@ +Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com> + + * docs/**: Added recent API changes. + * libpango/pango-context.c: Doc comment fixes + + * configure.in: Add in directories from unicode-config + when running AC_CHECK_LIB on libunicode. + Thu Feb 10 23:45:27 2000 Owen Taylor <otaylor@redhat.com> * configure.in: Up version to match 0.6 release that diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index d605bbf3..49adb8c5 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,11 @@ +Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com> + + * docs/**: Added recent API changes. + * libpango/pango-context.c: Doc comment fixes + + * configure.in: Add in directories from unicode-config + when running AC_CHECK_LIB on libunicode. + Thu Feb 10 23:45:27 2000 Owen Taylor <otaylor@redhat.com> * configure.in: Up version to match 0.6 release that diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d605bbf3..49adb8c5 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com> + + * docs/**: Added recent API changes. + * libpango/pango-context.c: Doc comment fixes + + * configure.in: Add in directories from unicode-config + when running AC_CHECK_LIB on libunicode. + Thu Feb 10 23:45:27 2000 Owen Taylor <otaylor@redhat.com> * configure.in: Up version to match 0.6 release that diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index d605bbf3..49adb8c5 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,11 @@ +Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com> + + * docs/**: Added recent API changes. + * libpango/pango-context.c: Doc comment fixes + + * configure.in: Add in directories from unicode-config + when running AC_CHECK_LIB on libunicode. + Thu Feb 10 23:45:27 2000 Owen Taylor <otaylor@redhat.com> * configure.in: Up version to match 0.6 release that diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d605bbf3..49adb8c5 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com> + + * docs/**: Added recent API changes. + * libpango/pango-context.c: Doc comment fixes + + * configure.in: Add in directories from unicode-config + when running AC_CHECK_LIB on libunicode. + Thu Feb 10 23:45:27 2000 Owen Taylor <otaylor@redhat.com> * configure.in: Up version to match 0.6 release that diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d605bbf3..49adb8c5 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com> + + * docs/**: Added recent API changes. + * libpango/pango-context.c: Doc comment fixes + + * configure.in: Add in directories from unicode-config + when running AC_CHECK_LIB on libunicode. + Thu Feb 10 23:45:27 2000 Owen Taylor <otaylor@redhat.com> * configure.in: Up version to match 0.6 release that diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d605bbf3..49adb8c5 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com> + + * docs/**: Added recent API changes. + * libpango/pango-context.c: Doc comment fixes + + * configure.in: Add in directories from unicode-config + when running AC_CHECK_LIB on libunicode. + Thu Feb 10 23:45:27 2000 Owen Taylor <otaylor@redhat.com> * configure.in: Up version to match 0.6 release that @@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd $srcdir -PROJECT=PanGo +PROJECT=Pango TEST_TYPE=-f FILE=libpango/pango.h diff --git a/configure.in b/configure.in index c9503ec2..10ba3ecf 100644 --- a/configure.in +++ b/configure.in @@ -35,7 +35,7 @@ AC_SUBST(UNICODE_LIBS) AC_CHECK_FUNCS(flockfile) AC_CHECK_LIB(unicode, unicode_type, :, - AC_MSG_ERROR([*** libunicode not found.])) + AC_MSG_ERROR([*** libunicode not found.]), $UNICODE_LIBS) AC_CHECK_PROG(gtkdoc, gtkdoc-scan, yes, no) AM_CONDITIONAL(HAVE_GTK_DOC, test x$gtkdoc = xyes) diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index f68e34a5..e628cc4f 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -19,6 +19,7 @@ pango_context_set_base_dir pango_context_get_lang pango_context_set_lang pango_context_load_font +pango_context_list_families pango_context_list_fonts <SUBSECTION> pango_break @@ -88,6 +89,8 @@ pango_font_map_init pango_font_map_ref pango_font_map_unref pango_font_map_load_font +pango_font_map_list_families +pango_font_map_free_families pango_font_map_list_fonts </SECTION> diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml index 3c18a7da..91874e00 100644 --- a/docs/tmpl/fonts.sgml +++ b/docs/tmpl/fonts.sgml @@ -257,6 +257,7 @@ a particular #PangoFontMap implementation. @load_font: a function to load a font with a given description. See pango_font_map_load_font() @list_fonts: A function to list available fonts. See pango_font_map_list_fonts() +@list_families: <!-- ##### FUNCTION pango_font_map_init ##### --> <para> @@ -293,12 +294,32 @@ a particular #PangoFontMap implementation. @Returns: +<!-- ##### FUNCTION pango_font_map_list_families ##### --> +<para> + +</para> + +@fontmap: +@families: +@n_families: + + +<!-- ##### FUNCTION pango_font_map_free_families ##### --> +<para> + +</para> + +@families: +@n_families: + + <!-- ##### FUNCTION pango_font_map_list_fonts ##### --> <para> </para> @fontmap: +@family: @descs: @n_descs: diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml index 449e6963..29073625 100644 --- a/docs/tmpl/main.sgml +++ b/docs/tmpl/main.sgml @@ -258,12 +258,23 @@ It contains the following fields: @Returns: +<!-- ##### FUNCTION pango_context_list_families ##### --> +<para> + +</para> + +@context: +@families: +@n_families: + + <!-- ##### FUNCTION pango_context_list_fonts ##### --> <para> </para> @context: +@family: @descs: @n_descs: diff --git a/docs/tmpl/pango-x.sgml b/docs/tmpl/pango-x.sgml deleted file mode 100644 index 8b75e862..00000000 --- a/docs/tmpl/pango-x.sgml +++ /dev/null @@ -1,145 +0,0 @@ -<!-- ##### SECTION Title ##### --> -X Rendering - -<!-- ##### SECTION Short_Description ##### --> -Functions for rendering and measuring glyphs on -the X Window system. - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - -<!-- ##### TYPEDEF PangoXSubfont ##### --> -<para> - -</para> - - -<!-- ##### MACRO PANGO_RENDER_TYPE_X ##### --> -<para> -%PANGO_RENDER_TYPE_X is a string constant that -is used to identify shaping modules for the -X Window System. -</para> - - - -<!-- ##### MACRO PANGO_X_MAKE_GLYPH ##### --> -<para> - -</para> - -@subfont: -@index: - - -<!-- ##### MACRO PANGO_X_GLYPH_SUBFONT ##### --> -<para> - -</para> - -@glyph: - - -<!-- ##### MACRO PANGO_X_GLYPH_INDEX ##### --> -<para> - -</para> - -@glyph: - - -<!-- ##### FUNCTION pango_x_get_context ##### --> -<para> - -</para> - -@display: -@Returns: - - -<!-- ##### FUNCTION pango_x_load_font ##### --> -<para> - -</para> - -@display: -@spec: -@Returns: - - -<!-- ##### FUNCTION pango_x_render ##### --> -<para> - -</para> - -@display: -@d: -@gc: -@font: -@glyphs: -@x: -@y: - - -<!-- ##### FUNCTION pango_x_extents ##### --> -<para> - -</para> - -@font: -@glyphs: -@lbearing: -@rbearing: -@width: -@ascent: -@descent: -@logical_ascent: -@logical_descent: - - -<!-- ##### FUNCTION pango_x_glyph_extents ##### --> -<para> - -</para> - -@font: -@glyph: -@lbearing: -@rbearing: -@width: -@ascent: -@descent: -@logical_ascent: -@logical_descent: - - -<!-- ##### FUNCTION pango_x_has_glyph ##### --> -<para> - -</para> - -@font: -@glyph: -@Returns: - - -<!-- ##### FUNCTION pango_x_list_subfonts ##### --> -<para> - -</para> - -@font: -@charsets: -@n_charsets: -@subfont_ids: -@subfont_charsets: -@Returns: - - diff --git a/pango/pango-context.c b/pango/pango-context.c index d9e15c3f..2e8c6700 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -116,12 +116,15 @@ pango_context_add_font_map (PangoContext *context, /** * pango_context_list_fonts: * @context: a #PangoContext + * @family: the family for which to list the fonts, or %NULL + * to list fonts in all families. * @descs: location to store a pointer to an array of pointers to * #PangoFontDescription. This array should be freed * with pango_font_descriptions_free() * @n_descs: location to store the number of elements in @descs * - * Lists all fonts in all fontmaps for this context. + * Lists all fonts in all fontmaps for this context, or all + * fonts in a particular family. **/ void pango_context_list_fonts (PangoContext *context, @@ -214,7 +217,7 @@ list_families_foreach (gpointer key, gpointer value, gpointer user_data) /** * pango_context_list_families: - * @fontmap: a #PangoContext + * @context: a #PangoContext * @families: location to store a pointer to an array of strings. * This array should be freed with pango_font_map_free_families(). * @n_families: location to store the number of elements in @descs |