Version bump

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 432108ad62e930015b2d59f0576b2ce5a17de5dd..07a70be282829512a9d1ed3e776d9c57ddd6b9a9 100644 (file)
--- 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-29")
+set (My_Project_Revised_Date "2017-04-09")
 set (My_Project_Version_Major 6)
 set (My_Project_Version_Minor 0)
-set (My_Project_Version_Patch 3)
+set (My_Project_Version_Patch 4)
 
 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
index 6aef81cb3219468ad399d91af6d7d8793b734c63..81c1573105004a5f06e91335d2181b7bc32f5790 100644 (file)
Binary files a/DevelopmentNotes/DevelopmentNotes.epub and b/DevelopmentNotes/DevelopmentNotes.epub differ

diff --git a/DevelopmentNotes/DevelopmentNotes.fodt b/DevelopmentNotes/DevelopmentNotes.fodt
index e642a36b9d87ff37018068c9d9f4288847bf3e52..543474f148db8fc879f01dc0e1c927058717ed2a 100644 (file)
--- a/DevelopmentNotes/DevelopmentNotes.fodt
+++ b/DevelopmentNotes/DevelopmentNotes.fodt
@@ -755,6 +755,61 @@ more cross-platform approach than that used by MMD v5.</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">2017&#8211;04&#8211;09 - v 6.0.4:</text:p>
+
+<text:list text:style-name="L1">
+<text:list-item>
+<text:p text:style-name="P1">
+ADDED: The &#8216;&#8211;l&#8217; command line argument also sets language, if not overridden by metadata</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+FIXED: Fix regular expression to match table separator lines. (Fixes #50)</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="Standard">FIXED: Improve organization of fallback lines for fenced code blocks and HTML blocks</text:p></text:list-item>
+
+</text:list></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="Standard">2017&#8211;03&#8211;29 - v 6.0.3:</text:p>
+
+<text:list text:style-name="L1">
+<text:list-item>
+<text:p text:style-name="P1">
+ADDED: Script for updating re2c and lemon files</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+CHANGED: Recompile lexer using &#8211;8 flag</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+CHANGED: Recompile scanners using &#8211;8 flag</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="Standard">FIXED: Don&#8217;t separate out 'à'</text:p></text:list-item>
+
+</text:list></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="Standard">2017&#8211;03&#8211;29 - v 6.0.2:</text:p>
+
+<text:list text:style-name="L1">
+<text:list-item>
+<text:p text:style-name="P1">
+CHANGED: Refactor code slightly</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="P1">
+CHANGED: Remove ASCII non&#8211;breaking space support from lexer</text:p></text:list-item>
+
+<text:list-item>
+<text:p text:style-name="Standard">FIXED: Fix quote pairing in compatibility mode</text:p></text:list-item>
+
+</text:list></text:list-item>
+
 <text:list-item>
 <text:p text:style-name="Standard">2017&#8211;03&#8211;28 &#8211; v 6.0.1:</text:p></text:list-item>
 

diff --git a/DevelopmentNotes/DevelopmentNotes.html b/DevelopmentNotes/DevelopmentNotes.html
index 6694be27f81060dfed142309a2c54d0ad3bfc7ef..35737d78bb4740b001126b3b0e5b6c55c2250f82 100644 (file)
--- a/DevelopmentNotes/DevelopmentNotes.html
+++ b/DevelopmentNotes/DevelopmentNotes.html
@@ -429,6 +429,28 @@ more cross-platform approach than that used by <abbr title="MultiMarkdown">MMD</
 <h3 id="changelog">Changelog </h3>
 
 <ul>
+<li><p>2017&#8211;04&#8211;09 - v 6.0.4:</p>
+
+<ul>
+<li>ADDED: The &#8216;&#8211;l&#8217; command line argument also sets language, if not overridden by metadata</li>
+<li>FIXED: Fix regular expression to match table separator lines. (Fixes #50)</li>
+<li>FIXED: Improve organization of fallback lines for fenced code blocks and HTML blocks</li>
+</ul></li>
+<li><p>2017&#8211;03&#8211;29 - v 6.0.3:</p>
+
+<ul>
+<li>ADDED: Script for updating re2c and lemon files</li>
+<li>CHANGED: Recompile lexer using &#8211;8 flag</li>
+<li>CHANGED: Recompile scanners using &#8211;8 flag</li>
+<li>FIXED: Don&#8217;t separate out 'à'</li>
+</ul></li>
+<li><p>2017&#8211;03&#8211;29 - v 6.0.2:</p>
+
+<ul>
+<li>CHANGED: Refactor code slightly</li>
+<li>CHANGED: Remove ASCII non&#8211;breaking space support from lexer</li>
+<li>FIXED: Fix quote pairing in compatibility mode</li>
+</ul></li>
 <li><p>2017&#8211;03&#8211;28 &#8211; v 6.0.1:</p></li>
 <li><p>CHANGED: Adjust LaTeX support files</p></li>
 <li><p>CHANGED: Fix potential bug in tokenize function</p></li>

diff --git a/DevelopmentNotes/DevelopmentNotes.pdf b/DevelopmentNotes/DevelopmentNotes.pdf
index 62eb9900d10568f0496fdbf3a9dee7fbaf275d3a..8c1a119f79fe9b4bf3c2b2b754204e7e3797ce3e 100644 (file)
Binary files a/DevelopmentNotes/DevelopmentNotes.pdf and b/DevelopmentNotes/DevelopmentNotes.pdf differ

diff --git a/DevelopmentNotes/DevelopmentNotes.txt b/DevelopmentNotes/DevelopmentNotes.txt
index 2dfa5fad2df1e30f12d0830bf68818832910fad9..e9cc17ca3443ecca8e8e9f25843ac9f5073e82ea 100644 (file)
--- a/DevelopmentNotes/DevelopmentNotes.txt
+++ b/DevelopmentNotes/DevelopmentNotes.txt
@@ -466,6 +466,13 @@ more cross-platform approach than that used by MMD v5.
 
 # Changelog #
 
+* 2017-04-09 - v 6.0.4:
+
+       *    ADDED: The '-l' command line argument also sets language, if not overridden by metadata
+       *    FIXED: Fix regular expression to match table separator lines. (Fixes #50)
+       *    FIXED: Improve organization of fallback lines for fenced code blocks and HTML blocks
+
+
 * 2017-03-29 - v 6.0.3:
 
        *    ADDED: Script for updating re2c and lemon files

diff --git a/README.md b/README.md
index 46f0481aa64adcc8a1ec8bd3a66d1b89af7fbc8f..48c312d61ce72457a40e843355dbd026ce109aac 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
 | ---------- | ------------------------- |  
 | Title:     | MultiMarkdown        |  
 | Author:    | Fletcher T. Penney       |  
-| Date:      | 2017-03-29 |  
+| Date:      | 2017-04-09 |  
 | Copyright: | Copyright © 2016 - 2017 Fletcher T. Penney.    |  
-| Version:   | 6.0.3      |  
+| Version:   | 6.0.4      |  
 
 
 ## An Announcement! ##