rmultimarkdown 6.4.0.3 → 6.7.0.0

data/ext/mmd/xml.h

@@ -0,0 +1,134 @@
+/**
+
+	MultiMarkdown -- Lightweight markup processor to produce HTML, LaTeX, and more.
+
+	@file xml.h
+
+	@brief Utilities to help parse XML files
+
+
+	@author	Fletcher T. Penney
+	@bug
+
+**/
+
+/*
+
+	Copyright © 2016 - 2019 Fletcher T. Penney.
+
+
+	The `MultiMarkdown 6` project is released under the 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.
+
+	uthash library:
+		Copyright (c) 2005-2016, Troy D. Hanson
+
+		Licensed under Revised BSD license
+
+	miniz library:
+		Copyright 2013-2014 RAD Game Tools and Valve Software
+		Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+
+		Licensed under the MIT license
+
+	argtable3 library:
+		Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann
+		<sheitmann@users.sourceforge.net>
+		All rights reserved.
+
+		Licensed under the Revised BSD License
+
+
+	## The MIT License ##
+
+	Permission is hereby granted, free of charge, to any person obtaining
+	a copy of this software and associated documentation files (the
+	"Software"), to deal in the Software without restriction, including
+	without limitation the rights to use, copy, modify, merge, publish,
+	distribute, sublicense, and/or sell 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 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.
+
+
+	## Revised BSD License ##
+
+	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 the <organization> 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 <COPYRIGHT
+	HOLDER> 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 XML_MULTIMARKDOWN_H
+#define XML_MULTIMARKDOWN_H
+
+/// skip through whitespace
+size_t xml_scan_wsnl(const char * c);
+
+/// scan generic attribute (including quoted value if present)
+size_t xml_scan_attribute_name(const char * c);
+
+/// scan until start of value, if present
+size_t xml_scan_until_value(const char * c);
+
+/// scan value
+size_t xml_scan_value(const char * c);
+
+/// Does the string include encoded newline?
+size_t xml_scan_encoded_newline(const char * c, size_t len);
+
+
+/// Decode XML encoded text and print to DString
+void print_xml_as_text(DString * out, const char * source, size_t start, size_t len);
+
+/// Parse XML text for attribute and value
+size_t xml_extract_attribute(const char * source, size_t start, char ** attr, char ** value);
+
+
+/// Extract attribute with specified name
+char * xml_extract_named_attribute(const char * source, size_t start, const char * name);
+
+#endif

data/ext/mmd/zip.c

@@ -101,6 +101,7 @@
 
 */
 
+#include "d_string.h"
 #include "zip.h"
 
 #include <dirent.h>
@@ -195,16 +196,82 @@ mz_bool unzip_archive_to_path(mz_zip_archive * pZip, const char * path) {
 
 // Unzip archive (as plain binary data) to specified file path
 mz_bool unzip_data_to_path(const void * data, size_t size, const char * path) {
-	mz_zip_archive pZip;
-	memset(&pZip, 0, sizeof(mz_zip_archive));
+	mz_zip_archive * pZip = malloc(sizeof(mz_zip_archive));
+	memset(pZip, 0, sizeof(mz_zip_archive));
 
-	mz_bool status = mz_zip_reader_init_mem(&pZip, data, size, 0);
+	mz_bool status = mz_zip_reader_init_mem(pZip, data, size, 0);
 
 	if (!status) {
 		fprintf(stderr, "mz_zip_reader_init_mem() failed.\n");
+		mz_zip_reader_end(pZip);
 		return status;
 	}
 
-	return unzip_archive_to_path(&pZip, path);
+	status = unzip_archive_to_path(pZip, path);
+	mz_zip_reader_end(pZip);
+	free(pZip);
+	return status;
+}
+
+
+// Extract single file from archive
+mz_bool unzip_file_from_archive(mz_zip_archive * pZip, const char * filename, DString * destination) {
+	mz_uint32 index;
+	mz_zip_archive_file_stat pStat;
+	mz_bool status;
+
+	int result = mz_zip_reader_locate_file_v2(pZip, filename, NULL, 0, &index);
+
+	if (result == -1) {
+		// Failed
+		return 0;
+	}
+
+	mz_zip_reader_file_stat(pZip, index, &pStat);
+	unsigned long long size = pStat.m_uncomp_size + 1;				// Allow for null terminator in case this is text
+
+	if (destination->currentStringBufferSize < size) {
+		// Buffer to small
+		free(destination->str);
+		destination->str = malloc((unsigned long)size);
+		destination->currentStringBufferSize = (size_t)size;
+	}
+
+	status = mz_zip_reader_extract_to_mem(pZip, index, destination->str, destination->currentStringBufferSize, 0);
+	destination->currentStringLength = (size_t)size - 1;
+	destination->str[destination->currentStringLength] = '\0';
+
+	if (!status) {
+		fprintf(stderr, "mz_zip_reader_extract_to_mem() failed.\n");
+	}
+
+	return status;
 }
 
+
+// Extract single file from archive
+mz_bool unzip_file_from_data(const void * data, size_t size, const char * filename, DString * destination) {
+	mz_zip_archive * pZip = malloc(sizeof(mz_zip_archive));
+	memset(pZip, 0, sizeof(mz_zip_archive));
+
+	mz_bool status = mz_zip_reader_init_mem(pZip, data, size, 0);
+
+	if (!status) {
+		fprintf(stderr, "mz_zip_reader_init_mem() failed.\n");
+		mz_zip_reader_end(pZip);
+		return status;
+	}
+
+	status =  mz_zip_validate_archive(pZip, 0);
+
+	if (!status) {
+		fprintf(stderr, "mz_zip_validate_archive failed.\n");
+		mz_zip_reader_end(pZip);
+		return status;
+	}
+
+	status = unzip_file_from_archive(pZip, filename, destination);
+	mz_zip_reader_end(pZip);
+	free(pZip);
+	return status;
+}

data/ext/mmd/zip.h

@@ -114,7 +114,13 @@ void zip_new_archive(mz_zip_archive * pZip);
 mz_bool unzip_archive_to_path(mz_zip_archive * pZip, const char * path);
 
 // Unzip archive (as plain binary data) to specified file path
-mz_bool unzip_data_to_path(const void * data, size_t len, const char * path);
+mz_bool unzip_data_to_path(const void * data, size_t size, const char * path);
+
+// Extract single file from archive
+mz_bool unzip_file_from_archive(mz_zip_archive * pZip, const char * filename, DString * destination);
+
+// Extract single file from archive
+mz_bool unzip_file_from_data(const void * data, size_t size, const char * filename, DString * file);
 
 
 #endif

data/ext/ruby_multi_markdown.c

@@ -5,18 +5,6 @@
 #include "mmd.h"
 #include "d_string.h"
 
-// Tries to convert a C string into an encoded ruby String
-static VALUE encoded_str_new2(char *str, char *encoding) {
-  VALUE result = rb_str_new2(str);
-
-  int enc = rb_enc_find_index(encoding);
-  if (enc > 0) {
-    rb_enc_associate_index(result, enc);
-  }
-
-  return result;
-}
-
 static VALUE rb_cMultiMarkdown;
 
 static int get_exts(VALUE self) {
@@ -70,11 +58,11 @@ static void free_engine_manager(engine_manager* manager) {
   free(manager);
 }
 
-static VALUE rb_multimarkdown_allocate(VALUE class) {
+static VALUE rb_multimarkdown_allocate(VALUE klass) {
   engine_manager *manager = malloc(sizeof(engine_manager));
   manager->mmd_engine = NULL;
 
-  return Data_Wrap_Struct(class, NULL, free_engine_manager, manager);
+  return Data_Wrap_Struct(klass, NULL, free_engine_manager, manager);
 }
 
 static VALUE rb_multimarkdown_start_engine(VALUE self, VALUE text) {
@@ -110,6 +98,9 @@ static VALUE rb_multimarkdown_set_language(VALUE self, VALUE language) {
   else if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("fr")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("french")) == Qtrue) {
     lang = FRENCH;
   }
+  else if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("sp")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("spanish")) == Qtrue) {
+    lang = SPANISH;
+  }
   else if (rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("sv")) == Qtrue || rb_funcall(language_s, rb_intern("=="), 1, rb_str_new2("swedish")) == Qtrue) {
     lang = SWEDISH;
   }
@@ -121,7 +112,7 @@ static VALUE rb_multimarkdown_set_language(VALUE self, VALUE language) {
 
 static VALUE rb_multimarkdown_to_html(VALUE self) {
   char *html = mmd_engine_convert(get_mmd_engine(self), FORMAT_HTML);
-  VALUE result = encoded_str_new2(html, "UTF-8");
+  VALUE result = rb_utf8_str_new_cstr(html);
   free(html);
 
   return result;
@@ -129,7 +120,7 @@ static VALUE rb_multimarkdown_to_html(VALUE self) {
 
 static VALUE rb_multimarkdown_to_latex(VALUE self) {
   char *latex = mmd_engine_convert(get_mmd_engine(self), FORMAT_LATEX);
-  VALUE result = encoded_str_new2(latex, "UTF-8");
+  VALUE result = rb_utf8_str_new_cstr(latex);
   free(latex);
 
   return result;
@@ -137,7 +128,7 @@ static VALUE rb_multimarkdown_to_latex(VALUE self) {
 
 static VALUE rb_multimarkdown_extract_metadata_keys(VALUE self) {
   char *metadata_keys = mmd_engine_metadata_keys(get_mmd_engine(self));
-  VALUE str = encoded_str_new2(metadata_keys, "UTF-8");
+  VALUE str = rb_utf8_str_new_cstr(metadata_keys);
   free(metadata_keys);
 
   return rb_funcall(str, rb_intern("split"), 1, rb_str_new2("\n"));
@@ -148,7 +139,7 @@ static VALUE rb_multimarkdown_extract_metadata_value(VALUE self, VALUE key) {
   char *pkey = StringValuePtr(key);
 
   char *metadata = mmd_engine_metavalue_for_key(get_mmd_engine(self), pkey);
-  VALUE result = encoded_str_new2(metadata, "UTF-8");
+  VALUE result = rb_utf8_str_new_cstr(metadata);
 
   return result;
 }

data/lib/multi_markdown/version.rb

@@ -1,6 +1,6 @@
 class MultiMarkdown
 
   # The ruby 'multimarkdown' gem version
-  VERSION = "6.4.0.3"
+  VERSION = "6.7.0.0"
 
 end

data/rmultimarkdown.gemspec

@@ -27,8 +27,6 @@ Gem::Specification.new do |s|
   s.description = s.summary
   s.extra_rdoc_files = ['README.md', 'LICENSE']
 
-  s.add_dependency "bundler"
-
   s.files = %w(LICENSE README.md Rakefile rmultimarkdown.gemspec ext/Makefile) + Dir.glob("{bin,lib,test}/**/*") + Dir.glob("{ext}/**/*.{c,h,rb}")
   s.test_files = Dir.glob("{test}/**/*")
   s.executables = "rmultimarkdown"

metadata

@@ -1,29 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmultimarkdown
 version: !ruby/object:Gem::Version
-  version: 6.4.0.3
+  version: 6.7.0.0
 platform: ruby
 authors:
 - Till Schulte-Coerne
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: A MultiMarkdown 6 binding for Ruby
 email:
 - till.schulte-coerne@innoq.com
@@ -32,8 +17,8 @@ executables:
 extensions:
 - ext/extconf.rb
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
 - LICENSE
 - README.md
@@ -44,14 +29,16 @@ files:
 - ext/extconf.rb
 - ext/mmd/aho-corasick.c
 - ext/mmd/aho-corasick.h
+- ext/mmd/argtable3.c
+- ext/mmd/argtable3.h
 - ext/mmd/beamer.c
 - ext/mmd/beamer.h
 - ext/mmd/char.c
 - ext/mmd/char.h
-- ext/mmd/char_lookup.c
 - ext/mmd/critic_markup.c
 - ext/mmd/critic_markup.h
 - ext/mmd/d_string.c
+- ext/mmd/d_string.h
 - ext/mmd/epub.c
 - ext/mmd/epub.h
 - ext/mmd/file.c
@@ -59,13 +46,20 @@ files:
 - ext/mmd/html.c
 - ext/mmd/html.h
 - ext/mmd/i18n.h
-- ext/mmd/include/d_string.h
-- ext/mmd/include/libMultiMarkdown.h
-- ext/mmd/include/token.h
+- ext/mmd/itmz-lexer.c
+- ext/mmd/itmz-lexer.h
+- ext/mmd/itmz-parser.c
+- ext/mmd/itmz-parser.h
+- ext/mmd/itmz-reader.c
+- ext/mmd/itmz-reader.h
+- ext/mmd/itmz.c
+- ext/mmd/itmz.h
 - ext/mmd/latex.c
 - ext/mmd/latex.h
 - ext/mmd/lexer.c
 - ext/mmd/lexer.h
+- ext/mmd/libMultiMarkdown.h
+- ext/mmd/main.c
 - ext/mmd/memoir.c
 - ext/mmd/memoir.h
 - ext/mmd/miniz.c
@@ -96,6 +90,7 @@ files:
 - ext/mmd/textbundle.c
 - ext/mmd/textbundle.h
 - ext/mmd/token.c
+- ext/mmd/token.h
 - ext/mmd/token_pairs.c
 - ext/mmd/token_pairs.h
 - ext/mmd/transclude.c
@@ -106,6 +101,8 @@ files:
 - ext/mmd/version.h
 - ext/mmd/writer.c
 - ext/mmd/writer.h
+- ext/mmd/xml.c
+- ext/mmd/xml.h
 - ext/mmd/zip.c
 - ext/mmd/zip.h
 - ext/ruby_multi_markdown.c
@@ -119,7 +116,6 @@ files:
 homepage: http://github.com/tillsc/multi_markdown
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -134,11 +130,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A MultiMarkdown 6 binding for Ruby
 test_files:
-- test/multi_markdown_test.rb
 - test/extensions_test.rb
+- test/multi_markdown_test.rb

data/ext/mmd/char_lookup.c

@@ -1,212 +0,0 @@
-/**
-
-	MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more.
-
-	@file char_lookup.c
-
-	@brief Create lookup table for char.c
-
-
-	@author	Fletcher T. Penney
-	@bug
-
-**/
-
-/*
-
-	Copyright © 2016 - 2017 Fletcher T. Penney.
-
-
-	The `MultiMarkdown 6` project is released under the 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 ##
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	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 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.
-
-*/
-
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "char.h"
-
-// Shortcuts to assign values to characters in lookup table
-#define punctuation(x)	table[x] |= CHAR_PUNCTUATION
-#define whitespace(x)	table[x] |= CHAR_WHITESPACE
-#define alpha(x)		table[x] |= CHAR_ALPHA
-#define digit(x)		table[x] |= CHAR_DIGIT
-#define line_ending(x)	table[x] |= CHAR_LINE_ENDING
-
-#define USE_EXTENDED_ASCII_disabled 1
-
-int main( int argc, char** argv ) {
-	unsigned char table[256] = {0};
-
-	// Define punctuation
-	punctuation('.');
-	punctuation('!');
-	punctuation('?');
-
-	punctuation(',');
-	punctuation(';');
-	punctuation(':');
-
-	punctuation('"');
-	punctuation('\'');
-	punctuation('`');
-	punctuation('~');
-
-	punctuation('(');
-	punctuation(')');
-	punctuation('{');
-	punctuation('}');
-	punctuation('[');
-	punctuation(']');
-
-	punctuation('#');
-	punctuation('$');
-	punctuation('%');
-	punctuation('+');
-	punctuation('-');
-	punctuation('=');
-	punctuation('<');
-	punctuation('>');
-
-	punctuation('&');
-	punctuation('@');
-	punctuation('\\');
-	punctuation('/');
-	punctuation('^');
-
-	punctuation('*');
-	punctuation('_');
-
-	punctuation('|');
-
-
-	// Define whitespace
-	whitespace(' ');
-	whitespace('\t');
-
-
-	// Define line endings
-	line_ending('\n');
-	line_ending('\r');
-	line_ending('\0');		// Count EOF as line ending
-
-
-	// Define digits
-	for (char i = '0'; i <= '9'; ++i) {
-		digit(i);
-	}
-
-	// Define alpha
-	for (char i = 'a'; i <= 'z'; ++i) {
-		alpha(i);
-	}
-
-	for (char i = 'A'; i <= 'Z'; ++i) {
-		alpha(i);
-	}
-
-
-	// Extended ASCII
-	#ifdef USE_EXTENDED_ASCII
-
-	// Punctuation ranges
-	for (int i = 132; i < 138; ++i) {
-		punctuation(i);
-	}
-
-	for (int i = 145; i < 156; ++i) {
-		punctuation(i);
-	}
-
-	for (int i = 161; i < 192; ++i) {
-		punctuation(i);
-	}
-
-
-	// Alphanumeric ranges
-	for (int i = 192; i < 215; ++i) {
-		alpha(i);
-	}
-
-	for (int i = 216; i < 247; ++i) {
-		alpha(i);
-	}
-
-	for (int i = 248; i < 256; ++i) {
-		alpha(i);
-	}
-
-	// Isolated extended ASCII characters
-	for (int i = 128; i < 256; ++i) {
-		switch (i) {
-			case 128:
-			case 130:
-			case 139:
-			case 215:
-			case 247:
-				punctuation(i);
-				break;
-
-			case 160:
-				whitespace(i);
-				break;
-
-			case 131:
-			case 138:
-			case 140:
-			case 142:
-			case 156:
-			case 158:
-			case 159:
-				alpha(i);
-				break;
-
-			default:
-				break;
-		}
-	}
-
-	#endif
-
-
-	// Print output as 16 x 16 table
-	for (int i = 0; i < 16; ++i) {
-		for (int j = 0; j < 16; ++j) {
-			fprintf(stdout, "%3d,", table[i * 16 + j]);
-		}
-
-		fprintf(stdout, "\n");
-	}
-}