diff options
| -rw-r--r-- | ChangeLog | 41 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | examples/Makefile.am | 178 | ||||
| -rw-r--r-- | pango-view/GLASS.utf8 (renamed from examples/GLASS.utf8) | 0 | ||||
| -rw-r--r-- | pango-view/HELLO.utf8 (renamed from examples/HELLO.utf8) | 0 | ||||
| -rw-r--r-- | pango-view/Makefile.am | 188 | ||||
| -rw-r--r-- | pango-view/pango-view.c (renamed from examples/pango-view.c) | 0 | ||||
| -rw-r--r-- | pango-view/pangocairo-view.c (renamed from examples/pangocairo-view.c) | 0 | ||||
| -rw-r--r-- | pango-view/pangoft2-view.c (renamed from examples/pangoft2-view.c) | 0 | ||||
| -rw-r--r-- | pango-view/pangox-view.c (renamed from examples/pangox-view.c) | 0 | ||||
| -rw-r--r-- | pango-view/pangoxft-view.c (renamed from examples/pangoxft-view.c) | 0 | ||||
| -rw-r--r-- | pango-view/renderdemo.c (renamed from examples/renderdemo.c) | 0 | ||||
| -rw-r--r-- | pango-view/renderdemo.h (renamed from examples/renderdemo.h) | 0 | ||||
| -rw-r--r-- | pango-view/test-arabic.txt (renamed from examples/test-arabic.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-chinese.txt (renamed from examples/test-chinese.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-devanagari.txt (renamed from examples/test-devanagari.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-gurmukhi.txt (renamed from examples/test-gurmukhi.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-hebrew.txt (renamed from examples/test-hebrew.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-ipa.txt (renamed from examples/test-ipa.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-lao.txt (renamed from examples/test-lao.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-latin.txt (renamed from examples/test-latin.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-mixed.txt (renamed from examples/test-mixed.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-syriac.txt (renamed from examples/test-syriac.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-tamil.txt (renamed from examples/test-tamil.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-thai.txt (renamed from examples/test-thai.txt) | 0 | ||||
| -rw-r--r-- | pango-view/test-tibetan.txt (renamed from examples/test-tibetan.txt) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-cairo.c (renamed from examples/viewer-cairo.c) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-cairo.h (renamed from examples/viewer-cairo.h) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-main.c (renamed from examples/viewer-main.c) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-pangocairo.c (renamed from examples/viewer-pangocairo.c) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-pangoft2.c (renamed from examples/viewer-pangoft2.c) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-pangox.c (renamed from examples/viewer-pangox.c) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-pangoxft.c (renamed from examples/viewer-pangoxft.c) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-win32.c (renamed from examples/viewer-win32.c) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-x.c (renamed from examples/viewer-x.c) | 0 | ||||
| -rw-r--r-- | pango-view/viewer-x.h (renamed from examples/viewer-x.h) | 0 | ||||
| -rw-r--r-- | pango-view/viewer.h (renamed from examples/viewer.h) | 0 |
38 files changed, 232 insertions, 178 deletions
@@ -1,5 +1,46 @@ 2007-01-16 Behdad Esfahbod <behdad@gnome.org> + * examples/pango-view.c: + * examples/pangocairo-view.c: + * examples/pangoft2-view.c: + * examples/pangox-view.c: + * examples/pangoxft-view.c: + * examples/renderdemo.c: + * examples/renderdemo.h: + * examples/test-arabic.txt: + * examples/test-chinese.txt: + * examples/test-devanagari.txt: + * examples/test-gurmukhi.txt: + * examples/test-hebrew.txt: + * examples/test-ipa.txt: + * examples/test-lao.txt: + * examples/test-latin.txt: + * examples/test-mixed.txt: + * examples/test-syriac.txt: + * examples/test-tamil.txt: + * examples/test-thai.txt: + * examples/test-tibetan.txt: + * examples/viewer-cairo.c: + * examples/viewer-cairo.h: + * examples/viewer-main.c: + * examples/viewer-pangocairo.c: + * examples/viewer-pangoft2.c: + * examples/viewer-pangox.c: + * examples/viewer-pangoxft.c: + * examples/viewer-win32.c: + * examples/viewer-x.c: + * examples/viewer-x.h: + * examples/viewer.h: + Move into pango-view/ + + * Makefile.am: + * configure.in: + * examples/Makefile.am: + * pango-view/Makefile.am: + Update. + +2007-01-16 Behdad Esfahbod <behdad@gnome.org> + * examples/renderdemo.c (parse_enum): Oops. Replace GType* with GType. 2007-01-16 Behdad Esfahbod <behdad@gnome.org> diff --git a/Makefile.am b/Makefile.am index ea7f5bcd..a44f96c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in. -SUBDIRS= pango modules examples docs tools tests +SUBDIRS= pango modules pango-view examples docs tools tests EXTRA_DIST = \ autogen.sh \ diff --git a/configure.in b/configure.in index ecbfe86f..3e630367 100644 --- a/configure.in +++ b/configure.in @@ -933,6 +933,7 @@ pango/opentype/Makefile pango/pango.rc pango/pangoft2.rc pango/pangowin32.rc +pango-view/Makefile modules/Makefile modules/arabic/Makefile modules/basic/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index 362b18ed..7381296a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,27 +1,7 @@ ## Process this file with automake to create Makefile.in. -TEST_TEXTS = \ - test-arabic.txt \ - test-chinese.txt \ - test-devanagari.txt \ - test-gurmukhi.txt \ - test-hebrew.txt \ - test-ipa.txt \ - test-lao.txt \ - test-latin.txt \ - test-syriac.txt \ - test-tamil.txt \ - test-thai.txt \ - test-tibetan.txt \ - HELLO.utf8 \ - GLASS.utf8 - EXTRA_DIST = \ - viewer-win32.c \ - pangowin32tobmp.c \ - $(TEST_TEXTS) - -CLEANFILES = pangorc + pangowin32tobmp.c INCLUDES = \ -I$(top_srcdir) \ @@ -33,157 +13,7 @@ INCLUDES = \ $(X_CFLAGS) noinst_PROGRAMS = -bin_PROGRAMS = - -######################################################### -if HAVE_FREETYPE -noinst_PROGRAMS += pangoft2-view - -pangoft2_view_SOURCES = \ - renderdemo.h \ - renderdemo.c \ - viewer.h \ - viewer-main.c \ - viewer-pangoft2.c \ - pangoft2-view.c - -pangoft2_view_LDADD = \ - ../pango/libpango-$(PANGO_API_VERSION).la \ - ../pango/libpangoft2-$(PANGO_API_VERSION).la \ - $(GLIB_LIBS) \ - $(FREETYPE_LIBS) -endif -######################################################### - -######################################################### -if HAVE_X -noinst_PROGRAMS += pangox-view - -pangox_view_SOURCES = \ - renderdemo.h \ - renderdemo.c \ - viewer.h \ - viewer-x.h \ - viewer-x.c \ - viewer-main.c \ - viewer-pangox.c \ - pangox-view.c - -pangox_view_LDADD = \ - ../pango/libpango-$(PANGO_API_VERSION).la \ - ../pango/libpangox-$(PANGO_API_VERSION).la \ - $(GLIB_LIBS) \ - $(X_LIBS) -endif -######################################################### - -######################################################### -if HAVE_XFT -noinst_PROGRAMS += pangoxft-view - -pangoxft_view_SOURCES = \ - renderdemo.h \ - renderdemo.c \ - viewer.h \ - viewer-x.h \ - viewer-x.c \ - viewer-main.c \ - viewer-pangoxft.c \ - pangoxft-view.c - -pangoxft_view_LDADD = \ - ../pango/libpango-$(PANGO_API_VERSION).la \ - ../pango/libpangoft2-$(PANGO_API_VERSION).la \ - ../pango/libpangoxft-$(PANGO_API_VERSION).la \ - $(GLIB_LIBS) \ - $(XFT_LIBS) \ - $(X_LIBS) -endif -######################################################### - -######################################################### -if HAVE_CAIRO -if HAVE_X -if HAVE_CAIRO_XLIB -noinst_PROGRAMS += pangocairo-view -pangocairo_view_SOURCES = \ - renderdemo.h \ - renderdemo.c \ - viewer.h \ - viewer-cairo.h \ - viewer-cairo.c \ - viewer-x.h \ - viewer-x.c \ - viewer-main.c \ - viewer-pangocairo.c \ - pangocairo-view.c - -pangocairo_view_LDADD = \ - ../pango/libpango-$(PANGO_API_VERSION).la \ - ../pango/libpangoft2-$(PANGO_API_VERSION).la \ - ../pango/libpangocairo-$(PANGO_API_VERSION).la \ - $(GLIB_LIBS) \ - $(CAIRO_LIBS) \ - $(X_LIBS) -endif -endif -endif -######################################################### - -######################################################### -if HAVE_X -bin_PROGRAMS += pango-view -pango_view_SOURCES = \ - renderdemo.h \ - renderdemo.c \ - viewer.h \ - viewer-x.h \ - viewer-x.c \ - viewer-main.c \ - pango-view.c -pango_view_LDADD = \ - ../pango/libpango-$(PANGO_API_VERSION).la \ - $(GLIB_LIBS) -if HAVE_X -pango_view_SOURCES += \ - viewer-pangox.c -pango_view_LDADD += \ - ../pango/libpangox-$(PANGO_API_VERSION).la -endif -if HAVE_FREETYPE -pango_view_SOURCES += \ - viewer-pangoft2.c -pango_view_LDADD += \ - ../pango/libpangoft2-$(PANGO_API_VERSION).la \ - $(FREETYPE_LIBS) -endif -if HAVE_XFT -pango_view_SOURCES += \ - viewer-pangoxft.c -pango_view_LDADD += \ - ../pango/libpangoft2-$(PANGO_API_VERSION).la \ - ../pango/libpangoxft-$(PANGO_API_VERSION).la \ - $(XFT_LIBS) -endif -if HAVE_CAIRO -if HAVE_CAIRO_XLIB -pango_view_SOURCES += \ - viewer-cairo.h \ - viewer-cairo.c \ - viewer-pangocairo.c -pango_view_LDADD += \ - ../pango/libpangoft2-$(PANGO_API_VERSION).la \ - ../pango/libpangocairo-$(PANGO_API_VERSION).la \ - $(CAIRO_LIBS) -endif -endif -pango_view_LDADD += \ - $(X_LIBS) -endif -######################################################### - -######################################################### if HAVE_CAIRO_PNG noinst_PROGRAMS += cairosimple cairotwisted @@ -198,9 +28,3 @@ cairosimple_LDADD += \ endif cairotwisted_LDADD = $(cairosimple_LDADD) endif -######################################################### - -BUILT_SOURCES = pangorc - -pangorc: $(srcdir)/../modules/pangorc - cp $< $@ diff --git a/examples/GLASS.utf8 b/pango-view/GLASS.utf8 index 610b595e..610b595e 100644 --- a/examples/GLASS.utf8 +++ b/pango-view/GLASS.utf8 diff --git a/examples/HELLO.utf8 b/pango-view/HELLO.utf8 index 21acb941..21acb941 100644 --- a/examples/HELLO.utf8 +++ b/pango-view/HELLO.utf8 diff --git a/pango-view/Makefile.am b/pango-view/Makefile.am new file mode 100644 index 00000000..ad06af85 --- /dev/null +++ b/pango-view/Makefile.am @@ -0,0 +1,188 @@ +## Process this file with automake to create Makefile.in. + +TEST_TEXTS = \ + test-arabic.txt \ + test-chinese.txt \ + test-devanagari.txt \ + test-gurmukhi.txt \ + test-hebrew.txt \ + test-ipa.txt \ + test-lao.txt \ + test-latin.txt \ + test-syriac.txt \ + test-tamil.txt \ + test-thai.txt \ + test-tibetan.txt \ + HELLO.utf8 \ + GLASS.utf8 + +EXTRA_DIST = \ + viewer-win32.c \ + $(TEST_TEXTS) + +CLEANFILES = pangorc + +INCLUDES = \ + -I$(top_srcdir) \ + $(PANGO_DEBUG_FLAGS) \ + $(GLIB_CFLAGS) \ + $(XFT_CFLAGS) \ + $(CAIRO_CFLAGS) \ + $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) + +noinst_PROGRAMS = +bin_PROGRAMS = + +######################################################### +if HAVE_FREETYPE +noinst_PROGRAMS += pangoft2-view + +pangoft2_view_SOURCES = \ + renderdemo.h \ + renderdemo.c \ + viewer.h \ + viewer-main.c \ + viewer-pangoft2.c \ + pangoft2-view.c + +pangoft2_view_LDADD = \ + ../pango/libpango-$(PANGO_API_VERSION).la \ + ../pango/libpangoft2-$(PANGO_API_VERSION).la \ + $(GLIB_LIBS) \ + $(FREETYPE_LIBS) +endif +######################################################### + +######################################################### +if HAVE_X +noinst_PROGRAMS += pangox-view + +pangox_view_SOURCES = \ + renderdemo.h \ + renderdemo.c \ + viewer.h \ + viewer-x.h \ + viewer-x.c \ + viewer-main.c \ + viewer-pangox.c \ + pangox-view.c + +pangox_view_LDADD = \ + ../pango/libpango-$(PANGO_API_VERSION).la \ + ../pango/libpangox-$(PANGO_API_VERSION).la \ + $(GLIB_LIBS) \ + $(X_LIBS) +endif +######################################################### + +######################################################### +if HAVE_XFT +noinst_PROGRAMS += pangoxft-view + +pangoxft_view_SOURCES = \ + renderdemo.h \ + renderdemo.c \ + viewer.h \ + viewer-x.h \ + viewer-x.c \ + viewer-main.c \ + viewer-pangoxft.c \ + pangoxft-view.c + +pangoxft_view_LDADD = \ + ../pango/libpango-$(PANGO_API_VERSION).la \ + ../pango/libpangoft2-$(PANGO_API_VERSION).la \ + ../pango/libpangoxft-$(PANGO_API_VERSION).la \ + $(GLIB_LIBS) \ + $(XFT_LIBS) \ + $(X_LIBS) +endif +######################################################### + +######################################################### +if HAVE_CAIRO +if HAVE_X +if HAVE_CAIRO_XLIB +noinst_PROGRAMS += pangocairo-view + +pangocairo_view_SOURCES = \ + renderdemo.h \ + renderdemo.c \ + viewer.h \ + viewer-cairo.h \ + viewer-cairo.c \ + viewer-x.h \ + viewer-x.c \ + viewer-main.c \ + viewer-pangocairo.c \ + pangocairo-view.c + +pangocairo_view_LDADD = \ + ../pango/libpango-$(PANGO_API_VERSION).la \ + ../pango/libpangoft2-$(PANGO_API_VERSION).la \ + ../pango/libpangocairo-$(PANGO_API_VERSION).la \ + $(GLIB_LIBS) \ + $(CAIRO_LIBS) \ + $(X_LIBS) +endif +endif +endif +######################################################### + +######################################################### +if HAVE_X +bin_PROGRAMS += pango-view +pango_view_SOURCES = \ + renderdemo.h \ + renderdemo.c \ + viewer.h \ + viewer-x.h \ + viewer-x.c \ + viewer-main.c \ + pango-view.c +pango_view_LDADD = \ + ../pango/libpango-$(PANGO_API_VERSION).la \ + $(GLIB_LIBS) +if HAVE_X +pango_view_SOURCES += \ + viewer-pangox.c +pango_view_LDADD += \ + ../pango/libpangox-$(PANGO_API_VERSION).la +endif +if HAVE_FREETYPE +pango_view_SOURCES += \ + viewer-pangoft2.c +pango_view_LDADD += \ + ../pango/libpangoft2-$(PANGO_API_VERSION).la \ + $(FREETYPE_LIBS) +endif +if HAVE_XFT +pango_view_SOURCES += \ + viewer-pangoxft.c +pango_view_LDADD += \ + ../pango/libpangoft2-$(PANGO_API_VERSION).la \ + ../pango/libpangoxft-$(PANGO_API_VERSION).la \ + $(XFT_LIBS) +endif +if HAVE_CAIRO +if HAVE_CAIRO_XLIB +pango_view_SOURCES += \ + viewer-cairo.h \ + viewer-cairo.c \ + viewer-pangocairo.c +pango_view_LDADD += \ + ../pango/libpangoft2-$(PANGO_API_VERSION).la \ + ../pango/libpangocairo-$(PANGO_API_VERSION).la \ + $(CAIRO_LIBS) +endif +endif +pango_view_LDADD += \ + $(X_LIBS) +endif +######################################################### + +BUILT_SOURCES = pangorc + +pangorc: $(srcdir)/../modules/pangorc + cp $< $@ diff --git a/examples/pango-view.c b/pango-view/pango-view.c index 9771e8cc..9771e8cc 100644 --- a/examples/pango-view.c +++ b/pango-view/pango-view.c diff --git a/examples/pangocairo-view.c b/pango-view/pangocairo-view.c index c5ba8716..c5ba8716 100644 --- a/examples/pangocairo-view.c +++ b/pango-view/pangocairo-view.c diff --git a/examples/pangoft2-view.c b/pango-view/pangoft2-view.c index d4ac695c..d4ac695c 100644 --- a/examples/pangoft2-view.c +++ b/pango-view/pangoft2-view.c diff --git a/examples/pangox-view.c b/pango-view/pangox-view.c index 72e97603..72e97603 100644 --- a/examples/pangox-view.c +++ b/pango-view/pangox-view.c diff --git a/examples/pangoxft-view.c b/pango-view/pangoxft-view.c index bdf893f8..bdf893f8 100644 --- a/examples/pangoxft-view.c +++ b/pango-view/pangoxft-view.c diff --git a/examples/renderdemo.c b/pango-view/renderdemo.c index ab89b8fe..ab89b8fe 100644 --- a/examples/renderdemo.c +++ b/pango-view/renderdemo.c diff --git a/examples/renderdemo.h b/pango-view/renderdemo.h index c9d10361..c9d10361 100644 --- a/examples/renderdemo.h +++ b/pango-view/renderdemo.h diff --git a/examples/test-arabic.txt b/pango-view/test-arabic.txt index 58653a6f..58653a6f 100644 --- a/examples/test-arabic.txt +++ b/pango-view/test-arabic.txt diff --git a/examples/test-chinese.txt b/pango-view/test-chinese.txt index d4fb796a..d4fb796a 100644 --- a/examples/test-chinese.txt +++ b/pango-view/test-chinese.txt diff --git a/examples/test-devanagari.txt b/pango-view/test-devanagari.txt index 9cfccc56..9cfccc56 100644 --- a/examples/test-devanagari.txt +++ b/pango-view/test-devanagari.txt diff --git a/examples/test-gurmukhi.txt b/pango-view/test-gurmukhi.txt index f3d05920..f3d05920 100644 --- a/examples/test-gurmukhi.txt +++ b/pango-view/test-gurmukhi.txt diff --git a/examples/test-hebrew.txt b/pango-view/test-hebrew.txt index 15467d87..15467d87 100644 --- a/examples/test-hebrew.txt +++ b/pango-view/test-hebrew.txt diff --git a/examples/test-ipa.txt b/pango-view/test-ipa.txt index 2fdd5e2c..2fdd5e2c 100644 --- a/examples/test-ipa.txt +++ b/pango-view/test-ipa.txt diff --git a/examples/test-lao.txt b/pango-view/test-lao.txt index 012025e4..012025e4 100644 --- a/examples/test-lao.txt +++ b/pango-view/test-lao.txt diff --git a/examples/test-latin.txt b/pango-view/test-latin.txt index 31fe90bd..31fe90bd 100644 --- a/examples/test-latin.txt +++ b/pango-view/test-latin.txt diff --git a/examples/test-mixed.txt b/pango-view/test-mixed.txt index 5c3f1a2f..5c3f1a2f 100644 --- a/examples/test-mixed.txt +++ b/pango-view/test-mixed.txt diff --git a/examples/test-syriac.txt b/pango-view/test-syriac.txt index 05fedc7b..05fedc7b 100644 --- a/examples/test-syriac.txt +++ b/pango-view/test-syriac.txt diff --git a/examples/test-tamil.txt b/pango-view/test-tamil.txt index ff080a24..ff080a24 100644 --- a/examples/test-tamil.txt +++ b/pango-view/test-tamil.txt diff --git a/examples/test-thai.txt b/pango-view/test-thai.txt index 4bb8d2e0..4bb8d2e0 100644 --- a/examples/test-thai.txt +++ b/pango-view/test-thai.txt diff --git a/examples/test-tibetan.txt b/pango-view/test-tibetan.txt index 83d44aab..83d44aab 100644 --- a/examples/test-tibetan.txt +++ b/pango-view/test-tibetan.txt diff --git a/examples/viewer-cairo.c b/pango-view/viewer-cairo.c index baabe2dc..baabe2dc 100644 --- a/examples/viewer-cairo.c +++ b/pango-view/viewer-cairo.c diff --git a/examples/viewer-cairo.h b/pango-view/viewer-cairo.h index 6e2adb84..6e2adb84 100644 --- a/examples/viewer-cairo.h +++ b/pango-view/viewer-cairo.h diff --git a/examples/viewer-main.c b/pango-view/viewer-main.c index 9dc7cc88..9dc7cc88 100644 --- a/examples/viewer-main.c +++ b/pango-view/viewer-main.c diff --git a/examples/viewer-pangocairo.c b/pango-view/viewer-pangocairo.c index 16c6d8bf..16c6d8bf 100644 --- a/examples/viewer-pangocairo.c +++ b/pango-view/viewer-pangocairo.c diff --git a/examples/viewer-pangoft2.c b/pango-view/viewer-pangoft2.c index bf73fb50..bf73fb50 100644 --- a/examples/viewer-pangoft2.c +++ b/pango-view/viewer-pangoft2.c diff --git a/examples/viewer-pangox.c b/pango-view/viewer-pangox.c index f3a88e67..f3a88e67 100644 --- a/examples/viewer-pangox.c +++ b/pango-view/viewer-pangox.c diff --git a/examples/viewer-pangoxft.c b/pango-view/viewer-pangoxft.c index 8b308167..8b308167 100644 --- a/examples/viewer-pangoxft.c +++ b/pango-view/viewer-pangoxft.c diff --git a/examples/viewer-win32.c b/pango-view/viewer-win32.c index 3ac67ba0..3ac67ba0 100644 --- a/examples/viewer-win32.c +++ b/pango-view/viewer-win32.c diff --git a/examples/viewer-x.c b/pango-view/viewer-x.c index e79c6eaf..e79c6eaf 100644 --- a/examples/viewer-x.c +++ b/pango-view/viewer-x.c diff --git a/examples/viewer-x.h b/pango-view/viewer-x.h index 71c1279e..71c1279e 100644 --- a/examples/viewer-x.h +++ b/pango-view/viewer-x.h diff --git a/examples/viewer.h b/pango-view/viewer.h index 4d1d836a..4d1d836a 100644 --- a/examples/viewer.h +++ b/pango-view/viewer.h |