Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:fletcher/MultiMarkdown-6 into de…
Browse files Browse the repository at this point in the history 
…velop
  • Loading branch information
@fletcher
fletcher committed Dec 31, 2023
2 parents aa02aa7 + cd8d3b0 commit 7faad61
Show file tree
Hide file tree
Showing 34 changed files with 558 additions and 132 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ cmake_minimum_required(VERSION 2.9)
set (My_Project_Title "libMultiMarkdown")
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 "2020-10-28")
set (My_Project_Revised_Date "2023-06-10")
set (My_Project_Version_Major 6)
set (My_Project_Version_Minor 6)
set (My_Project_Version_Minor 7)
set (My_Project_Version_Patch 0)

set (My_Project_Copyright_Date "2016 - 2020")
set (My_Project_Copyright_Date "2016 - 2023")

set (My_Project_Identifier "net.fletcherpenney.multimarkdown")

Expand Down
Binary file modified DevelopmentNotes/DevelopmentNotes.epub
View file
Binary file not shown.
223 changes: 222 additions & 1 deletion DevelopmentNotes/DevelopmentNotes.fodt
View file
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">2020-10-28</meta:user-defined>
<meta:user-defined meta:name="date">2023-06-10</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 @@ -763,6 +763,227 @@ 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">2023&#8211;06&#8211;10 - v 6.7.0:</text:p>

<text:list text:style-name="L1">
<text:list-item>
<text:p text:style-name="P1">
ADDED: Add OBJECT_REPLACEMENT_CHARACTER token (fixes #216)</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
ADDED: Add compiler flag (DISABLE_OBJECT_POOL) to disable token pools</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
ADDED: Add more token types</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
Add Swift support</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
Avoid space to be eaten aways after a slash in latex export</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
CHANGED: Add additional TOC tests</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
CHANGED: Astyle</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
CHANGED: Reformat comment</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Centralize html fix</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Don&#8217;t output empty figure captions</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix Glossaries test</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix ambidextrous tokens inside of footnotes and other definitions</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix architecture issue when running multimarkdown from Xcode</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix edge case where table separator without leading pipe is treated as a list item</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix error detecting tables when indented in list items &#8211; Thanks, @wnm3!</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix flow control error</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix issue with certain nested lists</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix issue with escaping in URLs</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix issue with reference links with leading space instead of tab</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix regression from pull request that breaks build</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix style issue with ODT output format</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix trailing whitespace issues in headers/TOC</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix typo in xml.c</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Fix typos in error messages</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Improve README install path</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Improve edge cases around fenced code blocks and setext headers</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Improve markup handling around definition lists and colons</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Improve token mapping in header blocks</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Left out file</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Re-enable token object pools in default configuration</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Reset stack sizes before freeing temporary engine</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Restore prior label_counter after {{TOC}}</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Updated argtable3 now needs to link to math</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Use MultiMarkdown instead of libMultiMarkdown as title in version.h</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: Use UTC for timestamp</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
FIXED: bibtex metadata should be raw</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
Merge branch &#8216;develop&#8217; of github.com:fletcher/MultiMarkdown-6 into develop</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
Merge branch &#8216;release/6.6.0&#8217; into develop</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
Merge pull request #210 from DivineDominion/swift-framework</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
Merge pull request #233 from DivineDominion/patch-4</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
Merge pull request #243 from alexban011/githubCi</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
Merge pull request #245 from hvellyr/develop</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Apply astyle to all files</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Include definition list colons as markup token</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Project clean up</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Update CMakeLists.txt for Universal Binary</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Update astyle config</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Update github CI for multiple platforms</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Update lexers with newer version of re2c</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: Update to latest argtable3 code</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
UPDATED: standardize common source files</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
ci: added github CI</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="P1">
specify unsigned short for functions in token.h</text:p></text:list-item>

<text:list-item>
<text:p text:style-name="Standard">use unsigned short in implementation, too</text:p></text:list-item>

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

<text:list-item>
<text:p text:style-name="Standard">2020&#8211;10&#8211;28 - v 6.6.0:</text:p>

Expand Down
60 changes: 59 additions & 1 deletion DevelopmentNotes/DevelopmentNotes.html
View file
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="2020-10-28"/>
<meta name="date" content="2023-06-10"/>
<meta name="uuid" content="dd2d8e76-dc2d-416d-9acd-5395d20871c2"/>
</head>
<body>
Expand Down Expand Up @@ -433,6 +433,64 @@ <h3 id="dependencieslibraries">Dependencies/Libraries</h3>
<h3 id="changelog">Changelog</h3>

<ul>
<li><p>2023&#8211;06&#8211;10 - v 6.7.0:</p>

<ul>
<li>ADDED: Add OBJECT_REPLACEMENT_CHARACTER token (fixes #216)</li>
<li>ADDED: Add compiler flag (DISABLE_OBJECT_POOL) to disable token pools</li>
<li>ADDED: Add more token types</li>
<li>Add Swift support</li>
<li>Avoid space to be eaten aways after a slash in latex export</li>
<li>CHANGED: Add additional TOC tests</li>
<li>CHANGED: Astyle</li>
<li>CHANGED: Reformat comment</li>
<li>FIXED: Centralize html fix</li>
<li>FIXED: Don&#8217;t output empty figure captions</li>
<li>FIXED: Fix Glossaries test</li>
<li>FIXED: Fix ambidextrous tokens inside of footnotes and other definitions</li>
<li>FIXED: Fix architecture issue when running multimarkdown from Xcode</li>
<li>FIXED: Fix edge case where table separator without leading pipe is treated as a list item</li>
<li>FIXED: Fix error detecting tables when indented in list items &#8211; Thanks, @wnm3!</li>
<li>FIXED: Fix flow control error</li>
<li>FIXED: Fix issue with certain nested lists</li>
<li>FIXED: Fix issue with escaping in URLs</li>
<li>FIXED: Fix issue with reference links with leading space instead of tab</li>
<li>FIXED: Fix regression from pull request that breaks build</li>
<li>FIXED: Fix style issue with ODT output format</li>
<li>FIXED: Fix trailing whitespace issues in headers/TOC</li>
<li>FIXED: Fix typo in xml.c</li>
<li>FIXED: Fix typos in error messages</li>
<li>FIXED: Improve README install path</li>
<li>FIXED: Improve edge cases around fenced code blocks and setext headers</li>
<li>FIXED: Improve markup handling around definition lists and colons</li>
<li>FIXED: Improve token mapping in header blocks</li>
<li>FIXED: Left out file</li>
<li>FIXED: Re-enable token object pools in default configuration</li>
<li>FIXED: Reset stack sizes before freeing temporary engine</li>
<li>FIXED: Restore prior label_counter after {{TOC}}</li>
<li>FIXED: Updated argtable3 now needs to link to math</li>
<li>FIXED: Use MultiMarkdown instead of libMultiMarkdown as title in version.h</li>
<li>FIXED: Use UTC for timestamp</li>
<li>FIXED: bibtex metadata should be raw</li>
<li>Merge branch &#8216;develop&#8217; of github.com:fletcher/MultiMarkdown-6 into develop</li>
<li>Merge branch &#8216;release/6.6.0&#8217; into develop</li>
<li>Merge pull request #210 from DivineDominion/swift-framework</li>
<li>Merge pull request #233 from DivineDominion/patch-4</li>
<li>Merge pull request #243 from alexban011/githubCi</li>
<li>Merge pull request #245 from hvellyr/develop</li>
<li>UPDATED: Apply astyle to all files</li>
<li>UPDATED: Include definition list colons as markup token</li>
<li>UPDATED: Project clean up</li>
<li>UPDATED: Update CMakeLists.txt for Universal Binary</li>
<li>UPDATED: Update astyle config</li>
<li>UPDATED: Update github CI for multiple platforms</li>
<li>UPDATED: Update lexers with newer version of re2c</li>
<li>UPDATED: Update to latest argtable3 code</li>
<li>UPDATED: standardize common source files</li>
<li>ci: added github CI</li>
<li>specify unsigned short for functions in token.h</li>
<li>use unsigned short in implementation, too</li>
</ul></li>
<li><p>2020&#8211;10&#8211;28 - v 6.6.0:</p>

<ul>
Expand Down
Binary file modified DevelopmentNotes/DevelopmentNotes.pdf
View file
Binary file not shown.
60 changes: 59 additions & 1 deletion DevelopmentNotes/DevelopmentNotes.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Title: MultiMarkdown v6 Development Notes
Author: Fletcher T. Penney
Date: 2020-10-28
Date: 2023-06-10
LaTeX Config: tufte-handout
Base Header Level: 3
uuid: dd2d8e76-dc2d-416d-9acd-5395d20871c2
Expand Down Expand Up @@ -472,6 +472,64 @@ TextBundle/TextPack, OpenDocument, etc.

# Changelog #

* 2023-06-10 - v 6.7.0:

* ADDED: Add OBJECT_REPLACEMENT_CHARACTER token (fixes #216)
* ADDED: Add compiler flag (DISABLE_OBJECT_POOL) to disable token pools
* ADDED: Add more token types
* Add Swift support
* Avoid space to be eaten aways after a slash in latex export
* CHANGED: Add additional TOC tests
* CHANGED: Astyle
* CHANGED: Reformat comment
* FIXED: Centralize html fix
* FIXED: Don't output empty figure captions
* FIXED: Fix Glossaries test
* FIXED: Fix ambidextrous tokens inside of footnotes and other definitions
* FIXED: Fix architecture issue when running multimarkdown from Xcode
* FIXED: Fix edge case where table separator without leading pipe is treated as a list item
* FIXED: Fix error detecting tables when indented in list items -- Thanks, @wnm3!
* FIXED: Fix flow control error
* FIXED: Fix issue with certain nested lists
* FIXED: Fix issue with escaping in URLs
* FIXED: Fix issue with reference links with leading space instead of tab
* FIXED: Fix regression from pull request that breaks build
* FIXED: Fix style issue with ODT output format
* FIXED: Fix trailing whitespace issues in headers/TOC
* FIXED: Fix typo in xml.c
* FIXED: Fix typos in error messages
* FIXED: Improve README install path
* FIXED: Improve edge cases around fenced code blocks and setext headers
* FIXED: Improve markup handling around definition lists and colons
* FIXED: Improve token mapping in header blocks
* FIXED: Left out file
* FIXED: Re-enable token object pools in default configuration
* FIXED: Reset stack sizes before freeing temporary engine
* FIXED: Restore prior label_counter after {{TOC}}
* FIXED: Updated argtable3 now needs to link to math
* FIXED: Use MultiMarkdown instead of libMultiMarkdown as title in version.h
* FIXED: Use UTC for timestamp
* FIXED: bibtex metadata should be raw
* Merge branch 'develop' of github.com:fletcher/MultiMarkdown-6 into develop
* Merge branch 'release/6.6.0' into develop
* Merge pull request #210 from DivineDominion/swift-framework
* Merge pull request #233 from DivineDominion/patch-4
* Merge pull request #243 from alexban011/githubCi
* Merge pull request #245 from hvellyr/develop
* UPDATED: Apply astyle to all files
* UPDATED: Include definition list colons as markup token
* UPDATED: Project clean up
* UPDATED: Update CMakeLists.txt for Universal Binary
* UPDATED: Update astyle config
* UPDATED: Update github CI for multiple platforms
* UPDATED: Update lexers with newer version of re2c
* UPDATED: Update to latest argtable3 code
* UPDATED: standardize common source files
* ci: added github CI
* specify unsigned short for functions in token.h
* use unsigned short in implementation, too


* 2020-10-28 - v 6.6.0:

* UPDATED: Restructure source code organization; Restructure Cmake configuration file; restructure Makefile
Expand Down
Binary file modified QuickStart/QuickStart.epub
View file
Binary file not shown.
Loading

0 comments on commit 7faad61

Please sign in to comment.