Merge branch 'release/6.3.0'

fletcher · Feb 6, 2018 · c360422 · c360422
2 parents f198973 + 60e6e68
commit c360422
Show file tree

Hide file tree

Showing 79 changed files with 1,857 additions and 2,653 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,14 +8,14 @@ cmake_minimum_required (VERSION 2.6)
 set (My_Project_Title "MultiMarkdown")
 set (My_Project_Description "Lightweight markup processor to produce HTML, LaTeX, and more.")
 set (My_Project_Author "Fletcher T. Penney")
-set (My_Project_Revised_Date "2017-11-20")
+set (My_Project_Revised_Date "2018-02-05")
 set (My_Project_Version_Major 6)
-set (My_Project_Version_Minor 2)
-set (My_Project_Version_Patch 3)
+set (My_Project_Version_Minor 3)
+set (My_Project_Version_Patch 0)
 
 set (My_Project_Version "${My_Project_Version_Major}.${My_Project_Version_Minor}.${My_Project_Version_Patch}")
 
-set (My_Project_Copyright_Date "2016 - 2017")
+set (My_Project_Copyright_Date "2016 - 2018")
 set (My_Project_Copyright "Copyright © ${My_Project_Copyright_Date} ${My_Project_Author}.")
 
 string(TOUPPER ${My_Project_Title} My_Project_Title_Caps  )
@@ -104,7 +104,7 @@ MACRO(ADD_PUBLIC_HEADER target filename)
 
 	SET_TARGET_PROPERTIES(${target} PROPERTIES
 		XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS
-		"macos iphonesimulator iphoneos"
+		"macosx iphonesimulator iphoneos"
 	)
 
 	SET_TARGET_PROPERTIES(${target} PROPERTIES
@@ -184,7 +184,6 @@ set(src_files
 	Sources/libMultiMarkdown/d_string.c
 	Sources/libMultiMarkdown/epub.c
 	Sources/libMultiMarkdown/file.c
-	Sources/libMultiMarkdown/fodt.c
 	Sources/libMultiMarkdown/html.c
 	Sources/libMultiMarkdown/latex.c
 	Sources/libMultiMarkdown/lexer.c
@@ -216,7 +215,6 @@ set(header_files
 	Sources/libMultiMarkdown/include/d_string.h
 	Sources/libMultiMarkdown/epub.h
 	Sources/libMultiMarkdown/file.h
-	Sources/libMultiMarkdown/fodt.h
 	Sources/libMultiMarkdown/html.h
 	Sources/libMultiMarkdown/latex.h
 	Sources/libMultiMarkdown/lexer.h
@@ -270,6 +268,15 @@ set (latex
 	texmf/tex/latex/mmd6/article/mmd6-article-footer.tex
 	texmf/tex/latex/mmd6/article/mmd6-article-leader.tex
 
+	texmf/tex/latex/mmd6/beamer/beamerthemekeynote-gradient.sty
+	texmf/tex/latex/mmd6/beamer/beamerthemekeynote-portfolio.sty
+	texmf/tex/latex/mmd6/beamer/beamerthemekeynote-vintage.sty
+	texmf/tex/latex/mmd6/beamer/mmd6-beamer-begin.tex
+	texmf/tex/latex/mmd6/beamer/mmd6-beamer-footer.tex
+	texmf/tex/latex/mmd6/beamer/mmd6-beamer-leader.tex
+	texmf/tex/latex/mmd6/beamer/Portfolio.png
+	texmf/tex/latex/mmd6/beamer/Vintage.png
+
 	texmf/tex/latex/mmd6/letterhead/mmd-envelope.sty
 	texmf/tex/latex/mmd6/letterhead/mmd-letterhead.sty
 	texmf/tex/latex/mmd6/letterhead/mmd6-letterhead-begin.tex
@@ -426,13 +433,15 @@ endif (WIN32)
 # ==============
 
 # Is libcurl available?
-find_package(CURL)
-if (CURL_FOUND)
-	add_definitions(-DUSE_CURL)
-	message (STATUS "libcurl found")
-else ()
-	message (STATUS "libcurl not found")
-endif (CURL_FOUND)	
+if (NOT DEFINED TEST)
+	find_package(CURL)
+	if (CURL_FOUND)
+		add_definitions(-DUSE_CURL)
+		message (STATUS "libcurl found")
+	else ()
+		message (STATUS "libcurl not found")
+	endif (CURL_FOUND)	
+endif ()
 
 # Create a library?
 if (NOT DEFINED TEST)

diff --git a/DevelopmentNotes/DevelopmentNotes.epub b/DevelopmentNotes/DevelopmentNotes.epub
diff --git a/DevelopmentNotes/DevelopmentNotes.fodt b/DevelopmentNotes/DevelopmentNotes.fodt
@@ -276,7 +276,7 @@ office:mimetype="application/vnd.oasis.opendocument.text">
 <office:meta>
 	<dc:title>MultiMarkdown v6 Development Notes</dc:title>
 	<dc:creator>Fletcher T. Penney</dc:creator>
-	<meta:user-defined meta:name="date">2017-11-20</meta:user-defined>
+	<meta:user-defined meta:name="date">2018-02-05</meta:user-defined>
 	<meta:user-defined meta:name="uuid">dd2d8e76-dc2d-416d-9acd-5395d20871c2</meta:user-defined>
 </office:meta>
 <office:body>
@@ -762,6 +762,127 @@ TextBundle/TextPack, OpenDocument, etc.</text:p></text:list-item>
 <text:h text:outline-level="3"><text:bookmark text:name="changelog"/>Changelog </text:h>
 
 <text:list text:style-name="L1">
+<text:list-item>
+<text:p text:style-name="Standard">2018&#8211;02&#8211;05 - v 6.3.0:</text:p>
+
+<text:list text:style-name="L1">
+<text:list-item>
+<text:p text:style-name="P1">
+ADDED: Add additional CM tests</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+ADDED: Add beamer LaTeX support files to installer</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+ADDED: Update beamer latex support files for MMD 6 latex config metadata support</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: All test build on path with spaces</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Don&#8217;t use libcurl on test build</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix HTML 5 compliance with image dimensions; Fix CriticMarkup inside code spans/blocks</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix bug in token pruning</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix bug with setting tail in token prune/graft</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix edge case with superscripts and punctuation</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix issue in Windows code</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix issue with list bullets in fenced code blocks</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix reject/accept with highlighting</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix typo in QuickStart.txt (fixes #111)</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Properly assign ambidextrous tokens in tables</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+Fix encoding of some markup inside LaTeX texttt environment (fixes #110 and #108)</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+UPDATED: Add Spanish style quotes support</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+UPDATED: Add test suite to d_string</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+UPDATED: Apply astyle to source</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+UPDATED: Improve commands for accepting/rejecting CriticMarkup</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+UPDATED: Remove deprecated fodt.c and fodt.h</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+UPDATED: Update dates</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+UPDATED: specify types to silence warnings and prevent theoretical errors</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+add cocoaconv.rb enum conversion script</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+change d_string_erase argument docstring</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+drop redundant enum case prefixes in Swift</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+drop redundant enum name prefixes from enum cases</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+expose singular-S type to Swift code generator</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+fix target platform spelling (macosx, not macos)</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="Standard">remove plural S from enum type names</text:p></text:list-item>
+
+</text:list></text:list-item>
+
 <text:list-item>
 <text:p text:style-name="Standard">2017&#8211;11&#8211;20 - v 6.2.3:</text:p>
 

diff --git a/DevelopmentNotes/DevelopmentNotes.html b/DevelopmentNotes/DevelopmentNotes.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8"/>
 	<title>MultiMarkdown v6 Development Notes</title>
 	<meta name="author" content="Fletcher T. Penney"/>
-	<meta name="date" content="2017-11-20"/>
+	<meta name="date" content="2018-02-05"/>
 	<meta name="uuid" content="dd2d8e76-dc2d-416d-9acd-5395d20871c2"/>
 </head>
 <body>
@@ -432,6 +432,39 @@ <h3 id="dependencieslibraries">Dependencies/Libraries </h3>
 <h3 id="changelog">Changelog </h3>
 
 <ul>
+<li><p>2018&#8211;02&#8211;05 - v 6.3.0:</p>
+
+<ul>
+<li>ADDED: Add additional CM tests</li>
+<li>ADDED: Add beamer LaTeX support files to installer</li>
+<li>ADDED: Update beamer latex support files for <abbr title="MultiMarkdown">MMD</abbr> 6 latex config metadata support</li>
+<li>FIXED: All test build on path with spaces</li>
+<li>FIXED: Don&#8217;t use libcurl on test build</li>
+<li>FIXED: Fix HTML 5 compliance with image dimensions; Fix CriticMarkup inside code spans/blocks</li>
+<li>FIXED: Fix bug in token pruning</li>
+<li>FIXED: Fix bug with setting tail in token prune/graft</li>
+<li>FIXED: Fix edge case with superscripts and punctuation</li>
+<li>FIXED: Fix issue in Windows code</li>
+<li>FIXED: Fix issue with list bullets in fenced code blocks</li>
+<li>FIXED: Fix reject/accept with highlighting</li>
+<li>FIXED: Fix typo in QuickStart.txt (fixes #111)</li>
+<li>FIXED: Properly assign ambidextrous tokens in tables</li>
+<li>Fix encoding of some markup inside LaTeX texttt environment (fixes #110 and #108)</li>
+<li>UPDATED: Add Spanish style quotes support</li>
+<li>UPDATED: Add test suite to d_string</li>
+<li>UPDATED: Apply astyle to source</li>
+<li>UPDATED: Improve commands for accepting/rejecting CriticMarkup</li>
+<li>UPDATED: Remove deprecated fodt.c and fodt.h</li>
+<li>UPDATED: Update dates</li>
+<li>UPDATED: specify types to silence warnings and prevent theoretical errors</li>
+<li>add cocoaconv.rb enum conversion script</li>
+<li>change d_string_erase argument docstring</li>
+<li>drop redundant enum case prefixes in Swift</li>
+<li>drop redundant enum name prefixes from enum cases</li>
+<li>expose singular-S type to Swift code generator</li>
+<li>fix target platform spelling (macosx, not macos)</li>
+<li>remove plural S from enum type names</li>
+</ul></li>
 <li><p>2017&#8211;11&#8211;20 - v 6.2.3:</p>
 
 <ul>

diff --git a/DevelopmentNotes/DevelopmentNotes.pdf b/DevelopmentNotes/DevelopmentNotes.pdf
diff --git a/DevelopmentNotes/DevelopmentNotes.txt b/DevelopmentNotes/DevelopmentNotes.txt
@@ -1,6 +1,6 @@
 Title:	MultiMarkdown v6 Development Notes
 Author:	Fletcher T. Penney
-Date: 2017-11-20  
+Date: 2018-02-05  
 LaTeX Config:	tufte-handout
 Base Header Level:	3
 uuid: dd2d8e76-dc2d-416d-9acd-5395d20871c2
@@ -471,6 +471,39 @@ TextBundle/TextPack, OpenDocument, etc.
 
 # Changelog #
 
+* 2018-02-05 - v 6.3.0:
+
+	*    ADDED: Add additional CM tests
+	*    ADDED: Add beamer LaTeX support files to installer
+	*    ADDED: Update beamer latex support files for MMD 6 latex config metadata support
+	*    FIXED: All test build on path with spaces
+	*    FIXED: Don't use libcurl on test build
+	*    FIXED: Fix HTML 5 compliance with image dimensions; Fix CriticMarkup inside code spans/blocks
+	*    FIXED: Fix bug in token pruning
+	*    FIXED: Fix bug with setting tail in token prune/graft
+	*    FIXED: Fix edge case with superscripts and punctuation
+	*    FIXED: Fix issue in Windows code
+	*    FIXED: Fix issue with list bullets in fenced code blocks
+	*    FIXED: Fix reject/accept with highlighting
+	*    FIXED: Fix typo in QuickStart.txt (fixes #111)
+	*    FIXED: Properly assign ambidextrous tokens in tables
+	*    Fix encoding of some markup inside LaTeX texttt environment (fixes #110 and #108)
+	*    UPDATED: Add Spanish style quotes support
+	*    UPDATED: Add test suite to d_string
+	*    UPDATED: Apply astyle to source
+	*    UPDATED: Improve commands for accepting/rejecting CriticMarkup
+	*    UPDATED: Remove deprecated fodt.c and fodt.h
+	*    UPDATED: Update dates
+	*    UPDATED: specify types to silence warnings and prevent theoretical errors
+	*    add cocoaconv.rb enum conversion script
+	*    change d_string_erase argument docstring
+	*    drop redundant enum case prefixes in Swift
+	*    drop redundant enum name prefixes from enum cases
+	*    expose singular-S type to Swift code generator
+	*    fix target platform spelling (macosx, not macos)
+	*    remove plural S from enum type names
+
+
 * 2017-11-20 - v 6.2.3:
 
 	*    CHANGED: Fix typos

diff --git a/QuickStart/QuickStart.epub b/QuickStart/QuickStart.epub
diff --git a/QuickStart/QuickStart.fodt b/QuickStart/QuickStart.fodt
@@ -276,7 +276,7 @@ office:mimetype="application/vnd.oasis.opendocument.text">
 <office:meta>
 	<dc:title>MultiMarkdown v6 Quick Start Guide</dc:title>
 	<dc:creator>Fletcher T. Penney</dc:creator>
-	<meta:user-defined meta:name="version">6.2.2</meta:user-defined>
+	<meta:user-defined meta:name="version">6.3.0</meta:user-defined>
 	<meta:user-defined meta:name="uuid">0d6313fa-9135-477e-9c14-7d62c1977833</meta:user-defined>
 </office:meta>
 <office:body>
@@ -318,7 +318,7 @@ office:mimetype="application/vnd.oasis.opendocument.text">
 
 <text:h text:outline-level="3"><text:bookmark text:name="introduction"/>Introduction </text:h>
 
-<text:p text:style-name="Standard">Version: 6.2.2</text:p>
+<text:p text:style-name="Standard">Version: 6.3.0</text:p>
 
 <text:p text:style-name="Standard">This document serves as a description of MultiMarkdown (MMD) v6, as well as a sample
 document to demonstrate the various features. Specifically, differences from
@@ -663,7 +663,7 @@ new system.</text:p>
 <text:p text:style-name="Standard"><text:span text:style-name="MMD-Bold"><text:span text:style-name="MMD-Italic">In addition</text:span></text:span>, there is a new shortcut key &#8211; <text:span text:style-name="Source_20_Text">latex config</text:span>. This allows
 you to specify a &#8220;document name&#8221; that is used to automatically identify the
 corresponding <text:span text:style-name="Source_20_Text">latex leader</text:span>, <text:span text:style-name="Source_20_Text">latex begin</text:span>, and <text:span text:style-name="Source_20_Text">latex footer</text:span> files. For
-example, using <text:span text:style-name="Source_20_Text">latex config: artice</text:span> is the same as using:</text:p>
+example, using <text:span text:style-name="Source_20_Text">latex config: article</text:span> is the same as using:</text:p>
 
 <text:p text:style-name="Preformatted Text">latex leader:<text:tab/>mmd6-article-leader<text:line-break/>latex begin:<text:tab/>mmd6-article-begin<text:line-break/>latex footer:<text:tab/>mmd6-article-footer<text:line-break/></text:p>
 

diff --git a/QuickStart/QuickStart.html b/QuickStart/QuickStart.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8"/>
 	<title>MultiMarkdown v6 Quick Start Guide</title>
 	<meta name="author" content="Fletcher T. Penney"/>
-	<meta name="version" content="6.2.2"/>
+	<meta name="version" content="6.3.0"/>
 	<meta name="uuid" content="0d6313fa-9135-477e-9c14-7d62c1977833"/>
 </head>
 <body>
@@ -43,7 +43,7 @@
 
 <h3 id="introduction">Introduction </h3>
 
-<p>Version: 6.2.2</p>
+<p>Version: 6.3.0</p>
 
 <p>This document serves as a description of MultiMarkdown (<abbr title="MultiMarkdown">MMD</abbr>) v6, as well as a sample
 document to demonstrate the various features. Specifically, differences from
@@ -354,7 +354,7 @@ <h4 id="latexchanges">LaTeX Changes </h4>
 <p><strong><em>In addition</em></strong>, there is a new shortcut key &#8211; <code>latex config</code>. This allows
 you to specify a &#8220;document name&#8221; that is used to automatically identify the
 corresponding <code>latex leader</code>, <code>latex begin</code>, and <code>latex footer</code> files. For
-example, using <code>latex config: artice</code> is the same as using:</p>
+example, using <code>latex config: article</code> is the same as using:</p>
 
 <pre><code>latex leader:	mmd6-article-leader
 latex begin:	mmd6-article-begin

diff --git a/QuickStart/QuickStart.pdf b/QuickStart/QuickStart.pdf
diff --git a/QuickStart/QuickStart.txt b/QuickStart/QuickStart.txt
@@ -1,6 +1,6 @@
 Title:	MultiMarkdown v6 Quick Start Guide
 Author:	Fletcher T. Penney
-Version:	6.2.2
+Version:	6.3.0
 LaTeX Config:	tufte-handout
 Base Header Level:	3
 uuid:	0d6313fa-9135-477e-9c14-7d62c1977833
@@ -334,7 +334,7 @@ new system.
 ***In addition***, there is a new shortcut key -- `latex config`.  This allows
 you to specify a "document name" that is used to automatically identify the
 corresponding `latex leader`, `latex begin`, and `latex footer` files.  For
-example, using `latex config: artice` is the same as using:
+example, using `latex config: article` is the same as using:
 
 	latex leader:	mmd6-article-leader
 	latex begin:	mmd6-article-begin