adg-dash.h   adg-dash.h 
skipping to change at line 34 skipping to change at line 34
#ifndef __ADG_DASH_H__ #ifndef __ADG_DASH_H__
#define __ADG_DASH_H__ #define __ADG_DASH_H__
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_DASH (adg_dash_get_type()) #define ADG_TYPE_DASH (adg_dash_get_type())
typedef struct _AdgDash AdgDash; typedef struct _AdgDash AdgDash;
GType adg_dash_get_type (void); GType adg_dash_get_type (void);
AdgDash * adg_dash_dup (const AdgDash *dash); AdgDash * adg_dash_dup (const AdgDash *src);
AdgDash * adg_dash_new (void); AdgDash * adg_dash_new (void);
AdgDash * adg_dash_new_with_dashes (gint num_dashes , AdgDash * adg_dash_new_with_dashes (gint num_dashes ,
...); ...);
void adg_dash_append_dash (AdgDash *dash, void adg_dash_append_dash (AdgDash *dash,
gdouble length); gdouble length);
void adg_dash_append_dashes (AdgDash *dash, void adg_dash_append_dashes (AdgDash *dash,
gint num_dashes , gint num_dashes ,
...); ...);
void adg_dash_append_dashes_valist (AdgDash *dash, void adg_dash_append_dashes_valist (AdgDash *dash,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 adg-path.h   adg-path.h 
skipping to change at line 74 skipping to change at line 74
va_list var_args); va_list var_args);
void adg_path_append_array (AdgPath *path, void adg_path_append_array (AdgPath *path,
CpmlPrimitiveType type, CpmlPrimitiveType type,
const CpmlPair**pairs); const CpmlPair**pairs);
void adg_path_append_primitive (AdgPath *path, void adg_path_append_primitive (AdgPath *path,
const CpmlPrimitive const CpmlPrimitive
*primitive) ; *primitive) ;
void adg_path_append_segment (AdgPath *path, void adg_path_append_segment (AdgPath *path,
const CpmlSegment const CpmlSegment
*segment); *segment);
void adg_path_append_cpml_path (AdgPath *path, void adg_path_append_cairo_path (AdgPath *path,
const cairo_path_t const cairo_path_t
*cairo_path ); *cairo_path );
void adg_path_move_to (AdgPath *path, void adg_path_move_to (AdgPath *path,
const CpmlPair *pair); const CpmlPair *pair);
void adg_path_move_to_explicit (AdgPath *path, void adg_path_move_to_explicit (AdgPath *path,
gdouble x, gdouble x,
gdouble y); gdouble y);
void adg_path_line_to (AdgPath *path, void adg_path_line_to (AdgPath *path,
const CpmlPair *pair); const CpmlPair *pair);
void adg_path_line_to_explicit (AdgPath *path, void adg_path_line_to_explicit (AdgPath *path,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 adg-table-cell.h   adg-table-cell.h 
skipping to change at line 33 skipping to change at line 33
#ifndef __ADG_TABLE_CELL_H__ #ifndef __ADG_TABLE_CELL_H__
#define __ADG_TABLE_CELL_H__ #define __ADG_TABLE_CELL_H__
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_TABLE_CELL (adg_table_cell_get_type()) #define ADG_TYPE_TABLE_CELL (adg_table_cell_get_type())
GType adg_table_cell_get_type (void); GType adg_table_cell_get_type (void);
AdgTableCell * adg_table_cell_dup (const AdgTableCell *table_ cell); AdgTableCell * adg_table_cell_dup (const AdgTableCell *src);
AdgTableCell * adg_table_cell_new (AdgTableRow *table_row) ; AdgTableCell * adg_table_cell_new (AdgTableRow *table_row) ;
AdgTableCell * adg_table_cell_new_before (AdgTableCell *before_cel l); AdgTableCell * adg_table_cell_new_before (AdgTableCell *before_cel l);
AdgTableCell * adg_table_cell_new_with_width (AdgTableRow *table_row, AdgTableCell * adg_table_cell_new_with_width (AdgTableRow *table_row,
gdouble width); gdouble width);
AdgTableCell * adg_table_cell_new_full (AdgTableRow *table_row, AdgTableCell * adg_table_cell_new_full (AdgTableRow *table_row,
gdouble width, gdouble width,
const gchar *name, const gchar *name,
const gchar *title, const gchar *title,
gboolean has_frame) ; gboolean has_frame) ;
void adg_table_cell_dispose (AdgTableCell *table_cell ); void adg_table_cell_dispose (AdgTableCell *table_cell );
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 adg-table-row.h   adg-table-row.h 
skipping to change at line 33 skipping to change at line 33
#ifndef __ADG_TABLE_ROW_H__ #ifndef __ADG_TABLE_ROW_H__
#define __ADG_TABLE_ROW_H__ #define __ADG_TABLE_ROW_H__
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_TABLE_ROW (adg_table_row_get_type()) #define ADG_TYPE_TABLE_ROW (adg_table_row_get_type())
GType adg_table_row_get_type (void); GType adg_table_row_get_type (void);
AdgTableRow * adg_table_row_dup (const AdgTableRow *table_ row); AdgTableRow * adg_table_row_dup (const AdgTableRow *src);
AdgTableRow * adg_table_row_new (AdgTable *table); AdgTableRow * adg_table_row_new (AdgTable *table);
AdgTableRow * adg_table_row_new_before (AdgTableRow *before_row ); AdgTableRow * adg_table_row_new_before (AdgTableRow *before_row );
void adg_table_row_free (AdgTableRow *table_row) ; void adg_table_row_free (AdgTableRow *table_row) ;
void adg_table_row_insert (AdgTableRow *table_row, void adg_table_row_insert (AdgTableRow *table_row,
AdgTableCell *table_cell , AdgTableCell *table_cell ,
AdgTableCell *before_cel l); AdgTableCell *before_cel l);
void adg_table_row_remove (AdgTableRow *table_row, void adg_table_row_remove (AdgTableRow *table_row,
AdgTableCell *table_cell ); AdgTableCell *table_cell );
void adg_table_row_foreach (AdgTableRow *table_row, void adg_table_row_foreach (AdgTableRow *table_row,
GCallback callback, GCallback callback,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 adg-utils.h   adg-utils.h 
skipping to change at line 53 skipping to change at line 53
gboolean adg_is_enum_value (int value, gboolean adg_is_enum_value (int value,
GType enum_type) ; GType enum_type) ;
gboolean adg_is_boolean_value (gboolean value); gboolean adg_is_boolean_value (gboolean value);
gchar * adg_string_replace (const gchar *str, gchar * adg_string_replace (const gchar *str,
const gchar *from, const gchar *from,
const gchar *to); const gchar *to);
gchar * adg_find_file (const gchar *file, gchar * adg_find_file (const gchar *file,
...); ...);
gdouble adg_scale_factor (const gchar *scale); gdouble adg_scale_factor (const gchar *scale);
cairo_surface_type_t adg_type_from_filename (const gchar *file); cairo_surface_type_t adg_type_from_filename (const gchar *file);
void adg_nop (void);
G_END_DECLS G_END_DECLS
#endif /* __ADG_UTILS_H__ */ #endif /* __ADG_UTILS_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 adg.h   adg.h 
skipping to change at line 27 skipping to change at line 27
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __ADG_H__ #ifndef __ADG_H__
#define __ADG_H__ #define __ADG_H__
#include <cairo-gobject.h> #include <cairo-gobject.h>
#include <cpml.h> #include <cpml.h>
#include "adg/adg-forward-declarations.h" #include "adg/adg-forward-declarations.h"
#include "adg/adg-cairo-fallback.h"
#include "adg/adg-enums.h" #include "adg/adg-enums.h"
#include "adg/adg-type-builtins.h"
#include "adg/adg-utils.h" #include "adg/adg-utils.h"
#include "adg/adg-matrix.h" #include "adg/adg-matrix.h"
#include "adg/adg-entity.h" #include "adg/adg-entity.h"
#include "adg/adg-model.h" #include "adg/adg-model.h"
#include "adg/adg-trail.h" #include "adg/adg-trail.h"
#include "adg/adg-path.h" #include "adg/adg-path.h"
#include "adg/adg-edges.h" #include "adg/adg-edges.h"
#include "adg/adg-point.h" #include "adg/adg-point.h"
#include "adg/adg-marker.h" #include "adg/adg-marker.h"
#include "adg/adg-dash.h" #include "adg/adg-dash.h"
#include "adg/adg-style.h" #include "adg/adg-style.h"
#include "adg/adg-color-style.h" #include "adg/adg-color-style.h"
#include "adg/adg-line-style.h" #include "adg/adg-line-style.h"
#include "adg/adg-font-style.h" #include "adg/adg-font-style.h"
#include "adg/adg-table-style.h" #include "adg/adg-table-style.h"
#include "adg/adg-dim-style.h" #include "adg/adg-dim-style.h"
#include "adg/adg-fill-style.h" #include "adg/adg-fill-style.h"
#include "adg/adg-ruled-fill.h" #include "adg/adg-ruled-fill.h"
#include "adg/adg-param-dress.h"
#include "adg/adg-dress.h" #include "adg/adg-dress.h"
#include "adg/adg-stroke.h" #include "adg/adg-stroke.h"
#include "adg/adg-hatch.h" #include "adg/adg-hatch.h"
#include "adg/adg-textual.h" #include "adg/adg-textual.h"
#include "adg/adg-toy-text.h" #include "adg/adg-toy-text.h"
#include "adg/adg-logo.h" #include "adg/adg-logo.h"
#include "adg/adg-projection.h" #include "adg/adg-projection.h"
#include "adg/adg-container.h" #include "adg/adg-container.h"
#include "adg/adg-alignment.h" #include "adg/adg-alignment.h"
#include "adg/adg-table.h" #include "adg/adg-table.h"
#include "adg/adg-table-row.h"
#include "adg/adg-table-cell.h"
#include "adg/adg-title-block.h" #include "adg/adg-title-block.h"
#include "adg/adg-arrow.h" #include "adg/adg-arrow.h"
#include "adg/adg-dim.h" #include "adg/adg-dim.h"
#include "adg/adg-ldim.h" #include "adg/adg-ldim.h"
#include "adg/adg-rdim.h" #include "adg/adg-rdim.h"
#include "adg/adg-adim.h" #include "adg/adg-adim.h"
#include "adg/adg-canvas.h" #include "adg/adg-canvas.h"
#include <pango/pango.h> #include <pango/pango.h>
#include "adg/adg-text.h" #include "adg/adg-text.h"
 End of changes. 4 change blocks. 
0 lines changed or deleted 5 lines changed or added


 cpml-gobject.h   cpml-gobject.h 
skipping to change at line 29 skipping to change at line 29
#if !defined(__CPML_H__) #if !defined(__CPML_H__)
#error "Only <cpml/cpml.h> can be included directly." #error "Only <cpml/cpml.h> can be included directly."
#endif #endif
#ifndef __CPML_GOBJECT_H__ #ifndef __CPML_GOBJECT_H__
#define __CPML_GOBJECT_H__ #define __CPML_GOBJECT_H__
G_BEGIN_DECLS G_BEGIN_DECLS
#define CPML_TYPE_PAIR (cpml_pair_get_type()) #define CPML_TYPE_PAIR (cpml_pair_get_type())
GType cpml_pair_get_type (void); GType cpml_pair_get_type (void);
CpmlPair * cpml_pair_dup (const CpmlPair *pair); CpmlPair * cpml_pair_dup (const CpmlPair *pair);
#define CPML_TYPE_PRIMITIVE (cpml_primitive_get_type()) #define CPML_TYPE_PRIMITIVE_TYPE (cpml_primitive_type_get_type()
GType cpml_primitive_get_type (void); )
CpmlPrimitive * cpml_primitive_dup (const CpmlPrimitive *primitive) GType cpml_primitive_type_get_type(void);
;
CpmlPrimitive * cpml_primitive_deep_dup (const CpmlPrimitive *primitive) #define CPML_TYPE_PRIMITIVE (cpml_primitive_get_type())
; GType cpml_primitive_get_type (void);
CpmlPrimitive * cpml_primitive_dup (const CpmlPrimitive *primit
#define CPML_TYPE_SEGMENT (cpml_segment_get_type()) ive);
GType cpml_segment_get_type (void); CpmlPrimitive * cpml_primitive_deep_dup (const CpmlPrimitive *primit
CpmlSegment * cpml_segment_dup (const CpmlSegment *segment); ive);
CpmlSegment * cpml_segment_deep_dup (const CpmlSegment *segment);
void cpml_segment_deep_copy (CpmlSegment *segment, #define CPML_TYPE_SEGMENT (cpml_segment_get_type())
const CpmlSegment *src); GType cpml_segment_get_type (void);
CpmlSegment * cpml_segment_dup (const CpmlSegment *segmen
t);
CpmlSegment * cpml_segment_deep_dup (const CpmlSegment *segmen
t);
#define CPML_TYPE_CURVE_OFFSET_ALGORITHM \ #define CPML_TYPE_CURVE_OFFSET_ALGORITHM \
(cpml_curve_offset_algorithm_get_ty pe()) (cpml_curve_offset_algorithm_ge t_type())
GType cpml_curve_offset_algorithm_get_type GType cpml_curve_offset_algorithm_get_type
(void); (void);
G_END_DECLS G_END_DECLS
#endif /* __CPML_GOBJECT_H__ */ #endif /* __CPML_GOBJECT_H__ */
 End of changes. 3 change blocks. 
19 lines changed or deleted 23 lines changed or added


 cpml-primitive.h   cpml-primitive.h 
skipping to change at line 30 skipping to change at line 30
#if !defined(__CPML_H__) #if !defined(__CPML_H__)
#error "Only <cpml/cpml.h> can be included directly." #error "Only <cpml/cpml.h> can be included directly."
#endif #endif
#ifndef __CPML_PRIMITIVE_H__ #ifndef __CPML_PRIMITIVE_H__
#define __CPML_PRIMITIVE_H__ #define __CPML_PRIMITIVE_H__
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
typedef struct _CpmlPrimitive CpmlPrimitive; typedef struct _CpmlPrimitive CpmlPrimitive;
typedef cairo_path_data_type_t CpmlPrimitiveType;
typedef enum { #define CPML_MOVE CAIRO_PATH_MOVE_TO
CPML_MOVE = CAIRO_PATH_MOVE_TO, #define CPML_LINE CAIRO_PATH_LINE_TO
CPML_LINE = CAIRO_PATH_LINE_TO, #define CPML_CURVE CAIRO_PATH_CURVE_TO
CPML_CURVE = CAIRO_PATH_CURVE_TO, #define CPML_CLOSE CAIRO_PATH_CLOSE_PATH
CPML_CLOSE = CAIRO_PATH_CLOSE_PATH, #define CPML_ARC ((CpmlPrimitiveType) 19)
CPML_ARC = 88
} CpmlPrimitiveType;
struct _CpmlPrimitive { struct _CpmlPrimitive {
/*< public >*/ /*< public >*/
CpmlSegment *segment; CpmlSegment *segment;
cairo_path_data_t *org; cairo_path_data_t *org;
cairo_path_data_t *data; cairo_path_data_t *data;
}; };
size_t cpml_primitive_type_get_n_points size_t cpml_primitive_type_get_n_points
(CpmlPrimitiveType type); (CpmlPrimitiveType type);
void cpml_primitive_from_segment(CpmlPrimitive *primitive, void cpml_primitive_from_segment(CpmlPrimitive *primitive,
CpmlSegment *segment); CpmlSegment *segment);
void cpml_primitive_copy (CpmlPrimitive *primitive, void cpml_primitive_copy (CpmlPrimitive *primitive,
const CpmlPrimitive *src); const CpmlPrimitive *src);
int cpml_primitive_copy_data (CpmlPrimitive *primitive,
const CpmlPrimitive *src);
void cpml_primitive_reset (CpmlPrimitive *primitive) ; void cpml_primitive_reset (CpmlPrimitive *primitive) ;
int cpml_primitive_next (CpmlPrimitive *primitive) ; int cpml_primitive_next (CpmlPrimitive *primitive) ;
size_t cpml_primitive_get_n_points(const CpmlPrimitive *primitive) ; size_t cpml_primitive_get_n_points(const CpmlPrimitive *primitive) ;
double cpml_primitive_get_length (const CpmlPrimitive *primitive) ; double cpml_primitive_get_length (const CpmlPrimitive *primitive) ;
void cpml_primitive_put_extents (const CpmlPrimitive *primitive, void cpml_primitive_put_extents (const CpmlPrimitive *primitive,
CpmlExtents *extents); CpmlExtents *extents);
int cpml_primitive_set_point (CpmlPrimitive *primitive, int cpml_primitive_set_point (CpmlPrimitive *primitive,
int n_point, int n_point,
const CpmlPair *pair); const CpmlPair *pair);
int cpml_primitive_put_point (const CpmlPrimitive *primitive, int cpml_primitive_put_point (const CpmlPrimitive *primitive,
int n_point, int n_point,
CpmlPair *pair); CpmlPair *pair);
void cpml_primitive_put_pair_at (const CpmlPrimitive *primitive, void cpml_primitive_put_pair_at (const CpmlPrimitive *primitive,
double pos, double pos,
CpmlPair *pair); CpmlPair *pair);
void cpml_primitive_put_vector_at void cpml_primitive_put_vector_at
(const CpmlPrimitive *primitive, (const CpmlPrimitive *primitive,
double pos, double pos,
CpmlVector *vector); CpmlVector *vector);
int cpml_primitive_is_inside (const CpmlPrimitive *primitive,
const CpmlPair *pair);
double cpml_primitive_get_closest_pos double cpml_primitive_get_closest_pos
(const CpmlPrimitive *primitive, (const CpmlPrimitive *primitive,
const CpmlPair *pair); const CpmlPair *pair);
size_t cpml_primitive_put_intersections size_t cpml_primitive_put_intersections
(const CpmlPrimitive *primitive, (const CpmlPrimitive *primitive,
const CpmlPrimitive *primitive2 , const CpmlPrimitive *primitive2 ,
size_t n_dest, size_t n_dest,
CpmlPair *dest); CpmlPair *dest);
size_t cpml_primitive_put_intersections_with_segment size_t cpml_primitive_put_intersections_with_segment
(const CpmlPrimitive *primitive, (const CpmlPrimitive *primitive,
 End of changes. 4 change blocks. 
7 lines changed or deleted 10 lines changed or added


 cpml-segment.h   cpml-segment.h 
skipping to change at line 42 skipping to change at line 42
/*< public >*/ /*< public >*/
cairo_path_t *path; cairo_path_t *path;
cairo_path_data_t *data; cairo_path_data_t *data;
int num_data; int num_data;
}; };
int cpml_segment_from_cairo (CpmlSegment *segment, int cpml_segment_from_cairo (CpmlSegment *segment,
cairo_path_t *path); cairo_path_t *path);
void cpml_segment_copy (CpmlSegment *segment, void cpml_segment_copy (CpmlSegment *segment,
const CpmlSegment *src); const CpmlSegment *src);
int cpml_segment_copy_data (CpmlSegment *segment,
const CpmlSegment *src);
void cpml_segment_reset (CpmlSegment *segment); void cpml_segment_reset (CpmlSegment *segment);
int cpml_segment_next (CpmlSegment *segment); int cpml_segment_next (CpmlSegment *segment);
double cpml_segment_get_length (const CpmlSegment *segment); double cpml_segment_get_length (const CpmlSegment *segment);
void cpml_segment_put_extents (const CpmlSegment *segment, void cpml_segment_put_extents (const CpmlSegment *segment,
CpmlExtents *extents); CpmlExtents *extents);
void cpml_segment_put_pair_at (const CpmlSegment *segment, void cpml_segment_put_pair_at (const CpmlSegment *segment,
double pos, double pos,
CpmlPair *pair); CpmlPair *pair);
void cpml_segment_put_vector_at (const CpmlSegment *segment, void cpml_segment_put_vector_at (const CpmlSegment *segment,
double pos, double pos,
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 cpml-utils.h   cpml-utils.h 
skipping to change at line 31 skipping to change at line 31
#error "Only <cpml/cpml.h> can be included directly." #error "Only <cpml/cpml.h> can be included directly."
#endif #endif
#ifndef __CPML_UTILS_H__ #ifndef __CPML_UTILS_H__
#define __CPML_UTILS_H__ #define __CPML_UTILS_H__
/* Required include files */ /* Required include files */
#include <stdlib.h> #include <stdlib.h>
#include <cairo.h> #include <cairo.h>
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
#define CPML_GNUC_CONST __attribute__((__const__))
#else
#define CPML_GNUC_CONST
#endif
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
double cpml_angle (double angle); double cpml_angle (double angle);
CAIRO_END_DECLS CAIRO_END_DECLS
#endif /* __CPML_UTILS_H__ */ #endif /* __CPML_UTILS_H__ */
 End of changes. 1 change blocks. 
6 lines changed or deleted 0 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/