mathematical 1.6.14 → 1.6.18

data/ext/mathematical/lasem/itex2mml/meson.build

@@ -0,0 +1,17 @@
+flex = find_program('flex', required: false)
+bison = find_program('bison', required: false)
+
+lgen = generator(flex,
+output : '@BASENAME@.yy.c',
+arguments : ['-P', '@BASENAME@_yy', '-o', '@OUTPUT@', '@INPUT@'])
+
+pgen = generator(bison,
+output : ['@BASENAME@.tab.c', '@BASENAME@.tab.h'],
+arguments : ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@', '--warning=no-conflicts-rr', '--warnings=no-conflicts-sr', '-v', '-y', '-p', '@BASENAME@_yy', '-d'])
+
+itex2mml_files = [
+	lgen.process ('itex2MML.l'),
+	pgen.process ('itex2MML.y')
+]
+
+itex2mml_inc = include_directories ('.')

data/ext/mathematical/lasem/lasem.doap

@@ -1,21 +1,21 @@
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
          xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xmlns:gnome="http://api.gnome.org/doap-extensions#"
          xmlns="http://usefulinc.com/ns/doap#">
 
   <name xml:lang="en">Lasem</name>
   <shortdesc xml:lang="en">SVG and MathML rendering library</shortdesc>
-  <homepage rdf:resource="https://wiki.gnome.org/Projects/Lasem" />
-  <download-page rdf:resource="http://download.gnome.org/sources/lasem/" />
-  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/lasem/issues/" />
-  <!-- <category rdf:resource="http://api.gnome.org/doap-extensions#development" /> -->
+
+  <homepage rdf:resource="https://github.com/LasemProject/lasem" />
+  <download-page rdf:resource="https://github.com/LasemProject/lasem/releases" />
+  <bug-database rdf:resource="https://github.com/LasemProject/lasem/issues" />
+  <programming-language>C</programming-language>
 
   <maintainer>
     <foaf:Person>
       <foaf:name>Emmanuel Pacaud</foaf:name>
-      <foaf:mbox rdf:resource="mailto:emmanuel@gnome.org" />
-      <gnome:userid>emmanuel</gnome:userid>
+      <foaf:mbox rdf:resource="mailto:emmanuel.pacaud@free.fr" />
     </foaf:Person>
   </maintainer>
+
 </Project>

data/ext/mathematical/lasem/meson.build

@@ -0,0 +1,46 @@
+project ('lasem', 'c', version: '0.5.2', meson_version: '>=0.56.0')
+
+gnome = import('gnome')
+i18n = import ('i18n')
+pkg = import ('pkgconfig')
+
+lasem_version = meson.project_version ()
+lasem_api_version = '0.6'
+
+versions = lasem_version.split ('.')
+lasem_major_version = versions[0].to_int ()
+lasem_minor_version = versions[1].to_int ()
+lasem_micro_version = versions[2].to_int ()
+
+cc = meson.get_compiler ('c')
+
+glib_dep = dependency ('glib-2.0', version: '>=2.36', required: true)
+gobject_dep = dependency ('gobject-2.0', required: true)
+gio_dep = dependency ('gio-2.0', required: true)
+gdk_dep = dependency ('gdk-pixbuf-2.0', required: true)
+cairo_dep = dependency ('cairo', version: '>= 1.2', required: true)
+pango_cairo_dep = dependency ('pangocairo', version: '>= 1.16.0', required: true)
+libxml2_dep = dependency ('libxml-2.0', required: true)
+
+libm = cc.find_library ('m', required: true)
+
+lasem_dependencies = [glib_dep, gobject_dep, gio_dep, gdk_dep, cairo_dep, pango_cairo_dep, libxml2_dep, libm]
+
+subdir ('po')
+subdir ('itex2mml')
+subdir ('src')
+subdir ('tests')
+subdir ('viewer')
+
+doc_deps = dependency ('gi-docgen', version:'>= 2021.1', fallback: ['gi-docgen', 'dummy_dep'], required:get_option('documentation'))
+subdir('docs', if_found: doc_deps)
+
+summary (
+  {
+  'prefix': get_option('prefix'),
+  'bindir': get_option('bindir'),
+  'libdir': get_option('libdir'),
+  'datadir': get_option('datadir'),
+  },
+  section: 'Directories'
+)

data/ext/mathematical/lasem/meson_options.txt

@@ -0,0 +1,5 @@
+# Documentation and introspection
+
+option('introspection', type: 'feature', value: 'auto', description: 'Build introspection data (requires gobject-introspection)')
+option('documentation', type: 'feature', value: 'disabled', description: 'Build API reference (requires gi-docgen)')
+option('viewer', type: 'feature', value: 'disabled', description: 'Build viewer application (requires gtk4)')

data/ext/mathematical/lasem/org.lasem.Viewer.json

@@ -0,0 +1,41 @@
+{
+    "app-id" : "org.lasem.Viewer",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "lsm-viewer",
+    "finish-args" : [
+        "--share=network",
+        "--share=ipc",
+        "--socket=fallback-x11",
+        "--device=dri",
+        "--socket=wayland"
+    ],
+    "cleanup" : [
+        "/include",
+        "/lib/pkgconfig",
+        "/man",
+        "/share/doc",
+        "/share/gtk-doc",
+        "/share/man",
+        "/share/pkgconfig",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
+        {
+            "name" : "lasem",
+            "builddir" : true,
+            "buildsystem" : "meson",
+            "config-opts" : [
+            	"-Dviewer=enabled"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "path" : "./"
+                }
+            ]
+        }
+    ]
+}

data/ext/mathematical/lasem/po/LINGUAS

@@ -13,7 +13,6 @@ gl
 hu
 id
 it
-it
 lt
 lv
 nb
@@ -22,7 +21,6 @@ oc
 pl
 pt
 pt_BR
-ro
 ru
 sl
 sr

data/ext/mathematical/lasem/po/eu.po

@@ -3,100 +3,64 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2013.
-# Asier Sarasua Garmendia <asier.sarasua@gmail.com>, 2019.
 #
 msgid ""
-msgstr "Project-Id-Version: lasem master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/lasem/issues\n"
-"POT-Creation-Date: 2019-08-19 12:49+0000\n"
-"PO-Revision-Date: 2019-10-27 10:00+0100\n"
-"Last-Translator: Asier Sarasua Garmendia <asier.sarasua@gmail.com>\n"
-"Language-Team: Basque <librezale@librezale.eus>\n"
+msgstr ""
+"Project-Id-Version: lasem master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=lasem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-08-30 17:44+0200\n"
+"PO-Revision-Date: 2013-08-30 17:39+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"Language-Team: Basque <librezale@librezale.org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.4\n"
 
-#: ../src/lasemrender.c:70
+#: ../src/lasemrender.c:67
 msgid "Output filename"
 msgstr "Irteerako fitxategi-izena"
 
-#: ../src/lasemrender.c:72
+#: ../src/lasemrender.c:69
 msgid "Output format"
 msgstr "Irteerako formatua"
 
-#: ../src/lasemrender.c:74
+#: ../src/lasemrender.c:71
 msgid "Pixel per inch"
 msgstr "Pixel hazbeteko"
 
-#: ../src/lasemrender.c:76
+#: ../src/lasemrender.c:73
 msgid "Zoom"
 msgstr "Zooma"
 
-#: ../src/lasemrender.c:78
-msgid "Element id"
-msgstr "Elementuaren IDa"
-
-#: ../src/lasemrender.c:80
-msgid "Offset"
-msgstr "Desplazamendua"
-
-#: ../src/lasemrender.c:82
-msgid "Size"
-msgstr "Tamaina"
-
-#: ../src/lasemrender.c:84
+#: ../src/lasemrender.c:75
 msgid "Debug domains"
 msgstr "Arazketaren domeinuak"
 
-#: ../src/lasemrender.c:97
-msgid "Invalid document type (SVG expected)"
-msgstr "Dokumentu mota baliogabea (SVG espero zen)"
-
-#: ../src/lasemrender.c:103
+#: ../src/lasemrender.c:105
 #, c-format
-msgid "Element '%s' not found"
-msgstr "'%s' elementua ez da aurkitu"
+msgid "Option parsing failed: %s\n"
+msgstr "Huts egin du aukera aztertzean: %s\n"
 
-#: ../src/lasemrender.c:154
-msgid "Option parsing failed:"
-msgstr "Aukeren analisiak huts egin du:"
-
-#: ../src/lasemrender.c:161
+#: ../src/lasemrender.c:112
+#, c-format
 msgid "Invalid zoom value"
 msgstr "Zoomaren baliogabeko balioa"
 
-#: ../src/lasemrender.c:170
-msgid "Invalid number of arguments for offset option"
-msgstr "Argumentu kopuru baliogabea desplazamenduaren aukerarako"
-
-#: ../src/lasemrender.c:180
-msgid "Invalid number of arguments for size option"
-msgstr "Argumentu kopuru baliogabea tamainaren aukerarako"
-
-#: ../src/lasemrender.c:185
-msgid "Invalid export size"
-msgstr "Esportazio-tamaina baliogabea"
-
-#: ../src/lasemrender.c:193
-msgid "Missing input filename"
-msgstr "Sarrerako fitxategi-izena falta da"
-
-#: ../src/lasemrender.c:204
-msgid "Unknown format:"
-msgstr "Formatu ezezaguna:"
-
-#: ../src/lasemrender.c:244
-msgid ""
-"Don't know which format to use, please either give a format (-f) or an "
-"output filename (-o)"
-msgstr "Ez dakit zein formatu erabili, eman formatu bat (-f) edo irteerako fitxategi-izen bat (-o)"
+#: ../src/lasemrender.c:119
+#, c-format
+msgid "One input file name is required\n"
+msgstr "Sarrerako fitxategi-izen bat behar da\n"
 
-#: ../src/lasemrender.c:355
+#: ../src/lasemrender.c:130
 #, c-format
-msgid "Can't load '%s'"
-msgstr "Ezin da '%s' kargatu"
+msgid "Unknown format: %s\n"
+msgstr "Formatu ezezaguna: %s\n"
 
-#~ msgid "One input file name is required\n"
-#~ msgstr "Sarrerako fitxategi-izen bat behar da\n"
+#: ../src/lasemrender.c:255
+#, c-format
+msgid "Can't load '%s'\n"
+msgstr "Ezin da '%s' kargatu\n"

data/ext/mathematical/lasem/po/meson.build

@@ -0,0 +1,4 @@
+add_project_arguments('-DGETTEXT_PACKAGE="lasem-@0@"'.format (lasem_api_version), language:'c')
+
+i18n.gettext ('lasem-@0@'.format (lasem_api_version),
+	      args: '--directory=' + meson.project_source_root())

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

@@ -32,7 +32,6 @@
 #include <cairo-pdf.h>
 #include <cairo-svg.h>
 #include <cairo-ps.h>
-#include <../config.h>
 
 #include <../itex2mml/itex2MML.h>
 
@@ -141,10 +140,6 @@ main(int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-#if !GLIB_CHECK_VERSION(2,36,0)
-	g_type_init ();
-#endif
-
 	context = g_option_context_new (NULL);
 	g_option_context_add_main_entries (context, entries, NULL);
 
@@ -288,7 +283,7 @@ 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 {

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

@@ -22,10 +22,12 @@
  */
 
 #include <lsmdomimplementation.h>
+#include <lsmmathmloperatordictionary.h>
 #include <lsm.h>
 
 void
 lsm_shutdown (void)
 {
 	lsm_dom_implementation_cleanup ();
+	lsm_mathml_operator_dictionary_cleanup ();
 }

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

@@ -23,6 +23,7 @@
 
 #include <lsmattributes.h>
 #include <lsmdebug.h>
+#include <lsmmisc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -240,7 +241,6 @@ lsm_attribute_manager_serialize	(LsmAttributeManager *manager,
 	LsmAttribute *attribute;
 	GString *string;
 	GHashTableIter iter;
-	char *c_string;
 	gpointer key, value;
 	gboolean attribute_found = FALSE;
 
@@ -272,8 +272,5 @@ lsm_attribute_manager_serialize	(LsmAttributeManager *manager,
 		return NULL;
 	}
 
-	c_string = string->str;
-	g_string_free (string, FALSE);
-
-	return c_string;
+	return lsm_g_string_free_and_steal (string);
 }

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

@@ -432,7 +432,7 @@ const LsmMathmlOperatorGlyph AMS_table[] = {
 		{LSM_MATHML_FONT_ERROR,		""},
 		1,
 		{
-			{LSM_MATHML_FONT_DEFAULT,	"\xcc\xb2"}
+			{LSM_MATHML_FONT_DEFAULT,	"\xe2\x80\x8c\xcc\xb2"}
 		}
 	},
 	{
@@ -482,7 +482,7 @@ const LsmMathmlOperatorGlyph AMS_table[] = {
 		{
 			{LSM_MATHML_FONT_CMEX10,	"e"},
 			{LSM_MATHML_FONT_CMEX10,	"f"},
-			{LSM_MATHML_FONT_CMEX10,	"g"}
+			{LSM_MATHML_FONT_CMEX10,	"g"},
 		}
 	},
 	{
@@ -535,7 +535,7 @@ const LsmMathmlOperatorGlyph AMS_table[] = {
 	},
 	{
 		"-",
-		0,
+		LSM_MATHML_GLYPH_FLAG_STRETCH_HORIZONTAL,
 		{LSM_MATHML_FONT_ERROR,		""},
 		{LSM_MATHML_FONT_ERROR,		""},
 		{LSM_MATHML_FONT_ERROR,		""},
@@ -556,22 +556,86 @@ const LsmMathmlOperatorGlyph AMS_table[] = {
 		{
 			{LSM_MATHML_FONT_DEFAULT,	"|"}
 		}
-	}
+	},
+	{
+		"\x5e" /* ^ ^ */,
+		LSM_MATHML_GLYPH_FLAG_STRETCH_HORIZONTAL,
+		{LSM_MATHML_FONT_ERROR,		""},
+		{LSM_MATHML_FONT_ERROR,		""},
+		{LSM_MATHML_FONT_ERROR,		""},
+		{LSM_MATHML_FONT_ERROR,		""},
+		1,
+		{
+			{LSM_MATHML_FONT_DEFAULT,	"\x5e"}
+		}
+	},
 };
 
 static GHashTable *
 _get_glyph_table (void)
 {
 	static GHashTable *glyph_table = NULL;
+	LsmMathmlOperatorGlyph glyph_template =
+	{
+		"\xcc\x80",
+		0,
+		{LSM_MATHML_FONT_ERROR,		""},
+		{LSM_MATHML_FONT_ERROR,		""},
+		{LSM_MATHML_FONT_ERROR,		""},
+		{LSM_MATHML_FONT_ERROR,		""},
+		1,
+		{
+			{LSM_MATHML_FONT_DEFAULT,	"\xe2\x80\x8c\xcc\x80"}
+		}
+	};
+	char *utf8 = (char *) &glyph_template.utf8;
+	char *sized_utf8 = (char *) &glyph_template.sized_glyphs[0].utf8;
 	unsigned int i;
 
 	if (glyph_table != NULL)
 		return glyph_table;
 
-	glyph_table = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
+	glyph_table = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
+
+	for (i = 0; i < G_N_ELEMENTS (AMS_table); i++) {
+		LsmMathmlOperatorGlyph *glyph;
+
+		glyph = g_new(LsmMathmlOperatorGlyph, 1);
+		memcpy (glyph, &AMS_table[i], sizeof (LsmMathmlOperatorGlyph));
+
+		g_hash_table_insert (glyph_table, (void *) AMS_table[i].utf8, glyph);
+	}
+
+	/* Add a Zero Width Non-joiner character to combining characters in order to avoid dotted circles */
+	for (i = 0x80; i < 0xbf; i++) {
+		LsmMathmlOperatorGlyph *glyph;
+
+		utf8[1] = i;
+		sized_utf8[4] = i;
+
+		glyph = g_new(LsmMathmlOperatorGlyph, 1);
+		memcpy (glyph, &glyph_template, sizeof (LsmMathmlOperatorGlyph));
+
+		if (g_hash_table_lookup (glyph_table, (char *) glyph->utf8) == NULL)
+			g_hash_table_insert (glyph_table, (char *) glyph->utf8, glyph);
+	}
 
-	for (i = 0; i < G_N_ELEMENTS (AMS_table); i++)
-		g_hash_table_insert (glyph_table, (void *) AMS_table[i].utf8, (void *) &AMS_table[i]);
+	utf8[0] = '\xcd';
+	sized_utf8[3] = '\xcd';
+	for (i = 0x80; i < 0xaf; i++) {
+		LsmMathmlOperatorGlyph *glyph;
+		char *utf8 = (char *) &glyph_template.utf8;
+		char *sized_utf8 = (char *) &glyph_template.sized_glyphs[0].utf8;
+
+		utf8[1] = i;
+		sized_utf8[4] = i;
+
+		glyph = g_new(LsmMathmlOperatorGlyph, 1);
+		memcpy (glyph, &glyph_template, sizeof (LsmMathmlOperatorGlyph));
+
+		if (g_hash_table_lookup (glyph_table, (char *) glyph->utf8) == NULL)
+			g_hash_table_insert (glyph_table, (char *) glyph->utf8, glyph);
+	}
 
 	return glyph_table;
 }

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

@@ -25,6 +25,7 @@
 #include <lsmmathmlview.h>
 #include <lsmdomtext.h>
 #include <lsmdebug.h>
+#include <lsmmisc.h>
 
 static GObjectClass *parent_class;
 
@@ -74,24 +75,25 @@ _update (LsmMathmlElement *self, LsmMathmlStyle *style)
 
 	if (need_conversion) {
 		LsmMathmlDocument *document;
+		size_t length;
 
 		g_free (itex_element->itex);
-		itex_element->itex = string->str;
+		length = string->len;
+		itex_element->itex = lsm_g_string_free_and_steal (string);
 
 		lsm_debug_update ("[MathmlItex::update] need conversion");
 
-		document = lsm_mathml_document_new_from_itex (itex_element->itex,
-							      string->len, NULL);
+		document = lsm_mathml_document_new_from_itex (itex_element->itex, length, NULL);
 		if (document != NULL) {
 			if (itex_element->math != NULL)
 				g_object_unref (lsm_dom_node_get_owner_document (LSM_DOM_NODE (itex_element->math)));
 
 			itex_element->math = LSM_MATHML_ELEMENT (lsm_mathml_document_get_root_element (document));
 		}
+	} else {
+		g_string_free (string, TRUE);
 	}
 
-	g_string_free (string, FALSE);
-
 	if (itex_element->math != NULL) {
 		lsm_dom_node_changed (LSM_DOM_NODE (itex_element->math));
 		self->need_measure = lsm_mathml_element_update (itex_element->math, style);

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

@@ -3213,10 +3213,11 @@ static const LsmMathmlOperatorDictionaryEntry lsm_mathml_operator_entries[] = {
 	}
 };
 
+static GHashTable *operator_hash = NULL;
+
 static GHashTable *
 _get_operator_dictionary (void)
 {
-	static GHashTable *operator_hash = NULL;
 	const char *utf8, *prefix;
 	char *key;
 	int i;
@@ -3246,6 +3247,8 @@ _get_operator_dictionary (void)
 		if (g_hash_table_lookup (operator_hash, key) == NULL)
 			g_hash_table_insert (operator_hash, key,
 					     (void *) &lsm_mathml_operator_entries[i]);
+		else
+			g_free (key);
 	}
 
 	return operator_hash;
@@ -3330,3 +3333,10 @@ lsm_mathml_operator_dictionary_lookup (const char *utf8, LsmMathmlForm form)
 
 	return &lsm_mathml_operator_dictionary_default_entry;
 }
+
+void
+lsm_mathml_operator_dictionary_cleanup (void)
+{
+	if (operator_hash != NULL)
+		g_hash_table_unref (operator_hash);
+}

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

@@ -46,7 +46,8 @@ typedef struct {
 	gboolean	 symmetric;
 } LsmMathmlOperatorDictionaryEntry;
 
-const LsmMathmlOperatorDictionaryEntry *	lsm_mathml_operator_dictionary_lookup (const char *utf8, LsmMathmlForm form);
+const LsmMathmlOperatorDictionaryEntry *	lsm_mathml_operator_dictionary_lookup  (const char *utf8, LsmMathmlForm form);
+void						lsm_mathml_operator_dictionary_cleanup (void);
 
 G_END_DECLS
 

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

@@ -200,12 +200,17 @@ double
 lsm_mathml_operator_element_get_slant (const LsmMathmlOperatorElement *operator_element, LsmMathmlView *view)
 {
 	char *text;
+	double slant;
 
 	g_return_val_if_fail (LSM_IS_MATHML_OPERATOR_ELEMENT (operator_element), 0.0);
 
 	text = lsm_mathml_presentation_token_get_text (LSM_MATHML_PRESENTATION_TOKEN (operator_element));
 
-	return lsm_mathml_view_get_operator_slant (view, &LSM_MATHML_ELEMENT (operator_element)->style, text);
+	slant = lsm_mathml_view_get_operator_slant (view, &LSM_MATHML_ELEMENT (operator_element)->style, text);
+
+	g_free (text);
+
+	return slant;
 }
 
 LsmDomNode *

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

@@ -251,6 +251,16 @@ lsm_mathml_view_get_font_metrics (LsmMathmlView *view,
 		*descent = bbox.depth;
 }
 
+char *
+_add_zero_width_non_joiner_to_combining (const char *text)
+{
+	if (text != NULL && ((text[0] == '\xcc' && text[1] >= '\x80' && text[1] <= '\xbf') ||
+			     (text[0] == '\xcd' && text[1] >= '\x80' && text[1] <= '\xaf')) && text[2] == '\0')
+		return g_strdup_printf ("\xe2\x80\x8c%s", text);
+	else
+		return g_strdup (text);
+}
+
 void
 lsm_mathml_view_measure_text (LsmMathmlView *view,
 			   const LsmMathmlElementStyle *style,
@@ -258,6 +268,7 @@ lsm_mathml_view_measure_text (LsmMathmlView *view,
 			   LsmMathmlBbox *bbox)
 {
 	PangoRectangle ink_rect;
+	char *actual_text;
 	int baseline;
 
 	g_return_if_fail (LSM_IS_MATHML_VIEW (view));
@@ -269,8 +280,10 @@ lsm_mathml_view_measure_text (LsmMathmlView *view,
 		return;
 	}
 
-	lsm_mathml_view_update_layout_for_text (view, style, text,
+	actual_text = _add_zero_width_non_joiner_to_combining(text);
+	lsm_mathml_view_update_layout_for_text (view, style, actual_text,
 					     view->dom_view.measure_pango_layout, &ink_rect, NULL, &baseline);
+	g_free (actual_text);
 
 	bbox->width = pango_units_to_double (ink_rect.width);
 	bbox->height = pango_units_to_double (baseline - ink_rect.y);
@@ -285,6 +298,7 @@ lsm_mathml_view_show_text (LsmMathmlView *view,
 {
 	PangoLayout *pango_layout;
 	PangoRectangle rect, ink_rect;
+	char *actual_text;
 	cairo_t *cairo;
 	int baseline;
 
@@ -294,13 +308,17 @@ lsm_mathml_view_show_text (LsmMathmlView *view,
 	if (text == NULL || strlen (text) < 1)
 		return;
 
+	actual_text = _add_zero_width_non_joiner_to_combining (text);
+
+	actual_text = _add_zero_width_non_joiner_to_combining(text);
 	lsm_debug_render ("[LsmMathmlView::show_text] '%s' at %g, %g (size = %g) %s",
-		   text, x, y, style->math_size,
+		   actual_text, x, y, style->math_size,
 		   lsm_mathml_variant_to_string (style->math_variant));
 
-	lsm_mathml_view_update_layout_for_text (view, style, text,
+	lsm_mathml_view_update_layout_for_text (view, style, actual_text,
 					     view->dom_view.pango_layout, &ink_rect, &rect, &baseline);
 	lsm_mathml_view_show_layout (view, x, y, baseline, &ink_rect, &rect);
+	g_free (actual_text);
 
 	if (ink_rect.width <= 0 || ink_rect.height <= 0)
 		return;

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

@@ -53,11 +53,11 @@ typedef enum {
 
 typedef struct {
 	LsmMathmlFont 	font;
-	const char 	utf8[4];
+	const char 	utf8[6];
 } LsmMathmlGlyph;
 
 typedef struct {
-	const char		*utf8;
+	const char		utf8[6];
 	LsmMathmlGlyphFlags	flags;
 	LsmMathmlGlyph		start_glyph;
 	LsmMathmlGlyph		middle_glyph;