Skip to content

Commit

Permalink
Merge branch 'release/0.4.2-b'
Browse files Browse the repository at this point in the history
  • Loading branch information
fletcher committed Mar 5, 2017
2 parents fb71cfd + de3c9bc commit 91eea92
Show file tree
Hide file tree
Showing 52 changed files with 2,125 additions and 1,086 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 "2017-02-17")
set (My_Project_Revised_Date "2017-03-05")
set (My_Project_Version_Major 0)
set (My_Project_Version_Minor 4)
set (My_Project_Version_Patch 1b)
set (My_Project_Version_Patch 2b)

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

Expand Down
20 changes: 18 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,29 @@
| ---------- | ------------------------- |
| Title: | MultiMarkdown |
| Author: | Fletcher T. Penney |
| Date: | 2017-02-17 |
| Date: | 2017-03-05 |
| Copyright: | Copyright © 2016 - 2017 Fletcher T. Penney. |
| Version: | 0.4.1b |
| Version: | 0.4.2b |


## Updates ##

* 2017-03-05 -- v 0.4.2-b:

* ADDED: Add and utility functions; fix memory leak
* ADDED: Initial abbreviation support
* ADDED: Keep working on Abbreviations/Glossaries
* ADDED: Refactor abbreviation code; Add inline abbreviations; Fix abbreviations in ODF
* ADDED: Update Inline Footnote test
* CHANGED: Add comments to i18n.h
* CHANGED: Finish refactoring note-related code
* CHANGED: Refactor footnotes
* CHANGED: Refactor glossary code
* CHANGED: Remove offset from html export functions
* FIXED: latex list items need to block optional argument to allow '[' as first character
* Merge branch 'release/0.4.1-b' into develop


* 2017-03-04 -- v 0.4.1-b:

* FIXED: Add glossary localization
Expand Down
Loading

0 comments on commit 91eea92

Please # to comment.