2007-09-03 Carlos Garcia Campos <carlosgc@gnome.org>
* gtk-doc.make:
* glib/poppler-document.cc:
* glib/poppler-form-field.cc:
* glib/poppler-page.cc:
* glib/reference/poppler-docs.sgml:
* glib/reference/poppler-sections.txt:
* glib/reference/poppler.types:
* glib/reference/tmpl/poppler-action.sgml:
* glib/reference/tmpl/poppler-attachment.sgml:
* glib/reference/tmpl/poppler-document.sgml:
* glib/reference/tmpl/poppler-enums.sgml:
* glib/reference/tmpl/poppler-form-field.sgml:
* glib/reference/tmpl/poppler-page.sgml:
* glib/reference/tmpl/poppler-private.sgml:
* glib/reference/tmpl/poppler.sgml: Update glib bindings API
documentation.
diff --git a/ChangeLog b/ChangeLog
index 73944cb..73af24f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2007-09-03 Carlos Garcia Campos <carlosgc@gnome.org>
+
+ * gtk-doc.make:
+ * glib/poppler-document.cc:
+ * glib/poppler-form-field.cc:
+ * glib/poppler-page.cc:
+ * glib/reference/poppler-docs.sgml:
+ * glib/reference/poppler-sections.txt:
+ * glib/reference/poppler.types:
+ * glib/reference/tmpl/poppler-action.sgml:
+ * glib/reference/tmpl/poppler-attachment.sgml:
+ * glib/reference/tmpl/poppler-document.sgml:
+ * glib/reference/tmpl/poppler-enums.sgml:
+ * glib/reference/tmpl/poppler-form-field.sgml:
+ * glib/reference/tmpl/poppler-page.sgml:
+ * glib/reference/tmpl/poppler-private.sgml:
+ * glib/reference/tmpl/poppler.sgml: Update glib bindings API
+ documentation.
+
2007-09-02 Albert Astals Cid <aacid@kde.org>
* poppler/PDFDoc.cc: Don't enforce %%EOF at the end of file
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
index 2701231..700fe13 100644
--- a/glib/poppler-document.cc
+++ b/glib/poppler-document.cc
@@ -1407,6 +1407,16 @@
g_object_unref (ps_file);
}
+/**
+ * poppler_document_get_form_field:
+ * @document: a #PopplerDocument
+ * @id: an id of a #PopplerFormField
+ *
+ * Returns the #PopplerFormField for the given @id. It must be freed with
+ * g_object_unref()
+ *
+ * Return value: a new #PopplerFormField or NULL if not found
+ **/
PopplerFormField *
poppler_document_get_form_field (PopplerDocument *document,
gint id)
diff --git a/glib/poppler-form-field.cc b/glib/poppler-form-field.cc
index 113f41e..989fa4d 100644
--- a/glib/poppler-form-field.cc
+++ b/glib/poppler-form-field.cc
@@ -75,6 +75,14 @@
}
/* Public methods */
+/**
+ * poppler_form_field_get_field_type:
+ * @field: a #PopplerFormField
+ *
+ * Gets the type of @field
+ *
+ * Return value: #PopplerFormFieldType of @field
+ **/
PopplerFormFieldType
poppler_form_field_get_field_type (PopplerFormField *field)
{
@@ -95,6 +103,14 @@
return POPPLER_FORM_FIELD_UNKNOWN;
}
+/**
+ * poppler_form_field_get_id:
+ * @field: a #PopplerFormField
+ *
+ * Gets the id of @field
+ *
+ * Return value: the id of @field
+ **/
gint
poppler_form_field_get_id (PopplerFormField *field)
{
@@ -103,6 +119,14 @@
return field->widget->getID ();
}
+/**
+ * poppler_form_field_get_font_size
+ * @field: a #PopplerFormField
+ *
+ * Gets the font size of @field
+ *
+ * Return value: the font size of @field
+ **/
gdouble
poppler_form_field_get_font_size (PopplerFormField *field)
{
@@ -111,6 +135,14 @@
return field->widget->getFontSize ();
}
+/**
+ * poppler_form_field_is_read_only
+ * @field: a #PopplerFormField
+ *
+ * Checks whether @field is read only
+ *
+ * Return value: %TRUE if @field is read only
+ **/
gboolean
poppler_form_field_is_read_only (PopplerFormField *field)
{
@@ -120,6 +152,14 @@
}
/* Button Field */
+/**
+ * poppler_form_field_button_get_button_type
+ * @field: a #PopplerFormField
+ *
+ * Gets the button type of @field
+ *
+ * Return value: #PopplerFormButtonType of @field
+ **/
PopplerFormButtonType
poppler_form_field_button_get_button_type (PopplerFormField *field)
{
@@ -138,6 +178,15 @@
}
}
+/**
+ * poppler_form_field_button_get_state
+ * @field: a #PopplerFormField
+ *
+ * Queries a #PopplerFormField and returns its current state. Returns %TRUE if
+ * @field is pressed in and %FALSE if it is raised.
+ *
+ * Return value: current state of @field
+ **/
gboolean
poppler_form_field_button_get_state (PopplerFormField *field)
{
@@ -146,6 +195,14 @@
return static_cast<FormWidgetButton*>(field->widget)->getState ();
}
+/**
+ * poppler_form_field_button_set_state
+ * @field: a #PopplerFormField
+ * @state: %TRUE or %FALSE
+ *
+ * Sets the status of @field. Set to %TRUE if you want the #PopplerFormField
+ * to be 'pressed in', and %FALSE to raise it.
+ **/
void
poppler_form_field_button_set_state (PopplerFormField *field,
gboolean state)
@@ -156,6 +213,14 @@
}
/* Text Field */
+/**
+ * poppler_form_field_text_get_text_type:
+ * @field: a #PopplerFormField
+ *
+ * Gets the text type of @field.
+ *
+ * Return value: #PopplerFormTextType of @field
+ **/
PopplerFormTextType
poppler_form_field_text_get_text_type (PopplerFormField *field)
{
@@ -173,6 +238,14 @@
return POPPLER_FORM_TEXT_NORMAL;
}
+/**
+ * poppler_form_field_text_get_text:
+ * @field: a #PopplerFormField
+ *
+ * Retrieves the contents of @field.
+ *
+ * Return value: a new allocated string. It must be freed with g_free() when done.
+ **/
gchar *
poppler_form_field_text_get_text (PopplerFormField *field)
{
@@ -187,6 +260,13 @@
return tmp ? _poppler_goo_string_to_utf8 (tmp) : NULL;
}
+/**
+ * poppler_form_field_text_set_text:
+ * @field: a #PopplerFormField
+ * @text: the new text
+ *
+ * Sets the text in @field to the given value, replacing the current contents.
+ **/
void
poppler_form_field_text_set_text (PopplerFormField *field,
const gchar *text)
@@ -204,6 +284,14 @@
delete goo_tmp;
}
+/**
+ * poppler_form_field_text_get_max_len:
+ * @field: a #PopplerFormField
+ *
+ * Retrieves the maximum allowed length of the text in @field
+ *
+ * Return value: the maximum allowed number of characters in @field, or -1 if there is no maximum.
+ **/
gint
poppler_form_field_text_get_max_len (PopplerFormField *field)
{
@@ -212,6 +300,14 @@
return static_cast<FormWidgetText*>(field->widget)->getMaxLen ();
}
+/**
+ * poppler_form_field_text_do_spell_check:
+ * @field: a #PopplerFormField
+ *
+ * Checks whether spell checking should be done for the contents of @field
+ *
+ * Return value: %TRUE if spell checking should be done for @field
+ **/
gboolean
poppler_form_field_text_do_spell_check (PopplerFormField *field)
{
@@ -228,6 +324,14 @@
return !static_cast<FormWidgetText*>(field->widget)->noScroll ();
}
+/**
+ * poppler_form_field_text_is_rich_text:
+ * @field: a #PopplerFormField
+ *
+ * Checks whether the contents of @field are rich text
+ *
+ * Return value: %TRUE if the contents of @field are rich text
+ **/
gboolean
poppler_form_field_text_is_rich_text (PopplerFormField *field)
{
@@ -236,6 +340,14 @@
return static_cast<FormWidgetText*>(field->widget)->isRichText ();
}
+/**
+ * poppler_form_field_text_is_password:
+ * @field: a #PopplerFormField
+ *
+ * Checks whether content of @field is a password and it must be hidden
+ *
+ * Return value: %TRUE if the content of @field is a password
+ **/
gboolean
poppler_form_field_text_is_password (PopplerFormField *field)
{
@@ -245,6 +357,14 @@
}
/* Choice Field */
+/**
+ * poppler_form_field_choice_get_choice_type:
+ * @field: a #PopplerFormField
+ *
+ * Gets the choice type of @field
+ *
+ * Return value: #PopplerFormChoiceType of @field
+ **/
PopplerFormChoiceType
poppler_form_field_choice_get_choice_type (PopplerFormField *field)
{
@@ -256,6 +376,14 @@
return POPPLER_FORM_CHOICE_LIST;
}
+/**
+ * poppler_form_field_choice_is_editable:
+ * @field: a #PopplerFormField
+ *
+ * Checks whether @field is editable
+ *
+ * Return value: %TRUE if @field is editable
+ **/
gboolean
poppler_form_field_choice_is_editable (PopplerFormField *field)
{
@@ -264,6 +392,14 @@
return static_cast<FormWidgetChoice*>(field->widget)->hasEdit ();
}
+/**
+ * poppler_form_field_choice_can_select_multiple:
+ * @field: a #PopplerFormField
+ *
+ * Checks whether @field allows multiple choices to be selected
+ *
+ * Return value: %TRUE if @field allows multiple choices to be selected
+ **/
gboolean
poppler_form_field_choice_can_select_multiple (PopplerFormField *field)
{
@@ -272,6 +408,14 @@
return static_cast<FormWidgetChoice*>(field->widget)->isMultiSelect ();
}
+/**
+ * poppler_form_field_choice_do_spell_check:
+ * @field: a #PopplerFormField
+ *
+ * Checks whether spell checking should be done for the contents of @field
+ *
+ * Return value: %TRUE if spell checking should be done for @field
+ **/
gboolean
poppler_form_field_choice_do_spell_check (PopplerFormField *field)
{
@@ -288,6 +432,14 @@
return static_cast<FormWidgetChoice*>(field->widget)->commitOnSelChange ();
}
+/**
+ * poppler_form_field_choice_get_n_items:
+ * @field: a #PopplerFormField
+ *
+ * Returns the number of items on @field
+ *
+ * Return value: the number of items on @field
+ **/
gint
poppler_form_field_choice_get_n_items (PopplerFormField *field)
{
@@ -296,6 +448,15 @@
return static_cast<FormWidgetChoice*>(field->widget)->getNumChoices ();
}
+/**
+ * poppler_form_field_choice_get_item:
+ * @field: a #PopplerFormField
+ * @index: the index of the item
+ *
+ * Returns the contents of the item on @field at the given index
+ *
+ * Return value: a new allocated string. It must be freed with g_free() when done.
+ **/
gchar *
poppler_form_field_choice_get_item (PopplerFormField *field,
gint index)
@@ -308,6 +469,15 @@
return tmp ? _poppler_goo_string_to_utf8 (tmp) : NULL;
}
+/**
+ * poppler_form_field_choice_is_item_selected:
+ * @field: a #PopplerFormField
+ * @index: the index of the item
+ *
+ * Checks whether the item at the given index on @field is currently selected
+ *
+ * Return value: %TRUE if item at @index is currently selected
+ **/
gboolean
poppler_form_field_choice_is_item_selected (PopplerFormField *field,
gint index)
@@ -317,6 +487,13 @@
return static_cast<FormWidgetChoice*>(field->widget)->isSelected (index);
}
+/**
+ * poppler_form_field_choice_select_item:
+ * @field: a #PopplerFormField
+ * @index: the index of the item
+ *
+ * Selects the item at the given index on @field
+ **/
void
poppler_form_field_choice_select_item (PopplerFormField *field,
gint index)
@@ -326,6 +503,12 @@
static_cast<FormWidgetChoice*>(field->widget)->select (index);
}
+/**
+ * poppler_form_field_choice_unselect_all:
+ * @field: a #PopplerFormField
+ *
+ * Unselects all the items on @field
+ **/
void
poppler_form_field_choice_unselect_all (PopplerFormField *field)
{
@@ -334,6 +517,13 @@
static_cast<FormWidgetChoice*>(field->widget)->deselectAll ();
}
+/**
+ * poppler_form_field_choice_toggle_item:
+ * @field: a #PopplerFormField
+ * @index: the index of the item
+ *
+ * Changes the state of the item at the given index
+ **/
void
poppler_form_field_choice_toggle_item (PopplerFormField *field,
gint index)
@@ -343,6 +533,13 @@
static_cast<FormWidgetChoice*>(field->widget)->toggle (index);
}
+/**
+ * poppler_form_field_choice_toggle_item:
+ * @field: a #PopplerFormField
+ * @text: the new text
+ *
+ * Sets the text in @field to the given value, replacing the current contents
+ **/
void
poppler_form_field_choice_set_text (PopplerFormField *field,
const gchar *text)
@@ -360,6 +557,14 @@
delete goo_tmp;
}
+/**
+ * poppler_form_field_choice_get_text:
+ * @field: a #PopplerFormField
+ *
+ * Retrieves the contents of @field.
+ *
+ * Return value: a new allocated string. It must be freed with g_free() when done.
+ **/
gchar *
poppler_form_field_choice_get_text (PopplerFormField *field)
{
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index 753fb7c..438d408 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -443,7 +443,7 @@
#endif
/**
- * poppler_page_render:
+ * poppler_page_render_to_pixbuf:
* @page: the page to render from
* @src_x: x coordinate of upper left corner
* @src_y: y coordinate of upper left corner
@@ -515,6 +515,7 @@
* poppler_page_get_selection_region:
* @page: a #PopplerPage
* @scale: scale specified as pixels per point
+ * @style: a #PopplerSelectionStyle
* @selection: start and end point of selection as a rectangle
*
* Returns a region containing the area that would be rendered by
@@ -647,6 +648,7 @@
* @cairo: cairo context to render to
* @selection: start and end point of selection as a rectangle
* @old_selection: previous selection
+ * @style: a #PopplerSelectionStyle
* @glyph_color: color to use for drawing glyphs
* @background_color: color to use for the selection background
*
@@ -731,6 +733,7 @@
* @pixbuf: pixbuf to render to
* @selection: start and end point of selection as a rectangle
* @old_selection: previous selection
+ * @style: a #PopplerSelectionStyle
* @glyph_color: color to use for drawing glyphs
* @background_color: color to use for the selection background
*
@@ -895,11 +898,12 @@
/**
* poppler_page_get_text:
* @page: a #PopplerPage
- * @rect: the rectangle including the text
+ * @style: a #PopplerSelectionStyle
+ * @selection: the #PopplerRectangle including the text
*
- * Retrieves the contents of the specified rectangle as text
+ * Retrieves the contents of the specified @selection as text.
*
- * Return value: a pointer to the contents of the rectangle
+ * Return value: a pointer to the contents of the @selection
* as a string
**/
char *
diff --git a/glib/reference/poppler-docs.sgml b/glib/reference/poppler-docs.sgml
index ad6a163..103dd9c 100644
--- a/glib/reference/poppler-docs.sgml
+++ b/glib/reference/poppler-docs.sgml
@@ -12,6 +12,8 @@
<xi:include href="xml/poppler-document.xml"/>
<xi:include href="xml/poppler-page.xml"/>
<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"/>
</chapter>
</book>
diff --git a/glib/reference/poppler-sections.txt b/glib/reference/poppler-sections.txt
index 3b12ca9..fe0cb99 100644
--- a/glib/reference/poppler-sections.txt
+++ b/glib/reference/poppler-sections.txt
@@ -1,29 +1,55 @@
<SECTION>
<FILE>poppler-page</FILE>
+poppler_page_render
poppler_page_render_to_pixbuf
poppler_page_get_size
poppler_page_get_index
poppler_page_get_thumbnail
poppler_page_get_thumbnail_size
-poppler_page_find_text
poppler_page_render_to_ps
+poppler_page_find_text
poppler_page_get_text
+poppler_page_get_duration
+poppler_page_get_transition
poppler_page_get_link_mapping
poppler_page_free_link_mapping
+poppler_page_get_image_mapping
+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_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
<SUBSECTION Standard>
POPPLER_PAGE
POPPLER_IS_PAGE
@@ -39,10 +65,15 @@
PopplerViewerPreferences
PopplerPermissions
poppler_document_new_from_file
+poppler_document_new_from_data
poppler_document_save
poppler_document_get_n_pages
poppler_document_get_page
poppler_document_get_page_by_label
+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
@@ -90,8 +121,69 @@
POPPLER_TYPE_ACTION
POPPLER_ACTION
poppler_action_get_type
-poppler_action_free
poppler_action_copy
+poppler_action_free
+POPPLER_TYPE_DEST
+poppler_dest_get_type
+poppler_dest_copy
+poppler_dest_free
+</SECTION>
+
+<SECTION>
+<FILE>poppler-attachment</FILE>
+PopplerAttachment
+poppler_attachment_save
+poppler_attachment_save_to_callback
+PopplerAttachmentSaveFunc
+<SUBSECTION Standard>
+POPPLER_ATTACHMENT
+POPPLER_IS_ATTACHMENT
+POPPLER_TYPE_ATTACHMENT
+poppler_attachment_get_type
+</SECTION>
+</SECTION>
+
+<SECTION>
+<FILE>poppler-form-field</FILE>
+PopplerFormField
+PopplerFormButtonType
+PopplerFormChoiceType
+PopplerFormFieldType
+PopplerFormTextType
+poppler_form_field_get_id
+poppler_form_field_get_field_type
+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_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_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_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>
<SECTION>
@@ -110,6 +202,14 @@
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
@@ -128,6 +228,10 @@
PopplerIndexIter
PopplerFontsIter
PopplerRectangle
+PopplerSelectionStyle
+PopplerPageTransitionType
+PopplerPageTransitionAlignment
+PopplerPageTransitionDirection
PopplerLinkMapping
PopplerPage
PopplerFontInfo
diff --git a/glib/reference/poppler.types b/glib/reference/poppler.types
index b962a56..4e4bc33 100644
--- a/glib/reference/poppler.types
+++ b/glib/reference/poppler.types
@@ -2,3 +2,5 @@
poppler_document_get_type
poppler_page_get_type
+poppler_attachment_get_type
+poppler_form_field_get_type
diff --git a/glib/reference/tmpl/poppler-action.sgml b/glib/reference/tmpl/poppler-action.sgml
index e263365..ec32547 100644
--- a/glib/reference/tmpl/poppler-action.sgml
+++ b/glib/reference/tmpl/poppler-action.sgml
@@ -155,6 +155,15 @@
@Returns:
+<!-- ##### FUNCTION poppler_action_copy ##### -->
+<para>
+
+</para>
+
+@action:
+@Returns:
+
+
<!-- ##### FUNCTION poppler_action_free ##### -->
<para>
@@ -163,12 +172,35 @@
@action:
-<!-- ##### FUNCTION poppler_action_copy ##### -->
+<!-- ##### MACRO POPPLER_TYPE_DEST ##### -->
<para>
</para>
-@action:
+
+
+<!-- ##### FUNCTION poppler_dest_get_type ##### -->
+<para>
+
+</para>
+
@Returns:
+<!-- ##### FUNCTION poppler_dest_copy ##### -->
+<para>
+
+</para>
+
+@dest:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_dest_free ##### -->
+<para>
+
+</para>
+
+@dest:
+
+
diff --git a/glib/reference/tmpl/poppler-attachment.sgml b/glib/reference/tmpl/poppler-attachment.sgml
new file mode 100644
index 0000000..81dae97
--- /dev/null
+++ b/glib/reference/tmpl/poppler-attachment.sgml
@@ -0,0 +1,65 @@
+<!-- ##### SECTION Title ##### -->
+PopplerAttachment
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT PopplerAttachment ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION poppler_attachment_save ##### -->
+<para>
+
+</para>
+
+@attachment:
+@filename:
+@error:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_attachment_save_to_callback ##### -->
+<para>
+
+</para>
+
+@attachment:
+@save_func:
+@user_data:
+@error:
+@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
+@error and return %FALSE, in which case poppler_attachment_save_to_callback()
+will fail with the same error.
+</para>
+
+@buf: buffer containing bytes to be written.
+@count: number of bytes in @buf.
+@data: A location to return an error.
+@error: user data passed to poppler_attachment_save_to_callback()
+@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
index 29f9209..c453570 100644
--- a/glib/reference/tmpl/poppler-document.sgml
+++ b/glib/reference/tmpl/poppler-document.sgml
@@ -96,6 +96,18 @@
@Returns:
+<!-- ##### FUNCTION poppler_document_new_from_data ##### -->
+<para>
+
+</para>
+
+@data:
+@length:
+@password:
+@error:
+@Returns:
+
+
<!-- ##### FUNCTION poppler_document_save ##### -->
<para>
@@ -136,6 +148,44 @@
@Returns:
+<!-- ##### FUNCTION poppler_document_find_dest ##### -->
+<para>
+
+</para>
+
+@document:
+@link_name:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_document_has_attachments ##### -->
+<para>
+
+</para>
+
+@document:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_document_get_attachments ##### -->
+<para>
+
+</para>
+
+@document:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_document_get_form_field ##### -->
+<para>
+
+</para>
+
+@document:
+@id:
+@Returns:
+
+
<!-- ##### FUNCTION poppler_index_iter_get_type ##### -->
<para>
diff --git a/glib/reference/tmpl/poppler-enums.sgml b/glib/reference/tmpl/poppler-enums.sgml
index df7b007..b7841d7 100644
--- a/glib/reference/tmpl/poppler-enums.sgml
+++ b/glib/reference/tmpl/poppler-enums.sgml
@@ -122,6 +122,66 @@
@Returns:
+<!-- ##### MACRO POPPLER_TYPE_SELECTION_STYLE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_selection_style_get_type ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### MACRO POPPLER_TYPE_PAGE_TRANSITION_TYPE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_page_transition_type_get_type ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### MACRO POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_page_transition_alignment_get_type ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### MACRO POPPLER_TYPE_PAGE_TRANSITION_DIRECTION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION poppler_page_transition_direction_get_type ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
<!-- ##### MACRO POPPLER_TYPE_ERROR ##### -->
<para>
diff --git a/glib/reference/tmpl/poppler-form-field.sgml b/glib/reference/tmpl/poppler-form-field.sgml
new file mode 100644
index 0000000..38d0e9d
--- /dev/null
+++ b/glib/reference/tmpl/poppler-form-field.sgml
@@ -0,0 +1,315 @@
+<!-- ##### SECTION Title ##### -->
+PopplerFormField
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT PopplerFormField ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM PopplerFormButtonType ##### -->
+<para>
+
+</para>
+
+@POPPLER_FORM_BUTTON_PUSH:
+@POPPLER_FORM_BUTTON_CHECK:
+@POPPLER_FORM_BUTTON_RADIO:
+
+<!-- ##### ENUM PopplerFormChoiceType ##### -->
+<para>
+
+</para>
+
+@POPPLER_FORM_CHOICE_COMBO:
+@POPPLER_FORM_CHOICE_LIST:
+
+<!-- ##### ENUM PopplerFormFieldType ##### -->
+<para>
+
+</para>
+
+@POPPLER_FORM_FIELD_UNKNOWN:
+@POPPLER_FORM_FIELD_BUTTON:
+@POPPLER_FORM_FIELD_TEXT:
+@POPPLER_FORM_FIELD_CHOICE:
+@POPPLER_FORM_FIELD_SIGNATURE:
+
+<!-- ##### ENUM PopplerFormTextType ##### -->
+<para>
+
+</para>
+
+@POPPLER_FORM_TEXT_NORMAL:
+@POPPLER_FORM_TEXT_MULTILINE:
+@POPPLER_FORM_TEXT_FILE_SELECT:
+
+<!-- ##### FUNCTION poppler_form_field_get_id ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_get_field_type ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_is_read_only ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_get_font_size ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_button_get_button_type ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_button_get_state ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_button_set_state ##### -->
+<para>
+
+</para>
+
+@field:
+@state:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_can_select_multiple ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_commit_on_change ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_do_spell_check ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_get_choice_type ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_get_item ##### -->
+<para>
+
+</para>
+
+@field:
+@index:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_get_n_items ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_get_text ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_is_editable ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_is_item_selected ##### -->
+<para>
+
+</para>
+
+@field:
+@index:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_select_item ##### -->
+<para>
+
+</para>
+
+@field:
+@index:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_set_text ##### -->
+<para>
+
+</para>
+
+@field:
+@text:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_toggle_item ##### -->
+<para>
+
+</para>
+
+@field:
+@index:
+
+
+<!-- ##### FUNCTION poppler_form_field_choice_unselect_all ##### -->
+<para>
+
+</para>
+
+@field:
+
+
+<!-- ##### FUNCTION poppler_form_field_text_do_scroll ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_text_do_spell_check ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_text_get_max_len ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_text_get_text ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_text_get_text_type ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_text_is_password ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_text_is_rich_text ##### -->
+<para>
+
+</para>
+
+@field:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_text_set_text ##### -->
+<para>
+
+</para>
+
+@field:
+@text:
+
+
diff --git a/glib/reference/tmpl/poppler-page.sgml b/glib/reference/tmpl/poppler-page.sgml
index e859e80..a708da1 100644
--- a/glib/reference/tmpl/poppler-page.sgml
+++ b/glib/reference/tmpl/poppler-page.sgml
@@ -17,6 +17,15 @@
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### FUNCTION poppler_page_render ##### -->
+<para>
+
+</para>
+
+@page:
+@cairo:
+
+
<!-- ##### FUNCTION poppler_page_render_to_pixbuf ##### -->
<para>
@@ -71,6 +80,15 @@
@Returns:
+<!-- ##### FUNCTION poppler_page_render_to_ps ##### -->
+<para>
+
+</para>
+
+@page:
+@ps_file:
+
+
<!-- ##### FUNCTION poppler_page_find_text ##### -->
<para>
@@ -81,25 +99,35 @@
@Returns:
-<!-- ##### FUNCTION poppler_page_render_to_ps ##### -->
-<para>
-
-</para>
-
-@page:
-@ps_file:
-
-
<!-- ##### FUNCTION poppler_page_get_text ##### -->
<para>
</para>
@page:
+@style:
@rect:
@Returns:
+<!-- ##### FUNCTION poppler_page_get_duration ##### -->
+<para>
+
+</para>
+
+@page:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_page_get_transition ##### -->
+<para>
+
+</para>
+
+@page:
+@Returns:
+
+
<!-- ##### FUNCTION poppler_page_get_link_mapping ##### -->
<para>
@@ -117,6 +145,40 @@
@list:
+<!-- ##### FUNCTION poppler_page_get_image_mapping ##### -->
+<para>
+
+</para>
+
+@page:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_page_free_image_mapping ##### -->
+<para>
+
+</para>
+
+@list:
+
+
+<!-- ##### FUNCTION poppler_page_get_form_field_mapping ##### -->
+<para>
+
+</para>
+
+@page:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_page_free_form_field_mapping ##### -->
+<para>
+
+</para>
+
+@list:
+
+
<!-- ##### FUNCTION poppler_page_get_selection_region ##### -->
<para>
@@ -124,6 +186,7 @@
@page:
@scale:
+@style:
@selection:
@Returns:
@@ -142,6 +205,22 @@
@background_color:
+<!-- ##### FUNCTION poppler_page_render_selection_to_pixbuf ##### -->
+<para>
+
+</para>
+
+@page:
+@scale:
+@rotation:
+@pixbuf:
+@selection:
+@old_selection:
+@style:
+@glyph_color:
+@background_color:
+
+
<!-- ##### MACRO POPPLER_TYPE_RECTANGLE ##### -->
<para>
@@ -192,6 +271,59 @@
@rectangle:
+<!-- ##### MACRO POPPLER_TYPE_PAGE_TRANSITION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT PopplerPageTransition ##### -->
+<para>
+
+</para>
+
+@type:
+@alignment:
+@direction:
+@duration:
+@angle:
+@scale:
+@rectangular:
+
+<!-- ##### FUNCTION poppler_page_transition_get_type ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_page_transition_new ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_page_transition_copy ##### -->
+<para>
+
+</para>
+
+@transition:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_page_transition_free ##### -->
+<para>
+
+</para>
+
+@transition:
+
+
<!-- ##### MACRO POPPLER_TYPE_LINK_MAPPING ##### -->
<para>
@@ -240,3 +372,99 @@
@mapping:
+<!-- ##### MACRO POPPLER_TYPE_IMAGE_MAPPING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT PopplerImageMapping ##### -->
+<para>
+
+</para>
+
+@area:
+@image:
+
+<!-- ##### FUNCTION poppler_image_mapping_get_type ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_image_mapping_new ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_image_mapping_copy ##### -->
+<para>
+
+</para>
+
+@mapping:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_image_mapping_free ##### -->
+<para>
+
+</para>
+
+@mapping:
+
+
+<!-- ##### MACRO POPPLER_TYPE_FORM_FIELD_MAPPING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT PopplerFormFieldMapping ##### -->
+<para>
+
+</para>
+
+@area:
+@field:
+
+<!-- ##### FUNCTION poppler_form_field_mapping_get_type ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_mapping_new ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_mapping_copy ##### -->
+<para>
+
+</para>
+
+@mapping:
+@Returns:
+
+
+<!-- ##### FUNCTION poppler_form_field_mapping_free ##### -->
+<para>
+
+</para>
+
+@mapping:
+
+
diff --git a/glib/reference/tmpl/poppler-private.sgml b/glib/reference/tmpl/poppler-private.sgml
index 4ffccd3..001b34e 100644
--- a/glib/reference/tmpl/poppler-private.sgml
+++ b/glib/reference/tmpl/poppler-private.sgml
@@ -53,6 +53,11 @@
</para>
+<!-- ##### ARG PopplerDocument:metadata ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG PopplerDocument:mod-date ##### -->
<para>
@@ -113,6 +118,7 @@
</para>
+@parent_instance:
@document:
@scanner:
diff --git a/glib/reference/tmpl/poppler.sgml b/glib/reference/tmpl/poppler.sgml
index 96a2d39..2d5c163 100644
--- a/glib/reference/tmpl/poppler.sgml
+++ b/glib/reference/tmpl/poppler.sgml
@@ -86,6 +86,11 @@
</para>
+<!-- ##### ARG PopplerDocument:metadata ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG PopplerDocument:mod-date ##### -->
<para>
@@ -148,6 +153,49 @@
@x2:
@y2:
+<!-- ##### ENUM PopplerSelectionStyle ##### -->
+<para>
+
+</para>
+
+@POPPLER_SELECTION_GLYPH:
+@POPPLER_SELECTION_WORD:
+@POPPLER_SELECTION_LINE:
+
+<!-- ##### ENUM PopplerPageTransitionType ##### -->
+<para>
+
+</para>
+
+@POPPLER_PAGE_TRANSITION_REPLACE:
+@POPPLER_PAGE_TRANSITION_SPLIT:
+@POPPLER_PAGE_TRANSITION_BLINDS:
+@POPPLER_PAGE_TRANSITION_BOX:
+@POPPLER_PAGE_TRANSITION_WIPE:
+@POPPLER_PAGE_TRANSITION_DISSOLVE:
+@POPPLER_PAGE_TRANSITION_GLITTER:
+@POPPLER_PAGE_TRANSITION_FLY:
+@POPPLER_PAGE_TRANSITION_PUSH:
+@POPPLER_PAGE_TRANSITION_COVER:
+@POPPLER_PAGE_TRANSITION_UNCOVER:
+@POPPLER_PAGE_TRANSITION_FADE:
+
+<!-- ##### ENUM PopplerPageTransitionAlignment ##### -->
+<para>
+
+</para>
+
+@POPPLER_PAGE_TRANSITION_HORIZONTAL:
+@POPPLER_PAGE_TRANSITION_VERTICAL:
+
+<!-- ##### ENUM PopplerPageTransitionDirection ##### -->
+<para>
+
+</para>
+
+@POPPLER_PAGE_TRANSITION_INWARD:
+@POPPLER_PAGE_TRANSITION_OUTWARD:
+
<!-- ##### STRUCT PopplerLinkMapping ##### -->
<para>
@@ -172,6 +220,7 @@
</para>
+@parent_instance:
@document:
@scanner:
diff --git a/gtk-doc.make b/gtk-doc.make
index 91cdd34..7f3a73a 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -42,12 +42,19 @@
if ENABLE_GTK_DOC
all-local: html-build.stamp
+else
+all-local:
+endif
+
+docs: html-build.stamp
#### scan ####
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo '*** Scanning header files ***'
+ @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)
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
@@ -56,17 +63,15 @@
test -f $$i || touch $$i ; \
done \
fi
- cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+$(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 '*** Rebuilding template files ***'
+ @echo 'gtk-doc: Rebuilding template files'
@-chmod -R u+w $(srcdir)
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
touch tmpl-build.stamp
@@ -76,11 +81,11 @@
#### xml ####
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo '*** Building XML ***'
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(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)" $(MKDB_OPTIONS)
+ 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)
touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@@ -89,18 +94,15 @@
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo '*** Building HTML ***'
+ @echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo '-- Fixing Crossreferences'
+ @echo 'gtk-doc: Fixing cross-references'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
-else
-all-local:
-endif
##############
@@ -109,7 +111,7 @@
rm -rf .libs
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt $(DOC_MODULE)-undocumented.txt $(DOC_MODULE)-undeclared.txt
install-data-local:
installfiles=`echo $(srcdir)/html/*`; \
@@ -145,9 +147,9 @@
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
- -cp $(srcdir)/html/* $(distdir)/html
+ cp $(srcdir)/html/* $(distdir)/html
if test -f $(srcdir)/$(DOC_MODULE).types; then \
cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
fi
-.PHONY : dist-hook-local
+.PHONY : dist-hook-local docs
