FIXED: Add ODF to wilcard transcluding; Fix tufte to support latex title

diff --git a/.gitignore b/.gitignore
index cab183678099234b215dc8e15d3e029c94590b59..46f648187db7b2e09d471e8cc5a5a01d1302c95e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 CHANGELOG-UNRELEASED
 documentation
+gh-pages
 
 # Developer Tools
 *.pbxuser

diff --git a/Sources/libMultiMarkdown/transclude.c b/Sources/libMultiMarkdown/transclude.c
index 547cb2f0d57ee687cdb07b5231d0ccaca8e9c28e..e0dd839562a15b03e6c5010c585b8339ba126b14 100644 (file)
--- a/Sources/libMultiMarkdown/transclude.c
+++ b/Sources/libMultiMarkdown/transclude.c
@@ -382,6 +382,9 @@ void mmd_transclude_source(DString * source, const char * search_path, const cha
                                        case FORMAT_MEMOIR:
                                                d_string_append(file_path, ".tex");
                                                break;
+                                       case FORMAT_ODF:
+                                               d_string_append(file_path, ".fodt");
+                                               break;
                                        default:
                                                d_string_append(file_path, ".txt");
                                                break;

diff --git a/texmf/tex/latex/mmd6/tufte-book/mmd6-tufte-book-begin.tex b/texmf/tex/latex/mmd6/tufte-book/mmd6-tufte-book-begin.tex
index bd71c7eea414847ab12fb3e2757e32afdb265ff3..21f8c21a18a8cd377ea1068f3d07bf13c2219892 100644 (file)
--- a/texmf/tex/latex/mmd6/tufte-book/mmd6-tufte-book-begin.tex
+++ b/texmf/tex/latex/mmd6/tufte-book/mmd6-tufte-book-begin.tex
@@ -1,6 +1,6 @@
 
 
-\title{\mytitle}
+\title{\latextitle}
 \author{\myauthor}
 
 \ifx\mydate\undefined

diff --git a/texmf/tex/latex/mmd6/tufte-handout/mmd6-tufte-handout-begin.tex b/texmf/tex/latex/mmd6/tufte-handout/mmd6-tufte-handout-begin.tex
index 58c14f591b631b20ecd6f7665c714fb09da0ee58..b453913351e47244162ea86cc6452f2703f65515 100644 (file)
--- a/texmf/tex/latex/mmd6/tufte-handout/mmd6-tufte-handout-begin.tex
+++ b/texmf/tex/latex/mmd6/tufte-handout/mmd6-tufte-handout-begin.tex
@@ -1,6 +1,6 @@
 
 
-\title{\mytitle}
+\title{\latextitle}
 \author{\myauthor}
 
 \ifx\mydate\undefined