Skip to content

Commit

Permalink
Merge branch 'release/6.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
fletcher committed Mar 28, 2018
2 parents 7dd192d + eb41f04 commit 23485eb
Show file tree
Hide file tree
Showing 12 changed files with 158 additions and 15 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "2018-03-27")
set (My_Project_Revised_Date "2018-03-28")
set (My_Project_Version_Major 6)
set (My_Project_Version_Minor 3)
set (My_Project_Version_Patch 1)
set (My_Project_Version_Patch 2)

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

Expand Down
Binary file modified DevelopmentNotes/DevelopmentNotes.epub
Binary file not shown.
91 changes: 89 additions & 2 deletions DevelopmentNotes/DevelopmentNotes.fodt
Original file line number Diff line number Diff line change
Expand Up @@ -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">2018-02-05</meta:user-defined>
<meta:user-defined meta:name="date">2018-03-38</meta:user-defined>
<meta:user-defined meta:name="uuid">dd2d8e76-dc2d-416d-9acd-5395d20871c2</meta:user-defined>
</office:meta>
<office:body>
Expand Down Expand Up @@ -721,7 +721,8 @@ the code or used during the development.</text:p>
<text:h text:outline-level="3"><text:bookmark text:name="dependencieslibraries"/>Dependencies/Libraries </text:h>

<text:p text:style-name="Standard">MMD v6 has no external dependencies when compiling, aside from the standard
libraries for C development.</text:p>
libraries for C development (Except that it will use <text:span text:style-name="Source_20_Text">libcurl</text:span> if available in
order to support downloading remote images/files for EPUB/FODT exporting.</text:p>

<text:p text:style-name="Standard">MMD can be compiled without any other tools beside the build system (cmake).</text:p>

Expand Down Expand Up @@ -762,6 +763,92 @@ 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;03&#8211;28 - v 6.3.2:</text:p>

<text:list text:style-name="L1">
<text:list-item>
<text:p text:style-name="Standard">UPDATED: Update documentation</text:p></text:list-item>

</text:list></text:list-item>

<text:list-item>
<text:p text:style-name="Standard">2018&#8211;03&#8211;27 - v 6.3.1:</text:p>

<text:list text:style-name="L1">
<text:list-item>
<text:p text:style-name="P1">
ADDED: Add beamer support for code highlighting</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
ADDED: Add extra tests for variations on link types</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
ADDED: Add integrated memoir test</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
ADDED: Migrate manuscript and memoir(book) LaTeX formats to MMD-6</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Checking for metadata was partially erasing token tree and leaving engine in invalid state</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Explicitly disable metadata in compatibility mode</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix Makefile for Windows 32-bit zip</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix detection of invalid request to copy substring of DString</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix issue with empty metadata lines</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix issue with raw source markers(fixes #115)</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix issue with trailing ATX hash without final newline</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix potential pointer overflow if line starts with &#8216;:::&#8217;</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Improve internal link creation in LaTeX</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Improve logic for disabling metadata</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Improve parsing of HTML 5 tag</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Add beginnings of Beamer test suite; add support for beamer/memoir and raw text blocks</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Update quick start guide</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="Standard">UPDATED: Update remaining tests for LaTeX change</text:p></text:list-item>

</text:list></text:list-item>

<text:list-item>
<text:p text:style-name="Standard">2018&#8211;02&#8211;05 - v 6.3.0:</text:p>

Expand Down
32 changes: 30 additions & 2 deletions DevelopmentNotes/DevelopmentNotes.html
Original file line number Diff line number Diff line change
Expand Up @@ -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="2018-02-05"/>
<meta name="date" content="2018-03-38"/>
<meta name="uuid" content="dd2d8e76-dc2d-416d-9acd-5395d20871c2"/>
</head>
<body>
Expand Down Expand Up @@ -399,7 +399,8 @@ <h4 id="unittesting">Unit Testing </h4>
<h3 id="dependencieslibraries">Dependencies/Libraries </h3>

<p><abbr title="MultiMarkdown">MMD</abbr> v6 has no external dependencies when compiling, aside from the standard
libraries for C development.</p>
libraries for C development (Except that it will use <code>libcurl</code> if available in
order to support downloading remote images/files for EPUB/FODT exporting.</p>

<p><abbr title="MultiMarkdown">MMD</abbr> can be compiled without any other tools beside the build system (cmake).</p>

Expand Down Expand Up @@ -432,6 +433,33 @@ <h3 id="dependencieslibraries">Dependencies/Libraries </h3>
<h3 id="changelog">Changelog </h3>

<ul>
<li><p>2018&#8211;03&#8211;28 - v 6.3.2:</p>

<ul>
<li>UPDATED: Update documentation</li>
</ul></li>
<li><p>2018&#8211;03&#8211;27 - v 6.3.1:</p>

<ul>
<li>ADDED: Add beamer support for code highlighting</li>
<li>ADDED: Add extra tests for variations on link types</li>
<li>ADDED: Add integrated memoir test</li>
<li>ADDED: Migrate manuscript and memoir(book) LaTeX formats to <abbr title="MultiMarkdown">MMD</abbr>-6</li>
<li>FIXED: Checking for metadata was partially erasing token tree and leaving engine in invalid state</li>
<li>FIXED: Explicitly disable metadata in compatibility mode</li>
<li>FIXED: Fix Makefile for Windows 32-bit zip</li>
<li>FIXED: Fix detection of invalid request to copy substring of DString</li>
<li>FIXED: Fix issue with empty metadata lines</li>
<li>FIXED: Fix issue with raw source markers(fixes #115)</li>
<li>FIXED: Fix issue with trailing ATX hash without final newline</li>
<li>FIXED: Fix potential pointer overflow if line starts with &#8216;:::&#8217;</li>
<li>FIXED: Improve internal link creation in LaTeX</li>
<li>FIXED: Improve logic for disabling metadata</li>
<li>FIXED: Improve parsing of HTML 5 <video> tag</li>
<li>UPDATED: Add beginnings of Beamer test suite; add support for beamer/memoir and raw text blocks</li>
<li>UPDATED: Update quick start guide</li>
<li>UPDATED: Update remaining tests for LaTeX change</li>
</ul></li>
<li><p>2018&#8211;02&#8211;05 - v 6.3.0:</p>

<ul>
Expand Down
Binary file modified DevelopmentNotes/DevelopmentNotes.pdf
Binary file not shown.
32 changes: 30 additions & 2 deletions DevelopmentNotes/DevelopmentNotes.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Title: MultiMarkdown v6 Development Notes
Author: Fletcher T. Penney
Date: 2018-02-05
Date: 2018-03-38
LaTeX Config: tufte-handout
Base Header Level: 3
uuid: dd2d8e76-dc2d-416d-9acd-5395d20871c2
Expand Down Expand Up @@ -422,7 +422,8 @@ the code or used during the development.
# Dependencies/Libraries #

MMD v6 has no external dependencies when compiling, aside from the standard
libraries for C development.
libraries for C development (Except that it will use `libcurl` if available in
order to support downloading remote images/files for EPUB/FODT exporting.

MMD can be compiled without any other tools beside the build system (cmake).

Expand Down Expand Up @@ -471,6 +472,33 @@ TextBundle/TextPack, OpenDocument, etc.

# Changelog #

* 2018-03-28 - v 6.3.2:

* UPDATED: Update documentation


* 2018-03-27 - v 6.3.1:

* ADDED: Add beamer support for code highlighting
* ADDED: Add extra tests for variations on link types
* ADDED: Add integrated memoir test
* ADDED: Migrate manuscript and memoir(book) LaTeX formats to MMD-6
* FIXED: Checking for metadata was partially erasing token tree and leaving engine in invalid state
* FIXED: Explicitly disable metadata in compatibility mode
* FIXED: Fix Makefile for Windows 32-bit zip
* FIXED: Fix detection of invalid request to copy substring of DString
* FIXED: Fix issue with empty metadata lines
* FIXED: Fix issue with raw source markers(fixes #115)
* FIXED: Fix issue with trailing ATX hash without final newline
* FIXED: Fix potential pointer overflow if line starts with ':::'
* FIXED: Improve internal link creation in LaTeX
* FIXED: Improve logic for disabling metadata
* FIXED: Improve parsing of HTML 5 <video> tag
* UPDATED: Add beginnings of Beamer test suite; add support for beamer/memoir and raw text blocks
* UPDATED: Update quick start guide
* UPDATED: Update remaining tests for LaTeX change


* 2018-02-05 - v 6.3.0:

* ADDED: Add additional CM tests
Expand Down
Binary file modified QuickStart/QuickStart.epub
Binary file not shown.
4 changes: 2 additions & 2 deletions QuickStart/QuickStart.fodt
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0</meta:user-defined>
<meta:user-defined meta:name="version">6.3.2</meta:user-defined>
<meta:user-defined meta:name="uuid">0d6313fa-9135-477e-9c14-7d62c1977833</meta:user-defined>
</office:meta>
<office:body>
Expand Down Expand Up @@ -321,7 +321,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.3.0</text:p>
<text:p text:style-name="Standard">Version: 6.3.2</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
Expand Down
4 changes: 2 additions & 2 deletions QuickStart/QuickStart.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0"/>
<meta name="version" content="6.3.2"/>
<meta name="uuid" content="0d6313fa-9135-477e-9c14-7d62c1977833"/>
</head>
<body>
Expand Down Expand Up @@ -49,7 +49,7 @@

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

<p>Version: 6.3.0</p>
<p>Version: 6.3.2</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
Expand Down
Binary file modified QuickStart/QuickStart.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion QuickStart/QuickStart.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Title: MultiMarkdown v6 Quick Start Guide
Author: Fletcher T. Penney
Version: 6.3.0
Version: 6.3.2
LaTeX Config: tufte-handout
Base Header Level: 3
uuid: 0d6313fa-9135-477e-9c14-7d62c1977833
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
| ---------- | ------------------------- |
| Title: | MultiMarkdown |
| Author: | Fletcher T. Penney |
| Date: | 2018-03-27 |
| Date: | 2018-03-28 |
| Copyright: | Copyright © 2016 - 2018 Fletcher T. Penney. |
| Version: | 6.3.1 |
| Version: | 6.3.2 |

master branch: [![Build Status](https://travis-ci.org/fletcher/MultiMarkdown-6.svg?branch=master)](https://travis-ci.org/fletcher/MultiMarkdown-6)
develop branch: [![Build Status](https://travis-ci.org/fletcher/MultiMarkdown-6.svg?branch=develop)](https://travis-ci.org/fletcher/MultiMarkdown-6)
Expand Down

0 comments on commit 23485eb

Please sign in to comment.