mathematical 1.6.7 → 1.6.8

data/ext/mathematical/mtex2MML/deps/uthash/utarray.h

@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stddef.h>  /* size_t */
 #include <string.h>  /* memset, etc */
 #include <stdlib.h>  /* exit */
-#include "../strdup/strdup.h"
+#include "../../src/string_dup.h"
 
 #ifndef oom
 #define oom() exit(-1)
@@ -225,7 +225,7 @@ typedef struct {
 /* last we pre-define a few icd for common utarrays of ints and strings */
 static void utarray_str_cpy(void *dst, const void *src) {
   char **_src = (char**)src, **_dst = (char**)dst;
-  *_dst = (*_src == NULL) ? NULL : strdup(*_src);
+  *_dst = (*_src == NULL) ? NULL : string_dup(*_src);
 }
 static void utarray_str_dtor(void *elt) {
   char **eltc = (char**)elt;

data/ext/mathematical/mtex2MML/src/em.c

@@ -1,7 +1,7 @@
 #include "em.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "../deps/strdup/strdup.h"
+#include "string_dup.h"
 #include "../deps/uthash/utstring.h"
 
 float mtex2MML_extract_number_from_pxstring(char * str)
@@ -39,7 +39,7 @@ char *mtex2MML_dbl2em(char *str)
   dbl *= 0.056f;
 
   utstring_printf(em, "%.3fem", dbl);
-  em_str = strdup(utstring_body(em));
+  em_str = string_dup(utstring_body(em));
 
   utstring_free(em);
 
@@ -55,7 +55,7 @@ char *mtex2MML_double_pixel(float f, char *pixel)
 
   dbl = f * 2;
   utstring_printf(em, "%.3f%s", dbl, pixel);
-  em_str = strdup(utstring_body(em));
+  em_str = string_dup(utstring_body(em));
 
   utstring_free(em);
 
@@ -73,7 +73,7 @@ char *mtex2MML_implement_skew(char *base_str, char *em_skew, char *pattern)
   utstring_printf(skew_mathml, "%s%s%s", pattern, "</mo></mover></mrow><mspace width=\"-", em_skew);
   utstring_printf(skew_mathml, "%s", "\" /></mrow><mrow></mrow></mrow>");
 
-  skew_mathml_str = strdup(utstring_body(skew_mathml));
+  skew_mathml_str = string_dup(utstring_body(skew_mathml));
 
   utstring_free(skew_mathml);
 
@@ -91,7 +91,7 @@ char *mtex2MML_root_pos_to_em(char * str)
   dbl /= 15;
 
   utstring_printf(em, "%.3fem", dbl);
-  em_str = strdup(utstring_body(em));
+  em_str = string_dup(utstring_body(em));
 
   utstring_free(em);
 

data/ext/mathematical/mtex2MML/src/environment.c

@@ -3,7 +3,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "../deps/strdup/strdup.h"
+#include "string_dup.h"
 #include "environment.h"
 #include "string_extras.h"
 
@@ -141,7 +141,7 @@ void mtex2MML_env_replacements(UT_array **environment_data_stack, encaseType **e
 
   unsigned int rowlines_stack_len = 0, eqn = 0, i = 0, insertion_idx = 0;
 
-  char *dupe_environment = strdup(environment);
+  char *dupe_environment = string_dup(environment);
   char *line = strtok(dupe_environment, "\n");
 
   /* set up the array stack */
@@ -219,7 +219,7 @@ void mtex2MML_env_replacements(UT_array **environment_data_stack, encaseType **e
             temp = tok + 2; /* skip the first part ("\[") */
             if ( (tok = strstr(temp, EM_PATTERN_END)) != NULL) {
               mtex2MML_remove_last_char(temp);
-              char *s = strdup(temp);
+              char *s = string_dup(temp);
               utarray_push_back(row_spacing_stack, &s);
               free(s);
             }
@@ -356,7 +356,7 @@ void mtex2MML_perform_replacement(UT_array **environment_data_stack, UT_array *r
 
 char *mtex2MML_vertical_pipe_extract(char *string)
 {
-  char *dupe = strdup(string);
+  char *dupe = string_dup(string);
   UT_string *columnlines, *border;
   char *previous_column = "", *attr_columnlines, *attr_border;
   unsigned int i = 0;
@@ -410,7 +410,7 @@ char *mtex2MML_vertical_pipe_extract(char *string)
     utstring_printf(columnlines, "%s", "none");
   }
 
-  attr_columnlines = strdup(utstring_body(columnlines));
+  attr_columnlines = string_dup(utstring_body(columnlines));
   free(dupe);
   utstring_free(border);
   utstring_free(columnlines);
@@ -423,7 +423,7 @@ char *mtex2MML_remove_excess_pipe_chars(char *string)
   UT_string *columnalign;
   utstring_new(columnalign);
 
-  char *dupe = strdup(string);
+  char *dupe = string_dup(string);
   char *token = strtok(dupe, " ");
   char *attr_columnalign;
 
@@ -434,7 +434,7 @@ char *mtex2MML_remove_excess_pipe_chars(char *string)
     token = strtok(NULL, " ");
   }
 
-  attr_columnalign = strdup(utstring_body(columnalign));
+  attr_columnalign = string_dup(utstring_body(columnalign));
   free(dupe);
   utstring_free(columnalign);
 
@@ -466,7 +466,7 @@ char *mtex2MML_combine_row_data(UT_array **environment_data_stack)
   /* combine the row spacing and row lines data */
   utstring_printf(row_attr_data, "%s%s\" %s\"", "rowspacing=\"", row_spacing_data, row_lines_data);
 
-  row_attr = strdup(utstring_body(row_attr_data));
+  row_attr = string_dup(utstring_body(row_attr_data));
   utarray_erase(*environment_data_stack, 0, 1);
 
   utstring_free(row_attr_data);

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

@@ -1,7 +1,7 @@
 #ifndef MTEX2MML_H
 #define MTEX2MML_H
 
-#define MTEX2MML_VERSION "1.3.0"
+#define MTEX2MML_VERSION "1.3.1"
 
 #ifdef __cplusplus
 extern "C" {

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

@@ -12,7 +12,7 @@
 #include "environment.h"
 #include "string_extras.h"
 
-#include "../deps/strdup/strdup.h"
+#include "string_dup.h"
 #include "../deps/uthash/uthash.h"
 
 struct css_colors *colors = NULL;
@@ -3459,8 +3459,8 @@ colspan: COLSPAN ATTRLIST {
 void envdata_copy(void *_dst, const void *_src)
 {
   envdata_t *dst = (envdata_t*)_dst, *src = (envdata_t*)_src;
-  dst->rowspacing = src->rowspacing ? strdup(src->rowspacing) : NULL;
-  dst->rowlines = src->rowlines ? strdup(src->rowlines) : NULL;
+  dst->rowspacing = src->rowspacing ? string_dup(src->rowspacing) : NULL;
+  dst->rowlines = src->rowlines ? string_dup(src->rowlines) : NULL;
   dst->environment_type = src->environment_type;
   utarray_new(dst->eqn_numbers, &ut_int_icd);
   utarray_concat(dst->eqn_numbers, src->eqn_numbers);

data/ext/mathematical/mtex2MML/{deps/strdup/strdup.c → src/string_dup.c}

@@ -1,21 +1,18 @@
-
 //
-// strdup.c
+// string_dup.c
 //
 // Copyright (c) 2014 Stephen Mathieson
 // MIT licensed
 //
 
-#ifndef _WIN32
-#ifndef IS_TRAVISCI
-#ifndef HAVE_STRDUP
+#ifndef HAVE_STRINGDUP
 
 #include <stdlib.h>
 #include <string.h>
-#include "strdup.h"
+#include "string_dup.h"
 
 char *
-strdup(const char *str) {
+string_dup(const char *str) {
   if (!str) return NULL;
   int len = strlen(str) + 1;
   char *buf = malloc(len);
@@ -23,6 +20,4 @@ strdup(const char *str) {
   return buf;
 }
 
-#endif /* HAVE_STRDUP */
-#endif
-#endif
+#endif /* HAVE_STRINGDUP */

data/ext/mathematical/mtex2MML/src/string_dup.h

@@ -0,0 +1,23 @@
+//
+// string_dup.h
+//
+// Copyright (c) 2014 Stephen Mathieson
+// MIT licensed
+//
+
+#ifndef HAVE_STRINGDUP
+#define HAVE_STRINGDUP
+
+/**
+ * Drop-in replacement for string_dup(3) from libc.
+ *
+ * Creates a copy of `str`.  Free when done.
+ *
+ * Returns a pointer to the newly allocated
+ * copy of `str`, or `NULL` on failure.
+ */
+
+char *
+string_dup(const char *str);
+
+#endif /* HAVE_STRINGDUP */

data/ext/mathematical/mtex2MML/src/string_extras.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "string_extras.h"
-#include "../deps/strdup/strdup.h"
+#include "string_dup.h"
 
 void mtex2MML_remove_last_char(char* str)
 {
@@ -22,7 +22,7 @@ char * mtex2MML_str_replace (char *string, const char *substr, const char *repla
   char *newstr = NULL;
   char *oldstr = NULL;
 
-  newstr = strdup(string);
+  newstr = string_dup(string);
 
   while ( ( tok = strstr( newstr, substr ) ) ) {
 

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

@@ -13,7 +13,7 @@
 #include <stdarg.h>
 #include <wchar.h>
 
-#include "../deps/strdup/strdup.h"
+#include "../src/string_dup.h"
 
 /* required for sandboxing */
 #include <sys/types.h>
@@ -494,7 +494,7 @@ void clar__fail(
 	error->error_msg = error_msg;
 
 	if (description != NULL)
-		error->description = strdup(description);
+		error->description = string_dup(description);
 
 	_clar.total_errors++;
 	_clar.test_status = CL_TEST_FAILURE;

data/ext/mathematical/mtex2MML/tests/clar/fs.h

@@ -1,4 +1,4 @@
-#include "../../deps/strdup/strdup.h"
+#include "../../src/string_dup.h"
 
 #ifdef _WIN32
 
@@ -290,7 +290,7 @@ fs_copy(const char *_source, const char *dest)
 	char *source;
 	size_t source_len;
 
-	source = strdup(_source);
+	source = string_dup(_source);
 	source_len = strlen(source);
 
 	if (source[source_len - 1] == '/')

data/ext/mathematical/mtex2MML/tests/clar/sandbox.h

@@ -1,4 +1,4 @@
-#include "../../deps/strdup/strdup.h"
+#include "../../src/string_dup.h"
 #include "../deps/mkdtemp/mkdtemp.h"
 
 static char _clar_path[4096];

data/lib/mathematical.rb

@@ -17,7 +17,7 @@ class Mathematical
     :base64 => false,
     :maxsize => 0,
     :format => :svg,
-    :delimiter => [:dollar, :double]
+    :delimiter => [:DOLLAR, :DOUBLE]
   }
 
   XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"

data/lib/mathematical/configuration.rb

@@ -4,12 +4,12 @@ class Configuration
   class Delimiters
     include Ruby::Enum
 
-    define :default, 0
-    define :dollar, 1
-    define :double, 2
-    define :parens, 4
-    define :brackets, 8
-    define :environments, 16
+    define :DEFAULT, 0
+    define :DOLLAR, 1
+    define :DOUBLE, 2
+    define :PARENS, 4
+    define :BRACKETS, 8
+    define :ENVIRONMENTS, 16
 
     def self.option_exists?(option)
       unless Delimiters.keys.include?(option)

data/lib/mathematical/version.rb

@@ -1,3 +1,3 @@
 class Mathematical
-  VERSION = '1.6.7'.freeze
+  VERSION = '1.6.8'.freeze
 end

data/test/mathematical/delimiters_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Mathematical::BasicTest < MiniTest::Test
   def test_single_dollar
-    render = Mathematical.new(:delimiter => :dollar, :format => :mathml)
+    render = Mathematical.new(:delimiter => :DOLLAR, :format => :mathml)
 
     fixture_tex = "$\\pi$"
     fixture_mml = File.read(File.join(MTEX2MML_FIXTURES_DIR, 'delimiters', 'single_dollar.html')).strip
@@ -13,7 +13,7 @@ class Mathematical::BasicTest < MiniTest::Test
   end
 
   def test_double_dollar
-    render = Mathematical.new(:delimiter => :double, :format => :mathml)
+    render = Mathematical.new(:delimiter => :DOUBLE, :format => :mathml)
 
     fixture_tex = "$$\\pi$$"
     fixture_mml = File.read(File.join(MTEX2MML_FIXTURES_DIR, 'delimiters', 'double_dollar.html')).strip
@@ -24,7 +24,7 @@ class Mathematical::BasicTest < MiniTest::Test
   end
 
   def test_parens
-    render = Mathematical.new(:delimiter => :parens, :format => :mathml)
+    render = Mathematical.new(:delimiter => :PARENS, :format => :mathml)
 
     fixture_tex = "\\(\\pi\\)"
     fixture_mml = File.read(File.join(MTEX2MML_FIXTURES_DIR, 'delimiters', 'parens.html')).strip
@@ -35,7 +35,7 @@ class Mathematical::BasicTest < MiniTest::Test
   end
 
   def test_brackets
-    render = Mathematical.new(:delimiter => :brackets, :format => :mathml)
+    render = Mathematical.new(:delimiter => :BRACKETS, :format => :mathml)
 
     fixture_tex = "\\[\\pi\\]"
     fixture_mml = File.read(File.join(MTEX2MML_FIXTURES_DIR, 'delimiters', 'brackets.html')).strip
@@ -46,7 +46,7 @@ class Mathematical::BasicTest < MiniTest::Test
   end
 
   def test_environments
-    render = Mathematical.new(:delimiter => :environments, :format => :mathml)
+    render = Mathematical.new(:delimiter => :ENVIRONMENTS, :format => :mathml)
 
     fixture_tex = "\\begin{equation}f(x)=(x+a)(x+b)\\end{equation}"
     fixture_mml = File.read(File.join(MTEX2MML_FIXTURES_DIR, 'delimiters', 'single_equation.html')).strip
@@ -57,7 +57,7 @@ class Mathematical::BasicTest < MiniTest::Test
   end
 
   def test_mixed
-    render = Mathematical.new(:delimiter => [:brackets, :double], :format => :mathml)
+    render = Mathematical.new(:delimiter => [:BRACKETS, :DOUBLE], :format => :mathml)
 
     fixture_tex = "\\[\\alpha\\] $$\\beta$$"
     fixture_mml = File.read(File.join(MTEX2MML_FIXTURES_DIR, 'delimiters', 'mixed.html')).strip

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathematical
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum
@@ -570,15 +570,15 @@ files:
 - ext/mathematical/mtex2MML/SUPPORTED.md
 - ext/mathematical/mtex2MML/appveyor.yml
 - ext/mathematical/mtex2MML/build/CMakeCache.txt
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CMakeCCompiler.cmake
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CMakeCXXCompiler.cmake
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CMakeDetermineCompilerABI_C.bin
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CMakeDetermineCompilerABI_CXX.bin
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CMakeSystem.cmake
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CompilerIdC/CMakeCCompilerId.c
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CompilerIdC/a.out
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CompilerIdCXX/CMakeCXXCompilerId.cpp
-- ext/mathematical/mtex2MML/build/CMakeFiles/3.6.1/CompilerIdCXX/a.out
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CMakeCCompiler.cmake
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CMakeCXXCompiler.cmake
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CMakeDetermineCompilerABI_C.bin
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CMakeDetermineCompilerABI_CXX.bin
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CMakeSystem.cmake
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CompilerIdC/CMakeCCompilerId.c
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CompilerIdC/a.out
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CompilerIdCXX/CMakeCXXCompilerId.cpp
+- ext/mathematical/mtex2MML/build/CMakeFiles/3.7.2/CompilerIdCXX/a.out
 - ext/mathematical/mtex2MML/build/CMakeFiles/CMakeDirectoryInformation.cmake
 - ext/mathematical/mtex2MML/build/CMakeFiles/CMakeOutput.log
 - ext/mathematical/mtex2MML/build/CMakeFiles/CMakeRuleHashes.txt
@@ -753,9 +753,6 @@ files:
 - ext/mathematical/mtex2MML/build/parser.h
 - ext/mathematical/mtex2MML/build/parser.output
 - ext/mathematical/mtex2MML/cmake/Modules/astyle.cmake
-- ext/mathematical/mtex2MML/deps/strdup/package.json
-- ext/mathematical/mtex2MML/deps/strdup/strdup.c
-- ext/mathematical/mtex2MML/deps/strdup/strdup.h
 - ext/mathematical/mtex2MML/deps/uthash/package.json
 - ext/mathematical/mtex2MML/deps/uthash/utarray.h
 - ext/mathematical/mtex2MML/deps/uthash/uthash.h
@@ -776,6 +773,8 @@ files:
 - ext/mathematical/mtex2MML/src/main.c
 - ext/mathematical/mtex2MML/src/mtex2MML.h
 - ext/mathematical/mtex2MML/src/parser.y
+- ext/mathematical/mtex2MML/src/string_dup.c
+- ext/mathematical/mtex2MML/src/string_dup.h
 - ext/mathematical/mtex2MML/src/string_extras.c
 - ext/mathematical/mtex2MML/src/string_extras.h
 - ext/mathematical/mtex2MML/src/win32-shims/unistd.h

data/ext/mathematical/mtex2MML/deps/strdup/package.json

@@ -1,12 +0,0 @@
-{
-  "name": "strdup",
-  "version": "0.0.2",
-  "repo": "clibs/strdup",
-  "description": "drop-in replacement for strdup(3) from libc",
-  "keywords": [ "string", "copy" ],
-  "license": "Expat",
-  "src": [
-    "strdup.c",
-    "strdup.h"
-  ]
-}

data/ext/mathematical/mtex2MML/deps/strdup/strdup.h

@@ -1,30 +0,0 @@
-
-//
-// strdup.h
-//
-// Copyright (c) 2014 Stephen Mathieson
-// MIT licensed
-//
-
-#ifndef _WIN32
-#ifndef IS_TRAVISCI
-#ifndef HAVE_STRDUP
-#define HAVE_STRDUP
-
-/**
- * Drop-in replacement for strdup(3) from libc.
- *
- * Creates a copy of `str`.  Free when done.
- *
- * Returns a pointer to the newly allocated
- * copy of `str`, or `NULL` on failure.
- */
-
-char *
-strdup(const char *str);
-
-#endif /* HAVE_STRDUP */
-#else
-#define strdup _strdup
-#endif
-#endif