Skip to content

Commit 3406b73

Browse files
fletcherfletcher
committed
Merge branch 'release/6.5.3'
2 parents bc52210 + 727ed1b commit 3406b73

46 files changed

Lines changed: 30834 additions & 62366 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ cmake_minimum_required (VERSION 2.6)
88
set (My_Project_Title "MultiMarkdown")
99
set (My_Project_Description "Lightweight markup processor to produce HTML, LaTeX, and more.")
1010
set (My_Project_Author "Fletcher T. Penney")
11-
set (My_Project_Revised_Date "2020-04-10")
11+
set (My_Project_Revised_Date "2020-10-28")
1212
set (My_Project_Version_Major 6)
1313
set (My_Project_Version_Minor 5)
14-
set (My_Project_Version_Patch 2)
14+
set (My_Project_Version_Patch 3)
1515

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

@@ -524,6 +524,7 @@ SET_TARGET_PROPERTIES(libMultiMarkdown PROPERTIES
524524
FRAMEWORK_VERSION A
525525
MACOSX_FRAMEWORK_IDENTIFIER net.multimarkdown.mmd6
526526
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "net.multimarkdown.mmd6"
527+
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
527528
)
528529

529530
ADD_PUBLIC_HEADER(libMultiMarkdown Sources/libMultiMarkdown/include/libMultiMarkdown.h)

‎DevelopmentNotes/DevelopmentNotes.epub‎

213 Bytes
Binary file not shown.

‎DevelopmentNotes/DevelopmentNotes.fodt‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ office:mimetype="application/vnd.oasis.opendocument.text">
276276
<office:meta>
277277
<dc:title>MultiMarkdown v6 Development Notes</dc:title>
278278
<dc:creator>Fletcher T. Penney</dc:creator>
279-
<meta:user-defined meta:name="date">2020-04-10</meta:user-defined>
279+
<meta:user-defined meta:name="date">2020-10-28</meta:user-defined>
280280
<meta:user-defined meta:name="uuid">dd2d8e76-dc2d-416d-9acd-5395d20871c2</meta:user-defined>
281281
</office:meta>
282282
<office:body>
@@ -763,6 +763,67 @@ TextBundle/TextPack, OpenDocument, etc.</text:p></text:list-item>
763763
<text:h text:outline-level="3"><text:bookmark text:name="changelog"/>Changelog</text:h>
764764

765765
<text:list text:style-name="L1">
766+
<text:list-item>
767+
<text:p text:style-name="Standard">2020&#8211;10&#8211;28 - v 6.5.3:</text:p>
768+
769+
<text:list text:style-name="L1">
770+
<text:list-item>
771+
<text:p text:style-name="P1">
772+
ADDED: Add additional blockquote tests</text:p></text:list-item>
773+
774+
<text:list-item>
775+
<text:p text:style-name="P1">
776+
ADDED: Add format to create HTML with storing of assets</text:p></text:list-item>
777+
778+
<text:list-item>
779+
<text:p text:style-name="P1">
780+
FIXED: Add latex footer to beamer output format (fixes #185)</text:p></text:list-item>
781+
782+
<text:list-item>
783+
<text:p text:style-name="P1">
784+
FIXED: Allow hyphen in image/link unquoted attributes</text:p></text:list-item>
785+
786+
<text:list-item>
787+
<text:p text:style-name="P1">
788+
FIXED: Don&#8217;t free NULL link</text:p></text:list-item>
789+
790+
<text:list-item>
791+
<text:p text:style-name="P1">
792+
FIXED: Fix CMake issue</text:p></text:list-item>
793+
794+
<text:list-item>
795+
<text:p text:style-name="P1">
796+
FIXED: Fix issue when parsing blockquote that contains raw HTML</text:p></text:list-item>
797+
798+
<text:list-item>
799+
<text:p text:style-name="P1">
800+
FIXED: Fix issue with tight list where last item has multiple paragraphs not being recognized as a loose list</text:p></text:list-item>
801+
802+
<text:list-item>
803+
<text:p text:style-name="P1">
804+
FIXED: Fix regression</text:p></text:list-item>
805+
806+
<text:list-item>
807+
<text:p text:style-name="P1">
808+
FIXED: Fix test suite</text:p></text:list-item>
809+
810+
<text:list-item>
811+
<text:p text:style-name="P1">
812+
FIXED: Improve blockquote parser</text:p></text:list-item>
813+
814+
<text:list-item>
815+
<text:p text:style-name="P1">
816+
FIXED: Prevent iOS Safari from bastardizing left arrow unicode character with an ugly emoji</text:p></text:list-item>
817+
818+
<text:list-item>
819+
<text:p text:style-name="P1">
820+
FIXED: tweak CriticMarkup highlight handling</text:p></text:list-item>
821+
822+
<text:list-item>
823+
<text:p text:style-name="Standard">Merge branch &#8216;develop&#8217; of github.com:fletcher/MultiMarkdown-6 into develop</text:p></text:list-item>
824+
825+
</text:list></text:list-item>
826+
766827
<text:list-item>
767828
<text:p text:style-name="Standard">2020&#8211;04&#8211;10 - v 6.5.2:</text:p>
768829

‎DevelopmentNotes/DevelopmentNotes.html‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8"/>
55
<title>MultiMarkdown v6 Development Notes</title>
66
<meta name="author" content="Fletcher T. Penney"/>
7-
<meta name="date" content="2020-04-10"/>
7+
<meta name="date" content="2020-10-28"/>
88
<meta name="uuid" content="dd2d8e76-dc2d-416d-9acd-5395d20871c2"/>
99
</head>
1010
<body>
@@ -433,6 +433,24 @@ <h3 id="dependencieslibraries">Dependencies/Libraries</h3>
433433
<h3 id="changelog">Changelog</h3>
434434

435435
<ul>
436+
<li><p>2020&#8211;10&#8211;28 - v 6.5.3:</p>
437+
438+
<ul>
439+
<li>ADDED: Add additional blockquote tests</li>
440+
<li>ADDED: Add format to create HTML with storing of assets</li>
441+
<li>FIXED: Add latex footer to beamer output format (fixes #185)</li>
442+
<li>FIXED: Allow hyphen in image/link unquoted attributes</li>
443+
<li>FIXED: Don&#8217;t free NULL link</li>
444+
<li>FIXED: Fix CMake issue</li>
445+
<li>FIXED: Fix issue when parsing blockquote that contains raw HTML</li>
446+
<li>FIXED: Fix issue with tight list where last item has multiple paragraphs not being recognized as a loose list</li>
447+
<li>FIXED: Fix regression</li>
448+
<li>FIXED: Fix test suite</li>
449+
<li>FIXED: Improve blockquote parser</li>
450+
<li>FIXED: Prevent iOS Safari from bastardizing left arrow unicode character with an ugly emoji</li>
451+
<li>FIXED: tweak CriticMarkup highlight handling</li>
452+
<li>Merge branch &#8216;develop&#8217; of github.com:fletcher/MultiMarkdown-6 into develop</li>
453+
</ul></li>
436454
<li><p>2020&#8211;04&#8211;10 - v 6.5.2:</p>
437455

438456
<ul>
@@ -1120,7 +1138,7 @@ <h3 id="changelog">Changelog</h3>
11201138
<ol>
11211139

11221140
<li id="gn:1">
1123-
PEG: <p>Parsing Expression Grammar <a href="https://en.wikipedia.org/wiki/Parsing_expression_grammar">https://en.wikipedia.org/wiki/Parsing_expression_grammar</a> <a href="#gnref:1" title="return to body" class="reverseglossary">&#160;&#8617;</a></p>
1141+
PEG: <p>Parsing Expression Grammar <a href="https://en.wikipedia.org/wiki/Parsing_expression_grammar">https://en.wikipedia.org/wiki/Parsing_expression_grammar</a> <a href="#gnref:1" title="return to body" class="reverseglossary">&#160;&#8617;&#xfe0e;</a></p>
11241142
</li>
11251143

11261144
</ol>

‎DevelopmentNotes/DevelopmentNotes.pdf‎

610 Bytes
Binary file not shown.

‎DevelopmentNotes/DevelopmentNotes.txt‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Title: MultiMarkdown v6 Development Notes
22
Author: Fletcher T. Penney
3-
Date: 2020-04-10
3+
Date: 2020-10-28
44
LaTeX Config: tufte-handout
55
Base Header Level: 3
66
uuid: dd2d8e76-dc2d-416d-9acd-5395d20871c2
@@ -472,6 +472,24 @@ TextBundle/TextPack, OpenDocument, etc.
472472

473473
# Changelog #
474474

475+
* 2020-10-28 - v 6.5.3:
476+
477+
* ADDED: Add additional blockquote tests
478+
* ADDED: Add format to create HTML with storing of assets
479+
* FIXED: Add latex footer to beamer output format (fixes #185)
480+
* FIXED: Allow hyphen in image/link unquoted attributes
481+
* FIXED: Don't free NULL link
482+
* FIXED: Fix CMake issue
483+
* FIXED: Fix issue when parsing blockquote that contains raw HTML
484+
* FIXED: Fix issue with tight list where last item has multiple paragraphs not being recognized as a loose list
485+
* FIXED: Fix regression
486+
* FIXED: Fix test suite
487+
* FIXED: Improve blockquote parser
488+
* FIXED: Prevent iOS Safari from bastardizing left arrow unicode character with an ugly emoji
489+
* FIXED: tweak CriticMarkup highlight handling
490+
* Merge branch 'develop' of github.com:fletcher/MultiMarkdown-6 into develop
491+
492+
475493
* 2020-04-10 - v 6.5.2:
476494

477495
* FIXED: Don't use undefined version string

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
| ---------- | ------------------------- |
55
| Title: | MultiMarkdown |
66
| Author: | Fletcher T. Penney |
7-
| Date: | 2020-04-10 |
7+
| Date: | 2020-10-28 |
88
| Copyright: | Copyright © 2016 - 2020 Fletcher T. Penney. |
9-
| Version: | 6.5.2 |
9+
| Version: | 6.5.3 |
1010

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

‎Sources/libMultiMarkdown/beamer.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,12 @@ void mmd_end_complete_beamer(DString * out, const char * source, scratch_pad * s
369369

370370
if (m) {
371371
printf("\\input{%s}\n\n", m->value);
372+
} else {
373+
m = extract_meta_from_stack(scratch, "latexconfig");
374+
375+
if (m) {
376+
printf("\\input{mmd6-%s-footer}\n", m->value);
377+
}
372378
}
373379

374380
print_const("\\end{document}");

‎Sources/libMultiMarkdown/html.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc
823823
scratch->footnote_para_counter--;
824824

825825
if (scratch->footnote_para_counter == 0) {
826-
printf(" <a href=\"#cnref:%d\" title=\"%s\" class=\"reversecitation\">&#160;&#8617;</a>", scratch->citation_being_printed, LC("return to body"));
826+
printf(" <a href=\"#cnref:%d\" title=\"%s\" class=\"reversecitation\">&#160;&#8617;&#xfe0e;</a>", scratch->citation_being_printed, LC("return to body"));
827827
}
828828
}
829829

@@ -838,15 +838,15 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc
838838
temp_short = rand() % 32000 + 1;
839839
}
840840

841-
printf(" <a href=\"#fnref:%d\" title=\"%s\" class=\"reversefootnote\">&#160;&#8617;</a>", temp_short, LC("return to body"));
841+
printf(" <a href=\"#fnref:%d\" title=\"%s\" class=\"reversefootnote\">&#160;&#8617;&#xfe0e;</a>", temp_short, LC("return to body"));
842842
}
843843
}
844844

845845
if (scratch->glossary_being_printed) {
846846
scratch->footnote_para_counter--;
847847

848848
if (scratch->footnote_para_counter == 0) {
849-
printf(" <a href=\"#gnref:%d\" title=\"%s\" class=\"reverseglossary\">&#160;&#8617;</a>", scratch->glossary_being_printed, LC("return to body"));
849+
printf(" <a href=\"#gnref:%d\" title=\"%s\" class=\"reverseglossary\">&#160;&#8617;&#xfe0e;</a>", scratch->glossary_being_printed, LC("return to body"));
850850
}
851851
}
852852

@@ -1775,6 +1775,7 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc
17751775
break;
17761776

17771777
case PAIR_CRITIC_HI:
1778+
stack_push(scratch->critic_stack, t);
17781779

17791780
// Ignore if we're rejecting or accepting
17801781
if ((scratch->extensions & EXT_CRITIC_REJECT) ||

‎Sources/libMultiMarkdown/include/libMultiMarkdown.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ enum output_format {
572572
FORMAT_OPML,
573573
FORMAT_ITMZ,
574574
FORMAT_MMD,
575+
FORMAT_HTML_WITH_ASSETS
575576
};
576577

577578

0 commit comments

Comments
 (0)