mathematical 1.5.12 → 1.6.0

data/ext/mathematical/lasem/po/sv.po

@@ -1,69 +1,102 @@
 # Swedish translation for lasem.
-# Copyright © 2011, 2014, 2015 Free Software Foundation, Inc.
+# Copyright © 2011, 2014, 2015, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the lasem package.
 # Daniel Nylander <po@danielnylander.se>, 2011.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014, 2015.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lasem\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=lasem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-08-03 22:12+0000\n"
-"PO-Revision-Date: 2015-08-07 14:50+0200\n"
+"POT-Creation-Date: 2016-07-04 19:36+0000\n"
+"PO-Revision-Date: 2016-08-02 01:18+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.3\n"
+"X-Generator: Poedit 1.8.8\n"
 
-#: ../src/lasemrender.c:67
+#: ../src/lasemrender.c:70
 msgid "Output filename"
 msgstr "Filnamn för utdata"
 
-#: ../src/lasemrender.c:69
+#: ../src/lasemrender.c:72
 msgid "Output format"
 msgstr "Format för utdata"
 
-#: ../src/lasemrender.c:71
+#: ../src/lasemrender.c:74
 msgid "Pixel per inch"
 msgstr "Bildpunkter per tum"
 
-#: ../src/lasemrender.c:73
+#: ../src/lasemrender.c:76
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../src/lasemrender.c:75
+#: ../src/lasemrender.c:78
+msgid "Element id"
+msgstr "Element-id"
+
+#: ../src/lasemrender.c:80
+msgid "Offset"
+msgstr "Position"
+
+#: ../src/lasemrender.c:82
+msgid "Size"
+msgstr "Storlek"
+
+#: ../src/lasemrender.c:84
 msgid "Debug domains"
 msgstr "Felsökningsdomäner"
 
-#: ../src/lasemrender.c:107
+#: ../src/lasemrender.c:97
+msgid "Invalid document type (SVG expected)"
+msgstr "Ogiltig dokumenttyp (SVG förväntades)"
+
+#: ../src/lasemrender.c:103
+#, c-format
+msgid "Element '%s' not found"
+msgstr "Elementet ”%s” hittades inte"
+
+#: ../src/lasemrender.c:154
 msgid "Option parsing failed:"
 msgstr "Tolkning av flaggor misslyckades:"
 
-#: ../src/lasemrender.c:114
+#: ../src/lasemrender.c:161
 msgid "Invalid zoom value"
 msgstr "Ogiltigt zoomvärde"
 
-#: ../src/lasemrender.c:121
+#: ../src/lasemrender.c:170
+msgid "Invalid number of arguments for offset option"
+msgstr "Ogiltigt antal argument för positionsflagga"
+
+#: ../src/lasemrender.c:180
+msgid "Invalid number of arguments for size option"
+msgstr "Ogiltigt antal argument för storleksflagga"
+
+#: ../src/lasemrender.c:185
+msgid "Invalid export size"
+msgstr "Ogiltig exportstorlek"
+
+#: ../src/lasemrender.c:193
 msgid "Missing input filename"
 msgstr "Saknar filnamn för indata"
 
-#: ../src/lasemrender.c:132
+#: ../src/lasemrender.c:204
 msgid "Unknown format:"
 msgstr "Okänt format: %s"
 
-#: ../src/lasemrender.c:172
+#: ../src/lasemrender.c:244
 msgid ""
 "Don't know which format to use, please either give a format (-f) or an "
 "output filename (-o)"
 msgstr ""
-"Vet inte vilket format som ska användas, ange antingen ett format (-f) "
-"eller ett filnamn för utdata (-o)"
+"Vet inte vilket format som ska användas, ange antingen ett format (-f) eller "
+"ett filnamn för utdata (-o)"
 
-#: ../src/lasemrender.c:262
+#: ../src/lasemrender.c:355
 #, c-format
 msgid "Can't load '%s'"
 msgstr "Kan inte läsa in ”%s”"

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

@@ -25,9 +25,9 @@
 #include <stdlib.h>
 #include <lsm.h>
 #include <lsmmathml.h>
+#include <lsmsvg.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gprintf.h>
 #include <gio/gio.h>
 #include <cairo-pdf.h>
 #include <cairo-svg.h>
@@ -40,6 +40,9 @@ static char *option_debug_domains = NULL;
 static char *option_output_file_format = NULL;
 static char **option_input_filenames = NULL;
 static char *option_output_filename = NULL;
+static char *option_element_id = NULL;
+static char *option_offset = NULL;
+static char *option_size = NULL;
 double option_ppi = 72.0;
 double option_zoom = 1.0;
 
@@ -71,12 +74,53 @@ static const GOptionEntry entries[] =
 		&option_ppi, 			N_("Pixel per inch"), NULL },
 	{ "zoom", 		'z', 0, G_OPTION_ARG_DOUBLE,
 		&option_zoom, 			N_("Zoom"), NULL },
+	{ "id", 		'i', 0, G_OPTION_ARG_STRING,
+		&option_element_id, 		N_("Element id"), NULL },
+	{ "offset", 		't', 0, G_OPTION_ARG_STRING,
+		&option_offset, 		N_("Offset"), NULL },
+	{ "size", 		's', 0, G_OPTION_ARG_STRING,
+		&option_size, 		N_("Size"), NULL },
 	{ "debug", 		'd', 0, G_OPTION_ARG_STRING,
 		&option_debug_domains,		N_("Debug domains"), NULL },
 	{ NULL }
 };
 
-int main(int argc, char **argv)
+static gboolean
+_hide_before_object (LsmDomDocument *document, const char *id)
+{
+	LsmDomNode *node;
+	LsmDomNode *sibling;
+	LsmDomNode *parent;
+
+	/* TODO: Handle other document types */
+	if (!LSM_IS_SVG_DOCUMENT (document)) {
+		fprintf (stderr, "%s\n", _("Invalid document type (SVG expected)"));
+		return  FALSE;
+	}
+
+	node = LSM_DOM_NODE (lsm_svg_document_get_element_by_id (LSM_SVG_DOCUMENT (document), id));
+	if (!LSM_IS_DOM_NODE (node)) {
+		fprintf (stderr, _("Element '%s' not found"), id);
+		fprintf (stderr, "\n");
+		return FALSE;
+	}
+
+	for (parent = lsm_dom_node_get_parent_node (node);
+	     LSM_IS_DOM_NODE (parent);
+	     node = parent, parent = lsm_dom_node_get_parent_node (parent)) {
+		for (sibling = lsm_dom_node_get_first_child (parent);
+		     LSM_IS_DOM_NODE (sibling);
+		     sibling = lsm_dom_node_get_next_sibling (sibling)) {
+			if (sibling != node && LSM_IS_SVG_ELEMENT (sibling))
+				lsm_dom_element_set_attribute (LSM_DOM_ELEMENT (sibling), "display", "none");
+		}
+	}
+
+	return TRUE;
+}
+
+int
+main(int argc, char **argv)
 {
 	LsmDomDocument *document;
 	LsmDomView *view;
@@ -87,8 +131,11 @@ int main(int argc, char **argv)
 	FileFormat format;
 	char *output_filename;
 	char *input_filename;
+	double offset_x_pt, offset_y_pt;
 	double height_pt, width_pt;
 	unsigned int height, width;
+	double size[2];
+	double offset[2];
 
 	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -104,21 +151,46 @@ int main(int argc, char **argv)
 	if (!g_option_context_parse (context, &argc, &argv, &error))
 	{
 		g_option_context_free (context);
-		printf ("%s %s\n", _("Option parsing failed:"), error->message);
+		fprintf (stderr, "%s %s\n", _("Option parsing failed:"), error->message);
 		return EXIT_FAILURE;
 	}
 
 	g_option_context_free (context);
 
 	if (option_zoom < 0.0) {
-		printf ("%s\n", _("Invalid zoom value"));
+		fprintf (stderr, "%s\n", _("Invalid zoom value"));
 		return EXIT_FAILURE;
 	}
 
+	if (option_offset != NULL) {
+		unsigned n_values;
+
+		n_values = lsm_str_parse_double_list (&option_offset, 2, offset);
+		if (n_values != 2) {
+			fprintf (stderr, "%s\n", _("Invalid number of arguments for offset option"));
+			return EXIT_FAILURE;
+		}
+	}
+
+	if (option_size != NULL) {
+		unsigned n_values;
+
+		n_values = lsm_str_parse_double_list (&option_size, 2, size);
+		if (n_values != 2) {
+			fprintf (stderr, "%s\n", _("Invalid number of arguments for size option"));
+			return EXIT_FAILURE;
+		}
+		if (size[0] <= 0.0 ||
+		    size[1] <= 0.0) {
+			fprintf (stderr, "%s\n", _("Invalid export size"));
+			return EXIT_FAILURE;
+		}
+	}
+
 	lsm_debug_enable (option_debug_domains);
 
 	if (option_input_filenames == NULL || g_strv_length (option_input_filenames) > 1) {
-		printf ("%s\n", _("Missing input filename"));
+		fprintf (stderr, "%s\n", _("Missing input filename"));
 		return EXIT_FAILURE;
 	}
 
@@ -129,7 +201,7 @@ int main(int argc, char **argv)
 			if (g_ascii_strcasecmp (option_output_file_format, file_formats[format]) == 0)
 				break;
 		if (FORMAT_UNKNOWN == format) {
-			printf ("%s %s\n", _("Unknown format:"), option_output_file_format);
+			fprintf (stderr, "%s %s\n", _("Unknown format:"), option_output_file_format);
 			return EXIT_FAILURE;
 		}
 	} else
@@ -169,7 +241,7 @@ int main(int argc, char **argv)
 	}
 
 	if (format == FORMAT_UNKNOWN) {
-		printf ("%s\n", _("Don't know which format to use, please either give a format (-f) or an output filename (-o)"));
+		fprintf (stderr, "%s\n", _("Don't know which format to use, please either give a format (-f) or an output filename (-o)"));
 		return EXIT_FAILURE;
 	}
 
@@ -188,6 +260,13 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (document != NULL && option_element_id != NULL) {
+		if (!_hide_before_object (document, option_element_id)) {
+			g_object_unref (document);
+			return EXIT_FAILURE;
+		}
+	}
+
 	if (document != NULL) {
 		if (lsm_debug_check (&lsm_debug_category_dom, LSM_DEBUG_LEVEL_LOG)) {
 			void *buffer;
@@ -209,11 +288,25 @@ int main(int argc, char **argv)
 
 		lsm_dom_view_get_size (view, &width_pt, &height_pt, NULL);
 		lsm_dom_view_get_size_pixels (view, &width, &height, NULL);
+		
+		if (option_offset == NULL) {
+			offset_x_pt = offset_y_pt = 0.0;
+		} else {
+			offset_x_pt = option_zoom * offset[0];
+			offset_y_pt = option_zoom * offset[1];
+		}
 
-		width_pt *= option_zoom;
-		height_pt *= option_zoom;
-		width *= option_zoom;
-		height *= option_zoom;
+		if (option_size == NULL) {
+			width_pt *= option_zoom;
+			height_pt *= option_zoom;
+			width *= option_zoom;
+			height *= option_zoom;
+		}  else {
+			width_pt = option_zoom * size[0];
+			height_pt = option_zoom * size[1];
+			width = width_pt;
+			height = height_pt;
+		}
 
 		switch (format) {
 			case FORMAT_PDF:
@@ -240,7 +333,7 @@ int main(int argc, char **argv)
 		cairo_surface_destroy (surface);
 		cairo_scale (cairo, option_zoom, option_zoom);
 
-		lsm_dom_view_render (view, cairo, 0, 0);
+		lsm_dom_view_render (view, cairo, -offset_x_pt, -offset_y_pt);
 
 		switch (format) {
 			case FORMAT_PNG:
@@ -259,8 +352,8 @@ int main(int argc, char **argv)
 
 		lsm_debug_render ("width = %g pt, height = %g pt",  width_pt, height_pt);
 	} else {
-		printf (_("Can't load '%s'"), input_filename);
-		printf ("\n");
+		fprintf (stderr, _("Can't load '%s'"), input_filename);
+		fprintf (stderr, "\n");
 
 		return EXIT_FAILURE;
 	}

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

@@ -76,3 +76,4 @@ lsm_itex_free_mathml_buffer (char *mathml)
 
 	itex2MML_free_string (mathml);
 }
+

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

@@ -322,8 +322,6 @@ lsm_svg_element_finalize (GObject *object)
 
 /* LsmSvgElement class */
 
-static const LsmSvgMatrix matrix_default =	 { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, LSM_SVG_MATRIX_FLAGS_IDENTITY};
-
 static const LsmAttributeInfos lsm_svg_attribute_infos[] = {
 	{
 		.name = "id",

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

@@ -32,7 +32,7 @@ lsm_svg_viewbox_new (double resolution_ppi,
 {
 	LsmSvgViewbox *svg_viewbox;
 
-	svg_viewbox = g_new (LsmSvgViewbox, 1);
+	svg_viewbox = g_slice_new (LsmSvgViewbox);
 	svg_viewbox->resolution_ppi = resolution_ppi;
 	svg_viewbox->viewbox = *viewbox;
 	svg_viewbox->diagonal = sqrt (viewbox->width * viewbox->width +
@@ -44,7 +44,7 @@ lsm_svg_viewbox_new (double resolution_ppi,
 void
 lsm_svg_viewbox_free (LsmSvgViewbox *viewbox)
 {
-	g_free (viewbox);
+	g_slice_free (LsmSvgViewbox, viewbox);
 }
 
 double

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

@@ -30,6 +30,22 @@ lsm_svg_matrix_is_identity (const LsmSvgMatrix *matrix)
 	return ((matrix->flags & LSM_SVG_MATRIX_FLAGS_IDENTITY) != 0);
 }
 
+static double
+_compute_determinant (const LsmSvgMatrix *matrix)
+{
+    return matrix->a * matrix->d - matrix->b * matrix->c;
+}
+
+gboolean
+lsm_svg_matrix_is_invertible (const LsmSvgMatrix *matrix)
+{
+    double det;
+
+    det = _compute_determinant (matrix);
+
+    return isfinite (det) && det != 0.;
+}
+
 void
 lsm_svg_matrix_init (LsmSvgMatrix *matrix, double a, double b, double c, double d, double e, double f)
 {

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

@@ -35,7 +35,8 @@ typedef struct {
 	LsmSvgMatrixFlags flags;
 } LsmSvgMatrix;
 
-gboolean lsm_svg_matrix_is_identity (const LsmSvgMatrix *matrix);
+gboolean lsm_svg_matrix_is_identity 		(const LsmSvgMatrix *matrix);
+gboolean lsm_svg_matrix_is_invertible		(const LsmSvgMatrix *matrix);
 
 void 	lsm_svg_matrix_init 			(LsmSvgMatrix *matrix, double a, double b,
 					                               double c, double d,

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

@@ -142,7 +142,8 @@ _svg_element_render (LsmSvgElement *self, LsmSvgView *view)
 	lsm_svg_view_show_viewport (view, &viewport);
 
 	lsm_svg_view_push_viewport (view, &viewport, is_viewbox_defined ? &svg->viewbox.value : NULL,
-				    &svg->preserve_aspect_ratio.value, LSM_SVG_OVERFLOW_HIDDEN);
+				    &svg->preserve_aspect_ratio.value,
+				    is_outermost_svg ? LSM_SVG_OVERFLOW_VISIBLE : LSM_SVG_OVERFLOW_HIDDEN);
 
 	LSM_SVG_ELEMENT_CLASS (parent_class)->render (self, view);
 
@@ -154,7 +155,12 @@ _svg_element_render (LsmSvgElement *self, LsmSvgView *view)
 void
 lsm_svg_svg_element_render (LsmSvgSvgElement *svg, LsmSvgView *view)
 {
-	lsm_svg_view_push_viewport (view, &svg->svg_box, NULL, NULL, LSM_SVG_OVERFLOW_HIDDEN);
+	gboolean is_outermost_svg;
+
+	is_outermost_svg = LSM_IS_SVG_DOCUMENT (lsm_dom_node_get_parent_node (LSM_DOM_NODE (svg)));
+
+	lsm_svg_view_push_viewport (view, &svg->svg_box, NULL, NULL,
+				    is_outermost_svg ? LSM_SVG_OVERFLOW_VISIBLE : LSM_SVG_OVERFLOW_HIDDEN);
 	lsm_svg_element_render (LSM_SVG_ELEMENT (svg), view);
 	lsm_svg_view_pop_viewport (view);
 }

data/ext/mathematical/lasem_overrides.c

@@ -1,7 +1,7 @@
-#include "ruby.h"
-
 #include "lasem_overrides.h"
-#include <string.h>
+#ifdef IS_TRAVISCI
+#define HAVE_STRDUP
+#endif
 #include <mtex2MML.h>
 
 void

data/ext/mathematical/mathematical.c

@@ -99,7 +99,7 @@ VALUE process(VALUE self, unsigned long maxsize, const char *latex_code, unsigne
   char * mathml = lsm_mtex_to_mathml(latex_code, latex_size, delimiter, parse_type);
   if (mathml == NULL) { print_and_raise(rb_eParseError, "Failed to parse mtex"); }
 
-  if (format == FORMAT_MATHML) {
+  if (format == FORMAT_MATHML || parse_type == TEXT_FILTER) {
     rb_hash_aset (result_hash, CSTR2SYM ("data"), rb_str_new2(mathml));
     mtex2MML_free_string(mathml);
     return result_hash;