mathematical 1.4.2 → 1.5.0

data/ext/mathematical/lasem/src/lsmsvgview.c

@@ -331,11 +331,20 @@ lsm_svg_view_create_surface_pattern (LsmSvgView *view,
 	g_return_val_if_fail (view->pattern_data != NULL, FALSE);
 	g_return_val_if_fail (view->dom_view.cairo == NULL, FALSE);
 
+	/* Calculate a scale that will allow us to create a surface pattern
+	 * for which a pixel will also be roughly a pixel on the final
+	 * image */
+
 	x1 = viewport->x;
 	y1 = viewport->y;
 	x2 = viewport->x + viewport->width;
 	y2 = viewport->y;
 
+	if (pattern_matrix != NULL) {
+		lsm_svg_matrix_transform_point (pattern_matrix, &x1, &y1);
+		lsm_svg_matrix_transform_point (pattern_matrix, &x2, &y2);
+	}
+
 	cairo_user_to_device (view->pattern_data->old_cairo, &x1, &y1);
 	cairo_user_to_device (view->pattern_data->old_cairo, &x2, &y2);
 
@@ -344,14 +353,18 @@ lsm_svg_view_create_surface_pattern (LsmSvgView *view,
 	x2 = viewport->x;
 	y2 = viewport->y + viewport->height;
 
+	if (pattern_matrix != NULL) {
+		lsm_svg_matrix_transform_point (pattern_matrix, &x2, &y2);
+	}
+
 	cairo_user_to_device (view->pattern_data->old_cairo, &x2, &y2);
 
 	device_height = sqrt ((x1 - x2)*(x1 - x2) + (y1 - y2)*(y1 - y2));
 
-	if (surface_type == LSM_SVG_VIEW_SURFACE_TYPE_IMAGE) {
-		device_height = ceil (device_height);
-		device_width = ceil (device_width);
-	}
+	/* Create new surface with integer size */
+
+	device_height = ceil (device_height);
+	device_width = ceil (device_width);
 
 	x_scale = device_width / viewport->width;
 	y_scale = device_height / viewport->height;
@@ -1761,23 +1774,25 @@ lsm_svg_view_pop_mask (LsmSvgView *view)
 		cairo_pop_group_to_source (cairo);
 		if (view->pattern_data->pattern != NULL) {
 			cairo_surface_t *surface;
-			int width, height, row, i, stride;
-			unsigned char *pixels;
-
-			cairo_pattern_get_surface (view->pattern_data->pattern, &surface);
-			pixels = cairo_image_surface_get_data (surface);
-			height = cairo_image_surface_get_height (surface);
-			width = cairo_image_surface_get_width (surface);
-			stride = cairo_image_surface_get_stride (surface);
-
-			for (row = 0; row < height; row++) {
-				guint8 *row_data = (pixels + (row * stride));
-				for (i = 0; i < width; i++) {
-					guint32 *pixel = (guint32 *) row_data + i;
-					*pixel = ((((*pixel & 0x00ff0000) >> 16) * 13817 +
-						   ((*pixel & 0x0000ff00) >> 8) * 46518 +
-						   ((*pixel & 0x000000ff)) * 4688) * 0xff
-						  /* * opacity */);
+
+			if (cairo_pattern_get_surface (view->pattern_data->pattern, &surface) == CAIRO_STATUS_SUCCESS) {
+				int width, height, row, i, stride;
+				unsigned char *pixels;
+
+				pixels = cairo_image_surface_get_data (surface);
+				height = cairo_image_surface_get_height (surface);
+				width = cairo_image_surface_get_width (surface);
+				stride = cairo_image_surface_get_stride (surface);
+
+				for (row = 0; row < height; row++) {
+					guint8 *row_data = (pixels + (row * stride));
+					for (i = 0; i < width; i++) {
+						guint32 *pixel = (guint32 *) row_data + i;
+						*pixel = ((((*pixel & 0x00ff0000) >> 16) * 13817 +
+							   ((*pixel & 0x0000ff00) >> 8) * 46518 +
+							   ((*pixel & 0x000000ff)) * 4688) * 0xff
+							  /* * opacity */);
+					}
 				}
 			}
 
@@ -1868,58 +1883,58 @@ lsm_svg_view_pop_filter (LsmSvgView *view)
 
 	if (LSM_IS_SVG_FILTER_ELEMENT (filter_element) &&
 	    view->pattern_data->pattern != NULL) {
-		cairo_matrix_t matrix;
-		LsmBox subregion;
-
-		view->filter_surfaces = NULL;
+		if (cairo_pattern_get_surface (view->pattern_data->pattern, &surface) == CAIRO_STATUS_SUCCESS) {
+			cairo_matrix_t matrix;
+			LsmBox subregion;
 
-		cairo_pattern_get_surface (view->pattern_data->pattern, &surface);
+			view->filter_surfaces = NULL;
 
-		subregion.x = 0;
-		subregion.y = 0;
-		subregion.width = cairo_image_surface_get_width (surface);
-		subregion.height = cairo_image_surface_get_height (surface);
+			subregion.x = 0;
+			subregion.y = 0;
+			subregion.width = cairo_image_surface_get_width (surface);
+			subregion.height = cairo_image_surface_get_height (surface);
 
-		filter_surface = lsm_svg_filter_surface_new_with_content ("SourceGraphic", surface, &subregion);
-		cairo_pattern_get_matrix (view->pattern_data->pattern, &matrix);
+			filter_surface = lsm_svg_filter_surface_new_with_content ("SourceGraphic", surface, &subregion);
+			cairo_pattern_get_matrix (view->pattern_data->pattern, &matrix);
 
-		view->filter_surfaces = g_slist_prepend (view->filter_surfaces, filter_surface);
+			view->filter_surfaces = g_slist_prepend (view->filter_surfaces, filter_surface);
 
-		lsm_svg_element_force_render (filter_element, view);
+			lsm_svg_element_force_render (filter_element, view);
 
-		if (view->debug_filter) {
-			GSList *iter;
-			char *filename;
-			static int count = 0;
+			if (view->debug_filter) {
+				GSList *iter;
+				char *filename;
+				static int count = 0;
 
-			for (iter = view->filter_surfaces; iter != NULL; iter = iter->next) {
-				LsmSvgFilterSurface *surface = iter->data;
+				for (iter = view->filter_surfaces; iter != NULL; iter = iter->next) {
+					LsmSvgFilterSurface *surface = iter->data;
 
-				filename = g_strdup_printf ("filter-%04d-%s-%s.png", count++,
-							    view->style->filter->value,
-							    lsm_svg_filter_surface_get_name (surface));
-				cairo_surface_write_to_png (lsm_svg_filter_surface_get_cairo_surface (surface), filename);
-				g_free (filename);
+					filename = g_strdup_printf ("filter-%04d-%s-%s.png", count++,
+							view->style->filter->value,
+							lsm_svg_filter_surface_get_name (surface));
+					cairo_surface_write_to_png (lsm_svg_filter_surface_get_cairo_surface (surface), filename);
+					g_free (filename);
+				}
 			}
-		}
 
-		if (view->filter_surfaces->next != NULL) {
-			cairo_pattern_t *pattern;
-			cairo_surface_t *surface;
+			if (view->filter_surfaces->next != NULL) {
+				cairo_pattern_t *pattern;
+				cairo_surface_t *surface;
+
+				surface = lsm_svg_filter_surface_get_cairo_surface (view->filter_surfaces->data);
+				pattern = cairo_pattern_create_for_surface (surface);
+				cairo_pattern_set_extend (pattern, CAIRO_EXTEND_NONE);
+				cairo_pattern_set_matrix (pattern, &matrix);
+				cairo_set_source (view->pattern_data->old_cairo, pattern);
+				cairo_pattern_destroy (pattern);
+				cairo_paint_with_alpha (view->pattern_data->old_cairo, view->style->opacity->value);
+			}
 
-			surface = lsm_svg_filter_surface_get_cairo_surface (view->filter_surfaces->data);
-			pattern = cairo_pattern_create_for_surface (surface);
-			cairo_pattern_set_extend (pattern, CAIRO_EXTEND_NONE);
-			cairo_pattern_set_matrix (pattern, &matrix);
-			cairo_set_source (view->pattern_data->old_cairo, pattern);
-			cairo_pattern_destroy (pattern);
-			cairo_paint_with_alpha (view->pattern_data->old_cairo, view->style->opacity->value);
+			for (iter = view->filter_surfaces; iter != NULL; iter = iter->next)
+				lsm_svg_filter_surface_unref (iter->data);
+			g_slist_free (view->filter_surfaces);
+			view->filter_surfaces = NULL;
 		}
-
-		for (iter = view->filter_surfaces; iter != NULL; iter = iter->next)
-			lsm_svg_filter_surface_unref (iter->data);
-		g_slist_free (view->filter_surfaces);
-		view->filter_surfaces = NULL;
 	}
 
 	_end_pattern (view);
@@ -2095,10 +2110,30 @@ lsm_svg_view_apply_flood (LsmSvgView *view, const char *output, const LsmBox *su
 		        subregion_px.x, subregion_px.y);
 
 	lsm_svg_filter_surface_flood (output_surface,
-				  view->style->flood_color->value.red,
-				  view->style->flood_color->value.green,
-				  view->style->flood_color->value.blue,
-				  view->style->flood_opacity->value);
+				      view->style->flood_color->value.red,
+				      view->style->flood_color->value.green,
+				      view->style->flood_color->value.blue,
+				      view->style->flood_opacity->value);
+}
+
+void
+lsm_svg_view_apply_image (LsmSvgView *view, const char *output, const LsmBox *subregion,
+			  GdkPixbuf *pixbuf, LsmSvgPreserveAspectRatio preserve_aspect_ratio)
+{
+	LsmSvgFilterSurface *output_surface;
+	LsmSvgFilterSurface *input_surface;
+	LsmBox subregion_px;
+
+	g_return_if_fail (LSM_IS_SVG_VIEW (view));
+
+	input_surface = _get_filter_surface (view, NULL);
+
+	lsm_cairo_box_user_to_device (view->dom_view.cairo, &subregion_px, subregion);
+	output_surface = _create_filter_surface (view, output, input_surface, &subregion_px);
+
+	lsm_log_render ("[SvgView::apply_image]");
+
+	lsm_svg_filter_surface_image (output_surface, pixbuf, preserve_aspect_ratio);
 }
 
 void
@@ -2131,7 +2166,7 @@ lsm_svg_view_apply_gaussian_blur (LsmSvgView *view, const char *input, const cha
 	lsm_log_render ("[SvgView::apply_gaussian_blur] %g px,%g px",
 			std_x, std_y);
 
-	lsm_svg_filter_surface_fast_blur (input_surface, output_surface, std_x, std_y);
+	lsm_svg_filter_surface_blur (input_surface, output_surface, std_x, std_y);
 }
 
 void
@@ -2163,6 +2198,172 @@ lsm_svg_view_apply_offset (LsmSvgView *view, const char *input, const char *outp
 	lsm_svg_filter_surface_offset (input_surface, output_surface, dx, dy);
 }
 
+void
+lsm_svg_view_apply_color_matrix (LsmSvgView *view, const char *input, const char *output,
+				 const LsmBox *subregion, LsmSvgColorFilterType type,
+				 unsigned int n_values, const double *values)
+{
+	LsmSvgFilterSurface *input_surface;
+	LsmSvgFilterSurface *output_surface;
+	LsmBox subregion_px;
+
+	g_return_if_fail (LSM_IS_SVG_VIEW (view));
+
+	input_surface = _get_filter_surface (view, input);
+
+	if (input_surface == NULL) {
+		lsm_debug_render ("[SvgView::apply_color_matrix] Input '%s' not found", input);
+		return;
+	}
+
+	lsm_cairo_box_user_to_device (view->dom_view.cairo, &subregion_px, subregion);
+	output_surface = _create_filter_surface (view, output, input_surface, &subregion_px);
+
+	lsm_svg_filter_surface_color_matrix (input_surface, output_surface, type, n_values, values);
+}
+
+void
+lsm_svg_view_apply_displacement_map (LsmSvgView *view, const char *input_1, const char *input_2, const char *output,
+				     const LsmBox *subregion,
+				     double scale, LsmSvgChannelSelector x_channel_selector, LsmSvgChannelSelector y_channel_selector)
+{
+	LsmSvgFilterSurface *output_surface;
+	LsmSvgFilterSurface *input_1_surface;
+	LsmSvgFilterSurface *input_2_surface;
+	LsmBox subregion_px;
+	cairo_matrix_t transform;
+	double x_scale, y_scale;
+
+	g_return_if_fail (LSM_IS_SVG_VIEW (view));
+
+	input_1_surface = _get_filter_surface (view, input_1);
+	input_2_surface = _get_filter_surface (view, input_2);
+
+	if (input_1_surface == NULL || input_2_surface == NULL) {
+		lsm_warning_render ("[SvgView::apply_displacement_map] Inputs '%s' or '%s' not found", input_1, input_2);
+		return;
+	}
+
+	lsm_cairo_box_user_to_device (view->dom_view.cairo, &subregion_px, subregion);
+	output_surface = _create_filter_surface (view, output, input_1_surface, &subregion_px);
+
+	cairo_get_matrix (view->dom_view.cairo, &transform);
+
+	x_scale = transform.xx * scale;
+	y_scale = transform.yy * scale;
+
+	lsm_svg_filter_surface_displacement_map (input_1_surface, input_2_surface, output_surface, x_scale, y_scale,
+						 x_channel_selector, y_channel_selector);
+}
+
+void 
+lsm_svg_view_apply_morphology (LsmSvgView *view, const char *input, const char *output, const LsmBox *subregion,
+			       LsmSvgMorphologyOperator op, double radius)
+{
+	LsmSvgFilterSurface *input_surface;
+	LsmSvgFilterSurface *output_surface;
+	LsmBox subregion_px;
+	double rx, ry;
+
+	g_return_if_fail (LSM_IS_SVG_VIEW (view));
+
+	input_surface = _get_filter_surface (view, input);
+
+	if (input_surface == NULL) {
+		lsm_debug_render ("[SvgView::apply_morphoogy] Input '%s' not found", input);
+		return;
+	}
+
+	lsm_cairo_box_user_to_device (view->dom_view.cairo, &subregion_px, subregion);
+	output_surface = _create_filter_surface (view, output, input_surface, &subregion_px);
+
+	rx = radius;
+	ry = radius;
+	cairo_user_to_device_distance (view->dom_view.cairo, &rx, &ry);
+
+	lsm_svg_filter_surface_morphology (input_surface, output_surface, op, rx, ry);
+}
+
+void
+lsm_svg_view_apply_convolve_matrix (LsmSvgView *view, const char *input, const char *output, const LsmBox *subregion,
+				    unsigned x_order, unsigned y_order, unsigned n_values, double *values,
+				    double divisor, double bias, int target_x, int target_y,
+				    LsmSvgEdgeMode edge_mode, gboolean preserve_alpha)
+{
+	LsmSvgFilterSurface *input_surface;
+	LsmSvgFilterSurface *output_surface;
+	LsmBox subregion_px;
+
+	g_return_if_fail (LSM_IS_SVG_VIEW (view));
+
+	input_surface = _get_filter_surface (view, input);
+
+	if (input_surface == NULL) {
+		lsm_debug_render ("[SvgView::apply_color_matrix] Input '%s' not found", input);
+		return;
+	}
+
+	lsm_cairo_box_user_to_device (view->dom_view.cairo, &subregion_px, subregion);
+	output_surface = _create_filter_surface (view, output, input_surface, &subregion_px);
+
+	lsm_svg_filter_surface_convolve_matrix (input_surface, output_surface, x_order, y_order, n_values, values,
+						divisor, bias, target_x, target_y, edge_mode, preserve_alpha);
+}
+
+void 
+lsm_svg_view_apply_specular_lighting (LsmSvgView *view, const char *output, const LsmBox *subregion,
+				      double surface_scale, double specular_constant, double specular_exponent,
+				      double dx, double dy)
+{
+	LsmSvgFilterSurface *output_surface;
+	LsmSvgFilterSurface *input_surface;
+	LsmBox subregion_px;
+
+	g_return_if_fail (LSM_IS_SVG_VIEW (view));
+
+	input_surface = _get_filter_surface (view, NULL);
+
+	lsm_cairo_box_user_to_device (view->dom_view.cairo, &subregion_px, subregion);
+	output_surface = _create_filter_surface (view, output, input_surface, &subregion_px);
+
+	lsm_log_render ("[SvgView::apply_specular_lighting] subregion %gx%g px at %g,%g px",
+			subregion_px.width, subregion_px.height,
+			subregion_px.x, subregion_px.y);
+
+	cairo_user_to_device_distance (view->dom_view.cairo, &dx, &dy);
+
+	lsm_svg_filter_surface_specular_lighting (output_surface, surface_scale, specular_constant, specular_exponent, dx, dy);
+}
+
+void
+lsm_svg_view_apply_turbulence (LsmSvgView *view, const char *output, const LsmBox *subregion,
+			       double base_frequency_x, double base_frequency_y,
+			       int n_octaves, double seed,
+			       LsmSvgStitchTiles stitch_tiles,
+			       LsmSvgTurbulenceType type)
+{
+	LsmSvgFilterSurface *output_surface;
+	LsmSvgFilterSurface *input_surface;
+	LsmBox subregion_px;
+	cairo_matrix_t transform;
+
+	g_return_if_fail (LSM_IS_SVG_VIEW (view));
+
+	input_surface = _get_filter_surface (view, NULL);
+
+	lsm_cairo_box_user_to_device (view->dom_view.cairo, &subregion_px, subregion);
+	output_surface = _create_filter_surface (view, output, input_surface, &subregion_px);
+
+	lsm_log_render ("[SvgView::apply_turbulence] subregion %gx%g px at %g,%g px",
+			subregion_px.width, subregion_px.height,
+			subregion_px.x, subregion_px.y);
+
+	cairo_get_matrix (view->dom_view.cairo, &transform);
+
+	lsm_svg_filter_surface_turbulence (output_surface, base_frequency_x, base_frequency_y, n_octaves, seed, stitch_tiles, type,
+					   &transform);
+}
+
 void
 lsm_svg_view_apply_merge (LsmSvgView *view, const char *input, const char *output, const LsmBox *subregion)
 {

data/ext/mathematical/lasem/src/lsmsvgview.h

@@ -172,8 +172,31 @@ void		lsm_svg_view_apply_gaussian_blur 	(LsmSvgView *view, const char *input, co
 							 double std_x, double std_y);
 void 		lsm_svg_view_apply_offset 		(LsmSvgView *view, const char *input, const char *output, const LsmBox *subregion,
 							 double dx, double dy);
+void 		lsm_svg_view_apply_color_matrix 	(LsmSvgView *view, const char *input, const char *output,
+							 const LsmBox *subregion, LsmSvgColorFilterType type,
+							 unsigned int n_values, const double *values);
+void		lsm_svg_view_apply_displacement_map 	(LsmSvgView *view, const char *input_1, const char *input_2, const char *output,
+							 const LsmBox *subregion, double scale,
+							 LsmSvgChannelSelector x_channel_selector,
+							 LsmSvgChannelSelector y_channel_selector);
 void 		lsm_svg_view_apply_merge 		(LsmSvgView *view, const char *input, const char *output, const LsmBox *subregion);
 void 		lsm_svg_view_apply_tile 		(LsmSvgView *view, const char *input, const char *output, const LsmBox *subregion);
+void		lsm_svg_view_apply_image 		(LsmSvgView *view, const char *output, const LsmBox *subregion,
+							 GdkPixbuf *pixbuf, LsmSvgPreserveAspectRatio preserve_aspect_ratio);
+void 		lsm_svg_view_apply_morphology 		(LsmSvgView *view, const char *input, const char *output, const LsmBox *subregion,
+							 LsmSvgMorphologyOperator op, double radius);
+void 		lsm_svg_view_apply_convolve_matrix 	(LsmSvgView *view, const char *input, const char *output, const LsmBox *subregion,
+							 unsigned a, unsigned b, unsigned n_values, double *values,
+							 double divisor, double bias, int target_x, int target_y,
+							 LsmSvgEdgeMode edge_mode, gboolean preserve_alpha);
+void 		lsm_svg_view_apply_specular_lighting 	(LsmSvgView *view, const char *output, const LsmBox *subregion,
+							 double surface_scale, double specular_constant, double specular_exponent,
+							 double dx, double dy);
+void		lsm_svg_view_apply_turbulence 		(LsmSvgView *view, const char *output, const LsmBox *subregion,
+							 double base_frequency_x, double base_frequency_y,
+							 int n_octaves, double seed,
+							 LsmSvgStitchTiles stitch_tiles,
+							 LsmSvgTurbulenceType type);
 
 G_END_DECLS
 

data/ext/mathematical/lasem/src/lsmtraits.c

@@ -30,6 +30,59 @@ const LsmTraitClass lsm_null_trait_class = {
 	.size = 0
 };
 
+static gboolean
+lsm_boolean_trait_from_string (LsmTrait *abstract_trait, char *string)
+{
+	gboolean *trait = (gboolean *) abstract_trait;
+
+	if (g_strcmp0 ("true", string) == 0)
+		*trait = TRUE;
+	else if (g_strcmp0 ("false", string) == 0)
+		*trait = FALSE;
+	else return FALSE;
+
+	return TRUE;
+}
+
+static char *
+lsm_boolean_trait_to_string (LsmTrait *abstract_trait)
+{
+	gboolean *trait = (gboolean *) abstract_trait;
+
+	return g_strdup_printf ("%s", *trait ? "true" : "false");
+}
+
+const LsmTraitClass lsm_boolean_trait_class = {
+	.size = sizeof (gboolean),
+	.from_string = lsm_boolean_trait_from_string,
+	.to_string = lsm_boolean_trait_to_string
+};
+
+static gboolean
+lsm_integer_trait_from_string (LsmTrait *abstract_trait, char *string)
+{
+	int *trait = (int *) abstract_trait;
+	char *end_ptr;
+
+	*trait = g_ascii_strtoll (string, &end_ptr, 10);
+
+	return end_ptr != string;
+}
+
+static char *
+lsm_integer_trait_to_string (LsmTrait *abstract_trait)
+{
+	int *trait = (int *) abstract_trait;
+
+	return g_strdup_printf ("%d", *trait);
+}
+
+const LsmTraitClass lsm_integer_trait_class = {
+	.size = sizeof (int),
+	.from_string = lsm_integer_trait_from_string,
+	.to_string = lsm_integer_trait_to_string
+};
+
 static gboolean
 lsm_double_trait_from_string (LsmTrait *abstract_trait, char *string)
 {
@@ -116,4 +169,3 @@ lsm_enum_value_from_string (const char *string, const char **strings, unsigned i
 
 	return -1;
 }
-

data/ext/mathematical/lasem/src/lsmtraits.h

@@ -39,6 +39,8 @@ typedef struct {
 } LsmTraitClass;
 
 extern const LsmTraitClass lsm_null_trait_class;
+extern const LsmTraitClass lsm_boolean_trait_class;
+extern const LsmTraitClass lsm_integer_trait_class;
 extern const LsmTraitClass lsm_double_trait_class;
 extern const LsmTraitClass lsm_box_trait_class;
 

data/ext/mathematical/lasem/tests/Makefile

@@ -88,8 +88,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = x86_64-apple-darwin14.3.0
-host_triplet = x86_64-apple-darwin14.3.0
+build_triplet = x86_64-apple-darwin14.5.0
+host_triplet = x86_64-apple-darwin14.5.0
 noinst_PROGRAMS = lsm-test$(EXEEXT) $(am__EXEEXT_1)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -105,7 +105,8 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = dom$(EXEEXT) str$(EXEEXT) suite$(EXEEXT)
+am__EXEEXT_1 = dom$(EXEEXT) str$(EXEEXT) filter$(EXEEXT) \
+	suite$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am_dom_OBJECTS = dom.$(OBJEXT)
 dom_OBJECTS = $(am_dom_OBJECTS)
@@ -118,6 +119,9 @@ AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+am_filter_OBJECTS = filter.$(OBJEXT)
+filter_OBJECTS = $(am_filter_OBJECTS)
+filter_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_lsm_test_OBJECTS = lsmtest.$(OBJEXT)
 lsm_test_OBJECTS = $(am_lsm_test_OBJECTS)
 lsm_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -164,10 +168,10 @@ AM_V_CCLD = $(am__v_CCLD_$(V))
 am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(dom_SOURCES) $(lsm_test_SOURCES) $(str_SOURCES) \
-	$(suite_SOURCES)
-DIST_SOURCES = $(dom_SOURCES) $(lsm_test_SOURCES) $(str_SOURCES) \
-	$(suite_SOURCES)
+SOURCES = $(dom_SOURCES) $(filter_SOURCES) $(lsm_test_SOURCES) \
+	$(str_SOURCES) $(suite_SOURCES)
+DIST_SOURCES = $(dom_SOURCES) $(filter_SOURCES) $(lsm_test_SOURCES) \
+	$(str_SOURCES) $(suite_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -261,8 +265,8 @@ INTROSPECTION_SCANNER =
 INTROSPECTION_TYPELIBDIR = 
 LASEM_API_VERSION = 0.6
 LASEM_API_VERSION_U = 0_6
-LASEM_CFLAGS = -D_REENTRANT -I/usr/local/Cellar/gdk-pixbuf/2.30.8/include/gdk-pixbuf-2.0 -I/usr/local/Cellar/libpng/1.6.17/include/libpng16 -I/usr/local/Cellar/pango/1.36.8/include/pango-1.0 -I/usr/local/Cellar/cairo/1.12.16_1/include/cairo -I/usr/local/Cellar/glib/2.44.1/include/glib-2.0 -I/usr/local/Cellar/glib/2.44.1/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pixman/0.32.6/include/pixman-1 -I/usr/local/Cellar/fontconfig/2.11.1/include -I/usr/local/Cellar/freetype/2.5.3_1/include/freetype2 -I/usr/local/Cellar/freetype/2.5.5/include/freetype2 -I/usr/local/Cellar/libpng/1.6.17/include/libpng16 -I/opt/X11/include -I/usr/include/libxml2 
-LASEM_LIBS = -L/usr/local/Cellar/glib/2.44.1/lib -L/usr/local/Cellar/gdk-pixbuf/2.30.8/lib -L/usr/local/Cellar/pango/1.36.8/lib -L/usr/local/Cellar/glib/2.44.1/lib -L/usr/local/opt/gettext/lib -L/usr/local/Cellar/cairo/1.12.16_1/lib -lgio-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lintl -lcairo -lxml2  -lm
+LASEM_CFLAGS = -D_REENTRANT -I/opt/X11/include/cairo -I/opt/X11/include/pixman-1 -I/opt/X11/include -I/opt/X11/include/freetype2 -I/opt/X11/include/libpng15 -I/opt/X11/include -I/usr/local/Cellar/gdk-pixbuf/2.30.8/include/gdk-pixbuf-2.0 -I/usr/local/Cellar/libpng/1.6.18/include/libpng16 -I/usr/local/Cellar/pango/1.36.8_2/include/pango-1.0 -I/usr/local/Cellar/glib/2.44.1/include/glib-2.0 -I/usr/local/Cellar/glib/2.44.1/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/include/libxml2 
+LASEM_LIBS = -L/opt/X11/lib -L/usr/local/Cellar/glib/2.44.1/lib -L/usr/local/Cellar/gdk-pixbuf/2.30.8/lib -L/usr/local/Cellar/pango/1.36.8_2/lib -L/usr/local/Cellar/glib/2.44.1/lib -L/usr/local/opt/gettext/lib -lgio-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lintl -lcairo -lxml2  -lm
 LASEM_LIBTOOL_VERSION = 5:1:0
 LD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 LDFLAGS = -L/usr/local/lib
@@ -300,7 +304,7 @@ PACKAGE_VERSION = 0.5.1
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/local/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = 
+PKG_CONFIG_PATH = /opt/X11/lib/pkgconfig:
 POFILES = 
 POSUB = po
 PO_IN_DATADIR_FALSE = 
@@ -328,10 +332,10 @@ am__quote =
 am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 bindir = ${exec_prefix}/bin
-build = x86_64-apple-darwin14.3.0
+build = x86_64-apple-darwin14.5.0
 build_alias = 
 build_cpu = x86_64
-build_os = darwin14.3.0
+build_os = darwin14.5.0
 build_vendor = apple
 builddir = .
 datadir = ${datarootdir}
@@ -339,10 +343,10 @@ datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = x86_64-apple-darwin14.3.0
+host = x86_64-apple-darwin14.5.0
 host_alias = 
 host_cpu = x86_64
-host_os = darwin14.3.0
+host_os = darwin14.5.0
 host_vendor = apple
 htmldir = ${docdir}
 includedir = ${prefix}/include
@@ -373,7 +377,7 @@ GTESTER = gtester
 GTESTER_REPORT = gtester-report
 
 # initialize variables for unconditional += appending
-TEST_PROGS = dom str suite
+TEST_PROGS = dom str filter suite
 AM_CPPFLAGS = -g -I$(top_srcdir)/src/ $(LASEM_CFLAGS)
 AM_CFLAGS = -Wall
 test_progs_ldadd = \
@@ -387,6 +391,8 @@ str_SOURCES = str.c
 str_LDADD = $(test_progs_ldadd)
 dom_SOURCES = dom.c
 dom_LDADD = $(test_progs_ldadd)
+filter_SOURCES = filter.c
+filter_LDADD = $(test_progs_ldadd)
 suite_SOURCES = suite.c
 suite_LDADD = $(test_progs_ldadd)
 suite_CFLAGS = -DSUITE_DATA_DIRECTORY="\"$(top_srcdir)/tests/data\"" -DSUITE_OPTION_FILE="\"$(top_srcdir)/tests/suite.ini\""
@@ -439,6 +445,10 @@ dom$(EXEEXT): $(dom_OBJECTS) $(dom_DEPENDENCIES) $(EXTRA_dom_DEPENDENCIES)
 	@rm -f dom$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(dom_OBJECTS) $(dom_LDADD) $(LIBS)
 
+filter$(EXEEXT): $(filter_OBJECTS) $(filter_DEPENDENCIES) $(EXTRA_filter_DEPENDENCIES) 
+	@rm -f filter$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(filter_OBJECTS) $(filter_LDADD) $(LIBS)
+
 lsm-test$(EXEEXT): $(lsm_test_OBJECTS) $(lsm_test_DEPENDENCIES) $(EXTRA_lsm_test_DEPENDENCIES) 
 	@rm -f lsm-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(lsm_test_OBJECTS) $(lsm_test_LDADD) $(LIBS)
@@ -458,6 +468,7 @@ distclean-compile:
 	-rm -f *.tab.c
 
 include ./$(DEPDIR)/dom.Po
+include ./$(DEPDIR)/filter.Po
 include ./$(DEPDIR)/lsmtest.Po
 include ./$(DEPDIR)/str.Po
 include ./$(DEPDIR)/suite-suite.Po