diff options
author | Owen Taylor <otaylor@redhat.com> | 2004-06-21 16:10:31 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 16:10:31 +0000 |
commit | 62b4e6b676ae2ef114960529b0a5b79d213820d0 (patch) | |
tree | 8a12a666cb475bc13f8d245ca027dfa187ed0a34 | |
parent | 95059cad33f0ae575af5b8e79c0fddd021c99834 (diff) | |
download | pango-62b4e6b676ae2ef114960529b0a5b79d213820d0.tar.gz |
Missed commit: add -lm dependency to pkg-config files.
Mon Jun 21 11:47:41 2004 Owen Taylor <otaylor@redhat.com>
* configure.in pango.pc.in: Missed commit: add
-lm dependency to pkg-config files.
* docs/pango-sections.txt: Add PangoMatrix and rotated
rendering functions
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | docs/pango-sections.txt | 5 | ||||
-rw-r--r-- | docs/tmpl/freetype-fonts.sgml | 34 | ||||
-rw-r--r-- | docs/tmpl/glyphs.sgml | 76 | ||||
-rw-r--r-- | docs/tmpl/main.sgml | 18 | ||||
-rw-r--r-- | pango.pc.in | 2 |
10 files changed, 168 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Mon Jun 21 11:47:41 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in pango.pc.in: Missed commit: add + -lm dependency to pkg-config files. + + * docs/pango-sections.txt: Add PangoMatrix and rotated + rendering functions + Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-attributes.c (pango_attr_list_change): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 30647012..c35baa48 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Mon Jun 21 11:47:41 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in pango.pc.in: Missed commit: add + -lm dependency to pkg-config files. + + * docs/pango-sections.txt: Add PangoMatrix and rotated + rendering functions + Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-attributes.c (pango_attr_list_change): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 30647012..c35baa48 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Mon Jun 21 11:47:41 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in pango.pc.in: Missed commit: add + -lm dependency to pkg-config files. + + * docs/pango-sections.txt: Add PangoMatrix and rotated + rendering functions + Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-attributes.c (pango_attr_list_change): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 30647012..c35baa48 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Mon Jun 21 11:47:41 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in pango.pc.in: Missed commit: add + -lm dependency to pkg-config files. + + * docs/pango-sections.txt: Add PangoMatrix and rotated + rendering functions + Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-attributes.c (pango_attr_list_change): diff --git a/configure.in b/configure.in index 01995269..6d9e8f20 100644 --- a/configure.in +++ b/configure.in @@ -514,14 +514,17 @@ if test $enable_explicit_deps = yes ; then PKGCONFIG_X_LIBS="$X_LIBS $X_EXTRA_LIBS" PKGCONFIG_XFT_LIBS=$XFT_LIBS PKGCONFIG_FREETYPE_LIBS=$FREETYPE_LIBS + PKGCONFIG_MATH_LIBS=-lm else PKGCONFIG_X_LIBS= PKGCONFIG_XFT_LIBS= PKGCONFIG_FREETYPE_LIBS= + PKGCONFIG_MATH_LIBS= fi AC_SUBST(PKGCONFIG_X_LIBS) AC_SUBST(PKGCONFIG_XFT_LIBS) AC_SUBST(PKGCONFIG_FREETYPE_LIBS) +AC_SUBST(PKGCONFIG_MATH_LIBS) AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no) AC_CONFIG_COMMANDS([pango/module-defs.h], diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index 998345ec..c3b73f90 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -24,6 +24,8 @@ pango_context_get_language pango_context_set_language pango_context_get_base_dir pango_context_set_base_dir +pango_context_get_matrix +pango_context_set_matrix pango_context_load_font pango_context_load_fontset pango_context_get_metrics @@ -638,8 +640,11 @@ pango_ft2_font_map_set_default_substitute pango_ft2_font_map_substitute_changed pango_ft2_get_context pango_ft2_render +pango_ft2_render_transformed pango_ft2_render_layout_line +pango_ft2_render_layout_line_subpixel pango_ft2_render_layout +pango_ft2_render_layout_subpixel pango_ft2_get_unknown_glyph pango_ft2_font_get_kerning pango_ft2_font_get_face diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml index 81823761..9877c200 100644 --- a/docs/tmpl/freetype-fonts.sgml +++ b/docs/tmpl/freetype-fonts.sgml @@ -107,6 +107,19 @@ Function type for doing final config tweaking on prepared FcPatterns. @y: +<!-- ##### FUNCTION pango_ft2_render_transformed ##### --> +<para> + +</para> + +@bitmap: +@matrix: +@font: +@glyphs: +@x: +@y: + + <!-- ##### FUNCTION pango_ft2_render_layout_line ##### --> <para> @@ -118,6 +131,17 @@ Function type for doing final config tweaking on prepared FcPatterns. @y: +<!-- ##### FUNCTION pango_ft2_render_layout_line_subpixel ##### --> +<para> + +</para> + +@bitmap: +@line: +@x: +@y: + + <!-- ##### FUNCTION pango_ft2_render_layout ##### --> <para> @@ -129,7 +153,15 @@ Function type for doing final config tweaking on prepared FcPatterns. @y: -<<<<<<< freetype-fonts.sgml +<!-- ##### FUNCTION pango_ft2_render_layout_subpixel ##### --> +<para> + +</para> + +@bitmap: +@layout: +@x: +@y: <!-- ##### FUNCTION pango_ft2_get_unknown_glyph ##### --> diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml index 987ed682..952435a3 100644 --- a/docs/tmpl/glyphs.sgml +++ b/docs/tmpl/glyphs.sgml @@ -98,6 +98,82 @@ horizontal origin. @rect: a #PangoRectangle +<!-- ##### STRUCT PangoMatrix ##### --> +<para> + +</para> + +@xx: +@xy: +@yx: +@yy: +@x0: +@y0: + +<!-- ##### MACRO PANGO_MATRIX_INIT ##### --> +<para> + +</para> + + + +<!-- ##### FUNCTION pango_matrix_copy ##### --> +<para> + +</para> + +@matrix: +@Returns: + + +<!-- ##### FUNCTION pango_matrix_free ##### --> +<para> + +</para> + +@matrix: + + +<!-- ##### FUNCTION pango_matrix_translate ##### --> +<para> + +</para> + +@matrix: +@tx: +@ty: + + +<!-- ##### FUNCTION pango_matrix_scale ##### --> +<para> + +</para> + +@matrix: +@scale_x: +@scale_y: + + +<!-- ##### FUNCTION pango_matrix_rotate ##### --> +<para> + +</para> + +@matrix: +@degrees: + + +<!-- ##### FUNCTION pango_matrix_concat ##### --> +<para> + +</para> + +@matrix: +@new_matrix: +<!-- # Unused Parameters # --> +@new: + + <!-- ##### TYPEDEF PangoGlyph ##### --> <para> A #PangoGlyph represents a single glyph in the output form of a string. diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml index e2557de1..904853e1 100644 --- a/docs/tmpl/main.sgml +++ b/docs/tmpl/main.sgml @@ -214,6 +214,24 @@ The GObject type for #PangoDirection. @direction: +<!-- ##### FUNCTION pango_context_get_matrix ##### --> +<para> + +</para> + +@context: +@Returns: + + +<!-- ##### FUNCTION pango_context_set_matrix ##### --> +<para> + +</para> + +@context: +@matrix: + + <!-- ##### FUNCTION pango_context_load_font ##### --> <para> diff --git a/pango.pc.in b/pango.pc.in index db556161..9c53bdc4 100644 --- a/pango.pc.in +++ b/pango.pc.in @@ -9,6 +9,6 @@ Name: Pango Description: Internationalized text handling Version: @VERSION@ Requires: glib-2.0,gobject-2.0,gmodule-2.0 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ Cflags: -I${includedir}/pango-1.0 |