diff --git a/ChangeLog b/ChangeLog
index 4b6b7e1..c11a15f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-30  Albert Astals Cid <aacid@kde.org>
+
+	* utils/HtmlFonts.cc: Make pdftohtml not pollute stdout. Patch by
+	Nanning Buitenhuis <nanning@elvenkind.com>
+
 2007-05-29  Kristian Høgsberg  <krh@redhat.com>
 
 	* poppler/gen-unicode-tables.py: Add this script to fix distcheck.
diff --git a/glib/reference/tmpl/poppler-document.sgml b/glib/reference/tmpl/poppler-document.sgml
index 6d4d13f..29f9209 100644
--- a/glib/reference/tmpl/poppler-document.sgml
+++ b/glib/reference/tmpl/poppler-document.sgml
@@ -50,11 +50,15 @@
 @POPPLER_FONT_TYPE_UNKNOWN: 
 @POPPLER_FONT_TYPE_TYPE1: 
 @POPPLER_FONT_TYPE_TYPE1C: 
+@POPPLER_FONT_TYPE_TYPE1COT: 
 @POPPLER_FONT_TYPE_TYPE3: 
 @POPPLER_FONT_TYPE_TRUETYPE: 
+@POPPLER_FONT_TYPE_TRUETYPEOT: 
 @POPPLER_FONT_TYPE_CID_TYPE0: 
 @POPPLER_FONT_TYPE_CID_TYPE0C: 
+@POPPLER_FONT_TYPE_CID_TYPE0COT: 
 @POPPLER_FONT_TYPE_CID_TYPE2: 
+@POPPLER_FONT_TYPE_CID_TYPE2OT: 
 
 <!-- ##### ENUM PopplerViewerPreferences ##### -->
 <para>
diff --git a/glib/reference/tmpl/poppler-enums.sgml b/glib/reference/tmpl/poppler-enums.sgml
index f12dcb5..df7b007 100644
--- a/glib/reference/tmpl/poppler-enums.sgml
+++ b/glib/reference/tmpl/poppler-enums.sgml
@@ -17,3 +17,153 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### MACRO POPPLER_TYPE_ACTION_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_action_type_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_DEST_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_dest_type_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_PAGE_LAYOUT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_page_layout_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_PAGE_MODE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_page_mode_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_FONT_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_font_type_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_VIEWER_PREFERENCES ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_viewer_preferences_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_PERMISSIONS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_permissions_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_error_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_ORIENTATION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_orientation_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### MACRO POPPLER_TYPE_BACKEND ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_backend_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
diff --git a/glib/reference/tmpl/poppler-page.sgml b/glib/reference/tmpl/poppler-page.sgml
index c0c2ff3..e859e80 100644
--- a/glib/reference/tmpl/poppler-page.sgml
+++ b/glib/reference/tmpl/poppler-page.sgml
@@ -134,11 +134,10 @@
 </para>
 
 @page: 
-@scale: 
-@rotation: 
-@pixbuf: 
+@cairo: 
 @selection: 
 @old_selection: 
+@style: 
 @glyph_color: 
 @background_color: 
 
diff --git a/glib/reference/tmpl/poppler-unused.sgml b/glib/reference/tmpl/poppler-unused.sgml
index eb181ce..e69de29 100644
--- a/glib/reference/tmpl/poppler-unused.sgml
+++ b/glib/reference/tmpl/poppler-unused.sgml
@@ -1,130 +0,0 @@
-<!-- ##### MACRO POPPLER_TYPE_ACTION_TYPE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_BACKEND ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_DEST_TYPE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_ERROR ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_FONT_TYPE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_ORIENTATION ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_PAGE_LAYOUT ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_PAGE_MODE ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_PERMISSIONS ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_VIEWER_PREFERENCES ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION poppler_action_type_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_backend_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_dest_type_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_error_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_font_type_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_orientation_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_page_layout_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_page_mode_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_permissions_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION poppler_viewer_preferences_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
diff --git a/utils/HtmlFonts.cc b/utils/HtmlFonts.cc
index e267c25..479c822 100644
--- a/utils/HtmlFonts.cc
+++ b/utils/HtmlFonts.cc
@@ -36,7 +36,7 @@
   r=static_cast<int>(rgb.r/65535.0*255.0);
   g=static_cast<int>(rgb.g/65535.0*255.0);
   b=static_cast<int>(rgb.b/65535.0*255.0);
-  if (!(Ok(r)&&Ok(b)&&Ok(g))) {printf("Error : Bad color %d %d %d\n", r, g, b);r=0;g=0;b=0;}
+  if (!(Ok(r)&&Ok(b)&&Ok(g)) && !globalParams->getErrQuiet()) {fprintf(stderr, "Error : Bad color (%d,%d,%d) reset to (0,0,0)\n", r, g, b);r=0;g=0;b=0;}
 }
 
 GooString *HtmlFontColor::convtoX(unsigned int xcol) const{