docs/index.html in maruku-0.4.0 vs docs/index.html in maruku-0.4.1

- old
+ new

@@ -2,11 +2,11 @@ <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> <html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'><head><meta content='text/html; charset=utf-8' http-equiv='Content-type' /><title>Maruku: a Markdown-superset interpreter</title><link href='style.css' rel='stylesheet' type='text/css' /></head><body> <h1 id='maruku_a_markdownsuperset_interpreter'>Mar<strong>u</strong>k<strong>u</strong>: a Markdown-superset interpreter</h1> -<p><a href='http://maruku.rubyforge.org/&gt;'>Maruku</a> is a Markdown interpreter written in <a href='http://www.ruby-lang.org'>Ruby</a>.</p> +<p><a href='http://maruku.rubyforge.org/'>Maruku</a> is a Markdown interpreter written in <a href='http://www.ruby-lang.org'>Ruby</a>.</p> <p>Maruku allows you to write in an easy-to-read-and-write syntax, like this:</p> <blockquote> <p><a href='http://maruku.rubyforge.org/maruku.md'>This document in Markdown</a></p> @@ -40,11 +40,11 @@ </li> </ul> <p><strong>Authors</strong>: Maruku has been developed so far by <a href='http://www.dis.uniroma1.it/~acensi/'>Andrea Censi</a>. Contributors are most welcome!</p> -<p><strong>The name of the game</strong>: Maruku is the <a href='http://en.wikipedia.org/wiki/Romaji'>romaji</a> translitteration of the <a href='http://en.wikipedia.org/wiki/Katakana'>katakana</a> translitteration of &quot;Mark&quot;, the first word in Markdown. I chose this name because Ruby is Japanese, and also the sillable &quot;ru&quot; appears in Maruku.</p> +<p><strong>The name of the game</strong>: Maruku is the <a href='http://en.wikipedia.org/wiki/Romaji'>romaji</a> translitteration of the <a href='http://en.wikipedia.org/wiki/Katakana'>katakana</a> translitteration of &ldquo;Mark&rdquo;, the first word in Markdown. I chose this name because Ruby is Japanese, and also the sillable &ldquo;ru&rdquo; appears in Maruku.</p> <hr /> <p>Table of contents: (<strong>auto-generated by Maruku!</strong>)</p> <div class='maruku_toc'><ul style='list-style: none;'><li><span class='maruku_section_number'>1. </span><a href='#release_notes'>Release notes</a></li><li><span class='maruku_section_number'>2. </span><a href='#download'>Download</a><ul style='list-style: none;'><li><span class='maruku_section_number'>2.1. </span><a href='#bugs_report'>Bugs report</a></li></ul></li><li><span class='maruku_section_number'>3. </span><a href='#usage'>Usage</a><ul style='list-style: none;'><li><span class='maruku_section_number'>3.1. </span><a href='#from_the_command_line'>From the command line</a></li></ul></li><li><span class='maruku_section_number'>4. </span><a href='#extra'>Examples of PHP Markdown Extra syntax</a></li><li><span class='maruku_section_number'>5. </span><a href='#maruku-and-bluecloth'>Maruku and Bluecloth</a></li><li><span class='maruku_section_number'>6. </span><a href='#meta'>New meta-data syntax</a><ul style='list-style: none;'><li><span class='maruku_section_number'>6.1. </span><a href='#metadata_for_blocklevel_and_spanlevel_elements'>Meta-data for block-level and span-level elements</a></li><li><span class='maruku_section_number'>6.2. </span><a href='#metadata_for_the_document'>Meta-data for the document</a></li><li><span class='maruku_section_number'>6.3. </span><a href='#metalist'>List of meta-data</a></li><li><span class='maruku_section_number'>6.4. </span><a href='#examples'>Examples</a></li></ul></li><li><span class='maruku_section_number'>7. </span><a href='#features'>Other Features</a><ul style='list-style: none;'><li><span class='maruku_section_number'>7.1. </span><a href='#automatic_generation_of_the_table_of_contents'>Automatic generation of the table of contents</a></li><li><span class='maruku_section_number'>7.2. </span><a href='#this_header_contains_emphasis_strong_text_and_'>This header contains <em>emphasis</em> <strong>strong text</strong> and <code>code</code></a></li><li><span class='maruku_section_number'>7.3. </span><a href='#use_html_entities'>Use HTML entities</a></li></ul></li><li><span class='maruku_section_number'>8. </span><a href='#future'>Future developments</a><ul style='list-style: none;'><li><span class='maruku_section_number'>8.1. </span><a href='#a_syntax_for_adding_math'>A syntax for adding math</a></li></ul></li></ul></div><hr /> <h2 id='release_notes'><span class='maruku_section_number'>1. </span>Release notes</h2> @@ -52,20 +52,68 @@ <p>In the meantime, feel free to toy around, and please signal problems, request features, by <a href='http://www.dis.uniroma1.it/~acensi/contact.html'>contacting me</a> or using the <a href='http://rubyforge.org/tracker/?group_id=2795'>tracker</a>. For issues about the Markdown syntax itself and improvements to it, please write to the <a href='http://six.pairlist.net/mailman/listinfo/markdown-discuss'>Markdown-discuss mailing list</a>.</p> <p>Have fun!</p> +<h4 id='changes_in_041_aka_typographer'>Changes in 0.4.1 aka &ldquo;Typographer&rdquo;</h4> + +<ul> +<li> +<p>Implemented SmartyPants support:</p> +<pre><code>&apos;Twas a &quot;test&quot; to &apos;remember&apos; -- in the &apos;90s +--- while I was &lt;&lt;ok&gt;&gt;. She was 6\&quot;12\&apos;.</code></pre> +<blockquote> +<p>&lsquo;Twas a &ldquo;test&rdquo; to &lsquo;remember&rsquo; &ndash; in the &rsquo;90s &mdash; while I was &laquo;ok&raquo;. She was 6&quot;12&#39;.</p> +</blockquote> + +<p>I adapted the code from RubyPants.</p> +</li> + +<li> +<p>Server directives between <code>&lt;? ?&gt;</code> are properly preserved.</p> +</li> + +<li> +<p>Changes in LaTeX export:</p> + +<ul> +<li> +<p>Now Japanese text rendering sort of works, using the following packages:</p> +<pre><code>\usepackage[C40]{fontenc} +\usepackage[cjkjis]{ucs} +\usepackage[utf8x]{inputenc} +</code></pre> +<p>Nevertheless, I could only get bitmap fonts working &ndash; probably it&rsquo;s a problem with my setup.</p> + +<p>A quick test: 日本、中国、ひらがな、カタカナ。</p> +</li> + +<li> +<p>Fixed bugs in rendering of immediate links.</p> +</li> + +<li> +<p>External packages are <code>require</code>d only if needed.</p> +</li> + +<li> +<p>More symbols supported. See the symbol list <a href='http://maruku.rubyforge.org/entity_test.html'>in HTML</a> and <a href='http://maruku.rubyforge.org/entity_test.pdf'>in PDF</a>.</p> +</li> +</ul> +</li> +</ul> + <h4 id='changes_in_04'>Changes in 0.4</h4> <ul> <li>First implementation of <a href='http://maruku.rubyforge.org/proposal.html'>the new meta-data syntax</a>.</li> <li>General refactorization of the code and much cleaner error reporting.</li> <li>Created <a href='http://maruku.rubyforge.org/rdoc/'>the RDOC documentation</a>.</li> -<li>The <code>add_whitespace</code> method took too much time -- it was O(n^2).</li> +<li>The <code>add_whitespace</code> method took too much time &ndash; it was O(n^2).</li> <li>Added unit-tests for block-level elements.</li> </ul> <h4 id='changes_in_03'>Changes in 0.3</h4> @@ -123,11 +171,11 @@ <p>(カタカナで 私の 名前は アンドレア チェンシ です).</p> <p>(日本のガルは 大好き、でも、日本語は難しですから、そうぞ 英語話すガルを おしえてください).</p> </blockquote> -<p>In the LaTeX version, these do not appear. I know how to do LaTeX with ISO-8859-1 encoding (European characters), but I&apos;m struggling with half-baked solutions for UTF-8 encoded documents.</p> +<p>In the LaTeX version, these do not appear. I know how to do LaTeX with ISO-8859-1 encoding (European characters), but I&rsquo;m struggling with half-baked solutions for UTF-8 encoded documents.</p> </li> <li> <p>Implement the <a href='http://maruku.rubyforge.org/proposal.html'>new meta-data proposal</a>.</p> </li> @@ -152,15 +200,15 @@ <h2 id='download'><span class='maruku_section_number'>2. </span>Download</h2> <p>The development site is <a href='http://rubyforge.org/projects/maruku/'>http://rubyforge.org/projects/maruku/</a>.</p> <p>Install with:</p> -<pre class='shell' style='background-color: #efefff;'>$ gem install maruku</pre> +<pre class='sh' style='background-color: #efefff;'>$ gem install maruku</pre> <p>Released files can also be seen at <a href='http://rubyforge.org/frs/?group_id=2795'>http://rubyforge.org/frs/?group_id=2795</a>.</p> <p>Anonymous access to the repository is possible with:</p> -<pre class='shell' style='background-color: #efefff;'>$ svn checkout svn://rubyforge.org/var/svn/maruku</pre> +<pre class='sh' style='background-color: #efefff;'>$ svn checkout svn://rubyforge.org/var/svn/maruku</pre> <p>If you want commit access to the repository, just create an account on Rubyforge and <a href='http://www.dis.uniroma1.it/~acensi/contact.html'>drop me a mail</a>.</p> <h3 id='bugs_report'><span class='maruku_section_number'>2.1. </span>Bugs report</h3> <p>Use the <a href='http://rubyforge.org/tracker/?group_id=2795'>tracker</a> or <a href='http://www.dis.uniroma1.it/~acensi/contact.html'>drop me an email</a>.</p> @@ -182,31 +230,31 @@ <p>There are two command-line programs installed: <code>maruku</code> and <code>marutex</code>.</p> <ul> <li> <p><code>maruku</code> converts Markdown to HTML:</p> -<pre class='shell' style='background-color: #efefff;'>$ maruku file.md # creates file.html</pre></li> +<pre class='sh' style='background-color: #efefff;'>$ maruku file.md # creates file.html</pre></li> <li> <p><code>marutex</code> converts Markdown to LaTeX, then calls <code>pdflatex</code> to transform to PDF:</p> -<pre class='shell' style='background-color: #efefff;'>$ marutex file.md # creates file.tex and file.pdf</pre></li> +<pre class='sh' style='background-color: #efefff;'>$ marutex file.md # creates file.tex and file.pdf</pre></li> </ul> <h2 id='extra'><span class='maruku_section_number'>4. </span>Examples of PHP Markdown Extra syntax</h2> <ul> <li> <p>tables</p> -<pre class='markdown' style='background-color: #ffefef;'>Col1 | Very very long head | Very very long head| +<pre style='background-color: #ffefef;'><code>Col1 | Very very long head | Very very long head| -----|:-------------------:|-------------------:| -cell | center-align | right-align |</pre><table><thead><tr><th>Col1</th><th>Very very long head</th><th>Very very long head</th></tr></thead><tbody><tr><td style='text-align: left;'>cell</td><td style='text-align: center;'>center-align</td><td style='text-align: right;'>right-align</td></tr></tbody></table></li> +cell | center-align | right-align |</code></pre><table><thead><tr><th>Col1</th><th>Very very long head</th><th>Very very long head</th></tr></thead><tbody><tr><td style='text-align: left;'>cell</td><td style='text-align: center;'>center-align</td><td style='text-align: right;'>right-align</td></tr></tbody></table></li> <li> <p>footnotes <sup id='fnref:1'><a href='#fn:1' rel='footnote'>1</a></sup></p> -<pre class='markdown' style='background-color: #ffefef;'>* footnotes [^foot] +<pre style='background-color: #ffefef;'><code>* footnotes [^foot] -[^foot]: I really was missing those.</pre></li> +[^foot]: I really was missing those.</code></pre></li> </ul> <ul> <li> <p>Markdown inside HTML elements</p> @@ -216,19 +264,25 @@ <p>This is a div with Markdown <strong>strong text</strong></p> </div></li> <li> <p>header ids</p> -<pre class='markdown' style='background-color: #ffefef;'>## Download ## {#download}</pre> +<pre style='background-color: #ffefef;'><code>## Download ## {#download}</code></pre> <p>For example, <a href='#download'>a link to the download</a> header.</p> </li> <li> <p>definition lists</p> -<pre class='markdown' style='background-color: #ffefef;'>Definition list -: something very hard to parse</pre><dl><dt>Definition list</dt><dd>something very hard to parse</dd></dl></li> +<pre style='background-color: #ffefef;'><code>Definition list +: something very hard to parse</code></pre> +<dl> +<dt>Definition list</dt> +<dd>something very hard to parse</dd> +</dl> +</li> + <li> <p>abbreviations or <abbr title='Simply an abbreviation'>ABB</abbr> for short.</p> </li> </ul> @@ -252,53 +306,90 @@ </li> </ul> <h2 id='meta'><span class='maruku_section_number'>6. </span>New meta-data syntax</h2> -<p>Maruku implements a syntax that allows to attach &quot;meta&quot; information to objects.</p> +<p>Maruku implements a syntax that allows to attach &ldquo;meta&rdquo; information to objects.</p> <h3 id='metadata_for_blocklevel_and_spanlevel_elements'><span class='maruku_section_number'>6.1. </span>Meta-data for block-level and span-level elements</h3> <p>See <a href='http://maruku.rubyforge.org/proposal.html'>this proposal</a>.</p> <h3 id='metadata_for_the_document'><span class='maruku_section_number'>6.2. </span>Meta-data for the document</h3> <p>Meta-data for the document itself is specified through the use of email headers:</p> -<pre class='markdown' style='background-color: #ffefef;'>Title: A simple document containing meta-headers +<pre style='background-color: #ffefef;'><code>Title: A simple document containing meta-headers CSS: style.css -Content of the document</pre> +Content of the document +</code></pre> <p>When creating the document through</p> <pre class='ruby' style='background-color: #efffef;'><span class='constant'>Maruku</span><span class='punct'>.</span><span class='ident'>new</span><span class='punct'>(</span><span class='ident'>s</span><span class='punct'>).</span><span class='ident'>to_html_document</span></pre> <p>the title and stylesheet are added as expected.</p> <p>Meta-data keys are assumed to be case-insensitive.</p> <hr /> <h3 id='metalist'><span class='maruku_section_number'>6.3. </span>List of meta-data</h3> -<dl><dt><strong><code>title</code>, <code>subject</code></strong></dt><dd> + +<dl> +<dt><strong><code>title</code>, <code>subject</code></strong></dt> + +<dd> <p>(document) Sets the title of the document (HTML: used in the <code>TITLE</code> element).</p> -</dd><dt><strong><code>use_numbered_headers</code></strong></dt><dd> +</dd> + +<dt><strong><code>use_numbered_headers</code></strong></dt> + +<dd> <p>(document) If <code>true</code>, headers are numbered (just like this document). Default is <code>false</code>.</p> -</dd><dt><strong><code>css</code></strong></dt><dd> +</dd> + +<dt><strong><code>css</code></strong></dt> + +<dd> <p>(document, HTML) Url of stylesheet.</p> -</dd><dt><strong><code>html_use_syntax</code></strong></dt><dd> +</dd> + +<dt><strong><code>html_use_syntax</code></strong></dt> + +<dd> <p>(document, HTML) If set, use the <a href='http://syntax.rubyforge.org/'>Ruby <code>syntax</code> library</a> to add source highlighting.</p> -</dd><dt><strong><code>latex_use_listings</code></strong></dt><dd> +</dd> + +<dt><strong><code>latex_use_listings</code></strong></dt> + +<dd> <p>(document, LaTeX) If set, use the fancy <a href='http://www.ctan.org/tex-archive/macros/latex/contrib/listings/'><code>listings</code> package</a> for better displaying code blocks.</p> <p>If not set, use standard <code>verbatim</code> environment.</p> -</dd><dt><strong><code>style</code>, <code>id</code>, <code>class</code></strong></dt><dd> +</dd> + +<dt><strong><code>style</code>, <code>id</code>, <code>class</code></strong></dt> + +<dd> <p>(any block object, HTML) Standard CSS attributes are copied.</p> -</dd><dt><strong><code>lang</code></strong></dt><dd> +</dd> + +<dt><strong><code>lang</code></strong></dt> + +<dd> <p>(code blocks) Name of programming language (<code>ruby</code>) for syntax highlighting.</p> <p>Default for this is <code>code_lang</code> in document.</p> <p>Syntax highlighting is delegated to the <a href='http://syntax.rubyforge.org/'><code>syntax</code> library</a> for HTML output and to the <a href='http://www.ctan.org/tex-archive/macros/latex/contrib/listings/'><code>listings</code> package</a> for LaTeX output.</p> -</dd><dt><strong><code>code_show_spaces</code></strong></dt><dd> +</dd> + +<dt><strong><code>code_show_spaces</code></strong></dt> + +<dd> <p>Shows tabs and newlines (default is read in the document object).</p> -</dd><dt><strong><code>code_background_color</code></strong></dt><dd> +</dd> + +<dt><strong><code>code_background_color</code></strong></dt> + +<dd> <p>Background color for code blocks. (default is read in the document object).</p> <p>The format is either a named color (<code>green</code>, <code>red</code>) or a CSS color of the form <code>#ff00ff</code>.</p> <ul> @@ -310,19 +401,21 @@ <p>for <strong>LaTeX output</strong>, if it is a named color, it must be a color accepted by the LaTeX <code>color</code> packages. If it is of the form <code>#ff00ff</code>, Maruku defines a color using the <code>\color[rgb]{r,g,b}</code> macro.</p> <p>For example, for <code>#0000ff</code>, the macro is called as: <code>\color[rgb]{0,0,1}</code>.</p> </li> </ul> -</dd></dl> +</dd> +</dl> + <h3 id='examples'><span class='maruku_section_number'>6.4. </span>Examples</h3> <p>An example of this is the following:</p> -<pre class='markdown' style='background-color: #ffefef;'> One space +<pre style='background-color: #ffefef;'><code> One space Two spaces Tab, space, tab Tab, tab, tab and all is green! -{code_show_spaces code_background_color=#ffeedd}</pre> +{code_show_spaces code_background_color=#ffeedd}</code></pre> <p>That will produce:</p> <pre style='background-color: #ffeedd;'><code>&not;One&not;space &not;&not;Two&not;spaces &raquo;&nbsp;&nbsp;&nbsp;&not;&raquo;&nbsp;&nbsp;&nbsp;Tab,&not;space,&not;tab &raquo;&nbsp;&nbsp;&nbsp;&raquo;&nbsp;&nbsp;&nbsp;&raquo;&nbsp;&nbsp;&nbsp;Tab,&not;tab,&not;tab&not;and&not;all&not;is&not;green!</code></pre> @@ -366,6 +459,6 @@ $ \alpha = \beta + \gamma $ (eq:1) This is a reference to equation: please see (eq:1)</code></pre><div class='footnotes'><hr /><ol><li id='fn:1'> <p>I really was missing those.</p> -<a href='#fnref:1' rev='footnote'>&#8617;</a></li></ol></div><div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown interpreter'>Maruku</a> at 21:05 on Saturday, January 06th, 2007.</span></div></body></html> +<a href='#fnref:1' rev='footnote'>&#8617;</a></li></ol></div><div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown interpreter for Ruby'>Maruku</a> at 23:43 on Monday, January 08th, 2007.</span></div></body></html>