adg-adim.h		adg-adim.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_ADIM_H__		#ifndef __ADG_ADIM_H__
	#define __ADG_ADIM_H__		#define __ADG_ADIM_H__
	#include <adg/adg-dim.h>		#include "adg-dim.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_ADIM (adg_adim_get_type())		#define ADG_TYPE_ADIM (adg_adim_get_type())
	#define ADG_ADIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_ADIM, AdgADim))		#define ADG_ADIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_ADIM, AdgADim))
	#define ADG_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_ADIM, AdgADimClass))		#define ADG_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_ADIM, AdgADimClass))
	#define ADG_IS_ADIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_ADIM))		#define ADG_IS_ADIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_ADIM))
	#define ADG_IS_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_ADIM))		#define ADG_IS_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_ADIM))
	#define ADG_ADIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_ADIM, AdgADimClass))		#define ADG_ADIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_ADIM, AdgADimClass))
	skipping to change at line 75		skipping to change at line 75
	gdouble org2_x,		gdouble org2_x,
	gdouble org2_y,		gdouble org2_y,
	gdouble pos_x,		gdouble pos_x,
	gdouble pos_y);		gdouble pos_y);
	AdgADim * adg_adim_new_full_from_model (AdgModel *model,		AdgADim * adg_adim_new_full_from_model (AdgModel *model,
	const gchar *ref1,		const gchar *ref1,
	const gchar *ref2,		const gchar *ref2,
	const gchar *org1,		const gchar *org1,
	const gchar *org2,		const gchar *org2,
	const gchar *pos);		const gchar *pos);
			void adg_adim_set_org1 (AdgADim *adim,
	void adg_adim_set_org (AdgADim *adim,		const AdgPoint *org1);
	const AdgPair *org1,		void adg_adim_set_org1_explicit (AdgADim *adim,
			gdouble x,
			gdouble y);
			void adg_adim_set_org1_from_pair (AdgADim *adim,
			const AdgPair *org1);
			void adg_adim_set_org1_from_model (AdgADim *adim,
			AdgModel *model,
			const gchar *org1);
			AdgPoint * adg_adim_get_org1 (AdgADim *adim);
			void adg_adim_set_org2 (AdgADim *adim,
			const AdgPoint *org2);
			void adg_adim_set_org2_explicit (AdgADim *adim,
			gdouble x,
			gdouble y);
			void adg_adim_set_org2_from_pair (AdgADim *adim,
	const AdgPair *org2);		const AdgPair *org2);
	void adg_adim_set_org_explicit (AdgADim *adim,		void adg_adim_set_org2_from_model (AdgADim *adim,
	gdouble org1_x,
	gdouble org1_y,
	gdouble org2_x,
	gdouble org2_y);
	void adg_adim_set_org_from_model (AdgADim *adim,
	AdgModel *model,		AdgModel *model,
	const gchar *org1,
	const gchar *org2);		const gchar *org2);
	const AdgPair * adg_adim_get_org1 (AdgADim *adim);		AdgPoint * adg_adim_get_org2 (AdgADim *adim);
	const AdgPair * adg_adim_get_org2 (AdgADim *adim);
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_ADIM_H__ */		#endif /* __ADG_ADIM_H__ */
End of changes. 6 change blocks.
	14 lines changed or deleted		21 lines changed or added

	adg-alignment.h		adg-alignment.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_ALIGNMENT_H__		#ifndef __ADG_ALIGNMENT_H__
	#define __ADG_ALIGNMENT_H__		#define __ADG_ALIGNMENT_H__
	#include <adg/adg-container.h>		#include "adg-container.h"
	#include <adg/adg-pair.h>		#include "adg-pair.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_ALIGNMENT (adg_alignment_get_type())		#define ADG_TYPE_ALIGNMENT (adg_alignment_get_type())
	#define ADG_ALIGNMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A DG_TYPE_ALIGNMENT, AdgAlignment))		#define ADG_ALIGNMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A DG_TYPE_ALIGNMENT, AdgAlignment))
	#define ADG_ALIGNMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD G_TYPE_ALIGNMENT, AdgAlignmentClass))		#define ADG_ALIGNMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD G_TYPE_ALIGNMENT, AdgAlignmentClass))
	#define ADG_IS_ALIGNMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A DG_TYPE_ALIGNMENT))		#define ADG_IS_ALIGNMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A DG_TYPE_ALIGNMENT))
	#define ADG_IS_ALIGNMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD G_TYPE_ALIGNMENT))		#define ADG_IS_ALIGNMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD G_TYPE_ALIGNMENT))
	#define ADG_ALIGNMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD G_TYPE_ALIGNMENT, AdgAlignmentClass))		#define ADG_ALIGNMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD G_TYPE_ALIGNMENT, AdgAlignmentClass))
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added

	adg-arrow.h		adg-arrow.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_ARROW_H__		#ifndef __ADG_ARROW_H__
	#define __ADG_ARROW_H__		#define __ADG_ARROW_H__
	#include <adg/adg-marker.h>		#include "adg-marker.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_ARROW (adg_arrow_get_type())		#define ADG_TYPE_ARROW (adg_arrow_get_type())
	#define ADG_ARROW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_ARROW, AdgArrow))		#define ADG_ARROW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_ARROW, AdgArrow))
	#define ADG_ARROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_ARROW, AdgArrowClass))		#define ADG_ARROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_ARROW, AdgArrowClass))
	#define ADG_IS_ARROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_ARROW))		#define ADG_IS_ARROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_ARROW))
	#define ADG_IS_ARROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_ARROW))		#define ADG_IS_ARROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_ARROW))
	#define ADG_ARROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_ARROW, AdgArrowClass))		#define ADG_ARROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_ARROW, AdgArrowClass))
	skipping to change at line 54		skipping to change at line 54
	gpointer data;		gpointer data;
	};		};
	struct _AdgArrowClass {		struct _AdgArrowClass {
	/*< private >*/		/*< private >*/
	AdgMarkerClass parent_class;		AdgMarkerClass parent_class;
	};		};
	GType adg_arrow_get_type (void) G_GNUC_CONST;		GType adg_arrow_get_type (void) G_GNUC_CONST;
			AdgArrow * adg_arrow_new (void);
			AdgArrow * adg_arrow_new_with_trail (AdgTrail *trail,
			gdouble pos);
	void adg_arrow_set_angle (AdgArrow *arrow,		void adg_arrow_set_angle (AdgArrow *arrow,
	gdouble angle);		gdouble angle);
	gdouble adg_arrow_get_angle (AdgArrow *arrow);		gdouble adg_arrow_get_angle (AdgArrow *arrow);
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_ARROW_H__ */		#endif /* __ADG_ARROW_H__ */
End of changes. 3 change blocks.
	2 lines changed or deleted		5 lines changed or added

	adg-canvas.h		adg-canvas.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_CANVAS_H__		#ifndef __ADG_CANVAS_H__
	#define __ADG_CANVAS_H__		#define __ADG_CANVAS_H__
	#include <adg/adg-container.h>		#include "adg-container.h"
	#include <adg/adg-style.h>		#include "adg-title-block.h"
			#include "adg-style.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_CANVAS (adg_canvas_get_type())		#define ADG_TYPE_CANVAS (adg_canvas_get_type())
	#define ADG_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_CANVAS, AdgCanvas))		#define ADG_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_CANVAS, AdgCanvas))
	#define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_CANVAS, AdgCanvasClass))		#define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_CANVAS, AdgCanvasClass))
	#define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_CANVAS))		#define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_CANVAS))
	#define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_CANVAS))		#define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_CANVAS))
	#define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_CANVAS, AdgCanvasClass))		#define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_CANVAS, AdgCanvasClass))
	skipping to change at line 56		skipping to change at line 57
	/*< private >*/		/*< private >*/
	AdgContainer parent;		AdgContainer parent;
	gpointer data;		gpointer data;
	};		};
	struct _AdgCanvasClass {		struct _AdgCanvasClass {
	/*< private >*/		/*< private >*/
	AdgContainerClass parent_class;		AdgContainerClass parent_class;
	};		};
	GType adg_canvas_get_type (void) G_GNUC_CONST ;		GType adg_canvas_get_type (void) G_GNUC_CONST;
	AdgCanvas * adg_canvas_new (void);		AdgCanvas * adg_canvas_new (void);
			void adg_canvas_set_background_dress (AdgCanvas *canvas,
			AdgDress dress);
			AdgDress adg_canvas_get_background_dress (AdgCanvas *canvas);
			void adg_canvas_set_frame_dress (AdgCanvas *canvas,
			AdgDress dress);
			AdgDress adg_canvas_get_frame_dress (AdgCanvas *canvas);
			void adg_canvas_set_title_block (AdgCanvas *canvas,
			AdgTitleBlock *title_bloc
			k);
			AdgTitleBlock * adg_canvas_get_title_block (AdgCanvas *canvas);
			void adg_canvas_set_top_margin (AdgCanvas *canvas,
			gdouble value);
			gdouble adg_canvas_get_top_margin (AdgCanvas *canvas);
			void adg_canvas_set_right_margin (AdgCanvas *canvas,
			gdouble value);
			gdouble adg_canvas_get_right_margin (AdgCanvas *canvas);
			void adg_canvas_set_bottom_margin (AdgCanvas *canvas,
			gdouble value);
			gdouble adg_canvas_get_bottom_margin (AdgCanvas *canvas);
			void adg_canvas_set_left_margin (AdgCanvas *canvas,
			gdouble value);
			gdouble adg_canvas_get_left_margin (AdgCanvas *canvas);
			void adg_canvas_set_margins (AdgCanvas *canvas,
			gdouble top,
			gdouble right,
			gdouble bottom,
			gdouble left);
			void adg_canvas_switch_frame (AdgCanvas *canvas,
			gboolean new_state)
			;
			gboolean adg_canvas_has_frame (AdgCanvas *canvas);
			void adg_canvas_set_top_padding (AdgCanvas *canvas,
			gdouble value);
			gdouble adg_canvas_get_top_padding (AdgCanvas *canvas);
			void adg_canvas_set_right_padding (AdgCanvas *canvas,
			gdouble value);
			gdouble adg_canvas_get_right_padding (AdgCanvas *canvas);
			void adg_canvas_set_bottom_padding (AdgCanvas *canvas,
			gdouble value);
			gdouble adg_canvas_get_bottom_padding (AdgCanvas *canvas);
			void adg_canvas_set_left_padding (AdgCanvas *canvas,
			gdouble value);
			gdouble adg_canvas_get_left_padding (AdgCanvas *canvas);
			void adg_canvas_set_paddings (AdgCanvas *canvas,
			gdouble top,
			gdouble right,
			gdouble bottom,
			gdouble left);
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_CANVAS_H__ */		#endif /* __ADG_CANVAS_H__ */
End of changes. 4 change blocks.
	5 lines changed or deleted		54 lines changed or added

	adg-color-style.h		adg-color-style.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_COLOR_STYLE_H__		#ifndef __ADG_COLOR_STYLE_H__
	#define __ADG_COLOR_STYLE_H__		#define __ADG_COLOR_STYLE_H__
	#include <adg/adg-style.h>		#include "adg-style.h"
	#include <adg/adg-enums.h>		#include "adg-enums.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_COLOR_STYLE (adg_color_style_get_type())		#define ADG_TYPE_COLOR_STYLE (adg_color_style_get_type())
	#define ADG_COLOR_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_COLOR_STYLE, AdgColorStyle))		#define ADG_COLOR_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_COLOR_STYLE, AdgColorStyle))
	#define ADG_COLOR_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE_COLOR_STYLE, AdgColorStyleClass))		#define ADG_COLOR_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE_COLOR_STYLE, AdgColorStyleClass))
	#define ADG_IS_COLOR_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_COLOR_STYLE))		#define ADG_IS_COLOR_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_COLOR_STYLE))
	#define ADG_IS_COLOR_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE_COLOR_STYLE))		#define ADG_IS_COLOR_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE_COLOR_STYLE))
	#define ADG_COLOR_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE_COLOR_STYLE, AdgColorStyleClass))		#define ADG_COLOR_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE_COLOR_STYLE, AdgColorStyleClass))
	skipping to change at line 56		skipping to change at line 56
	};		};
	struct _AdgColorStyleClass {		struct _AdgColorStyleClass {
	/*< private >*/		/*< private >*/
	AdgStyleClass parent_class;		AdgStyleClass parent_class;
	};		};
	GType adg_color_style_get_type (void) G_GNUC_CONST;		GType adg_color_style_get_type (void) G_GNUC_CONST;
	AdgColorStyle * adg_color_style_new (void);		AdgColorStyle * adg_color_style_new (void);
			void adg_color_style_set_red (AdgColorStyle *color_styl
			e,
			gdouble red);
			gdouble adg_color_style_get_red (AdgColorStyle *color_styl
			e);
			void adg_color_style_set_green (AdgColorStyle *color_styl
			e,
			gdouble green);
			gdouble adg_color_style_get_green (AdgColorStyle *color_styl
			e);
			void adg_color_style_set_blue (AdgColorStyle *color_styl
			e,
			gdouble blue);
			gdouble adg_color_style_get_blue (AdgColorStyle *color_styl
			e);
	void adg_color_style_set_rgb (AdgColorStyle *color_styl e,		void adg_color_style_set_rgb (AdgColorStyle *color_styl e,
	gdouble r,		gdouble red,
	gdouble g,		gdouble green,
	gdouble b);		gdouble blue);
	void adg_color_style_put_rgb (AdgColorStyle *color_styl e,		void adg_color_style_put_rgb (AdgColorStyle *color_styl e,
	gdouble *r,		gdouble *red,
	gdouble *g,		gdouble *green,
	gdouble *b);		gdouble *blue);
	void adg_color_style_set_alpha (AdgColorStyle *color_styl e,		void adg_color_style_set_alpha (AdgColorStyle *color_styl e,
	gdouble alpha);		gdouble alpha);
	gdouble adg_color_style_get_alpha (AdgColorStyle *color_styl e);		gdouble adg_color_style_get_alpha (AdgColorStyle *color_styl e);
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_COLOR_STYLE_H__ */		#endif /* __ADG_COLOR_STYLE_H__ */
End of changes. 5 change blocks.
	9 lines changed or deleted		24 lines changed or added

	adg-container.h		adg-container.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_CONTAINER_H__		#ifndef __ADG_CONTAINER_H__
	#define __ADG_CONTAINER_H__		#define __ADG_CONTAINER_H__
	#include <adg/adg-entity.h>		#include "adg-entity.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_CONTAINER (adg_container_get_type())		#define ADG_TYPE_CONTAINER (adg_container_get_type())
	#define ADG_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A DG_TYPE_CONTAINER, AdgContainer))		#define ADG_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A DG_TYPE_CONTAINER, AdgContainer))
	#define ADG_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD G_TYPE_CONTAINER, AdgContainerClass))		#define ADG_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD G_TYPE_CONTAINER, AdgContainerClass))
	#define ADG_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A DG_TYPE_CONTAINER))		#define ADG_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A DG_TYPE_CONTAINER))
	#define ADG_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD G_TYPE_CONTAINER))		#define ADG_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD G_TYPE_CONTAINER))
	#define ADG_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD G_TYPE_CONTAINER, AdgContainerClass))		#define ADG_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD G_TYPE_CONTAINER, AdgContainerClass))
	skipping to change at line 53		skipping to change at line 53
	AdgEntity parent;		AdgEntity parent;
	gpointer data;		gpointer data;
	};		};
	struct _AdgContainerClass {		struct _AdgContainerClass {
	/*< private >*/		/*< private >*/
	AdgEntityClass parent_class;		AdgEntityClass parent_class;
	/*< public >*/		/*< public >*/
	/* Virtual Table */		/* Virtual Table */
	GSList * (*get_children) (AdgContainer *container) ;		GSList * (*children) (AdgContainer *container) ;
	void (*add) (AdgContainer *container,		void (*add) (AdgContainer *container,
	AdgEntity *entity);		AdgEntity *entity);
	void (*remove) (AdgContainer *container,		void (*remove) (AdgContainer *container,
	AdgEntity *entity);		AdgEntity *entity);
	};		};
	GType adg_container_get_type (void) G_GNUC_CONST;		GType adg_container_get_type (void) G_GNUC_CONST;
	AdgContainer * adg_container_new (void);		AdgContainer * adg_container_new (void);
	GSList * adg_container_get_children (AdgContainer *container );		GSList * adg_container_children (AdgContainer *container );
	void adg_container_add (AdgContainer *container ,		void adg_container_add (AdgContainer *container ,
	AdgEntity *entity);		AdgEntity *entity);
	void adg_container_remove (AdgContainer *container ,		void adg_container_remove (AdgContainer *container ,
	AdgEntity *entity);		AdgEntity *entity);
	void adg_container_foreach (AdgContainer *container ,		void adg_container_foreach (AdgContainer *container ,
	GCallback callback,		GCallback callback,
	gpointer user_data );		gpointer user_data );
	void adg_container_propagate (AdgContainer *container ,		void adg_container_propagate (AdgContainer *container ,
	guint signal_id ,		guint signal_id ,
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	adg-dim-style.h		adg-dim-style.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_DIM_STYLE_H__		#ifndef __ADG_DIM_STYLE_H__
	#define __ADG_DIM_STYLE_H__		#define __ADG_DIM_STYLE_H__
	#include <adg/adg-style.h>		#include "adg-style.h"
	#include <adg/adg-dress.h>		#include "adg-dress.h"
	#include <adg/adg-marker.h>		#include "adg-marker.h"
	#include <adg/adg-pair.h>		#include "adg-pair.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_DIM_STYLE (adg_dim_style_get_type())		#define ADG_TYPE_DIM_STYLE (adg_dim_style_get_type())
	#define ADG_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A DG_TYPE_DIM_STYLE, AdgDimStyle))		#define ADG_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A DG_TYPE_DIM_STYLE, AdgDimStyle))
	#define ADG_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD G_TYPE_DIM_STYLE, AdgDimStyleClass))		#define ADG_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD G_TYPE_DIM_STYLE, AdgDimStyleClass))
	#define ADG_IS_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A DG_TYPE_DIM_STYLE))		#define ADG_IS_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A DG_TYPE_DIM_STYLE))
	#define ADG_IS_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD G_TYPE_DIM_STYLE))		#define ADG_IS_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD G_TYPE_DIM_STYLE))
	#define ADG_DIM_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD G_TYPE_DIM_STYLE, AdgDimStyleClass))		#define ADG_DIM_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD G_TYPE_DIM_STYLE, AdgDimStyleClass))
	skipping to change at line 56		skipping to change at line 56
	AdgStyle parent;		AdgStyle parent;
	gpointer data;		gpointer data;
	};		};
	struct _AdgDimStyleClass {		struct _AdgDimStyleClass {
	/*< private >*/		/*< private >*/
	AdgStyleClass parent_class;		AdgStyleClass parent_class;
	};		};
	GType adg_dim_style_get_type (void) G_GNUC_CONST;		GType adg_dim_style_get_type (void) G_GNUC_CONST;
	AdgStyle * adg_dim_style_new (void);		AdgDimStyle * adg_dim_style_new (void);
			void adg_dim_style_set_marker1 (AdgDimStyle *dim_style,
	AdgMarker * adg_dim_style_marker1_new (AdgDimStyle *dim_style)
	;
	AdgMarker * adg_dim_style_marker2_new (AdgDimStyle *dim_style)
	;
	void adg_dim_style_use_marker1 (AdgDimStyle *dim_style,
	AdgMarker *marker);		AdgMarker *marker);
	void adg_dim_style_use_marker2 (AdgDimStyle *dim_style,		AdgMarker * adg_dim_style_marker1_new (AdgDimStyle *dim_style)
			;
			void adg_dim_style_set_marker2 (AdgDimStyle *dim_style,
	AdgMarker *marker);		AdgMarker *marker);
			AdgMarker * adg_dim_style_marker2_new (AdgDimStyle *dim_style) ;
	void adg_dim_style_set_color_dress (AdgDimStyle *dim_style,		void adg_dim_style_set_color_dress (AdgDimStyle *dim_style,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_dim_style_get_color_dress (AdgDimStyle *dim_style) ;		AdgDress adg_dim_style_get_color_dress (AdgDimStyle *dim_style) ;
	void adg_dim_style_set_value_dress (AdgDimStyle *dim_style,		void adg_dim_style_set_value_dress (AdgDimStyle *dim_style,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_dim_style_get_value_dress (AdgDimStyle *dim_style) ;		AdgDress adg_dim_style_get_value_dress (AdgDimStyle *dim_style) ;
	void adg_dim_style_set_min_dress (AdgDimStyle *dim_style,		void adg_dim_style_set_min_dress (AdgDimStyle *dim_style,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_dim_style_get_min_dress (AdgDimStyle *dim_style) ;		AdgDress adg_dim_style_get_min_dress (AdgDimStyle *dim_style) ;
	void adg_dim_style_set_max_dress (AdgDimStyle *dim_style,		void adg_dim_style_set_max_dress (AdgDimStyle *dim_style,
End of changes. 5 change blocks.
	13 lines changed or deleted		11 lines changed or added

	adg-dim.h		adg-dim.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_DIM_H__		#ifndef __ADG_DIM_H__
	#define __ADG_DIM_H__		#define __ADG_DIM_H__
	#include <adg/adg-alignment.h>		#include "adg-point.h"
	#include <adg/adg-model.h>		#include "adg-alignment.h"
	#include <adg/adg-enums.h>		#include "adg-model.h"
			#include "adg-enums.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_DIM (adg_dim_get_type())		#define ADG_TYPE_DIM (adg_dim_get_type())
	#define ADG_DIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYP E_DIM, AdgDim))		#define ADG_DIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYP E_DIM, AdgDim))
	#define ADG_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE _DIM, AdgDimClass))		#define ADG_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE _DIM, AdgDimClass))
	#define ADG_IS_DIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYP E_DIM))		#define ADG_IS_DIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYP E_DIM))
	#define ADG_IS_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE _DIM))		#define ADG_IS_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE _DIM))
	#define ADG_DIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE _DIM, AdgDimClass))		#define ADG_DIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE _DIM, AdgDimClass))
	skipping to change at line 62		skipping to change at line 63
	/*< public >*/		/*< public >*/
	/* Virtual Table */		/* Virtual Table */
	gdouble (*quote_angle) (gdouble angle);		gdouble (*quote_angle) (gdouble angle);
	gchar * (*default_value) (AdgDim *dim);		gchar * (*default_value) (AdgDim *dim);
	};		};
	GType adg_dim_get_type (void) G_GNUC_CONST;		GType adg_dim_get_type (void) G_GNUC_CONST;
	AdgDress adg_dim_get_dim_dress (AdgDim *dim);		AdgDress adg_dim_get_dim_dress (AdgDim *dim);
	void adg_dim_set_dim_dress (AdgDim *dim,		void adg_dim_set_dim_dress (AdgDim *dim,
	AdgDress dress);		AdgDress dress);
	void adg_dim_set_ref (AdgDim *dim,		void adg_dim_set_ref1 (AdgDim *dim,
	const AdgPair *ref1,		const AdgPoint *ref1);
			void adg_dim_set_ref1_explicit (AdgDim *dim,
			gdouble x,
			gdouble y);
			void adg_dim_set_ref1_from_pair (AdgDim *dim,
			const AdgPair *ref1);
			void adg_dim_set_ref1_from_model (AdgDim *dim,
			AdgModel *model,
			const gchar *ref1);
			AdgPoint * adg_dim_get_ref1 (AdgDim *dim);
			void adg_dim_set_ref2 (AdgDim *dim,
			const AdgPoint *ref2);
			void adg_dim_set_ref2_explicit (AdgDim *dim,
			gdouble x,
			gdouble y);
			void adg_dim_set_ref2_from_pair (AdgDim *dim,
	const AdgPair *ref2);		const AdgPair *ref2);
	void adg_dim_set_ref_explicit (AdgDim *dim,		void adg_dim_set_ref2_from_model (AdgDim *dim,
	gdouble ref1_x,
	gdouble ref1_y,
	gdouble ref2_x,
	gdouble ref2_y);
	void adg_dim_set_ref_from_model (AdgDim *dim,
	AdgModel *model,		AdgModel *model,
	const gchar *ref1,
	const gchar *ref2);		const gchar *ref2);
	const AdgPair * adg_dim_get_ref1 (AdgDim *dim);		AdgPoint * adg_dim_get_ref2 (AdgDim *dim);
	const AdgPair * adg_dim_get_ref2 (AdgDim *dim);
	void adg_dim_set_pos (AdgDim *dim,		void adg_dim_set_pos (AdgDim *dim,
	const AdgPair *pos);		const AdgPoint *pos);
	void adg_dim_set_pos_explicit (AdgDim *dim,		void adg_dim_set_pos_explicit (AdgDim *dim,
	gdouble x,		gdouble x,
	gdouble y);		gdouble y);
			void adg_dim_set_pos_from_pair (AdgDim *dim,
			const AdgPair *pos);
	void adg_dim_set_pos_from_model (AdgDim *dim,		void adg_dim_set_pos_from_model (AdgDim *dim,
	AdgModel *model,		AdgModel *model,
	const gchar *pos);		const gchar *pos);
	const AdgPair * adg_dim_get_pos (AdgDim *dim);		AdgPoint * adg_dim_get_pos (AdgDim *dim);
	void adg_dim_set_level (AdgDim *dim,		void adg_dim_set_level (AdgDim *dim,
	gdouble level);		gdouble level);
	gdouble adg_dim_get_level (AdgDim *dim);		gdouble adg_dim_get_level (AdgDim *dim);
	void adg_dim_set_outside (AdgDim *dim,		void adg_dim_set_outside (AdgDim *dim,
	AdgThreeState outside);		AdgThreeState outside);
	AdgThreeState adg_dim_get_outside (AdgDim *dim);		AdgThreeState adg_dim_get_outside (AdgDim *dim);
	void adg_dim_set_detached (AdgDim *dim,		void adg_dim_set_detached (AdgDim *dim,
	AdgThreeState detached);		AdgThreeState detached);
	AdgThreeState adg_dim_get_detached (AdgDim *dim);		AdgThreeState adg_dim_get_detached (AdgDim *dim);
	void adg_dim_set_value (AdgDim *dim,		void adg_dim_set_value (AdgDim *dim,
End of changes. 9 change blocks.
	17 lines changed or deleted		28 lines changed or added

	adg-dress-builtins.h		adg-dress-builtins.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_DRESS_BUILTINS_H__		#ifndef __ADG_DRESS_BUILTINS_H__
	#define __ADG_DRESS_BUILTINS_H__		#define __ADG_DRESS_BUILTINS_H__
	#include <adg/adg-dress.h>		#include "adg-dress.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_DRESS_UNDEFINED 0		#define ADG_DRESS_UNDEFINED 0
	#define ADG_DRESS_COLOR (_adg_dress_color())		#define ADG_DRESS_COLOR (_adg_dress_color())
			#define ADG_DRESS_COLOR_BACKGROUND (_adg_dress_color_background())
	#define ADG_DRESS_COLOR_STROKE (_adg_dress_color_stroke())		#define ADG_DRESS_COLOR_STROKE (_adg_dress_color_stroke())
	#define ADG_DRESS_COLOR_DIMENSION (_adg_dress_color_dimension())		#define ADG_DRESS_COLOR_DIMENSION (_adg_dress_color_dimension())
	#define ADG_DRESS_COLOR_HATCH (_adg_dress_color_hatch())		#define ADG_DRESS_COLOR_FILL (_adg_dress_color_fill())
			#define ADG_DRESS_COLOR_ANNOTATION (_adg_dress_color_annotation())
	#define ADG_DRESS_LINE (_adg_dress_line())		#define ADG_DRESS_LINE (_adg_dress_line())
	#define ADG_DRESS_LINE_MEDIUM (_adg_dress_line_medium())		#define ADG_DRESS_LINE_STROKE (_adg_dress_line_stroke())
	#define ADG_DRESS_LINE_THIN (_adg_dress_line_thin())		#define ADG_DRESS_LINE_DIMENSION (_adg_dress_line_dimension())
	#define ADG_DRESS_LINE_THICK (_adg_dress_line_thick())		#define ADG_DRESS_LINE_FILL (_adg_dress_line_fill())
	#define ADG_DRESS_LINE_THINNER (_adg_dress_line_thinner())
	#define ADG_DRESS_LINE_THICKER (_adg_dress_line_thinner())
	#define ADG_DRESS_LINE_HATCH (_adg_dress_line_hatch())
	#define ADG_DRESS_LINE_GRID (_adg_dress_line_grid())		#define ADG_DRESS_LINE_GRID (_adg_dress_line_grid())
	#define ADG_DRESS_LINE_FRAME (_adg_dress_line_frame())		#define ADG_DRESS_LINE_FRAME (_adg_dress_line_frame())
	#define ADG_DRESS_TEXT (_adg_dress_text())		#define ADG_DRESS_FONT (_adg_dress_font())
	#define ADG_DRESS_TEXT_VALUE (_adg_dress_text_value())		#define ADG_DRESS_FONT_TEXT (_adg_dress_font_text())
	#define ADG_DRESS_TEXT_LIMIT (_adg_dress_text_limit())		#define ADG_DRESS_FONT_ANNOTATION (_adg_dress_font_annotation())
			#define ADG_DRESS_FONT_QUOTE_TEXT (_adg_dress_font_quote_text())
			#define ADG_DRESS_FONT_QUOTE_ANNOTATION (_adg_dress_font_quote_annotation()
			)
	#define ADG_DRESS_DIMENSION (_adg_dress_dimension())		#define ADG_DRESS_DIMENSION (_adg_dress_dimension())
	#define ADG_DRESS_FILL (_adg_dress_fill())		#define ADG_DRESS_FILL (_adg_dress_fill())
	#define ADG_DRESS_FILL_HATCH (_adg_dress_fill_hatch())		#define ADG_DRESS_FILL_HATCH (_adg_dress_fill_hatch())
	#define ADG_DRESS_TABLE (_adg_dress_table())		#define ADG_DRESS_TABLE (_adg_dress_table())
	AdgDress _adg_dress_color (void) G_GNUC_CONST;		AdgDress _adg_dress_color (void) G_GNUC_CONST;
			AdgDress _adg_dress_color_background (void) G_GNUC_CONST;
	AdgDress _adg_dress_color_stroke (void) G_GNUC_CONST;		AdgDress _adg_dress_color_stroke (void) G_GNUC_CONST;
	AdgDress _adg_dress_color_dimension (void) G_GNUC_CONST;		AdgDress _adg_dress_color_dimension (void) G_GNUC_CONST;
	AdgDress _adg_dress_color_hatch (void) G_GNUC_CONST;		AdgDress _adg_dress_color_fill (void) G_GNUC_CONST;
			AdgDress _adg_dress_color_annotation (void) G_GNUC_CONST;
	AdgDress _adg_dress_line (void) G_GNUC_CONST;		AdgDress _adg_dress_line (void) G_GNUC_CONST;
	AdgDress _adg_dress_line_medium (void) G_GNUC_CONST;		AdgDress _adg_dress_line_stroke (void) G_GNUC_CONST;
	AdgDress _adg_dress_line_thin (void) G_GNUC_CONST;		AdgDress _adg_dress_line_dimension (void) G_GNUC_CONST;
	AdgDress _adg_dress_line_thick (void) G_GNUC_CONST;		AdgDress _adg_dress_line_fill (void) G_GNUC_CONST;
	AdgDress _adg_dress_line_thinner (void) G_GNUC_CONST;
	AdgDress _adg_dress_line_thicker (void) G_GNUC_CONST;
	AdgDress _adg_dress_line_hatch (void) G_GNUC_CONST;
	AdgDress _adg_dress_line_grid (void) G_GNUC_CONST;		AdgDress _adg_dress_line_grid (void) G_GNUC_CONST;
	AdgDress _adg_dress_line_frame (void) G_GNUC_CONST;		AdgDress _adg_dress_line_frame (void) G_GNUC_CONST;
	AdgDress _adg_dress_text (void) G_GNUC_CONST;		AdgDress _adg_dress_font (void) G_GNUC_CONST;
	AdgDress _adg_dress_text_value (void) G_GNUC_CONST;		AdgDress _adg_dress_font_text (void) G_GNUC_CONST;
	AdgDress _adg_dress_text_limit (void) G_GNUC_CONST;		AdgDress _adg_dress_font_annotation (void) G_GNUC_CONST;
			AdgDress _adg_dress_font_quote_text (void) G_GNUC_CONST;
			AdgDress _adg_dress_font_quote_annotation(void) G_GNUC_CONST;
	AdgDress _adg_dress_dimension (void) G_GNUC_CONST;		AdgDress _adg_dress_dimension (void) G_GNUC_CONST;
	AdgDress _adg_dress_fill (void) G_GNUC_CONST;		AdgDress _adg_dress_fill (void) G_GNUC_CONST;
	AdgDress _adg_dress_fill_hatch (void) G_GNUC_CONST;		AdgDress _adg_dress_fill_hatch (void) G_GNUC_CONST;
	AdgDress _adg_dress_table (void) G_GNUC_CONST;		AdgDress _adg_dress_table (void) G_GNUC_CONST;
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_DRESS_BUILTINS_H__ */		#endif /* __ADG_DRESS_BUILTINS_H__ */
End of changes. 10 change blocks.
	22 lines changed or deleted		25 lines changed or added

	adg-dress.h		adg-dress.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_DRESS_H__		#ifndef __ADG_DRESS_H__
	#define __ADG_DRESS_H__		#define __ADG_DRESS_H__
	#include <adg/adg-style.h>		#include "adg-style.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_DRESS (adg_dress_get_type())		#define ADG_TYPE_DRESS (adg_dress_get_type())
	#define ADG_VALUE_HOLDS_DRESS(value) (G_TYPE_CHECK_VALUE_TYPE((value), A DG_TYPE_DRESS))		#define ADG_VALUE_HOLDS_DRESS(value) (G_TYPE_CHECK_VALUE_TYPE((value), A DG_TYPE_DRESS))
	#define ADG_TYPE_PARAM_SPEC_DRESS (_adg_param_spec_dress_get_type())		#define ADG_TYPE_PARAM_SPEC_DRESS (_adg_param_spec_dress_get_type())
	#define ADG_IS_PARAM_SPEC_DRESS(spec) (G_TYPE_CHECK_INSTANCE_TYPE((spec), ADG_TYPE_PARAM_SPEC_DRESS))		#define ADG_IS_PARAM_SPEC_DRESS(spec) (G_TYPE_CHECK_INSTANCE_TYPE((spec), ADG_TYPE_PARAM_SPEC_DRESS))
	/* AdgDress defined in adg-entity.h */		/* AdgDress defined in adg-entity.h */
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-edges.h		adg-edges.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_EDGES_H__		#ifndef __ADG_EDGES_H__
	#define __ADG_EDGES_H__		#define __ADG_EDGES_H__
	#include <adg/adg-trail.h>		#include "adg-trail.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_EDGES (adg_edges_get_type())		#define ADG_TYPE_EDGES (adg_edges_get_type())
	#define ADG_EDGES(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_EDGES, AdgEdges))		#define ADG_EDGES(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_EDGES, AdgEdges))
	#define ADG_EDGES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_EDGES, AdgEdgesClass))		#define ADG_EDGES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_EDGES, AdgEdgesClass))
	#define ADG_IS_EDGES(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_EDGES))		#define ADG_IS_EDGES(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_EDGES))
	#define ADG_IS_EDGES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_EDGES))		#define ADG_IS_EDGES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_EDGES))
	#define ADG_EDGES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_EDGES, AdgEdgesClass))		#define ADG_EDGES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_EDGES, AdgEdgesClass))
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-entity.h		adg-entity.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_ENTITY_H__		#ifndef __ADG_ENTITY_H__
	#define __ADG_ENTITY_H__		#define __ADG_ENTITY_H__
	#include <adg/adg-util.h>		#include "adg-matrix.h"
			#include "adg-point.h"
			#include <cpml.h>
			/* The following header is autogenerated, so it could be hosted
			* by a different directory on VPATH builds */
	#include <adg/adg-type-builtins.h>		#include <adg/adg-type-builtins.h>
	#include <adg/adg-matrix.h>
	#include <cpml/cpml.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_ENTITY (adg_entity_get_type())		#define ADG_TYPE_ENTITY (adg_entity_get_type())
	#define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_ENTITY, AdgEntity))		#define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_ENTITY, AdgEntity))
	#define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_ENTITY, AdgEntityClass))		#define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_ENTITY, AdgEntityClass))
	#define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_ENTITY))		#define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_ENTITY))
	#define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_ENTITY))		#define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_ENTITY))
	#define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_ENTITY, AdgEntityClass))		#define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_ENTITY, AdgEntityClass))
	/* Forward declaration */		/* Forward declarations */
	ADG_FORWARD_DECL(AdgStyle);		ADG_FORWARD_DECL(AdgCanvas);
	typedef gint AdgDress;		typedef gint AdgDress;
			#if 0
			/* This is declared in adg-model.h */
	typedef struct _AdgEntity AdgEntity;		typedef struct _AdgEntity AdgEntity;
			#endif
	typedef struct _AdgEntityClass AdgEntityClass;		typedef struct _AdgEntityClass AdgEntityClass;
	typedef void (*AdgEntityCallback) (AdgEntity *entity, gpointer user_data);
	ADG_FORWARD_DECL(AdgCanvas);
	struct _AdgEntity {		struct _AdgEntity {
	/*< private >*/		/*< private >*/
	GInitiallyUnowned parent;		GInitiallyUnowned parent;
	gpointer data;		gpointer data;
	};		};
	struct _AdgEntityClass {		struct _AdgEntityClass {
	/*< private >*/		/*< private >*/
	GInitiallyUnownedClass parent_class;		GInitiallyUnownedClass parent_class;
	skipping to change at line 119		skipping to change at line 121
	AdgDress dress);		AdgDress dress);
	void adg_entity_apply_dress (AdgEntity *entity,		void adg_entity_apply_dress (AdgEntity *entity,
	AdgDress dress,		AdgDress dress,
	cairo_t *cr);		cairo_t *cr);
	void adg_entity_global_changed (AdgEntity *entity);		void adg_entity_global_changed (AdgEntity *entity);
	void adg_entity_local_changed (AdgEntity *entity);		void adg_entity_local_changed (AdgEntity *entity);
	void adg_entity_invalidate (AdgEntity *entity);		void adg_entity_invalidate (AdgEntity *entity);
	void adg_entity_arrange (AdgEntity *entity);		void adg_entity_arrange (AdgEntity *entity);
	void adg_entity_render (AdgEntity *entity,		void adg_entity_render (AdgEntity *entity,
	cairo_t *cr);		cairo_t *cr);
			AdgPoint * adg_entity_point (AdgEntity *entity,
			AdgPoint *old_point
			,
			AdgPoint *new_point
			);
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_ENTITY_H__ */		#endif /* __ADG_ENTITY_H__ */
End of changes. 8 change blocks.
	10 lines changed or deleted		18 lines changed or added

	adg-enums.h		adg-enums.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_ENUMS_H__		#ifndef __ADG_ENUMS_H__
	#define __ADG_ENUMS_H__		#define __ADG_ENUMS_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* This header file should follow this (inconsistent) style to cope		/* This header file should follow this (inconsistent) style to cope
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	adg-fill-style.h		adg-fill-style.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_FILL_STYLE_H__		#ifndef __ADG_FILL_STYLE_H__
	#define __ADG_FILL_STYLE_H__		#define __ADG_FILL_STYLE_H__
	#include <adg/adg-style.h>		#include "adg-style.h"
	#include <adg/adg-pattern.h>		#include "adg-pattern.h"
	#include <cpml/cpml-extents.h>		#include <cpml.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_FILL_STYLE (adg_fill_style_get_type())		#define ADG_TYPE_FILL_STYLE (adg_fill_style_get_type())
	#define ADG_FILL_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_FILL_STYLE, AdgFillStyle))		#define ADG_FILL_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_FILL_STYLE, AdgFillStyle))
	#define ADG_FILL_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_FILL_STYLE, AdgFillStyleClass))		#define ADG_FILL_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_FILL_STYLE, AdgFillStyleClass))
	#define ADG_IS_FILL_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_FILL_STYLE))		#define ADG_IS_FILL_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_FILL_STYLE))
	#define ADG_IS_FILL_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_FILL_STYLE))		#define ADG_IS_FILL_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_FILL_STYLE))
	#define ADG_FILL_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_FILL_STYLE, AdgFillStyleClass))		#define ADG_FILL_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_FILL_STYLE, AdgFillStyleClass))
End of changes. 2 change blocks.
	4 lines changed or deleted		4 lines changed or added

	adg-font-style.h		adg-font-style.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_FONT_STYLE_H__		#ifndef __ADG_FONT_STYLE_H__
	#define __ADG_FONT_STYLE_H__		#define __ADG_FONT_STYLE_H__
	#include <adg/adg-style.h>		#include "adg-style.h"
	#include <adg/adg-matrix.h>		#include "adg-matrix.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_FONT_STYLE (adg_font_style_get_type())		#define ADG_TYPE_FONT_STYLE (adg_font_style_get_type())
	#define ADG_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_FONT_STYLE, AdgFontStyle))		#define ADG_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_FONT_STYLE, AdgFontStyle))
	#define ADG_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_FONT_STYLE, AdgFontStyleClass))		#define ADG_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_FONT_STYLE, AdgFontStyleClass))
	#define ADG_IS_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_FONT_STYLE))		#define ADG_IS_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_FONT_STYLE))
	#define ADG_IS_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_FONT_STYLE))		#define ADG_IS_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_FONT_STYLE))
	#define ADG_FONT_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_FONT_STYLE, AdgFontStyleClass))		#define ADG_FONT_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_FONT_STYLE, AdgFontStyleClass))
	skipping to change at line 54		skipping to change at line 54
	AdgStyle parent;		AdgStyle parent;
	gpointer data;		gpointer data;
	};		};
	struct _AdgFontStyleClass {		struct _AdgFontStyleClass {
	/*< private >*/		/*< private >*/
	AdgStyleClass parent_class;		AdgStyleClass parent_class;
	};		};
	GType adg_font_style_get_type (void) G_GNUC_CONST;		GType adg_font_style_get_type (void) G_GNUC_CONST;
	AdgStyle * adg_font_style_new (void);		AdgFontStyle * adg_font_style_new (void);
	cairo_scaled_font_t *		cairo_scaled_font_t *
	adg_font_style_get_scaled_font (AdgFontStyle *font_styl e,		adg_font_style_get_scaled_font (AdgFontStyle *font_styl e,
	const AdgMatrix *ctm);		const AdgMatrix *ctm);
	void adg_font_style_set_color_dress (AdgFontStyle *font_style ,		void adg_font_style_set_color_dress (AdgFontStyle *font_style ,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_font_style_get_color_dress (AdgFontStyle *font_style );		AdgDress adg_font_style_get_color_dress (AdgFontStyle *font_style );
	void adg_font_style_set_family (AdgFontStyle *font_styl e,		void adg_font_style_set_family (AdgFontStyle *font_styl e,
	const gchar *family);		const gchar *family);
	const gchar * adg_font_style_get_family (AdgFontStyle *font_styl e);		const gchar * adg_font_style_get_family (AdgFontStyle *font_styl e);
	void adg_font_style_set_slant (AdgFontStyle *font_styl e,		void adg_font_style_set_slant (AdgFontStyle *font_styl e,
End of changes. 3 change blocks.
	5 lines changed or deleted		4 lines changed or added

	adg-hatch.h		adg-hatch.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_HATCH_H__		#ifndef __ADG_HATCH_H__
	#define __ADG_HATCH_H__		#define __ADG_HATCH_H__
	#include <adg/adg-stroke.h>		#include "adg-stroke.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_HATCH (adg_hatch_get_type())		#define ADG_TYPE_HATCH (adg_hatch_get_type())
	#define ADG_HATCH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_HATCH, AdgHatch))		#define ADG_HATCH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_HATCH, AdgHatch))
	#define ADG_HATCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_HATCH, AdgHatchClass))		#define ADG_HATCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_HATCH, AdgHatchClass))
	#define ADG_IS_HATCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_HATCH))		#define ADG_IS_HATCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_HATCH))
	#define ADG_IS_HATCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_HATCH))		#define ADG_IS_HATCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_HATCH))
	#define ADG_HATCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_HATCH, AdgHatchClass))		#define ADG_HATCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_HATCH, AdgHatchClass))
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-ldim.h		adg-ldim.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_LDIM_H__		#ifndef __ADG_LDIM_H__
	#define __ADG_LDIM_H__		#define __ADG_LDIM_H__
	#include <adg/adg-dim.h>		#include "adg-dim.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_LDIM (adg_ldim_get_type())		#define ADG_TYPE_LDIM (adg_ldim_get_type())
	#define ADG_LDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_LDIM, AdgLDim))		#define ADG_LDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_LDIM, AdgLDim))
	#define ADG_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_LDIM, AdgLDimClass))		#define ADG_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_LDIM, AdgLDimClass))
	#define ADG_IS_LDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_LDIM))		#define ADG_IS_LDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_LDIM))
	#define ADG_IS_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_LDIM))		#define ADG_IS_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_LDIM))
	#define ADG_LDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_LDIM, AdgLDimClass))		#define ADG_LDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_LDIM, AdgLDimClass))
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-line-style.h		adg-line-style.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_LINE_STYLE_H__		#ifndef __ADG_LINE_STYLE_H__
	#define __ADG_LINE_STYLE_H__		#define __ADG_LINE_STYLE_H__
	#include <adg/adg-style.h>		#include "adg-style.h"
	#include <adg/adg-dress.h>		#include "adg-dress.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_LINE_STYLE (adg_line_style_get_type())		#define ADG_TYPE_LINE_STYLE (adg_line_style_get_type())
	#define ADG_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_LINE_STYLE, AdgLineStyle))		#define ADG_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_LINE_STYLE, AdgLineStyle))
	#define ADG_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_LINE_STYLE, AdgLineStyleClass))		#define ADG_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_LINE_STYLE, AdgLineStyleClass))
	#define ADG_IS_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_LINE_STYLE))		#define ADG_IS_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_LINE_STYLE))
	#define ADG_IS_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_LINE_STYLE))		#define ADG_IS_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_LINE_STYLE))
	#define ADG_LINE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_LINE_STYLE, AdgLineStyleClass))		#define ADG_LINE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_LINE_STYLE, AdgLineStyleClass))
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added

	adg-logo.h		adg-logo.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_LOGO_H__		#ifndef __ADG_LOGO_H__
	#define __ADG_LOGO_H__		#define __ADG_LOGO_H__
	#include <adg/adg-entity.h>		#include "adg-entity.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_LOGO (adg_logo_get_type())		#define ADG_TYPE_LOGO (adg_logo_get_type())
	#define ADG_LOGO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_LOGO, AdgLogo))		#define ADG_LOGO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_LOGO, AdgLogo))
	#define ADG_LOGO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_LOGO, AdgLogoClass))		#define ADG_LOGO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_LOGO, AdgLogoClass))
	#define ADG_IS_LOGO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_LOGO))		#define ADG_IS_LOGO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_LOGO))
	#define ADG_IS_LOGO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_LOGO))		#define ADG_IS_LOGO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_LOGO))
	#define ADG_LOGO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_LOGO, AdgLogoClass))		#define ADG_LOGO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_LOGO, AdgLogoClass))
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-marker.h		adg-marker.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_MARKER_H__		#ifndef __ADG_MARKER_H__
	#define __ADG_MARKER_H__		#define __ADG_MARKER_H__
	#include <adg/adg-entity.h>		#include "adg-entity.h"
	#include <adg/adg-trail.h>		#include "adg-trail.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_MARKER (adg_marker_get_type())		#define ADG_TYPE_MARKER (adg_marker_get_type())
	#define ADG_MARKER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_MARKER, AdgMarker))		#define ADG_MARKER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_MARKER, AdgMarker))
	#define ADG_MARKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_MARKER, AdgMarkerClass))		#define ADG_MARKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_MARKER, AdgMarkerClass))
	#define ADG_IS_MARKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_MARKER))		#define ADG_IS_MARKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_MARKER))
	#define ADG_IS_MARKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_MARKER))		#define ADG_IS_MARKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_MARKER))
	#define ADG_MARKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_MARKER, AdgMarkerClass))		#define ADG_MARKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_MARKER, AdgMarkerClass))
	skipping to change at line 58		skipping to change at line 58
	struct _AdgMarkerClass {		struct _AdgMarkerClass {
	/*< private >*/		/*< private >*/
	AdgEntityClass parent_class;		AdgEntityClass parent_class;
	/*< public >*/		/*< public >*/
	/* Virtual Table */		/* Virtual Table */
	AdgModel * (*create_model) (AdgMarker *marker);		AdgModel * (*create_model) (AdgMarker *marker);
	};		};
	GType adg_marker_get_type (void) G_GNUC_CONST;		GType adg_marker_get_type (void) G_GNUC_CONST;
			void adg_marker_set_trail (AdgMarker *marker,
			AdgTrail *trail);
			AdgTrail * adg_marker_get_trail (AdgMarker *marker);
			void adg_marker_set_n_segment (AdgMarker *marker,
			guint n_segment)
			;
			guint adg_marker_get_n_segment (AdgMarker *marker);
	void adg_marker_set_segment (AdgMarker *marker,		void adg_marker_set_segment (AdgMarker *marker,
	AdgTrail *trail,		AdgTrail *trail,
	guint n_segment) ;		guint n_segment) ;
	AdgTrail * adg_marker_get_trail (AdgMarker *marker);
	guint adg_marker_get_n_segment (AdgMarker *marker);
	const AdgSegment *adg_marker_get_segment (AdgMarker *marker);		const AdgSegment *adg_marker_get_segment (AdgMarker *marker);
	void adg_marker_backup_segment (AdgMarker *marker);		void adg_marker_backup_segment (AdgMarker *marker);
	const AdgSegment *adg_marker_get_backup_segment (AdgMarker *marker);		const AdgSegment *adg_marker_get_backup_segment (AdgMarker *marker);
	void adg_marker_set_pos (AdgMarker *marker,		void adg_marker_set_pos (AdgMarker *marker,
	gdouble pos);		gdouble pos);
	gdouble adg_marker_get_pos (AdgMarker *marker);		gdouble adg_marker_get_pos (AdgMarker *marker);
	void adg_marker_set_size (AdgMarker *marker,		void adg_marker_set_size (AdgMarker *marker,
	gdouble size);		gdouble size);
	gdouble adg_marker_get_size (AdgMarker *marker);		gdouble adg_marker_get_size (AdgMarker *marker);
	void adg_marker_set_model (AdgMarker *marker,		void adg_marker_set_model (AdgMarker *marker,
End of changes. 4 change blocks.
	5 lines changed or deleted		10 lines changed or added

	adg-matrix.h		adg-matrix.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_MATRIX_H__		#ifndef __ADG_MATRIX_H__
	#define __ADG_MATRIX_H__		#define __ADG_MATRIX_H__
	#include <adg/adg-enums.h>		#include "adg-enums.h"
	#include <cairo.h>		#include <cairo.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_MATRIX (adg_matrix_get_type())		#define ADG_TYPE_MATRIX (adg_matrix_get_type())
	typedef cairo_matrix_t AdgMatrix;		typedef cairo_matrix_t AdgMatrix;
	GType adg_matrix_get_type (void) G_GNUC_CONST;		GType adg_matrix_get_type (void) G_GNUC_CONST;
	const AdgMatrix *adg_matrix_identity (void) G_GNUC_CONST;		const AdgMatrix *adg_matrix_identity (void) G_GNUC_CONST;
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-model.h		adg-model.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_MODEL_H__		#ifndef __ADG_MODEL_H__
	#define __ADG_MODEL_H__		#define __ADG_MODEL_H__
	#include <adg/adg-entity.h>		#include "adg-pair.h"
	#include <adg/adg-pair.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_MODEL (adg_model_get_type())		#define ADG_TYPE_MODEL (adg_model_get_type())
	#define ADG_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_MODEL, AdgModel))		#define ADG_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_MODEL, AdgModel))
	#define ADG_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_MODEL, AdgModel))		#define ADG_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_MODEL, AdgModel))
	#define ADG_IS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_MODEL))		#define ADG_IS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_MODEL))
	#define ADG_IS_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_MODEL))		#define ADG_IS_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_MODEL))
	#define ADG_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_MODEL, AdgModelClass))		#define ADG_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_MODEL, AdgModelClass))
			/* Forward declarations */
			ADG_FORWARD_DECL(AdgEntity);
	typedef struct _AdgModel AdgModel;		typedef struct _AdgModel AdgModel;
	typedef struct _AdgModelClass AdgModelClass;		typedef struct _AdgModelClass AdgModelClass;
	typedef void (*AdgNamedPairCallback) (const gchar *name, AdgPair *pair,		typedef void (*AdgDependencyFunc) (AdgModel *model,
	gpointer user_data);		AdgEntity *entity,
			gpointer user_data)
			;
			typedef void (*AdgNamedPairFunc) (AdgModel *model,
			const gchar *name,
			AdgPair *pair,
			gpointer user_data)
			;
	struct _AdgModel {		struct _AdgModel {
	/*< private >*/		/*< private >*/
	GObject parent;		GObject parent;
	gpointer data;		gpointer data;
	};		};
	struct _AdgModelClass {		struct _AdgModelClass {
	/*< private >*/		/*< private >*/
	GObjectClass parent_class;		GObjectClass parent_class;
	skipping to change at line 75		skipping to change at line 82
	};		};
	GType adg_model_get_type (void) G_GNUC_CONST;		GType adg_model_get_type (void) G_GNUC_CONST;
	void adg_model_add_dependency (AdgModel *model,		void adg_model_add_dependency (AdgModel *model,
	AdgEntity *entity);		AdgEntity *entity);
	void adg_model_remove_dependency (AdgModel *model,		void adg_model_remove_dependency (AdgModel *model,
	AdgEntity *entity);		AdgEntity *entity);
	const GSList * adg_model_get_dependencies (AdgModel *model);		const GSList * adg_model_get_dependencies (AdgModel *model);
	void adg_model_foreach_dependency (AdgModel *model,		void adg_model_foreach_dependency (AdgModel *model,
	AdgEntityCallback callback ,		AdgDependencyFunc callback ,
	gpointer user_dat a);		gpointer user_dat a);
	void adg_model_set_named_pair (AdgModel *model,		void adg_model_set_named_pair (AdgModel *model,
	const gchar *name,		const gchar *name,
	const AdgPair *pair);		const AdgPair *pair);
			void adg_model_set_named_pair_explicit
			(AdgModel *model,
			const gchar *name,
			gdouble x,
			gdouble y);
	const AdgPair * adg_model_get_named_pair (AdgModel *model,		const AdgPair * adg_model_get_named_pair (AdgModel *model,
	const gchar *name);		const gchar *name);
	void adg_model_foreach_named_pair (AdgModel *model,		void adg_model_foreach_named_pair (AdgModel *model,
	AdgNamedPairCallback callb ack,		AdgNamedPairFunc callback ,
	gpointer user_dat a);		gpointer user_dat a);
	void adg_model_clear (AdgModel *model);		void adg_model_clear (AdgModel *model);
	void adg_model_changed (AdgModel *model);		void adg_model_changed (AdgModel *model);
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_MODEL_H__ */		#endif /* __ADG_MODEL_H__ */
End of changes. 7 change blocks.
	7 lines changed or deleted		21 lines changed or added

	adg-pair.h		adg-pair.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_PAIR_H__		#ifndef __ADG_PAIR_H__
	#define __ADG_PAIR_H__		#define __ADG_PAIR_H__
	#include <cpml/cpml.h>		#include <cpml.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_PAIR (adg_pair_get_type())		#define ADG_TYPE_PAIR (adg_pair_get_type())
	typedef CpmlPair AdgPair;		typedef CpmlPair AdgPair;
	GType adg_pair_get_type (void) G_GNUC_CONST;		GType adg_pair_get_type (void) G_GNUC_CONST;
	AdgPair * adg_pair_dup (const AdgPair *pair);		AdgPair * adg_pair_dup (const AdgPair *pair);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-path.h		adg-path.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_PATH_H__		#ifndef __ADG_PATH_H__
	#define __ADG_PATH_H__		#define __ADG_PATH_H__
	#include <adg/adg-trail.h>		#include "adg-trail.h"
	#include <adg/adg-primitive.h>		#include "adg-primitive.h"
	#include <adg/adg-segment.h>		#include "adg-segment.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_PATH (adg_path_get_type())		#define ADG_TYPE_PATH (adg_path_get_type())
	#define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_PATH, AdgPath))		#define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_PATH, AdgPath))
	#define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_PATH, AdgPathClass))		#define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_PATH, AdgPathClass))
	#define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_PATH))		#define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_PATH))
	#define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_PATH))		#define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_PATH))
	#define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_PATH, AdgPathClass))		#define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_PATH, AdgPathClass))
	skipping to change at line 65		skipping to change at line 65
	AdgPath * adg_path_new (void);		AdgPath * adg_path_new (void);
	const AdgPair * adg_path_get_current_point (AdgPath *path);		const AdgPair * adg_path_get_current_point (AdgPath *path);
	gboolean adg_path_has_current_point (AdgPath *path);		gboolean adg_path_has_current_point (AdgPath *path);
	const AdgPrimitive *		const AdgPrimitive *
	adg_path_last_primitive (AdgPath *path);		adg_path_last_primitive (AdgPath *path);
	const AdgPrimitive *		const AdgPrimitive *
	adg_path_over_primitive (AdgPath *path);		adg_path_over_primitive (AdgPath *path);
	void adg_path_append (AdgPath *path,		void adg_path_append (AdgPath *path,
	cairo_path_data_type_t typ e,		CpmlPrimitiveType type,
	...);		...);
	void adg_path_append_valist (AdgPath *path,		void adg_path_append_valist (AdgPath *path,
	cairo_path_data_type_t typ e,		CpmlPrimitiveType type,
	va_list var_args);		va_list var_args);
	void adg_path_append_primitive (AdgPath *path,		void adg_path_append_primitive (AdgPath *path,
	const AdgPrimitive		const AdgPrimitive
	*primitive) ;		*primitive) ;
	void adg_path_append_segment (AdgPath *path,		void adg_path_append_segment (AdgPath *path,
	const AdgSegment *segment) ;		const AdgSegment *segment) ;
	void adg_path_append_cpml_path (AdgPath *path,		void adg_path_append_cpml_path (AdgPath *path,
	const CpmlPath *cpml_path) ;		const CpmlPath *cpml_path) ;
	void adg_path_move_to (AdgPath *path,		void adg_path_move_to (AdgPath *path,
	const AdgPair *pair);		const AdgPair *pair);
End of changes. 4 change blocks.
	6 lines changed or deleted		6 lines changed or added

	adg-pattern.h		adg-pattern.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_PATTERN_H__		#ifndef __ADG_PATTERN_H__
	#define __ADG_PATTERN_H__		#define __ADG_PATTERN_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <cairo.h>		#include <cairo.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	adg-point.h		adg-point.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_POINT_H__		#ifndef __ADG_POINT_H__
	#define __ADG_POINT_H__		#define __ADG_POINT_H__
	#include <adg/adg-pair.h>		#include "adg-pair.h"
	#include <adg/adg-model.h>		#include "adg-model.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_POINT (adg_point_get_type())		#define ADG_TYPE_POINT (adg_point_get_type())
			/* Forward declaration */
			ADG_FORWARD_DECL(AdgStyle);
	typedef struct _AdgPoint AdgPoint;		typedef struct _AdgPoint AdgPoint;
	GType adg_point_get_type (void) G_GNUC_CONST;		GType adg_point_get_type (void) G_GNUC_CONST;
	AdgPoint * adg_point_new (void);		AdgPoint * adg_point_new (void);
	AdgPoint * adg_point_dup (const AdgPoint *point);		AdgPoint * adg_point_dup (const AdgPoint *src);
	void adg_point_destroy (AdgPoint *point);		void adg_point_destroy (AdgPoint *point);
	void adg_point_copy (AdgPoint *point,		void adg_point_copy (AdgPoint *point,
	const AdgPoint *src);		const AdgPoint *src);
	void adg_point_set_pair (AdgPoint *point,		void adg_point_set_pair (AdgPoint *point,
	const AdgPair *pair);		const AdgPair *pair);
	void adg_point_set_pair_explicit (AdgPoint *point,		void adg_point_set_pair_explicit (AdgPoint *point,
	gdouble x,		gdouble x,
	gdouble y);		gdouble y);
	void adg_point_set_pair_from_model (AdgPoint *point,		void adg_point_set_pair_from_model (AdgPoint *point,
	AdgModel *model,		AdgModel *model,
	const gchar *name);		const gchar *name);
			void adg_point_unset (AdgPoint *point);
	const AdgPair * adg_point_get_pair (AdgPoint *point);		const AdgPair * adg_point_get_pair (AdgPoint *point);
			AdgModel * adg_point_get_model (AdgPoint *point);
			const gchar * adg_point_get_name (AdgPoint *point);
	void adg_point_invalidate (AdgPoint *point);		void adg_point_invalidate (AdgPoint *point);
			gboolean adg_point_equal (const AdgPoint *point1,
			const AdgPoint *point2);
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_POINT_H__ */		#endif /* __ADG_POINT_H__ */
End of changes. 7 change blocks.
	4 lines changed or deleted		12 lines changed or added

	adg-primitive.h		adg-primitive.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_PRIMITIVE_H__		#ifndef __ADG_PRIMITIVE_H__
	#define __ADG_PRIMITIVE_H__		#define __ADG_PRIMITIVE_H__
	#include <cpml/cpml.h>		#include <cpml.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_PRIMITIVE (adg_primitive_get_type())		#define ADG_TYPE_PRIMITIVE (adg_primitive_get_type())
	typedef CpmlPrimitive AdgPrimitive;		typedef CpmlPrimitive AdgPrimitive;
	GType adg_primitive_get_type (void) G_GNUC_CONST;		GType adg_primitive_get_type (void) G_GNUC_CONST;
	AdgPrimitive * adg_primitive_dup (const AdgPrimitive *primitive) ;		AdgPrimitive * adg_primitive_dup (const AdgPrimitive *primitive) ;
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-projection.h		adg-projection.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_PROJECTION_H__		#ifndef __ADG_PROJECTION_H__
	#define __ADG_PROJECTION_H__		#define __ADG_PROJECTION_H__
	#include <adg/adg-entity.h>		#include "adg-entity.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_PROJECTION (adg_projection_get_type())		#define ADG_TYPE_PROJECTION (adg_projection_get_type())
	#define ADG_PROJECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_PROJECTION, AdgProjection))		#define ADG_PROJECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_PROJECTION, AdgProjection))
	#define ADG_PROJECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_PROJECTION, AdgProjectionClass))		#define ADG_PROJECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_PROJECTION, AdgProjectionClass))
	#define ADG_IS_PROJECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_PROJECTION))		#define ADG_IS_PROJECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_PROJECTION))
	#define ADG_IS_PROJECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_PROJECTION))		#define ADG_IS_PROJECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_PROJECTION))
	#define ADG_PROJECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_PROJECTION, AdgProjectionClass))		#define ADG_PROJECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_PROJECTION, AdgProjectionClass))
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-rdim.h		adg-rdim.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_RDIM_H__		#ifndef __ADG_RDIM_H__
	#define __ADG_RDIM_H__		#define __ADG_RDIM_H__
	#include <adg/adg-dim.h>		#include "adg-dim.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_RDIM (adg_rdim_get_type())		#define ADG_TYPE_RDIM (adg_rdim_get_type())
	#define ADG_RDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_RDIM, AdgRDim))		#define ADG_RDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_RDIM, AdgRDim))
	#define ADG_RDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_RDIM, AdgRDimClass))		#define ADG_RDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_RDIM, AdgRDimClass))
	#define ADG_IS_RDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_RDIM))		#define ADG_IS_RDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_RDIM))
	#define ADG_IS_RDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_RDIM))		#define ADG_IS_RDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_RDIM))
	#define ADG_RDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_RDIM, AdgRDimClass))		#define ADG_RDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_RDIM, AdgRDimClass))
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-ruled-fill.h		adg-ruled-fill.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_RULED_FILL_H__		#ifndef __ADG_RULED_FILL_H__
	#define __ADG_RULED_FILL_H__		#define __ADG_RULED_FILL_H__
	#include <adg/adg-fill-style.h>		#include "adg-fill-style.h"
	#include <adg/adg-dress.h>		#include "adg-dress.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_RULED_FILL (adg_ruled_fill_get_type())		#define ADG_TYPE_RULED_FILL (adg_ruled_fill_get_type())
	#define ADG_RULED_FILL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_RULED_FILL, AdgRuledFill))		#define ADG_RULED_FILL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_RULED_FILL, AdgRuledFill))
	#define ADG_RULED_FILL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_RULED_FILL, AdgRuledFillClass))		#define ADG_RULED_FILL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A DG_TYPE_RULED_FILL, AdgRuledFillClass))
	#define ADG_IS_RULED_FILL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_RULED_FILL))		#define ADG_IS_RULED_FILL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_RULED_FILL))
	#define ADG_IS_RULED_FILL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_RULED_FILL))		#define ADG_IS_RULED_FILL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A DG_TYPE_RULED_FILL))
	#define ADG_RULED_FILL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_RULED_FILL, AdgRuledFillClass))		#define ADG_RULED_FILL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A DG_TYPE_RULED_FILL, AdgRuledFillClass))
	skipping to change at line 54		skipping to change at line 54
	AdgFillStyle parent;		AdgFillStyle parent;
	gpointer data;		gpointer data;
	};		};
	struct _AdgRuledFillClass {		struct _AdgRuledFillClass {
	/*< private >*/		/*< private >*/
	AdgFillStyleClass parent_class;		AdgFillStyleClass parent_class;
	};		};
	GType adg_ruled_fill_get_type (void) G_GNUC_CONST;		GType adg_ruled_fill_get_type (void) G_GNUC_CONST;
			AdgRuledFill * adg_ruled_fill_new (void);
	void adg_ruled_fill_set_line_dress (AdgRuledFill *ruled_fill ,		void adg_ruled_fill_set_line_dress (AdgRuledFill *ruled_fill ,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_ruled_fill_get_line_dress (AdgRuledFill *ruled_fill );		AdgDress adg_ruled_fill_get_line_dress (AdgRuledFill *ruled_fill );
	void adg_ruled_fill_set_spacing (AdgRuledFill *ruled_fill ,		void adg_ruled_fill_set_spacing (AdgRuledFill *ruled_fill ,
	gdouble spacing);		gdouble spacing);
	gdouble adg_ruled_fill_get_spacing (AdgRuledFill *ruled_fill );		gdouble adg_ruled_fill_get_spacing (AdgRuledFill *ruled_fill );
	void adg_ruled_fill_set_angle (AdgRuledFill *ruled_fill ,		void adg_ruled_fill_set_angle (AdgRuledFill *ruled_fill ,
	gdouble angle);		gdouble angle);
	gdouble adg_ruled_fill_get_angle (AdgRuledFill *ruled_fill );		gdouble adg_ruled_fill_get_angle (AdgRuledFill *ruled_fill );
End of changes. 3 change blocks.
	4 lines changed or deleted		4 lines changed or added

	adg-segment.h		adg-segment.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_SEGMENT_H__		#ifndef __ADG_SEGMENT_H__
	#define __ADG_SEGMENT_H__		#define __ADG_SEGMENT_H__
	#include <cpml/cpml.h>		#include <cpml.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_SEGMENT (adg_segment_get_type())		#define ADG_TYPE_SEGMENT (adg_segment_get_type())
	typedef CpmlSegment AdgSegment;		typedef CpmlSegment AdgSegment;
	GType adg_segment_get_type (void) G_GNUC_CONST;		GType adg_segment_get_type (void) G_GNUC_CONST;
	AdgSegment * adg_segment_dup (const AdgSegment *segment);		AdgSegment * adg_segment_dup (const AdgSegment *segment);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-stroke.h		adg-stroke.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_STROKE_H__		#ifndef __ADG_STROKE_H__
	#define __ADG_STROKE_H__		#define __ADG_STROKE_H__
	#include <adg/adg-entity.h>		#include "adg-entity.h"
	#include <adg/adg-trail.h>		#include "adg-trail.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_STROKE (adg_stroke_get_type())		#define ADG_TYPE_STROKE (adg_stroke_get_type())
	#define ADG_STROKE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_STROKE, AdgStroke))		#define ADG_STROKE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_STROKE, AdgStroke))
	#define ADG_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_STROKE, AdgStrokeClass))		#define ADG_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_STROKE, AdgStrokeClass))
	#define ADG_IS_STROKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_STROKE))		#define ADG_IS_STROKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_STROKE))
	#define ADG_IS_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_STROKE))		#define ADG_IS_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_STROKE))
	#define ADG_STROKE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_STROKE, AdgStrokeClass))		#define ADG_STROKE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_STROKE, AdgStrokeClass))
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added

	adg-style.h		adg-style.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_STYLE_H__		#ifndef __ADG_STYLE_H__
	#define __ADG_STYLE_H__		#define __ADG_STYLE_H__
	#include <adg/adg-entity.h>		#include "adg-entity.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_STYLE (adg_style_get_type())		#define ADG_TYPE_STYLE (adg_style_get_type())
	#define ADG_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_STYLE, AdgStyle))		#define ADG_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_STYLE, AdgStyle))
	#define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_STYLE, AdgStyleClass))		#define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_STYLE, AdgStyleClass))
	#define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_STYLE))		#define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_STYLE))
	#define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_STYLE))		#define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_STYLE))
	#define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_STYLE, AdgStyleClass))		#define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_STYLE, AdgStyleClass))
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-table-style.h		adg-table-style.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_TABLE_STYLE_H__		#ifndef __ADG_TABLE_STYLE_H__
	#define __ADG_TABLE_STYLE_H__		#define __ADG_TABLE_STYLE_H__
	#include <adg/adg-style.h>		#include "adg-style.h"
	#include <adg/adg-dress.h>		#include "adg-dress.h"
	#include <adg/adg-marker.h>		#include "adg-marker.h"
	#include <adg/adg-pair.h>		#include "adg-pair.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_TABLE_STYLE (adg_table_style_get_type())		#define ADG_TYPE_TABLE_STYLE (adg_table_style_get_type())
	#define ADG_TABLE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_TABLE_STYLE, AdgTableStyle))		#define ADG_TABLE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_TABLE_STYLE, AdgTableStyle))
	#define ADG_TABLE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE_TABLE_STYLE, AdgTableStyleClass))		#define ADG_TABLE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE_TABLE_STYLE, AdgTableStyleClass))
	#define ADG_IS_TABLE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_TABLE_STYLE))		#define ADG_IS_TABLE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_TABLE_STYLE))
	#define ADG_IS_TABLE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE_TABLE_STYLE))		#define ADG_IS_TABLE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE_TABLE_STYLE))
	#define ADG_TABLE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE_TABLE_STYLE, AdgTableStyleClass))		#define ADG_TABLE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE_TABLE_STYLE, AdgTableStyleClass))
	skipping to change at line 56		skipping to change at line 56
	AdgStyle parent;		AdgStyle parent;
	gpointer data;		gpointer data;
	};		};
	struct _AdgTableStyleClass {		struct _AdgTableStyleClass {
	/*< private >*/		/*< private >*/
	AdgStyleClass parent_class;		AdgStyleClass parent_class;
	};		};
	GType adg_table_style_get_type (void) G_GNUC_CONST;		GType adg_table_style_get_type (void) G_GNUC_CONST;
	AdgStyle * adg_table_style_new (void);		AdgTableStyle * adg_table_style_new (void);
	void adg_table_style_set_color_dress (AdgTableStyle *table_styl e,		void adg_table_style_set_color_dress (AdgTableStyle *table_styl e,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_table_style_get_color_dress (AdgTableStyle *table_styl e);		AdgDress adg_table_style_get_color_dress (AdgTableStyle *table_styl e);
	void adg_table_style_set_frame_dress (AdgTableStyle *table_styl e,		void adg_table_style_set_frame_dress (AdgTableStyle *table_styl e,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_table_style_get_frame_dress (AdgTableStyle *table_styl e);		AdgDress adg_table_style_get_frame_dress (AdgTableStyle *table_styl e);
	void adg_table_style_set_grid_dress (AdgTableStyle *table_styl e,		void adg_table_style_set_grid_dress (AdgTableStyle *table_styl e,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_table_style_get_grid_dress (AdgTableStyle *table_styl e);		AdgDress adg_table_style_get_grid_dress (AdgTableStyle *table_styl e);
	void adg_table_style_set_title_dress (AdgTableStyle *table_styl e,		void adg_table_style_set_title_dress (AdgTableStyle *table_styl e,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_table_style_get_title_dress (AdgTableStyle *table_styl e);		AdgDress adg_table_style_get_title_dress (AdgTableStyle *table_styl e);
	void adg_table_style_set_value_dress (AdgTableStyle *table_styl e,		void adg_table_style_set_value_dress (AdgTableStyle *table_styl e,
	AdgDress dress);		AdgDress dress);
	AdgDress adg_table_style_get_value_dress (AdgTableStyle *table_styl e);		AdgDress adg_table_style_get_value_dress (AdgTableStyle *table_styl e);
	void adg_table_style_set_row_height (AdgTableStyle *table_styl e,		void adg_table_style_set_row_height (AdgTableStyle *table_styl e,
	gdouble row_height );		gdouble height);
	gdouble adg_table_style_get_row_height (AdgTableStyle *table_styl e);		gdouble adg_table_style_get_row_height (AdgTableStyle *table_styl e);
	void adg_table_style_set_cell_padding(AdgTableStyle *table_styl e,		void adg_table_style_set_cell_padding(AdgTableStyle *table_styl e,
	const AdgPair *cell_paddi ng);		const AdgPair *padding);
	const AdgPair * adg_table_style_get_cell_padding(AdgTableStyle *table_styl e);		const AdgPair * adg_table_style_get_cell_padding(AdgTableStyle *table_styl e);
	void adg_table_style_set_cell_spacing(AdgTableStyle *table_styl e,		void adg_table_style_set_cell_spacing(AdgTableStyle *table_styl e,
	const AdgPair *cell_spaci ng);		const AdgPair *spacing);
	const AdgPair * adg_table_style_get_cell_spacing(AdgTableStyle *table_styl e);		const AdgPair * adg_table_style_get_cell_spacing(AdgTableStyle *table_styl e);
	G_END_DECLS		G_END_DECLS
	#endif /* __ADG_TABLE_STYLE_H__ */		#endif /* __ADG_TABLE_STYLE_H__ */
End of changes. 6 change blocks.
	9 lines changed or deleted		9 lines changed or added

	adg-table.h		adg-table.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_TABLE_H__		#ifndef __ADG_TABLE_H__
	#define __ADG_TABLE_H__		#define __ADG_TABLE_H__
	#include <adg/adg-entity.h>		#include "adg-entity.h"
	#include <adg/adg-pair.h>		#include "adg-pair.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_TABLE (adg_table_get_type())		#define ADG_TYPE_TABLE (adg_table_get_type())
	#define ADG_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_TABLE, AdgTable))		#define ADG_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_TABLE, AdgTable))
	#define ADG_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_TABLE, AdgTableClass))		#define ADG_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_TABLE, AdgTableClass))
	#define ADG_IS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_TABLE))		#define ADG_IS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_TABLE))
	#define ADG_IS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_TABLE))		#define ADG_IS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_TABLE))
	#define ADG_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_TABLE, AdgTableClass))		#define ADG_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_TABLE, AdgTableClass))
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added

	adg-title-block.h		adg-title-block.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_TITLE_BLOCK_H__		#ifndef __ADG_TITLE_BLOCK_H__
	#define __ADG_TITLE_BLOCK_H__		#define __ADG_TITLE_BLOCK_H__
	#include <adg/adg-table.h>		#include "adg-table.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_TITLE_BLOCK (adg_title_block_get_type())		#define ADG_TYPE_TITLE_BLOCK (adg_title_block_get_type())
	#define ADG_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_TITLE_BLOCK, AdgTitleBlock))		#define ADG_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_TITLE_BLOCK, AdgTitleBlock))
	#define ADG_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE_TITLE_BLOCK, AdgTitleBlockClass))		#define ADG_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE_TITLE_BLOCK, AdgTitleBlockClass))
	#define ADG_IS_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_TITLE_BLOCK))		#define ADG_IS_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_TITLE_BLOCK))
	#define ADG_IS_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE_TITLE_BLOCK))		#define ADG_IS_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE_TITLE_BLOCK))
	#define ADG_TITLE_BLOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE_TITLE_BLOCK, AdgTitleBlockClass))		#define ADG_TITLE_BLOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE_TITLE_BLOCK, AdgTitleBlockClass))
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	adg-toy-text.h		adg-toy-text.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_TOY_TEXT_H__		#ifndef __ADG_TOY_TEXT_H__
	#define __ADG_TOY_TEXT_H__		#define __ADG_TOY_TEXT_H__
	#include <adg/adg-entity.h>		#include "adg-entity.h"
	#include <adg/adg-pair.h>		#include "adg-pair.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_TOY_TEXT (adg_toy_text_get_type())		#define ADG_TYPE_TOY_TEXT (adg_toy_text_get_type())
	#define ADG_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), AD G_TYPE_TOY_TEXT, AdgToyText))		#define ADG_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), AD G_TYPE_TOY_TEXT, AdgToyText))
	#define ADG_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG _TYPE_TOY_TEXT, AdgToyTextClass))		#define ADG_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG _TYPE_TOY_TEXT, AdgToyTextClass))
	#define ADG_IS_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), AD G_TYPE_TOY_TEXT))		#define ADG_IS_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), AD G_TYPE_TOY_TEXT))
	#define ADG_IS_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG _TYPE_TOY_TEXT))		#define ADG_IS_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG _TYPE_TOY_TEXT))
	#define ADG_TOY_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG _TYPE_TOY_TEXT, AdgToyTextClass))		#define ADG_TOY_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG _TYPE_TOY_TEXT, AdgToyTextClass))
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added

	adg-trail.h		adg-trail.h
	skipping to change at line 21		skipping to change at line 21
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__ADG_H__)		#if !defined(__ADG_H__)
	#error "Only <adg/adg.h> can be included directly."		#error "Only <adg.h> can be included directly."
	#endif		#endif
	#ifndef __ADG_TRAIL_H__		#ifndef __ADG_TRAIL_H__
	#define __ADG_TRAIL_H__		#define __ADG_TRAIL_H__
	#include <adg/adg-model.h>		#include "adg-model.h"
	#include <adg/adg-primitive.h>		#include "adg-primitive.h"
	#include <adg/adg-segment.h>		#include "adg-segment.h"
	#include <cpml/cpml.h>		#include <cpml.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define ADG_TYPE_TRAIL (adg_trail_get_type())		#define ADG_TYPE_TRAIL (adg_trail_get_type())
	#define ADG_TRAIL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_TRAIL, AdgTrail))		#define ADG_TRAIL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_TRAIL, AdgTrail))
	#define ADG_TRAIL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_TRAIL, AdgTrailClass))		#define ADG_TRAIL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_TRAIL, AdgTrailClass))
	#define ADG_IS_TRAIL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_TRAIL))		#define ADG_IS_TRAIL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_TRAIL))
	#define ADG_IS_TRAIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_TRAIL))		#define ADG_IS_TRAIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_TRAIL))
	#define ADG_TRAIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_TRAIL, AdgTrailClass))		#define ADG_TRAIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_TRAIL, AdgTrailClass))
End of changes. 2 change blocks.
	5 lines changed or deleted		5 lines changed or added

	adg-type-builtins.h		adg-type-builtins.h
	/* Generated data (by glib-mkenums) */		/* Generated data (by glib-mkenums) */
	#ifndef __ADG_TYPE_BUILTINS_H__		#ifndef __ADG_TYPE_BUILTINS_H__
	#define __ADG_TYPE_BUILTINS_H__		#define __ADG_TYPE_BUILTINS_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* Enumerations from "adg-enums.h" */		/* Enumerations from "./adg-enums.h" */
	#define ADG_TYPE_THREE_STATE (adg_three_state_get_type())		#define ADG_TYPE_THREE_STATE (adg_three_state_get_type())
	GType adg_three_state_get_type(void) G_GNUC_CONST;		GType adg_three_state_get_type(void) G_GNUC_CONST;
	#define ADG_TYPE_TRANSFORM_MODE (adg_transform_mode_get_type())		#define ADG_TYPE_TRANSFORM_MODE (adg_transform_mode_get_type())
	GType adg_transform_mode_get_type(void) G_GNUC_CONST;		GType adg_transform_mode_get_type(void) G_GNUC_CONST;
	#define ADG_TYPE_MIX_METHOD (adg_mix_method_get_type())		#define ADG_TYPE_MIX_METHOD (adg_mix_method_get_type())
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	adg.h		adg.h
	skipping to change at line 23		skipping to change at line 23
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef __ADG_H__		#ifndef __ADG_H__
	#define __ADG_H__		#define __ADG_H__
	#include <adg/adg-pair.h>		#include <glib-object.h>
	#include <adg/adg-matrix.h>
	#include <adg/adg-pattern.h>
	#include <adg/adg-primitive.h>
	#include <adg/adg-segment.h>
	#include <adg/adg-point.h>
	#include <adg/adg-model.h>		#include "adg/adg-utils.h"
	#include <adg/adg-trail.h>		#include "adg/adg-pair.h"
	#include <adg/adg-path.h>		#include "adg/adg-matrix.h"
	#include <adg/adg-edges.h>		#include "adg/adg-pattern.h"
			#include "adg/adg-primitive.h"
			#include "adg/adg-segment.h"
			#include "adg/adg-point.h"
	#include <adg/adg-style.h>		#include "adg/adg-model.h"
	#include <adg/adg-color-style.h>		#include "adg/adg-trail.h"
	#include <adg/adg-line-style.h>		#include "adg/adg-path.h"
	#include <adg/adg-font-style.h>		#include "adg/adg-edges.h"
	#include <adg/adg-ruled-fill.h>
	#include <adg/adg-table-style.h>
	#include <adg/adg-dim-style.h>
	#include <adg/adg-fill-style.h>
	#include <adg/adg-entity.h>		#include "adg/adg-style.h"
	#include <adg/adg-stroke.h>		#include "adg/adg-color-style.h"
	#include <adg/adg-hatch.h>		#include "adg/adg-line-style.h"
	#include <adg/adg-toy-text.h>		#include "adg/adg-font-style.h"
	#include <adg/adg-logo.h>		#include "adg/adg-ruled-fill.h"
	#include <adg/adg-projection.h>		#include "adg/adg-table-style.h"
	#include <adg/adg-container.h>		#include "adg/adg-dim-style.h"
	#include <adg/adg-alignment.h>		#include "adg/adg-fill-style.h"
	#include <adg/adg-canvas.h>		#include "adg/adg-dress.h"
	#include <adg/adg-marker.h>		#include "adg/adg-dress-builtins.h"
	#include <adg/adg-arrow.h>
	#include <adg/adg-dim.h>		#include "adg/adg-entity.h"
	#include <adg/adg-adim.h>		#include "adg/adg-stroke.h"
	#include <adg/adg-ldim.h>		#include "adg/adg-hatch.h"
	#include <adg/adg-rdim.h>		#include "adg/adg-toy-text.h"
	#include <adg/adg-table.h>		#include "adg/adg-logo.h"
	#include <adg/adg-title-block.h>		#include "adg/adg-projection.h"
			#include "adg/adg-container.h"
			#include "adg/adg-alignment.h"
			#include "adg/adg-canvas.h"
			#include "adg/adg-marker.h"
			#include "adg/adg-arrow.h"
			#include "adg/adg-dim.h"
			#include "adg/adg-adim.h"
			#include "adg/adg-ldim.h"
			#include "adg/adg-rdim.h"
			#include "adg/adg-table.h"
			#include "adg/adg-title-block.h"
	#endif /* __ADG_H__ */		#endif /* __ADG_H__ */
End of changes. 4 change blocks.
	35 lines changed or deleted		40 lines changed or added

	cpml-arc.h		cpml-arc.h
	skipping to change at line 29		skipping to change at line 29
	#if !defined(__CPML_H__)		#if !defined(__CPML_H__)
	#error "Only <cpml/cpml.h> can be included directly."		#error "Only <cpml/cpml.h> can be included directly."
	#endif		#endif
	#ifndef __CPML_ARC_H__		#ifndef __CPML_ARC_H__
	#define __CPML_ARC_H__		#define __CPML_ARC_H__
	CAIRO_BEGIN_DECLS		CAIRO_BEGIN_DECLS
	#ifdef CAIRO_PATH_ARC_TO
	#define CPML_ARC CAIRO_PATH_ARC_TO
	#else
	#define CPML_ARC 100
	#endif
	cairo_bool_t		cairo_bool_t
	cpml_arc_info (const CpmlPrimitive *arc,		cpml_arc_info (const CpmlPrimitive *arc,
	CpmlPair *center,		CpmlPair *center,
	double *r,		double *r,
	double *start,		double *start,
	double *end);		double *end);
	void cpml_arc_to_cairo (const CpmlPrimitive *arc,		void cpml_arc_to_cairo (const CpmlPrimitive *arc,
	cairo_t *cr);		cairo_t *cr);
	void cpml_arc_to_curves (const CpmlPrimitive *arc,		void cpml_arc_to_curves (const CpmlPrimitive *arc,
	CpmlSegment *segment,		CpmlSegment *segment,
End of changes. 1 change blocks.
	6 lines changed or deleted		0 lines changed or added

	cpml-curve.h		cpml-curve.h
	skipping to change at line 29		skipping to change at line 29
	#if !defined(__CPML_H__)		#if !defined(__CPML_H__)
	#error "Only <cpml/cpml.h> can be included directly."		#error "Only <cpml/cpml.h> can be included directly."
	#endif		#endif
	#ifndef __CPML_CURVE_H__		#ifndef __CPML_CURVE_H__
	#define __CPML_CURVE_H__		#define __CPML_CURVE_H__
	CAIRO_BEGIN_DECLS		CAIRO_BEGIN_DECLS
	#define CPML_CURVE CAIRO_PATH_CURVE_TO
	void cpml_curve_put_pair_at_time (const CpmlPrimitive *curve,		void cpml_curve_put_pair_at_time (const CpmlPrimitive *curve,
	double t,		double t,
	CpmlPair *pair);		CpmlPair *pair);
	void cpml_curve_put_vector_at_time (const CpmlPrimitive *curve,		void cpml_curve_put_vector_at_time (const CpmlPrimitive *curve,
	double t,		double t,
	CpmlVector *vector);		CpmlVector *vector);
	CAIRO_END_DECLS		CAIRO_END_DECLS
	#endif /* __CPML_CURVE_H__ */		#endif /* __CPML_CURVE_H__ */
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	cpml-primitive.h		cpml-primitive.h
	skipping to change at line 27		skipping to change at line 27
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#if !defined(__CPML_H__)		#if !defined(__CPML_H__)
	#error "Only <cpml/cpml.h> can be included directly."		#error "Only <cpml/cpml.h> can be included directly."
	#endif		#endif
	#ifndef __CPML_PRIMITIVE_H__		#ifndef __CPML_PRIMITIVE_H__
	#define __CPML_PRIMITIVE_H__		#define __CPML_PRIMITIVE_H__
	CAIRO_BEGIN_DECLS		#ifndef CAIRO_PATH_ARC_TO
			#define CAIRO_PATH_ARC_TO 100
			#endif
	#define CPML_MOVE CAIRO_PATH_MOVE_TO		CAIRO_BEGIN_DECLS
	typedef struct _CpmlPrimitive CpmlPrimitive;		typedef struct _CpmlPrimitive CpmlPrimitive;
	typedef cairo_path_data_type_t CpmlPrimitiveType;
			typedef enum {
			CPML_MOVE = CAIRO_PATH_MOVE_TO,
			CPML_LINE = CAIRO_PATH_LINE_TO,
			CPML_CURVE = CAIRO_PATH_CURVE_TO,
			CPML_CLOSE = CAIRO_PATH_CLOSE_PATH,
			CPML_ARC = CAIRO_PATH_ARC_TO
			} CpmlPrimitiveType;
	struct _CpmlPrimitive {		struct _CpmlPrimitive {
	CpmlSegment *segment;		CpmlSegment *segment;
	cairo_path_data_t *org;		cairo_path_data_t *org;
	cairo_path_data_t *data;		cairo_path_data_t *data;
	};		};
	size_t cpml_primitive_type_get_n_points		size_t cpml_primitive_type_get_n_points
	(CpmlPrimitiveType type);		(CpmlPrimitiveType type);
	void cpml_primitive_from_segment(CpmlPrimitive *primitive,		void cpml_primitive_from_segment(CpmlPrimitive *primitive,
End of changes. 3 change blocks.
	3 lines changed or deleted		12 lines changed or added

	cpml.h		cpml.h
	skipping to change at line 23		skipping to change at line 23
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the		* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef __CPML_H__		#ifndef __CPML_H__
	#define __CPML_H__		#define __CPML_H__
	#include <cpml/cpml-util.h>		#include "cpml/cpml-utils.h"
	#include <cpml/cpml-pair.h>		#include "cpml/cpml-pair.h"
	#include <cpml/cpml-extents.h>		#include "cpml/cpml-extents.h"
	#include <cpml/cpml-segment.h>		#include "cpml/cpml-segment.h"
	#include <cpml/cpml-primitive.h>		#include "cpml/cpml-primitive.h"
	#include <cpml/cpml-line.h>		#include "cpml/cpml-arc.h"
	#include <cpml/cpml-close.h>		#include "cpml/cpml-curve.h"
	#include <cpml/cpml-arc.h>
	#include <cpml/cpml-curve.h>
	#endif /* __CPML_H__ */		#endif /* __CPML_H__ */
End of changes. 1 change blocks.
	9 lines changed or deleted		7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/