adg-adim.h   adg-adim.h 
skipping to change at line 49 skipping to change at line 49
AdgDim parent; AdgDim parent;
gpointer data; gpointer data;
}; };
struct _AdgADimClass { struct _AdgADimClass {
/*< private >*/ /*< private >*/
AdgDimClass parent_class; AdgDimClass parent_class;
}; };
GType adg_adim_get_type (void) G_GNUC_CONST; GType adg_adim_get_type (void) G_GNUC_CONST;
AdgADim * adg_adim_new (void); AdgADim * adg_adim_new (void);
AdgADim * adg_adim_new_full (const AdgPair *ref1,
const AdgPair *ref2,
const AdgPair *org1,
const AdgPair *org2,
const AdgPair *pos);
AdgADim * adg_adim_new_full_explicit (gdouble ref1_x,
gdouble ref1_y,
gdouble ref2_x,
gdouble ref2_y,
gdouble org1_x,
gdouble org1_y,
gdouble org2_x,
gdouble org2_y,
gdouble pos_x,
gdouble pos_y);
gdouble adg_adim_get_angle1 (AdgADim *adim); const AdgPair * adg_adim_get_org1 (AdgADim *adim);
void adg_adim_set_angle1 (AdgADim *adim, const AdgPair * adg_adim_get_org2 (AdgADim *adim);
gdouble angle); void adg_adim_set_org (AdgADim *adim,
gdouble adg_adim_get_angle2 (AdgADim *adim); const AdgPair *org1,
void adg_adim_set_angle2 (AdgADim *adim, const AdgPair *org2);
gdouble angle);
G_END_DECLS G_END_DECLS
#endif /* __ADG_ADIM_H__ */ #endif /* __ADG_ADIM_H__ */
 End of changes. 3 change blocks. 
7 lines changed or deleted 20 lines changed or added


 adg-dim-style.h   adg-dim-style.h 
skipping to change at line 66 skipping to change at line 66
void adg_dim_style_use_marker1 (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, void adg_dim_style_use_marker2 (AdgDimStyle *dim_style,
AdgMarker *marker); AdgMarker *marker);
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_color_dress (AdgDimStyle *dim_style, void adg_dim_style_set_color_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_value_dress (AdgDimStyle *dim_style, void adg_dim_style_set_value_dress (AdgDimStyle *dim_style,
AdgDress dress); AdgDress dress);
AdgDress adg_dim_style_get_up_dress (AdgDimStyle *dim_style) AdgDress adg_dim_style_get_min_dress (AdgDimStyle *dim_style)
; ;
void adg_dim_style_set_up_dress (AdgDimStyle *dim_style, void adg_dim_style_set_min_dress (AdgDimStyle *dim_style,
AdgDress dress);
AdgDress adg_dim_style_get_down_dress (AdgDimStyle *dim_style)
;
void adg_dim_style_set_down_dress (AdgDimStyle *dim_style,
AdgDress dress); AdgDress dress);
AdgDress adg_dim_style_get_note_dress (AdgDimStyle *dim_style) AdgDress adg_dim_style_get_max_dress (AdgDimStyle *dim_style)
; ;
void adg_dim_style_set_note_dress (AdgDimStyle *dim_style, void adg_dim_style_set_max_dress (AdgDimStyle *dim_style,
AdgDress dress); AdgDress dress);
AdgDress adg_dim_style_get_line_dress (AdgDimStyle *dim_style) ; AdgDress adg_dim_style_get_line_dress (AdgDimStyle *dim_style) ;
void adg_dim_style_set_line_dress (AdgDimStyle *dim_style, void adg_dim_style_set_line_dress (AdgDimStyle *dim_style,
AdgDress dress); AdgDress dress);
gdouble adg_dim_style_get_from_offset (AdgDimStyle *dim_style) ; gdouble adg_dim_style_get_from_offset (AdgDimStyle *dim_style) ;
void adg_dim_style_set_from_offset (AdgDimStyle *dim_style, void adg_dim_style_set_from_offset (AdgDimStyle *dim_style,
gdouble offset); gdouble offset);
gdouble adg_dim_style_get_to_offset (AdgDimStyle *dim_style) ; gdouble adg_dim_style_get_to_offset (AdgDimStyle *dim_style) ;
void adg_dim_style_set_to_offset (AdgDimStyle *dim_style, void adg_dim_style_set_to_offset (AdgDimStyle *dim_style,
gdouble offset); gdouble offset);
gdouble adg_dim_style_beyond (AdgDimStyle *dim_style) ;
gdouble adg_dim_style_get_beyond (AdgDimStyle *dim_style) ; gdouble adg_dim_style_get_beyond (AdgDimStyle *dim_style) ;
void adg_dim_style_set_beyond (AdgDimStyle *dim_style, void adg_dim_style_set_beyond (AdgDimStyle *dim_style,
gdouble length); gdouble length);
gdouble adg_dim_style_get_baseline_spacing gdouble adg_dim_style_get_baseline_spacing
(AdgDimStyle *dim_style) ; (AdgDimStyle *dim_style) ;
void adg_dim_style_set_baseline_spacing void adg_dim_style_set_baseline_spacing
(AdgDimStyle *dim_style, (AdgDimStyle *dim_style,
gdouble spacing); gdouble spacing);
gdouble adg_dim_style_get_tolerance_spacing gdouble adg_dim_style_get_limits_spacing(AdgDimStyle *dim_style)
(AdgDimStyle *dim_style) ;
; void adg_dim_style_set_limits_spacing(AdgDimStyle *dim_style,
void adg_dim_style_set_tolerance_spacing
(AdgDimStyle *dim_style,
gdouble spacing); gdouble spacing);
const AdgPair * adg_dim_style_get_quote_shift (AdgDimStyle *dim_style) ; const AdgPair * adg_dim_style_get_quote_shift (AdgDimStyle *dim_style) ;
void adg_dim_style_set_quote_shift (AdgDimStyle *dim_style, void adg_dim_style_set_quote_shift (AdgDimStyle *dim_style,
const AdgPair *shift); const AdgPair *shift);
const AdgPair * adg_dim_style_get_tolerance_shift const AdgPair * adg_dim_style_get_limits_shift (AdgDimStyle *dim_style)
(AdgDimStyle *dim_style) ;
; void adg_dim_style_set_limits_shift (AdgDimStyle *dim_style,
void adg_dim_style_set_tolerance_shift
(AdgDimStyle *dim_style,
const AdgPair *shift);
const AdgPair * adg_dim_style_get_note_shift (AdgDimStyle *dim_style)
;
void adg_dim_style_set_note_shift (AdgDimStyle *dim_style,
const AdgPair *shift); const AdgPair *shift);
const gchar * adg_dim_style_get_number_format (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_number_format (AdgDimStyle *dim_style,
const gchar *format); const gchar *format);
const gchar * adg_dim_style_get_number_tag (AdgDimStyle *dim_style) ; const gchar * adg_dim_style_get_number_tag (AdgDimStyle *dim_style) ;
void adg_dim_style_set_number_tag (AdgDimStyle *dim_style, void adg_dim_style_set_number_tag (AdgDimStyle *dim_style,
const gchar *tag); const gchar *tag);
G_END_DECLS G_END_DECLS
 End of changes. 5 change blocks. 
25 lines changed or deleted 12 lines changed or added


 adg-dim.h   adg-dim.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_DIM_H__ #ifndef __ADG_DIM_H__
#define __ADG_DIM_H__ #define __ADG_DIM_H__
#include <adg/adg-entity.h> #include <adg/adg-container.h>
#include <adg/adg-pair.h> #include <adg/adg-dim-style.h>
#include <adg/adg-enums.h> #include <adg/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 50 skipping to change at line 50
/*< private >*/ /*< private >*/
AdgEntity parent; AdgEntity parent;
gpointer data; gpointer data;
}; };
struct _AdgDimClass { struct _AdgDimClass {
/*< private >*/ /*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
/*< public >*/ /*< public >*/
/* Virtual Table */ /* Virtual Table */
gdouble (*quote_angle) (gdouble angle);
gchar * (*default_value) (AdgDim *dim); gchar * (*default_value) (AdgDim *dim);
void (*quote_layout) (AdgDim *dim,
cairo_t *cr);
}; };
GType adg_dim_get_type (void) G_GNUC_CONST; GType adg_dim_get_type (void) G_GNUC_CONST;
AdgDress adg_dim_get_dress (AdgDim *dim); AdgDress adg_dim_get_dress (AdgDim *dim);
void adg_dim_set_dress (AdgDim *dim, void adg_dim_set_dress (AdgDim *dim,
AdgDress dress); AdgDress dress);
const AdgPair * adg_dim_get_org (AdgDim *dim);
void adg_dim_set_org (AdgDim *dim,
const AdgPair *org);
void adg_dim_set_org_explicit (AdgDim *dim,
gdouble org_x,
gdouble org_y);
gdouble adg_dim_get_angle (AdgDim *dim);
void adg_dim_set_angle (AdgDim *dim,
gdouble angle);
const AdgPair * adg_dim_get_ref1 (AdgDim *dim); const AdgPair * adg_dim_get_ref1 (AdgDim *dim);
const AdgPair * adg_dim_get_ref2 (AdgDim *dim); const AdgPair * adg_dim_get_ref2 (AdgDim *dim);
void adg_dim_set_ref (AdgDim *dim, void adg_dim_set_ref (AdgDim *dim,
const AdgPair *ref1, const AdgPair *ref1,
const AdgPair *ref2); const AdgPair *ref2);
void adg_dim_set_ref_explicit (AdgDim *dim, void adg_dim_set_ref_explicit (AdgDim *dim,
gdouble ref1_x, gdouble ref1_x,
gdouble ref1_y, gdouble ref1_y,
gdouble ref2_x, gdouble ref2_x,
gdouble ref2_y); gdouble ref2_y);
const AdgPair * adg_dim_get_pos1 (AdgDim *dim); const AdgPair * adg_dim_get_pos (AdgDim *dim);
const AdgPair * adg_dim_get_pos2 (AdgDim *dim);
void adg_dim_set_pos (AdgDim *dim, void adg_dim_set_pos (AdgDim *dim,
AdgPair *pos1, const AdgPair *pos);
AdgPair *pos2);
void adg_dim_set_pos_explicit (AdgDim *dim, void adg_dim_set_pos_explicit (AdgDim *dim,
gdouble pos1_x, gdouble x,
gdouble pos1_y, gdouble y);
gdouble pos2_x,
gdouble pos2_y);
gdouble adg_dim_get_level (AdgDim *dim); gdouble adg_dim_get_level (AdgDim *dim);
void adg_dim_set_level (AdgDim *dim, void adg_dim_set_level (AdgDim *dim,
gdouble level); gdouble level);
AdgThreeState adg_dim_get_outside (AdgDim *dim); AdgThreeState adg_dim_get_outside (AdgDim *dim);
void adg_dim_set_outside (AdgDim *dim, void adg_dim_set_outside (AdgDim *dim,
AdgThreeState outside); AdgThreeState outside);
const gchar * adg_dim_get_value (AdgDim *dim); const gchar * adg_dim_get_value (AdgDim *dim);
void adg_dim_set_value (AdgDim *dim, void adg_dim_set_value (AdgDim *dim,
const gchar *value); const gchar *value);
const gchar * adg_dim_get_value_min (AdgDim *dim); const gchar * adg_dim_get_min (AdgDim *dim);
void adg_dim_set_value_min (AdgDim *dim, void adg_dim_set_min (AdgDim *dim,
const gchar *value_min) const gchar *min);
; const gchar * adg_dim_get_max (AdgDim *dim);
const gchar * adg_dim_get_value_max (AdgDim *dim); void adg_dim_set_max (AdgDim *dim,
void adg_dim_set_value_max (AdgDim *dim, const gchar *max);
const gchar *value_max) void adg_dim_set_limits (AdgDim *dim,
; const gchar *min,
void adg_dim_set_tolerances (AdgDim *dim, const gchar *max);
const gchar *value_min, AdgDimStyle * adg_dim_get_dim_style (AdgDim *dim);
const gchar *value_max) gdouble adg_dim_quote_angle (AdgDim *dim,
; gdouble angle);
const gchar * adg_dim_get_note (AdgDim *dim); AdgContainer * adg_dim_get_quote (AdgDim *dim);
void adg_dim_set_note (AdgDim *dim,
const gchar *note);
void adg_dim_render_quote (AdgDim *dim,
cairo_t *cr);
G_END_DECLS G_END_DECLS
#endif /* __ADG_DIM_H__ */ #endif /* __ADG_DIM_H__ */
 End of changes. 8 change blocks. 
38 lines changed or deleted 20 lines changed or added


 adg-entity.h   adg-entity.h 
skipping to change at line 24 skipping to change at line 24
* 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_ENTITY_H__ #ifndef __ADG_ENTITY_H__
#define __ADG_ENTITY_H__ #define __ADG_ENTITY_H__
#include <adg/adg-util.h> #include <adg/adg-util.h>
#include <adg/adg-type-builtins.h>
#include <adg/adg-matrix.h> #include <adg/adg-matrix.h>
#include <adg/adg-dress.h> #include <adg/adg-dress.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))
skipping to change at line 49 skipping to change at line 51
ADG_FORWARD_DECL(AdgCanvas); 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;
/*< public >*/ /*< public >*/
/* Signals */ /* Signals */
void (*parent_set) (AdgEntity *entity, void (*parent_set) (AdgEntity *entity,
AdgEntity *old_parent AdgEntity *old_paren
); t);
void (*global_changed) (AdgEntity *entity);
void (*local_changed) (AdgEntity *entity);
/* Virtual Table */ /* Virtual Table */
void (*get_global_matrix) (AdgEntity *entity, void (*invalidate) (AdgEntity *entity);
AdgMatrix *matrix); void (*arrange) (AdgEntity *entity);
void (*get_local_matrix) (AdgEntity *entity, void (*render) (AdgEntity *entity,
AdgMatrix *matrix); cairo_t *cr);
gboolean (*invalidate) (AdgEntity *entity);
gboolean (*render) (AdgEntity *entity,
cairo_t *cr);
}; };
GType adg_entity_get_type (void) G_GNUC_CONST; GType adg_entity_get_type (void) G_GNUC_CONST;
AdgCanvas * adg_entity_get_canvas (AdgEntity *entity); AdgCanvas * adg_entity_get_canvas (AdgEntity *entity);
AdgEntity * adg_entity_get_parent (AdgEntity *entity); AdgEntity * adg_entity_get_parent (AdgEntity *entity);
void adg_entity_set_parent (AdgEntity *entity, void adg_entity_set_parent (AdgEntity *entity,
AdgEntity *parent); AdgEntity *parent);
gboolean adg_entity_get_rendered (AdgEntity *entity); void adg_entity_get_global_map (AdgEntity *entity,
void adg_entity_set_rendered (AdgEntity *entity,
gboolean rendered)
;
void adg_entity_get_global_map (AdgEntity *entity,
AdgMatrix *map); AdgMatrix *map);
void adg_entity_set_global_map (AdgEntity *entity, void adg_entity_set_global_map (AdgEntity *entity,
const AdgMatrix *map); const AdgMatrix *map);
void adg_entity_transform_global_map (AdgEntity *entity, void adg_entity_transform_global_map(AdgEntity *entity,
const AdgMatrix *transform const AdgMatrix *transform
ation); ation,
void adg_entity_get_global_matrix (AdgEntity *entity, AdgTransformationMode mode
AdgMatrix *matrix); );
void adg_entity_get_local_map (AdgEntity *entity, void adg_entity_get_local_map (AdgEntity *entity,
AdgMatrix *map); AdgMatrix *map);
void adg_entity_set_local_map (AdgEntity *entity, void adg_entity_set_local_map (AdgEntity *entity,
const AdgMatrix *map); const AdgMatrix *map);
void adg_entity_transform_local_map (AdgEntity *entity, void adg_entity_transform_local_map (AdgEntity *entity,
const AdgMatrix *transform const AdgMatrix *transform
ation); ation,
void adg_entity_get_local_matrix (AdgEntity *entity, AdgTransformationMode mode
AdgMatrix *matrix); );
void adg_entity_apply_local_matrix (AdgEntity *entity, AdgTransformationMode
cairo_t *cr); adg_entity_get_local_mode (AdgEntity *entity);
AdgStyle * adg_entity_style (AdgEntity *entity, void adg_entity_set_local_mode (AdgEntity *entity,
AdgTransformationMode mode
);
void adg_entity_get_extents (AdgEntity *entity,
CpmlExtents *extents);
void adg_entity_set_extents (AdgEntity *entity,
const CpmlExtents *extents
);
AdgStyle * adg_entity_style (AdgEntity *entity,
AdgDress dress); AdgDress dress);
AdgStyle * adg_entity_get_style (AdgEntity *entity, AdgStyle * adg_entity_get_style (AdgEntity *entity,
AdgDress dress); AdgDress dress);
void adg_entity_set_style (AdgEntity *entity, void adg_entity_set_style (AdgEntity *entity,
AdgDress dress, AdgDress dress,
AdgStyle *style); AdgStyle *style);
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_invalidate (AdgEntity *entity); const AdgMatrix *adg_entity_global_matrix (AdgEntity *entity);
void adg_entity_render (AdgEntity *entity, const AdgMatrix *adg_entity_local_matrix (AdgEntity *entity);
void adg_entity_get_ctm (AdgEntity *entity,
AdgMatrix *ctm);
void adg_entity_global_changed (AdgEntity *entity);
void adg_entity_local_changed (AdgEntity *entity);
void adg_entity_invalidate (AdgEntity *entity);
void adg_entity_arrange (AdgEntity *entity);
void adg_entity_render (AdgEntity *entity,
cairo_t *cr); cairo_t *cr);
G_END_DECLS G_END_DECLS
#endif /* __ADG_ENTITY_H__ */ #endif /* __ADG_ENTITY_H__ */
 End of changes. 16 change blocks. 
41 lines changed or deleted 54 lines changed or added


 adg-enums.h   adg-enums.h 
skipping to change at line 28 skipping to change at line 28
*/ */
#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
typedef enum { typedef enum {
ADG_LINE_STYLE_DRAW,
ADG_LINE_STYLE_CENTER,
ADG_LINE_STYLE_HIDDEN,
ADG_LINE_STYLE_HATCH,
ADG_LINE_STYLE_DIM,
ADG_LINE_STYLE_LAST
} AdgLineStyleId;
typedef enum {
ADG_FONT_STYLE_TEXT,
ADG_FONT_STYLE_VALUE,
ADG_FONT_STYLE_TOLERANCE,
ADG_FONT_STYLE_NOTE,
ADG_FONT_STYLE_LAST
} AdgFontStyleId;
typedef enum {
ADG_ARROW_STYLE_ARROW,
ADG_ARROW_STYLE_TRIANGLE,
ADG_ARROW_STYLE_DOT,
ADG_ARROW_STYLE_CIRCLE,
ADG_ARROW_STYLE_BLOCK,
ADG_ARROW_STYLE_SQUARE,
ADG_ARROW_STYLE_TICK,
ADG_ARROW_STYLE_LAST
} AdgArrowStyleId;
typedef enum {
ADG_DIM_STYLE_ISO,
ADG_DIM_STYLE_LAST
} AdgDimStyleId;
typedef enum {
ADG_THREE_STATE_OFF, ADG_THREE_STATE_OFF,
ADG_THREE_STATE_ON, ADG_THREE_STATE_ON,
ADG_THREE_STATE_UNKNOWN ADG_THREE_STATE_UNKNOWN
} AdgThreeState; } AdgThreeState;
typedef enum {
ADG_TRANSFORM_NONE,
ADG_TRANSFORM_BEFORE,
ADG_TRANSFORM_AFTER,
ADG_TRANSFORM_BEFORE_NORMALIZED,
ADG_TRANSFORM_AFTER_NORMALIZED
} AdgTransformationMode;
G_END_DECLS G_END_DECLS
#endif /* __ADG_ENUMS_H__ */ #endif /* __ADG_ENUMS_H__ */
 End of changes. 2 change blocks. 
33 lines changed or deleted 8 lines changed or added


 adg-font-style.h   adg-font-style.h 
skipping to change at line 24 skipping to change at line 24
* 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_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/adg-style.h>
#include <adg/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 50 skipping to change at line 51
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); AdgStyle * adg_font_style_new (void);
cairo_scaled_font_t *
adg_font_style_font (AdgFontStyle *font_styl
e,
const AdgMatrix *ctm);
const gchar * adg_font_style_get_family (AdgFontStyle *font_style const gchar * adg_font_style_get_family (AdgFontStyle *font_styl
); e);
void adg_font_style_set_family (AdgFontStyle *font_style void adg_font_style_set_family (AdgFontStyle *font_styl
, e,
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_styl
); e);
void adg_font_style_set_slant (AdgFontStyle *font_style void adg_font_style_set_slant (AdgFontStyle *font_styl
, e,
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_styl
); e);
void adg_font_style_set_weight (AdgFontStyle *font_style void adg_font_style_set_weight (AdgFontStyle *font_styl
, e,
cairo_font_weight_t weight ); cairo_font_weight_t weight );
gdouble adg_font_style_get_size (AdgFontStyle *font_style gdouble adg_font_style_get_size (AdgFontStyle *font_styl
); e);
void adg_font_style_set_size (AdgFontStyle *font_style void adg_font_style_set_size (AdgFontStyle *font_styl
, e,
gdouble size); gdouble size);
cairo_antialias_t cairo_antialias_t
adg_font_style_get_antialias (AdgFontStyle *font_style adg_font_style_get_antialias (AdgFontStyle *font_styl
); e);
void adg_font_style_set_antialias (AdgFontStyle *font_style void adg_font_style_set_antialias (AdgFontStyle *font_styl
, e,
cairo_antialias_t antialia s); 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_styl e);
void adg_font_style_set_subpixel_order void adg_font_style_set_subpixel_order
(AdgFontStyle *font_style , (AdgFontStyle *font_styl e,
cairo_subpixel_order_t sub pixel_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_styl
); e);
void adg_font_style_set_hint_style (AdgFontStyle *font_style void adg_font_style_set_hint_style (AdgFontStyle *font_styl
, e,
cairo_hint_style_t hint_st yle); 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_styl
); e);
void adg_font_style_set_hint_metrics (AdgFontStyle *font_style void adg_font_style_set_hint_metrics (AdgFontStyle *font_styl
, e,
cairo_hint_metrics_t hint_ metrics); 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. 11 change blocks. 
32 lines changed or deleted 37 lines changed or added


 adg-ldim.h   adg-ldim.h 
skipping to change at line 63 skipping to change at line 63
gdouble direction, gdouble direction,
const AdgPair *pos); const AdgPair *pos);
AdgLDim * adg_ldim_new_full_explicit (gdouble ref1_x, AdgLDim * adg_ldim_new_full_explicit (gdouble ref1_x,
gdouble ref1_y, gdouble ref1_y,
gdouble ref2_x, gdouble ref2_x,
gdouble ref2_y, gdouble ref2_y,
gdouble direction, gdouble direction,
gdouble pos_x, gdouble pos_x,
gdouble pos_y); gdouble pos_y);
void adg_ldim_set_pos (AdgLDim *ldim,
const AdgPair *pos);
void adg_ldim_set_pos_explicit (AdgLDim *ldim,
gdouble pos_x,
gdouble pos_y);
gdouble 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,
gdouble direction) ; gdouble direction) ;
gboolean adg_ldim_has_extension1 (AdgLDim *ldim); gboolean adg_ldim_has_extension1 (AdgLDim *ldim);
void adg_ldim_switch_extension1 (AdgLDim *ldim, void adg_ldim_switch_extension1 (AdgLDim *ldim,
gboolean state); gboolean state);
gboolean adg_ldim_has_extension2 (AdgLDim *ldim); gboolean adg_ldim_has_extension2 (AdgLDim *ldim);
void adg_ldim_switch_extension2 (AdgLDim *ldim, void adg_ldim_switch_extension2 (AdgLDim *ldim,
gboolean state); gboolean state);
 End of changes. 1 change blocks. 
5 lines changed or deleted 0 lines changed or added


 adg-marker.h   adg-marker.h 
skipping to change at line 55 skipping to change at line 55
/*< 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;
AdgTrail * adg_marker_get_trail (AdgMarker *marker); AdgTrail * adg_marker_get_trail (AdgMarker *marker);
void adg_marker_set_trail (AdgMarker *marker,
AdgTrail *trail);
guint adg_marker_get_n_segment (AdgMarker *marker); guint adg_marker_get_n_segment (AdgMarker *marker);
void adg_marker_set_n_segment (AdgMarker *marker, AdgSegment * adg_marker_get_segment (AdgMarker *marker);
void adg_marker_set_segment (AdgMarker *marker,
AdgTrail *trail,
guint n_segment) ; guint n_segment) ;
const AdgSegment * const AdgSegment *
adg_marker_get_backup_segment (AdgMarker *marker); adg_marker_get_backup_segment (AdgMarker *marker);
void adg_marker_backup_segment (AdgMarker *marker); void adg_marker_backup_segment (AdgMarker *marker);
AdgSegment * adg_marker_get_segment (AdgMarker *marker);
gdouble adg_marker_get_pos (AdgMarker *marker); gdouble adg_marker_get_pos (AdgMarker *marker);
void adg_marker_set_pos (AdgMarker *marker, void adg_marker_set_pos (AdgMarker *marker,
gdouble pos); gdouble pos);
gdouble adg_marker_get_size (AdgMarker *marker); gdouble adg_marker_get_size (AdgMarker *marker);
void adg_marker_set_size (AdgMarker *marker, void adg_marker_set_size (AdgMarker *marker,
gdouble size); gdouble size);
AdgModel * adg_marker_model (AdgMarker *marker); AdgModel * adg_marker_model (AdgMarker *marker);
AdgModel * adg_marker_get_model (AdgMarker *marker); AdgModel * adg_marker_get_model (AdgMarker *marker);
void adg_marker_set_model (AdgMarker *marker, void adg_marker_set_model (AdgMarker *marker,
AdgModel *model); AdgModel *model);
 End of changes. 3 change blocks. 
4 lines changed or deleted 3 lines changed or added


 adg-matrix.h   adg-matrix.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_MATRIX_H__ #ifndef __ADG_MATRIX_H__
#define __ADG_MATRIX_H__ #define __ADG_MATRIX_H__
#include <glib-object.h> #include <adg/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;
AdgMatrix * adg_matrix_dup (const AdgMatrix *matrix); const AdgMatrix*adg_matrix_identity (void) G_GNUC_CONST;
const AdgMatrix*adg_matrix_get_fallback (void) G_GNUC_CONST;
AdgMatrix * adg_matrix_copy (AdgMatrix *matrix, AdgMatrix * adg_matrix_copy (AdgMatrix *matrix,
const AdgMatrix *src); const AdgMatrix *src);
void adg_matrix_init_null (AdgMatrix *matrix); AdgMatrix * adg_matrix_dup (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);
void adg_matrix_init_reflection (AdgMatrix *matrix, gboolean adg_matrix_normalize (AdgMatrix *matrix);
double radians); void adg_matrix_transform (AdgMatrix *matrix,
const AdgMatrix *transform
ation,
AdgTransformationMode mode
);
G_END_DECLS G_END_DECLS
#endif /* __ADG_MATRIX_H__ */ #endif /* __ADG_MATRIX_H__ */
 End of changes. 4 change blocks. 
7 lines changed or deleted 10 lines changed or added


 adg-model.h   adg-model.h 
skipping to change at line 52 skipping to change at line 52
struct _AdgModelClass { struct _AdgModelClass {
/*< private >*/ /*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
/*< public >*/ /*< public >*/
GSList * (*get_dependencies) (AdgModel *model); GSList * (*get_dependencies) (AdgModel *model);
void (*add_dependency) (AdgModel *model, void (*add_dependency) (AdgModel *model,
AdgEntity *entity); AdgEntity *entity);
void (*remove_dependency) (AdgModel *model, void (*remove_dependency) (AdgModel *model,
AdgEntity *entity); AdgEntity *entity);
void (*clear) (AdgModel *model);
void (*changed) (AdgModel *model); void (*changed) (AdgModel *model);
}; };
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);
GSList * adg_model_get_dependencies (AdgModel *model); GSList * adg_model_get_dependencies (AdgModel *model);
void adg_model_foreach_dependency (AdgModel *model, void adg_model_foreach_dependency (AdgModel *model,
GCallback callback, GCallback callback,
gpointer user_data) ; gpointer user_data) ;
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. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 adg-pair.h   adg-pair.h 
skipping to change at line 34 skipping to change at line 34
#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);
gboolean adg_pair_equal (const AdgPair *pair1,
const AdgPair *pair2);
G_END_DECLS G_END_DECLS
#endif /* __ADG_PAIR_H__ */ #endif /* __ADG_PAIR_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 adg-path.h   adg-path.h 
skipping to change at line 58 skipping to change at line 58
AdgTrailClass parent_class; AdgTrailClass parent_class;
}; };
GType adg_path_get_type (void) G_GNUC_CONST; GType adg_path_get_type (void) G_GNUC_CONST;
AdgPath * adg_path_new (void); AdgPath * adg_path_new (void);
void adg_path_get_current_point (AdgPath *path, void adg_path_get_current_point (AdgPath *path,
gdouble *x, gdouble *x,
gdouble *y); gdouble *y);
gboolean adg_path_has_current_point (AdgPath *path); gboolean adg_path_has_current_point (AdgPath *path);
void adg_path_clear (AdgPath *path);
void adg_path_append (AdgPath *path, void adg_path_append (AdgPath *path,
cairo_path_data_type_t cairo_path_data_type_t
type, type,
...); ...);
void adg_path_append_valist (AdgPath *path, void adg_path_append_valist (AdgPath *path,
cairo_path_data_type_t cairo_path_data_type_t
type, type,
va_list var_args); va_list var_args);
void adg_path_append_primitive (AdgPath *path, void adg_path_append_primitive (AdgPath *path,
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 adg-toy-text.h   adg-toy-text.h 
skipping to change at line 57 skipping to change at line 57
}; };
GType adg_toy_text_get_type (void) G_GNUC_CONST; GType adg_toy_text_get_type (void) G_GNUC_CONST;
AdgToyText * adg_toy_text_new (const gchar *label); AdgToyText * adg_toy_text_new (const gchar *label);
AdgDress adg_toy_text_get_dress (AdgToyText *toy_text); AdgDress adg_toy_text_get_dress (AdgToyText *toy_text);
void adg_toy_text_set_dress (AdgToyText *toy_text, void adg_toy_text_set_dress (AdgToyText *toy_text,
AdgDress dress); AdgDress dress);
const gchar * adg_toy_text_get_label (AdgToyText *toy_text); const gchar * adg_toy_text_get_label (AdgToyText *toy_text);
void adg_toy_text_set_label (AdgToyText *toy_text, void adg_toy_text_set_label (AdgToyText *toy_text,
const gchar *label); const gchar *label);
void adg_toy_text_get_extents (AdgToyText *toy_text,
cairo_t *cr,
cairo_text_extents_t *exte
nts);
G_END_DECLS G_END_DECLS
#endif /* __ADG_TOY_TEXT_H__ */ #endif /* __ADG_TOY_TEXT_H__ */
 End of changes. 1 change blocks. 
4 lines changed or deleted 0 lines changed or added


 adg-trail.h   adg-trail.h 
skipping to change at line 60 skipping to change at line 60
/*< public >*/ /*< public >*/
CpmlPath * (*get_cpml_path) (AdgTrail *trail); CpmlPath * (*get_cpml_path) (AdgTrail *trail);
}; };
GType adg_trail_get_type (void) G_GNUC_CONST; GType adg_trail_get_type (void) G_GNUC_CONST;
AdgTrail * adg_trail_new (AdgTrailCallback callback, AdgTrail * adg_trail_new (AdgTrailCallback callback,
gpointer user_data ); gpointer user_data );
const cairo_path_t * const cairo_path_t *
adg_trail_get_cairo_path (AdgTrail *trail); adg_trail_get_cairo_path (AdgTrail *trail);
void adg_trail_clear_cairo_path (AdgTrail *trail);
CpmlPath * adg_trail_get_cpml_path (AdgTrail *trail); CpmlPath * adg_trail_get_cpml_path (AdgTrail *trail);
gboolean adg_trail_get_segment (AdgTrail *trail, gboolean adg_trail_get_segment (AdgTrail *trail,
AdgSegment *segment, AdgSegment *segment,
guint n); guint n);
void adg_trail_dump (AdgTrail *trail); void adg_trail_dump (AdgTrail *trail);
G_END_DECLS G_END_DECLS
#endif /* __ADG_TRAIL_H__ */ #endif /* __ADG_TRAIL_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 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_LINE_STYLE_ID (adg_line_style_id_get_type())
GType adg_line_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_FONT_STYLE_ID (adg_font_style_id_get_type())
GType adg_font_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_ARROW_STYLE_ID (adg_arrow_style_id_get_type())
GType adg_arrow_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_DIM_STYLE_ID (adg_dim_style_id_get_type())
GType adg_dim_style_id_get_type(void) G_GNUC_CONST;
#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_TRANSFORMATION_MODE (adg_transformation_mode_get_type())
GType adg_transformation_mode_get_type(void) G_GNUC_CONST;
G_END_DECLS G_END_DECLS
#endif /* __ADG_TYPE_BUILTINS_H__ */ #endif /* __ADG_TYPE_BUILTINS_H__ */
/* Generated data ends here */ /* Generated data ends here */
 End of changes. 2 change blocks. 
17 lines changed or deleted 5 lines changed or added


 adg-util.h   adg-util.h 
skipping to change at line 24 skipping to change at line 24
* 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_UTIL_H__ #ifndef __ADG_UTIL_H__
#define __ADG_UTIL_H__ #define __ADG_UTIL_H__
#include <glib.h> #include <glib.h>
#include <cairo.h>
#include <math.h> #include <math.h>
#define ADG_DIR_RIGHT 0. #define ADG_DIR_RIGHT 0.
#define ADG_DIR_DOWN M_PI_2 #define ADG_DIR_DOWN M_PI_2
#define ADG_DIR_LEFT M_PI #define ADG_DIR_LEFT M_PI
#define ADG_DIR_UP (M_PI_2 * 3.) #define ADG_DIR_UP (M_PI_2 * 3.)
#define ADG_FORWARD_DECL(id) typedef struct _##id id #define ADG_FORWARD_DECL(id) typedef struct _##id id
#define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE) #define ADG_MESSAGE(message) g_message("file `%s' at line %d: %s", \
#define ADG_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_EN __FILE__, __LINE__, #message)
D
#define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_E
ND
#define ADG_CHECKPOINT_WITH_MESSAGE(message) \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
"file `%s' at line %d: %s", \
__FILE__, __LINE__, #message)
#define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point")
#define ADG_STUB() ADG_CHECKPOINT_WITH_MESSAGE("stub")
G_BEGIN_DECLS G_BEGIN_DECLS
int adg_strcmp (const char *s1, gint adg_strcmp (const gchar *s1,
const gchar *s2); const gchar *s2);
G_END_DECLS G_END_DECLS
#endif /* __ADG_UTIL_H__ */ #endif /* __ADG_UTIL_H__ */
 End of changes. 3 change blocks. 
15 lines changed or deleted 3 lines changed or added


 adg.h   adg.h 
skipping to change at line 28 skipping to change at line 28
*/ */
#ifndef __ADG_H__ #ifndef __ADG_H__
#define __ADG_H__ #define __ADG_H__
#include <adg/adg-adim.h> #include <adg/adg-adim.h>
#include <adg/adg-canvas.h> #include <adg/adg-canvas.h>
#include <adg/adg-container.h> #include <adg/adg-container.h>
#include <adg/adg-dim.h> #include <adg/adg-dim.h>
#include <adg/adg-dress.h> #include <adg/adg-dress.h>
#include <adg/adg-edges.h>
#include <adg/adg-entity.h> #include <adg/adg-entity.h>
#include <adg/adg-enums.h> #include <adg/adg-enums.h>
#include <adg/adg-ldim.h> #include <adg/adg-ldim.h>
#include <adg/adg-matrix.h> #include <adg/adg-matrix.h>
#include <adg/adg-model.h> #include <adg/adg-model.h>
#include <adg/adg-pair.h> #include <adg/adg-pair.h>
#include <adg/adg-path.h> #include <adg/adg-path.h>
#include <adg/adg-primitive.h> #include <adg/adg-primitive.h>
#include <adg/adg-segment.h> #include <adg/adg-segment.h>
#include <adg/adg-stroke.h> #include <adg/adg-stroke.h>
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 cpml-pair.h   cpml-pair.h 
skipping to change at line 59 skipping to change at line 59
const CpmlPair *src); const CpmlPair *src);
void cpml_pair_transform (CpmlPair *pair, void cpml_pair_transform (CpmlPair *pair,
const cairo_matrix_t const cairo_matrix_t
*matrix); *matrix);
double cpml_pair_squared_distance (const CpmlPair *from, double cpml_pair_squared_distance (const CpmlPair *from,
const CpmlPair *to); const CpmlPair *to);
double cpml_pair_distance (const CpmlPair *from, double cpml_pair_distance (const CpmlPair *from,
const CpmlPair *to); const CpmlPair *to);
CpmlVector * cpml_vector_from_angle (CpmlVector *vector, CpmlVector * cpml_vector_from_angle (CpmlVector *vector,
double angle, double angle);
double length);
void cpml_vector_set_length (CpmlVector *vector, void cpml_vector_set_length (CpmlVector *vector,
double length); double length);
double cpml_vector_angle (const CpmlVector double cpml_vector_angle (const CpmlVector
*vector); *vector);
void cpml_vector_normal (CpmlVector *vector); void cpml_vector_normal (CpmlVector *vector);
void cpml_pair_to_cairo (const CpmlPair *pair, void cpml_pair_to_cairo (const CpmlPair *pair,
cairo_path_data_t cairo_path_data_t
*path_data) ; *path_data) ;
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 cpml.h   cpml.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., 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-arc.h> #include <cpml/cpml-arc.h>
#include <cpml/cpml-curve.h> #include <cpml/cpml-curve.h>
#include <cpml/cpml-extents.h>
#include <cpml/cpml-line.h> #include <cpml/cpml-line.h>
#include <cpml/cpml-pair.h> #include <cpml/cpml-pair.h>
#include <cpml/cpml-primitive.h> #include <cpml/cpml-primitive.h>
#include <cpml/cpml-segment.h> #include <cpml/cpml-segment.h>
#include <cpml/cpml-util.h> #include <cpml/cpml-util.h>
#endif /* __CPML_H__ */ #endif /* __CPML_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 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/