From: Fletcher T. Penney Date: Thu, 6 Jul 2017 13:57:43 +0000 (-0400) Subject: version bump X-Git-Tag: 6.1.0^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=080b9d277c5cb72232d85bb1b43b62d6058e83b6;p=multimarkdown version bump --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ba959d..18292ff 100644 --- 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-05-24") +set (My_Project_Revised_Date "2017-07-06") set (My_Project_Version_Major 6) -set (My_Project_Version_Minor 0) -set (My_Project_Version_Patch 7) +set (My_Project_Version_Minor 1) +set (My_Project_Version_Patch 0) 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 8999ba0..3c07bcf 100644 Binary files a/DevelopmentNotes/DevelopmentNotes.epub and b/DevelopmentNotes/DevelopmentNotes.epub differ diff --git a/DevelopmentNotes/DevelopmentNotes.fodt b/DevelopmentNotes/DevelopmentNotes.fodt index 0e7ccf4..199b711 100644 --- a/DevelopmentNotes/DevelopmentNotes.fodt +++ b/DevelopmentNotes/DevelopmentNotes.fodt @@ -274,7 +274,7 @@ MultiMarkdown v6 Development Notes Fletcher T. Penney - 2017-05-24 + 2017-07-06 dd2d8e76-dc2d-416d-9acd-5395d20871c2 @@ -750,11 +750,157 @@ which are zip files with a specific file structure inside them.argtable3 – provides more advanced command-line argument processing in a more cross-platform approach than that used by MMD v5. + +libCurl – allows for easily downloading image assets from web servers in +order to embed them in packaged file formats, e.g. EPUB 3, +TextBundle/TextPack, OpenDocument, etc. + Changelog + +2017–07–06 - v 6.1.0: + + + + +ADDED: Add ‘–nosmart’ option to disable smart typography + + + +ADDED: Add ‘notransclude’ option + + + +ADDED: Add Travis CI configuration + + + +ADDED: Add odt and fodt formats; disable odf format for consistency + + + +ADDED: Add regular TextBundle format support + + + +ADDED: Add support for ‘latexauthor’ and ‘latextitle’ metadata (Addresses #58) + + + +ADDED: Add syntax for raw source (Addresses #38) + + + +ADDED: Start working on textbundle output format + + + +ADDED: Store image assets in OpenDocument files + + + +ADDED: Use assets for reference image definitions in TextBundle format + + + +CHANGED: Disable ‘bundle’ format until it's finished + + + +CHANGED: Make epub utility functions static + + + +CHANGED: Remove odf files; replace convenience scripts + + + +CHANGED: Use ‘markdown’ file extension + + + +FIXED: Add ODF to wilcard transcluding; Fix tufte to support latex title + + + +FIXED: Avoid a few potential crashes + + + +FIXED: Don't parse MMD inside math (fixes #69) + + + +FIXED: Fix asset path for CSS metadata + + + +FIXED: Fix issue where tight list items not properly processed for smart typography + + + +FIXED: Fix issue with transclusion and relative paths + + + +FIXED: Fix regression and add newline at end of converted strings + + + +FIXED: Fix two potential crashes + + + +FIXED: Improve apostrophe detection after punctuation mark + + + +FIXED: Improve handling of HTML entities (fixed #71) + + + +FIXED: Improve transclusion search folder resolution + + + +FIXED: PATH_MAX isn't reliable + + + +FIXED: Refactor super/subscript parsing (fixes #70) + + + +FIXED: Silence a few warnings + + + +FIXED: Use .bat files for Windows installer (fixes #74) + + + +UPDATE: Use custom strdup() replacement + + + +UPDATED: Fix whitespace + + + +UPDATED: Include build status in README + + + +UPDATED: Include html version in Textbundle + + +UPDATED: Update parser to track headers, even in compatibility mode + + + 2017–05–24 - v 6.0.7: diff --git a/DevelopmentNotes/DevelopmentNotes.html b/DevelopmentNotes/DevelopmentNotes.html index 014cf35..dab4c54 100644 --- a/DevelopmentNotes/DevelopmentNotes.html +++ b/DevelopmentNotes/DevelopmentNotes.html @@ -4,7 +4,7 @@ MultiMarkdown v6 Development Notes - + @@ -424,11 +424,52 @@ through each one sequentially.

which are zip files with a specific file structure inside them.

  • argtable3 – provides more advanced command-line argument processing in a more cross-platform approach than that used by MMD v5.

    • +

  • libCurl – allows for easily downloading image assets from web servers in +order to embed them in packaged file formats, e.g. EPUB 3, +TextBundle/TextPack, OpenDocument, etc.

    • Changelog

      +

    • 2017–07–06 - v 6.1.0:

      + +
        +
      • ADDED: Add ‘–nosmart’ option to disable smart typography
        • +
      • ADDED: Add ‘notransclude’ option
        • +
      • ADDED: Add Travis CI configuration
        • +
      • ADDED: Add odt and fodt formats; disable odf format for consistency
        • +
      • ADDED: Add regular TextBundle format support
        • +
      • ADDED: Add support for ‘latexauthor’ and ‘latextitle’ metadata (Addresses #58)
        • +
      • ADDED: Add syntax for raw source (Addresses #38)
        • +
      • ADDED: Start working on textbundle output format
        • +
      • ADDED: Store image assets in OpenDocument files
        • +
      • ADDED: Use assets for reference image definitions in TextBundle format
        • +
      • CHANGED: Disable ‘bundle’ format until it's finished
        • +
      • CHANGED: Make epub utility functions static
        • +
      • CHANGED: Remove odf files; replace convenience scripts
        • +
      • CHANGED: Use ‘markdown’ file extension
        • +
      • FIXED: Add ODF to wilcard transcluding; Fix tufte to support latex title
        • +
      • FIXED: Avoid a few potential crashes
        • +
      • FIXED: Don't parse MMD inside math (fixes #69)
        • +
      • FIXED: Fix asset path for CSS metadata
        • +
      • FIXED: Fix issue where tight list items not properly processed for smart typography
        • +
      • FIXED: Fix issue with transclusion and relative paths
        • +
      • FIXED: Fix regression and add newline at end of converted strings
        • +
      • FIXED: Fix two potential crashes
        • +
      • FIXED: Improve apostrophe detection after punctuation mark
        • +
      • FIXED: Improve handling of HTML entities (fixed #71)
        • +
      • FIXED: Improve transclusion search folder resolution
        • +
      • FIXED: PATH_MAX isn't reliable
        • +
      • FIXED: Refactor super/subscript parsing (fixes #70)
        • +
      • FIXED: Silence a few warnings
        • +
      • FIXED: Use .bat files for Windows installer (fixes #74)
        • +
      • UPDATE: Use custom strdup() replacement
        • +
      • UPDATED: Fix whitespace
        • +
      • UPDATED: Include build status in README
        • +
      • UPDATED: Include html version in Textbundle
        • +
      • UPDATED: Update parser to track headers, even in compatibility mode
        • +

    • 2017–05–24 - v 6.0.7:

        diff --git a/DevelopmentNotes/DevelopmentNotes.pdf b/DevelopmentNotes/DevelopmentNotes.pdf index 15438c7..1671aae 100644 Binary files a/DevelopmentNotes/DevelopmentNotes.pdf and b/DevelopmentNotes/DevelopmentNotes.pdf differ diff --git a/DevelopmentNotes/DevelopmentNotes.txt b/DevelopmentNotes/DevelopmentNotes.txt index efd18f2..85fdabf 100644 --- a/DevelopmentNotes/DevelopmentNotes.txt +++ b/DevelopmentNotes/DevelopmentNotes.txt @@ -1,6 +1,6 @@ Title: MultiMarkdown v6 Development Notes Author: Fletcher T. Penney -Date: 2017-05-24 +Date: 2017-07-06 LaTeX Config: tufte-handout Base Header Level: 3 uuid: dd2d8e76-dc2d-416d-9acd-5395d20871c2 @@ -449,6 +449,10 @@ which are zip files with a specific file structure inside them. * [argtable3] -- provides more advanced command-line argument processing in a more cross-platform approach than that used by MMD v5. +* [libCurl] -- allows for easily downloading image assets from web servers in +order to embed them in packaged file formats, e.g. EPUB 3, +TextBundle/TextPack, OpenDocument, etc. + [>MMD]: MultiMarkdown [>MD]: Markdown @@ -462,10 +466,49 @@ more cross-platform approach than that used by MMD v5. [uthash]: https://troydhanson.github.io/uthash/ [miniz]: https://github.com/richgel999/miniz [argtable3]: https://github.com/argtable/argtable3 +[libCurl]: https://curl.haxx.se/libcurl/ # Changelog # +* 2017-07-06 - v 6.1.0: + + * ADDED: Add '--nosmart' option to disable smart typography + * ADDED: Add 'notransclude' option + * ADDED: Add Travis CI configuration + * ADDED: Add odt and fodt formats; disable odf format for consistency + * ADDED: Add regular TextBundle format support + * ADDED: Add support for 'latexauthor' and 'latextitle' metadata (Addresses #58) + * ADDED: Add syntax for raw source (Addresses #38) + * ADDED: Start working on textbundle output format + * ADDED: Store image assets in OpenDocument files + * ADDED: Use assets for reference image definitions in TextBundle format + * CHANGED: Disable 'bundle' format until it's finished + * CHANGED: Make epub utility functions static + * CHANGED: Remove odf files; replace convenience scripts + * CHANGED: Use 'markdown' file extension + * FIXED: Add ODF to wilcard transcluding; Fix tufte to support latex title + * FIXED: Avoid a few potential crashes + * FIXED: Don't parse MMD inside math (fixes #69) + * FIXED: Fix asset path for CSS metadata + * FIXED: Fix issue where tight list items not properly processed for smart typography + * FIXED: Fix issue with transclusion and relative paths + * FIXED: Fix regression and add newline at end of converted strings + * FIXED: Fix two potential crashes + * FIXED: Improve apostrophe detection after punctuation mark + * FIXED: Improve handling of HTML entities (fixed #71) + * FIXED: Improve transclusion search folder resolution + * FIXED: PATH_MAX isn't reliable + * FIXED: Refactor super/subscript parsing (fixes #70) + * FIXED: Silence a few warnings + * FIXED: Use .bat files for Windows installer (fixes #74) + * UPDATE: Use custom strdup() replacement + * UPDATED: Fix whitespace + * UPDATED: Include build status in README + * UPDATED: Include html version in Textbundle + * UPDATED: Update parser to track headers, even in compatibility mode + + * 2017-05-24 - v 6.0.7: * CHANGED: Add mmd_convert_to_data functions; Refactor main.c so that EPUB and other formats use same workflow -- batch mode no longer required for EPUB format diff --git a/QuickStart/QuickStart.epub b/QuickStart/QuickStart.epub index 52da4e7..5b1c2a0 100644 Binary files a/QuickStart/QuickStart.epub and b/QuickStart/QuickStart.epub differ diff --git a/QuickStart/QuickStart.fodt b/QuickStart/QuickStart.fodt index 787cd51..34365f3 100644 --- a/QuickStart/QuickStart.fodt +++ b/QuickStart/QuickStart.fodt @@ -274,7 +274,7 @@ MultiMarkdown v6 Quick Start Guide Fletcher T. Penney - 6.0.1 + 6.1.0 0d6313fa-9135-477e-9c14-7d62c1977833 @@ -303,6 +303,8 @@ Internationalization 1 LaTeX Changes 1 Metadata 1 +Output Formats 1 +Embedded Images 1 Table of Contents 1 Transclusion 1 Future Steps 1 @@ -312,7 +314,7 @@ Introduction -Version: 6.0.1 +Version: 6.1.0 This document serves as a description of MultiMarkdown (MMD) v6, as well as a sample document to demonstrate the various features. Specifically, differences from @@ -689,6 +691,68 @@ options are dutch, +Output Formats + +MultiMarkdown 6 supports the following output formats, using the -t +command-line argument: + + + + +html – (Default) create HTML 5 + + +latex – create LaTeX for conversion to PDF using high quality +typography + + +beamer and memoir – two additional LaTeX variants for creating +slide presentations and longer documents, respectively + + +mmd – output the MMD text before converting to another format, +but after performing transclusion. This format is not generally needed. + + +odt – OpenDocument text file, used by OpenOffice and compatible +word processors. Images are embedded inside the file package. + + +fodt – OpenDocument text variant using a single text (XML) file +instead of a compressed zip file. Images are not embedded in this format. + + +epub – EPUB 3 ebook format. Images and CSS are embedded in the +file package. + + +bundle – [TextBundle] format consisting of Markdown/MultiMarkdown +text file and embedded images and CSS. Useful for sharing Markdown files +and images between applications (on any OS, but especially on iOS) + + +bundlezip – TextPack variant of the TextBundle format – the file +package is compressed to a single zip file (similar to EPUB and ODT +formats). + + + +Embedded Images + +Supported export formats (odt, epub, bundle, bundlezip) include +images inside the export document: + + + + +Local images are embedded automatically + + +Images stored on remote servers are embedded if libCurl is +properly installed when MMD is compiled. This is true for macOS builds. + + + Table of Contents By placing {{TOC}} in your document, you can insert an automatically @@ -798,4 +862,4 @@ and “stuff between headers”. - + \ No newline at end of file diff --git a/QuickStart/QuickStart.html b/QuickStart/QuickStart.html index e736f40..8be9540 100644 --- a/QuickStart/QuickStart.html +++ b/QuickStart/QuickStart.html @@ -4,7 +4,7 @@ MultiMarkdown v6 Quick Start Guide - + @@ -29,6 +29,8 @@
      • Internationalization
      • LaTeX Changes
      • Metadata
        • +
      • Output Formats
        • +
      • Embedded Images
      • Table of Contents
      • Transclusion
      @@ -39,7 +41,7 @@

      Introduction

      -

      Version: 6.0.1

      +

      Version: 6.1.0

      This document serves as a description of MultiMarkdown (MMD) v6, as well as a sample document to demonstrate the various features. Specifically, differences from @@ -379,6 +381,44 @@ options are dutch, french, german, fr, de, sv. Anything else defaults to English.

    +

    Output Formats

    + +

    MultiMarkdown 6 supports the following output formats, using the -t +command-line argument:

    + +
      +
    • html – (Default) create HTML 5
      • +
    • latex – create LaTeX for conversion to PDF using high quality +typography
      • +
    • beamer and memoir – two additional LaTeX variants for creating +slide presentations and longer documents, respectively
      • +
    • mmd – output the MMD text before converting to another format, +but after performing transclusion. This format is not generally needed.
      • +
    • odt – OpenDocument text file, used by OpenOffice and compatible +word processors. Images are embedded inside the file package.
      • +
    • fodt – OpenDocument text variant using a single text (XML) file +instead of a compressed zip file. Images are not embedded in this format.
      • +
    • epub – EPUB 3 ebook format. Images and CSS are embedded in the +file package.
      • +
    • bundle – [TextBundle] format consisting of Markdown/MultiMarkdown +text file and embedded images and CSS. Useful for sharing Markdown files +and images between applications (on any OS, but especially on iOS)
      • +
    • bundlezip – TextPack variant of the TextBundle format – the file +package is compressed to a single zip file (similar to EPUB and ODT +formats).
      • +
    + +

    Embedded Images

    + +

    Supported export formats (odt, epub, bundle, bundlezip) include +images inside the export document:

    + +
      +
    • Local images are embedded automatically
      • +
    • Images stored on remote servers are embedded if libCurl is +properly installed when MMD is compiled. This is true for macOS builds.
      • +
    +

    Table of Contents

    By placing {{TOC}} in your document, you can insert an automatically @@ -490,4 +530,3 @@ glossary collects information about important terms used in your document - diff --git a/QuickStart/QuickStart.pdf b/QuickStart/QuickStart.pdf index 4037ef0..fa044fe 100644 Binary files a/QuickStart/QuickStart.pdf and b/QuickStart/QuickStart.pdf differ diff --git a/QuickStart/QuickStart.txt b/QuickStart/QuickStart.txt index b9aa970..d9602f0 100644 --- a/QuickStart/QuickStart.txt +++ b/QuickStart/QuickStart.txt @@ -1,6 +1,6 @@ Title: MultiMarkdown v6 Quick Start Guide Author: Fletcher T. Penney -Version: 6.0.1 +Version: 6.1.0 LaTeX Config: tufte-handout Base Header Level: 3 uuid: 0d6313fa-9135-477e-9c14-7d62c1977833 @@ -360,6 +360,46 @@ options are `dutch`, `french`, `german`, `germanguillemets`, `swedish`, `nl`, `fr`, `de`, `sv`. Anything else defaults to English. +## Output Formats ## + +MultiMarkdown 6 supports the following output formats, using the `-t` +command-line argument: + +* `html` -- (Default) create HTML 5 +* `latex` -- create [LaTeX] for conversion to PDF using high quality +typography +* `beamer` and `memoir` -- two additional LaTeX variants for creating +slide presentations and longer documents, respectively +* `mmd` -- output the MMD text before converting to another format, +but after performing transclusion. This format is not generally needed. +* `odt` -- OpenDocument text file, used by OpenOffice and compatible +word processors. Images are embedded inside the file package. +* `fodt` -- OpenDocument text variant using a single text (XML) file +instead of a compressed zip file. Images are not embedded in this format. +* `epub` -- EPUB 3 ebook format. Images and CSS are embedded in the +file package. +* `bundle` -- [TextBundle] format consisting of Markdown/MultiMarkdown +text file and embedded images and CSS. Useful for sharing Markdown files +and images between applications (on any OS, but especially on iOS) +* `bundlezip` -- TextPack variant of the TextBundle format -- the file +package is compressed to a single zip file (similar to EPUB and ODT +formats). + +[LaTeX]: https://en.wikipedia.org/wiki/LaTeX + + +## Embedded Images ## + +Supported export formats (`odt`, `epub`, `bundle`, `bundlezip`) include +images inside the export document: + +* Local images are embedded automatically +* Images stored on remote servers are embedded *if* [libCurl] is +properly installed when MMD is compiled. This is true for macOS builds. + +[libCurl]: https://curl.haxx.se/libcurl/ + + ## Table of Contents ## By placing `{{TOC}}` in your document, you can insert an automatically diff --git a/README.md b/README.md index 1eb3e25..7a8ec74 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ | ---------- | ------------------------- | | Title: | MultiMarkdown | | Author: | Fletcher T. Penney | -| Date: | 2017-05-24 | +| Date: | 2017-07-06 | | Copyright: | Copyright © 2016 - 2017 Fletcher T. Penney. | -| Version: | 6.0.7 | +| Version: | 6.1.0 | 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)