UPDATED: Add beginnings of Beamer test suite; add support for beamer/memoir and raw...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb778940aebe7353c4db57bd2944dc838563bf5c..0d650bda60c35a922651396835daf0cc2acbe636 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -647,6 +647,10 @@ ADD_MMD_TEST(mmd-6-compat "-c" MMD6Tests htmlc)
 
 ADD_MMD_TEST(mmd-6-latex "-t latex" MMD6Tests tex)
 
+ADD_MMD_TEST(mmd-6-beamer "-t beamer" Beamer tex)
+
+ADD_MMD_TEST(mmd-6-memoir "-t memoir" Memoir tex)
+
 ADD_MMD_TEST(mmd-6-odf "-t fodt" MMD6Tests fodt)
 
 ADD_MMD_TEST(mmd-6-critic-accept "-a" CriticMarkup htmla)

diff --git a/Sources/libMultiMarkdown/beamer.c b/Sources/libMultiMarkdown/beamer.c
index 1f7322c00094a28bd33696ae095bdf68c381046d..7db7d2c845a7ab673a7397b6d6cacb8f111b3aa1 100644 (file)
--- a/Sources/libMultiMarkdown/beamer.c
+++ b/Sources/libMultiMarkdown/beamer.c
@@ -55,6 +55,7 @@
 
 #include "latex.h"
 #include "beamer.h"
+#include "parser.h"
 
 #define print(x) d_string_append(out, x)
 #define print_const(x) d_string_append_c_array(out, x, sizeof(x) - 1)
@@ -173,6 +174,33 @@ void mmd_export_token_beamer(DString * out, const char * source, token * t, scra
                        temp_char = get_fence_language_specifier(t->child->child, source);
 
                        if (temp_char) {
+                               if (strncmp("{=", temp_char, 2) == 0) {
+                                       // Raw source
+                                       if (raw_filter_text_matches(temp_char, FORMAT_BEAMER)) {
+                                               switch (t->child->tail->type) {
+                                                       case LINE_FENCE_BACKTICK_3:
+                                                       case LINE_FENCE_BACKTICK_4:
+                                                       case LINE_FENCE_BACKTICK_5:
+                                                               temp_token = t->child->tail;
+                                                               break;
+
+                                                       default:
+                                                               temp_token = NULL;
+                                               }
+
+                                               if (temp_token) {
+                                                       d_string_append_c_array(out, &source[t->child->next->start], temp_token->start - t->child->next->start);
+                                                       scratch->padded = 1;
+                                               } else {
+                                                       d_string_append_c_array(out, &source[t->child->start + t->child->len], t->start + t->len - t->child->next->start);
+                                                       scratch->padded = 0;
+                                               }
+                                       }
+
+                                       free(temp_char);
+                                       break;
+                               }
+
                                printf("\\begin{lstlisting}[language=%s]\n", temp_char);
                        } else {
                                print_const("\\begin{verbatim}\n");

diff --git a/Sources/libMultiMarkdown/memoir.c b/Sources/libMultiMarkdown/memoir.c
index 9de11e3a316a549f58112ff07079ff9d29ecfa1d..3b93d0647d36577249a633b2d0d6373640327a11 100644 (file)
--- a/Sources/libMultiMarkdown/memoir.c
+++ b/Sources/libMultiMarkdown/memoir.c
@@ -55,6 +55,7 @@
 
 #include "latex.h"
 #include "memoir.h"
+#include "parser.h"
 
 #define print(x) d_string_append(out, x)
 #define print_const(x) d_string_append_c_array(out, x, sizeof(x) - 1)
@@ -70,6 +71,7 @@ void mmd_export_token_memoir(DString * out, const char * source, token * t, scra
        }
 
        char *  temp_char       = NULL;
+       token * temp_token      = NULL;
 
        switch (t->type) {
                case DOC_START_TOKEN:
@@ -82,6 +84,33 @@ void mmd_export_token_memoir(DString * out, const char * source, token * t, scra
                        temp_char = get_fence_language_specifier(t->child->child, source);
 
                        if (temp_char) {
+                               if (strncmp("{=", temp_char, 2) == 0) {
+                                       // Raw source
+                                       if (raw_filter_text_matches(temp_char, FORMAT_MEMOIR)) {
+                                               switch (t->child->tail->type) {
+                                                       case LINE_FENCE_BACKTICK_3:
+                                                       case LINE_FENCE_BACKTICK_4:
+                                                       case LINE_FENCE_BACKTICK_5:
+                                                               temp_token = t->child->tail;
+                                                               break;
+
+                                                       default:
+                                                               temp_token = NULL;
+                                               }
+
+                                               if (temp_token) {
+                                                       d_string_append_c_array(out, &source[t->child->next->start], temp_token->start - t->child->next->start);
+                                                       scratch->padded = 1;
+                                               } else {
+                                                       d_string_append_c_array(out, &source[t->child->start + t->child->len], t->start + t->len - t->child->next->start);
+                                                       scratch->padded = 0;
+                                               }
+                                       }
+
+                                       free(temp_char);
+                                       break;
+                               }
+
                                printf("\\begin{adjustwidth}{2.5em}{2.5em}\n\\begin{lstlisting}[language=%s]\n", temp_char);
                        } else {
                                print_const("\\begin{adjustwidth}{2.5em}{2.5em}\n\\begin{verbatim}\n");

diff --git a/tests/Beamer/OPML-MMD-Map.pdf b/tests/Beamer/OPML-MMD-Map.pdf
new file mode 100644 (file)
index 0000000..667d34c
Binary files /dev/null and b/tests/Beamer/OPML-MMD-Map.pdf differ

diff --git a/tests/Beamer/Raw Source.tex b/tests/Beamer/Raw Source.tex
new file mode 100644 (file)
index 0000000..a4e7800
--- /dev/null
+++ b/tests/Beamer/Raw Source.tex
@@ -0,0 +1,47 @@
+\input{mmd6-beamer-leader}
+\def\mytitle{Raw Source}
+\input{mmd6-beamer-begin}
+
+\begin{frame}[fragile]
+\frametitle{0 }
+\label{0}
+
+\texttt{*foo*}\{*\}
+
+
+
+*foo*
+
+
+
+*foo*
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{5 }
+\label{5}
+
+\begin{lstlisting}[language={*}]
+*foo*
+\end{lstlisting}
+
+*foo*
+
+*foo*
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{10 }
+\label{10}
+
+*foo*
+
+*bar*
+
+\end{frame}
+
+\mode<all>
+\end{document}\mode*
+

diff --git a/tests/Beamer/Raw Source.text b/tests/Beamer/Raw Source.text
new file mode 100644 (file)
index 0000000..1e81cca
--- /dev/null
+++ b/tests/Beamer/Raw Source.text
@@ -0,0 +1,48 @@
+Title: Raw Source
+latex config:  beamer
+base header level:     3  
+
+# 0 #
+
+`*foo*`{*}
+
+`*foo*`{=html}
+
+`*foo*`{=latex}
+
+`*foo*`{=odt}
+
+`*foo*`{=*}
+
+# 5 #
+
+```{*}
+*foo*
+```
+
+```{=html}
+*foo*
+```
+
+```{=latex}
+*foo*
+```
+
+```{=odt}
+*foo*
+```
+
+```{=*}
+*foo*
+```
+
+# 10 #
+
+```{=beamer}
+*foo*
+```
+
+```{=*}
+*foo*
+
+*bar*

diff --git a/tests/Beamer/What Is MMD.tex b/tests/Beamer/What Is MMD.tex
new file mode 100644 (file)
index 0000000..3947133
--- /dev/null
+++ b/tests/Beamer/What Is MMD.tex
@@ -0,0 +1,336 @@
+\input{mmd6-beamer-leader}
+\def\mytitle{What is MultiMarkdown?}
+\def\subtitle{And why should you care?}
+\def\myauthor{Fletcher T. Penney}
+\def\affiliation{http:\slash \slash fletcherpenney.net\slash multimarkdown\slash }
+\def\mycopyright{2009-2011 Fletcher T. Penney. This work is licensed under a Creative Commons License. http:\slash \slash creativecommons.org\slash licenses\slash by-sa\slash 2.5\slash }
+\input{mmd-natbib-plain}
+\def\theme{keynote-gradient}
+\input{mmd6-beamer-begin}
+
+\begin{frame}[fragile]
+\frametitle{MultiMarkdown is a derivative of Markdown }
+\label{multimarkdownisaderivativeofmarkdown}
+
+\href{http://daringfireball.net/projects/markdown/}{Markdown}\footnote{\href{http://daringfireball.net/projects/markdown/}{http:\slash \slash daringfireball.net\slash projects\slash markdown\slash }} is a program and a
+syntax by John Gruber that allows you to easily convert plain text into HTML
+suitable for using on a web page.
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{The old way was complicated }
+\label{theoldwaywascomplicated}
+
+\begin{verbatim}
+<p>In order to create valid 
+<a href="http://en.wikipedia.org/wiki/HTML">HTML</a>, you 
+need properly coded syntax that can be cumbersome for 
+&#8220;non-programmers&#8221; to write. Sometimes, you
+just want to easily make certain words <strong>bold
+</strong>, and certain words <em>italicized</em> without
+having to remember the syntax. Additionally, for example,
+creating lists:</p>
+
+<ul>
+<li>should be easy</li>
+<li>should not involve programming</li>
+</ul>
+\end{verbatim}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{The new way is easier }
+\label{thenewwayiseasier}
+
+\begin{verbatim}
+In order to create valid [HTML], you need properly
+coded syntax that can be cumbersome for 
+"non-programmers" to write. Sometimes, you just want
+to easily make certain words **bold**, and certain 
+words *italicized* without having to remember the 
+syntax. Additionally, for example, creating lists:
+
+* should be easy
+* should not involve programming
+
+[HTML]: http://en.wikipedia.org/wiki/HTML
+\end{verbatim}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Markdown is designed for people }
+\label{markdownisdesignedforpeople}
+
+The overriding design goal for Markdown's formatting syntax is to make it as
+readable as possible. The idea is that a Markdown-formatted document should be
+publishable as-is, as plain text, without looking like it's been marked up
+with tags or formatting instructions. While Markdown's syntax has been
+influenced by several existing text-to-HTML filters, the single biggest source
+of inspiration for Markdown's syntax is the format of plain text email.
+~\citep{gruber}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{But Markdown wasn't complete }
+\label{butmarkdownwasntcomplete}
+
+I, and others, loved the spirit and elegance of Markdown, but felt it was
+still missing a few features that each of us considered were essential.
+Several variations on Markdown arose to meet the needs of these other
+programmers.
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{MultiMarkdown adds several new features }
+\label{multimarkdownaddsseveralnewfeatures}
+
+\begin{itemize}
+\item{} footnotes
+
+\item{} tables
+
+\item{} citations and bibliography
+
+\item{} image attributes
+
+\item{} metadata
+
+\item{} internal cross-references
+
+\item{} math support
+
+\item{} glossary entries
+
+\item{} definition lists
+
+\item{} and more{\ldots}
+
+\end{itemize}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{MMD also adds something else{\ldots} }
+\label{mmdalsoaddssomethingelse...}
+
+\begin{itemize}
+\item{} Outside of the actual syntax, MMD supports multiple output formats,
+including HTML, \href{http://en.wikipedia.org/wiki/LaTeX}{LaTeX}\footnote{\href{http://en.wikipedia.org/wiki/LaTeX}{http:\slash \slash en.wikipedia.org\slash wiki\slash LaTeX}},
+\href{http://en.wikipedia.org/wiki/OpenDocument}{OpenDocument}\footnote{\href{http://en.wikipedia.org/wiki/OpenDocument}{http:\slash \slash en.wikipedia.org\slash wiki\slash OpenDocument}}, and
+\href{http://en.wikipedia.org/wiki/OPML}{OPML}\footnote{\href{http://en.wikipedia.org/wiki/OPML}{http:\slash \slash en.wikipedia.org\slash wiki\slash OPML}}
+
+\item{} This allows you to use the same markup language (MultiMarkdown) to create a
+high quality pdf (article, book, or presentation like this one) without any
+additional programming.
+
+\item{} Most importantly, you don't have to know how this works, or even what
+the LaTeX commands mean --- just have the software installed.
+
+\end{itemize}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{So, one text file becomes multiple final documents }
+\label{soonetextfilebecomesmultiplefinaldocuments}
+
+\begin{figure}[htbp]
+\centering
+\includegraphics[keepaspectratio,width=\textwidth,height=0.75\textheight]{OPML-MMD-Map.pdf}
+\caption{Example MultiMarkdown output formats}
+\end{figure}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{The goal is to separate content from formatting }
+\label{thegoalistoseparatecontentfromformatting}
+
+By focusing on the text content of your document, you can focus on the
+creative, the scientific, the \emph{human}. Let your computer do what it is good at
+--- the fairly boring job of making sure that margins are correct, that
+paragraphs are properly separated, your footnotes are in order, and that your
+tables line up --- regardless of the final format you want your document to
+take.
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{MultiMarkdown and Mathematics }
+\label{multimarkdownandmathematics}
+
+Built into MultiMarkdown is support for mathematical equations. You write
+using LaTeX syntax. When you output to HTML, you can use
+\href{http://www.mathjax.org/}{MathJax}\footnote{\href{http://www.mathjax.org/}{http:\slash \slash www.mathjax.org\slash }} to properly display the math. If you output
+to LaTeX, it is display automatically. There is not currently an approach to
+display math using OpenDocument
+
+\begin{verbatim}
+\\[ {e}^{i\pi }+1=0 \\]
+\end{verbatim}
+
+becomes
+
+\[ {e}^{i\pi }+1=0 \]
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Images are just as easy }
+\label{imagesarejustaseasy}
+
+\begin{verbatim}
+![Nautilus Star](Nautilus_Star.png)
+\end{verbatim}
+
+becomes{\ldots}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Images are just as easy }
+\label{imagesarejustaseasy}
+
+\begin{figure}[htbp]
+\centering
+\includegraphics[keepaspectratio,width=\textwidth,height=0.75\textheight]{Nautilus_Star.png}
+\caption{Nautilus Star}
+\end{figure}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Support for a bibliography is also included }
+\label{supportforabibliographyisalsoincluded}
+
+\begin{itemize}
+\item{} MultiMarkdown has support for \href{http://www.bibtex.org/}{BibTeX}\footnote{\href{http://www.bibtex.org/}{http:\slash \slash www.bibtex.org\slash }}, or
+for just including your own citations, so that you can back up your
+arguments.~\citep[p. 42]{fake}
+
+\item{} The citation above links to the corresponding entry in the bibliography.
+
+\end{itemize}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Installation is easy }
+\label{installationiseasy}
+
+\begin{itemize}
+\item{} Download the MultiMarkdown software --- there are installers for Mac OS X
+and Windows, and instructions for compiling in Linux.
+
+\item{} If you want to use LaTeX, install a version appropriate for your operating
+system.
+
+\item{} OpenDocument output doesn't require any special software, but will require
+an application capable of opening the document --- LibreOffice,
+OpenOffice.org (with the proper plug-in installed), etc.
+
+\end{itemize}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{How do I create a MultiMarkdown document? }
+\label{howdoicreateamultimarkdowndocument}
+
+\begin{itemize}
+\item{} A MultiMarkdown is simply a text document that is written in the
+MultiMarkdown syntax. You can use any text editor or application you like.
+If your editor supports fonts, italics, etc. then be sure to save as a plain
+text file (not a .doc, RTF, or other ``rich'' format).
+
+\item{} Some applications include built-in support for MultiMarkdown in various
+ways. There's a \href{http://fletcher.github.com/markdown.tmbundle/}{bundle}\footnote{\href{http://fletcher.github.com/markdown.tmbundle/}{http:\slash \slash fletcher.github.com\slash markdown.tmbundle\slash }} for \href{http://macromates.com/}{TextMate}\footnote{\href{http://macromates.com/}{http:\slash \slash macromates.com\slash }}, and \href{http://www.literatureandlatte.com/scrivener.html}{Scrivener}\footnote{\href{http://www.literatureandlatte.com/scrivener.html}{http:\slash \slash www.literatureandlatte.com\slash scrivener.html}} includes
+MultiMarkdown support.
+
+\end{itemize}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Why should I mess with this LaTeX stuff? }
+\label{whyshouldimesswiththislatexstuff}
+
+MultiMarkdown's support for LaTeX is designed to automatically do the ``right''
+thing in most situations for most people. But if you want to dig in and learn
+more, you can customize MMD to create highly tailored documents that suit your
+specific needs. If you want high quality typography, LaTeX is the way to go.
+
+If you already know what LaTeX is, then MultiMarkdown allows you to create
+documents without learning all of the complicated LaTeX commands and markup.
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{How do I create a fancy PDF? }
+\label{howdoicreateafancypdf}
+
+If you're using LaTeX, and have the proper software installed it's easy:
+
+\begin{enumerate}
+\item{} Type \texttt{mmd2tex filename.txt}
+
+\item{} Use \texttt{pdflatex}, \texttt{xelatex}, or your preferred tool to compile the LaTeX
+file into a pdf.
+
+\item{} There is no step 3
+
+\end{enumerate}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{Where to learn more }
+\label{wheretolearnmore}
+
+\begin{itemize}
+\item{} \href{http://fletcherpenney.net/multimarkdown/}{http:\slash \slash fletcherpenney.net\slash multimarkdown\slash }
+
+\item{} \href{http://groups.google.com/group/multimarkdown/}{http:\slash \slash groups.google.com\slash group\slash multimarkdown\slash }
+
+\item{} \href{http://fletcher.github.com/MultiMarkdown-Gallery/}{http:\slash \slash fletcher.github.com\slash MultiMarkdown-Gallery\slash }
+
+\end{itemize}
+
+\end{frame}
+
+\begin{frame}[fragile]
+\frametitle{By the way{\ldots} }
+\label{bytheway...}
+
+This presentation was, of course, written in MultiMarkdown and processed by
+typing \texttt{mmd2tex what\_is\_mmd.txt}.
+
+It uses the \texttt{beamer} XSLT file, and the \texttt{keynote-gradient} beamer theme.
+\end{frame}
+
+\part{Bibliography}
+\begin{frame}[allowframebreaks]
+\frametitle{Bibliography}
+\def\newblock{}
+\begin{thebibliography}{0}
+
+\bibitem{gruber}
+John Gruber. Daring Fireball: Markdown. [Cited January 2006]. Available from \href{http://daringfireball.net/projects/markdown/}{http:\slash \slash daringfireball.net\slash projects\slash markdown\slash }.
+
+
+
+\bibitem{fake}
+John Doe. \emph{A Totally Fake Book}. Vanity Press, 2006.
+
+
+\end{thebibliography}
+\end{frame}
+
+\mode<all>
+\end{document}\mode*
+

diff --git a/tests/Disabled/What Is MMD.text b/tests/Beamer/What Is MMD.text
similarity index 98%
rename from tests/Disabled/What Is MMD.text
rename to tests/Beamer/What Is MMD.text
index a29c0c8f624277e20940e55bb2cb8f85933fa433..c7ee9c59db5ef292764f75c821c15ea96f2f08d3 100644 (file)
--- a/tests/Disabled/What Is MMD.text
+++ b/tests/Beamer/What Is MMD.text
@@ -1,4 +1,3 @@
-latex leader:          mmd-beamer-header
 Title:                         What is MultiMarkdown?  
 Subtitle:                      And why should you care? 
 Author:                                Fletcher T. Penney  
@@ -10,8 +9,7 @@ base header level:     3
 latex mode:                    beamer  
 latex header:          \input{mmd-natbib-plain}
 Theme:                         keynote-gradient
-latex begin:           mmd-beamer-begin-doc
-latex footer:          mmd-beamer-footer
+latex config:          beamer
 
 
 # MultiMarkdown is a derivative of Markdown #