mathematical 1.6.18 → 1.7.0

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

@@ -0,0 +1,88 @@
+/*
+Copyright (c) 2018-2022, Troy D. Hanson  https://troydhanson.github.io/uthash/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef UTSTACK_H
+#define UTSTACK_H
+
+#define UTSTACK_VERSION 2.3.0
+
+/*
+ * This file contains macros to manipulate a singly-linked list as a stack.
+ *
+ * To use utstack, your structure must have a "next" pointer.
+ *
+ * ----------------.EXAMPLE -------------------------
+ * struct item {
+ *      int id;
+ *      struct item *next;
+ * };
+ *
+ * struct item *stack = NULL;
+ *
+ * int main() {
+ *      int count;
+ *      struct item *tmp;
+ *      struct item *item = malloc(sizeof *item);
+ *      item->id = 42;
+ *      STACK_COUNT(stack, tmp, count); assert(count == 0);
+ *      STACK_PUSH(stack, item);
+ *      STACK_COUNT(stack, tmp, count); assert(count == 1);
+ *      STACK_POP(stack, item);
+ *      free(item);
+ *      STACK_COUNT(stack, tmp, count); assert(count == 0);
+ * }
+ * --------------------------------------------------
+ */
+
+#define STACK_TOP(head) (head)
+
+#define STACK_EMPTY(head) (!(head))
+
+#define STACK_PUSH(head,add)                                         \
+    STACK_PUSH2(head,add,next)
+
+#define STACK_PUSH2(head,add,next)                                   \
+do {                                                                 \
+  (add)->next = (head);                                              \
+  (head) = (add);                                                    \
+} while (0)
+
+#define STACK_POP(head,result)                                       \
+    STACK_POP2(head,result,next)
+
+#define STACK_POP2(head,result,next)                                 \
+do {                                                                 \
+  (result) = (head);                                                 \
+  (head) = (head)->next;                                             \
+} while (0)
+
+#define STACK_COUNT(head,el,counter)                                 \
+    STACK_COUNT2(head,el,counter,next)                               \
+
+#define STACK_COUNT2(head,el,counter,next)                           \
+do {                                                                 \
+  (counter) = 0;                                                     \
+  for ((el) = (head); el; (el) = (el)->next) { ++(counter); }        \
+} while (0)
+
+#endif /* UTSTACK_H */

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

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2016, Troy D. Hanson   http://troydhanson.github.com/uthash/
+Copyright (c) 2008-2022, Troy D. Hanson  https://troydhanson.github.io/uthash/
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -26,26 +26,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef UTSTRING_H
 #define UTSTRING_H
 
-#define UTSTRING_VERSION 2.0.1
-
-#ifdef __GNUC__
-#define _UNUSED_ __attribute__ ((__unused__))
-#else
-#define _UNUSED_
-#endif
+#define UTSTRING_VERSION 2.3.0
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
 
-#ifndef oom
-#define oom() exit(-1)
+#ifdef __GNUC__
+#define UTSTRING_UNUSED __attribute__((__unused__))
+#else
+#define UTSTRING_UNUSED
+#endif
+
+#ifdef oom
+#error "The name of macro 'oom' has been changed to 'utstring_oom'. Please update your code."
+#define utstring_oom() oom()
+#endif
+
+#ifndef utstring_oom
+#define utstring_oom() exit(-1)
 #endif
 
 typedef struct {
-    char *d;
-    size_t n; /* allocd size */
+    char *d;  /* pointer to allocated buffer */
+    size_t n; /* allocated capacity */
     size_t i; /* index of first unused byte */
 } UT_string;
 
@@ -54,7 +59,9 @@ do {                                                       \
   if (((s)->n - (s)->i) < (size_t)(amt)) {                 \
     char *utstring_tmp = (char*)realloc(                   \
       (s)->d, (s)->n + (amt));                             \
-    if (utstring_tmp == NULL) oom();                       \
+    if (!utstring_tmp) {                                   \
+      utstring_oom();                                      \
+    }                                                      \
     (s)->d = utstring_tmp;                                 \
     (s)->n += (amt);                                       \
   }                                                        \
@@ -81,9 +88,11 @@ do {                                                       \
 
 #define utstring_new(s)                                    \
 do {                                                       \
-   s = (UT_string*)calloc(sizeof(UT_string),1);            \
-   if (!s) oom();                                          \
-   utstring_init(s);                                       \
+  (s) = (UT_string*)malloc(sizeof(UT_string));             \
+  if (!(s)) {                                              \
+    utstring_oom();                                        \
+  }                                                        \
+  utstring_init(s);                                        \
 } while(0)
 
 #define utstring_renew(s)                                  \
@@ -117,11 +126,11 @@ do {                                                             \
   (dst)->d[(dst)->i]='\0';                                       \
 } while(0)
 
-#define utstring_len(s) ((unsigned)((s)->i))
+#define utstring_len(s) ((s)->i)
 
 #define utstring_body(s) ((s)->d)
 
-_UNUSED_ static void utstring_printf_va(UT_string *s, const char *fmt, va_list ap) {
+UTSTRING_UNUSED static void utstring_printf_va(UT_string *s, const char *fmt, va_list ap) {
    int n;
    va_list cp;
    for (;;) {
@@ -148,7 +157,7 @@ _UNUSED_ static void utstring_printf_va(UT_string *s, const char *fmt, va_list a
 static void utstring_printf(UT_string *s, const char *fmt, ...)
   __attribute__ (( format( printf, 2, 3) ));
 #endif
-_UNUSED_ static void utstring_printf(UT_string *s, const char *fmt, ...) {
+UTSTRING_UNUSED static void utstring_printf(UT_string *s, const char *fmt, ...) {
    va_list ap;
    va_start(ap,fmt);
    utstring_printf_va(s,fmt,ap);
@@ -159,7 +168,7 @@ _UNUSED_ static void utstring_printf(UT_string *s, const char *fmt, ...) {
  * begin substring search functions                                            *
  ******************************************************************************/
 /* Build KMP table from left to right. */
-_UNUSED_ static void _utstring_BuildTable(
+UTSTRING_UNUSED static void _utstring_BuildTable(
     const char *P_Needle,
     size_t P_NeedleLen,
     long *P_KMP_Table)
@@ -199,7 +208,7 @@ _UNUSED_ static void _utstring_BuildTable(
 
 
 /* Build KMP table from right to left. */
-_UNUSED_ static void _utstring_BuildTableR(
+UTSTRING_UNUSED static void _utstring_BuildTableR(
     const char *P_Needle,
     size_t P_NeedleLen,
     long *P_KMP_Table)
@@ -239,7 +248,7 @@ _UNUSED_ static void _utstring_BuildTableR(
 
 
 /* Search data from left to right. ( Multiple search mode. ) */
-_UNUSED_ static long _utstring_find(
+UTSTRING_UNUSED static long _utstring_find(
     const char *P_Haystack,
     size_t P_HaystackLen,
     const char *P_Needle,
@@ -272,7 +281,7 @@ _UNUSED_ static long _utstring_find(
 
 
 /* Search data from right to left. ( Multiple search mode. ) */
-_UNUSED_ static long _utstring_findR(
+UTSTRING_UNUSED static long _utstring_findR(
     const char *P_Haystack,
     size_t P_HaystackLen,
     const char *P_Needle,
@@ -306,7 +315,7 @@ _UNUSED_ static long _utstring_findR(
 
 
 /* Search data from left to right. ( One time search mode. ) */
-_UNUSED_ static long utstring_find(
+UTSTRING_UNUSED static long utstring_find(
     UT_string *s,
     long P_StartPosition,   /* Start from 0. -1 means last position. */
     const char *P_Needle,
@@ -352,7 +361,7 @@ _UNUSED_ static long utstring_find(
 
 
 /* Search data from right to left. ( One time search mode. ) */
-_UNUSED_ static long utstring_findR(
+UTSTRING_UNUSED static long utstring_findR(
     UT_string *s,
     long P_StartPosition,   /* Start from 0. -1 means last position. */
     const char *P_Needle,

data/ext/mathematical/mtex2MML/script/cibuild

@@ -1,58 +1,15 @@
-#!/bin/sh
+#!/bin/bash
+
+set -e
 
 mkdir -p build
-cd build
+cd build || exit 1
 cmake ..
 make
 ctest -V
 
-echo 'inline'
-echo '\sin y'     | ./mtex2MML --inline | grep "display='inline'" || exit 1
-echo ''
-
-echo 'display'
-echo '\sin y'     | ./mtex2MML --display | grep "display='block'" || exit 1
-echo ''
-
-echo 'inline print-mtex'
-echo '\sin y'     | ./mtex2MML --inline --print-mtex | grep '$\\sin y\$'|| exit 1
-echo ''
-
-echo 'display print-mtex'
-echo '\sin y'     | ./mtex2MML --display --print-mtex | grep '$$\\sin y\$\$' || exit 1
-echo ''
-
-echo 'dollar'
-echo '$\sin y$'   | ./mtex2MML | grep "display='inline'" || exit 1
-
-echo 'double dollar'
-echo '$$\sin y$$' | ./mtex2MML | grep "display='block'" || exit 1
-
-echo 'parens'
-echo '\(\sin y\)' | ./mtex2MML | grep "display='inline'" || exit 1
-
-echo 'brackets'
-echo '\[\sin y\]' | ./mtex2MML | grep "display='block'" || exit 1
-
-echo 'dollar use-dollar'
-echo '$\sin y$'   | ./mtex2MML --use-dollar | grep "display='inline'" || exit 1
-
-echo 'double dollar use-double'
-echo '$$\sin y$$' | ./mtex2MML --use-double | grep "display='block'" || exit 1
-
-echo 'parens use-parens'
-echo '\(\sin y\)' | ./mtex2MML --use-parens | grep "display='inline'" || exit 1
-
-echo 'brackets use-brackets'
-echo '\[\sin y\]' | ./mtex2MML --use-brackets | grep "display='block'" || exit 1
-
-echo 'env use-env'
-echo '\\begin{align}3x + 9y &=  -12\\end{align}' | ./mtex2MML --use-env | grep "display='block'" || exit 1
-
-echo 'DONE with command check'
-
 if [ -n "$CI" ]; then
-  if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+  if [[ "$(uname -s)" == "Linux" ]] ; then
     make memcheck
   fi
 fi

data/ext/mathematical/mtex2MML/script/test-quick

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+echo 'inline'
+echo '\sin y'     | ./mtex2MML --inline | grep "display='inline'" || exit 1
+echo ''
+
+echo 'display'
+echo '\sin y'     | ./mtex2MML --display | grep "display='block'" || exit 1
+echo ''
+
+echo 'inline print-mtex'
+echo '\sin y'     | ./mtex2MML --inline --print-mtex | grep '$\\sin y\$'|| exit 1
+echo ''
+
+echo 'display print-mtex'
+echo '\sin y'     | ./mtex2MML --display --print-mtex | grep '$$\\sin y\$\$' || exit 1
+echo ''
+
+echo 'dollar'
+echo '$\sin y$'   | ./mtex2MML | grep "display='inline'" || exit 1
+
+echo 'double dollar'
+echo '$$\sin y$$' | ./mtex2MML | grep "display='block'" || exit 1
+
+echo 'parens'
+echo '\(\sin y\)' | ./mtex2MML | grep "display='inline'" || exit 1
+
+echo 'brackets'
+echo '\[\sin y\]' | ./mtex2MML | grep "display='block'" || exit 1
+
+echo 'dollar use-dollar'
+echo '$\sin y$'   | ./mtex2MML --use-dollar | grep "display='inline'" || exit 1
+
+echo 'double dollar use-double'
+echo '$$\sin y$$' | ./mtex2MML --use-double | grep "display='block'" || exit 1
+
+echo 'parens use-parens'
+echo '\(\sin y\)' | ./mtex2MML --use-parens | grep "display='inline'" || exit 1
+
+echo 'brackets use-brackets'
+echo '\[\sin y\]' | ./mtex2MML --use-brackets | grep "display='block'" || exit 1
+
+echo 'env use-env'
+echo '\\begin{align}3x + 9y &=  -12\\end{align}' | ./mtex2MML --use-env | grep "display='block'" || exit 1
+
+echo 'DONE with command check'

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

@@ -93,6 +93,10 @@ int mtex2MML_identify_eqn_number(envType environment_type, char *line)
   }
 }
 
+static int div_ceil(int a, int b) {
+   return (a/b) + !!(a%b);
+}
+
 void mtex2MML_env_replacements(UT_array **environment_data_stack, encaseType **encase, const char *environment)
 {
   /* TODO: these next detections are gross, but substack and cases are rather special */
@@ -254,7 +258,7 @@ void mtex2MML_env_replacements(UT_array **environment_data_stack, encaseType **e
          rather than a label per row. in that case, jam a label
          in the middle. */
       if (environment_type == ENV_GATHER || environment_type == ENV_MULTLINE) {
-        insertion_idx = ceil(utarray_len(eqn_number_stack) / 2);
+        insertion_idx = div_ceil(utarray_len(eqn_number_stack), 2);
         eqn = 1;
         utarray_insert(eqn_number_stack, &eqn, insertion_idx);
         utarray_pop_back(eqn_number_stack);