RubyGems - mathematical - Versions diffs - 1.6.14 → 1.6.18 - Mend

mathematical 1.6.14 → 1.6.18

Files changed (318) hide show

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

@@ -34,9 +34,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <lsmmathml.h>
 #include <glib.h>
@@ -525,8 +522,8 @@ main (int argc, char **argv)
 	if (!check_for_compare())
 		return EXIT_FAILURE;
-#ifdef HAVE_UNISTD_H
-	if (isatty (2)) {
+#if GLIB_CHECK_VERSION(2,50,0)
+	if (g_log_writer_supports_color (STDOUT_FILENO)) {
 		fail_face = "\033[41m\033[37m\033[1m";
 		success_face = "\033[42m\033[37m\033[1m";
 		normal_face = "\033[m";
@@ -542,10 +539,6 @@ main (int argc, char **argv)
 	lasem_test_html ("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n");
 	lasem_test_html ("<body>\n");
-#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);

data/ext/mathematical/lasem/tests/meson.build ADDED Viewed

@@ -0,0 +1,39 @@
+add_test_setup (
+  'valgrind',
+  exe_wrapper:[
+    'valgrind',
+    '--tool=memcheck',
+    '--leak-check=yes',
+    '--suppressions=' + meson.project_source_root() / 'tests' / 'lasem.supp',
+    '--error-exitcode=1'
+  ],
+  timeout_multiplier:10
+)
+tests = [
+	['dom',		[]],
+	['str', 	[]],
+	['filter', 	[]],
+	['suite',	['-DSUITE_DATA_DIRECTORY="@0@/tests/data"'.format (meson.project_source_root ()),
+	                 '-DSUITE_OPTION_FILE="@0@/tests/suite.ini"'.format (meson.project_source_root ())]]
+]
+foreach t: tests
+  exe = executable (t[0], '@0@.c'.format (t[0]),
+    c_args: [t[1]],
+    link_with: lasem_library,
+    dependencies: lasem_dependencies,
+    include_directories: [library_inc])
+  test (t[0], exe)
+endforeach
+examples = [
+	['lsm-test',			'lsmtest.c']
+]
+foreach example: examples
+  exe = executable (example[0], example[1],
+    link_with: lasem_library,
+    dependencies: lasem_dependencies,
+    include_directories: [library_inc])
+endforeach

data/ext/mathematical/lasem/tests/str.c CHANGED Viewed

@@ -36,10 +36,6 @@ main (int argc, char *argv[])
 	g_test_add_func ("/str/str-consolidate", str_consolidate_test);
-#if !GLIB_CHECK_VERSION(2,36,0)
-	g_type_init ();
-#endif
 	result = g_test_run();
 	lsm_shutdown ();

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

@@ -118,10 +118,6 @@ main (int argc, char *argv[])
 	GSList *files;
 	int result;
-#if !GLIB_CHECK_VERSION(2,36,0)
-	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));

data/ext/mathematical/lasem/viewer/meson.build ADDED Viewed

@@ -0,0 +1,17 @@
+if get_option('viewer').enabled()
+demo_dependencies = [
+  lasem_dependencies,
+  dependency('gtk4', version : '>=4.9')
+]
+lasemdemo = executable(
+  'lsm-viewer',
+  'viewer.c',
+  dependencies : demo_dependencies,
+  link_with : lasem_library,
+  include_directories : [library_inc],
+  install : true
+)
+endif

data/ext/mathematical/lasem/viewer/viewer.c ADDED Viewed

@@ -0,0 +1,248 @@
+/* Lasem - SVG and Mathml library
+ *
+ * Copyright © 2010 Emmanuel Pacaud
+ * Copyright © 2023 Matthew Jakeman
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1335, USA.
+ *
+ * Author:
+ * 	Matthew Jakeman <mattjakemandev@gmail.com>
+ */
+#include <gtk/gtk.h>
+#include <lsm.h>
+#include <lsmdom.h>
+#include <cairo.h>
+#define VIEWER_TYPE_WINDOW (viewer_window_get_type())
+G_DECLARE_FINAL_TYPE (ViewerWindow, viewer_window, VIEWER, WINDOW, GtkApplicationWindow)
+struct _ViewerWindow
+{
+    GtkApplicationWindow parent_instance;
+    GtkWidget *lasem_view;
+    LsmDomDocument *document;
+    LsmDomView *view;
+    GError *error;
+};
+G_DEFINE_FINAL_TYPE (ViewerWindow, viewer_window, GTK_TYPE_APPLICATION_WINDOW)
+static GtkWidget *
+viewer_window_new (GtkApplication *app)
+{
+    return GTK_WIDGET (g_object_new (VIEWER_TYPE_WINDOW,
+                                     "application", app,
+                                     NULL));
+}
+static void
+viewer_window_finalize (GObject *object)
+{
+    ViewerWindow *self = (ViewerWindow *)object;
+    g_clear_pointer (&self->view, g_object_unref);
+    g_clear_pointer (&self->document, g_object_unref);
+    G_OBJECT_CLASS (viewer_window_parent_class)->finalize (object);
+}
+static void
+viewer_window_class_init (ViewerWindowClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    object_class->finalize = viewer_window_finalize;
+}
+static void
+display_error (ViewerWindow *window, GError *error, const char *error_text)
+{
+    char *message;
+    message = (error != NULL)
+        ? error->message
+        : "Undetermined Error";
+    GtkAlertDialog *dlg = gtk_alert_dialog_new ("%s: %s\n",
+						error_text,
+						message);
+    gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
+    g_signal_connect (dlg, "response", G_CALLBACK (gtk_window_destroy), NULL);
+    gtk_window_present (GTK_WINDOW (dlg));
+}
+static void
+viewer_window_load_from_file (ViewerWindow *window, const char *path)
+{
+    GError *error = NULL;
+    gchar *contents;
+    gsize length;
+    if (!g_file_get_contents (path, &contents, &length, &error))
+    {
+        display_error (window, error, "Could not read file");
+        if (error != NULL)
+            g_error_free (error);
+        return;
+    }
+    if (window->view)
+    {
+        g_clear_pointer (&window->view, g_object_unref);
+        g_clear_pointer (&window->document, g_object_unref);
+        g_clear_pointer (&window->error, g_object_unref);
+    }
+    window->document = lsm_dom_document_new_from_memory (contents, length, &error);
+    if (!LSM_IS_DOM_DOCUMENT (window->document))
+    {
+        display_error (window, error, "Could not read MathML/SVG");
+        if (error != NULL)
+            g_error_free (error);
+        return;
+    }
+    window->view = lsm_dom_document_create_view (window->document);
+    gtk_widget_queue_draw (window->lasem_view);
+}
+static void
+lasem_view_draw (GtkDrawingArea *drawing_area,
+                 cairo_t        *cr,
+                 int             width,
+                 int             height,
+                 ViewerWindow     *window)
+{
+    if (window->view == NULL)
+        return;
+    int margin = 25;
+    guint content_width = 0;
+    guint content_height = 0;
+    guint baseline = 0;
+    lsm_dom_view_get_size_pixels (window->view, &content_width, &content_height, &baseline);
+    float multiplier = ((float)width - (2 * margin)) / content_width;
+    lsm_dom_view_set_resolution (window->view, multiplier * LSM_DOM_VIEW_DEFAULT_RESOLUTION);
+    lsm_dom_view_render (window->view, cr, margin, margin);
+}
+static void
+viewer_on_file_open (GtkFileDialog *dialog,
+                     GAsyncResult  *result,
+                     ViewerWindow  *self)
+{
+    GFile *file;
+    GError *error = NULL;
+    file = gtk_file_dialog_open_finish (dialog, result, &error);
+    if (G_IS_FILE (file))
+    {
+        char *path;
+        path = g_file_get_path (file);
+        viewer_window_load_from_file (self, path);
+        g_free (path);
+    }
+    else
+    {
+        display_error (self, error, "File Chooser error");
+        if (error != NULL)
+            g_error_free (error);
+    }
+}
+static void
+viewer_show_file_chooser (ViewerWindow *self)
+{
+    GtkFileDialog *dialog;
+    GtkFileFilter *filter;
+    filter = gtk_file_filter_new ();
+    gtk_file_filter_add_mime_type (filter, "text/mathml");
+    gtk_file_filter_add_mime_type (filter, "image/svg+xml");
+    gtk_file_filter_set_name (filter, "MathML/SVG Files");
+    dialog = gtk_file_dialog_new ();
+    gtk_file_dialog_set_modal (dialog, TRUE);
+    gtk_file_dialog_set_default_filter (dialog, filter);
+    gtk_file_dialog_open (dialog, GTK_WINDOW (self),
+                          NULL, (GAsyncReadyCallback) viewer_on_file_open,
+                          self);
+}
+static void
+viewer_window_init (ViewerWindow *self)
+{
+    gtk_window_set_title (GTK_WINDOW (self), "Lasem Viewer");
+    gtk_window_set_default_size (GTK_WINDOW (self), 800, 600);
+    gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
+    GtkWidget *header_bar = gtk_header_bar_new ();
+    gtk_window_set_titlebar (GTK_WINDOW (self), header_bar);
+    GtkWidget *open_btn = gtk_button_new_with_label ("Open");
+    gtk_widget_add_css_class (open_btn, "suggested-action");
+    g_signal_connect_swapped (open_btn, "clicked", G_CALLBACK (viewer_show_file_chooser), self);
+    gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar), open_btn);
+    GtkWidget *lasem_view = gtk_drawing_area_new ();
+    gtk_window_set_child (GTK_WINDOW (self), lasem_view);
+    gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (lasem_view),
+                                    (GtkDrawingAreaDrawFunc) lasem_view_draw,
+                                    self, NULL);
+    self->lasem_view = lasem_view;
+}
+static void
+activate (GtkApplication* app,
+          gpointer        user_data)
+{
+    GtkWidget *window = viewer_window_new(app);
+    gtk_widget_set_visible (window, TRUE);
+}
+int
+main (int    argc,
+      char **argv)
+{
+    GtkApplication *app;
+    int status;
+    app = gtk_application_new ("org.lasem.Viewer", G_APPLICATION_DEFAULT_FLAGS);
+    g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
+    status = g_application_run (G_APPLICATION (app), argc, argv);
+    g_object_unref (app);
+    return status;
+}

data/ext/mathematical/mtex2MML/script/tag CHANGED Viewed

@@ -1,27 +1,28 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
-require 'octokit'
+require "octokit"
-`git push origin`
+%x(git push origin)
-`rm -rf build`
-`mkdir build`
+%x(rm -rf build)
+%x(mkdir build)
-Dir.chdir 'build' do
-  `cmake ..`
-  `make`
+Dir.chdir("build") do
+  %x(cmake ..)
+  %x(make)
 end
-MTEX2MML_HEADER = File.read(File.join('src', 'mtex2MML.h'))
+MTEX2MML_HEADER = File.read(File.join("src", "mtex2MML.h"))
 VERSION = MTEX2MML_HEADER.match(/MTEX2MML_VERSION\s*"(.+?)"/)[1]
 TAG_NAME = "v#{VERSION}"
 puts "Creating tag #{TAG_NAME}..."
-`git tag #{TAG_NAME}`
+%x(git tag #{TAG_NAME})
-puts 'Creating release...'
-client = Octokit::Client.new(:access_token => ENV['GITHUB_TOKEN'])
-release_response = client.create_release 'gjtorikian/mtex2MML', TAG_NAME, \
-                                        :name => VERSION
+puts "Creating release..."
+client = Octokit::Client.new(access_token: ENV["GITHUB_TOKEN"])
+_release_response = client.create_release("gjtorikian/mtex2MML", TAG_NAME, \
+  name: VERSION)
-puts 'Done!'
+puts "Done!"

data/ext/mathematical/mtex2MML/src/lexer.l CHANGED Viewed

@@ -1523,12 +1523,12 @@ int display_style = 0;
 %%
-void mtex2MML_restart ()
+void mtex2MML_restart (void)
 {
   BEGIN(INITIAL);
 }
-void mtex2MML_reset_parsing_environment()
+void mtex2MML_reset_parsing_environment(void)
 {
   parsing_environment = NO_PARSE;
   mtex2MML_eqn_src[mtex2MML_eqn_end-mtex2MML_eqn_src-yyleng]=0;
@@ -1548,7 +1548,7 @@ void mtex2MML_setup (const char * buffer, unsigned long length)
   s_mtex2MML_length = length;
 }
-int mtex2MML_capture_eqn_src()
+int mtex2MML_capture_eqn_src(void)
 {
   if (YY_START != INITIAL && YY_START != SVGENV)
     return mtex2MML_do_capture_eqn();
@@ -1556,7 +1556,7 @@ int mtex2MML_capture_eqn_src()
   return -1;
 }
-int mtex2MML_do_capture_eqn()
+int mtex2MML_do_capture_eqn(void)
 {
   if (mtex2MML_eqn_bufsize - (mtex2MML_eqn_end-mtex2MML_eqn_src+yyleng) > 1)
   {

data/ext/mathematical/mtex2MML/src/mtex2MML.h CHANGED Viewed

@@ -51,24 +51,24 @@ extern void (*mtex2MML_error) (const char * msg);                          /* de
 extern char * mtex2MML_global_parse (const char * buffer, unsigned long length, const int options, const int global_start);
-extern int mtex2MML_delimiter_type();
+extern int mtex2MML_delimiter_type(const int type);
 extern void   mtex2MML_setup (const char * buffer, unsigned long length);
-extern void   mtex2MML_restart ();
-extern void   mtex2MML_reset_parsing_environment ();
+extern void   mtex2MML_restart (void);
+extern void   mtex2MML_reset_parsing_environment (void);
-extern int mtex2MML_do_capture_eqn();
-extern int mtex2MML_capture_eqn_src();
+extern int mtex2MML_do_capture_eqn(void);
+extern int mtex2MML_capture_eqn_src(void);
-extern char * mtex2MML_output ();
+extern char * mtex2MML_output (void);
 extern char * mtex2MML_copy_string (const char * str);
 extern char * mtex2MML_copy_string_extra (const char * str, unsigned extra);
 extern char * mtex2MML_copy2 (const char * first, const char * second);
 extern char * mtex2MML_copy3 (const char * first, const char * second, const char * third);
 extern char * mtex2MML_copy_escaped (const char * str);
-extern  UT_array ** mtex2MML_get_environment_data_stack();
+extern  UT_array ** mtex2MML_get_environment_data_stack(void);
 extern char * mtex2MML_empty_string;

data/ext/mathematical/mtex2MML/src/parser.y CHANGED Viewed

@@ -36,7 +36,7 @@ yydebug = 1;
  encaseType encase = NONE;
- extern int yylex ();
+ extern int yylex (void);
  extern char * yytext;
@@ -86,7 +86,7 @@ yydebug = 1;
  #ifdef mtex2MML_CAPTURE
  static char * mtex2MML_output_string = "" ;
- char * mtex2MML_output ()
+ char * mtex2MML_output (void)
  {
    char * copy = (char *) malloc((mtex2MML_output_string ? strlen(mtex2MML_output_string) : 0) + 1);
    if (copy) {
@@ -279,7 +279,7 @@ yydebug = 1;
  }
  /* Returns a string representation of the global_label, and increments the label */
- char * mtex2MML_global_label()
+ char * mtex2MML_global_label(void)
  {
    char * n = (char *) malloc(256);
    #ifdef _WIN32
@@ -3507,7 +3507,7 @@ void format_additions(const char *buffer, const int options)
   encase = (encaseType) encase_pointer;
 }
-void free_additions()
+void free_additions(void)
 {
   utarray_free(environment_data_stack);
@@ -3553,7 +3553,7 @@ char * mtex2MML_parse (const char * buffer, unsigned long length, const int opti
   return mathml;
 }
-UT_array ** mtex2MML_get_environment_data_stack()
+UT_array ** mtex2MML_get_environment_data_stack(void)
 {
   return &environment_data_stack;
 }

data/ext/mathematical/mtex2MML/tests/clar.c CHANGED Viewed

@@ -411,7 +411,7 @@ clar_test_init(int argc, char **argv)
 }
 int
-clar_test_run()
+clar_test_run(void)
 {
 	if (_clar.argc > 1)
 		clar_parse_args(_clar.argc, _clar.argv);
@@ -426,7 +426,7 @@ clar_test_run()
 }
 void
-clar_test_shutdown()
+clar_test_shutdown(void)
 {
 	clar_print_shutdown(
 		_clar.tests_ran,

data/ext/mathematical/mtex2MML/tests/deps/trim/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "trim",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "repo": "nami-doc/trim.c",
   "license": "MIT",
   "src": ["trim.c", "trim.h"]
-}
+}

data/lib/mathematical/configuration.rb CHANGED Viewed

@@ -1,4 +1,6 @@
-require 'ruby-enum'
+# frozen_string_literal: true
+require "ruby-enum"
 class Configuration
   class Delimiters
@@ -11,9 +13,11 @@ class Configuration
     define :BRACKETS, 8
     define :ENVIRONMENTS, 16
-    def self.option_exists?(option)
-      unless Delimiters.keys.include?(option)
-        fail TypeError, "delimiter type does not exist: #{option}"
+    class << self
+      def option_exists?(option)
+        unless Delimiters.key?(option)
+          raise(TypeError, "delimiter type does not exist: #{option}")
+        end
       end
     end
   end

data/lib/mathematical/corrections.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class Mathematical
   module Corrections
     def apply_corrections(maths)
@@ -9,7 +11,7 @@ class Mathematical
     # inside itex equations. So "<" and ">" are significant.
     # To obtain a less-than or greater-than sign, you should use \lt or \gt, respectively.
     def adjust_lt_gt(maths)
-      maths.gsub(/</, '\lt').gsub(/>/, '\gt')
+      maths.gsub("<", '\lt').gsub(">", '\gt')
     end
   end
 end

data/lib/mathematical/validator.rb CHANGED Viewed

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
 class Mathematical
   module Validator
     FORMAT_TYPES = [:svg, :png, :mathml].freeze
     RENDER_TYPES = [:parse, :filter, :text_filter, :strict_filter].freeze
     def validate_config(config)
-      fail(TypeError, 'maxsize must be an integer!') unless config[:maxsize].is_a? Integer
-      fail(TypeError, 'maxsize cannot be less than 0!') if config[:maxsize] < 0
-      fail(TypeError, 'format must be a symbol!') unless config[:format].is_a? Symbol
-      fail(TypeError, "format type must be one of the following formats: #{FORMAT_TYPES.join(', ')}") unless FORMAT_TYPES.include?(config[:format])
+      raise(TypeError, "maxsize must be an integer!") unless config[:maxsize].is_a?(Integer)
+      raise(TypeError, "maxsize cannot be less than 0!") if config[:maxsize] < 0
+      raise(TypeError, "format must be a symbol!") unless config[:format].is_a?(Symbol)
+      raise(TypeError, "format type must be one of the following formats: #{FORMAT_TYPES.join(", ")}") unless FORMAT_TYPES.include?(config[:format])
       if config[:delimiter].is_a?(Symbol)
         Configuration::Delimiters.option_exists?(config[:delimiter])
       elsif config[:delimiter].is_a?(Array)
@@ -18,12 +20,12 @@ class Mathematical
           Configuration::Delimiters.option_exists?(delim)
         end
       else
-        fail(TypeError, 'delimiter type must be a valid symbol or array of symbols')
+        raise(TypeError, "delimiter type must be a valid symbol or array of symbols")
       end
     end
     def validate_content(maths)
-      if maths.is_a? Array
+      if maths.is_a?(Array)
         maths.map { |m| validate_string(m) }
       else
         validate_string(maths)
@@ -31,7 +33,8 @@ class Mathematical
     end
     def validate_string(maths)
-      fail(ArgumentError, 'input must be string!') unless maths.is_a?(String)
+      raise(ArgumentError, "input must be string!") unless maths.is_a?(String)
       maths.strip
     end
   end

data/lib/mathematical/version.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class Mathematical
-  VERSION = '1.6.14'.freeze
+  VERSION = "1.6.18"
 end