Skip to content

Commit bc52210

Browse files
fletcherfletcher
committed
Merge branch 'release/6.5.2'
2 parents c637ee3 + 7f06206 commit bc52210

17 files changed

Lines changed: 103 additions & 37 deletions

‎CMakeLists.txt‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ 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 "2019-12-28")
11+
set (My_Project_Revised_Date "2020-04-10")
1212
set (My_Project_Version_Major 6)
1313
set (My_Project_Version_Minor 5)
14-
set (My_Project_Version_Patch 1)
14+
set (My_Project_Version_Patch 2)
1515

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

18-
set (My_Project_Copyright_Date "2016 - 2019")
18+
set (My_Project_Copyright_Date "2016 - 2020")
1919
set (My_Project_Copyright "Copyright © ${My_Project_Copyright_Date} ${My_Project_Author}.")
2020

2121
string(TOUPPER ${My_Project_Title} My_Project_Title_Caps )
@@ -416,7 +416,7 @@ if (APPLE)
416416
if (DEFINED ZIP)
417417
set (CPACK_GENERATOR ZIP)
418418
else (DEFINED ZIP)
419-
set (CPACK_GENERATOR PackageMaker)
419+
set (CPACK_GENERATOR productbuild)
420420
endif (DEFINED ZIP)
421421

422422
endif (APPLE)
@@ -532,7 +532,8 @@ ADD_PUBLIC_HEADER(libMultiMarkdown Sources/libMultiMarkdown/include/token.h)
532532
ADD_PUBLIC_HEADER(libMultiMarkdown Sources/libMultiMarkdown/include/version.h)
533533

534534
# Create a command-line app?
535-
# if (NOT DEFINED TEST)
535+
if(hasParent)
536+
else()
536537
add_executable(multimarkdown
537538
Sources/libMultiMarkdown/d_string.c
538539
Sources/multimarkdown/main.c
@@ -541,15 +542,17 @@ ADD_PUBLIC_HEADER(libMultiMarkdown Sources/libMultiMarkdown/include/version.h)
541542
#
542543
# Link the library to the app?
543544
target_link_libraries(multimarkdown libMultiMarkdown)
544-
# endif()
545+
546+
set_target_properties(multimarkdown PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO")
547+
set_property(TARGET multimarkdown PROPERTY C_STANDARD 11)
548+
set_property(TARGET multimarkdown PROPERTY C_STANDARD 11)
549+
endif()
545550

546551
# Xcode settings for fat binaries
547552
set_target_properties(libMultiMarkdown PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO")
548-
set_target_properties(multimarkdown PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO")
549553

550554
# Use C11
551555
set_property(TARGET libMultiMarkdown PROPERTY C_STANDARD 11)
552-
set_property(TARGET multimarkdown PROPERTY C_STANDARD 11)
553556

554557

555558
# ==========================
@@ -568,10 +571,13 @@ set_property(TARGET multimarkdown PROPERTY C_STANDARD 11)
568571
# install (FILES ${public_header_files} DESTINATION local/include/libFoo)
569572

570573
# Install MMD binary
571-
install (TARGETS multimarkdown
572-
DESTINATION bin
573-
COMPONENT application
574-
)
574+
if(hasParent)
575+
else()
576+
install (TARGETS multimarkdown
577+
DESTINATION bin
578+
COMPONENT application
579+
)
580+
endif()
575581
set (CPACK_COMPONENT_APPLICATION_DISPLAY_NAME "MultiMarkdown")
576582
set (CPACK_COMPONENT_APPLICATION_DESCRIPTION "Install the actual `multimarkdown` program.")
577583

‎DevelopmentNotes/DevelopmentNotes.epub‎

121 Bytes
Binary file not shown.

‎DevelopmentNotes/DevelopmentNotes.fodt‎

Lines changed: 30 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">2019-12-11</meta:user-defined>
279+
<meta:user-defined meta:name="date">2020-04-10</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,35 @@ 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;04&#8211;10 - v 6.5.2:</text:p>
768+
769+
<text:list text:style-name="L1">
770+
<text:list-item>
771+
<text:p text:style-name="P1">
772+
FIXED: Don&#8217;t use undefined version string</text:p></text:list-item>
773+
774+
<text:list-item>
775+
<text:p text:style-name="P1">
776+
FIXED: Fix memory leak in ITMZ reader</text:p></text:list-item>
777+
778+
<text:list-item>
779+
<text:p text:style-name="P1">
780+
FIXED: Update cpack generator for macOS</text:p></text:list-item>
781+
782+
<text:list-item>
783+
<text:p text:style-name="P1">
784+
Fix fsf address in files licenses.</text:p></text:list-item>
785+
786+
<text:list-item>
787+
<text:p text:style-name="P1">
788+
Merge pull request #184 from LyesSaadi/develop</text:p></text:list-item>
789+
790+
<text:list-item>
791+
<text:p text:style-name="Standard">UPDATED: Adjust cmake to only make library when included from a parent project</text:p></text:list-item>
792+
793+
</text:list></text:list-item>
794+
766795
<text:list-item>
767796
<text:p text:style-name="Standard">2019&#8211;12&#8211;28 - v 6.5.1:</text:p>
768797

‎DevelopmentNotes/DevelopmentNotes.html‎

Lines changed: 11 additions & 1 deletion
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="2019-12-11"/>
7+
<meta name="date" content="2020-04-10"/>
88
<meta name="uuid" content="dd2d8e76-dc2d-416d-9acd-5395d20871c2"/>
99
</head>
1010
<body>
@@ -433,6 +433,16 @@ <h3 id="dependencieslibraries">Dependencies/Libraries</h3>
433433
<h3 id="changelog">Changelog</h3>
434434

435435
<ul>
436+
<li><p>2020&#8211;04&#8211;10 - v 6.5.2:</p>
437+
438+
<ul>
439+
<li>FIXED: Don&#8217;t use undefined version string</li>
440+
<li>FIXED: Fix memory leak in ITMZ reader</li>
441+
<li>FIXED: Update cpack generator for macOS</li>
442+
<li>Fix fsf address in files licenses.</li>
443+
<li>Merge pull request #184 from LyesSaadi/develop</li>
444+
<li>UPDATED: Adjust cmake to only make library when included from a parent project</li>
445+
</ul></li>
436446
<li><p>2019&#8211;12&#8211;28 - v 6.5.1:</p>
437447

438448
<ul>

‎DevelopmentNotes/DevelopmentNotes.pdf‎

31.7 KB
Binary file not shown.

‎DevelopmentNotes/DevelopmentNotes.txt‎

Lines changed: 11 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: 2019-12-11
3+
Date: 2020-04-10
44
LaTeX Config: tufte-handout
55
Base Header Level: 3
66
uuid: dd2d8e76-dc2d-416d-9acd-5395d20871c2
@@ -472,6 +472,16 @@ TextBundle/TextPack, OpenDocument, etc.
472472

473473
# Changelog #
474474

475+
* 2020-04-10 - v 6.5.2:
476+
477+
* FIXED: Don't use undefined version string
478+
* FIXED: Fix memory leak in ITMZ reader
479+
* FIXED: Update cpack generator for macOS
480+
* Fix fsf address in files licenses.
481+
* Merge pull request #184 from LyesSaadi/develop
482+
* UPDATED: Adjust cmake to only make library when included from a parent project
483+
484+
475485
* 2019-12-28 - v 6.5.1:
476486

477487
* FIXED: Ensure use of bash for creating AllTests.c

‎QuickStart/QuickStart.epub‎

0 Bytes
Binary file not shown.

‎QuickStart/QuickStart.fodt‎

Lines changed: 2 additions & 2 deletions
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 Quick Start Guide</dc:title>
278278
<dc:creator>Fletcher T. Penney</dc:creator>
279-
<meta:user-defined meta:name="version">6.4.0</meta:user-defined>
279+
<meta:user-defined meta:name="version">6.5.2</meta:user-defined>
280280
<meta:user-defined meta:name="uuid">0d6313fa-9135-477e-9c14-7d62c1977833</meta:user-defined>
281281
</office:meta>
282282
<office:body>
@@ -321,7 +321,7 @@ office:mimetype="application/vnd.oasis.opendocument.text">
321321

322322
<text:h text:outline-level="3"><text:bookmark text:name="introduction"/>Introduction</text:h>
323323

324-
<text:p text:style-name="Standard">Version: 6.4.0</text:p>
324+
<text:p text:style-name="Standard">Version: 6.5.2</text:p>
325325

326326
<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 MMD v5 will be pointed out.</text:p>
327327

‎QuickStart/QuickStart.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8"/>
55
<title>MultiMarkdown v6 Quick Start Guide</title>
66
<meta name="author" content="Fletcher T. Penney"/>
7-
<meta name="version" content="6.4.0"/>
7+
<meta name="version" content="6.5.2"/>
88
<meta name="uuid" content="0d6313fa-9135-477e-9c14-7d62c1977833"/>
99
</head>
1010
<body>
@@ -49,7 +49,7 @@
4949

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

52-
<p>Version: 6.4.0</p>
52+
<p>Version: 6.5.2</p>
5353

5454
<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 <abbr title="MultiMarkdown">MMD</abbr> v5 will be pointed out.</p>
5555

‎QuickStart/QuickStart.pdf‎

30.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)