[poppler] poppler/poppler: Makefile.am, 1.20, 1.21 TextOutputDev.h, 1.10, 1.11

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv26076/poppler

Modified Files:
	Makefile.am TextOutputDev.h 
Log Message:
2006-02-28  Kristian Høgsberg  <krh at redhat.com>

        * configure.ac: Bump release to 0.5.1.

        * NEWS: Sum up 0.5.1 changes so far.

        * TextOutputDev.h: add getters for a couple of attributes.

        * glib/Makefile.am:
        * poppler/Makefile.am: Move cairo link dependency to glib bindings.



Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	16 Feb 2006 19:28:54 -0000	1.20
+++ Makefile.am	28 Feb 2006 23:24:59 -0000	1.21
@@ -34,19 +34,16 @@
 
 if BUILD_CAIRO_OUTPUT
 
-cairo_sources =					\
-	CairoFontEngine.cc			\
-	CairoOutputDev.cc
-
-cairo_headers =					\
-	CairoFontEngine.h			\
-	CairoOutputDev.h
+poppler_cairo = libpoppler-cairo.la
 
 cairo_includes =				\
 	$(CAIRO_CFLAGS)
 
-cairo_libs =					\
-	$(CAIRO_LIBS)
+libpoppler_cairo_la_SOURCES =			\
+	CairoFontEngine.cc			\
+	CairoFontEngine.h			\
+	CairoOutputDev.cc			\
+	CairoOutputDev.h
 
 endif
 
@@ -82,11 +79,12 @@
 
 lib_LTLIBRARIES = libpoppler.la
 
+noinst_LTLIBRARIES = $(poppler_cairo)
+
 libpoppler_la_LIBADD =				\
 	$(top_builddir)/goo/libgoo.la		\
 	$(top_builddir)/fofi/libfofi.la		\
 	$(splash_libs)				\
-	$(cairo_libs)				\
 	$(arthur_libs)				\
 	$(libjpeg_libs)				\
 	$(zlib_libs)				\
@@ -99,7 +97,6 @@
 poppler_includedir = $(includedir)/poppler
 poppler_include_HEADERS =	\
 	$(splash_headers)	\
-	$(cairo_headers)	\
 	$(arthur_headers)	\
 	Annot.h			\
 	Array.h			\

Index: TextOutputDev.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/TextOutputDev.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- TextOutputDev.h	3 Dec 2005 22:26:07 -0000	1.10
+++ TextOutputDev.h	28 Feb 2006 23:24:59 -0000	1.11
@@ -101,7 +101,7 @@
 
 #if TEXTOUT_WORD_LIST
   int getLength() { return len; }
-  Unicode getChar(int idx) { return text[idx]; }
+  const Unicode *getChar(int idx) { return &text[idx]; }
   GooString *getText();
   GooString *getFontName() { return font->fontName; }
   void getColor(double *r, double *g, double *b)
@@ -113,7 +113,10 @@
   int getCharPos() { return charPos; }
   int getCharLen() { return charLen; }
 #endif
-
+  double getEdge(int i) { return edge[i]; }
+  double getBaseline () { return base; }
+  GBool hasSpaceAfter  () { return spaceAfter; }
+  TextWord* nextWord () { return next; };
 private:
 
   int rot;			// rotation, multiple of 90 degrees