[poppler] 6 commits - configure.ac glib/poppler-action.cc glib/poppler-annot.cc glib/poppler-attachment.cc glib/poppler-attachment.h glib/poppler-document.cc glib/poppler-features.h.in glib/poppler-form-field.cc glib/poppler-layer.cc glib/poppler-media.cc glib/poppler-movie.cc glib/poppler-page.cc glib/reference gtk-doc.make m4/gtk-doc.m4

Carlos Garcia Campos carlosgc at kemper.freedesktop.org
Wed Jun 30 09:21:21 PDT 2010 

 configure.ac                                 |    3 
 glib/poppler-action.cc                       |    6 
 glib/poppler-annot.cc                        |    6 
 glib/poppler-attachment.cc                   |    6 
 glib/poppler-attachment.h                    |   16 
 glib/poppler-document.cc                     |    8 
 glib/poppler-features.h.in                   |   59 +++
 glib/poppler-form-field.cc                   |    6 
 glib/poppler-layer.cc                        |    6 
 glib/poppler-media.cc                        |    6 
 glib/poppler-movie.cc                        |    6 
 glib/poppler-page.cc                         |    6 
 glib/reference/Makefile.am                   |    2 
 glib/reference/poppler-docs.sgml             |   15 
 glib/reference/poppler-sections.txt          |  424 ++++++++++++++++-------
 glib/reference/poppler.types                 |    4 
 glib/reference/tmpl/poppler-action.sgml      |  216 ------------
 glib/reference/tmpl/poppler-annot.sgml       |  377 ---------------------
 glib/reference/tmpl/poppler-attachment.sgml  |   68 ---
 glib/reference/tmpl/poppler-document.sgml    |  410 ----------------------
 glib/reference/tmpl/poppler-enums.sgml       |  246 -------------
 glib/reference/tmpl/poppler-features.sgml    |   83 ----
 glib/reference/tmpl/poppler-form-field.sgml  |  318 -----------------
 glib/reference/tmpl/poppler-layer.sgml       |   83 ----
 glib/reference/tmpl/poppler-page.sgml        |  483 ---------------------------
 glib/reference/tmpl/poppler-private.sgml     |  148 --------
 glib/reference/tmpl/poppler-unused.sgml      |    8 
 glib/reference/tmpl/poppler.sgml             |  285 ---------------
 glib/reference/tmpl/stamp-poppler-enums.sgml |   22 -
 glib/reference/version.xml.in                |    1 
 gtk-doc.make                                 |   78 ++--
 m4/gtk-doc.m4                                |    2 
 32 files changed, 498 insertions(+), 2909 deletions(-)

New commits:
commit 19e1944c00ac2da6b18b015721fc3a8d1898a23a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Wed Jun 30 18:01:52 2010 +0200

    [glib] docs: Add media and movie to docs

diff --git a/glib/poppler-media.cc b/glib/poppler-media.cc
index b871fd9..1380fef 100644
--- a/glib/poppler-media.cc
+++ b/glib/poppler-media.cc
@@ -25,6 +25,12 @@
 #include "poppler-media.h"
 #include "poppler-private.h"
 
+/**
+ * SECTION: poppler-media
+ * @short_description: Media
+ * @title: PopplerMedia
+ */
+
 typedef struct _PopplerMediaClass PopplerMediaClass;
 
 struct _PopplerMedia
diff --git a/glib/poppler-movie.cc b/glib/poppler-movie.cc
index fd3c163..b162653 100644
--- a/glib/poppler-movie.cc
+++ b/glib/poppler-movie.cc
@@ -21,6 +21,12 @@
 #include "poppler-movie.h"
 #include "poppler-private.h"
 
+/**
+ * SECTION: poppler-movie
+ * @short_description: Movies
+ * @title: PopplerMovie
+ */
+
 typedef struct _PopplerMovieClass PopplerMovieClass;
 
 struct _PopplerMovie
diff --git a/glib/reference/poppler-docs.sgml b/glib/reference/poppler-docs.sgml
index 2240c5e..8486da5 100644
--- a/glib/reference/poppler-docs.sgml
+++ b/glib/reference/poppler-docs.sgml
@@ -19,9 +19,10 @@
     <xi:include href="xml/poppler-action.xml"/>
     <xi:include href="xml/poppler-attachment.xml"/>
     <xi:include href="xml/poppler-form-field.xml"/>
-    <xi:include href="xml/poppler-enums.xml"/>
     <xi:include href="xml/poppler-annot.xml"/>
     <xi:include href="xml/poppler-layer.xml"/>
+    <xi:include href="xml/poppler-media.xml"/>
+    <xi:include href="xml/poppler-movie.xml"/>
     <xi:include href="xml/poppler-features.xml"/>
   </chapter>
 
commit ca48bee07e6b4a20ea7b40b472a335e75feb4739
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Wed Jun 30 17:56:50 2010 +0200

    [glib] docs: Add missing types to poppler.types

diff --git a/glib/reference/poppler.types b/glib/reference/poppler.types
index 4e4bc33..eed9849 100644
--- a/glib/reference/poppler.types
+++ b/glib/reference/poppler.types
@@ -4,3 +4,7 @@ poppler_document_get_type
 poppler_page_get_type
 poppler_attachment_get_type
 poppler_form_field_get_type
+poppler_annot_get_type
+poppler_layer_get_type
+poppler_media_get_type
+poppler_movie_get_type
commit 613ccf81317a007ed5017ee788466613a6699bb5
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Wed Jun 30 17:54:22 2010 +0200

    [glib] docs: rework poppler-sections.txt
    
     - Better organization of sections and contents
     - Use of Standard and Private subsections
     - Add missing sections
     - Remove enums section

diff --git a/glib/reference/poppler-sections.txt b/glib/reference/poppler-sections.txt
index 070fdc9..65ec2cb 100644
--- a/glib/reference/poppler-sections.txt
+++ b/glib/reference/poppler-sections.txt
@@ -1,72 +1,113 @@
+<INCLUDE>poppler.h</INCLUDE>
+
 <SECTION>
 <FILE>poppler-page</FILE>
-poppler_page_render
-poppler_page_render_to_pixbuf
-poppler_page_get_size
+<TITLE>PopplerPage</TITLE>
+PopplerPage
+PopplerRectangle
+PopplerPageTransition
+PopplerLinkMapping
+PopplerImageMapping
+PopplerFormFieldMapping
+PopplerAnnotMapping
+PopplerPageTransitionType
+PopplerPageTransitionAlignment
+PopplerPageTransitionDirection
+PopplerSelectionStyle
 poppler_page_get_index
-poppler_page_get_thumbnail
+poppler_page_get_size
+poppler_page_get_crop_box
+poppler_page_get_duration
+poppler_page_get_transition
 poppler_page_get_thumbnail_size
+poppler_page_get_thumbnail
+poppler_page_get_thumbnail_pixbuf
+poppler_page_render
+poppler_page_render_for_printing
+poppler_page_render_to_pixbuf
+poppler_page_render_to_pixbuf_for_printing
 poppler_page_render_to_ps
+poppler_page_render_selection
+poppler_page_render_selection_to_pixbuf
+poppler_page_get_selection_region
+poppler_page_selection_region_free
 poppler_page_find_text
 poppler_page_get_text
-poppler_page_get_duration
-poppler_page_get_transition
+poppler_page_get_text_layout
 poppler_page_get_link_mapping
 poppler_page_free_link_mapping
 poppler_page_get_image_mapping
+poppler_page_get_image
 poppler_page_free_image_mapping
 poppler_page_get_form_field_mapping
 poppler_page_free_form_field_mapping
-poppler_page_get_selection_region
-poppler_page_render_selection
-poppler_page_render_selection_to_pixbuf
-POPPLER_TYPE_RECTANGLE
-PopplerRectangle
-poppler_rectangle_get_type
+poppler_page_get_annot_mapping
+poppler_page_free_annot_mapping
 poppler_rectangle_new
 poppler_rectangle_copy
 poppler_rectangle_free
-POPPLER_TYPE_PAGE_TRANSITION
-PopplerPageTransition
-poppler_page_transition_get_type
 poppler_page_transition_new
 poppler_page_transition_copy
 poppler_page_transition_free
-POPPLER_TYPE_LINK_MAPPING
-PopplerLinkMapping
-poppler_link_mapping_get_type
 poppler_link_mapping_new
 poppler_link_mapping_copy
 poppler_link_mapping_free
-POPPLER_TYPE_IMAGE_MAPPING
-PopplerImageMapping
-poppler_image_mapping_get_type
 poppler_image_mapping_new
 poppler_image_mapping_copy
 poppler_image_mapping_free
-POPPLER_TYPE_FORM_FIELD_MAPPING
-PopplerFormFieldMapping
-poppler_form_field_mapping_get_type
 poppler_form_field_mapping_new
 poppler_form_field_mapping_copy
 poppler_form_field_mapping_free
+poppler_annot_mapping_new
+poppler_annot_mapping_copy
+poppler_annot_mapping_free
+
 <SUBSECTION Standard>
 POPPLER_PAGE
 POPPLER_IS_PAGE
 POPPLER_TYPE_PAGE
+POPPLER_TYPE_RECTANGLE
+POPPLER_TYPE_PAGE_TRANSITION
+POPPLER_TYPE_LINK_MAPPING
+POPPLER_TYPE_IMAGE_MAPPING
+POPPLER_TYPE_FORM_FIELD_MAPPING
+POPPLER_TYPE_ANNOT_MAPPING
+POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT
+POPPLER_TYPE_PAGE_TRANSITION_DIRECTION
+POPPLER_TYPE_PAGE_TRANSITION_TYPE
+POPPLER_TYPE_SELECTION_STYLE
+<SUBSECTION Private>
 poppler_page_get_type
+poppler_rectangle_get_type
+poppler_page_transition_get_type
+poppler_link_mapping_get_type
+poppler_image_mapping_get_type
+poppler_form_field_mapping_get_type
+poppler_annot_mapping_get_type
+poppler_page_transition_alignment_get_type
+poppler_page_transition_direction_get_type
+poppler_page_transition_type_get_type
+poppler_selection_style_get_type
 </SECTION>
 
 <SECTION>
 <FILE>poppler-document</FILE>
+<TITLE>PopplerDocument</TITLE>
+PopplerDocument
+PopplerIndexIter
+PopplerFontsIter
+PopplerLayersIter
 PopplerPageLayout
 PopplerPageMode
+PopplerFontInfo
 PopplerFontType
+PopplerPSFile
 PopplerViewerPreferences
 PopplerPermissions
 poppler_document_new_from_file
 poppler_document_new_from_data
 poppler_document_save
+poppler_document_save_a_copy
 poppler_document_get_n_pages
 poppler_document_get_page
 poppler_document_get_page_by_label
@@ -74,7 +115,6 @@ poppler_document_find_dest
 poppler_document_has_attachments
 poppler_document_get_attachments
 poppler_document_get_form_field
-poppler_index_iter_get_type
 poppler_index_iter_new
 poppler_index_iter_copy
 poppler_index_iter_free
@@ -85,30 +125,66 @@ poppler_index_iter_next
 poppler_font_info_new
 poppler_font_info_scan
 poppler_font_info_free
-poppler_fonts_iter_get_type
 poppler_fonts_iter_copy
 poppler_fonts_iter_free
 poppler_fonts_iter_get_name
 poppler_fonts_iter_get_full_name
 poppler_fonts_iter_get_font_type
+poppler_fonts_iter_get_file_name
 poppler_fonts_iter_is_embedded
 poppler_fonts_iter_is_subset
 poppler_fonts_iter_next
+poppler_layers_iter_new
+poppler_layers_iter_copy
+poppler_layers_iter_free
+poppler_layers_iter_get_child
+poppler_layers_iter_get_layer
+poppler_layers_iter_get_title
+poppler_layers_iter_next
 poppler_ps_file_new
+poppler_ps_file_free
 poppler_ps_file_set_paper_size
 poppler_ps_file_set_duplex
-poppler_ps_file_free
+
 <SUBSECTION Standard>
 POPPLER_DOCUMENT
 POPPLER_IS_DOCUMENT
 POPPLER_TYPE_DOCUMENT
+POPPLER_FONT_INFO
+POPPLER_IS_FONT_INFO
+POPPLER_TYPE_FONT_INFO
+POPPLER_TYPE_FONTS_ITER
+POPPLER_TYPE_INDEX_ITER
+POPPLER_TYPE_LAYER
+POPPLER_TYPE_LAYERS_ITER
+POPPLER_PS_FILE
+POPPLER_IS_PS_FILE
+POPPLER_TYPE_PS_FILE
+POPPLER_TYPE_FONT_TYPE
+POPPLER_TYPE_PAGE_LAYOUT
+POPPLER_TYPE_PAGE_MODE
+POPPLER_TYPE_PERMISSIONS
+POPPLER_TYPE_VIEWER_PREFERENCES
+
+<SUBSECTION Private>
 poppler_document_get_type
+poppler_index_iter_get_type
+poppler_font_info_get_type
+poppler_fonts_iter_get_type
+poppler_layers_iter_get_type
+poppler_ps_file_get_type
+poppler_font_type_get_type
+poppler_page_layout_get_type
+poppler_page_mode_get_type
+poppler_permissions_get_type
+poppler_viewer_preferences_get_type
 </SECTION>
 
 <SECTION>
 <FILE>poppler-action</FILE>
-PopplerActionType
-PopplerDestType
+<TITLE>PopplerAction</TITLE>
+PopplerAction
+PopplerDest
 PopplerActionAny
 PopplerActionGotoDest
 PopplerActionGotoRemote
@@ -116,197 +192,287 @@ PopplerActionLaunch
 PopplerActionUri
 PopplerActionNamed
 PopplerActionMovie
-PopplerDest
-PopplerAction
-POPPLER_TYPE_ACTION
-POPPLER_ACTION
-poppler_action_get_type
+PopplerActionRendition
+PopplerActionOCGState
+PopplerActionType
+PopplerDestType
+PopplerActionMovieOperation
+PopplerActionLayer
+PopplerActionLayerAction
 poppler_action_copy
 poppler_action_free
-POPPLER_TYPE_DEST
-poppler_dest_get_type
 poppler_dest_copy
 poppler_dest_free
+
+<SUBSECTION Standard>
+POPPLER_ACTION
+POPPLER_TYPE_ACTION
+POPPLER_TYPE_ACTION_TYPE
+POPPLER_TYPE_DEST
+POPPLER_TYPE_DEST_TYPE
+POPPLER_TYPE_ACTION_LAYER_ACTION
+POPPLER_TYPE_ACTION_MOVIE_OPERATION
+
+
+<SUBSECTION Private>
+poppler_action_get_type
+poppler_dest_get_type
+poppler_action_type_get_type
+poppler_dest_type_get_type
+poppler_action_layer_action_get_type
+poppler_action_movie_operation_get_type
 </SECTION>
 
 <SECTION>
 <FILE>poppler-attachment</FILE>
+<TITLE>PopplerAttachment</TITLE>
 PopplerAttachment
+PopplerAttachmentSaveFunc
 poppler_attachment_save
 poppler_attachment_save_to_callback
-PopplerAttachmentSaveFunc
+
 <SUBSECTION Standard>
 POPPLER_ATTACHMENT
 POPPLER_IS_ATTACHMENT
 POPPLER_TYPE_ATTACHMENT
+
+<SUBSECTION Private>
 poppler_attachment_get_type
 </SECTION>
-</SECTION>
 
 <SECTION>
 <FILE>poppler-form-field</FILE>
+<TITLE>PopplerFormField</TITLE>
 PopplerFormField
+PopplerFormFieldType
 PopplerFormButtonType
 PopplerFormChoiceType
-PopplerFormFieldType
 PopplerFormTextType
-poppler_form_field_get_id
 poppler_form_field_get_field_type
+poppler_form_field_get_id
 poppler_form_field_is_read_only
 poppler_form_field_get_font_size
 poppler_form_field_button_get_button_type
 poppler_form_field_button_get_state
 poppler_form_field_button_set_state
+poppler_form_field_choice_get_choice_type
 poppler_form_field_choice_can_select_multiple
 poppler_form_field_choice_commit_on_change
 poppler_form_field_choice_do_spell_check
-poppler_form_field_choice_get_choice_type
 poppler_form_field_choice_get_item
 poppler_form_field_choice_get_n_items
 poppler_form_field_choice_get_text
+poppler_form_field_choice_set_text
 poppler_form_field_choice_is_editable
 poppler_form_field_choice_is_item_selected
 poppler_form_field_choice_select_item
-poppler_form_field_choice_set_text
 poppler_form_field_choice_toggle_item
 poppler_form_field_choice_unselect_all
+poppler_form_field_text_get_text_type
+poppler_form_field_text_get_text
+poppler_form_field_text_set_text
+poppler_form_field_text_get_max_len
 poppler_form_field_text_do_scroll
 poppler_form_field_text_do_spell_check
-poppler_form_field_text_get_max_len
-poppler_form_field_text_get_text
-poppler_form_field_text_get_text_type
 poppler_form_field_text_is_password
 poppler_form_field_text_is_rich_text
-poppler_form_field_text_set_text
 
 <SUBSECTION Standard>
 POPPLER_FORM_FIELD
 POPPLER_IS_FORM_FIELD
 POPPLER_TYPE_FORM_FIELD
-poppler_form_field_get_type
-</SECTION>
+POPPLER_TYPE_FORM_BUTTON_TYPE
+POPPLER_TYPE_FORM_CHOICE_TYPE
+POPPLER_TYPE_FORM_FIELD_TYPE
+POPPLER_TYPE_FORM_TEXT_TYPE
 
-<SECTION>
-<FILE>poppler-enums</FILE>
-POPPLER_TYPE_ACTION_TYPE
-poppler_action_type_get_type
-POPPLER_TYPE_DEST_TYPE
-poppler_dest_type_get_type
-POPPLER_TYPE_PAGE_LAYOUT
-poppler_page_layout_get_type
-POPPLER_TYPE_PAGE_MODE
-poppler_page_mode_get_type
-POPPLER_TYPE_FONT_TYPE
-poppler_font_type_get_type
-POPPLER_TYPE_VIEWER_PREFERENCES
-poppler_viewer_preferences_get_type
-POPPLER_TYPE_PERMISSIONS
-poppler_permissions_get_type
-POPPLER_TYPE_SELECTION_STYLE
-poppler_selection_style_get_type
-POPPLER_TYPE_PAGE_TRANSITION_TYPE
-poppler_page_transition_type_get_type
-POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT
-poppler_page_transition_alignment_get_type
-POPPLER_TYPE_PAGE_TRANSITION_DIRECTION
-poppler_page_transition_direction_get_type
-POPPLER_TYPE_ERROR
-poppler_error_get_type
-POPPLER_TYPE_ORIENTATION
-poppler_orientation_get_type
-POPPLER_TYPE_BACKEND
-poppler_backend_get_type
+<SUBSECTION Private>
+poppler_form_field_get_type
+poppler_form_field_type_get_type
+poppler_form_button_type_get_type
+poppler_form_choice_type_get_type
+poppler_form_text_type_get_type
 </SECTION>
 
 <SECTION>
 <FILE>poppler</FILE>
-poppler_error_quark
 POPPLER_ERROR
 PopplerError
 PopplerOrientation
-PopplerDocument
-PopplerIndexIter
-PopplerFontsIter
-PopplerRectangle
-PopplerSelectionStyle
-PopplerPageTransitionType
-PopplerPageTransitionAlignment
-PopplerPageTransitionDirection
-PopplerLinkMapping
-PopplerPage
-PopplerFontInfo
-PopplerPSFile
 PopplerBackend
+PopplerColor
 poppler_get_backend
 poppler_get_version
-</SECTION>
+poppler_date_parse
+poppler_color_new
+poppler_color_copy
+poppler_color_free
 
-<SECTION>
-<FILE>poppler-private</FILE>
-PopplerDocument
-PopplerPSFile
-PopplerFontInfo
-PopplerPage
-</SECTION>
+<SUBSECTION Standard>
+POPPLER_TYPE_COLOR
+POPPLER_TYPE_BACKEND
+POPPLER_TYPE_ERROR
+POPPLER_TYPE_ORIENTATION
 
-<SECTION>
-<FILE>stamp-poppler-enums</FILE>
+<SUBSECTION Private>
+poppler_error_get_type
+poppler_error_quark
+poppler_backend_get_type
+poppler_color_get_type
+poppler_orientation_get_type
 </SECTION>
 
 <SECTION>
 <FILE>poppler-annot</FILE>
+<TITLE>PopplerAnnot</TITLE>
 PopplerAnnot
-poppler_annot_callout_line_copy
-poppler_annot_callout_line_free
-poppler_annot_callout_line_get_type
-poppler_annot_callout_line_new
-poppler_annot_external_data_type_get_type
-poppler_annot_flag_get_type
-poppler_annot_free_text_get_callout_line
-poppler_annot_free_text_get_quadding
-poppler_annot_free_text_get_type
-poppler_annot_free_text_quadding_get_type
+PopplerAnnotMarkup
+PopplerAnnotText
+PopplerAnnotFreeText
+PopplerAnnotFileAttachment
+PopplerAnnotMovie
+PopplerAnnotScreen
+PopplerAnnotType
+PopplerAnnotFlag
+PopplerAnnotExternalDataType
+PopplerAnnotMarkupReplyType
+PopplerAnnotTextState
+PopplerAnnotCalloutLine
+PopplerAnnotFreeTextQuadding
 poppler_annot_get_annot_type
+poppler_annot_get_id
+poppler_annot_get_flags
+poppler_annot_get_name
+poppler_annot_get_page_index
 poppler_annot_get_color
 poppler_annot_get_contents
-poppler_annot_get_flags
-poppler_annot_get_id
+poppler_annot_set_contents
 poppler_annot_get_modified
-poppler_annot_get_name
-poppler_annot_get_type
-poppler_annot_mapping_copy
-poppler_annot_mapping_free
-poppler_annot_mapping_get_type
-poppler_annot_mapping_new
-poppler_annot_markup_get_date
-poppler_annot_markup_get_external_data
 poppler_annot_markup_get_label
+poppler_annot_markup_get_subject
 poppler_annot_markup_get_opacity
+poppler_annot_markup_has_popup
 poppler_annot_markup_get_popup_is_open
+poppler_annot_markup_get_popup_rectangle
+poppler_annot_markup_get_date
+poppler_annot_markup_get_external_data
 poppler_annot_markup_get_reply_to
-poppler_annot_markup_get_subject
-poppler_annot_markup_get_type
-poppler_annot_markup_reply_type_get_type
-poppler_annot_movie_get_movie
-poppler_annot_movie_get_title
-poppler_annot_movie_get_type
 poppler_annot_text_get_icon
 poppler_annot_text_get_is_open
 poppler_annot_text_get_state
+poppler_annot_free_text_get_callout_line
+poppler_annot_free_text_get_quadding
+poppler_annot_file_attachment_get_attachment
+poppler_annot_file_attachment_get_name
+poppler_annot_screen_get_action
+poppler_annot_movie_get_movie
+poppler_annot_movie_get_title
+poppler_annot_callout_line_new
+poppler_annot_callout_line_copy
+poppler_annot_callout_line_free
+
+<SUBSECTION Standard>
+POPPLER_ANNOT
+POPPLER_IS_ANNOT
+POPPLER_TYPE_ANNOT
+POPPLER_ANNOT_FILE_ATTACHMENT
+POPPLER_IS_ANNOT_FILE_ATTACHMENT
+POPPLER_TYPE_ANNOT_FILE_ATTACHMENT
+POPPLER_ANNOT_FREE_TEXT
+POPPLER_IS_ANNOT_FREE_TEXT
+POPPLER_TYPE_ANNOT_FREE_TEXT
+POPPLER_ANNOT_MARKUP
+POPPLER_IS_ANNOT_MARKUP
+POPPLER_TYPE_ANNOT_MARKUP
+POPPLER_ANNOT_MOVIE
+POPPLER_IS_ANNOT_MOVIE
+POPPLER_TYPE_ANNOT_MOVIE
+POPPLER_ANNOT_SCREEN
+POPPLER_IS_ANNOT_SCREEN
+POPPLER_TYPE_ANNOT_SCREEN
+POPPLER_ANNOT_TEXT
+POPPLER_IS_ANNOT_TEXT
+POPPLER_TYPE_ANNOT_TEXT
+POPPLER_TYPE_ANNOT_CALLOUT_LINE
+POPPLER_TYPE_ANNOT_EXTERNAL_DATA_TYPE
+POPPLER_TYPE_ANNOT_FLAG
+POPPLER_TYPE_ANNOT_MARKUP_REPLY_TYPE
+POPPLER_TYPE_ANNOT_TEXT_STATE
+POPPLER_TYPE_ANNOT_FREE_TEXT_QUADDING
+POPPLER_TYPE_ANNOT_TYPE
+
+<SUBSECTION Private>
+poppler_annot_get_type
+poppler_annot_type_get_type
+poppler_annot_markup_get_type
 poppler_annot_text_get_type
+poppler_annot_free_text_get_type
+poppler_annot_file_attachment_get_type
+poppler_annot_screen_get_type
+poppler_annot_movie_get_type
+poppler_annot_flag_get_type
+poppler_annot_external_data_type_get_type
+poppler_annot_markup_reply_type_get_type
+poppler_annot_callout_line_get_type
 poppler_annot_text_state_get_type
-poppler_annot_type_get_type
+poppler_annot_free_text_quadding_get_type
 </SECTION>
 
 <SECTION>
 <FILE>poppler-layer</FILE>
-poppler_layer_get_type
+<TITLE>PopplerLayer</TITLE>
+PopplerLayer
 poppler_layer_get_title
 poppler_layer_is_visible
 poppler_layer_show
 poppler_layer_hide
 poppler_layer_is_parent
 poppler_layer_get_radio_button_group_id
+
+<SUBSECTION Standard>
+POPPLER_LAYER
+POPPLER_IS_LAYER
+POPPLER_TYPE_LAYER
+
+<SUBSECTION Private>
+poppler_layer_get_type
+</SECTION>
+
+<SECTION>
+<FILE>poppler-media</FILE>
+<TITLE>PopplerMedia</TITLE>
+PopplerMedia
+PopplerMediaSaveFunc
+poppler_media_get_filename
+poppler_media_get_mime_type
+poppler_media_is_embedded
+poppler_media_save
+poppler_media_save_to_callback
+
+<SUBSECTION Standard>
+POPPLER_MEDIA
+POPPLER_IS_MEDIA
+POPPLER_TYPE_MEDIA
+
+<SUBSECTION Private>
+poppler_media_get_type
+</SECTION>
+
+<SECTION>
+<FILE>poppler-movie</FILE>
+<TITLE>PopplerMovie</TITLE>
+PopplerMovie
+poppler_movie_get_filename
+poppler_movie_need_poster
+poppler_movie_show_controls
+
+<SUBSECTION Standard>
+POPPLER_MOVIE
+POPPLER_IS_MOVIE
+POPPLER_TYPE_MOVIE
+<SUBSECTION Private>
+poppler_movie_get_type
+
 </SECTION>
 
 <SECTION>
commit b37556a32b79f8711ed7eca24abf19511872a70a
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Wed Jun 30 12:01:44 2010 +0200

    [glib] docs: Add index of symbols

diff --git a/glib/reference/poppler-docs.sgml b/glib/reference/poppler-docs.sgml
index 5b1eb2a..2240c5e 100644
--- a/glib/reference/poppler-docs.sgml
+++ b/glib/reference/poppler-docs.sgml
@@ -24,4 +24,9 @@
     <xi:include href="xml/poppler-layer.xml"/>
     <xi:include href="xml/poppler-features.xml"/>
   </chapter>
+
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
 </book>
commit 7f5fa4e19b4e324a396d64261b9125c1a557ac84
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Wed Jun 30 12:00:35 2010 +0200

    [glib] docs: Add version information

diff --git a/configure.ac b/configure.ac
index d77805c..8fa2b69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -632,6 +632,7 @@ utils/Makefile
 glib/Makefile
 glib/poppler-features.h
 glib/reference/Makefile
+glib/reference/version.xml
 glib/demo/Makefile
 test/Makefile
 qt/Makefile
diff --git a/glib/reference/Makefile.am b/glib/reference/Makefile.am
index fc99ed1..273336d 100644
--- a/glib/reference/Makefile.am
+++ b/glib/reference/Makefile.am
@@ -85,4 +85,4 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += 
+EXTRA_DIST += version.xml.in
diff --git a/glib/reference/poppler-docs.sgml b/glib/reference/poppler-docs.sgml
index 33dc2c4..5b1eb2a 100644
--- a/glib/reference/poppler-docs.sgml
+++ b/glib/reference/poppler-docs.sgml
@@ -1,9 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>Poppler Reference Manual</title>
+    <releaseinfo>
+      for Poppler &version;
+    </releaseinfo>
   </bookinfo>
 
   <chapter>
diff --git a/glib/reference/version.xml.in b/glib/reference/version.xml.in
new file mode 100644
index 0000000..9b6e99e
--- /dev/null
+++ b/glib/reference/version.xml.in
@@ -0,0 +1 @@
+ at POPPLER_VERSION@
commit 848d5e158fa9eadd19a658db314ba3fff9d026e8
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Wed Jun 30 11:30:41 2010 +0200

    [glib] docs: do not use gtk-doc templates

diff --git a/configure.ac b/configure.ac
index 48a3f15..d77805c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,7 +397,7 @@ fi
 AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes)
 AC_SUBST(GLIB_REQ)
 
-GTK_DOC_CHECK([1.0])
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 
 dnl
 dnl GDK
diff --git a/glib/poppler-action.cc b/glib/poppler-action.cc
index 871d3cf..c076551 100644
--- a/glib/poppler-action.cc
+++ b/glib/poppler-action.cc
@@ -19,6 +19,12 @@
 #include "poppler.h"
 #include "poppler-private.h"
 
+/**
+ * SECTION:poppler-action
+ * @short_description: Action links
+ * @title: PopplerAction
+ */
+
 POPPLER_DEFINE_BOXED_TYPE (PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free)
 
 /**
diff --git a/glib/poppler-annot.cc b/glib/poppler-annot.cc
index 87964f7..0c40f10 100644
--- a/glib/poppler-annot.cc
+++ b/glib/poppler-annot.cc
@@ -21,6 +21,12 @@
 #include "poppler.h"
 #include "poppler-private.h"
 
+/**
+ * SECTION:poppler-annot
+ * @short_description: Annotations
+ * @title: PopplerAnnot
+ */
+
 typedef struct _PopplerAnnotClass               PopplerAnnotClass;
 typedef struct _PopplerAnnotMarkupClass         PopplerAnnotMarkupClass;
 typedef struct _PopplerAnnotFreeTextClass       PopplerAnnotFreeTextClass;
diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc
index 6a098e1..6ff20b2 100644
--- a/glib/poppler-attachment.cc
+++ b/glib/poppler-attachment.cc
@@ -23,6 +23,12 @@
 #include "poppler.h"
 #include "poppler-private.h"
 
+/**
+ * SECTION:poppler-attachment
+ * @short_description: Attachments
+ * @title: PopplerAttachment
+ */
+
 /* FIXME: We need to add gettext support sometime */
 #define _(x) (x)
 
diff --git a/glib/poppler-attachment.h b/glib/poppler-attachment.h
index d506167..7d24c4a 100644
--- a/glib/poppler-attachment.h
+++ b/glib/poppler-attachment.h
@@ -32,6 +32,22 @@ G_BEGIN_DECLS
 #define POPPLER_IS_ATTACHMENT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), POPPLER_TYPE_ATTACHMENT))
 
 
+/**
+ * PopplerAttachmentSaveFunc:
+ * @buf: buffer containing bytes to be written.
+ * @count: number of bytes in @buf.
+ * @data: user data passed to poppler_attachment_save_to_callback()
+ * @error: GError to set on error, or NULL
+ *
+ * Specifies the type of the function passed to
+ * poppler_attachment_save_to_callback().  It is called once for each block of
+ * bytes that is "written" by poppler_attachment_save_to_callback().  If
+ * successful it should return %TRUE.  If an error occurs it should set
+ * @error and return %FALSE, in which case poppler_attachment_save_to_callback()
+ * will fail with the same error.
+ *
+ * @Returns: %TRUE if successful, %FALSE (with @error set) if failed.
+ */
 typedef gboolean (*PopplerAttachmentSaveFunc) (const gchar  *buf,
 					       gsize         count,
 					       gpointer      data,
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index b265a34..00669c0 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -36,6 +36,14 @@
 #include "poppler-private.h"
 #include "poppler-enums.h"
 
+/**
+ * SECTION:poppler-document
+ * @short_description: Information about a document
+ * @title: PopplerDocument
+ *
+ * The #PopplerDocument is an object used to refer to a main document.
+ */
+
 enum {
 	PROP_0,
 	PROP_TITLE,
diff --git a/glib/poppler-features.h.in b/glib/poppler-features.h.in
index 99c7ed8..279c960 100644
--- a/glib/poppler-features.h.in
+++ b/glib/poppler-features.h.in
@@ -19,13 +19,72 @@
 #ifndef __POPPLER_FEATURES_H__
 #define __POPPLER_FEATURES_H__
 
+/**
+ * SECTION:poppler-features
+ * @short_description: Variables and functions to check the poppler version and features
+ * @Title: Version and Features Information
+ *
+ * Poppler provides version information, and information about features
+ * enabled at compile time. This is primarily useful in configure checks
+ * for builds that have a configure script, or for allowing code to optionally
+ * depend but not require a specific poppler version.
+ */
+
+/**
+ * POPPLER_HAS_CAIRO:
+ *
+ * Defined if poppler was compiled with cairo support.
+ */
 @CAIRO_FEATURE@
+/**
+ * POPPLER_WITH_GDK:
+ *
+ * Defined if poppler was compiled with GDK support.
+ */
 @GDK_FEATURE@
 
+/**
+ * POPPLER_MAJOR_VERSION:
+ *
+ * The major version number of the poppler header files (e.g. in poppler version
+ * 0.1.2 this is 0.)
+ *
+ * Since: 0.12
+ */
 #define POPPLER_MAJOR_VERSION (@POPPLER_MAJOR_VERSION@)
+
+/**
+ * POPPLER_MINOR_VERSION:
+ *
+ * The major version number of the poppler header files (e.g. in poppler version
+ * 0.1.2 this is 1.)
+ *
+ * Since: 0.12
+ */
 #define POPPLER_MINOR_VERSION (@POPPLER_MINOR_VERSION@)
+
+/**
+ * POPPLER_MICRO_VERSION:
+ *
+ * The micro version number of the poppler header files (e.g. in poppler version
+ * 0.1.2 this is 2.)
+ *
+ * Since: 0.12
+ */
 #define POPPLER_MICRO_VERSION (@POPPLER_MICRO_VERSION@)
 
+/**
+ * POPPLER_CHECK_VERSION:
+ *
+ * @major: major version (e.g. 0 for version 0.1.2)
+ * @minor: minor version (e.g. 1 for version 0.1.2)
+ * @micro: micro version (e.g. 2 for version 0.1.2)
+ *
+ * Returns %TRUE if the version of the poppler header files is the same
+ * as or newer than the passed-in version.
+ *
+ * Since: 0.12
+ */
 #define POPPLER_CHECK_VERSION(major,minor,micro) \
   (POPPLER_MAJOR_VERSION > (major) || \
    (POPPLER_MAJOR_VERSION == (major) && POPPLER_MINOR_VERSION > (minor)) || \
diff --git a/glib/poppler-form-field.cc b/glib/poppler-form-field.cc
index 4ed5b9e..46d0370 100644
--- a/glib/poppler-form-field.cc
+++ b/glib/poppler-form-field.cc
@@ -21,6 +21,12 @@
 #include "poppler.h"
 #include "poppler-private.h"
 
+/**
+ * SECTION:poppler-form-field
+ * @short_description: Form Field
+ * @title: PoppplerFormField
+ */
+
 typedef struct _PopplerFormFieldClass PopplerFormFieldClass;
 struct _PopplerFormFieldClass
 {
diff --git a/glib/poppler-layer.cc b/glib/poppler-layer.cc
index 43aa85a..021ca0b 100644
--- a/glib/poppler-layer.cc
+++ b/glib/poppler-layer.cc
@@ -20,6 +20,12 @@
 #include "poppler-layer.h"
 #include "poppler-private.h"
 
+/**
+ * SECTION:poppler-layer
+ * @short_description: Layers
+ * @title: PopplerLayer
+ */
+
 typedef struct _PopplerLayerClass PopplerLayerClass;
 struct _PopplerLayerClass
 {
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index a3f378b..3b2f64d 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -32,6 +32,12 @@
 #include "poppler.h"
 #include "poppler-private.h"
 
+/**
+ * SECTION:poppler-page
+ * @short_description: Information about a page in a document
+ * @title: PopplerPage
+ */
+
 enum
 {
   PROP_0,
diff --git a/glib/reference/tmpl/poppler-action.sgml b/glib/reference/tmpl/poppler-action.sgml
deleted file mode 100644
index 26dbc17..0000000
--- a/glib/reference/tmpl/poppler-action.sgml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-PopplerAction
-
-<!-- ##### SECTION Short_Description ##### -->
-Action links
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM PopplerActionType ##### -->
-<para>
-
-</para>
-
- at POPPLER_ACTION_UNKNOWN: 
- at POPPLER_ACTION_NONE: 
- at POPPLER_ACTION_GOTO_DEST: 
- at POPPLER_ACTION_GOTO_REMOTE: 
- at POPPLER_ACTION_LAUNCH: 
- at POPPLER_ACTION_URI: 
- at POPPLER_ACTION_NAMED: 
- at POPPLER_ACTION_MOVIE: 
- at POPPLER_ACTION_RENDITION: 
- at POPPLER_ACTION_OCG_STATE: 
-
-<!-- ##### ENUM PopplerDestType ##### -->
-<para>
-
-</para>
-
- at POPPLER_DEST_UNKNOWN: 
- at POPPLER_DEST_XYZ: 
- at POPPLER_DEST_FIT: 
- at POPPLER_DEST_FITH: 
- at POPPLER_DEST_FITV: 
- at POPPLER_DEST_FITR: 
- at POPPLER_DEST_FITB: 
- at POPPLER_DEST_FITBH: 
- at POPPLER_DEST_FITBV: 
- at POPPLER_DEST_NAMED: 
-
-<!-- ##### STRUCT PopplerActionAny ##### -->
-<para>
-
-</para>
-
- at type: 
- at title: 
-
-<!-- ##### STRUCT PopplerActionGotoDest ##### -->
-<para>
-
-</para>
-
- at type: 
- at title: 
- at dest: 
-
-<!-- ##### STRUCT PopplerActionGotoRemote ##### -->
-<para>
-
-</para>
-
- at type: 
- at title: 
- at file_name: 
- at dest: 
-
-<!-- ##### STRUCT PopplerActionLaunch ##### -->
-<para>
-
-</para>
-
- at type: 
- at title: 
- at file_name: 
- at params: 
-
-<!-- ##### STRUCT PopplerActionUri ##### -->
-<para>
-
-</para>
-
- at type: 
- at title: 
- at uri: 
-
-<!-- ##### STRUCT PopplerActionNamed ##### -->
-<para>
-
-</para>
-
- at type: 
- at title: 
- at named_dest: 
-
-<!-- ##### STRUCT PopplerActionMovie ##### -->
-<para>
-
-</para>
-
- at type: 
- at title: 
- at operation: 
- at movie: 
-
-<!-- ##### STRUCT PopplerDest ##### -->
-<para>
-
-</para>
-
- at type: 
- at page_num: 
- at left: 
- at bottom: 
- at right: 
- at top: 
- at zoom: 
- at named_dest: 
- at change_left: 
- at change_top: 
- at change_zoom: 
-
-<!-- ##### UNION PopplerAction ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO POPPLER_TYPE_ACTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO POPPLER_ACTION ##### -->
-<para>
-
-</para>
-
- at obj: 
-
-
-<!-- ##### FUNCTION poppler_action_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_action_copy ##### -->
-<para>
-
-</para>
-
- at action: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_action_free ##### -->
-<para>
-
-</para>
-
- at action: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_DEST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_dest_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_dest_copy ##### -->
-<para>
-
-</para>
-
- at dest: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_dest_free ##### -->
-<para>
-
-</para>
-
- at dest: 
-
-
diff --git a/glib/reference/tmpl/poppler-annot.sgml b/glib/reference/tmpl/poppler-annot.sgml
deleted file mode 100644
index 6eb09a9..0000000
--- a/glib/reference/tmpl/poppler-annot.sgml
+++ /dev/null
@@ -1,377 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-PopplerAnnot
-
-<!-- ##### SECTION Short_Description ##### -->
-Annotations
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT PopplerAnnot ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION poppler_annot_callout_line_copy ##### -->
-<para>
-
-</para>
-
- at callout: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_callout_line_free ##### -->
-<para>
-
-</para>
-
- at callout: 
-
-
-<!-- ##### FUNCTION poppler_annot_callout_line_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_callout_line_new ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_external_data_type_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_flag_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_free_text_get_callout_line ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_free_text_get_quadding ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_free_text_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_free_text_quadding_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_get_annot_type ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_get_color ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_get_contents ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_get_flags ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_get_modified ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_get_name ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_mapping_copy ##### -->
-<para>
-
-</para>
-
- at mapping: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_mapping_free ##### -->
-<para>
-
-</para>
-
- at mapping: 
-
-
-<!-- ##### FUNCTION poppler_annot_mapping_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_mapping_new ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_get_date ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_get_external_data ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_get_label ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_get_opacity ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_get_popup_is_open ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_get_reply_to ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_get_subject ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_markup_reply_type_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_movie_get_movie ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_movie_get_title ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_movie_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_text_get_icon ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_text_get_is_open ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_text_get_state ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_text_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_text_state_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_annot_type_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
diff --git a/glib/reference/tmpl/poppler-attachment.sgml b/glib/reference/tmpl/poppler-attachment.sgml
deleted file mode 100644
index afecdbc..0000000
--- a/glib/reference/tmpl/poppler-attachment.sgml
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-PopplerAttachment
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT PopplerAttachment ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION poppler_attachment_save ##### -->
-<para>
-
-</para>
-
- at attachment: 
- at filename: 
- at error: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_attachment_save_to_callback ##### -->
-<para>
-
-</para>
-
- at attachment: 
- at save_func: 
- at user_data: 
- at error: 
- at Returns: 
-
-
-<!-- ##### USER_FUNCTION PopplerAttachmentSaveFunc ##### -->
-<para>
-Specifies the type of the function passed to
-poppler_attachment_save_to_callback().  It is called once for each block of
-bytes that is "written" by poppler_attachment_save_to_callback().  If
-successful it should return %TRUE.  If an error occurs it should set
- at error and return %FALSE, in which case poppler_attachment_save_to_callback()
-will fail with the same error.
-</para>
-
- at buf: buffer containing bytes to be written.
- at count: number of bytes in @buf.
- at data: A location to return an error.
- at error: user data passed to poppler_attachment_save_to_callback()
- at Returns: %TRUE if successful, %FALSE (with @error set) if failed.
-
-
diff --git a/glib/reference/tmpl/poppler-document.sgml b/glib/reference/tmpl/poppler-document.sgml
deleted file mode 100644
index 33cf2de..0000000
--- a/glib/reference/tmpl/poppler-document.sgml
+++ /dev/null
@@ -1,410 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-PopplerDocument
-
-<!-- ##### SECTION Short_Description ##### -->
-Information about a document
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #PopplerDocument is an object used to refer to a main document.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM PopplerPageLayout ##### -->
-<para>
-
-</para>
-
- at POPPLER_PAGE_LAYOUT_UNSET: 
- at POPPLER_PAGE_LAYOUT_SINGLE_PAGE: 
- at POPPLER_PAGE_LAYOUT_ONE_COLUMN: 
- at POPPLER_PAGE_LAYOUT_TWO_COLUMN_LEFT: 
- at POPPLER_PAGE_LAYOUT_TWO_COLUMN_RIGHT: 
- at POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT: 
- at POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT: 
-
-<!-- ##### ENUM PopplerPageMode ##### -->
-<para>
-
-</para>
-
- at POPPLER_PAGE_MODE_UNSET: 
- at POPPLER_PAGE_MODE_NONE: 
- at POPPLER_PAGE_MODE_USE_OUTLINES: 
- at POPPLER_PAGE_MODE_USE_THUMBS: 
- at POPPLER_PAGE_MODE_FULL_SCREEN: 
- at POPPLER_PAGE_MODE_USE_OC: 
- at POPPLER_PAGE_MODE_USE_ATTACHMENTS: 
-
-<!-- ##### ENUM PopplerFontType ##### -->
-<para>
-
-</para>
-
- at POPPLER_FONT_TYPE_UNKNOWN: 
- at POPPLER_FONT_TYPE_TYPE1: 
- at POPPLER_FONT_TYPE_TYPE1C: 
- at POPPLER_FONT_TYPE_TYPE1COT: 
- at POPPLER_FONT_TYPE_TYPE3: 
- at POPPLER_FONT_TYPE_TRUETYPE: 
- at POPPLER_FONT_TYPE_TRUETYPEOT: 
- at POPPLER_FONT_TYPE_CID_TYPE0: 
- at POPPLER_FONT_TYPE_CID_TYPE0C: 
- at POPPLER_FONT_TYPE_CID_TYPE0COT: 
- at POPPLER_FONT_TYPE_CID_TYPE2: 
- at POPPLER_FONT_TYPE_CID_TYPE2OT: 
-
-<!-- ##### ENUM PopplerViewerPreferences ##### -->
-<para>
-
-</para>
-
- at POPPLER_VIEWER_PREFERENCES_UNSET: 
- at POPPLER_VIEWER_PREFERENCES_HIDE_TOOLBAR: 
- at POPPLER_VIEWER_PREFERENCES_HIDE_MENUBAR: 
- at POPPLER_VIEWER_PREFERENCES_HIDE_WINDOWUI: 
- at POPPLER_VIEWER_PREFERENCES_FIT_WINDOW: 
- at POPPLER_VIEWER_PREFERENCES_CENTER_WINDOW: 
- at POPPLER_VIEWER_PREFERENCES_DISPLAY_DOC_TITLE: 
- at POPPLER_VIEWER_PREFERENCES_DIRECTION_RTL: 
-
-<!-- ##### ENUM PopplerPermissions ##### -->
-<para>
-
-</para>
-
- at POPPLER_PERMISSIONS_OK_TO_PRINT: 
- at POPPLER_PERMISSIONS_OK_TO_MODIFY: 
- at POPPLER_PERMISSIONS_OK_TO_COPY: 
- at POPPLER_PERMISSIONS_OK_TO_ADD_NOTES: 
- at POPPLER_PERMISSIONS_OK_TO_FILL_FORM: 
- at POPPLER_PERMISSIONS_FULL: 
-
-<!-- ##### FUNCTION poppler_document_new_from_file ##### -->
-<para>
-
-</para>
-
- at uri: 
- at password: 
- at error: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_new_from_data ##### -->
-<para>
-
-</para>
-
- at data: 
- at length: 
- at password: 
- at error: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_save ##### -->
-<para>
-
-</para>
-
- at document: 
- at uri: 
- at error: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_get_n_pages ##### -->
-<para>
-
-</para>
-
- at document: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_get_page ##### -->
-<para>
-
-</para>
-
- at document: 
- at index: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_get_page_by_label ##### -->
-<para>
-
-</para>
-
- at document: 
- at label: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_find_dest ##### -->
-<para>
-
-</para>
-
- at document: 
- at link_name: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_has_attachments ##### -->
-<para>
-
-</para>
-
- at document: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_get_attachments ##### -->
-<para>
-
-</para>
-
- at document: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_document_get_form_field ##### -->
-<para>
-
-</para>
-
- at document: 
- at id: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_index_iter_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_index_iter_new ##### -->
-<para>
-
-</para>
-
- at document: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_index_iter_copy ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_index_iter_free ##### -->
-<para>
-
-</para>
-
- at iter: 
-
-
-<!-- ##### FUNCTION poppler_index_iter_get_child ##### -->
-<para>
-
-</para>
-
- at parent: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_index_iter_is_open ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_index_iter_get_action ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_index_iter_next ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_font_info_new ##### -->
-<para>
-
-</para>
-
- at document: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_font_info_scan ##### -->
-<para>
-
-</para>
-
- at font_info: 
- at n_pages: 
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_font_info_free ##### -->
-<para>
-
-</para>
-
- at font_info: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_copy ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_free ##### -->
-<para>
-
-</para>
-
- at iter: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_get_name ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_get_full_name ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_get_font_type ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_is_embedded ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_is_subset ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_fonts_iter_next ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_ps_file_new ##### -->
-<para>
-
-</para>
-
- at document: 
- at filename: 
- at first_page: 
- at n_pages: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_ps_file_set_paper_size ##### -->
-<para>
-
-</para>
-
- at ps_file: 
- at width: 
- at height: 
-
-
-<!-- ##### FUNCTION poppler_ps_file_set_duplex ##### -->
-<para>
-
-</para>
-
- at ps_file: 
- at duplex: 
-
-
-<!-- ##### FUNCTION poppler_ps_file_free ##### -->
-<para>
-
-</para>
-
- at ps_file: 
-
-
diff --git a/glib/reference/tmpl/poppler-enums.sgml b/glib/reference/tmpl/poppler-enums.sgml
deleted file mode 100644
index 1fd9fa4..0000000
--- a/glib/reference/tmpl/poppler-enums.sgml
+++ /dev/null
@@ -1,246 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-poppler-enums
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO POPPLER_TYPE_ACTION_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_action_type_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_DEST_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_dest_type_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_PAGE_LAYOUT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_page_layout_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_PAGE_MODE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_page_mode_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_FONT_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_font_type_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_VIEWER_PREFERENCES ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_viewer_preferences_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_PERMISSIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_permissions_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_SELECTION_STYLE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_selection_style_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_PAGE_TRANSITION_TYPE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_page_transition_type_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_page_transition_alignment_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_PAGE_TRANSITION_DIRECTION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_page_transition_direction_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_error_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_ORIENTATION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_orientation_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_BACKEND ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION poppler_backend_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
diff --git a/glib/reference/tmpl/poppler-features.sgml b/glib/reference/tmpl/poppler-features.sgml
deleted file mode 100644
index f79d961..0000000
--- a/glib/reference/tmpl/poppler-features.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Version and Features Information
-
-<!-- ##### SECTION Short_Description ##### -->
-Variables and functions to check the poppler version and features
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Poppler provides version information, and information about features
-enabled at compile time. This is primarily useful in configure checks
-for builds that have a configure script, or for allowing code to optionally
-depend but not require a specific poppler version.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO POPPLER_HAS_CAIRO ##### -->
-<para>
-Defined if poppler was compiled with cairo support.
-</para>
-
-
-
-<!-- ##### MACRO POPPLER_WITH_GDK ##### -->
-<para>
-Defined if poppler was compiled with GDK support.
-</para>
-
-
-
-<!-- ##### MACRO POPPLER_MAJOR_VERSION ##### -->
-<para>
-The major version number of the poppler header files (e.g. in poppler version
-0.1.2 this is 0.)
-</para>
-
-Since: 0.11
-
-
-
-<!-- ##### MACRO POPPLER_MINOR_VERSION ##### -->
-<para>
-
-</para>
-The major version number of the poppler header files (e.g. in poppler version
-0.1.2 this is 1.)
-
-Since: 0.11
-
-
-
-<!-- ##### MACRO POPPLER_MICRO_VERSION ##### -->
-<para>
-The micro version number of the poppler header files (e.g. in poppler version
-0.1.2 this is 2.)
-</para>
-
-Since: 0.11
-
-
-
-<!-- ##### MACRO POPPLER_CHECK_VERSION ##### -->
-<para>
-Returns %TRUE if the version of the poppler header files is the same
-as or newer than the passed-in version.
-</para>
-
- at major: major version (e.g. 0 for version 0.1.2)
- at minor: minor version (e.g. 1 for version 0.1.2)
- at micro: micro version (e.g. 2 for version 0.1.2)
-
-Since: 0.11
-
-
diff --git a/glib/reference/tmpl/poppler-form-field.sgml b/glib/reference/tmpl/poppler-form-field.sgml
deleted file mode 100644
index cb1b4fc..0000000
--- a/glib/reference/tmpl/poppler-form-field.sgml
+++ /dev/null
@@ -1,318 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-PopplerFormField
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT PopplerFormField ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM PopplerFormButtonType ##### -->
-<para>
-
-</para>
-
- at POPPLER_FORM_BUTTON_PUSH: 
- at POPPLER_FORM_BUTTON_CHECK: 
- at POPPLER_FORM_BUTTON_RADIO: 
-
-<!-- ##### ENUM PopplerFormChoiceType ##### -->
-<para>
-
-</para>
-
- at POPPLER_FORM_CHOICE_COMBO: 
- at POPPLER_FORM_CHOICE_LIST: 
-
-<!-- ##### ENUM PopplerFormFieldType ##### -->
-<para>
-
-</para>
-
- at POPPLER_FORM_FIELD_UNKNOWN: 
- at POPPLER_FORM_FIELD_BUTTON: 
- at POPPLER_FORM_FIELD_TEXT: 
- at POPPLER_FORM_FIELD_CHOICE: 
- at POPPLER_FORM_FIELD_SIGNATURE: 
-
-<!-- ##### ENUM PopplerFormTextType ##### -->
-<para>
-
-</para>
-
- at POPPLER_FORM_TEXT_NORMAL: 
- at POPPLER_FORM_TEXT_MULTILINE: 
- at POPPLER_FORM_TEXT_FILE_SELECT: 
-
-<!-- ##### FUNCTION poppler_form_field_get_id ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_get_field_type ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_is_read_only ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_get_font_size ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_button_get_button_type ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_button_get_state ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_button_set_state ##### -->
-<para>
-
-</para>
-
- at field: 
- at state: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_can_select_multiple ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_commit_on_change ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_do_spell_check ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_get_choice_type ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_get_item ##### -->
-<para>
-
-</para>
-
- at field: 
- at index: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_get_n_items ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_get_text ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_is_editable ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_is_item_selected ##### -->
-<para>
-
-</para>
-
- at field: 
- at index: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_select_item ##### -->
-<para>
-
-</para>
-
- at field: 
- at index: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_set_text ##### -->
-<para>
-
-</para>
-
- at field: 
- at text: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_toggle_item ##### -->
-<para>
-
-</para>
-
- at field: 
- at index: 
-
-
-<!-- ##### FUNCTION poppler_form_field_choice_unselect_all ##### -->
-<para>
-
-</para>
-
- at field: 
-
-
-<!-- ##### FUNCTION poppler_form_field_text_do_scroll ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_text_do_spell_check ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_text_get_max_len ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_text_get_text ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_text_get_text_type ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_text_is_password ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_text_is_rich_text ##### -->
-<para>
-
-</para>
-
- at field: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_text_set_text ##### -->
-<para>
-
-</para>
-
- at field: 
- at text: 
-
-
diff --git a/glib/reference/tmpl/poppler-layer.sgml b/glib/reference/tmpl/poppler-layer.sgml
deleted file mode 100644
index 553c988..0000000
--- a/glib/reference/tmpl/poppler-layer.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-PopplerLayer
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION poppler_layer_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_layer_get_title ##### -->
-<para>
-
-</para>
-
- at layer: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_layer_is_visible ##### -->
-<para>
-
-</para>
-
- at layer: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_layer_show ##### -->
-<para>
-
-</para>
-
- at layer: 
-
-
-<!-- ##### FUNCTION poppler_layer_hide ##### -->
-<para>
-
-</para>
-
- at layer: 
-
-
-<!-- ##### FUNCTION poppler_layer_is_parent ##### -->
-<para>
-
-</para>
-
- at layer: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_layer_get_radio_button_group_id ##### -->
-<para>
-
-</para>
-
- at layer: 
- at Returns: 
-
-
diff --git a/glib/reference/tmpl/poppler-page.sgml b/glib/reference/tmpl/poppler-page.sgml
deleted file mode 100644
index d600078..0000000
--- a/glib/reference/tmpl/poppler-page.sgml
+++ /dev/null
@@ -1,483 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-PopplerPage
-
-<!-- ##### SECTION Short_Description ##### -->
-Information about a page in a document
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION poppler_page_render ##### -->
-<para>
-
-</para>
-
- at page: 
- at cairo: 
-
-
-<!-- ##### FUNCTION poppler_page_render_to_pixbuf ##### -->
-<para>
-
-</para>
-
- at page: 
- at src_x: 
- at src_y: 
- at src_width: 
- at src_height: 
- at scale: 
- at rotation: 
- at pixbuf: 
-
-
-<!-- ##### FUNCTION poppler_page_get_size ##### -->
-<para>
-
-</para>
-
- at page: 
- at width: 
- at height: 
-
-
-<!-- ##### FUNCTION poppler_page_get_index ##### -->
-<para>
-
-</para>
-
- at page: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_get_thumbnail ##### -->
-<para>
-
-</para>
-
- at page: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_get_thumbnail_size ##### -->
-<para>
-
-</para>
-
- at page: 
- at width: 
- at height: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_render_to_ps ##### -->
-<para>
-
-</para>
-
- at page: 
- at ps_file: 
-
-
-<!-- ##### FUNCTION poppler_page_find_text ##### -->
-<para>
-
-</para>
-
- at page: 
- at text: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_get_text ##### -->
-<para>
-
-</para>
-
- at page: 
- at style: 
- at rect: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_get_duration ##### -->
-<para>
-
-</para>
-
- at page: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_get_transition ##### -->
-<para>
-
-</para>
-
- at page: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_get_link_mapping ##### -->
-<para>
-
-</para>
-
- at page: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_free_link_mapping ##### -->
-<para>
-
-</para>
-
- at list: 
-
-
-<!-- ##### FUNCTION poppler_page_get_image_mapping ##### -->
-<para>
-
-</para>
-
- at page: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_free_image_mapping ##### -->
-<para>
-
-</para>
-
- at list: 
-
-
-<!-- ##### FUNCTION poppler_page_get_form_field_mapping ##### -->
-<para>
-
-</para>
-
- at page: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_free_form_field_mapping ##### -->
-<para>
-
-</para>
-
- at list: 
-
-
-<!-- ##### FUNCTION poppler_page_get_selection_region ##### -->
-<para>
-
-</para>
-
- at page: 
- at scale: 
- at style: 
- at selection: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_render_selection ##### -->
-<para>
-
-</para>
-
- at page: 
- at cairo: 
- at selection: 
- at old_selection: 
- at style: 
- at glyph_color: 
- at background_color: 
-
-
-<!-- ##### FUNCTION poppler_page_render_selection_to_pixbuf ##### -->
-<para>
-
-</para>
-
- at page: 
- at scale: 
- at rotation: 
- at pixbuf: 
- at selection: 
- at old_selection: 
- at style: 
- at glyph_color: 
- at background_color: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_RECTANGLE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT PopplerRectangle ##### -->
-<para>
-
-</para>
-
- at x1: 
- at y1: 
- at x2: 
- at y2: 
-
-<!-- ##### FUNCTION poppler_rectangle_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_rectangle_new ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_rectangle_copy ##### -->
-<para>
-
-</para>
-
- at rectangle: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_rectangle_free ##### -->
-<para>
-
-</para>
-
- at rectangle: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_PAGE_TRANSITION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT PopplerPageTransition ##### -->
-<para>
-
-</para>
-
- at type: 
- at alignment: 
- at direction: 
- at duration: 
- at angle: 
- at scale: 
- at rectangular: 
-
-<!-- ##### FUNCTION poppler_page_transition_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_transition_new ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_transition_copy ##### -->
-<para>
-
-</para>
-
- at transition: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_page_transition_free ##### -->
-<para>
-
-</para>
-
- at transition: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_LINK_MAPPING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT PopplerLinkMapping ##### -->
-<para>
-
-</para>
-
- at area: 
- at action: 
-
-<!-- ##### FUNCTION poppler_link_mapping_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_link_mapping_new ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_link_mapping_copy ##### -->
-<para>
-
-</para>
-
- at mapping: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_link_mapping_free ##### -->
-<para>
-
-</para>
-
- at mapping: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_IMAGE_MAPPING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT PopplerImageMapping ##### -->
-<para>
-
-</para>
-
- at area: 
- at image_id: 
-
-<!-- ##### FUNCTION poppler_image_mapping_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_image_mapping_new ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_image_mapping_copy ##### -->
-<para>
-
-</para>
-
- at mapping: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_image_mapping_free ##### -->
-<para>
-
-</para>
-
- at mapping: 
-
-
-<!-- ##### MACRO POPPLER_TYPE_FORM_FIELD_MAPPING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT PopplerFormFieldMapping ##### -->
-<para>
-
-</para>
-
- at area: 
- at field: 
-
-<!-- ##### FUNCTION poppler_form_field_mapping_get_type ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_mapping_new ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_mapping_copy ##### -->
-<para>
-
-</para>
-
- at mapping: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_form_field_mapping_free ##### -->
-<para>
-
-</para>
-
- at mapping: 
-
-
diff --git a/glib/reference/tmpl/poppler-private.sgml b/glib/reference/tmpl/poppler-private.sgml
deleted file mode 100644
index bd34e94..0000000
--- a/glib/reference/tmpl/poppler-private.sgml
+++ /dev/null
@@ -1,148 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-poppler-private
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT PopplerDocument ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG PopplerDocument:author ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:creation-date ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:creator ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:format ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:format-major ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:format-minor ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:keywords ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:linearized ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:metadata ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:mod-date ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:page-layout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:page-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:permissions ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:producer ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:subject ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:viewer-preferences ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT PopplerPSFile ##### -->
-<para>
-
-</para>
-
- at parent_instance: 
- at document: 
- at out: 
- at filename: 
- at first_page: 
- at last_page: 
- at paper_width: 
- at paper_height: 
- at duplex: 
-
-<!-- ##### STRUCT PopplerFontInfo ##### -->
-<para>
-
-</para>
-
- at parent_instance: 
- at document: 
- at scanner: 
-
-<!-- ##### STRUCT PopplerPage ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG PopplerPage:label ##### -->
-<para>
-
-</para>
-
diff --git a/glib/reference/tmpl/poppler-unused.sgml b/glib/reference/tmpl/poppler-unused.sgml
deleted file mode 100644
index 908a494..0000000
--- a/glib/reference/tmpl/poppler-unused.sgml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- ##### FUNCTION poppler_annot_get_id ##### -->
-<para>
-
-</para>
-
- at poppler_annot: 
- at Returns: 
-
diff --git a/glib/reference/tmpl/poppler.sgml b/glib/reference/tmpl/poppler.sgml
deleted file mode 100644
index 6bdb369..0000000
--- a/glib/reference/tmpl/poppler.sgml
+++ /dev/null
@@ -1,285 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-poppler
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION poppler_error_quark ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### MACRO POPPLER_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM PopplerError ##### -->
-<para>
-
-</para>
-
- at POPPLER_ERROR_INVALID: 
- at POPPLER_ERROR_ENCRYPTED: 
- at POPPLER_ERROR_OPEN_FILE: 
- at POPPLER_ERROR_BAD_CATALOG: 
- at POPPLER_ERROR_DAMAGED: 
-
-<!-- ##### ENUM PopplerOrientation ##### -->
-<para>
-
-</para>
-
- at POPPLER_ORIENTATION_PORTRAIT: 
- at POPPLER_ORIENTATION_LANDSCAPE: 
- at POPPLER_ORIENTATION_UPSIDEDOWN: 
- at POPPLER_ORIENTATION_SEASCAPE: 
-
-<!-- ##### STRUCT PopplerDocument ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG PopplerDocument:author ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:creation-date ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:creator ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:format ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:format-major ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:format-minor ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:keywords ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:linearized ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:metadata ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:mod-date ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:page-layout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:page-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:permissions ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:producer ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:subject ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG PopplerDocument:viewer-preferences ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT PopplerIndexIter ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT PopplerFontsIter ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT PopplerRectangle ##### -->
-<para>
-
-</para>
-
- at x1: 
- at y1: 
- at x2: 
- at y2: 
-
-<!-- ##### ENUM PopplerSelectionStyle ##### -->
-<para>
-
-</para>
-
- at POPPLER_SELECTION_GLYPH: 
- at POPPLER_SELECTION_WORD: 
- at POPPLER_SELECTION_LINE: 
-
-<!-- ##### ENUM PopplerPageTransitionType ##### -->
-<para>
-
-</para>
-
- at POPPLER_PAGE_TRANSITION_REPLACE: 
- at POPPLER_PAGE_TRANSITION_SPLIT: 
- at POPPLER_PAGE_TRANSITION_BLINDS: 
- at POPPLER_PAGE_TRANSITION_BOX: 
- at POPPLER_PAGE_TRANSITION_WIPE: 
- at POPPLER_PAGE_TRANSITION_DISSOLVE: 
- at POPPLER_PAGE_TRANSITION_GLITTER: 
- at POPPLER_PAGE_TRANSITION_FLY: 
- at POPPLER_PAGE_TRANSITION_PUSH: 
- at POPPLER_PAGE_TRANSITION_COVER: 
- at POPPLER_PAGE_TRANSITION_UNCOVER: 
- at POPPLER_PAGE_TRANSITION_FADE: 
-
-<!-- ##### ENUM PopplerPageTransitionAlignment ##### -->
-<para>
-
-</para>
-
- at POPPLER_PAGE_TRANSITION_HORIZONTAL: 
- at POPPLER_PAGE_TRANSITION_VERTICAL: 
-
-<!-- ##### ENUM PopplerPageTransitionDirection ##### -->
-<para>
-
-</para>
-
- at POPPLER_PAGE_TRANSITION_INWARD: 
- at POPPLER_PAGE_TRANSITION_OUTWARD: 
-
-<!-- ##### STRUCT PopplerLinkMapping ##### -->
-<para>
-
-</para>
-
- at area: 
- at action: 
-
-<!-- ##### STRUCT PopplerPage ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG PopplerPage:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT PopplerFontInfo ##### -->
-<para>
-
-</para>
-
- at parent_instance: 
- at document: 
- at scanner: 
-
-<!-- ##### STRUCT PopplerPSFile ##### -->
-<para>
-
-</para>
-
- at parent_instance: 
- at document: 
- at out: 
- at filename: 
- at first_page: 
- at last_page: 
- at paper_width: 
- at paper_height: 
- at duplex: 
-
-<!-- ##### ENUM PopplerBackend ##### -->
-<para>
-
-</para>
-
- at POPPLER_BACKEND_UNKNOWN: 
- at POPPLER_BACKEND_SPLASH: 
- at POPPLER_BACKEND_CAIRO: 
-
-<!-- ##### FUNCTION poppler_get_backend ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
-<!-- ##### FUNCTION poppler_get_version ##### -->
-<para>
-
-</para>
-
- at void: 
- at Returns: 
-
-
diff --git a/glib/reference/tmpl/stamp-poppler-enums.sgml b/glib/reference/tmpl/stamp-poppler-enums.sgml
deleted file mode 100644
index d1c7eec..0000000
--- a/glib/reference/tmpl/stamp-poppler-enums.sgml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-stamp-poppler-enums
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
diff --git a/gtk-doc.make b/gtk-doc.make
index 264a7cb..5574645 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -30,8 +30,9 @@ EXTRA_DIST = 				\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+DOC_STAMPS=scan-build.stamp sgml-build.stamp html-build.stamp pdf-build.stamp \
+	$(srcdir)/sgml.stamp $(srcdir)/html.stamp  \
+	$(srcdir)/pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -48,12 +49,23 @@ REPORT_FILES = \
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
 
 if ENABLE_GTK_DOC
-all-local: html-build.stamp
+if GTK_DOC_BUILD_HTML
+HTML_BUILD_STAMP=html-build.stamp
+else
+HTML_BUILD_STAMP=
+endif
+if GTK_DOC_BUILD_PDF
+PDF_BUILD_STAMP=pdf-build.stamp
+else
+PDF_BUILD_STAMP=
+endif
+
+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 else
 all-local:
 endif
 
-docs: html-build.stamp
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
@@ -62,8 +74,11 @@ $(REPORT_FILES): sgml-build.stamp
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  done ; \
+	  cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
@@ -77,27 +92,16 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  done ; \
+	  cd $(srcdir) && \
+	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -115,12 +119,31 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	if test "$(?)" = "0"; then \
 	  mkhtml_options=--path="$(srcdir)"; \
 	fi; \
-	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
 	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
+#### pdf ####
+
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building PDF'
+	@-chmod -R u+w $(srcdir)
+	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+	@mkpdf_imgdirs=""; \
+	if test "x$(HTML_IMAGES)" != "x"; then \
+	  for img in $(HTML_IMAGES); do \
+	    part=`dirname $$img`; \
+	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    if test $$? != 0; then \
+	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	    fi; \
+	  done; \
+	fi; \
+	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	@touch pdf-build.stamp
+
 ##############
 
 clean-local:
@@ -129,11 +152,11 @@ clean-local:
 
 distclean-local:
 	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) \
+	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
+	cd $(srcdir) && rm -rf html
 
 install-data-local:
 	@installfiles=`echo $(srcdir)/html/*`; \
@@ -179,10 +202,9 @@ dist-check-gtkdoc:
 endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	cp $(srcdir)/html/* $(distdir)/html
+	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
index ef01a82..2cfa1e7 100644
--- a/m4/gtk-doc.m4
+++ b/m4/gtk-doc.m4
@@ -48,7 +48,7 @@ AC_DEFUN([GTK_DOC_CHECK],
                      [build documentation in pdf format [[default=no]]]),,
       [enable_gtk_doc_pdf=no])
 
-  if test -n "$GTKDOC_MKPDF"; then
+  if test -z "$GTKDOC_MKPDF"; then
     enable_gtk_doc_pdf=no
   fi

More information about the poppler mailing list