adg-adim.h   adg-adim.h 
skipping to change at line 38 skipping to change at line 38
#define ADG_ADIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_ADIM, AdgADim)) #define ADG_ADIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_ADIM, AdgADim))
#define ADG_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_ADIM, AdgADimClass)) #define ADG_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_ADIM, AdgADimClass))
#define ADG_IS_ADIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_ADIM)) #define ADG_IS_ADIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_ADIM))
#define ADG_IS_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_ADIM)) #define ADG_IS_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_ADIM))
#define ADG_ADIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_ADIM, AdgADimClass)) #define ADG_ADIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_ADIM, AdgADimClass))
typedef struct _AdgADim AdgADim; typedef struct _AdgADim AdgADim;
typedef struct _AdgADimClass AdgADimClass; typedef struct _AdgADimClass AdgADimClass;
typedef struct _AdgADimPrivate AdgADimPrivate; typedef struct _AdgADimPrivate AdgADimPrivate;
struct _AdgADim struct _AdgADim {
{ AdgDim dim;
AdgDim dim; /*< private >*/
AdgADimPrivate *priv;
/*< private >*/
AdgADimPrivate *priv;
}; };
struct _AdgADimClass struct _AdgADimClass {
{ AdgDimClass parent_class;
AdgDimClass parent_class;
}; };
GType adg_adim_get_type (void) G_GNUC_CONST; GType adg_adim_get_type (void) G_GNUC_CONST;
AdgEntity * adg_adim_new (void); AdgEntity * adg_adim_new (void);
G_END_DECLS G_END_DECLS
#endif /* __ADG_ADIM_H__ */ #endif /* __ADG_ADIM_H__ */
 End of changes. 2 change blocks. 
9 lines changed or deleted 6 lines changed or added


 adg-arrow-style.h   adg-arrow-style.h 
skipping to change at line 50 skipping to change at line 50
/** /**
* AdgArrowRenderer: * AdgArrowRenderer:
* @arrow_style: an #AdgArrowStyle object * @arrow_style: an #AdgArrowStyle object
* @cr: a #cairo_t drawing context * @cr: a #cairo_t drawing context
* @segment: the CpmlPath segment where rendering the arrow * @segment: the CpmlPath segment where rendering the arrow
* *
* Callback that renders a custom arrow at the start position in @segment. * Callback that renders a custom arrow at the start position in @segment.
* If you need an ending arrow, you should reverse the segment and recall * If you need an ending arrow, you should reverse the segment and recall
* this function. * this function.
*/ **/
typedef void (*AdgArrowRenderer) (AdgArrowStyle *arrow_style typedef void (*AdgArrowRenderer) (AdgArrowStyle *arrow_styl
, e,
cairo_t *cr, cairo_t *cr,
CpmlPath *segment); CpmlPath *segment);
struct _AdgArrowStyle
{
AdgStyle style;
/*< private >*/ struct _AdgArrowStyle {
AdgArrowStylePrivate *priv; AdgStyle style;
/*< private >*/
AdgArrowStylePrivate *priv;
}; };
struct _AdgArrowStyleClass struct _AdgArrowStyleClass {
{ AdgStyleClass parent_class;
AdgStyleClass parent_class;
}; };
GType adg_arrow_style_get_type (void) G_GNUC_CONST; GType adg_arrow_style_get_type (void) G_GNUC_CONST;
AdgStyleSlot adg_arrow_style_get_slot (void) G_GNUC_CONST; AdgStyleSlot adg_arrow_style_get_slot (void) G_GNUC_CONST;
AdgStyle * adg_arrow_style_new (void); AdgStyle * adg_arrow_style_new (void);
void adg_arrow_style_render (AdgArrowStyle *arrow_style void adg_arrow_style_render (AdgArrowStyle *arrow_styl
, e,
cairo_t *cr, cairo_t *cr,
CpmlPath *segment); CpmlPath *segment);
gdouble adg_arrow_style_get_size (AdgArrowStyle *arr gdouble adg_arrow_style_get_size (AdgArrowStyle *arrow_styl
ow_style); e);
void adg_arrow_style_set_size (AdgArrowStyle *arrow_style void adg_arrow_style_set_size (AdgArrowStyle *arrow_styl
, e,
gdouble size); gdouble size);
gdouble adg_arrow_style_get_angle (AdgArrowStyle *arr gdouble adg_arrow_style_get_angle (AdgArrowStyle *arrow_styl
ow_style); e);
void adg_arrow_style_set_angle (AdgArrowStyle *arrow_style void adg_arrow_style_set_angle (AdgArrowStyle *arrow_styl
, e,
gdouble angle); gdouble angle);
gdouble adg_arrow_style_get_margin (AdgArrowStyle *arr gdouble adg_arrow_style_get_margin (AdgArrowStyle *arrow_styl
ow_style); e);
void adg_arrow_style_set_margin (AdgArrowStyle *arrow_style void adg_arrow_style_set_margin (AdgArrowStyle *arrow_styl
, e,
gdouble margin); gdouble margin);
const AdgArrowRenderer const AdgArrowRenderer
adg_arrow_style_get_renderer (AdgArrowStyle *arrow_style adg_arrow_style_get_renderer (AdgArrowStyle *arrow_styl
); e);
void adg_arrow_style_set_renderer (AdgArrowStyle *arrow_style void adg_arrow_style_set_renderer (AdgArrowStyle *arrow_styl
, e,
AdgArrowRenderer renderer); AdgArrowRenderer renderer)
;
G_END_DECLS G_END_DECLS
#endif /* __ADG_ARROW_STYLE_H__ */ #endif /* __ADG_ARROW_STYLE_H__ */
 End of changes. 7 change blocks. 
41 lines changed or deleted 39 lines changed or added


 adg-canvas.h   adg-canvas.h 
skipping to change at line 39 skipping to change at line 39
#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_ TYPE_CANVAS, AdgCanvasClass)) #define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_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_ TYPE_CANVAS)) #define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_CANVAS))
#define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_CANVAS, AdgCanvasClass)) #define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_CANVAS, AdgCanvasClass))
/* AdgCanvas declared in adg-entity.h */ /* AdgCanvas declared in adg-entity.h */
typedef struct _AdgCanvasClass AdgCanvasClass; typedef struct _AdgCanvasClass AdgCanvasClass;
typedef struct _AdgCanvasPrivate AdgCanvasPrivate; typedef struct _AdgCanvasPrivate AdgCanvasPrivate;
struct _AdgCanvas struct _AdgCanvas {
{ AdgContainer container;
AdgContainer container; /*< private >*/
AdgCanvasPrivate *priv;
/*< private >*/
AdgCanvasPrivate *priv;
}; };
struct _AdgCanvasClass struct _AdgCanvasClass {
{ 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);
G_END_DECLS G_END_DECLS
#endif /* __ADG_CANVAS_H__ */ #endif /* __ADG_CANVAS_H__ */
 End of changes. 2 change blocks. 
9 lines changed or deleted 6 lines changed or added


 adg-container.h   adg-container.h 
skipping to change at line 38 skipping to change at line 38
#define ADG_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TYPE_CONTAINER, AdgContainer)) #define ADG_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TYPE_CONTAINER, AdgContainer))
#define ADG_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), A DG_TYPE_CONTAINER, AdgContainerClass)) #define ADG_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), A DG_TYPE_CONTAINER, AdgContainerClass))
#define ADG_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TYPE_CONTAINER)) #define ADG_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TYPE_CONTAINER))
#define ADG_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), A DG_TYPE_CONTAINER)) #define ADG_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), A DG_TYPE_CONTAINER))
#define ADG_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), A DG_TYPE_CONTAINER, AdgContainerClass)) #define ADG_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), A DG_TYPE_CONTAINER, AdgContainerClass))
typedef struct _AdgContainer AdgContainer; typedef struct _AdgContainer AdgContainer;
typedef struct _AdgContainerClass AdgContainerClass; typedef struct _AdgContainerClass AdgContainerClass;
typedef struct _AdgContainerPrivate AdgContainerPrivate; typedef struct _AdgContainerPrivate AdgContainerPrivate;
struct _AdgContainer struct _AdgContainer {
{ AdgEntity entity;
AdgEntity entity; /*< private >*/
AdgContainerPrivate *priv;
/*< private >*/
AdgContainerPrivate *priv;
}; };
struct _AdgContainerClass struct _AdgContainerClass {
{ AdgEntityClass parent_class;
AdgEntityClass parent_class;
}; };
GType adg_container_get_type (void) G_GNUC_CONST; GType adg_container_get_type (void) G_GNUC_CONST
const AdgMatrix *adg_container_get_model_transformation (AdgContaine ;
r *container); const AdgMatrix *adg_container_get_model_transformation (AdgContainer *co
void adg_container_set_model_transformation (AdgContainer *con ntainer);
tainer, void adg_container_set_model_transformation (AdgContainer *co
AdgMatrix *tra ntainer,
nsformation); AdgMatrix *tr
const AdgMatrix *adg_container_get_paper_transformation (AdgContaine ansformation);
r *container); const AdgMatrix *adg_container_get_paper_transformation (AdgContainer *co
void adg_container_set_paper_transformation (AdgContainer *con ntainer);
tainer, void adg_container_set_paper_transformation (AdgContainer *co
AdgMatrix *tra ntainer,
nsformation); AdgMatrix *tr
ansformation);
G_END_DECLS G_END_DECLS
#endif /* __ADG_CONTAINER_H__ */ #endif /* __ADG_CONTAINER_H__ */
 End of changes. 3 change blocks. 
22 lines changed or deleted 20 lines changed or added


 adg-context.h   adg-context.h 
skipping to change at line 39 skipping to change at line 39
#define ADG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG _TYPE_CONTEXT, AdgContextClass)) #define ADG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG _TYPE_CONTEXT, AdgContextClass))
#define ADG_IS_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AD G_TYPE_CONTEXT)) #define ADG_IS_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AD G_TYPE_CONTEXT))
#define ADG_IS_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG _TYPE_CONTEXT)) #define ADG_IS_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG _TYPE_CONTEXT))
#define ADG_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG _TYPE_CONTEXT, AdgContextClass)) #define ADG_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG _TYPE_CONTEXT, AdgContextClass))
typedef struct _AdgContext AdgContext; typedef struct _AdgContext AdgContext;
typedef struct _AdgContextClass AdgContextClass; typedef struct _AdgContextClass AdgContextClass;
typedef struct _AdgContextPrivate AdgContextPrivate; typedef struct _AdgContextPrivate AdgContextPrivate;
typedef AdgStyle * (*AdgContextFiller) (AdgStyleClass *style_class, gpointe r user_data); typedef AdgStyle * (*AdgContextFiller) (AdgStyleClass *style_class, gpointe r user_data);
struct _AdgContext struct _AdgContext {
{ GObject object;
GObject object; /*< private >*/
AdgContextPrivate *priv;
/*< private >*/
AdgContextPrivate *priv;
}; };
struct _AdgContextClass struct _AdgContextClass {
{ GObjectClass object_class;
GObjectClass object_class;
}; };
GType adg_context_get_type (void) G_GNUC_CONST; GType adg_context_get_type (void) G_GNUC_CONST;
AdgStyleSlot adg_context_get_slot (GType type); AdgStyleSlot adg_context_get_slot (GType type);
AdgContext * adg_context_new (AdgContextFiller context_fi AdgContext * adg_context_new (AdgContextFiller context_f
ller, iller,
gpointer user_data); gpointer user_data)
AdgStyle * adg_context_get_style (AdgContext *context, ;
AdgStyleSlot slot); AdgStyle * adg_context_get_style (AdgContext *context,
void adg_context_set_style (AdgContext *context, AdgStyleSlot slot);
AdgStyle *style); void adg_context_set_style (AdgContext *context,
AdgStyle *style);
G_END_DECLS G_END_DECLS
#endif /* __ADG_CONTEXT_H__ */ #endif /* __ADG_CONTEXT_H__ */
 End of changes. 4 change blocks. 
18 lines changed or deleted 16 lines changed or added


 adg-dim-style.h   adg-dim-style.h 
skipping to change at line 44 skipping to change at line 44
#define ADG_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TYPE_DIM_STYLE, AdgDimStyle)) #define ADG_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TYPE_DIM_STYLE, AdgDimStyle))
#define ADG_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), A DG_TYPE_DIM_STYLE, AdgDimStyleClass)) #define ADG_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), A DG_TYPE_DIM_STYLE, AdgDimStyleClass))
#define ADG_IS_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TYPE_DIM_STYLE)) #define ADG_IS_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TYPE_DIM_STYLE))
#define ADG_IS_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), A DG_TYPE_DIM_STYLE)) #define ADG_IS_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), A DG_TYPE_DIM_STYLE))
#define ADG_DIM_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), A DG_TYPE_DIM_STYLE, AdgDimStyleClass)) #define ADG_DIM_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), A DG_TYPE_DIM_STYLE, AdgDimStyleClass))
typedef struct _AdgDimStyle AdgDimStyle; typedef struct _AdgDimStyle AdgDimStyle;
typedef struct _AdgDimStyleClass AdgDimStyleClass; typedef struct _AdgDimStyleClass AdgDimStyleClass;
typedef struct _AdgDimStylePrivate AdgDimStylePrivate; typedef struct _AdgDimStylePrivate AdgDimStylePrivate;
struct _AdgDimStyle struct _AdgDimStyle {
{ AdgStyle style;
AdgStyle style; /*< private >*/
AdgDimStylePrivate *priv;
/*< private >*/
AdgDimStylePrivate *priv;
}; };
struct _AdgDimStyleClass struct _AdgDimStyleClass {
{ 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;
AdgStyleSlot adg_dim_style_get_slot (void) G_GNUC_CONST; AdgStyleSlot adg_dim_style_get_slot (void) G_GNUC_CONST;
AdgStyle * adg_dim_style_new (void); AdgStyle * adg_dim_style_new (void);
AdgStyle * adg_dim_style_get_quote_style (AdgDimStyle *dim_style); AdgStyle * adg_dim_style_get_quote_style (AdgDimStyle *dim_style)
void adg_dim_style_set_quote_style (AdgDimStyle *dim_style, ;
AdgFontStyle *style); void adg_dim_style_set_quote_style (AdgDimStyle *dim_style,
AdgStyle * adg_dim_style_get_tolerance_style AdgFontStyle *style);
(AdgDimStyle *dim_style); AdgStyle * adg_dim_style_get_tolerance_style
void adg_dim_style_set_tolerance_style (AdgDimStyle *dim_style)
(AdgDimStyle *dim_style, ;
AdgFontStyle *style); void adg_dim_style_set_tolerance_style
AdgStyle * adg_dim_style_get_note_style (AdgDimStyle *dim_style); (AdgDimStyle *dim_style,
void adg_dim_style_set_note_style (AdgDimStyle *dim_style, AdgFontStyle *style);
AdgFontStyle *style); AdgStyle * adg_dim_style_get_note_style (AdgDimStyle *dim_style)
AdgStyle * adg_dim_style_get_line_style (AdgDimStyle *dim_style); ;
void adg_dim_style_set_line_style (AdgDimStyle *dim_style, void adg_dim_style_set_note_style (AdgDimStyle *dim_style,
AdgLineStyle *style); AdgFontStyle *style);
AdgStyle * adg_dim_style_get_arrow_style (AdgDimStyle *dim_style); AdgStyle * adg_dim_style_get_line_style (AdgDimStyle *dim_style)
void adg_dim_style_set_arrow_style (AdgDimStyle *dim_style, ;
AdgArrowStyle *style); void adg_dim_style_set_line_style (AdgDimStyle *dim_style,
gdouble adg_dim_style_get_from_offset (AdgDimStyle *dim AdgLineStyle *style);
_style); AdgStyle * adg_dim_style_get_arrow_style (AdgDimStyle *dim_style)
void adg_dim_style_set_from_offset (AdgDimStyle *dim_style, ;
gdouble offset); void adg_dim_style_set_arrow_style (AdgDimStyle *dim_style,
gdouble adg_dim_style_get_to_offset (AdgDimStyle *dim AdgArrowStyle *style);
_style); gdouble adg_dim_style_get_from_offset (AdgDimStyle *dim_style)
void adg_dim_style_set_to_offset (AdgDimStyle *dim_style, ;
gdouble offset); void adg_dim_style_set_from_offset (AdgDimStyle *dim_style,
gdouble adg_dim_style_get_baseline_spacing gdouble offset);
(AdgDimStyle *dim_style); gdouble adg_dim_style_get_to_offset (AdgDimStyle *dim_style)
void adg_dim_style_set_baseline_spacing ;
(AdgDimStyle *dim_style, void adg_dim_style_set_to_offset (AdgDimStyle *dim_style,
gdouble spacing); gdouble offset);
gdouble adg_dim_style_get_tolerance_spacing gdouble adg_dim_style_get_baseline_spacing
(AdgDimStyle *dim_style); (AdgDimStyle *dim_style)
void adg_dim_style_set_tolerance_spacing ;
(AdgDimStyle *dim_style, void adg_dim_style_set_baseline_spacing
gdouble spacing); (AdgDimStyle *dim_style,
const AdgPair * adg_dim_style_get_quote_shift (AdgDimStyle *dim gdouble spacing);
_style); gdouble adg_dim_style_get_tolerance_spacing
void adg_dim_style_set_quote_shift (AdgDimStyle *dim_style, (AdgDimStyle *dim_style)
const AdgPair *shift); ;
const AdgPair * adg_dim_style_get_tolerance_shift void adg_dim_style_set_tolerance_spacing
(AdgDimStyle *dim_style); (AdgDimStyle *dim_style,
void adg_dim_style_set_tolerance_shift gdouble spacing);
(AdgDimStyle *dim_style, const AdgPair * adg_dim_style_get_quote_shift (AdgDimStyle *dim_style)
const AdgPair *shift); ;
const AdgPair * adg_dim_style_get_note_shift (AdgDimStyle *dim void adg_dim_style_set_quote_shift (AdgDimStyle *dim_style,
_style); const AdgPair *shift);
void adg_dim_style_set_note_shift (AdgDimStyle *dim_style, const AdgPair * adg_dim_style_get_tolerance_shift
const AdgPair *shift); (AdgDimStyle *dim_style)
const gchar * adg_dim_style_get_number_format (AdgDimStyle *dim_style); ;
void adg_dim_style_set_number_format (AdgDimStyle *dim_style, void adg_dim_style_set_tolerance_shift
const gchar *format); (AdgDimStyle *dim_style,
const gchar * adg_dim_style_get_number_tag (AdgDimStyle *dim_style); const AdgPair *shift);
void adg_dim_style_set_number_tag (AdgDimStyle *dim_style, const AdgPair * adg_dim_style_get_note_shift (AdgDimStyle *dim_style)
const gchar *tag); ;
void adg_dim_style_set_note_shift (AdgDimStyle *dim_style,
const AdgPair *shift);
const gchar * adg_dim_style_get_number_format (AdgDimStyle *dim_style)
;
void adg_dim_style_set_number_format (AdgDimStyle *dim_style,
const gchar *format);
const gchar * adg_dim_style_get_number_tag (AdgDimStyle *dim_style)
;
void adg_dim_style_set_number_tag (AdgDimStyle *dim_style,
const gchar *tag);
G_END_DECLS G_END_DECLS
#endif /* __ADG_DIM_STYLE_H__ */ #endif /* __ADG_DIM_STYLE_H__ */
 End of changes. 4 change blocks. 
66 lines changed or deleted 73 lines changed or added


 adg-dim.h   adg-dim.h 
skipping to change at line 39 skipping to change at line 39
#define ADG_DIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TY PE_DIM, AdgDim)) #define ADG_DIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TY PE_DIM, AdgDim))
#define ADG_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TYP E_DIM, AdgDimClass)) #define ADG_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TYP E_DIM, AdgDimClass))
#define ADG_IS_DIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TY PE_DIM)) #define ADG_IS_DIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TY PE_DIM))
#define ADG_IS_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYP E_DIM)) #define ADG_IS_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYP E_DIM))
#define ADG_DIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYP E_DIM, AdgDimClass)) #define ADG_DIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYP E_DIM, AdgDimClass))
typedef struct _AdgDim AdgDim; typedef struct _AdgDim AdgDim;
typedef struct _AdgDimClass AdgDimClass; typedef struct _AdgDimClass AdgDimClass;
typedef struct _AdgDimPrivate AdgDimPrivate; typedef struct _AdgDimPrivate AdgDimPrivate;
struct _AdgDim struct _AdgDim {
{ AdgEntity entity;
AdgEntity entity; /*< private >*/
AdgDimPrivate *priv;
/*< private >*/
AdgDimPrivate *priv;
}; };
struct _AdgDimClass struct _AdgDimClass {
{ AdgEntityClass parent_class;
AdgEntityClass parent_class; /* Virtual Table */
gchar * (*default_quote) (AdgDim *dim);
/* Virtual Table */ void (*quote_layout) (AdgDim *dim,
gchar * (*default_quote) (AdgDim *di cairo_t *cr);
m);
void (*quote_layout) (AdgDim *di
m,
cairo_t *cr
);
}; };
GType adg_dim_get_type (void) G_GNUC_CONST GType adg_dim_get_type (void) G_GNUC_CONST;
; const AdgPair * adg_dim_get_org (AdgDim *dim);
void adg_dim_set_org (AdgDim *dim,
const AdgPair * adg_dim_get_ref1 (AdgDim *di const AdgPair *org);
m); void adg_dim_set_org_explicit (AdgDim *dim,
const AdgPair * adg_dim_get_ref2 (AdgDim *di gdouble org_x,
m); gdouble org_y);
void adg_dim_set_ref (AdgDim *di gdouble adg_dim_get_angle (AdgDim *dim);
m, void adg_dim_set_angle (AdgDim *dim,
const AdgPair *re gdouble angle);
f1, const AdgPair * adg_dim_get_ref1 (AdgDim *dim);
const AdgPair *re const AdgPair * adg_dim_get_ref2 (AdgDim *dim);
f2); void adg_dim_set_ref (AdgDim *dim,
void adg_dim_set_ref_explicit (AdgDim *di const AdgPair *ref1,
m, const AdgPair *ref2);
double re void adg_dim_set_ref_explicit (AdgDim *dim,
f1_x, gdouble ref1_x,
double re gdouble ref1_y,
f1_y, gdouble ref2_x,
double re gdouble ref2_y);
f2_x, const AdgPair * adg_dim_get_pos1 (AdgDim *dim);
double re const AdgPair * adg_dim_get_pos2 (AdgDim *dim);
f2_y); void adg_dim_set_pos (AdgDim *dim,
const AdgPair * adg_dim_get_pos1 (AdgDim *di AdgPair *pos1,
m); AdgPair *pos2);
const AdgPair * adg_dim_get_pos2 (AdgDim *di void adg_dim_set_pos_explicit (AdgDim *dim,
m); gdouble pos1_x,
void adg_dim_set_pos (AdgDim *di gdouble pos1_y,
m, gdouble pos2_x,
AdgPair *po gdouble pos2_y);
s1, gdouble adg_dim_get_level (AdgDim *dim);
AdgPair *po void adg_dim_set_level (AdgDim *dim,
s2); gdouble level);
void adg_dim_set_pos_explicit (AdgDim *di const gchar * adg_dim_get_quote (AdgDim *dim);
m, void adg_dim_set_quote (AdgDim *dim,
double po const gchar *quote);
s1_x, const gchar * adg_dim_get_tolerance_up (AdgDim *dim);
double po void adg_dim_set_tolerance_up (AdgDim *dim,
s1_y, const gchar *tolerance_
double po up);
s2_x, const gchar * adg_dim_get_tolerance_down (AdgDim *dim);
double po void adg_dim_set_tolerance_down (AdgDim *dim,
s2_y); const gchar *tolerance_
double adg_dim_get_level (AdgDim *di down);
m); void adg_dim_set_tolerances (AdgDim *dim,
void adg_dim_set_level (AdgDim *di const gchar *tolerance_
m, up,
double le const gchar *tolerance_
vel); down);
const gchar * adg_dim_get_quote (AdgDim *di const gchar * adg_dim_get_note (AdgDim *dim);
m); void adg_dim_set_note (AdgDim *dim,
void adg_dim_set_quote (AdgDim *di const gchar *note);
m, void adg_dim_render_quote (AdgDim *dim,
const gchar *qu cairo_t *cr);
ote);
const gchar * adg_dim_get_tolerance_up (AdgDim *di
m);
void adg_dim_set_tolerance_up (AdgDim *di
m,
const gchar *to
lerance_up);
const gchar * adg_dim_get_tolerance_down (AdgDim *di
m);
void adg_dim_set_tolerance_down (AdgDim *di
m,
const gchar *to
lerance_down);
void adg_dim_set_tolerances (AdgDim *di
m,
const gchar *to
lerance_up,
const gchar *to
lerance_down);
const gchar * adg_dim_get_note (AdgDim *di
m);
void adg_dim_set_note (AdgDim *di
m,
const gchar *no
te);
G_END_DECLS G_END_DECLS
#endif /* __ADG_DIM_H__ */ #endif /* __ADG_DIM_H__ */
 End of changes. 3 change blocks. 
96 lines changed or deleted 64 lines changed or added


 adg-entity.h   adg-entity.h 
skipping to change at line 46 skipping to change at line 46
#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_ TYPE_ENTITY, AdgEntityClass)) #define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_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_ TYPE_ENTITY)) #define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_ENTITY))
#define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_ENTITY, AdgEntityClass)) #define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_ENTITY, AdgEntityClass))
typedef struct _AdgEntity AdgEntity; typedef struct _AdgEntity AdgEntity;
typedef struct _AdgEntityClass AdgEntityClass; typedef struct _AdgEntityClass AdgEntityClass;
typedef struct _AdgEntityPrivate AdgEntityPrivate; typedef struct _AdgEntityPrivate AdgEntityPrivate;
struct _AdgEntity struct _AdgEntity {
{ GInitiallyUnowned initially_unowned;
GInitiallyUnowned initially_unowned;
/*< private >*/ /*< private >*/
AdgEntityPrivate *priv; AdgEntityPrivate *priv;
}; };
struct _AdgEntityClass struct _AdgEntityClass {
{ GInitiallyUnownedClass parent_class;
GInitiallyUnownedClass parent_class; /* Signals */
void (*model_matrix_changed) (AdgEntity *entity,
/* Signals */ AdgMatrix *parent_mat
void (*model_matrix_changed) (AdgEntity *ent rix);
ity, void (*paper_matrix_changed) (AdgEntity *entity,
AdgMatrix *par AdgMatrix *parent_mat
ent_matrix); rix);
void (*paper_matrix_changed) (AdgEntity *ent void (*invalidate) (AdgEntity *entity);
ity, void (*render) (AdgEntity *entity,
AdgMatrix *par cairo_t *cr);
ent_matrix); /* Virtual Table */
void (*render) (AdgEntity *ent const AdgMatrix * (*get_model_matrix) (AdgEntity *entity);
ity, const AdgMatrix * (*get_paper_matrix) (AdgEntity *entity);
cairo_t *cr)
;
/* Virtual Table */
const AdgMatrix * (*get_model_matrix) (AdgEntity *ent
ity);
const AdgMatrix * (*get_paper_matrix) (AdgEntity *ent
ity);
}; };
#define ADG_CALLBACK(f) ((AdgCallback) (f)) #define ADG_CALLBACK(f) ((AdgCallback) (f))
typedef void (*AdgCallback) (AdgEntity *entity, gpointer user_data); typedef void (*AdgCallback) (AdgEntity *entity, gpointer user_data);
GType adg_entity_get_type (void) G_GNUC_CONST; GType adg_entity_get_type (void) G_GNUC_CONST;
AdgCanvas * adg_entity_get_canvas (AdgEntity *ent AdgCanvas * adg_entity_get_canvas (AdgEntity *entity);
ity);
AdgContext * adg_entity_get_context (AdgEntity *ent AdgContext * adg_entity_get_context (AdgEntity *entity);
ity); void adg_entity_set_context (AdgEntity *entity,
void adg_entity_set_context (AdgEntity *ent AdgContext *context);
ity, const AdgMatrix*adg_entity_get_model_matrix (AdgEntity *entity);
AdgContext *con const AdgMatrix*adg_entity_get_paper_matrix (AdgEntity *entity);
text); gboolean adg_entity_build_paper2model (AdgEntity *entity,
const AdgMatrix * adg_entity_get_model_matrix (AdgEntity *ent AdgMatrix *matrix);
ity); gboolean adg_entity_build_model2paper (AdgEntity *entity,
const AdgMatrix * adg_entity_get_paper_matrix (AdgEntity *ent AdgMatrix *matrix);
ity); void adg_entity_scale_to_model (AdgEntity *entity,
void adg_entity_model_matrix_changed (AdgEntity *ent cairo_t *cr);
ity, void adg_entity_scale_to_paper (AdgEntity *entity,
const AdgMatrix*par cairo_t *cr);
ent_matrix); void adg_entity_model_matrix_changed (AdgEntity *entity,
void adg_entity_paper_matrix_changed (AdgEntity *ent const AdgMatrix*parent_mat
ity, rix);
const AdgMatrix*par void adg_entity_paper_matrix_changed (AdgEntity *entity,
ent_matrix); const AdgMatrix*parent_mat
AdgStyle * adg_entity_get_style (AdgEntity *ent rix);
ity, AdgStyle * adg_entity_get_style (AdgEntity *entity,
AdgStyleSlot sty AdgStyleSlot style_slot
le_slot); );
void adg_entity_apply (AdgEntity *ent void adg_entity_apply (AdgEntity *entity,
ity, AdgStyleSlot style_slot
AdgStyleSlot sty ,
le_slot, cairo_t *cr);
cairo_t *cr) gboolean adg_entity_model_matrix_applied (AdgEntity *entity);
; gboolean adg_entity_paper_matrix_applied (AdgEntity *entity);
gboolean adg_entity_model_matrix_applied (AdgEntity *ent gboolean adg_entity_model_applied (AdgEntity *entity);
ity); void adg_entity_invalidate (AdgEntity *entity);
gboolean adg_entity_paper_matrix_applied (AdgEntity *ent void adg_entity_render (AdgEntity *entity,
ity); cairo_t *cr);
gboolean adg_entity_model_applied (AdgEntity *ent
ity);
void adg_entity_render (AdgEntity *ent
ity,
cairo_t *cr)
;
G_END_DECLS G_END_DECLS
#endif /* __ADG_ENTITY_H__ */ #endif /* __ADG_ENTITY_H__ */
 End of changes. 6 change blocks. 
70 lines changed or deleted 54 lines changed or added


 adg-enums.h   adg-enums.h 
skipping to change at line 36 skipping to change at line 36
/** /**
* AdgLineStyleId: * AdgLineStyleId:
* @ADG_LINE_STYLE_DRAW: normal drawing * @ADG_LINE_STYLE_DRAW: normal drawing
* @ADG_LINE_STYLE_CENTER: axis and center-lines * @ADG_LINE_STYLE_CENTER: axis and center-lines
* @ADG_LINE_STYLE_HIDDEN: covered entities * @ADG_LINE_STYLE_HIDDEN: covered entities
* @ADG_LINE_STYLE_XATCH: xatches * @ADG_LINE_STYLE_XATCH: xatches
* @ADG_LINE_STYLE_DIM: extension and base lines of dimension entities * @ADG_LINE_STYLE_DIM: extension and base lines of dimension entities
* @ADG_LINE_STYLE_LAST: start of user-defined styles * @ADG_LINE_STYLE_LAST: start of user-defined styles
* *
* Numeric representation of line styles. * Builtin id to get some predefined #AdgLineStyle instances.
* Some standard line styles are predefined.
*/ */
typedef enum typedef enum {
{ ADG_LINE_STYLE_DRAW,
ADG_LINE_STYLE_DRAW, ADG_LINE_STYLE_CENTER,
ADG_LINE_STYLE_CENTER, ADG_LINE_STYLE_HIDDEN,
ADG_LINE_STYLE_HIDDEN, ADG_LINE_STYLE_XATCH,
ADG_LINE_STYLE_XATCH, ADG_LINE_STYLE_DIM,
ADG_LINE_STYLE_DIM, ADG_LINE_STYLE_LAST
ADG_LINE_STYLE_LAST
} AdgLineStyleId; } AdgLineStyleId;
/** /**
* AdgFontStyleId: * AdgFontStyleId:
* @ADG_FONT_STYLE_TEXT: generic text style
* @ADG_FONT_STYLE_QUOTE: text style for the quote number
* @ADG_FONT_STYLE_TOLERANCE: text style for quote tolerances
* @ADG_FONT_STYLE_NOTE: text style for additional notes appended to the qu
ote
* @ADG_FONT_STYLE_LAST: start of user defined font styles
* *
* Numeric representation of font styles. * Builtin id to get some predefined #AdgFontStyle instances.
* Some standard font styles are predefined.
*/ */
typedef enum typedef enum {
{ ADG_FONT_STYLE_TEXT,
ADG_FONT_STYLE_TEXT, ADG_FONT_STYLE_QUOTE,
ADG_FONT_STYLE_QUOTE, ADG_FONT_STYLE_TOLERANCE,
ADG_FONT_STYLE_TOLERANCE, ADG_FONT_STYLE_NOTE,
ADG_FONT_STYLE_NOTE, ADG_FONT_STYLE_LAST
ADG_FONT_STYLE_LAST
} AdgFontStyleId; } AdgFontStyleId;
/** /**
* AdgArrowStyleId: * AdgArrowStyleId:
* @ADG_ARROW_STYLE_ARROW: the classic arrow to use in technical drawings * @ADG_ARROW_STYLE_ARROW: the classic arrow to use in technical drawings
* @ADG_ARROW_STYLE_TRIANGLE: same as above, but not filled * @ADG_ARROW_STYLE_TRIANGLE: same as above, but not filled
* @ADG_ARROW_STYLE_DOT: a little size filled circle * @ADG_ARROW_STYLE_DOT: a filled circle
* @ADG_ARROW_STYLE_CIRCLE: an empty circle
* @ADG_ARROW_STYLE_BLOCK: a filled square
* @ADG_ARROW_STYLE_SQUARE: an empty square
* @ADG_ARROW_STYLE_TICK: an architetural tick * @ADG_ARROW_STYLE_TICK: an architetural tick
* @ADG_ARROW_STYLE_CIRCLE: a medium size empty circle * @ADG_ARROW_STYLE_LAST: start of user-defined arrow styles
* @ADG_ARROW_STYLE_SQUARE: a medium size empty square
* @ADG_ARROW_STYLE_LAST: start of user-defined styles
* *
* Numeric representation of arrow styles. * Builtin id to get some predefined #AdgArrowStyle instances.
* Some standard arrow styles are predefined.
*/ */
typedef enum typedef enum {
{ ADG_ARROW_STYLE_ARROW,
ADG_ARROW_STYLE_ARROW, ADG_ARROW_STYLE_TRIANGLE,
ADG_ARROW_STYLE_TRIANGLE, ADG_ARROW_STYLE_DOT,
ADG_ARROW_STYLE_DOT, ADG_ARROW_STYLE_CIRCLE,
ADG_ARROW_STYLE_CIRCLE, ADG_ARROW_STYLE_BLOCK,
ADG_ARROW_STYLE_BLOCK, ADG_ARROW_STYLE_SQUARE,
ADG_ARROW_STYLE_SQUARE, ADG_ARROW_STYLE_TICK,
ADG_ARROW_STYLE_TICK, ADG_ARROW_STYLE_LAST
ADG_ARROW_STYLE_LAST
} AdgArrowStyleId; } AdgArrowStyleId;
/** /**
* AdgDimStyleId: * AdgDimStyleId:
* @ADG_DIM_STYLE_ISO: ISO standard * @ADG_DIM_STYLE_ISO: the ISO standard
* @ADG_DIM_STYLE_LAST: start of user-defined styles * @ADG_DIM_STYLE_LAST: start of user-defined dimension styles
* *
* Numeric representation of dimension styles. * Builtin id to get some predefined #AdgDimStyle instances.
* Some standard dimension styles are predefined.
*/ */
typedef enum typedef enum {
{ ADG_DIM_STYLE_ISO,
ADG_DIM_STYLE_ISO, ADG_DIM_STYLE_LAST
ADG_DIM_STYLE_LAST
} AdgDimStyleId; } AdgDimStyleId;
G_END_DECLS G_END_DECLS
#endif /* __ADG_ENUMS_H__ */ #endif /* __ADG_ENUMS_H__ */
 End of changes. 13 change blocks. 
43 lines changed or deleted 42 lines changed or added


 adg-font-style.h   adg-font-style.h 
skipping to change at line 40 skipping to change at line 40
#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), ADG_TYPE_FONT_STYLE, AdgFontStyleClass)) #define ADG_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_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), ADG_TYPE_FONT_STYLE)) #define ADG_IS_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYPE_FONT_STYLE))
#define ADG_FONT_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYPE_FONT_STYLE, AdgFontStyleClass)) #define ADG_FONT_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYPE_FONT_STYLE, AdgFontStyleClass))
typedef struct _AdgFontStyle AdgFontStyle; typedef struct _AdgFontStyle AdgFontStyle;
typedef struct _AdgFontStyleClass AdgFontStyleClass; typedef struct _AdgFontStyleClass AdgFontStyleClass;
typedef struct _AdgFontStylePrivate AdgFontStylePrivate; typedef struct _AdgFontStylePrivate AdgFontStylePrivate;
struct _AdgFontStyle struct _AdgFontStyle {
{ AdgStyle style;
AdgStyle style; /*< private >*/
AdgFontStylePrivate *priv;
/*< private >*/
AdgFontStylePrivate *priv;
}; };
struct _AdgFontStyleClass struct _AdgFontStyleClass {
{ 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;
AdgStyleSlot adg_font_style_get_slot (void) G_GNUC_CONST; AdgStyleSlot adg_font_style_get_slot (void) G_GNUC_CONST;
AdgStyle * adg_font_style_new (void); AdgStyle * adg_font_style_new (void);
const gchar * adg_font_style_get_family (AdgFontStyle *font_style) const gchar * adg_font_style_get_family (AdgFontStyle *font_style
; );
void adg_font_style_set_family (AdgFontStyle *font_style, void adg_font_style_set_family (AdgFontStyle *font_style
const gchar *family); ,
const gchar *family);
cairo_font_slant_t cairo_font_slant_t
adg_font_style_get_slant (AdgFontStyle *font_style) adg_font_style_get_slant (AdgFontStyle *font_style
; );
void adg_font_style_set_slant (AdgFontStyle *font_style, void adg_font_style_set_slant (AdgFontStyle *font_style
cairo_font_slant_t slant); ,
cairo_font_slant_t slant);
cairo_font_weight_t cairo_font_weight_t
adg_font_style_get_weight (AdgFontStyle *font_style) adg_font_style_get_weight (AdgFontStyle *font_style
; );
void adg_font_style_set_weight (AdgFontStyle *font_style, void adg_font_style_set_weight (AdgFontStyle *font_style
cairo_font_weight_t weight) ,
; cairo_font_weight_t weight
gdouble adg_font_style_get_size (AdgFontStyle *fon );
t_style); gdouble adg_font_style_get_size (AdgFontStyle *font_style
void adg_font_style_set_size (AdgFontStyle *font_style, );
gdouble size); void adg_font_style_set_size (AdgFontStyle *font_style
,
gdouble size);
cairo_antialias_t cairo_antialias_t
adg_font_style_get_antialias (AdgFontStyle *font_style) adg_font_style_get_antialias (AdgFontStyle *font_style
; );
void adg_font_style_set_antialias (AdgFontStyle *font_style, void adg_font_style_set_antialias (AdgFontStyle *font_style
cairo_antialias_t antialias ,
); cairo_antialias_t antialia
s);
cairo_subpixel_order_t cairo_subpixel_order_t
adg_font_style_get_subpixel_order adg_font_style_get_subpixel_order
(AdgFontStyle *font_style) (AdgFontStyle *font_style
; );
void adg_font_style_set_subpixel_order void adg_font_style_set_subpixel_order
(AdgFontStyle *font_style, (AdgFontStyle *font_style
cairo_subpixel_order_t subp ,
ixel_order); cairo_subpixel_order_t sub
pixel_order);
cairo_hint_style_t cairo_hint_style_t
adg_font_style_get_hint_style (AdgFontStyle *font_style) adg_font_style_get_hint_style (AdgFontStyle *font_style
; );
void adg_font_style_set_hint_style (AdgFontStyle *font_style, void adg_font_style_set_hint_style (AdgFontStyle *font_style
cairo_hint_style_t hint_sty ,
le); cairo_hint_style_t hint_st
yle);
cairo_hint_metrics_t cairo_hint_metrics_t
adg_font_style_get_hint_metrics (AdgFontStyle *font_style) adg_font_style_get_hint_metrics (AdgFontStyle *font_style
; );
void adg_font_style_set_hint_metrics (AdgFontStyle *font_style, void adg_font_style_set_hint_metrics (AdgFontStyle *font_style
cairo_hint_metrics_t hint_m ,
etrics); cairo_hint_metrics_t hint_
metrics);
G_END_DECLS G_END_DECLS
#endif /* __ADG_FONT_STYLE_H__ */ #endif /* __ADG_FONT_STYLE_H__ */
 End of changes. 10 change blocks. 
51 lines changed or deleted 56 lines changed or added


 adg-ldim.h   adg-ldim.h 
skipping to change at line 38 skipping to change at line 38
#define ADG_LDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_LDIM, AdgLDim)) #define ADG_LDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_LDIM, AdgLDim))
#define ADG_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_LDIM, AdgLDimClass)) #define ADG_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_LDIM, AdgLDimClass))
#define ADG_IS_LDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_LDIM)) #define ADG_IS_LDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_LDIM))
#define ADG_IS_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_LDIM)) #define ADG_IS_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_LDIM))
#define ADG_LDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_LDIM, AdgLDimClass)) #define ADG_LDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_LDIM, AdgLDimClass))
typedef struct _AdgLDim AdgLDim; typedef struct _AdgLDim AdgLDim;
typedef struct _AdgLDimClass AdgLDimClass; typedef struct _AdgLDimClass AdgLDimClass;
typedef struct _AdgLDimPrivate AdgLDimPrivate; typedef struct _AdgLDimPrivate AdgLDimPrivate;
struct _AdgLDim struct _AdgLDim {
{ AdgDim dim;
AdgDim dim; /*< private >*/
AdgLDimPrivate *priv;
/*< private >*/
AdgLDimPrivate *priv;
}; };
struct _AdgLDimClass struct _AdgLDimClass {
{ AdgDimClass parent_class;
AdgDimClass parent_class;
}; };
GType adg_ldim_get_type (void) G_GNUC_CONST; GType adg_ldim_get_type (void) G_GNUC_CONST;
AdgEntity * adg_ldim_new (void); AdgEntity * adg_ldim_new (void);
AdgEntity * adg_ldim_new_full (const AdgPair *ref1, AdgEntity * adg_ldim_new_full (const AdgPair *ref1,
const AdgPair *ref2, const AdgPair *ref2,
double direction, gdouble direction,
const AdgPair *pos); const AdgPair *pos);
AdgEntity * adg_ldim_new_full_explicit (double ref1_x, AdgEntity * adg_ldim_new_full_explicit (gdouble ref1_x,
double ref1_y, gdouble ref1_y,
double ref2_x, gdouble ref2_x,
double ref2_y, gdouble ref2_y,
double direction, gdouble direction,
double pos_x, gdouble pos_x,
double pos_y); gdouble pos_y);
void adg_ldim_set_pos (AdgLDim *ldim, void adg_ldim_set_pos (AdgLDim *ldim,
const AdgPair *pos); const AdgPair *pos);
void adg_ldim_set_pos_explicit (AdgLDim *ldim, void adg_ldim_set_pos_explicit (AdgLDim *ldim,
double pos_x, gdouble pos_x,
double pos_y); gdouble pos_y);
double adg_ldim_get_direction (AdgLDim *ldim); gdouble adg_ldim_get_direction (AdgLDim *ldim);
void adg_ldim_set_direction (AdgLDim *ldim, void adg_ldim_set_direction (AdgLDim *ldim,
double direction) ; gdouble direction) ;
G_END_DECLS G_END_DECLS
#endif /* __ADG_LDIM_H__ */ #endif /* __ADG_LDIM_H__ */
 End of changes. 6 change blocks. 
21 lines changed or deleted 18 lines changed or added


 adg-line-style.h   adg-line-style.h 
skipping to change at line 40 skipping to change at line 40
#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), ADG_TYPE_LINE_STYLE, AdgLineStyleClass)) #define ADG_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_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), ADG_TYPE_LINE_STYLE)) #define ADG_IS_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYPE_LINE_STYLE))
#define ADG_LINE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYPE_LINE_STYLE, AdgLineStyleClass)) #define ADG_LINE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYPE_LINE_STYLE, AdgLineStyleClass))
typedef struct _AdgLineStyle AdgLineStyle; typedef struct _AdgLineStyle AdgLineStyle;
typedef struct _AdgLineStyleClass AdgLineStyleClass; typedef struct _AdgLineStyleClass AdgLineStyleClass;
typedef struct _AdgLineStylePrivate AdgLineStylePrivate; typedef struct _AdgLineStylePrivate AdgLineStylePrivate;
struct _AdgLineStyle struct _AdgLineStyle {
{ AdgStyle style;
AdgStyle style; /*< private >*/
AdgLineStylePrivate *priv;
/*< private >*/
AdgLineStylePrivate *priv;
}; };
struct _AdgLineStyleClass struct _AdgLineStyleClass {
{ AdgStyleClass parent_class;
AdgStyleClass parent_class;
}; };
GType adg_line_style_get_type (void) G_GNUC_CONST; GType adg_line_style_get_type (void) G_GNUC_CONST;
AdgStyleSlot adg_line_style_get_slot (void) G_GNUC_CONST; AdgStyleSlot adg_line_style_get_slot (void) G_GNUC_CONST;
AdgStyle * adg_line_style_new (void); AdgStyle * adg_line_style_new (void);
gdouble adg_line_style_get_width (AdgLineStyle *lin gdouble adg_line_style_get_width (AdgLineStyle *line_style
e_style); );
void adg_line_style_set_width (AdgLineStyle *line_style, void adg_line_style_set_width (AdgLineStyle *line_style
gdouble width); ,
gdouble width);
cairo_line_cap_t cairo_line_cap_t
adg_line_style_get_cap (AdgLineStyle *line_style) adg_line_style_get_cap (AdgLineStyle *line_style
; );
void adg_line_style_set_cap (AdgLineStyle *line_style, void adg_line_style_set_cap (AdgLineStyle *line_style
cairo_line_cap_t cap); ,
cairo_line_cap_t cap);
cairo_line_join_t cairo_line_join_t
adg_line_style_get_join (AdgLineStyle *line_style) adg_line_style_get_join (AdgLineStyle *line_style
; );
void adg_line_style_set_join (AdgLineStyle *line_style, void adg_line_style_set_join (AdgLineStyle *line_style
cairo_line_join_t join); ,
gdouble adg_line_style_get_miter_limit (AdgLineStyle *lin cairo_line_join_t join);
e_style); gdouble adg_line_style_get_miter_limit (AdgLineStyle *line_style
void adg_line_style_set_miter_limit (AdgLineStyle *line_style, );
gdouble miter_limit void adg_line_style_set_miter_limit (AdgLineStyle *line_style
); ,
gdouble miter_limi
t);
cairo_antialias_t cairo_antialias_t
adg_line_style_get_antialias (AdgLineStyle *line_style) adg_line_style_get_antialias (AdgLineStyle *line_style
; );
void adg_line_style_set_antialias (AdgLineStyle *line_style, void adg_line_style_set_antialias (AdgLineStyle *line_style
cairo_antialias_t antialias ,
); cairo_antialias_t antialia
s);
G_END_DECLS G_END_DECLS
#endif /* __ADG_LINE_STYLE_H__ */ #endif /* __ADG_LINE_STYLE_H__ */
 End of changes. 7 change blocks. 
34 lines changed or deleted 36 lines changed or added


 adg-matrix.h   adg-matrix.h 
skipping to change at line 32 skipping to change at line 32
#include <glib-object.h> #include <glib-object.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;
AdgMatrix * adg_matrix_dup (const AdgMatrix *matrix); AdgMatrix * adg_matrix_dup (const AdgMatrix *matrix);
const AdgMatrix * adg_matrix_get_fallback (void) G_GNUC_CONST; const AdgMatrix * adg_matrix_get_fallback (void) G_GNUC_CONST;
AdgMatrix * adg_matrix_set (AdgMatrix *matrix, AdgMatrix * adg_matrix_set (AdgMatrix *matrix,
const AdgMatrix *src); const AdgMatrix *src);
void adg_matrix_init_null (AdgMatrix *matrix); void adg_matrix_init_null (AdgMatrix *matrix);
gboolean adg_matrix_is_null (const AdgMatrix *matrix); gboolean adg_matrix_is_null (const AdgMatrix *matrix);
gboolean adg_matrix_equal (const AdgMatrix *matrix1, gboolean adg_matrix_equal (const AdgMatrix *matrix1,
const AdgMatrix *matrix2); const AdgMatrix *matrix2);
G_END_DECLS G_END_DECLS
#endif /* __ADG_MATRIX_H__ */ #endif /* __ADG_MATRIX_H__ */
 End of changes. 1 change blocks. 
9 lines changed or deleted 9 lines changed or added


 adg-model.h   adg-model.h 
skipping to change at line 38 skipping to change at line 38
#define ADG_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_ TYPE_MODEL, AdgModel)) #define ADG_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_ TYPE_MODEL, AdgModel))
#define ADG_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_T YPE_MODEL, AdgModel)) #define ADG_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_T YPE_MODEL, AdgModel))
#define ADG_IS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_ TYPE_MODEL)) #define ADG_IS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_ TYPE_MODEL))
#define ADG_IS_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_T YPE_MODEL)) #define ADG_IS_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_T YPE_MODEL))
#define ADG_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_T YPE_MODEL, AdgModel)) #define ADG_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_T YPE_MODEL, AdgModel))
typedef struct _AdgModel AdgModel; typedef struct _AdgModel AdgModel;
typedef struct _AdgModelClass AdgModelClass; typedef struct _AdgModelClass AdgModelClass;
typedef struct _AdgModelPrivate AdgModelPrivate; typedef struct _AdgModelPrivate AdgModelPrivate;
struct _AdgModel struct _AdgModel {
{ GObject object;
GObject object; /*< private >*/
AdgModelPrivate *priv;
/*< private >*/
AdgModelPrivate *priv;
}; };
struct _AdgModelClass struct _AdgModelClass {
{ GObjectClass parent_class;
GObjectClass parent_class;
}; };
GType adg_model_get_type (void) G_GNUC_CONST; GType adg_model_get_type (void) G_GNUC_CONST;
gchar * adg_model_get_name (AdgModel *model); gchar * adg_model_get_name (AdgModel *model);
void adg_model_set_name (AdgModel *model, void adg_model_set_name (AdgModel *model,
const gchar *name); const gchar *name);
gchar * adg_model_get_material (AdgModel *model); gchar * adg_model_get_material (AdgModel *model);
void adg_model_set_material (AdgModel *model, void adg_model_set_material (AdgModel *model,
const gchar *material); const gchar *material);
gchar * adg_model_get_treatment (AdgModel *model); gchar * adg_model_get_treatment (AdgModel *model);
void adg_model_set_treatment (AdgModel *model, void adg_model_set_treatment (AdgModel *model,
const gchar *treatment) ; const gchar *treatment) ;
 End of changes. 3 change blocks. 
10 lines changed or deleted 7 lines changed or added


 adg-pair.h   adg-pair.h 
skipping to change at line 32 skipping to change at line 32
#include <cpml/cpml.h> #include <cpml/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);
G_END_DECLS G_END_DECLS
#endif /* __ADG_PAIR_H__ */ #endif /* __ADG_PAIR_H__ */
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 adg-path.h   adg-path.h 
skipping to change at line 38 skipping to change at line 38
#define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_PATH, AdgPath)) #define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_PATH, AdgPath))
#define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_PATH, AdgPathClass)) #define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_PATH, AdgPathClass))
#define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_PATH)) #define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_PATH))
#define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_PATH)) #define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_PATH))
#define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_PATH, AdgPathClass)) #define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_PATH, AdgPathClass))
typedef struct _AdgPath AdgPath; typedef struct _AdgPath AdgPath;
typedef struct _AdgPathClass AdgPathClass; typedef struct _AdgPathClass AdgPathClass;
typedef struct _AdgPathPrivate AdgPathPrivate; typedef struct _AdgPathPrivate AdgPathPrivate;
struct _AdgPath struct _AdgPath {
{ AdgEntity entity;
AdgEntity entity; /*< private >*/
AdgPathPrivate *priv;
/*< private >*/
AdgPathPrivate *priv;
}; };
struct _AdgPathClass struct _AdgPathClass {
{ AdgEntityClass parent_class;
AdgEntityClass parent_class;
}; };
GType adg_path_get_type (void) G_GNUC_CONST; GType adg_path_get_type (void) G_GNUC_CONST;
AdgEntity * adg_path_new (AdgCallback create_fun c, AdgEntity * adg_path_new (AdgCallback create_fun c,
gpointer user_data) ; gpointer user_data) ;
void adg_path_clear (AdgPath *path); void adg_path_clear (AdgPath *path);
const cairo_path_t * const cairo_path_t *
adg_path_get_cairo_path (AdgPath *path); adg_path_get_cairo_path (AdgPath *path);
void adg_path_chain_ymirror (AdgPath *path); void adg_path_chain_ymirror (AdgPath *path);
void adg_path_dump (AdgPath *path); void adg_path_dump (AdgPath *path);
 End of changes. 2 change blocks. 
9 lines changed or deleted 6 lines changed or added


 adg-pattern.h   adg-pattern.h 
skipping to change at line 32 skipping to change at line 32
#include <glib-object.h> #include <glib-object.h>
#include <cairo.h> #include <cairo.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_PATTERN (adg_pattern_get_type ()) #define ADG_TYPE_PATTERN (adg_pattern_get_type ())
typedef cairo_pattern_t AdgPattern; typedef cairo_pattern_t AdgPattern;
GType adg_pattern_get_type (void) G_GNUC_CONST; GType adg_pattern_get_type (void) G_GNUC_CONST;
G_END_DECLS G_END_DECLS
#endif /* __ADG_PATTERN_H__ */ #endif /* __ADG_PATTERN_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 adg-style.h   adg-style.h 
skipping to change at line 40 skipping to change at line 40
#define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_ TYPE_STYLE)) #define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_ TYPE_STYLE))
#define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_T YPE_STYLE)) #define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_T YPE_STYLE))
#define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_T YPE_STYLE, AdgStyleClass)) #define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_T YPE_STYLE, AdgStyleClass))
typedef struct _AdgStyle AdgStyle; typedef struct _AdgStyle AdgStyle;
typedef struct _AdgStyleClass AdgStyleClass; typedef struct _AdgStyleClass AdgStyleClass;
typedef struct _AdgStylePrivate AdgStylePrivate; typedef struct _AdgStylePrivate AdgStylePrivate;
typedef gint AdgStyleId; typedef gint AdgStyleId;
typedef gint AdgStyleSlot; typedef gint AdgStyleSlot;
struct _AdgStyle struct _AdgStyle {
{ GObject object;
GObject object; /*< private >*/
AdgStylePrivate *priv;
/*< private >*/
AdgStylePrivate *priv;
}; };
struct _AdgStyleClass struct _AdgStyleClass {
{ GObjectClass parent_class;
GObjectClass parent_class; /* Virtual table */
GPtrArray * (*get_pool) (void);
/* Virtual table */ void (*apply) (AdgStyle *style,
GPtrArray * (*get_pool) (void); cairo_t *cr);
void (*apply) (AdgStyle *style,
cairo_t *cr);
}; };
GType adg_style_get_type (void) G_GNUC_CONST; GType adg_style_get_type (void) G_GNUC_CONST;
AdgStyleId adg_style_register_id (AdgStyle *style); AdgStyleId adg_style_register_id (AdgStyle *style);
AdgStyle * adg_style_from_id (GType type, AdgStyle * adg_style_from_id (GType type,
AdgStyleId id); AdgStyleId id);
AdgStyle * adg_style_get_default (AdgStyleClass *klass); AdgStyle * adg_style_get_default (AdgStyleClass *klass);
void adg_style_apply (AdgStyle *style, void adg_style_apply (AdgStyle *style,
cairo_t *cr); cairo_t *cr);
const AdgPattern * adg_style_get_pattern (AdgStyle *style); const AdgPattern * adg_style_get_pattern (AdgStyle *style);
void adg_style_set_pattern (AdgStyle *style, void adg_style_set_pattern (AdgStyle *style,
AdgPattern *pattern); AdgPattern *pattern);
G_END_DECLS G_END_DECLS
#endif /* __ADG_STYLE_H__ */ #endif /* __ADG_STYLE_H__ */
 End of changes. 4 change blocks. 
24 lines changed or deleted 20 lines changed or added


 adg-type-builtins.h   adg-type-builtins.h 
#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" */
GType adg_line_style_id_get_type (void) G_GNUC_CONST;
#define ADG_TYPE_LINE_STYLE_ID (adg_line_style_id_get_type()) #define ADG_TYPE_LINE_STYLE_ID (adg_line_style_id_get_type())
GType adg_font_style_id_get_type (void) G_GNUC_CONST; GType adg_line_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_FONT_STYLE_ID (adg_font_style_id_get_type()) #define ADG_TYPE_FONT_STYLE_ID (adg_font_style_id_get_type())
GType adg_arrow_style_id_get_type (void) G_GNUC_CONST; GType adg_font_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_ARROW_STYLE_ID (adg_arrow_style_id_get_type()) #define ADG_TYPE_ARROW_STYLE_ID (adg_arrow_style_id_get_type())
GType adg_dim_style_id_get_type (void) G_GNUC_CONST; GType adg_arrow_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_DIM_STYLE_ID (adg_dim_style_id_get_type()) #define ADG_TYPE_DIM_STYLE_ID (adg_dim_style_id_get_type())
GType adg_dim_style_id_get_type(void) G_GNUC_CONST;
G_END_DECLS G_END_DECLS
#endif /* __ADG_TYPE_BUILTINS_H__ */ #endif /* __ADG_TYPE_BUILTINS_H__ */
 End of changes. 6 change blocks. 
4 lines changed or deleted 9 lines changed or added


 adg-util.h   adg-util.h 
skipping to change at line 27 skipping to change at line 27
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __ADG_UTIL_H__ #ifndef __ADG_UTIL_H__
#define __ADG_UTIL_H__ #define __ADG_UTIL_H__
#include <glib.h> #include <glib.h>
#include <cairo.h> #include <cairo.h>
#include <math.h> #include <math.h>
G_BEGIN_DECLS #define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE)
#define ADG_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_EN
#define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE) D
#define ADG_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_END #define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_E
#define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_EN ND
D
#define ADG_CHECKPOINT_WITH_MESSAGE(message) \ #define ADG_CHECKPOINT_WITH_MESSAGE(message) \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
"file `%s' at line %d: %s", \ "file `%s' at line %d: %s", \
__FILE__, __LINE__, #message) __FILE__, __LINE__, #message)
#define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point") #define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point")
#define ADG_STUB() ADG_CHECKPOINT_WITH_MESSAGE("stub") #define ADG_STUB() ADG_CHECKPOINT_WITH_MESSAGE("stub")
G_END_DECLS
#endif /* __ADG_UTIL_H__ */ #endif /* __ADG_UTIL_H__ */
 End of changes. 2 change blocks. 
8 lines changed or deleted 5 lines changed or added


 cpml-pair.h   cpml-pair.h 
skipping to change at line 33 skipping to change at line 33
#include <cairo.h> #include <cairo.h>
#include <math.h> #include <math.h>
#define CPML_DIR_RIGHT 0. #define CPML_DIR_RIGHT 0.
#define CPML_DIR_DOWN (M_PI/2.) #define CPML_DIR_DOWN (M_PI/2.)
#define CPML_DIR_LEFT M_PI #define CPML_DIR_LEFT M_PI
#define CPML_DIR_UP (M_PI*3./2.) #define CPML_DIR_UP (M_PI*3./2.)
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
typedef struct _CpmlPair CpmlPair; typedef struct _CpmlPair CpmlPair;
struct _CpmlPair { struct _CpmlPair {
double x, y; double x, y;
}; };
cairo_bool_t cairo_bool_t cpml_pair_copy (CpmlPair *pair,
cpml_pair_copy (CpmlPair *pair, const CpmlPair *src);
const CpmlPair *src); cairo_bool_t cpml_pair_distance (double *distance,
cairo_bool_t const CpmlPair *from,
cpml_pair_distance (const CpmlPair *from, const CpmlPair *to);
const CpmlPair *to, cairo_bool_t cpml_pair_square_distance (double *distance,
double *distance); const CpmlPair *from,
cairo_bool_t const CpmlPair *to);
cpml_pair_square_distance (const CpmlPair *from, cairo_bool_t cpml_pair_angle (double *angle,
const CpmlPair *to, const CpmlPair *from,
double *distance); const CpmlPair *to);
cairo_bool_t cairo_bool_t cpml_vector_from_pair (CpmlPair *vector,
cpml_pair_angle (const CpmlPair *from, const CpmlPair *pair);
const CpmlPair *to, cairo_bool_t cpml_vector_from_angle (CpmlPair *vector,
double *angle); double angle);
cairo_bool_t
cpml_vector_from_pair (CpmlPair *vector,
const CpmlPair *pair);
cairo_bool_t
cpml_vector_from_angle (CpmlPair *vector,
double angle);
CAIRO_END_DECLS CAIRO_END_DECLS
#endif /* __CPML_PAIR_H__ */ #endif /* __CPML_PAIR_H__ */
 End of changes. 3 change blocks. 
23 lines changed or deleted 17 lines changed or added


 cpml-path.h   cpml-path.h 
skipping to change at line 25 skipping to change at line 25
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __CPML_PATH_H__ #ifndef __CPML_PATH_H__
#define __CPML_PATH_H__ #define __CPML_PATH_H__
#include <cpml/cpml-pair.h> #include <cpml/cpml-pair.h>
#define CPML_LAST 0 #define CPML_LAST 0
#define CPML_FIRST 1 #define CPML_FIRST 1
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
typedef struct _CpmlPath CpmlPath; typedef struct _CpmlPath CpmlPath;
struct _CpmlPath { struct _CpmlPath {
cairo_path_t cairo_path; cairo_path_t cairo_path;
CpmlPair org; CpmlPair org;
}; };
cairo_bool_t cairo_bool_t cpml_path_from_cairo (CpmlPath *path,
cpml_path_from_cairo (CpmlPath *path, const cairo_path_t *src,
const cairo_path_t *src, cairo_t *cr);
cairo_t *cr); cairo_bool_t cpml_path_from_cairo_explicit (CpmlPath *path,
cairo_bool_t const cairo_path_t *src,
cpml_path_from_cairo_explicit (CpmlPath *path, const CpmlPair *org);
const cairo_path_t *src, CpmlPath * cpml_path_copy (CpmlPath *path,
const CpmlPair *org); const CpmlPath *src);
CpmlPath * cairo_bool_t cpml_segment_from_path (CpmlPath *segment,
cpml_path_copy (CpmlPath *path, const CpmlPath *path,
const CpmlPath *src); int index);
cairo_bool_t cpml_primitive_from_path (CpmlPath *primitive,
cairo_bool_t const CpmlPath *path,
cpml_segment_from_path (CpmlPath *segment, int index);
const CpmlPath *path, cairo_bool_t cpml_primitive_get_pair (const CpmlPath *primitive,
int index); CpmlPair *pair, int index)
;
cairo_bool_t cairo_bool_t cpml_primitive_set_pair (CpmlPath *primitive,
cpml_primitive_from_path (CpmlPath *primitive, const CpmlPair *pair,
const CpmlPath *path, int index);
int index); cairo_bool_t cpml_primitive_get_point (const CpmlPath *primitive,
cairo_bool_t CpmlPair *point, double po
cpml_primitive_get_pair (const CpmlPath *primitive, s);
CpmlPair *pair, cairo_bool_t cpml_primitive_reverse (CpmlPath *primitive);
int index);
cairo_bool_t
cpml_primitive_set_pair (CpmlPath *primitive,
const CpmlPair *pair,
int index);
cairo_bool_t
cpml_primitive_get_point (const CpmlPath *primitive,
CpmlPair *point,
double pos);
cairo_bool_t
cpml_primitive_reverse (CpmlPath *primitive);
CAIRO_END_DECLS CAIRO_END_DECLS
#endif /* __CPML_PATH_H__ */ #endif /* __CPML_PATH_H__ */
 End of changes. 3 change blocks. 
39 lines changed or deleted 28 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/