Merge branch 'release/6.0.0-rc1'

fletcher · Mar 15, 2017 · f3b0ba4 · f3b0ba4
2 parents 0299ea5 + bc2d904
commit f3b0ba4
Show file tree

Hide file tree

Showing 41 changed files with 6,507 additions and 3,966 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,10 +8,10 @@ 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-03-13")
+set (My_Project_Revised_Date "2017-03-15")
 set (My_Project_Version_Major 6)
 set (My_Project_Version_Minor 0)
-set (My_Project_Version_Patch 0-b2)
+set (My_Project_Version_Patch 0-rc1)
 
 set (My_Project_Version "${My_Project_Version_Major}.${My_Project_Version_Minor}.${My_Project_Version_Patch}")
 

diff --git a/DevelopmentNotes/DevelopmentNotes.epub b/DevelopmentNotes/DevelopmentNotes.epub
diff --git a/DevelopmentNotes/DevelopmentNotes.fodt b/DevelopmentNotes/DevelopmentNotes.fodt
diff --git a/DevelopmentNotes/DevelopmentNotes.html b/DevelopmentNotes/DevelopmentNotes.html
diff --git a/DevelopmentNotes/DevelopmentNotes.pdf b/DevelopmentNotes/DevelopmentNotes.pdf
diff --git a/DevelopmentNotes/DevelopmentNotes.txt b/DevelopmentNotes/DevelopmentNotes.txt
diff --git a/QuickStart.epub b/QuickStart.epub
diff --git a/QuickStart/QuickStart.epub b/QuickStart/QuickStart.epub
diff --git a/QuickStart.fodt → QuickStart/QuickStart.fodt b/QuickStart.fodt → QuickStart/QuickStart.fodt
@@ -274,7 +274,7 @@
 <office:meta>
 	<dc:title>MultiMarkdown v6 Quick Start Guide</dc:title>
 	<meta:user-defined meta:name="author">Fletcher T. Penney</meta:user-defined>
-	<meta:user-defined meta:name="version">6.0-b</meta:user-defined>
+	<meta:user-defined meta:name="version">6.0.0-rc1</meta:user-defined>
 	<meta:user-defined meta:name="uuid">0d6313fa-9135-477e-9c14-7d62c1977833</meta:user-defined>
 </office:meta>
 <office:body>
@@ -308,7 +308,7 @@
 
 <text:h text:outline-level="3"><text:bookmark text:name="introduction"/>Introduction </text:h>
 
-<text:p text:style-name="Standard">Version: 6.0-b</text:p>
+<text:p text:style-name="Standard">Version: 6.0.0-rc1</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
@@ -503,10 +503,9 @@ older versions of the EPUB format, but other tools can convert to other
 document formats you need. Same goes for Amazon&#8217;s ebook formats &#8211; the
 <text:a xlink:type="simple" xlink:href="https://calibre-ebook.com/">Calibre</text:a> program can also be used to interconvert between formats.</text:p>
 
-<text:p text:style-name="Standard">**NOTE: Because EPUB documents are binary files, MMD only creates them when
-**run in batch mode (using the <text:span text:style-name="Source_20_Text">-b\--batch</text:span> options). Otherwise, it simply
-**outputs the HTML 5 file that would serve as the primary content for the
-**EPUB.</text:p>
+<text:p text:style-name="Standard"><text:span text:style-name="MMD-Bold">NOTE</text:span>: Because EPUB documents are binary files, MMD only creates them when
+run in batch mode (using the <text:span text:style-name="Source_20_Text">-b\--batch</text:span> options). Otherwise, it simply
+outputs the HTML 5 file that would serve as the primary content for the EPUB.</text:p>
 
 <text:h text:outline-level="4"><text:bookmark text:name="fencedcodeblocks"/>Fenced Code Blocks </text:h>
 

diff --git a/QuickStart.html → QuickStart/QuickStart.html b/QuickStart.html → 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.0-b"/>
+	<meta name="version" content="6.0.0-rc1"/>
 	<meta name="uuid" content="0d6313fa-9135-477e-9c14-7d62c1977833"/>
 </head>
 <body>
@@ -35,7 +35,7 @@
 
 <h3 id="introduction">Introduction </h3>
 
-<p>Version: 6.0-b</p>
+<p>Version: 6.0.0-rc1</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
@@ -217,10 +217,9 @@ <h4 id="epub3support">EPUB 3 Support </h4>
 document formats you need. Same goes for Amazon&#8217;s ebook formats &#8211; the
 <a href="https://calibre-ebook.com/">Calibre</a> program can also be used to interconvert between formats.</p>
 
-<p>**NOTE: Because EPUB documents are binary files, <abbr title="MultiMarkdown">MMD</abbr> only creates them when
-**run in batch mode (using the <code>-b\--batch</code> options). Otherwise, it simply
-**outputs the HTML 5 file that would serve as the primary content for the
-**EPUB.</p>
+<p><strong>NOTE</strong>: Because EPUB documents are binary files, <abbr title="MultiMarkdown">MMD</abbr> only creates them when
+run in batch mode (using the <code>-b\--batch</code> options). Otherwise, it simply
+outputs the HTML 5 file that would serve as the primary content for the EPUB.</p>
 
 <h4 id="fencedcodeblocks">Fenced Code Blocks </h4>
 

diff --git a/QuickStart.pdf → QuickStart/QuickStart.pdf b/QuickStart.pdf → QuickStart/QuickStart.pdf
diff --git a/QuickStart.txt → QuickStart/QuickStart.txt b/QuickStart.txt → QuickStart/QuickStart.txt
@@ -1,6 +1,6 @@
 Title:	MultiMarkdown v6 Quick Start Guide
 Author:	Fletcher T. Penney
-Version:	6.0-b
+Version:	6.0.0-rc1
 LaTeX Config:	tufte-handout
 Base Header Level:	3
 uuid:	0d6313fa-9135-477e-9c14-7d62c1977833
@@ -202,10 +202,9 @@ older versions of the EPUB format, but other tools can convert to other
 document formats you need.  Same goes for Amazon's ebook formats -- the
 [Calibre] program can also be used to interconvert between formats.
 
-**NOTE: Because EPUB documents are binary files, MMD only creates them when
-**run in batch mode (using the `-b\--batch` options).  Otherwise, it simply
-**outputs the HTML 5 file that would serve as the primary content for the
-**EPUB.
+**NOTE**: Because EPUB documents are binary files, MMD only creates them when
+run in batch mode (using the `-b\--batch` options).  Otherwise, it simply
+outputs the HTML 5 file that would serve as the primary content for the EPUB.
 
 
 ## Fenced Code Blocks ##