Skip to content

Commit c360422

Browse files
fletcherfletcher
committed
Merge branch 'release/6.3.0'
2 parents f198973 + 60e6e68 commit c360422

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1857
-2653
lines changed

‎CMakeLists.txt‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ cmake_minimum_required (VERSION 2.6)
88
set (My_Project_Title "MultiMarkdown")
99
set (My_Project_Description "Lightweight markup processor to produce HTML, LaTeX, and more.")
1010
set (My_Project_Author "Fletcher T. Penney")
11-
set (My_Project_Revised_Date "2017-11-20")
11+
set (My_Project_Revised_Date "2018-02-05")
1212
set (My_Project_Version_Major 6)
13-
set (My_Project_Version_Minor 2)
14-
set (My_Project_Version_Patch 3)
13+
set (My_Project_Version_Minor 3)
14+
set (My_Project_Version_Patch 0)
1515

1616
set (My_Project_Version "${My_Project_Version_Major}.${My_Project_Version_Minor}.${My_Project_Version_Patch}")
1717

18-
set (My_Project_Copyright_Date "2016 - 2017")
18+
set (My_Project_Copyright_Date "2016 - 2018")
1919
set (My_Project_Copyright "Copyright © ${My_Project_Copyright_Date} ${My_Project_Author}.")
2020

2121
string(TOUPPER ${My_Project_Title} My_Project_Title_Caps )
@@ -104,7 +104,7 @@ MACRO(ADD_PUBLIC_HEADER target filename)
104104

105105
SET_TARGET_PROPERTIES(${target} PROPERTIES
106106
XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS
107-
"macos iphonesimulator iphoneos"
107+
"macosx iphonesimulator iphoneos"
108108
)
109109

110110
SET_TARGET_PROPERTIES(${target} PROPERTIES
@@ -184,7 +184,6 @@ set(src_files
184184
Sources/libMultiMarkdown/d_string.c
185185
Sources/libMultiMarkdown/epub.c
186186
Sources/libMultiMarkdown/file.c
187-
Sources/libMultiMarkdown/fodt.c
188187
Sources/libMultiMarkdown/html.c
189188
Sources/libMultiMarkdown/latex.c
190189
Sources/libMultiMarkdown/lexer.c
@@ -216,7 +215,6 @@ set(header_files
216215
Sources/libMultiMarkdown/include/d_string.h
217216
Sources/libMultiMarkdown/epub.h
218217
Sources/libMultiMarkdown/file.h
219-
Sources/libMultiMarkdown/fodt.h
220218
Sources/libMultiMarkdown/html.h
221219
Sources/libMultiMarkdown/latex.h
222220
Sources/libMultiMarkdown/lexer.h
@@ -270,6 +268,15 @@ set (latex
270268
texmf/tex/latex/mmd6/article/mmd6-article-footer.tex
271269
texmf/tex/latex/mmd6/article/mmd6-article-leader.tex
272270

271+
texmf/tex/latex/mmd6/beamer/beamerthemekeynote-gradient.sty
272+
texmf/tex/latex/mmd6/beamer/beamerthemekeynote-portfolio.sty
273+
texmf/tex/latex/mmd6/beamer/beamerthemekeynote-vintage.sty
274+
texmf/tex/latex/mmd6/beamer/mmd6-beamer-begin.tex
275+
texmf/tex/latex/mmd6/beamer/mmd6-beamer-footer.tex
276+
texmf/tex/latex/mmd6/beamer/mmd6-beamer-leader.tex
277+
texmf/tex/latex/mmd6/beamer/Portfolio.png
278+
texmf/tex/latex/mmd6/beamer/Vintage.png
279+
273280
texmf/tex/latex/mmd6/letterhead/mmd-envelope.sty
274281
texmf/tex/latex/mmd6/letterhead/mmd-letterhead.sty
275282
texmf/tex/latex/mmd6/letterhead/mmd6-letterhead-begin.tex
@@ -426,13 +433,15 @@ endif (WIN32)
426433
# ==============
427434

428435
# Is libcurl available?
429-
find_package(CURL)
430-
if (CURL_FOUND)
431-
add_definitions(-DUSE_CURL)
432-
message (STATUS "libcurl found")
433-
else ()
434-
message (STATUS "libcurl not found")
435-
endif (CURL_FOUND)
436+
if (NOT DEFINED TEST)
437+
find_package(CURL)
438+
if (CURL_FOUND)
439+
add_definitions(-DUSE_CURL)
440+
message (STATUS "libcurl found")
441+
else ()
442+
message (STATUS "libcurl not found")
443+
endif (CURL_FOUND)
444+
endif ()
436445

437446
# Create a library?
438447
if (NOT DEFINED TEST)

‎DevelopmentNotes/DevelopmentNotes.epub‎

486 Bytes
Binary file not shown.

‎DevelopmentNotes/DevelopmentNotes.fodt‎

Lines changed: 122 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ office:mimetype="application/vnd.oasis.opendocument.text">
276276
<office:meta>
277277
<dc:title>MultiMarkdown v6 Development Notes</dc:title>
278278
<dc:creator>Fletcher T. Penney</dc:creator>
279-
<meta:user-defined meta:name="date">2017-11-20</meta:user-defined>
279+
<meta:user-defined meta:name="date">2018-02-05</meta:user-defined>
280280
<meta:user-defined meta:name="uuid">dd2d8e76-dc2d-416d-9acd-5395d20871c2</meta:user-defined>
281281
</office:meta>
282282
<office:body>
@@ -762,6 +762,127 @@ TextBundle/TextPack, OpenDocument, etc.</text:p></text:list-item>
762762
<text:h text:outline-level="3"><text:bookmark text:name="changelog"/>Changelog </text:h>
763763

764764
<text:list text:style-name="L1">
765+
<text:list-item>
766+
<text:p text:style-name="Standard">2018&#8211;02&#8211;05 - v 6.3.0:</text:p>
767+
768+
<text:list text:style-name="L1">
769+
<text:list-item>
770+
<text:p text:style-name="P1">
771+
ADDED: Add additional CM tests</text:p></text:list-item>
772+
773+
<text:list-item>
774+
<text:p text:style-name="P1">
775+
ADDED: Add beamer LaTeX support files to installer</text:p></text:list-item>
776+
777+
<text:list-item>
778+
<text:p text:style-name="P1">
779+
ADDED: Update beamer latex support files for MMD 6 latex config metadata support</text:p></text:list-item>
780+
781+
<text:list-item>
782+
<text:p text:style-name="P1">
783+
FIXED: All test build on path with spaces</text:p></text:list-item>
784+
785+
<text:list-item>
786+
<text:p text:style-name="P1">
787+
FIXED: Don&#8217;t use libcurl on test build</text:p></text:list-item>
788+
789+
<text:list-item>
790+
<text:p text:style-name="P1">
791+
FIXED: Fix HTML 5 compliance with image dimensions; Fix CriticMarkup inside code spans/blocks</text:p></text:list-item>
792+
793+
<text:list-item>
794+
<text:p text:style-name="P1">
795+
FIXED: Fix bug in token pruning</text:p></text:list-item>
796+
797+
<text:list-item>
798+
<text:p text:style-name="P1">
799+
FIXED: Fix bug with setting tail in token prune/graft</text:p></text:list-item>
800+
801+
<text:list-item>
802+
<text:p text:style-name="P1">
803+
FIXED: Fix edge case with superscripts and punctuation</text:p></text:list-item>
804+
805+
<text:list-item>
806+
<text:p text:style-name="P1">
807+
FIXED: Fix issue in Windows code</text:p></text:list-item>
808+
809+
<text:list-item>
810+
<text:p text:style-name="P1">
811+
FIXED: Fix issue with list bullets in fenced code blocks</text:p></text:list-item>
812+
813+
<text:list-item>
814+
<text:p text:style-name="P1">
815+
FIXED: Fix reject/accept with highlighting</text:p></text:list-item>
816+
817+
<text:list-item>
818+
<text:p text:style-name="P1">
819+
FIXED: Fix typo in QuickStart.txt (fixes #111)</text:p></text:list-item>
820+
821+
<text:list-item>
822+
<text:p text:style-name="P1">
823+
FIXED: Properly assign ambidextrous tokens in tables</text:p></text:list-item>
824+
825+
<text:list-item>
826+
<text:p text:style-name="P1">
827+
Fix encoding of some markup inside LaTeX texttt environment (fixes #110 and #108)</text:p></text:list-item>
828+
829+
<text:list-item>
830+
<text:p text:style-name="P1">
831+
UPDATED: Add Spanish style quotes support</text:p></text:list-item>
832+
833+
<text:list-item>
834+
<text:p text:style-name="P1">
835+
UPDATED: Add test suite to d_string</text:p></text:list-item>
836+
837+
<text:list-item>
838+
<text:p text:style-name="P1">
839+
UPDATED: Apply astyle to source</text:p></text:list-item>
840+
841+
<text:list-item>
842+
<text:p text:style-name="P1">
843+
UPDATED: Improve commands for accepting/rejecting CriticMarkup</text:p></text:list-item>
844+
845+
<text:list-item>
846+
<text:p text:style-name="P1">
847+
UPDATED: Remove deprecated fodt.c and fodt.h</text:p></text:list-item>
848+
849+
<text:list-item>
850+
<text:p text:style-name="P1">
851+
UPDATED: Update dates</text:p></text:list-item>
852+
853+
<text:list-item>
854+
<text:p text:style-name="P1">
855+
UPDATED: specify types to silence warnings and prevent theoretical errors</text:p></text:list-item>
856+
857+
<text:list-item>
858+
<text:p text:style-name="P1">
859+
add cocoaconv.rb enum conversion script</text:p></text:list-item>
860+
861+
<text:list-item>
862+
<text:p text:style-name="P1">
863+
change d_string_erase argument docstring</text:p></text:list-item>
864+
865+
<text:list-item>
866+
<text:p text:style-name="P1">
867+
drop redundant enum case prefixes in Swift</text:p></text:list-item>
868+
869+
<text:list-item>
870+
<text:p text:style-name="P1">
871+
drop redundant enum name prefixes from enum cases</text:p></text:list-item>
872+
873+
<text:list-item>
874+
<text:p text:style-name="P1">
875+
expose singular-S type to Swift code generator</text:p></text:list-item>
876+
877+
<text:list-item>
878+
<text:p text:style-name="P1">
879+
fix target platform spelling (macosx, not macos)</text:p></text:list-item>
880+
881+
<text:list-item>
882+
<text:p text:style-name="Standard">remove plural S from enum type names</text:p></text:list-item>
883+
884+
</text:list></text:list-item>
885+
765886
<text:list-item>
766887
<text:p text:style-name="Standard">2017&#8211;11&#8211;20 - v 6.2.3:</text:p>
767888

‎DevelopmentNotes/DevelopmentNotes.html‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8"/>
55
<title>MultiMarkdown v6 Development Notes</title>
66
<meta name="author" content="Fletcher T. Penney"/>
7-
<meta name="date" content="2017-11-20"/>
7+
<meta name="date" content="2018-02-05"/>
88
<meta name="uuid" content="dd2d8e76-dc2d-416d-9acd-5395d20871c2"/>
99
</head>
1010
<body>
@@ -432,6 +432,39 @@ <h3 id="dependencieslibraries">Dependencies/Libraries </h3>
432432
<h3 id="changelog">Changelog </h3>
433433

434434
<ul>
435+
<li><p>2018&#8211;02&#8211;05 - v 6.3.0:</p>
436+
437+
<ul>
438+
<li>ADDED: Add additional CM tests</li>
439+
<li>ADDED: Add beamer LaTeX support files to installer</li>
440+
<li>ADDED: Update beamer latex support files for <abbr title="MultiMarkdown">MMD</abbr> 6 latex config metadata support</li>
441+
<li>FIXED: All test build on path with spaces</li>
442+
<li>FIXED: Don&#8217;t use libcurl on test build</li>
443+
<li>FIXED: Fix HTML 5 compliance with image dimensions; Fix CriticMarkup inside code spans/blocks</li>
444+
<li>FIXED: Fix bug in token pruning</li>
445+
<li>FIXED: Fix bug with setting tail in token prune/graft</li>
446+
<li>FIXED: Fix edge case with superscripts and punctuation</li>
447+
<li>FIXED: Fix issue in Windows code</li>
448+
<li>FIXED: Fix issue with list bullets in fenced code blocks</li>
449+
<li>FIXED: Fix reject/accept with highlighting</li>
450+
<li>FIXED: Fix typo in QuickStart.txt (fixes #111)</li>
451+
<li>FIXED: Properly assign ambidextrous tokens in tables</li>
452+
<li>Fix encoding of some markup inside LaTeX texttt environment (fixes #110 and #108)</li>
453+
<li>UPDATED: Add Spanish style quotes support</li>
454+
<li>UPDATED: Add test suite to d_string</li>
455+
<li>UPDATED: Apply astyle to source</li>
456+
<li>UPDATED: Improve commands for accepting/rejecting CriticMarkup</li>
457+
<li>UPDATED: Remove deprecated fodt.c and fodt.h</li>
458+
<li>UPDATED: Update dates</li>
459+
<li>UPDATED: specify types to silence warnings and prevent theoretical errors</li>
460+
<li>add cocoaconv.rb enum conversion script</li>
461+
<li>change d_string_erase argument docstring</li>
462+
<li>drop redundant enum case prefixes in Swift</li>
463+
<li>drop redundant enum name prefixes from enum cases</li>
464+
<li>expose singular-S type to Swift code generator</li>
465+
<li>fix target platform spelling (macosx, not macos)</li>
466+
<li>remove plural S from enum type names</li>
467+
</ul></li>
435468
<li><p>2017&#8211;11&#8211;20 - v 6.2.3:</p>
436469

437470
<ul>

‎DevelopmentNotes/DevelopmentNotes.pdf‎

1.97 KB
Binary file not shown.

‎DevelopmentNotes/DevelopmentNotes.txt‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Title: MultiMarkdown v6 Development Notes
22
Author: Fletcher T. Penney
3-
Date: 2017-11-20
3+
Date: 2018-02-05
44
LaTeX Config: tufte-handout
55
Base Header Level: 3
66
uuid: dd2d8e76-dc2d-416d-9acd-5395d20871c2
@@ -471,6 +471,39 @@ TextBundle/TextPack, OpenDocument, etc.
471471

472472
# Changelog #
473473

474+
* 2018-02-05 - v 6.3.0:
475+
476+
* ADDED: Add additional CM tests
477+
* ADDED: Add beamer LaTeX support files to installer
478+
* ADDED: Update beamer latex support files for MMD 6 latex config metadata support
479+
* FIXED: All test build on path with spaces
480+
* FIXED: Don't use libcurl on test build
481+
* FIXED: Fix HTML 5 compliance with image dimensions; Fix CriticMarkup inside code spans/blocks
482+
* FIXED: Fix bug in token pruning
483+
* FIXED: Fix bug with setting tail in token prune/graft
484+
* FIXED: Fix edge case with superscripts and punctuation
485+
* FIXED: Fix issue in Windows code
486+
* FIXED: Fix issue with list bullets in fenced code blocks
487+
* FIXED: Fix reject/accept with highlighting
488+
* FIXED: Fix typo in QuickStart.txt (fixes #111)
489+
* FIXED: Properly assign ambidextrous tokens in tables
490+
* Fix encoding of some markup inside LaTeX texttt environment (fixes #110 and #108)
491+
* UPDATED: Add Spanish style quotes support
492+
* UPDATED: Add test suite to d_string
493+
* UPDATED: Apply astyle to source
494+
* UPDATED: Improve commands for accepting/rejecting CriticMarkup
495+
* UPDATED: Remove deprecated fodt.c and fodt.h
496+
* UPDATED: Update dates
497+
* UPDATED: specify types to silence warnings and prevent theoretical errors
498+
* add cocoaconv.rb enum conversion script
499+
* change d_string_erase argument docstring
500+
* drop redundant enum case prefixes in Swift
501+
* drop redundant enum name prefixes from enum cases
502+
* expose singular-S type to Swift code generator
503+
* fix target platform spelling (macosx, not macos)
504+
* remove plural S from enum type names
505+
506+
474507
* 2017-11-20 - v 6.2.3:
475508

476509
* CHANGED: Fix typos

‎QuickStart/QuickStart.epub‎

-3 Bytes
Binary file not shown.

‎QuickStart/QuickStart.fodt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ office:mimetype="application/vnd.oasis.opendocument.text">
276276
<office:meta>
277277
<dc:title>MultiMarkdown v6 Quick Start Guide</dc:title>
278278
<dc:creator>Fletcher T. Penney</dc:creator>
279-
<meta:user-defined meta:name="version">6.2.2</meta:user-defined>
279+
<meta:user-defined meta:name="version">6.3.0</meta:user-defined>
280280
<meta:user-defined meta:name="uuid">0d6313fa-9135-477e-9c14-7d62c1977833</meta:user-defined>
281281
</office:meta>
282282
<office:body>
@@ -318,7 +318,7 @@ office:mimetype="application/vnd.oasis.opendocument.text">
318318

319319
<text:h text:outline-level="3"><text:bookmark text:name="introduction"/>Introduction </text:h>
320320

321-
<text:p text:style-name="Standard">Version: 6.2.2</text:p>
321+
<text:p text:style-name="Standard">Version: 6.3.0</text:p>
322322

323323
<text:p text:style-name="Standard">This document serves as a description of MultiMarkdown (MMD) v6, as well as a sample
324324
document to demonstrate the various features. Specifically, differences from
@@ -663,7 +663,7 @@ new system.</text:p>
663663
<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
664664
you to specify a &#8220;document name&#8221; that is used to automatically identify the
665665
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
666-
example, using <text:span text:style-name="Source_20_Text">latex config: artice</text:span> is the same as using:</text:p>
666+
example, using <text:span text:style-name="Source_20_Text">latex config: article</text:span> is the same as using:</text:p>
667667

668668
<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>
669669

‎QuickStart/QuickStart.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8"/>
55
<title>MultiMarkdown v6 Quick Start Guide</title>
66
<meta name="author" content="Fletcher T. Penney"/>
7-
<meta name="version" content="6.2.2"/>
7+
<meta name="version" content="6.3.0"/>
88
<meta name="uuid" content="0d6313fa-9135-477e-9c14-7d62c1977833"/>
99
</head>
1010
<body>
@@ -43,7 +43,7 @@
4343

4444
<h3 id="introduction">Introduction </h3>
4545

46-
<p>Version: 6.2.2</p>
46+
<p>Version: 6.3.0</p>
4747

4848
<p>This document serves as a description of MultiMarkdown (<abbr title="MultiMarkdown">MMD</abbr>) v6, as well as a sample
4949
document to demonstrate the various features. Specifically, differences from
@@ -354,7 +354,7 @@ <h4 id="latexchanges">LaTeX Changes </h4>
354354
<p><strong><em>In addition</em></strong>, there is a new shortcut key &#8211; <code>latex config</code>. This allows
355355
you to specify a &#8220;document name&#8221; that is used to automatically identify the
356356
corresponding <code>latex leader</code>, <code>latex begin</code>, and <code>latex footer</code> files. For
357-
example, using <code>latex config: artice</code> is the same as using:</p>
357+
example, using <code>latex config: article</code> is the same as using:</p>
358358

359359
<pre><code>latex leader: mmd6-article-leader
360360
latex begin: mmd6-article-begin

‎QuickStart/QuickStart.pdf‎

-391 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)