rmultimarkdown 6.4.0.4 → 6.7.0.0

data/ext/mmd/argtable3.h

@@ -0,0 +1,273 @@
+/*******************************************************************************
+ * argtable3: Declares the main interfaces of the library
+ *
+ * This file is part of the argtable3 library.
+ *
+ * Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+ * <sheitmann@users.sourceforge.net>
+ * 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.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of STEWART HEITMANN nor the  names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * 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 STEWART HEITMANN 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 ARGTABLE3
+#define ARGTABLE3
+
+#include <stdio.h> /* FILE */
+#include <time.h>  /* struct tm */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ARG_REX_ICASE 1
+#define ARG_DSTR_SIZE 200
+#define ARG_CMD_NAME_LEN 100
+#define ARG_CMD_DESCRIPTION_LEN 256
+
+#ifndef ARG_REPLACE_GETOPT
+#define ARG_REPLACE_GETOPT 1 /* use the embedded getopt as the system getopt(3) */
+#endif /* ARG_REPLACE_GETOPT */
+
+/* bit masks for arg_hdr.flag */
+enum { ARG_TERMINATOR = 0x1, ARG_HASVALUE = 0x2, ARG_HASOPTVALUE = 0x4 };
+
+#if defined(_WIN32)
+#if defined(argtable3_EXPORTS)
+#define ARG_EXTERN __declspec(dllexport)
+#elif defined(argtable3_IMPORTS)
+#define ARG_EXTERN __declspec(dllimport)
+#else
+#define ARG_EXTERN
+#endif
+#else
+#define ARG_EXTERN
+#endif
+
+typedef struct _internal_arg_dstr * arg_dstr_t;
+typedef void * arg_cmd_itr_t;
+
+typedef void(arg_resetfn)(void * parent);
+typedef int(arg_scanfn)(void * parent, const char * argval);
+typedef int(arg_checkfn)(void * parent);
+typedef void(arg_errorfn)(void * parent, arg_dstr_t ds, int error, const char * argval, const char * progname);
+typedef void(arg_dstr_freefn)(char * buf);
+typedef int(arg_cmdfn)(int argc, char * argv[], arg_dstr_t res);
+typedef int(arg_comparefn)(const void * k1, const void * k2);
+
+/*
+ * The arg_hdr struct defines properties that are common to all arg_xxx structs.
+ * The argtable library requires each arg_xxx struct to have an arg_hdr
+ * struct as its first data member.
+ * The argtable library functions then use this data to identify the
+ * properties of the command line option, such as its option tags,
+ * datatype string, and glossary strings, and so on.
+ * Moreover, the arg_hdr struct contains pointers to custom functions that
+ * are provided by each arg_xxx struct which perform the tasks of parsing
+ * that particular arg_xxx arguments, performing post-parse checks, and
+ * reporting errors.
+ * These functions are private to the individual arg_xxx source code
+ * and are the pointer to them are initiliased by that arg_xxx struct's
+ * constructor function. The user could alter them after construction
+ * if desired, but the original intention is for them to be set by the
+ * constructor and left unaltered.
+ */
+typedef struct arg_hdr {
+	char flag;             /* Modifier flags: ARG_TERMINATOR, ARG_HASVALUE. */
+	const char * shortopts; /* String defining the short options */
+	const char * longopts; /* String defiing the long options */
+	const char * datatype; /* Description of the argument data type */
+	const char * glossary; /* Description of the option as shown by arg_print_glossary function */
+	int mincount;          /* Minimum number of occurences of this option accepted */
+	int maxcount;          /* Maximum number of occurences if this option accepted */
+	void * parent;         /* Pointer to parent arg_xxx struct */
+	arg_resetfn * resetfn; /* Pointer to parent arg_xxx reset function */
+	arg_scanfn * scanfn;   /* Pointer to parent arg_xxx scan function */
+	arg_checkfn * checkfn; /* Pointer to parent arg_xxx check function */
+	arg_errorfn * errorfn; /* Pointer to parent arg_xxx error function */
+	void * priv;           /* Pointer to private header data for use by arg_xxx functions */
+} arg_hdr_t;
+
+typedef struct arg_rem {
+	struct arg_hdr hdr; /* The mandatory argtable header struct */
+} arg_rem_t;
+
+typedef struct arg_lit {
+	struct arg_hdr hdr; /* The mandatory argtable header struct */
+	int count;          /* Number of matching command line args */
+} arg_lit_t;
+
+typedef struct arg_int {
+	struct arg_hdr hdr; /* The mandatory argtable header struct */
+	int count;          /* Number of matching command line args */
+	int * ival;         /* Array of parsed argument values */
+} arg_int_t;
+
+typedef struct arg_dbl {
+	struct arg_hdr hdr; /* The mandatory argtable header struct */
+	int count;          /* Number of matching command line args */
+	double * dval;      /* Array of parsed argument values */
+} arg_dbl_t;
+
+typedef struct arg_str {
+	struct arg_hdr hdr; /* The mandatory argtable header struct */
+	int count;          /* Number of matching command line args */
+	const char ** sval; /* Array of parsed argument values */
+} arg_str_t;
+
+typedef struct arg_rex {
+	struct arg_hdr hdr; /* The mandatory argtable header struct */
+	int count;          /* Number of matching command line args */
+	const char ** sval; /* Array of parsed argument values */
+} arg_rex_t;
+
+typedef struct arg_file {
+	struct arg_hdr hdr;     /* The mandatory argtable header struct */
+	int count;              /* Number of matching command line args*/
+	const char ** filename; /* Array of parsed filenames  (eg: /home/foo.bar) */
+	const char ** basename; /* Array of parsed basenames  (eg: foo.bar) */
+	const char ** extension; /* Array of parsed extensions (eg: .bar) */
+} arg_file_t;
+
+typedef struct arg_date {
+	struct arg_hdr hdr; /* The mandatory argtable header struct */
+	const char * format; /* strptime format string used to parse the date */
+	int count;          /* Number of matching command line args */
+	struct tm * tmval;  /* Array of parsed time values */
+} arg_date_t;
+
+enum { ARG_ELIMIT = 1, ARG_EMALLOC, ARG_ENOMATCH, ARG_ELONGOPT, ARG_EMISSARG };
+typedef struct arg_end {
+	struct arg_hdr hdr;  /* The mandatory argtable header struct */
+	int count;           /* Number of errors encountered */
+	int * error;         /* Array of error codes */
+	void ** parent;      /* Array of pointers to offending arg_xxx struct */
+	const char ** argval; /* Array of pointers to offending argv[] string */
+} arg_end_t;
+
+typedef struct arg_cmd_info {
+	char name[ARG_CMD_NAME_LEN];
+	char description[ARG_CMD_DESCRIPTION_LEN];
+	arg_cmdfn * proc;
+} arg_cmd_info_t;
+
+/**** arg_xxx constructor functions *********************************/
+
+ARG_EXTERN struct arg_rem * arg_rem(const char * datatype, const char * glossary);
+
+ARG_EXTERN struct arg_lit * arg_lit0(const char * shortopts, const char * longopts, const char * glossary);
+ARG_EXTERN struct arg_lit * arg_lit1(const char * shortopts, const char * longopts, const char * glossary);
+ARG_EXTERN struct arg_lit * arg_litn(const char * shortopts, const char * longopts, int mincount, int maxcount, const char * glossary);
+
+ARG_EXTERN struct arg_int * arg_int0(const char * shortopts, const char * longopts, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_int * arg_int1(const char * shortopts, const char * longopts, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_int * arg_intn(const char * shortopts, const char * longopts, const char * datatype, int mincount, int maxcount, const char * glossary);
+
+ARG_EXTERN struct arg_dbl * arg_dbl0(const char * shortopts, const char * longopts, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_dbl * arg_dbl1(const char * shortopts, const char * longopts, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_dbl * arg_dbln(const char * shortopts, const char * longopts, const char * datatype, int mincount, int maxcount, const char * glossary);
+
+ARG_EXTERN struct arg_str * arg_str0(const char * shortopts, const char * longopts, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_str * arg_str1(const char * shortopts, const char * longopts, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_str * arg_strn(const char * shortopts, const char * longopts, const char * datatype, int mincount, int maxcount, const char * glossary);
+
+ARG_EXTERN struct arg_rex * arg_rex0(const char * shortopts, const char * longopts, const char * pattern, const char * datatype, int flags, const char * glossary);
+ARG_EXTERN struct arg_rex * arg_rex1(const char * shortopts, const char * longopts, const char * pattern, const char * datatype, int flags, const char * glossary);
+ARG_EXTERN struct arg_rex * arg_rexn(const char * shortopts,
+									 const char * longopts,
+									 const char * pattern,
+									 const char * datatype,
+									 int mincount,
+									 int maxcount,
+									 int flags,
+									 const char * glossary);
+
+ARG_EXTERN struct arg_file * arg_file0(const char * shortopts, const char * longopts, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_file * arg_file1(const char * shortopts, const char * longopts, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_file * arg_filen(const char * shortopts, const char * longopts, const char * datatype, int mincount, int maxcount, const char * glossary);
+
+ARG_EXTERN struct arg_date * arg_date0(const char * shortopts, const char * longopts, const char * format, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_date * arg_date1(const char * shortopts, const char * longopts, const char * format, const char * datatype, const char * glossary);
+ARG_EXTERN struct arg_date * arg_daten(const char * shortopts, const char * longopts, const char * format, const char * datatype, int mincount, int maxcount, const char * glossary);
+
+ARG_EXTERN struct arg_end * arg_end(int maxerrors);
+
+#define ARG_DSTR_STATIC ((arg_dstr_freefn*)0)
+#define ARG_DSTR_VOLATILE ((arg_dstr_freefn*)1)
+#define ARG_DSTR_DYNAMIC ((arg_dstr_freefn*)3)
+
+/**** other functions *******************************************/
+ARG_EXTERN int arg_nullcheck(void ** argtable);
+ARG_EXTERN int arg_parse(int argc, char ** argv, void ** argtable);
+ARG_EXTERN void arg_print_option(FILE * fp, const char * shortopts, const char * longopts, const char * datatype, const char * suffix);
+ARG_EXTERN void arg_print_syntax(FILE * fp, void ** argtable, const char * suffix);
+ARG_EXTERN void arg_print_syntaxv(FILE * fp, void ** argtable, const char * suffix);
+ARG_EXTERN void arg_print_glossary(FILE * fp, void ** argtable, const char * format);
+ARG_EXTERN void arg_print_glossary_gnu(FILE * fp, void ** argtable);
+ARG_EXTERN void arg_print_errors(FILE * fp, struct arg_end * end, const char * progname);
+ARG_EXTERN void arg_print_option_ds(arg_dstr_t ds, const char * shortopts, const char * longopts, const char * datatype, const char * suffix);
+ARG_EXTERN void arg_print_syntax_ds(arg_dstr_t ds, void ** argtable, const char * suffix);
+ARG_EXTERN void arg_print_syntaxv_ds(arg_dstr_t ds, void ** argtable, const char * suffix);
+ARG_EXTERN void arg_print_glossary_ds(arg_dstr_t ds, void ** argtable, const char * format);
+ARG_EXTERN void arg_print_glossary_gnu_ds(arg_dstr_t ds, void ** argtable);
+ARG_EXTERN void arg_print_errors_ds(arg_dstr_t ds, struct arg_end * end, const char * progname);
+ARG_EXTERN void arg_freetable(void ** argtable, size_t n);
+
+ARG_EXTERN arg_dstr_t arg_dstr_create(void);
+ARG_EXTERN void arg_dstr_destroy(arg_dstr_t ds);
+ARG_EXTERN void arg_dstr_reset(arg_dstr_t ds);
+ARG_EXTERN void arg_dstr_free(arg_dstr_t ds);
+ARG_EXTERN void arg_dstr_set(arg_dstr_t ds, char * str, arg_dstr_freefn * free_proc);
+ARG_EXTERN void arg_dstr_cat(arg_dstr_t ds, const char * str);
+ARG_EXTERN void arg_dstr_catc(arg_dstr_t ds, char c);
+ARG_EXTERN void arg_dstr_catf(arg_dstr_t ds, const char * fmt, ...);
+ARG_EXTERN char * arg_dstr_cstr(arg_dstr_t ds);
+
+ARG_EXTERN void arg_cmd_init(void);
+ARG_EXTERN void arg_cmd_uninit(void);
+ARG_EXTERN void arg_cmd_register(const char * name, arg_cmdfn * proc, const char * description);
+ARG_EXTERN void arg_cmd_unregister(const char * name);
+ARG_EXTERN int arg_cmd_dispatch(const char * name, int argc, char * argv[], arg_dstr_t res);
+ARG_EXTERN unsigned int arg_cmd_count(void);
+ARG_EXTERN arg_cmd_info_t * arg_cmd_info(const char * name);
+ARG_EXTERN arg_cmd_itr_t arg_cmd_itr_create(void);
+ARG_EXTERN void arg_cmd_itr_destroy(arg_cmd_itr_t itr);
+ARG_EXTERN int arg_cmd_itr_advance(arg_cmd_itr_t itr);
+ARG_EXTERN char * arg_cmd_itr_key(arg_cmd_itr_t itr);
+ARG_EXTERN arg_cmd_info_t * arg_cmd_itr_value(arg_cmd_itr_t itr);
+ARG_EXTERN int arg_cmd_itr_search(arg_cmd_itr_t itr, void * k);
+ARG_EXTERN void arg_mgsort(void * data, int size, int esize, int i, int k, arg_comparefn * comparefn);
+ARG_EXTERN void arg_make_get_help_msg(arg_dstr_t res);
+ARG_EXTERN void arg_make_help_msg(arg_dstr_t ds, char * cmd_name, void ** argtable);
+ARG_EXTERN void arg_make_syntax_err_msg(arg_dstr_t ds, void ** argtable, struct arg_end * end);
+ARG_EXTERN int arg_make_syntax_err_help_msg(arg_dstr_t ds, char * name, int help, int nerrors, void ** argtable, struct arg_end * end, int * exitcode);
+ARG_EXTERN void arg_set_module_name(const char * name);
+ARG_EXTERN void arg_set_module_version(int major, int minor, int patch, const char * tag);
+
+/**** deprecated functions, for back-compatibility only ********/
+ARG_EXTERN void arg_free(void ** argtable);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/ext/mmd/beamer.c

@@ -56,6 +56,7 @@
 #include "latex.h"
 #include "beamer.h"
 #include "parser.h"
+#include "stack.h"
 
 #define print(x) d_string_append(out, x)
 #define print_const(x) d_string_append_c_array(out, x, sizeof(x) - 1)
@@ -178,6 +179,7 @@ void mmd_export_token_beamer(DString * out, const char * source, token * t, scra
 					// Raw source
 					if (raw_filter_text_matches(temp_char, FORMAT_BEAMER)) {
 						switch (t->child->tail->type) {
+							case CODE_FENCE_LINE:
 							case LINE_FENCE_BACKTICK_3:
 							case LINE_FENCE_BACKTICK_4:
 							case LINE_FENCE_BACKTICK_5:
@@ -192,7 +194,10 @@ void mmd_export_token_beamer(DString * out, const char * source, token * t, scra
 							d_string_append_c_array(out, &source[t->child->next->start], temp_token->start - t->child->next->start);
 							scratch->padded = 1;
 						} else {
-							d_string_append_c_array(out, &source[t->child->start + t->child->len], t->start + t->len - t->child->next->start);
+							if (t->child->next) {
+								d_string_append_c_array(out, &source[t->child->start + t->child->len], t->start + t->len - t->child->next->start);
+							}
+
 							scratch->padded = 0;
 						}
 					}
@@ -365,6 +370,12 @@ void mmd_end_complete_beamer(DString * out, const char * source, scratch_pad * s
 
 	if (m) {
 		printf("\\input{%s}\n\n", m->value);
+	} else {
+		m = extract_meta_from_stack(scratch, "latexconfig");
+
+		if (m) {
+			printf("\\input{mmd6-%s-footer}\n", m->value);
+		}
 	}
 
 	print_const("\\end{document}");

data/ext/mmd/char.c

@@ -1,6 +1,6 @@
 /**
 
-	MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more.
+	libCoreUtilities -- Reusable component libraries
 
 	@file char.c
 
@@ -10,27 +10,16 @@
 	@author	Fletcher T. Penney
 	@bug
 
-**/
+ **/
 
 /*
 
-	Copyright © 2016 - 2017 Fletcher T. Penney.
+	Copyright © 2016-2020 Fletcher T. Penney.
 
 
-	The `MultiMarkdown 6` project is released under the MIT License..
+	MIT License
 
-	GLibFacade.c and GLibFacade.h are from the MultiMarkdown v4 project:
-
-		https://github.com/fletcher/MultiMarkdown-4/
-
-	MMD 4 is released under both the MIT License and GPL.
-
-
-	CuTest is released under the zlib/libpng license. See CuTest.c for the text
-	of the license.
-
-
-	## The MIT License ##
+	Copyright (c) 2016-2020 Fletcher T. Penney
 
 	Permission is hereby granted, free of charge, to any person obtaining a copy
 	of this software and associated documentation files (the "Software"), to deal
@@ -39,34 +28,40 @@
 	copies of the Software, and to permit persons to whom the Software is
 	furnished to do so, subject to the following conditions:
 
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
+	The above copyright notice and this permission notice shall be included in all
+	copies or substantial portions of the Software.
 
 	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+	SOFTWARE.
 
 */
 
+
 #include <stdlib.h>
 
 #include "char.h"
 
+#ifdef TEST
+	#include "CuTest.h"
+#endif
+
 
 /// Create this lookup table using char_lookup.c
 static unsigned char smart_char_type[256] = {
 	16,  0,  0,  0,  0,  0,  0,  0,  0,  1, 16,  0,  0, 16,  0,  0,
 	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+	1,  2,  2,  2,  2,  2,  2, 34,  2,  2,  2,  2,  2, 34,  2,  2,
 	8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  2,  2,  2,  2,  2,  2,
-	2,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-	4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  2,
-	2,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-	4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  0,
+	2, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+	68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,  2,  2,  2,  2,  2,
+	2, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132,
+	132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132,  2,  2,  2,  2,  0,
+	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -74,7 +69,6 @@ static unsigned char smart_char_type[256] = {
 	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
 };
 
 
@@ -86,6 +80,8 @@ static int CHAR_WHITESPACE_OR_LINE_ENDING = CHAR_WHITESPACE | CHAR_LINE_ENDING;
 
 static int CHAR_WHITESPACE_OR_LINE_ENDING_OR_PUNCTUATION = CHAR_WHITESPACE | CHAR_LINE_ENDING | CHAR_PUNCTUATION;
 
+static int CHAR_ALPHA_OR_INTRAWORD = CHAR_ALPHA | CHAR_INTRAWORD;
+
 
 // Is character whitespace?
 int char_is_whitespace(char c) {
@@ -111,7 +107,7 @@ int char_is_windows_line_ending(char * c) {
 }
 
 #ifdef TEST
-void Test_char_is_windows_line_ending(CuTest* tc) {
+void Test_char_is_windows_line_ending(CuTest * tc) {
 	char * test = "\r\n\n";
 
 	CuAssertIntEquals(tc, 1, char_is_windows_line_ending(&test[0]));
@@ -140,6 +136,21 @@ int char_is_alphanumeric(char c) {
 	return smart_char_type[(unsigned char) c] & CHAR_ALPHANUMERIC;
 }
 
+// Is character lower case?
+int char_is_lower_case(char c) {
+	return smart_char_type[(unsigned char) c] & CHAR_LOWER;
+}
+
+// Is character upper case?
+int char_is_upper_case(char c) {
+	return smart_char_type[(unsigned char) c] & CHAR_UPPER;
+}
+
+// Is character a valid intraword character?
+int char_is_intraword(char c) {
+	return smart_char_type[(unsigned char) c] & CHAR_ALPHA_OR_INTRAWORD;
+}
+
 // Is character either whitespace or line ending?
 int char_is_whitespace_or_line_ending(char c) {
 	return smart_char_type[(unsigned char) c] & CHAR_WHITESPACE_OR_LINE_ENDING;
@@ -154,3 +165,85 @@ int char_is_whitespace_or_punctuation(char c) {
 int char_is_whitespace_or_line_ending_or_punctuation(char c) {
 	return smart_char_type[(unsigned char) c] & CHAR_WHITESPACE_OR_LINE_ENDING_OR_PUNCTUATION;
 }
+
+// From https://www.cl.cam.ac.uk/~mgk25/ucs/utf8_check.c
+
+/*
+ * The utf8_check() function scans the '\0'-terminated string starting
+ * at s. It returns a pointer to the first byte of the first malformed
+ * or overlong UTF-8 sequence found, or NULL if the string contains
+ * only correct UTF-8. It also spots UTF-8 sequences that could cause
+ * trouble if converted to UTF-16, namely surrogate characters
+ * (U+D800..U+DFFF) and non-Unicode positions (U+FFFE..U+FFFF). This
+ * routine is very likely to find a malformed sequence if the input
+ * uses any other encoding than UTF-8. It therefore can be used as a
+ * very effective heuristic for distinguishing between UTF-8 and other
+ * encodings.
+ *
+ * I wrote this code mainly as a specification of functionality; there
+ * are no doubt performance optimizations possible for certain CPUs.
+ *
+ * Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> -- 2005-03-30
+ * License: http://www.cl.cam.ac.uk/~mgk25/short-license.html
+ */
+
+// Is the string valid UTF-8? (Returns pointer to first sequence)
+unsigned char * utf8_check(unsigned char * s) {
+	while (*s) {
+		if (*s < 0x80)
+			/* 0xxxxxxx */
+		{
+			s++;
+		} else if ((s[0] & 0xe0) == 0xc0) {
+			/* 110XXXXx 10xxxxxx */
+			if ((s[1] & 0xc0) != 0x80 ||
+					(s[0] & 0xfe) == 0xc0) {                      /* overlong? */
+				return s;
+			} else {
+				s += 2;
+			}
+		} else if ((s[0] & 0xf0) == 0xe0) {
+			/* 1110XXXX 10Xxxxxx 10xxxxxx */
+			if ((s[1] & 0xc0) != 0x80 ||
+					(s[2] & 0xc0) != 0x80 ||
+					(s[0] == 0xe0 && (s[1] & 0xe0) == 0x80) ||    /* overlong? */
+					(s[0] == 0xed && (s[1] & 0xe0) == 0xa0) ||    /* surrogate? */
+					(s[0] == 0xef && s[1] == 0xbf &&
+					 (s[2] & 0xfe) == 0xbe)) {                    /* U+FFFE or U+FFFF? */
+				return s;
+			} else {
+				s += 3;
+			}
+		} else if ((s[0] & 0xf8) == 0xf0) {
+			/* 11110XXX 10XXxxxx 10xxxxxx 10xxxxxx */
+			if ((s[1] & 0xc0) != 0x80 ||
+					(s[2] & 0xc0) != 0x80 ||
+					(s[3] & 0xc0) != 0x80 ||
+					(s[0] == 0xf0 && (s[1] & 0xf0) == 0x80) ||    /* overlong? */
+					(s[0] == 0xf4 && s[1] > 0x8f) || s[0] > 0xf4) { /* > U+10FFFF? */
+				return s;
+			} else {
+				s += 4;
+			}
+		} else {
+			return s;
+		}
+	}
+
+	return NULL;
+}
+
+
+#ifdef TEST
+void Test_utf8_check(CuTest * tc) {
+	unsigned char * check;
+
+	CuAssertPtrEquals(tc, NULL, utf8_check((unsigned char *) "This is plain ASCII"));
+	CuAssertPtrEquals(tc, NULL, utf8_check((unsigned char *) "This ü UTF-8"));
+	CuAssertPtrEquals(tc, NULL, utf8_check((unsigned char *) "This 👪"));
+
+	CuAssertPtrEquals(tc, NULL, utf8_check((unsigned char *) "Ḽơᶉëᶆ ȋṕšᶙṁ ḍỡḽǭᵳ ʂǐť ӓṁệẗ, ĉṓɲṩḙċťᶒțûɾ ấɖḯƥĭṩčįɳġ ḝłįʈ, șếᶑ ᶁⱺ ẽḭŭŝḿꝋď ṫĕᶆᶈṓɍ ỉñḉīḑȋᵭṵńť ṷŧ ḹẩḇőꝛế éȶ đꝍꞎôꝛȇ ᵯáꞡᶇā ąⱡîɋṹẵ"));
+
+	CuAssertPtrNotNull(tc, utf8_check((unsigned char *) "\xe2\x28\xa1"));
+}
+#endif

data/ext/mmd/char.h

@@ -1,6 +1,6 @@
 /**
 
-	MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more.
+	libCoreUtilities -- Reusable component libraries
 
 	@file char.h
 
@@ -10,27 +10,16 @@
 	@author	Fletcher T. Penney
 	@bug
 
-**/
+ **/
 
 /*
 
-	Copyright © 2016 - 2017 Fletcher T. Penney.
+	Copyright © 2016-2020 Fletcher T. Penney.
 
 
-	The `MultiMarkdown 6` project is released under the MIT License..
+	MIT License
 
-	GLibFacade.c and GLibFacade.h are from the MultiMarkdown v4 project:
-
-		https://github.com/fletcher/MultiMarkdown-4/
-
-	MMD 4 is released under both the MIT License and GPL.
-
-
-	CuTest is released under the zlib/libpng license. See CuTest.c for the text
-	of the license.
-
-
-	## The MIT License ##
+	Copyright (c) 2016-2020 Fletcher T. Penney
 
 	Permission is hereby granted, free of charge, to any person obtaining a copy
 	of this software and associated documentation files (the "Software"), to deal
@@ -39,16 +28,16 @@
 	copies of the Software, and to permit persons to whom the Software is
 	furnished to do so, subject to the following conditions:
 
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
+	The above copyright notice and this permission notice shall be included in all
+	copies or substantial portions of the Software.
 
 	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+	SOFTWARE.
 
 */
 
@@ -56,9 +45,6 @@
 #ifndef CHAR_SMART_STRING_H
 #define CHAR_SMART_STRING_H
 
-#ifdef TEST
-	#include "CuTest.h"
-#endif
 
 /// Define character types
 enum char_types {
@@ -67,6 +53,9 @@ enum char_types {
 	CHAR_ALPHA				= 1 << 2,	//!< a-zA-Z
 	CHAR_DIGIT				= 1 << 3,	//!< 0-9
 	CHAR_LINE_ENDING		= 1 << 4,	//!< \n,\r,\0
+	CHAR_INTRAWORD			= 1 << 5,	//!< Punctuation that might be inside a word -'
+	CHAR_UPPER				= 1 << 6,	// ASCII upper case
+	CHAR_LOWER				= 1 << 7,	// ASCII lower case
 };
 
 
@@ -91,6 +80,15 @@ int char_is_digit(char c);
 // Is character alphanumeric?
 int char_is_alphanumeric(char c);
 
+// Is character lower case?
+int char_is_lower_case(char c);
+
+// Is character upper case?
+int char_is_upper_case(char c);
+
+// Is character a valid intraword character?
+int char_is_intraword(char c);
+
 // Is character either whitespace or line ending?
 int char_is_whitespace_or_line_ending(char c);
 
@@ -106,6 +104,8 @@ int char_is_whitespace_or_line_ending_or_punctuation(char c);
 // Is byte the first byte of a multibyte UTF-8 sequence?
 #define char_is_lead_multibyte(x) ((x & 0xC0) == 0xC0)
 
+// Is the string valid UTF-8? (Returns pointer to first sequence)
+unsigned char * utf8_check(unsigned char * s);
 
 #endif
 

data/ext/mmd/critic_markup.c

@@ -125,9 +125,10 @@ token * mmd_critic_tokenize_string(const char * source, size_t start, size_t len
 		}
 
 		match_free(m);
-		trie_free(ac);
 	}
 
+	trie_free(ac);
+
 	return root;
 }
 
@@ -346,10 +347,10 @@ void mmd_critic_markup_reject(DString * d) {
 
 
 #ifdef TEST
-void Test_critic(CuTest* tc) {
-	#ifdef kUseObjectPool
+void Test_critic(CuTest * tc) {
+#ifdef kUseObjectPool
 	token_pool_init();
-	#endif
+#endif
 
 	DString * test = d_string_new("{--foo bar--}");
 	mmd_critic_markup_reject(test);
@@ -416,11 +417,11 @@ void Test_critic(CuTest* tc) {
 	mmd_critic_markup_reject(test);
 	CuAssertStrEquals(tc, "", test->str);
 
-	#ifdef kUseObjectPool
+#ifdef kUseObjectPool
 	// Decrement counter and clean up token pool
 	token_pool_drain();
 
 	token_pool_free();
-	#endif
+#endif
 }
 #endif