mathematical 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c820da257090af3286f7e4756f79ce1aece737d
-  data.tar.gz: d2f998fbdd90b00510d0a5ac678af9397fa00dd8
+  metadata.gz: 950af06de24ca977728f01092c6ded39e96f39fc
+  data.tar.gz: 29148c1fd98932067e1c81c54d30bbb982501817
 SHA512:
-  metadata.gz: 643d66def8e1670019d4a9bdad47d3914fb0e09136790e6349e5088a2dcda5db606e81da6480f92c23dc0887b3b10fa2596c28eb31b53420d38300fec0b729be
-  data.tar.gz: fedb115fd8b874671d9dfaa43004e89d06640ea3f0288ac3c939d8bff4418c0b58c0e7dc07e89c04058f8367a6c2a807e2ed20a32b3225827ba7493201e57b23
+  metadata.gz: 1c9be59980546ff2fa68bed0dc4b4206cc4b9a4ec3b793189fa95355c912c51c0845787934c558004546136384e42c8d50957a4c75f13f66d4b6d0383319a5e4
+  data.tar.gz: 7d76ab7e62ea37b69f50cefb2f4c31767331ecd635850113ce1550acc19737755cda5cca95caf03f98121723d2a2a43c4f61f909f1539e87844b5b8a8971cd76

data/ext/mathematical/extconf.rb

@@ -20,12 +20,17 @@ find_header('libxml/xpathInternals.h', '/include/libxml2', '/usr/include/libxml2
 FileUtils.cp_r(Dir.glob("#{LASEM_DIR}/*"), File.dirname(__FILE__))
 File.delete(File.join(File.dirname(__FILE__), 'lasemrender.c'))
 
+debug_file = File.join(File.dirname(__FILE__), 'mtex2MML_debug.cc')
+if File.exists?(debug_file)
+  File.delete(File.join(File.dirname(__FILE__), 'mtex2MML_debug.cc'))
+end
+
 # build mtex2MML Bison files
 Dir.chdir(MTEX_DIR) do
   system 'make'
 end
 
-FileUtils.cp_r(Dir.glob("#{MTEX_DIR}/*.{c,h,cc}"), File.dirname(__FILE__))
+FileUtils.cp_r(Dir.glob("#{MTEX_DIR}/*.{c,h}"), File.dirname(__FILE__))
 FileUtils.cp_r("#{MTEX_DIR}/deps/.", File.dirname(__FILE__))
 FileUtils.cp_r(Dir.glob("#{MTEX_DIR}/deps/**/*"), File.dirname(__FILE__))
 

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

@@ -57,6 +57,15 @@ lsm_dom_character_data_set_node_value (LsmDomNode* self, const char *value)
 
 /* LsmDomCharacterData implementation */
 
+/**
+ * lsm_dom_character_data_get_data:
+ * @self: a #LsmDomCharacterData
+ *
+ * Get the character node data.
+ *
+ * Return value: character node data.
+ */
+
 const char *
 lsm_dom_character_data_get_data (LsmDomCharacterData* self)
 {
@@ -65,6 +74,14 @@ lsm_dom_character_data_get_data (LsmDomCharacterData* self)
 	return self->data;
 }
 
+/**
+ * lsm_dom_character_data_set_data:
+ * @self: a #LsmDomCharacterData
+ * @value: new node data
+ *
+ * Set the character node data.
+ */
+
 void
 lsm_dom_character_data_set_data (LsmDomCharacterData* self, const char * value)
 {

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

@@ -57,6 +57,8 @@ lsm_dom_document_get_node_type (LsmDomNode *node)
  * lsm_dom_document_get_document_element:
  * @self: a #LsmDomElement
  *
+ * Get the child node that is the root element of the document.
+ *
  * Returns: (transfer none): document element
  */
 
@@ -73,6 +75,8 @@ lsm_dom_document_get_document_element (LsmDomDocument *self)
  * @self: a #LsmDomDocument
  * @tag_name: name of the element to create
  *
+ * Create a new element node with a type corresponding to @tag_name.
+ *
  * Returns: (transfer full): a newly created #LsmDomElement
  */
 
@@ -113,6 +117,8 @@ lsm_dom_document_create_text_node_base (LsmDomDocument *document, const char *da
  * @self: a #LsmDomDocument
  * @data: content of the text node
  *
+ * Create a text node with @data as its initial content.
+ *
  * Returns: (transfer full): a newly created #LsmDomText
  */
 
@@ -128,6 +134,8 @@ lsm_dom_document_create_text_node (LsmDomDocument *document, const char *data)
  * lsm_dom_document_create_view:
  * @self: a #LsmDomDocument
  *
+ * Create a #LsmDomView for document rendering.
+ *
  * Returns: (transfer full): a new #LsmDomView
  */
 
@@ -139,6 +147,15 @@ lsm_dom_document_create_view (LsmDomDocument *self)
 	return LSM_DOM_DOCUMENT_GET_CLASS (self)->create_view (self);
 }
 
+/**
+ * lsm_dom_document_get_url:
+ * @self: a #LsmDomDocument
+ *
+ * Get document URL.
+ *
+ * Return value: document URL.
+ */
+
 const char *
 lsm_dom_document_get_url (LsmDomDocument *self)
 {

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

@@ -55,18 +55,20 @@ lsm_mathml_fenced_element_measure (LsmMathmlElement *self, LsmMathmlView *view,
 
 	if (open != NULL && open[0] != '\0') {
 		lsm_mathml_view_measure_operator (view, &self->style,
-					       open, FALSE, TRUE,
-					       axis_offset,
-					       &stretch_bbox, &fenced->open_bbox);
+						  open, FALSE, TRUE,
+						  axis_offset,
+						  0, G_MAXDOUBLE,
+						  &stretch_bbox, &fenced->open_bbox);
 		spacing += self->style.math_size * LSM_MATHML_SPACE_EM_THIN;
 	} else
 		fenced->open_bbox = lsm_mathml_bbox_null;
 
 	if (close != NULL && close[0] != '\0') {
 		lsm_mathml_view_measure_operator (view, &self->style,
-					       close, FALSE, TRUE,
-					       axis_offset,
-					       &stretch_bbox, &fenced->close_bbox);
+						  close, FALSE, TRUE,
+						  axis_offset,
+						  0, G_MAXDOUBLE,
+						  &stretch_bbox, &fenced->close_bbox);
 		spacing += self->style.math_size * LSM_MATHML_SPACE_EM_THIN;
 	} else
 		fenced->close_bbox = lsm_mathml_bbox_null;

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

@@ -152,12 +152,14 @@ lsm_mathml_operator_element_measure (LsmMathmlElement *self, LsmMathmlView *view
 	self->bbox = lsm_mathml_bbox_null;
 
 	lsm_mathml_view_measure_operator (view, &self->style,
-				       text,
-				       operator_element->is_large_op,
-				       operator_element->symmetric.value,
-				       lsm_mathml_view_measure_axis_offset (view, self->style.math_size),
-				       operator_element->stretchy.value ? stretch_bbox : &lsm_mathml_bbox_null,
-				       &self->bbox);
+					  text,
+					  operator_element->is_large_op,
+					  operator_element->symmetric.value,
+					  lsm_mathml_view_measure_axis_offset (view, self->style.math_size),
+					  operator_element->min_size.value,
+					  operator_element->max_size.value,
+					  operator_element->stretchy.value ? stretch_bbox : &lsm_mathml_bbox_null,
+					  &self->bbox);
 
 	g_free (text);
 

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

@@ -361,12 +361,15 @@ lsm_mathml_view_update_layout_for_operator (LsmMathmlView *view,
 
 void
 lsm_mathml_view_measure_operator (LsmMathmlView *view,
-			       const LsmMathmlElementStyle *style,
-			       char const *text,
-			       gboolean large,
-			       gboolean symmetric,
-			       double axis_offset,
-			       LsmMathmlBbox const *stretch_bbox, LsmMathmlBbox *bbox)
+				  const LsmMathmlElementStyle *style,
+				  char const *text,
+				  gboolean large,
+				  gboolean symmetric,
+				  double axis_offset,
+				  double min_size,	/* TODO actually use this parameter */
+				  double max_size,	/* TODO actually use this parameter */
+				  LsmMathmlBbox const *stretch_bbox,
+				  LsmMathmlBbox *bbox)
 {
 	PangoFontDescription *font_description;
 	PangoLayout *pango_layout;
@@ -658,7 +661,9 @@ lsm_mathml_view_measure_radical (LsmMathmlView *view,
 	radical_stretch_bbox.depth += LSM_MATHML_SPACE_EM_THICK * style->math_size;
 
 	lsm_mathml_view_measure_operator (view, style, LSM_MATHML_RADICAL_UTF8,
-					  FALSE, FALSE, 0.0, &radical_stretch_bbox, bbox);
+					  FALSE, FALSE, 0.0,
+					  0, G_MAXDOUBLE,
+					  &radical_stretch_bbox, bbox);
 
 	if (x_offset != NULL) {
 		*x_offset = bbox->width * LSM_MATHML_RADICAL_ORDER_X_OFFSET;

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

@@ -111,6 +111,8 @@ void 		lsm_mathml_view_measure_operator 	(LsmMathmlView *view,
 							 char const *text,
 							 gboolean large, gboolean symmetric,
 							 double axis_offset,
+							 double min_size,
+							 double max_size,
 							 const LsmMathmlBbox *stretch_bbox,
 							 LsmMathmlBbox *bbox);
 void 		lsm_mathml_view_show_operator 		(LsmMathmlView *view,

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

@@ -22,7 +22,9 @@
  */
 
 #include <lsmsvgsymbolelement.h>
+#include <lsmsvguseelement.h>
 #include <lsmsvgview.h>
+#include <lsmsvgtraits.h>
 #include <lsmdebug.h>
 #include <lsmdomdocument.h>
 #include <stdio.h>
@@ -41,6 +43,49 @@ lsm_svg_symbol_element_get_node_name (LsmDomNode *node)
 
 /* LsmSvgGraphic implementation */
 
+static void
+_symbol_element_render (LsmSvgElement *self, LsmSvgView *view)
+{
+	LsmSvgSymbolElement *symbol = LSM_SVG_SYMBOL_ELEMENT (self);
+	LsmSvgUseElement *use_element;
+	LsmSvgElement *element;
+	LsmSvgStyle *style;
+	LsmBox viewport;
+	gboolean is_viewbox_defined;
+
+	element = lsm_svg_view_get_referencing_element (view);
+	if (!LSM_IS_SVG_USE_ELEMENT (element))
+		return;
+
+	use_element = LSM_SVG_USE_ELEMENT (element);
+
+	style = lsm_svg_view_get_current_style (view);
+
+	viewport.x = 0;
+	viewport.y = 0;
+	viewport.width = lsm_svg_view_normalize_length (view, &use_element->width.length, LSM_SVG_LENGTH_DIRECTION_HORIZONTAL);
+	viewport.height = lsm_svg_view_normalize_length (view, &use_element->height.length, LSM_SVG_LENGTH_DIRECTION_VERTICAL);
+
+	is_viewbox_defined = lsm_attribute_is_defined ((LsmAttribute *) &symbol->viewbox);
+
+	if (is_viewbox_defined && (symbol->viewbox.value.width == 0.0 ||
+				   symbol->viewbox.value.height == 0.0))
+		return;
+
+	if (viewport.width <= 0.0 || viewport.height <= 0.0)
+		return;
+
+	lsm_debug_render ("[LsmSvgSymbolElement::render] viewport %g, %g, %g, %g",
+		   viewport.x, viewport.y, viewport.width, viewport.height);
+
+	lsm_svg_view_push_viewport (view, &viewport, is_viewbox_defined ? &symbol->viewbox.value : NULL,
+				    &symbol->preserve_aspect_ratio.value, style->overflow->value);
+
+	LSM_SVG_ELEMENT_CLASS (parent_class)->render (self, view);
+
+	lsm_svg_view_pop_viewport (view);
+}
+
 /* LsmSvgSymbolElement implementation */
 
 LsmDomNode *
@@ -49,6 +94,13 @@ lsm_svg_symbol_element_new (void)
 	return g_object_new (LSM_TYPE_SVG_SYMBOL_ELEMENT, NULL);
 }
 
+static const LsmBox viewbox_default =		 {0.0, 0.0, 0.0, 0.0};
+static const LsmSvgPreserveAspectRatio preserve_aspect_ratio_default = {
+	.defer = FALSE,
+	.align = LSM_SVG_ALIGN_X_MID_Y_MID,
+	.meet_or_slice = LSM_SVG_MEET_OR_SLICE_MEET
+};
+
 static void
 lsm_svg_symbol_element_init (LsmSvgSymbolElement *self)
 {
@@ -56,6 +108,21 @@ lsm_svg_symbol_element_init (LsmSvgSymbolElement *self)
 
 /* LsmSvgSymbolElement class */
 
+static const LsmAttributeInfos lsm_svg_symbol_element_attribute_infos[] = {
+	{
+		.name = "viewBox",
+		.attribute_offset = offsetof (LsmSvgSymbolElement, viewbox),
+		.trait_class = &lsm_box_trait_class,
+		.trait_default = &viewbox_default
+	},
+	{
+		.name = "preserveAspectRatio",
+		.attribute_offset = offsetof (LsmSvgSymbolElement, preserve_aspect_ratio),
+		.trait_class = &lsm_svg_preserve_aspect_ratio_trait_class,
+		.trait_default = &preserve_aspect_ratio_default
+	}
+};
+
 static void
 lsm_svg_symbol_element_class_init (LsmSvgSymbolElementClass *klass)
 {
@@ -69,6 +136,13 @@ lsm_svg_symbol_element_class_init (LsmSvgSymbolElementClass *klass)
 	s_element_class->category =
 		LSM_SVG_ELEMENT_CATEGORY_CONTAINER |
 		LSM_SVG_ELEMENT_CATEGORY_STRUCTURAL;
+
+	s_element_class->render = _symbol_element_render;
+	s_element_class->attribute_manager = lsm_attribute_manager_duplicate (s_element_class->attribute_manager);
+
+	lsm_attribute_manager_add_attributes (s_element_class->attribute_manager,
+					      G_N_ELEMENTS (lsm_svg_symbol_element_attribute_infos),
+					      lsm_svg_symbol_element_attribute_infos);
 }
 
 G_DEFINE_TYPE (LsmSvgSymbolElement, lsm_svg_symbol_element, LSM_TYPE_SVG_ELEMENT)

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

@@ -40,6 +40,9 @@ typedef struct _LsmSvgSymbolElementClass LsmSvgSymbolElementClass;
 
 struct _LsmSvgSymbolElement {
 	LsmSvgElement element;
+
+	LsmSvgViewboxAttribute			viewbox;
+	LsmSvgPreserveAspectRatioAttribute	preserve_aspect_ratio;
 };
 
 struct _LsmSvgSymbolElementClass {

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

@@ -164,15 +164,16 @@ lsm_svg_use_element_new (void)
 	return g_object_new (LSM_TYPE_SVG_USE_ELEMENT, NULL);
 }
 
-static const LsmSvgLength length_default = 	 { .value_unit =   0.0, .type = LSM_SVG_LENGTH_TYPE_PX};
+static const LsmSvgLength position_default = 	 { .value_unit =   0.0, .type = LSM_SVG_LENGTH_TYPE_PX};
+static const LsmSvgLength size_default = 	 { .value_unit =   100.0, .type = LSM_SVG_LENGTH_TYPE_PERCENTAGE};
 
 static void
 lsm_svg_use_element_init (LsmSvgUseElement *self)
 {
-	self->x.length = length_default;
-	self->y.length = length_default;
-	self->width.length = length_default;
-	self->height.length = length_default;
+	self->x.length = position_default;
+	self->y.length = position_default;
+	self->width.length = size_default;
+	self->height.length = size_default;
 }
 
 /* LsmSvgUseElement class */
@@ -182,25 +183,25 @@ static const LsmAttributeInfos lsm_svg_use_element_attribute_infos[] = {
 		.name = "x",
 		.attribute_offset = offsetof (LsmSvgUseElement, x),
 		.trait_class = &lsm_svg_length_trait_class,
-		.trait_default = &length_default
+		.trait_default = &position_default
 	},
 	{
 		.name = "y",
 		.attribute_offset = offsetof (LsmSvgUseElement, y),
 		.trait_class = &lsm_svg_length_trait_class,
-		.trait_default = &length_default
+		.trait_default = &position_default
 	},
 	{
 		.name = "width",
 		.attribute_offset = offsetof (LsmSvgUseElement, width),
 		.trait_class = &lsm_svg_length_trait_class,
-		.trait_default = &length_default
+		.trait_default = &size_default
 	},
 	{
 		.name = "height",
 		.attribute_offset = offsetof (LsmSvgUseElement, height),
 		.trait_class = &lsm_svg_length_trait_class,
-		.trait_default = &length_default
+		.trait_default = &size_default
 	},
 	{
 		.name = "xlink:href",

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

@@ -2226,6 +2226,18 @@ lsm_svg_view_pop_element (LsmSvgView *view)
 	view->element_stack = g_slist_delete_link (view->element_stack, view->element_stack);
 }
 
+LsmSvgElement *
+lsm_svg_view_get_referencing_element (LsmSvgView *view)
+{
+	g_return_val_if_fail (LSM_IS_SVG_VIEW (view), NULL);
+	
+	if (view->element_stack == NULL ||
+	    view->element_stack->next == NULL)
+		return NULL;
+	
+	return view->element_stack->next->data;
+}
+
 static gboolean
 lsm_svg_view_circular_reference_check (LsmSvgView *view, LsmSvgElement *element)
 {

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

@@ -155,6 +155,7 @@ void 		lsm_svg_view_pop_matrix			(LsmSvgView *view);
 
 void		lsm_svg_view_push_element		(LsmSvgView *view, const LsmSvgElement *element);
 void		lsm_svg_view_pop_element		(LsmSvgView *view);
+LsmSvgElement * lsm_svg_view_get_referencing_element 	(LsmSvgView *view);
 
 void		lsm_svg_view_push_style			(LsmSvgView *view, LsmSvgStyle *style);
 void		lsm_svg_view_pop_style			(LsmSvgView *view);

data/ext/mathematical/lasem/tests/lsmtest.c

@@ -61,7 +61,7 @@ static gboolean option_debug_mask = FALSE;
 static gboolean option_debug_group = FALSE;
 static gboolean option_debug_text = FALSE;
 static gboolean option_dry_run = FALSE;
-static double option_compare_fuzz = 10.0;
+static double option_compare_fuzz = 15.0;
 
 static const GOptionEntry entries[] =
 {

data/ext/mathematical/lasem/tests/suite.c

@@ -2,6 +2,8 @@
 #include <string.h>
 #include <lsmdom.h>
 
+GKeyFile *suite_options;
+
 static GSList *
 build_file_list (const char *path, GRegex *filename_regex)
 {
@@ -47,6 +49,7 @@ static void
 render_test (gconstpointer user_data)
 {
 	const char *filename = user_data;
+	char *basename;
 	LsmDomDocument *document;
 	LsmDomView *view;
 	LsmBox viewport;
@@ -54,6 +57,8 @@ render_test (gconstpointer user_data)
 	cairo_t *cairo;
 	cairo_surface_t *surface;
 
+	basename = g_path_get_basename (filename);
+
 	document = lsm_dom_document_new_from_path (filename, NULL);
 	g_assert (LSM_IS_DOM_DOCUMENT (document));
 
@@ -76,13 +81,20 @@ render_test (gconstpointer user_data)
 
 	if (cairo_status (cairo) == CAIRO_STATUS_SUCCESS) {
 		lsm_dom_view_render (LSM_DOM_VIEW (view), cairo, 1, 1);
-		g_assert (cairo_status (cairo) == CAIRO_STATUS_SUCCESS);
+
+		if (cairo_status (cairo) != CAIRO_STATUS_SUCCESS) {
+			g_test_message ("cairo_status = %s", cairo_status_to_string (cairo_status (cairo)));
+			if (!g_key_file_get_boolean (suite_options, basename, "ignore-cairo-status", NULL))
+				g_test_fail ();
+		}
 	}
 
 	cairo_destroy (cairo);
 
 	g_object_unref (view);
 	g_object_unref (document);
+
+	g_free (basename);
 }
 
 static void
@@ -107,6 +119,9 @@ main (int argc, char *argv[])
 	g_type_init ();
 #endif
 
+	suite_options = g_key_file_new ();
+	g_assert (g_key_file_load_from_file (suite_options, SUITE_OPTION_FILE, G_KEY_FILE_NONE, NULL));
+
 	g_test_init (&argc, &argv, NULL);
 
 	filename_regex = g_regex_new ("\\.(svg|mml)$", 0, 0, NULL);
@@ -119,6 +134,8 @@ main (int argc, char *argv[])
 	g_slist_free (files);
 	g_regex_unref (filename_regex);
 
+	g_key_file_free (suite_options);
+
 	lsm_shutdown ();
 
 	return result;