mathematical 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9d51871f076bd11925a8bc4bc7cf250c2de8b75
-  data.tar.gz: 2dfde62658cfb84f86004710c60e743e2c042e38
+  metadata.gz: 76b035ec15c5544af7d23d6f576db7bc631f1a99
+  data.tar.gz: d05835bb988ace6708c9c96f5b08e3af123f9e79
 SHA512:
-  metadata.gz: e7921f6cbfbd8773985403dcd7b9987a2d4aa9ba748c8118a0637b2a196bbfe708db13471dc4227c59090d53be0502894eefa936c21e9a69532e0644ff497919
-  data.tar.gz: 7c06f2688a1cf43ec5dacd443d3f2f35d3e89457b19f8bc04402d101d2ae1f93cc83df6e3ad9fec0a4f80b0f30e2ea3914afde2270be2cf7178f03c661adcb34
+  metadata.gz: 39d975bf3099679edf52fb1ab277f7e655482ed206a26de3a5e8ae2d93abc904bc5d0735f11789fc1c9c7378d038ba6842036b65565449bf4ad5d638e03612cd
+  data.tar.gz: 6e2a815f25d40bb1e3cea90f626f9a3669979b8ffbc847d7ade2549a123168fb35466d682009033521ce7058e5b4da1be608a5be212e66a773c66bfdb9113d62

data/Rakefile

@@ -20,6 +20,10 @@ end
 Gem::PackageTask.new(spec) do |pkg|
 end
 
+Rake::Task["compile"].enhance do
+  Rake::Task["destroy_copies"].invoke
+end
+
 Rake::Task[:test].prerequisites << :compile
 
 task :default => [:test]
@@ -54,3 +58,11 @@ task :publish do
     system "echo yolo"
   end
 end
+
+task :destroy_copies do
+  ext_dir = File.join(File.dirname(__FILE__), "ext", "mathematical")
+  Dir.glob("#{ext_dir}/*").select { |f| File.file?(f) }.each do |f|
+    next if f =~ /extconf.rb/ || f =~ /mathematical.c/
+    File.delete(f)
+  end
+end

data/ext/mathematical/extconf.rb

@@ -2,6 +2,9 @@ require 'mkmf'
 require 'rbconfig'
 host_os = RbConfig::CONFIG['host_os']
 
+LASEM_DIR = File.join(File.dirname(__FILE__), "lasem", "src")
+ITEX_DIR = File.join(File.dirname(__FILE__), "itexToMML")
+
 if host_os =~ /darwin|mac os/
   ENV['PKG_CONFIG_PATH'] = "/opt/X11/lib/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
 end
@@ -12,9 +15,16 @@ find_header("libxml/parser.h", "/usr/include/libxml2", "/usr/local/include/libxm
 find_header("libxml/xpath.h", "/usr/include/libxml2", "/usr/local/include/libxml2")
 find_header("libxml/xpathInternals.h", "/usr/include/libxml2", "/usr/local/include/libxml2")
 
+# TODO: this is so frakkin' stupid. but I can't seem to get subdirs to compile any other way
+# the `destroy_copies` task, immediately after `compile`, will destroy these files
+FileUtils.cp_r(Dir.glob("#{LASEM_DIR}/*"), File.dirname(__FILE__))
+File.delete(File.join(File.dirname(__FILE__), "lasemrender.c"))
+
+FileUtils.cp_r(Dir.glob("#{ITEX_DIR}/*"), File.dirname(__FILE__))
+
 have_library("pangocairo-1.0")
 
-$LDFLAGS += " #{`pkg-config --static --libs glib-2.0 gdk-pixbuf-2.0 cairo pango`}"
-$CFLAGS += " #{`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 cairo pango`}"
+$LDFLAGS += " #{`pkg-config --static --libs glib-2.0 gdk-pixbuf-2.0 cairo pango`.chomp}"
+$CFLAGS += " #{`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 cairo pango`.chomp} -I#{LASEM_DIR} -I#{ITEX_DIR}"
 
 create_makefile("mathematical/mathematical")

data/ext/mathematical/lasem/itex2mml/itex2MML.h

@@ -0,0 +1,63 @@
+/*             itex2MML 1.4.5
+ *   itex2MML.h last modified 10/2/2010
+ */
+
+#ifndef ITEX2MML_H
+#define ITEX2MML_H
+
+#define ITEX2MML_VERSION "1.4.5"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  /* Step 1. Parse a buffer with itex source; return value is mathml, or 0 on failure (e.g., parse error).
+   */
+  extern char * itex2MML_parse (const char * buffer, unsigned long length);
+
+  /* Step 2. Free the string from Step 1.
+   */
+  extern void   itex2MML_free_string (char * str);
+
+
+  /* Alternatively, to filter generic source and converting embedded equations, use:
+   */
+  extern int    itex2MML_filter (const char * buffer, unsigned long length);
+
+  extern int    itex2MML_html_filter (const char * buffer, unsigned long length);
+  extern int    itex2MML_strict_html_filter (const char * buffer, unsigned long length);
+
+
+  /* To change output methods:
+   *
+   * Note: If length is 0, then buffer is treated like a string; otherwise only length bytes are written.
+   */
+  extern void (*itex2MML_write) (const char * buffer, unsigned long length); /* default writes to stdout */
+  extern void (*itex2MML_write_mathml) (const char * mathml);                /* default calls itex2MML_write(mathml,0) */
+  extern void (*itex2MML_error) (const char * msg);                          /* default writes to stderr */
+
+
+  /* Other stuff:
+   */
+  extern void   itex2MML_setup (const char * buffer, unsigned long length);
+
+  extern void   itex2MML_restart (void);
+
+  extern char * itex2MML_copy_string (const char * str);
+  extern char * itex2MML_copy_string_extra (const char * str, unsigned extra);
+  extern char * itex2MML_copy2 (const char * first, const char * second);
+  extern char * itex2MML_copy3 (const char * first, const char * second, const char * third);
+  extern char * itex2MML_copy_escaped (const char * str);
+
+  extern char * itex2MML_empty_string;
+
+  extern int    itex2MML_lineno;
+
+  extern int    itex2MML_rowposn;
+  extern int    itex2MML_displaymode;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ! ITEX2MML_H */

data/ext/mathematical/{lasemrender.c → lasem/src/lasemrender.c}

@@ -32,8 +32,9 @@
 #include <cairo-pdf.h>
 #include <cairo-svg.h>
 #include <cairo-ps.h>
+#include <../config.h>
 
-#include "itex2MML.h"
+#include <../itex2mml/itex2MML.h>
 
 static char *option_debug_domains = NULL;
 static char *option_output_file_format = NULL;
@@ -75,7 +76,7 @@ static const GOptionEntry entries[] =
 	{ NULL }
 };
 
-int mainbar(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	LsmDomDocument *document;
 	LsmDomView *view;
@@ -89,41 +90,46 @@ int mainbar(int argc, char **argv)
 	double height_pt, width_pt;
 	unsigned int height, width;
 
+	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+	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);
 
-	// if (!g_option_context_parse (context, &argc, &argv, &error))
-	// {
-	// 	g_option_context_free (context);
-	// 	g_print (_("Option parsing failed: %s\n"), error->message);
-	// 	return EXIT_FAILURE;
-	// }
+	if (!g_option_context_parse (context, &argc, &argv, &error))
+	{
+		g_option_context_free (context);
+		g_print (_("Option parsing failed: %s\n"), error->message);
+		return EXIT_FAILURE;
+	}
 
 	g_option_context_free (context);
 
-	// if (option_zoom < 0.0) {
-	// 	g_print (_("Invalid zoom value"));
-	// 	return EXIT_FAILURE;
-	// }
+	if (option_zoom < 0.0) {
+		g_print (_("Invalid zoom value"));
+		return EXIT_FAILURE;
+	}
 
 	lsm_debug_enable (option_debug_domains);
 
-	// if (option_input_filenames == NULL || g_strv_length (option_input_filenames) > 1) {
-	// 	g_print (_("One input file name is required\n"));
-	// 	return EXIT_FAILURE;
-	// }
-	// option_input_filenames = ;
+	if (option_input_filenames == NULL || g_strv_length (option_input_filenames) > 1) {
+		g_print (_("One input file name is required\n"));
+		return EXIT_FAILURE;
+	}
 
-	input_filename = "/Users/garentorikian/Downloads/lasem-ruby/foo.mml";
+	input_filename = option_input_filenames[0];
 
 	if (option_output_file_format != NULL) {
 		for (format = 0; format < G_N_ELEMENTS(file_formats) - 1; format++)
 			if (g_ascii_strcasecmp (option_output_file_format, file_formats[format]) == 0)
 				break;
 		if (FORMAT_UNKNOWN == format) {
-			g_print (_("Unknown format : %s\n"), option_output_file_format);
+			g_print (_("Unknown format: %s\n"), option_output_file_format);
 			return EXIT_FAILURE;
 		}
 	} else
@@ -180,12 +186,12 @@ int mainbar(int argc, char **argv)
 	if (document != NULL) {
 		if (lsm_debug_check (&lsm_debug_category_dom, LSM_DEBUG_LEVEL_LOG)) {
 			void *buffer;
-			int size;
+			gsize size;
 
 			lsm_dom_document_save_to_memory (document, &buffer, &size, NULL);
 
 			if (buffer != NULL) {
-				g_printf ("%*s\n", size, (char *) buffer);
+				g_printf ("%*s\n", (int) size, (char *) buffer);
 				g_free (buffer);
 			}
 		}

data/ext/mathematical/{lsmdebug.c → lasem/src/lsmdebug.c}

@@ -25,6 +25,8 @@
 #include <glib/gprintf.h>
 #include <stdlib.h>
 
+static void lsm_debug_with_level (LsmDebugCategory *category, LsmDebugLevel level, const char *format, va_list args) G_GNUC_PRINTF(3,0);
+
 struct _LsmDebugCategory {
 	char *name;
 	LsmDebugLevel level;

data/ext/mathematical/{lsmdebug.h → lasem/src/lsmdebug.h}

@@ -60,9 +60,9 @@ extern LsmDebugCategory lsm_debug_category_viewport;
 #define lsm_log_render(...)		lsm_log (&lsm_debug_category_render, __VA_ARGS__)
 #define lsm_warning_render(...)		lsm_warning (&lsm_debug_category_render, __VA_ARGS__)
 
-void 		lsm_warning 			(LsmDebugCategory *category, const char *format, ...);
-void 		lsm_debug 			(LsmDebugCategory *category, const char *format, ...);
-void 		lsm_log 			(LsmDebugCategory *category, const char *format, ...);
+void 		lsm_warning 			(LsmDebugCategory *category, const char *format, ...) G_GNUC_PRINTF(2,3);
+void 		lsm_debug 			(LsmDebugCategory *category, const char *format, ...) G_GNUC_PRINTF(2,3);
+void 		lsm_log 			(LsmDebugCategory *category, const char *format, ...) G_GNUC_PRINTF(2,3);
 
 gboolean	lsm_debug_check			(LsmDebugCategory *category, LsmDebugLevel level);
 

data/ext/mathematical/{lsmdomparser.c → lasem/src/lsmdomparser.c}

@@ -1,6 +1,6 @@
 /* Lasem
  *
- * Copyright © 2007-2009 Emmanuel Pacaud
+ * Copyright © 2007-2014 Emmanuel Pacaud
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,7 +30,7 @@
 #include <libxml/parser.h>
 #include <gio/gio.h>
 #include <string.h>
-#include "itex2MML.h"
+#include <../itex2mml/itex2MML.h>
 
 typedef enum {
 	STATE
@@ -202,7 +202,7 @@ lsm_dom_parser_warning (void *user_data, const char *msg, ...)
 	va_list args;
 
 	va_start(args, msg);
-	lsm_warning_dom (msg);
+	lsm_warning_dom ("%s", msg);
 	va_end(args);
 }
 
@@ -212,7 +212,7 @@ lsm_dom_parser_error (void *user_data, const char *msg, ...)
 	va_list args;
 
 	va_start(args, msg);
-	lsm_warning_dom (msg);
+	lsm_warning_dom ("%s", msg);
 	va_end(args);
 }
 
@@ -222,7 +222,7 @@ lsm_dom_parser_fatal_error (void *user_data, const char *msg, ...)
 	va_list args;
 
 	va_start(args, msg);
-	lsm_warning_dom (msg);
+	lsm_warning_dom ("%s", msg);
 	va_end(args);
 }
 
@@ -259,7 +259,7 @@ typedef enum {
 
 static LsmDomDocument *
 _parse_memory (LsmDomDocument *document, LsmDomNode *node,
-	       const void *buffer, int size, GError **error)
+	       const void *buffer, gsize size, GError **error)
 {
 	static LsmDomSaxParserState state;
 
@@ -269,7 +269,7 @@ _parse_memory (LsmDomDocument *document, LsmDomNode *node,
 	else
 		state.current_node = LSM_DOM_NODE (document);
 
-	if (size < 0)
+	if (size < 1)
 		size = strlen (buffer);
 
 	if (xmlSAXUserParseMemory (&sax_handler, &state, buffer, size) < 0) {
@@ -293,18 +293,18 @@ _parse_memory (LsmDomDocument *document, LsmDomNode *node,
  * @document: a #LsmDomDocument
  * @node: a #LsmDomNode
  * @buffer: a memory buffer holding xml data
- * @size: size of the xml data, in bytes
+ * @size: size of the xml data, in bytes, 0 if unknown
  * @error: an error placeholder
  *
  * Append a chunk of xml tree to an existing document. The resulting nodes will be appended to
  * @node, or to @document if @node == NULL.
  *
- * Size set to a negative value indicated an unknow xml data size.
+ * Size set to 0 indicates an unknow xml data size.
  */
 
 void
 lsm_dom_document_append_from_memory (LsmDomDocument *document, LsmDomNode *node,
-				     const void *buffer, int size, GError **error)
+				     const void *buffer, gsize size, GError **error)
 {
 	g_return_if_fail (LSM_IS_DOM_DOCUMENT (document));
 	g_return_if_fail (LSM_IS_DOM_NODE (node) || node == NULL);
@@ -313,14 +313,30 @@ lsm_dom_document_append_from_memory (LsmDomDocument *document, LsmDomNode *node,
 	_parse_memory (document, node, buffer, size, error);
 }
 
+/**
+ * lsm_dom_document_new_from_memory:
+ * @buffer: xml data
+ * @size: size of the data, in bytes, 0 if unknown
+ * @error: an error placeholder
+ *
+ * Create a new document from a memory data buffer.
+ */
+
 LsmDomDocument *
-lsm_dom_document_new_from_memory (const void *buffer, int size, GError **error)
+lsm_dom_document_new_from_memory (const void *buffer, gsize size, GError **error)
 {
 	g_return_val_if_fail (buffer != NULL, NULL);
 
-	return _parse_memory (NULL, NULL, buffer, size, error);
+	return _parse_memory (NULL, NULL, buffer, size, error); 
 }
 
+/**
+ * lsm_dom_document_new_from_file:
+ * @file: a #GFile
+ * @error: an error placeholder
+ *
+ * Create a new document from a #GFile.
+ */
 
 static LsmDomDocument *
 lsm_dom_document_new_from_file (GFile *file, GError **error)
@@ -339,6 +355,14 @@ lsm_dom_document_new_from_file (GFile *file, GError **error)
 	return document;
 }
 
+/**
+ * lsm_dom_document_new_from_path:
+ * @path: a file path
+ * @error: an error placeholder
+ *
+ * Create a new document from the data stored in @path.
+ */
+
 LsmDomDocument *
 lsm_dom_document_new_from_path (const char *path, GError **error)
 {
@@ -359,6 +383,14 @@ lsm_dom_document_new_from_path (const char *path, GError **error)
 	return document;
 }
 
+/**
+ * lsm_dom_document_new_from_url:
+ * @url: a file url
+ * @error: an error placeholder
+ *
+ * Create a new document from the data stored at @url.
+ */
+
 LsmDomDocument *
 lsm_dom_document_new_from_url (const char *url, GError **error)
 {
@@ -384,6 +416,8 @@ lsm_dom_document_new_from_url (const char *url, GError **error)
  * @document: a #LsmDomDocument
  * @stream: stream to save to
  * @error: an error placeholder
+ *
+ * Save @document as an xml representation into @stream.
  */
 
 void
@@ -395,8 +429,18 @@ lsm_dom_document_save_to_stream (LsmDomDocument *document, GOutputStream *stream
 	lsm_dom_node_write_to_stream (LSM_DOM_NODE (document), stream, error);
 }
 
+/**
+ * lsm_dom_document_save_to_memory:
+ * @document: a #LsmDomDocument
+ * @buffer: placeholder for a pointer to the resulting data buffer
+ * @size: placeholder for the data size
+ * @error: placeholder for a #GError
+ *
+ * Save @document as an xml representation into @buffer.
+ */
+
 void
-lsm_dom_document_save_to_memory	(LsmDomDocument *document, void **buffer, int *size, GError **error)
+lsm_dom_document_save_to_memory	(LsmDomDocument *document, void **buffer, gsize *size, GError **error)
 {
 	GOutputStream *stream;
 
@@ -426,6 +470,15 @@ lsm_dom_document_save_to_memory	(LsmDomDocument *document, void **buffer, int *s
 	g_object_unref (stream);
 }
 
+/**
+ * lsm_dom_document_save_to_path:
+ * @document: a #LsmDomDocument
+ * @path: a file path
+ * @error: placeholder for a #GError
+ *
+ * Save @document as an xml representation to a file, replacing the already existing file if needed.
+ */
+
 void
 lsm_dom_document_save_to_path (LsmDomDocument *document, const char *path, GError **error)
 {
@@ -443,15 +496,24 @@ lsm_dom_document_save_to_path (LsmDomDocument *document, const char *path, GErro
 	g_object_unref (file);
 }
 
+/**
+ * lsm_dom_document_save_to_url:
+ * @document: a #LsmDomDocument
+ * @url: an url
+ * @error: placeholder for a #GError
+ *
+ * Save @document as an xml representation to @url, replacing the already existing file if needed.
+ */
+
 void
-lsm_dom_document_save_to_url (LsmDomDocument *document, const char *path, GError **error)
+lsm_dom_document_save_to_url (LsmDomDocument *document, const char *url, GError **error)
 {
 	GFile *file;
 	GFileOutputStream *stream;
 
-	g_return_if_fail (path != NULL);
+	g_return_if_fail (url != NULL);
 
-	file = g_file_new_for_uri (path);
+	file = g_file_new_for_uri (url);
 	stream = g_file_create (file, G_FILE_CREATE_REPLACE_DESTINATION, NULL, error);
 	if (stream != NULL) {
 		lsm_dom_document_save_to_stream (document, G_OUTPUT_STREAM (stream), error);