docs/changelog.md unit_test_block.sh unit_test_span.sh @@ -1,33 +1,85 @@ #!/usr/bin/env ruby require 'maruku' +require 'optparse' + +export = :html + +OptionParser.new do |opts| + opts.banner = "Usage: maruku [options] [file1.md [file2.md ..." + + opts.on("-v", "--[no-]verbose", "Run verbosely") do |v| + MaRuKu::Globals[:verbose] = v end + opts.on("-u", "--[no-]unsafe", "Use unsafe features") do |v| + MaRuKu::Globals[:unsafe_features] = v end -if File.basename($0) =~ /^maruku/ - # If we are given filenames, convert each file - if not ARGV.empty? - ARGV.each do |f| - puts "Opening #{f}" - # read file content - input = File.open(f,'r').read - - # create Maruku - doc = Maruku.new(input, {:on_error=>:warning}) - # convert to a complete html document - html = doc.to_html_document( {:indent => -1}) + + opts.on_tail("--pdf", "Write PDF" ) do export = :pdf end + opts.on_tail("--html", "Write HTML") do export = :html end + opts.on_tail("--tex", "Write LaTeX" ) do export = :tex end + + opts.on_tail("--version", "Show version") do + puts OptionParser::Version.join('.') + exit + end + + opts.on_tail("-h", "--help", "Show this message") do + puts opts + exit + end + +end.parse! + +#p ARGV +#p MaRuKu::Globals + +# If we are given filenames, convert each file +if not ARGV.empty? + ARGV.each do |f| + + # read file content + input = File.open(f,'r').read + + $stderr.puts "Reading from #{f}" - # write to file - dir = File.dirname(f) - filename = File.basename(f, File.extname(f)) + ".html" + # create Maruku + doc = Maruku.new(input, {:on_error=>:warning}) + - out_xml = File.join(dir, filename) - File.open(out_xml,'w') do |f| f.puts html end + out=""; prefix = "?" + case export + when :html + prefix='html' + out = doc.to_html_document( {:indent => -1}) + when :pdf, :tex + prefix='tex' + out = doc.to_latex_document + when :markdown + prefix='pretty_md' + out = doc.to_markdown + end + + # write to file + dir = File.dirname(f) + job = File.join(dir, File.basename(f, File.extname(f))) + filename = job + "." + prefix + + $stderr.puts "Writing to #{filename}" + File.open(filename,'w') do |f| f.puts out end + + if export == :pdf + cmd = "pdflatex '#{job}' -interaction=nonstopmode "+ + "'-output-directory=#{dir}' " + # run twice for cross references + system cmd + system cmd end - else - # else, act as a filter - data = $stdin.read - puts Maruku.new(data, {:on_error=>:warning}).to_html end + +else + # else, act as a filter + data = $stdin.read + puts Maruku.new(data, {:on_error=>:warning}).to_html end - bin/maruku @@ -9,6 +9,7 @@ def marker(x) "\n*** Output of #{x} ***\n" end +# a = expected b = found def equals(a, b) a = a.split("\n") b = b.split("\n") @@ -18,8 +19,19 @@ def equals(a, b) lb = b[i] if la != lb puts "\n" - puts "Line #{i}:\n#{la.inspect}\n" - puts "#{lb.inspect}\n" + + def write_lines(i, j, lines, prefix, i_star) + i = [i, 0].max + j = [j, lines.size-1].min + for a in i..j + l = lines[a].gsub(/\t/,' ') + puts ("%s %3d" % [prefix, a]) + + (a==i_star ? " -->" : " ")+lines[a] + end + end + + write_lines(i-3, i+3, a, "expected", i ) + write_lines(i-3, i+3, b, " found", i ) return false end end @@ -121,7 +133,7 @@ def run_test(filename, its_ok, verbose=true) TOTEST.each do |x| - if not equals(actual[x], expected[x]) + if not equals(expected[x], actual[x]) if its_ok.include? x expected[x] = actual[x] $stdout.write " relax:#{x} " bin/marutest @@ -9,20 +9,26 @@ pdfs+=proposal.pdf htmls+=proposal.html others+=proposal.md +pdfs+=entity_test.pdf +htmls+=entity_test.html + +all: pdf html + pdf: $(pdfs) html: $(htmls) -all: pdf html - index.html: maruku.html cp $< $@ %.html: %.md - ruby -I../lib ../bin/maruku $< + ruby -I../lib ../bin/maruku --html -u $< %.pdf: %.md - ruby -I../lib ../bin/marutex $< + ruby -I../lib ../bin/maruku --pdf -u $< + +dist: + -rm *.out *.aux *.tex *.toc *.dvi *.log clean: -rm -f $(htmls) $(pdfs) *.out *.aux *.tex *.toc docs/Makefile @@ -54,6 +54,54 @@ Have fun! +<h4 id='changes_in_041_aka_typographer'>Changes in 0.4.1 aka “Typographer”</h4> + +<ul> +<li> +Implemented SmartyPants support: +<pre><code>'Twas a "test" to 'remember' -- in the '90s +--- while I was <<ok>>. She was 6\"12\'.</code></pre> +<blockquote> +‘Twas a “test” to ‘remember’ – in the ’90s — while I was «ok». She was 6"12'. +</blockquote> + +I adapted the code from RubyPants. +</li> + +<li> +Server directives between <code><? ?></code> are properly preserved. +</li> + +<li> +Changes in LaTeX export: + +<ul> +<li> +Now Japanese text rendering sort of works, using the following packages: +<pre><code>\usepackage[C40]{fontenc} +\usepackage[cjkjis]{ucs} +\usepackage[utf8x]{inputenc} +</code></pre> +Nevertheless, I could only get bitmap fonts working – probably it’s a problem with my setup. + +A quick test: 日本、中国、ひらがな、カタカナ。 +</li> + +<li> +Fixed bugs in rendering of immediate links. +</li> + +<li> +External packages are <code>require</code>d only if needed. +</li> + +<li> +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>. +</li> +</ul> +</li> +</ul> + <h4 id='changes_in_04'>Changes in 0.4</h4> <ul> @@ -225,7 +273,13 @@ cell | center-align | right-align |</code></pre><table><thead><tr> <li> definition lists <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> +: something very hard to parse</code></pre> +<dl> +<dt>Definition list</dt> + +<dd>something very hard to parse</dd> +</dl> +</li> <li> abbreviations or <abbr title='Simply an abbreviation'>ABB</abbr> for short. @@ -275,29 +329,65 @@ Content of the document Meta-data keys are assumed to be case-insensitive. <hr /> <h3 id='metalist'>6.3. List of meta-data</h3> -<dl><dt><code>title</code>, <code>subject</code></dt><dd> + +<dl> +<dt><code>title</code>, <code>subject</code></dt> + +<dd> (document) Sets the title of the document (HTML: used in the <code>TITLE</code> element). -</dd><dt><code>use_numbered_headers</code></dt><dd> +</dd> + +<dt><code>use_numbered_headers</code></dt> + +<dd> (document) If <code>true</code>, headers are numbered (just like this document). Default is <code>false</code>. -</dd><dt><code>css</code></dt><dd> +</dd> + +<dt><code>css</code></dt> + +<dd> (document, HTML) Url of stylesheet. -</dd><dt><code>html_use_syntax</code></dt><dd> +</dd> + +<dt><code>html_use_syntax</code></dt> + +<dd> (document, HTML) If set, use the <a href='http://syntax.rubyforge.org/'>Ruby <code>syntax</code> library</a> to add source highlighting. -</dd><dt><code>latex_use_listings</code></dt><dd> +</dd> + +<dt><code>latex_use_listings</code></dt> + +<dd> (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. If not set, use standard <code>verbatim</code> environment. -</dd><dt><code>style</code>, <code>id</code>, <code>class</code></dt><dd> +</dd> + +<dt><code>style</code>, <code>id</code>, <code>class</code></dt> + +<dd> (any block object, HTML) Standard CSS attributes are copied. -</dd><dt><code>lang</code></dt><dd> +</dd> + +<dt><code>lang</code></dt> + +<dd> (code blocks) Name of programming language (<code>ruby</code>) for syntax highlighting. Default for this is <code>code_lang</code> in document. 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. -</dd><dt><code>code_show_spaces</code></dt><dd> +</dd> + +<dt><code>code_show_spaces</code></dt> + +<dd> Shows tabs and newlines (default is read in the document object). -</dd><dt><code>code_background_color</code></dt><dd> +</dd> + +<dt><code>code_background_color</code></dt> + +<dd> Background color for code blocks. (default is read in the document object). The format is either a named color (<code>green</code>, <code>red</code>) or a CSS color of the form <code>#ff00ff</code>. @@ -313,7 +403,9 @@ Content of the document For example, for <code>#0000ff</code>, the macro is called as: <code>\color[rgb]{0,0,1}</code>. </li> </ul> -</dd></dl> +</dd> +</dl> + <h3 id='examples'>6.4. Examples</h3> An example of this is the following: @@ -369,4 +461,4 @@ $ \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'> I really was missing those. -<a href='#fnref:1' rev='footnote'>↩</a></li></ol></div><div class='maruku_signature'><hr />Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown interpreter'>Maruku</a> at 00:18 on Monday, January 08th, 2007.</div></body></html> +<a href='#fnref:1' rev='footnote'>↩</a></li></ol></div><div class='maruku_signature'><hr />Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown interpreter for Ruby'>Maruku</a> at 23:18 on Monday, January 08th, 2007.</div></body></html> docs/maruku.html @@ -1,8 +1,8 @@ CSS: style.css -LaTeX_use_listings: true -html_use_syntax: true -use_numbered_headers: true - +Use numbered headers: true +HTML use syntax: true +LaTeX use listings: true +LaTeX CJK: true @@ -83,6 +83,39 @@ please write to the [Markdown-discuss mailing list][markdown-discuss]. Have fun! +#### Changes in 0.4.1 aka "Typographer" #### + +* Implemented SmartyPants support: + + 'Twas a "test" to 'remember' -- in the '90s + --- while I was <<ok>>. She was 6\"12\'. + > 'Twas a "test" to 'remember' -- in the '90s --- while I was <<ok>>. + > She was 6\"12\'. + + I adapted the code from RubyPants. + +* Server directives between `<? ?>` are properly preserved. +* Changes in LaTeX export: + + * Now Japanese text rendering sort of works, using the following packages: + + \usepackage[C40]{fontenc} + \usepackage[cjkjis]{ucs} + \usepackage[utf8x]{inputenc} + + Nevertheless, I could only get bitmap fonts working -- probably it's a problem + with my setup. + + A quick test: 日本、中国、ひらがな、カタカナ。 + + * Fixed bugs in rendering of immediate links. + * External packages are `require`d only if needed. + * More symbols supported. + See the symbol list + [in HTML](http://maruku.rubyforge.org/entity_test.html) and + [in PDF](http://maruku.rubyforge.org/entity_test.pdf). + + #### Changes in 0.4 #### * First implementation of [the new meta-data syntax][meta]. docs/maruku.md @@ -21,6 +21,7 @@ require 'iconv' + module MaRuKu; module In; module Markdown; module BlockLevelParser def parse_doc(s) @@ -31,10 +32,20 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser self.attributes.merge! meta2 +=begin maruku_doc +Attribute: encoding +Scope: document +Summary: Encoding for the document. + +If the `encoding` attribute is specified, then the content +will be converted from the specified encoding to UTF-8. + +Conversion happens using the `iconv` library. +=end + enc = self.attributes[:encoding] self.attributes.delete :encoding if enc && enc.downcase != 'utf-8' -# puts "Converting from #{enc} to UTF-8." converted = Iconv.new('utf-8', enc).iconv(data) # puts "Data: #{data.inspect}: #{data}" @@ -72,10 +83,18 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser # puts "#{e.node_type}: #{e.attributes.inspect}" end - self.execute_code_blocks - -# puts self.inspect +=begin maruku_doc +Attribute: exec +Scope: document +Summary: Enables execution of XML instructions. + +Disabled by default because of security concerns. +=end + if Maruku::Globals[:unsafe_features] + self.execute_code_blocks + # TODO: remove executed code blocks + end end # Expands an attribute list in an Hash lib/maruku/input/parse_doc.rb @@ -210,7 +210,16 @@ def educate(elements) end # strips empty strings elements.delete_if {|x| x.kind_of?(String) && x.size == 0} - return elements + final = [] + # join consecutive strings + elements.each do |x| + if x.kind_of?(String) && final.last.kind_of?(String) + final.last << x + else + final << x + end + end + return final end end end end end lib/maruku/input/rubypants.rb @@ -40,8 +40,6 @@ class REXML::Element public :write_children end - - # This module groups all functions related to HTML export. module MaRuKu; module Out; module HTML include REXML @@ -64,7 +62,6 @@ module MaRuKu; module Out; module HTML doc = Document.new(nil,{:respect_whitespace =>:all}) doc << div - #add_whitespace(doc) # REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements # containing code. @@ -98,7 +95,7 @@ module MaRuKu; module Out; module HTML root = Element.new('html', doc) root.add_namespace('http://www.w3.org/1999/xhtml') - lang = @attributes[:lang] || 'en' + lang = self.attributes[:lang] || 'en' root.attributes['lang'] = lang root.attributes['xml:lang'] = lang @@ -110,15 +107,12 @@ module MaRuKu; module Out; module HTML me.attributes['content'] = 'text/html; charset=utf-8' # Create title element - doc_title = @attributes[:title] || @attributes[:subject] || "" + doc_title = self.attributes[:title] || self.attributes[:subject] || "" title = Element.new 'title', head title << Text.new(doc_title) - # Encoding - - - css = @attributes[:css] + css = self.attributes[:css] if css # <link type="text/css" rel="stylesheet" href="..." /> link = Element.new 'link' @@ -145,7 +139,6 @@ module MaRuKu; module Out; module HTML root << body - # add_whitespace(doc) doc end @@ -195,7 +188,7 @@ module MaRuKu; module Out; module HTML span << Text.new('Created by ') a = Element.new('a', span) a.attributes['href'] = 'http://maruku.rubyforge.org' - a.attributes['title'] = 'Maruku: a Markdown interpreter' + a.attributes['title'] = 'Maruku: a Markdown interpreter for Ruby' a << Text.new('Maruku') span << Text.new(nice_date+".") div @@ -314,7 +307,7 @@ module MaRuKu; module Out; module HTML def to_html_code; source = self.raw_code - lang = @attributes[:lang] || @doc.attributes[:code_lang] + lang = self.attributes[:lang] || @doc.attributes[:code_lang] lang = 'xml' if lang=='html' use_syntax = get_setting(:html_use_syntax) @@ -411,8 +404,8 @@ module MaRuKu; module Out; module HTML if ref = @doc.refs[id] url = ref[:url] title = ref[:title] - a.attributes['href']=url if url - a.attributes['title']=title if title + a.attributes['href'] = url if url + a.attributes['title'] = title if title else maruku_error"Could not find ref_id = #{id.inspect} for #{self.inspect}" tell_user "Not creating a link for ref_id = #{id.inspect}." @@ -422,18 +415,17 @@ module MaRuKu; module Out; module HTML end def to_html_im_link - a = wrap_as_element 'a' - url = self.url - title = self.title - if url + if url = self.url + title = self.title + a = wrap_as_element 'a' a.attributes['href'] = url a.attributes['title'] = title if title + return a else maruku_error"Could not find url in #{self.inspect}" tell_user "Not creating a link for ref_id = #{id.inspect}." return wrap_as_element('span') end - return a end def add_ws(e) @@ -471,9 +463,7 @@ module MaRuKu; module Out; module HTML url = ref[:url] a.attributes['src'] = url [:title, :class, :style].each do |s| - if ref[s] then - a.attributes[s.to_s] = ref[s] - end + a.attributes[s.to_s] = ref[s] if ref[s] end else maruku_error"Could not find id = #{id.inspect} for\n #{self.inspect}" @@ -485,17 +475,16 @@ module MaRuKu; module Out; module HTML end def to_html_im_image - a = Element.new 'img' - url = self.url - title = self.title - if not url + if not url = self.url maruku_error"Image with no url: #{self.inspect}" tell_user "Could not create image with ref_id = #{id.inspect};"+ +" Using SPAN element as replacement." return wrap_as_element('span') end - a.attributes['src'] = url - a.attributes['title'] = title if title + title = self.title + a = Element.new 'img' + a.attributes['src'] = url + a.attributes['title'] = title if title return a end @@ -555,17 +544,14 @@ module MaRuKu; module Out; module HTML sup end + ## Definition lists ### - def to_html_definition_list - wrap_as_element('dl') - end - def to_html_definition - children_to_html - end - def to_html_definition_term; wrap_as_element('dt') end - def to_html_definition_data; wrap_as_element('dd') end + def to_html_definition_list() add_ws wrap_as_element('dl') end + def to_html_definition() children_to_html end + def to_html_definition_term() add_ws wrap_as_element('dt') end + def to_html_definition_data() add_ws wrap_as_element('dd') end -## Table ### + # FIXME: Ugly code def to_html_table align = self.align num_columns = align.size @@ -575,7 +561,7 @@ module MaRuKu; module Out; module HTML i = num_columns while i<@children.size rows << @children.slice(i, num_columns) - i+=num_columns + i += num_columns end table = create_html_element 'table' lib/maruku/output/to_html.rb @@ -18,12 +18,18 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #++ - module MaRuKu - + class MDDocument - + Latex_preamble_enc_cjk = +"\\usepackage[C40]{fontenc} +\\usepackage[cjkjis]{ucs} +\\usepackage[utf8x]{inputenc}" + + Latex_preamble_enc_utf8 = +"\\usepackage{ucs} +\\usepackage[utf8x]{inputenc}" def latex_require_package(p) if not self.latex_required_packages.include? p @@ -38,10 +44,6 @@ class MDDocument # Render as a complete LaTeX document def to_latex_document - header = "" - - - body = to_latex body += render_latex_signature @@ -51,20 +53,68 @@ class MDDocument "\\usepackage{#{p}}\n" }.join +=begin maruku_doc +Attribute: latex_cjk +Scope: document +Output: latex +Summary: Support for CJK characters. + +If the `latex_cjk` attribute is specified, then appropriate headers +are added to the LaTeX preamble to support Japanese fonts. +You have to have these fonts installed -- and this can be a pain. + +If `latex_cjk` is specified, this is added to the preamble: + +<?mrk md_code_block(Maruku::MDDocument::Latex_preamble_enc_cjk) ?> + +while the default is to add this: + +<?mrk md_code_block(Maruku::MDDocument::Latex_preamble_enc_utf8) ?> + +=end + encoding = @doc.attributes[:latex_cjk] ? + Latex_preamble_enc_cjk : Latex_preamble_enc_utf8 + +=begin maruku_doc +Attribute: latex_preamble +Scope: document +Output: latex +Summary: User-defined preamble. + +If the `latex_preamble` attribute is specified, then its value +will be used as a custom preamble. + +For example: + + Title: My document + Latex preamble: preamble.tex + +will produce: + + ... + \input{preamble.tex} + ... + +=end + user_preamble = (file = @doc.attributes[:latex_preamble]) ? + "\\input{#{file}}\n" : "" + "\\documentclass{article} -#{header} +% Packages required to support encoding +#{encoding} + +% Packages required by code #{required} -%\\usepackage{amssymb,amsmath} % eth -%\\usepackage{eurosym} % euro + +#{user_preamble} \\usepackage{hyperref} \\usepackage{xspace} \\usepackage[usenames,dvipsnames]{color} \\usepackage[margin=1in]{geometry} \\hypersetup{colorlinks=true} -%\\usepackage{ucs} -%\\usepackage[utf8x]{inputenc} + \\begin{document} #{body} \\end{document} @@ -89,26 +139,36 @@ module MaRuKu; module Out; module Latex def to_latex_hrule; "\n\\vspace{.5em} \\hrule \\vspace{.5em}\n" end def to_latex_linebreak; "\\linebreak " end - def to_latex_paragraph; - #{}"\\noindent "+ + def to_latex_paragraph children_to_latex+"\n\n" end def get_setting(name, default=nil) self.attributes[name] || @doc.attributes[name] || default end - +=begin maruku_doc +Title: Input format for colors +Output: latex, html +Related: code_background_color + +Admissible formats: + + green + #abc + #aabbcc +=end + # \color[named]{name} # \color[rgb]{1,0.2,0.3} def latex_color(s, command='color') if s =~ /^\#(\w\w)(\w\w)(\w\w)$/ - r = $1.hex; g = $2.hex; b=$3.hex + r = $1.hex; g = $2.hex; b=$3.hex # convert from 0-255 to 0.0-1.0 r = r / 255.0; g = g / 255.0; b = b / 255.0; "\\#{command}[rgb]{%0.2f,%0.2f,%0.2f}" % [r,g,b] elsif s =~ /^\#(\w)(\w)(\w)$/ - r = $1.hex; g = $2.hex; b=$3.hex - # convert from 0-255 to 0.0-1.0 + r = $1.hex; g = $2.hex; b=$3.hex + # convert from 0-15 to 0.0-1.0 r = r / 15.0; g = g / 15.0; b = b / 15.0; "\\#{command}[rgb]{%0.2f,%0.2f,%0.2f}" % [r,g,b] else @@ -118,6 +178,39 @@ module MaRuKu; module Out; module Latex def to_latex_code; raw_code = self.raw_code +=begin maruku_doc +Attribute: latex_use_listings +Scope: document +Output: latex +Summary: Support for `listings` package. +Related: code_show_spaces, code_background_color, lang, code_lang + +If the `latex_use_listings` attribute is specified, then +code block are rendered using the `listings` package. +Otherwise, a standard `verbatim` environment is used. + +* If the `lang` attribute for the code block has been specified, + it gets passed to the `listings` package using the `lstset` macro. + The default lang for code blocks is specified through + the `code_lang` attribute. + + \lstset{language=ruby} + + Please refer to the documentation of the `listings` package for + supported languages. + + If a language is not supported, the `listings` package will emit + a warning during the compilation. Just press enter and nothing + wrong will happen. + +* If the `code_show_spaces` is specified, than spaces and tabs will + be shown using the macro: + + \lstset{showspaces=true,showtabs=true} + +* The background color is given by `code_background_color`. + +=end if @doc.attributes[:latex_use_listings] @doc.latex_require_package('listings') @@ -223,35 +316,31 @@ module MaRuKu; module Out; module Latex "#{colorspec}{\\tt #{s}}" end - def to_latex_immediate_link + def to_latex_im_link url = self.url - return "\\href{#{url}}{#{url.to_latex}}" + + if url[0,1] == '#' + url = url[1,url.size] + return "\\hyperlink{#{url}}{#{children_to_latex}}" + else + return "\\href{#{url}}{#{children_to_latex}}" + end end def to_latex_link - if id = self.ref_id - # if empty, use text - if id.size == 0 - id = children.to_s.downcase - end - - ref = @doc.refs[id] - if not ref - $stderr.puts "Could not find id = '#{id}'" - return children_to_latex - else - url = ref[:url] - #title = ref[:title] || 'no title' - - if url[0,1] == '#' - url = url[1,url.size] - return "\\hyperlink{#{url}}{#{children_to_latex}}" - else - return "\\href{#{url}}{#{children_to_latex}}" - end - end + id = self.ref_id + # if empty, use text + if id.size == 0 + id = children.to_s.downcase + end + + ref = @doc.refs[id] + if not ref + $stderr.puts "Could not find id = '#{id}'" + return children_to_latex else - url = self.url + url = ref[:url] + #title = ref[:title] || 'no title' if url[0,1] == '#' url = url[1,url.size] @@ -260,6 +349,7 @@ module MaRuKu; module Out; module Latex return "\\href{#{url}}{#{children_to_latex}}" end end + end def to_latex_email_address @@ -392,20 +482,16 @@ module MaRuKu; module Out; module Latex e << h end end -# puts "Before: #{e.inspect}" + + # puts a space after commands if needed e.each_index do |i| if e[i] =~ /\\\w+\s*$/ # command -# puts "Found command: #{e[i].inspect}" -# puts "Next is #{e[i+1].inspect}" if (s=e[i+1]) && s[0] == ?\ # space -# puts "SPACE for #{e[i+1].inspect}" e[i] = e[i] + "\\ " end - else -# puts "Not command: #{e[i].inspect}" end end -# puts "After: #{e.inspect}" + e.join(join_char) end lib/maruku/output/to_latex.rb @@ -32,10 +32,21 @@ module MaRuKu; module Strings s.split("\n") end - # This parses email headers. Returns an hash. hash['data'] is the message. + # This parses email headers. Returns an hash. + # + # +hash['data']+ is the message. + # + # Keys are downcased, space becomes underscore, converted to symbols. + # + # My key: true + # + # becomes: + # + # {:my_key => true} + # def parse_email_headers(s) keys={} - match = (s =~ /((\w+: .*\n)+)\n/) + match = (s =~ /((\w[\w\s]+: .*\n)+)\n/) if match != 0 keys[:data] = s else @@ -51,27 +62,18 @@ module MaRuKu; module Strings end keys end - - # `.xyz` => class: xyz - # `#xyz` => id: xyz + + # Keys are downcased, space becomes underscore, converted to symbols. def normalize_key_and_value(k,v) v = v ? v.strip : true # no value defaults to true k = k.strip - # `.xyz` => class: xyz - if k =~ /^\.([\w\d]+)/ - return :class, $1 - # `#xyz` => id: xyz - elsif k =~ /^\#([\w\d]+)/ - return :id, $1 - else - # check synonyms - v = true if ['yes','true'].include?(v.to_s.downcase) - v = false if ['no','false'].include?(v.to_s.downcase) - - k = k.downcase.gsub(' ','_') - return k, v - end + # check synonyms + v = true if ['yes','true'].include?(v.to_s.downcase) + v = false if ['no','false'].include?(v.to_s.downcase) + + k = k.downcase.gsub(' ','_') + return k, v end # Returns the number of leading spaces, considering that lib/maruku/string_utils.rb @@ -47,6 +47,11 @@ EOF end module MaRuKu + +Globals = { + :unsafe_features => false, +} + # I did not want to have a class for each possible element. # Instead I opted to have only the class "MDElement" # that represents eveything in the document (paragraphs, headers, etc). @@ -59,8 +64,8 @@ module MaRuKu # The @doc variable points to the document to which the MDElement # belongs (which is an instance of Maruku, subclass of MDElement). # -# Meta data is specified the hash `meta`. Keys are symbols (downcased, with -# spaces substituted by underscores) +# Attributes are contained in the hash `attributes`. +# Keys are symbols (downcased, with spaces substituted by underscores) # # For example, if you write in the source document. # @@ -71,19 +76,16 @@ module MaRuKu # # You can access `value` by writing: # -# @doc.meta[:my_property] # => 'value' +# @doc.attributes[:my_property] # => 'value' # # from whichever MDElement in the hierarchy. - +# class MDElement # See helpers.rb for the list of allowed #node_type values safe_attr_accessor :node_type, Symbol # Children are either Strings or MDElement safe_attr_accessor :children, Array - - -# safe_attr_accessor :meta, Hash # An attribute list, may not be nil safe_attr_accessor :al, Array #Maruku::AttributeList @@ -132,6 +134,7 @@ end # This represents the whole document and holds global data. class MDDocument + safe_attr_accessor :refs, Hash safe_attr_accessor :footnotes, Hash lib/maruku/structures.rb @@ -46,7 +46,8 @@ end class Hash def inspect_ordered(a=nil,b=nil) - "{"+map{|k,v| k.inspect + "=>"+v.inspect}.join(',')+"}" + "{"+keys.map{|x|x.to_s}.sort.map{|x|x.to_sym}. + map{|k| k.inspect + "=>"+self[k].inspect}.join(',')+"}" end end lib/maruku/structures_inspect.rb @@ -19,7 +19,7 @@ #++ module MaRuKu - Version = '0.4.0' + Version = '0.4.1' MarukuURL = 'http://maruku.rubyforge.org/' lib/maruku/version.rb @@ -22,14 +22,14 @@ md_el(:document,[ md_el(:abbr,["W3C"],{:title=>"World Wide Web Consortium"},[]), "." ]), - md_el(:abbr_def,[],{:text=>"Hyper Text Markup Language",:abbr=>"HTML"},[]), - md_el(:abbr_def,[],{:text=>"World Wide Web Consortium",:abbr=>"W3C"},[]), + md_el(:abbr_def,[],{:abbr=>"HTML",:text=>"Hyper Text Markup Language"},[]), + md_el(:abbr_def,[],{:abbr=>"W3C",:text=>"World Wide Web Consortium"},[]), md_par([ "Operation ", md_el(:abbr,["Tigra Genesis"],{:title=>nil},[]), " is going well." ]), - md_el(:abbr_def,[],{:text=>nil,:abbr=>"Tigra Genesis"},[]) + md_el(:abbr_def,[],{:abbr=>"Tigra Genesis",:text=>nil},[]) ],{},[]) *** Output of to_html *** tests/unittest/abbreviations.md @@ -33,9 +33,9 @@ This is an email address: *** Output of Markdown.pl *** -This is an email address: <a href="mailto:andrea@invalid.it">andrea@invalid.it</a> +This is an email address: <a href="mailto:andrea@invalid.it">andrea@invalid.it</a> *** Output of Markdown.pl (parsed) *** -This is an email address: <a href='m&#97;&#x69;&#108;&#x74;&#x6F;:&#x61;&#x6E;&#x64;&#x72;&#101;&#97;&#64;&#105;n&#x76;&#x61;&#108;i&#x64;&#x2E;&#105;&#116;'>andrea@invalid.it</a +This is an email address: <a href='&#109;&#97;&#x69;&#108;&#116;&#x6F;:&#97;n&#100;&#114;&#101;&#x61;&#64;&#x69;&#x6E;&#118;&#97;&#x6C;&#x69;&#100;&#46;&#x69;&#116;'>andrea@invalid.it</a > \ No newline at end of file tests/unittest/email.md @@ -63,11 +63,11 @@ Maruku translates HTML entities to the equivalent in \LaTeX\xspace : \begin{tabular}{l|l} Entity&Result\\ \hline -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char99\char111\char112\char121\char59}&\copyright\\ -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char112\char111\char117\char110\char100\char59}&\pounds\\ -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char97\char38\char110\char98\char115\char112\char59\char98}&a~b\\ -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char108\char97\char109\char98\char100\char97\char59}&$\lambda$\\ -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char109\char100\char97\char115\char104\char59}&---\\ +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38\char99\char111\char112\char121\char59}&\copyright \\ +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38\char112\char111\char117\char110\char100\char59}&\pounds \\ +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char97\char38\char110\char98\char115\char112\char59\char98}&a~b\\ +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38\char108\char97\char109\char98\char100\char97\char59}&$\lambda$\\ +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38\char109\char100\char97\char115\char104\char59}&---\\ \end{tabular} Entity-substitution does not happen in code blocks or inline code. @@ -76,7 +76,7 @@ The following should not be translated: \begin{verbatim}© \end{verbatim} -It should read just like this: \colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char99\char111\char112\char121\char59}. +It should read just like this: \colorbox[rgb]{1.00,0.93,1.00}{\tt \char38\char99\char111\char112\char121\char59}. *** Output of to_md *** @@ -97,81 +97,10 @@ Maruku translates HTML entities to the equivalent in LaTeX:EntityResultabEntity- + OK! -Failed tests: [:to_latex] - -*** Output of inspect *** -md_el(:document,[ - md_par(["Maruku translates HTML entities to the equivalent in LaTeX:"]), - md_el(:table,[ - md_el(:head_cell,["Entity"],{},[]), - md_el(:head_cell,["Result"],{},[]), - md_el(:cell,[md_code("©")],{},[]), - md_el(:cell,[md_entity("copy")],{},[]), - md_el(:cell,[md_code("£")],{},[]), - md_el(:cell,[md_entity("pound")],{},[]), - md_el(:cell,[md_code("a b")],{},[]), - md_el(:cell,["a", md_entity("nbsp"), "b"],{},[]), - md_el(:cell,[md_code("λ")],{},[]), - md_el(:cell,[md_entity("lambda")],{},[]), - md_el(:cell,[md_code("—")],{},[]), - md_el(:cell,[md_entity("mdash")],{},[]) - ],{:align=>[:left, :left]},[]), - md_par([ - "Entity-substitution does not happen in code blocks or inline code." - ]), - md_par(["The following should not be translated:"]), - md_el(:code,[],{:raw_code=>"©\n"},[]), - md_par(["It should read just like this: ", md_code("©"), "."]) -],{},[]) -*** Output of to_html *** - -Maruku translates HTML entities to the equivalent in LaTeX: -<table><thead><tr><th>Entity</th><th>Result</th></tr></thead><tbody><tr><td style='text-align: left;'><code>&copy;</code></td><td style='text-align: left;'>©</td></tr><tr><td style='text-align: left;'><code>&pound;</code></td><td style='text-align: left;'>£</td></tr><tr><td style='text-align: left;'><code>a&nbsp;b</code></td><td style='text-align: left;'>a b</td></tr><tr><td style='text-align: left;'><code>&lambda;</code></td><td style='text-align: left;'>λ</td></tr><tr><td style='text-align: left;'><code>&mdash;</code></td><td style='text-align: left;'>—</td></tr></tbody></table> -Entity-substitution does not happen in code blocks or inline code. - -The following should not be translated: -<pre><code>&copy; -</code></pre> -It should read just like this: <code>&copy;</code>. - -*** Output of to_latex *** ------| WARNING | ----- -Maruku translates HTML entities to the equivalent in \LaTeX\xspace : - -\begin{tabular}{l|l} -Entity&Result\\ -\hline -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char99\char111\char112\char121\char59}&\copyright \\ -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char112\char111\char117\char110\char100\char59}&\pounds \\ -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char97\char38\char110\char98\char115\char112\char59\char98}&a~b\\ -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char108\char97\char109\char98\char100\char97\char59}&$\lambda$\\ -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char109\char100\char97\char115\char104\char59}&---\\ -\end{tabular} - -Entity-substitution does not happen in code blocks or inline code. - -The following should not be translated: - -\begin{verbatim}© -\end{verbatim} -It should read just like this: \colorbox[rgb]{1.00,0.67,1.00}{\tt \char38\char99\char111\char112\char121\char59}. - - -*** Output of to_md *** -Maruku translates HTML entities to the -equivalent in LaTeX: - -EntityResultabEntity-substitution does not happen in -code blocks or inline code. - -The following should not be translated: - -It should read just like this: . -*** Output of to_s *** -Maruku translates HTML entities to the equivalent in LaTeX:EntityResultabEntity-substitution does not happen in code blocks or inline code.The following should not be translated:It should read just like this: . *** Output of Markdown.pl *** Maruku translates HTML entities to the equivalent in LaTeX: tests/unittest/entities.md @@ -48,11 +48,11 @@ Hello: ! ! ` \{ \} [ ] ( ) \# . ! * * * Ora, {\em emphasis}, {\bf bold}, * {\tt \char60}- due asterischi-{\tt \char62} * , un underscore-{\tt \char62} \_ , {\em emphasis}, incre{\em dible}e! -This is \colorbox[rgb]{1.00,0.67,1.00}{\tt \char67\char111\char100\char101\char32\char119\char105\char116\char104\char32\char97\char32\char115\char112\char101\char99\char105\char97\char108\char58\char32\char45\char62\char32\char96\char32\char60\char45}(after) +This is \colorbox[rgb]{1.00,0.93,1.00}{\tt \char67\char111\char100\char101\char32\char119\char105\char116\char104\char32\char97\char32\char115\char112\char101\char99\char105\char97\char108\char58\char32\char45\char62\char32\char96\char32\char60\char45}(after) -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char83\char116\char97\char114\char116\char32} of paragraph +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char83\char116\char97\char114\char116\char32} of paragraph -End of \colorbox[rgb]{1.00,0.67,1.00}{\tt \char112\char97\char114\char97\char103\char114\char97\char112\char104\char32} +End of \colorbox[rgb]{1.00,0.93,1.00}{\tt \char112\char97\char114\char97\char103\char114\char97\char112\char104\char32} *** Output of to_md *** tests/unittest/escaping.md @@ -1 +1,10 @@ -<dl><dt>Apple</dt><dd>Pomaceous fruit of plants of the genus Malus in the family Rosaceae.</dd><dt>Orange</dt><dd>The fruit of an evergreen tree of the genus Citrus.</dd></dl> \ No newline at end of file + +<dl> +<dt>Apple</dt> + +<dd>Pomaceous fruit of plants of the genus Malus in the family Rosaceae.</dd> + +<dt>Orange</dt> + +<dd>The fruit of an evergreen tree of the genus Citrus.</dd> +</dl> tests/unittest/extra_dl.html @@ -20,17 +20,27 @@ md_el(:document,[ md_el(:definition_data,[ "Pomaceous fruit of plants of the genus Malus in the family Rosaceae." ],{},[]) - ],{:want_my_paragraph=>false,:definitions=>[md_el(:definition_data,[ + ],{:definitions=>[md_el(:definition_data,[ "Pomaceous fruit of plants of the genus Malus in the family Rosaceae." - ],{},[])],:terms=>[md_el(:definition_term,["Apple"],{},[])]},[]), + ],{},[])],:terms=>[md_el(:definition_term,["Apple"],{},[])],:want_my_paragraph=>false},[]), md_el(:definition,[ md_el(:definition_term,["Orange"],{},[]), md_el(:definition_data,["The fruit of an evergreen tree of the genus Citrus."],{},[]) - ],{:want_my_paragraph=>false,:definitions=>[md_el(:definition_data,["The fruit of an evergreen tree of the genus Citrus."],{},[])],:terms=>[md_el(:definition_term,["Orange"],{},[])]},[]) + ],{:definitions=>[md_el(:definition_data,["The fruit of an evergreen tree of the genus Citrus."],{},[])],:terms=>[md_el(:definition_term,["Orange"],{},[])],:want_my_paragraph=>false},[]) ],{},[]) ],{},[]) *** Output of to_html *** -<dl><dt>Apple</dt><dd>Pomaceous fruit of plants of the genus Malus in the family Rosaceae.</dd><dt>Orange</dt><dd>The fruit of an evergreen tree of the genus Citrus.</dd></dl> + +<dl> +<dt>Apple</dt> + +<dd>Pomaceous fruit of plants of the genus Malus in the family Rosaceae.</dd> + +<dt>Orange</dt> + +<dd>The fruit of an evergreen tree of the genus Citrus.</dd> +</dl> + *** Output of to_latex *** \begin{description} tests/unittest/extra_dl.md @@ -53,7 +53,7 @@ md_el(:document,[ Then you can create links to different parts of the same document like this: -, , +\hyperlink{header1}{Link back to header 1}, \hyperlink{header2}{Link back to header 2}, \hyperlink{header3}{Link back to header 3} *** Output of to_md *** tests/unittest/extra_header_id.md @@ -22,87 +22,7 @@ This is not a footnote. *** Output of inspect *** md_el(:document,[ md_par([ - "That's some text with a footnote ", - md_foot_ref("^b"), - " and another ", - md_foot_ref("^c"), - " and another ", - md_foot_ref("^a"), - "." - ]), - md_el(:footnote,[ - md_par(["And that's the footnote."]), - md_par(["That's the second paragraph of the footnote."]) - ],{:footnote_id=>"^a"},[]), - md_el(:footnote,[ - md_par(["And that's the footnote. This is second sentence (same paragraph)"]) - ],{:footnote_id=>"^b"},[]), - md_el(:footnote,[ - md_par(["This is the very long one."]), - md_par(["That's the second paragraph."]) - ],{:footnote_id=>"^c"},[]), - md_par(["This is not a footnote."]) -],{},[]) -*** Output of to_html *** - -That's some text with a footnote <a href='#fn:1' rel='footnote'>1</a> and another <a href='#fn:2' rel='footnote'>2</a> and another <a href='#fn:3' rel='footnote'>3</a>. - -This is not a footnote. -<div class='footnotes'><hr /><ol><li id='fn:1'> -And that's the footnote. This is second sentence (same paragraph) -<a href='#fnref:1' rev='footnote'>↩</a></li><li id='fn:2'> -This is the very long one. - -That's the second paragraph. -<a href='#fnref:2' rev='footnote'>↩</a></li><li id='fn:3'> -And that's the footnote. - -That's the second paragraph of the footnote. -<a href='#fnref:3' rev='footnote'>↩</a></li></ol></div> -*** Output of to_latex *** -That's some text with a footnote \footnote{And that's the footnote. This is second sentence (same paragraph)} and another \footnote{This is the very long one. - -That's the second paragraph.} and another \footnote{And that's the footnote. - -That's the second paragraph of the footnote.} . - -This is not a footnote. - - -*** Output of to_md *** -That's some text with a footnote and -another and another . - -And that's the footnote. - -That's the second paragraph of the -footnote. - -And that's the footnote. This is second -sentence (same paragraph) - -This is the very long one. - -That's the second paragraph. - -This is not a footnote. - - -*** Output of to_s *** -That's some text with a footnote and another and another .And that's the footnote.That's the second paragraph of the footnote.And that's the footnote. This is second sentence (same paragraph)This is the very long one.That's the second paragraph.This is not a footnote. -*** EOF *** - - - - -Failed tests: [:inspect, :to_html, :to_md, :to_s] - -*** Output of inspect *** ------| WARNING | ----- -md_el(:document,[ - md_par([ - "Tha", - "t", + "That", md_entity("rsquo"), "s some text with a footnote ", md_foot_ref("^b"), @@ -113,30 +33,27 @@ md_el(:document,[ "." ]), md_el(:footnote,[ - md_par(["And tha", "t", md_entity("rsquo"), "s the footnote."]), + md_par(["And that", md_entity("rsquo"), "s the footnote."]), md_par([ - "Tha", - "t", + "That", md_entity("rsquo"), "s the second paragraph of the footnote." ]) ],{:footnote_id=>"^a"},[]), md_el(:footnote,[ md_par([ - "And tha", - "t", + "And that", md_entity("rsquo"), "s the footnote. This is second sentence (same paragraph)" ]) ],{:footnote_id=>"^b"},[]), md_el(:footnote,[ md_par(["This is the very long one."]), - md_par(["Tha", "t", md_entity("rsquo"), "s the second paragraph."]) + md_par(["That", md_entity("rsquo"), "s the second paragraph."]) ],{:footnote_id=>"^c"},[]), md_par(["This is not a footnote."]) ],{},[]) *** Output of to_html *** ------| WARNING | ----- That’s some text with a footnote <a href='#fn:1' rel='footnote'>1</a> and another <a href='#fn:2' rel='footnote'>2</a> and another <a href='#fn:3' rel='footnote'>3</a>. @@ -163,28 +80,34 @@ This is not a footnote. *** Output of to_md *** ------| WARNING | ----- -Tha t s some text with a footnote and +That s some text with a footnote and another and another . -And tha t s the footnote. +And that s the footnote. -Tha t s the second paragraph of the +That s the second paragraph of the footnote. -And tha t s the footnote. This is -second sentence (same paragraph) +And that s the footnote. This is second +sentence (same paragraph) This is the very long one. -Tha t s the second paragraph. +That s the second paragraph. This is not a footnote. *** Output of to_s *** ------| WARNING | ----- Thats some text with a footnote and another and another .And thats the footnote.Thats the second paragraph of the footnote.And thats the footnote. This is second sentence (same paragraph)This is the very long one.Thats the second paragraph.This is not a footnote. +*** EOF *** + + + + OK! + + + *** Output of Markdown.pl *** That's some text with a footnote [^b] and another [^c] and another [^a]. tests/unittest/footnotes.md @@ -39,7 +39,9 @@ md_el(:document,[ md_im_image(["Cascading Style Sheets"], "http://jigsaw.w3.org/css-validator/images/vcss", "Title ok!") ]), md_par([ - "I'll say it one more time: this page does not use ", + "I", + md_entity("rsquo"), + "ll say it one more time: this page does not use ", md_image(["Cascading Style Sheets"], "css") ]), md_par([ @@ -57,7 +59,7 @@ md_el(:document,[ Please mouseover to see the title: <img title='Title ok!' src='http://jigsaw.w3.org/css-validator/images/vcss' /> -I'll say it one more time: this page does not use <img title='Optional title attribute' src='http://jigsaw.w3.org/css-validator/images/vcss' /> +I’ll say it one more time: this page does not use <img title='Optional title attribute' src='http://jigsaw.w3.org/css-validator/images/vcss' /> This is double size: <img class='external' title='Optional title attribute' src='http://jigsaw.w3.org/css-validator/images/vcss' style='border:0;width:188px;height:131px' /> @@ -83,7 +85,7 @@ Cascading Style Sheets Please mouseover to see the title: Cascading Style Sheets -I'll say it one more time: this page +I ll say it one more time: this page does not use Cascading Style Sheets This is double size: @@ -91,88 +93,15 @@ Cascading Style Sheets *** Output of to_s *** -This page does not uilizes Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsI'll say it one more time: this page does not use Cascading Style SheetsThis is double size: Cascading Style Sheets +This page does not uilizes Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsIll say it one more time: this page does not use Cascading Style SheetsThis is double size: Cascading Style Sheets *** EOF *** + OK! -Failed tests: [:inspect, :to_html, :to_md, :to_s] - -*** Output of inspect *** ------| WARNING | ----- -md_el(:document,[ - md_par([ - "This page does not uilizes ", - md_im_image(["Cascading Style Sheets"], "http://jigsaw.w3.org/css-validator/images/vcss", nil) - ]), - md_par([ - "Please mouseover to see the title: ", - md_im_image(["Cascading Style Sheets"], "http://jigsaw.w3.org/css-validator/images/vcss", "Title ok!") - ]), - md_par([ - "Please mouseover to see the title: ", - md_im_image(["Cascading Style Sheets"], "http://jigsaw.w3.org/css-validator/images/vcss", "Title ok!") - ]), - md_par([ - "I", - md_entity("rsquo"), - "ll say it one more time: this page does not use ", - md_image(["Cascading Style Sheets"], "css") - ]), - md_par([ - "This is double size: ", - md_image(["Cascading Style Sheets"], "css2") - ]), - md_ref_def("css", "http://jigsaw.w3.org/css-validator/images/vcss", {:title=>"Optional title attribute"}), - md_ref_def("css2", "http://jigsaw.w3.org/css-validator/images/vcss", {:title=>"Optional title attribute"}) -],{},[]) -*** Output of to_html *** ------| WARNING | ----- - -This page does not uilizes <img src='http://jigsaw.w3.org/css-validator/images/vcss' /> -Please mouseover to see the title: <img title='Title ok!' src='http://jigsaw.w3.org/css-validator/images/vcss' /> -Please mouseover to see the title: <img title='Title ok!' src='http://jigsaw.w3.org/css-validator/images/vcss' /> - -I’ll say it one more time: this page does not use <img title='Optional title attribute' src='http://jigsaw.w3.org/css-validator/images/vcss' /> - -This is double size: <img class='external' title='Optional title attribute' src='http://jigsaw.w3.org/css-validator/images/vcss' style='border:0;width:188px;height:131px' /> - -*** Output of to_latex *** -This page does not uilizes - -Please mouseover to see the title: - -Please mouseover to see the title: - -I'll say it one more time: this page does not use {\bf Images not supported yet (\char104\char116\char116\char112\char58\char47\char47\char106\char105\char103\char115\char97\char119\char46\char119\char51\char46\char111\char114\char103\char47\char99\char115\char115\char45\char118\char97\char108\char105\char100\char97\char116\char111\char114\char47\char105\char109\char97\char103\char101\char115\char47\char118\char99\char115\char115)} - -This is double size: {\bf Images not supported yet (\char104\char116\char116\char112\char58\char47\char47\char106\char105\char103\char115\char97\char119\char46\char119\char51\char46\char111\char114\char103\char47\char99\char115\char115\char45\char118\char97\char108\char105\char100\char97\char116\char111\char114\char47\char105\char109\char97\char103\char101\char115\char47\char118\char99\char115\char115)} - - -*** Output of to_md *** ------| WARNING | ----- -This page does not uilizes -Cascading Style Sheets - -Please mouseover to see the title: -Cascading Style Sheets - -Please mouseover to see the title: -Cascading Style Sheets - -I ll say it one more time: this page -does not use Cascading Style Sheets - -This is double size: -Cascading Style Sheets - - -*** Output of to_s *** ------| WARNING | ----- -This page does not uilizes Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsIll say it one more time: this page does not use Cascading Style SheetsThis is double size: Cascading Style Sheets *** Output of Markdown.pl *** This page does not uilizes <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets" title="" /> tests/unittest/images.md @@ -88,9 +88,7 @@ md_el(:document,[ Result alone: <img src='http://jigsaw.w3.org/css-validator/images/vcss' /> Without closing: -<img src='http://jigsaw.w3.org/css-validator/images/vcss' /><div> -This is true markdown text (paragraph) -This is true markdown text (no paragraph) +<img src='http://jigsaw.w3.org/css-validator/images/vcss' /><div>This is true markdown text (paragraph)This is true markdown text (no paragraph) This is true markdown text (block paragraph) </div><table> <tr> @@ -112,21 +110,21 @@ Input: \begin{verbatim}Emphasis \end{verbatim} -Result: {\bf Raw HTML removed in latex version } +Result: Input: \begin{verbatim}<img src="http://jigsaw.w3.org/css-validator/images/vcss"/> \end{verbatim} -Result on span: {\bf Raw HTML removed in latex version } +Result on span: Result alone: -{\bf Raw HTML removed in latex version }Without closing: +Without closing: + +The following is invalid HTML, and will generate an error: -{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version }The following is invalid HTML, and will generate an error: -{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version } *** Output of to_md *** Input: @@ -150,102 +148,10 @@ Input:Result: Input:Result on span: Result alone:Without closing:The following i + OK! -Failed tests: [:to_html] - -*** Output of inspect *** -md_el(:document,[ - md_par(["Input:"]), - md_el(:code,[],{:raw_code=>"Emphasis\n"},[]), - md_par(["Result: ", md_html("Emphasis")]), - md_par(["Input:"]), - md_el(:code,[],{:raw_code=>"<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\"/>\n"},[]), - md_par([ - "Result on span: ", - md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />") - ]), - md_par(["Result alone:"]), - md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />"), - md_par(["Without closing:"]), - md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />"), - md_html("<div markdown=\"1\">\n\tThis is *true* markdown text (paragraph)\n\n\t\n\t\tThis is *true* markdown text (no paragraph)\n\t\n\t\n\t\tThis is *true* markdown text (block paragraph)\n\t\n</div>"), - md_html("<table>\n<tr>\n<td markdown=\"1\">This is *true* markdown text. (no par)</td>\n<td markdown=\"block\">This is *true* markdown text. (par)</td>\n</tr>\n</table>"), - md_par(["The following is invalid HTML, and will generate an error:"]), - md_html("<table>\n<td markdown=\"1\">This is *true* markdown text. (no par)</td>\n<td markdown=\"block\">This is *true* markdown text. (par)</td>\n</tr>"), - md_html("</table>") -],{},[]) -*** Output of to_html *** ------| WARNING | ----- - -Input: -<pre><code>Emphasis -</code></pre> -Result: Emphasis - -Input: -<pre><code><img src="http://jigsaw.w3.org/css-validator/images/vcss"/> -</code></pre> -Result on span: <img src='http://jigsaw.w3.org/css-validator/images/vcss' /> - -Result alone: -<img src='http://jigsaw.w3.org/css-validator/images/vcss' /> -Without closing: -<img src='http://jigsaw.w3.org/css-validator/images/vcss' /><div>This is true markdown text (paragraph)This is true markdown text (no paragraph) -This is true markdown text (block paragraph) -</div><table> -<tr> -<td>This is true markdown text. (no par)</td> -<td> -This is true markdown text. (par) -</td> -</tr> -</table> -The following is invalid HTML, and will generate an error: -<pre class='markdown-html-error' style='border: solid 3px red; background-color: pink'>HTML parse error: -<table> -<td markdown="1">This is *true* markdown text. (no par)</td> -<td markdown="block">This is *true* markdown text. (par)</td> -</tr></pre><pre class='markdown-html-error' style='border: solid 3px red; background-color: pink'>HTML parse error: -</table></pre> -*** Output of to_latex *** -Input: - -\begin{verbatim}Emphasis -\end{verbatim} -Result: {\bf Raw HTML removed in latex version } - -Input: - -\begin{verbatim}<img src="http://jigsaw.w3.org/css-validator/images/vcss"/> -\end{verbatim} -Result on span: {\bf Raw HTML removed in latex version } - -Result alone: - -{\bf Raw HTML removed in latex version }Without closing: - -{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version }The following is invalid HTML, and will generate an error: - -{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version } -*** Output of to_md *** -Input: - -Result: - -Input: - -Result on span: - -Result alone: -Without closing: -The following is invalid HTML, and will -generate an error: - - -*** Output of to_s *** -Input:Result: Input:Result on span: Result alone:Without closing:The following is invalid HTML, and will generate an error: *** Output of Markdown.pl *** CSS: style.css tests/unittest/inline_html.md @@ -14,7 +14,7 @@ md_el(:document,[ Test bold </div>Test bold *** Output of to_latex *** -{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version } + *** Output of to_md *** *** Output of to_s *** tests/unittest/inline_html2.md @@ -107,15 +107,15 @@ Search on \href{http://www.google.com}{Google} Search on \href{http://images.google.com}{Google images} -Inline: +Inline: \href{http://google.com}{Google images} -Inline with title: +Inline with title: \href{http://google.com}{Google images} -Inline with title: +Inline with title: \href{http://google.com}{Google images} -Search on \href{http://www.gogole.com}{http://www.gogole.com} or \href{http://Here.com}{http://Here.com} or ask \href{mailto:bill@google.com}{\char98\char105\char108\char108\char64\char103\char111\char111\char103\char108\char101\char46\char99\char111\char109} or you might ask bill@google.com. +Search on or or ask \href{mailto:bill@google.com}{\char98\char105\char108\char108\char64\char103\char111\char111\char103\char108\char101\char46\char99\char111\char109} or you might ask bill@google.com. -If all else fails, ask +If all else fails, ask \href{http://www.google.com}{Google} *** Output of to_md *** @@ -168,7 +168,7 @@ Search on GoogleSearch on GoogleSearch on GoogleSearch on GoogleSearch on Google Inline with title: <a href="http://google.com "Title"">Google images</a> -Search on <a href="http://www.gogole.com">http://www.gogole.com</a> or <a href="http://Here.com">http://Here.com</a> or ask <a href="mailto:bill@google.com">bill@google.com</a> +Search on <a href="http://www.gogole.com">http://www.gogole.com</a> or <a href="http://Here.com">http://Here.com</a> or ask <a href="mailto:bill@google.com">bill@google.com</a> or you might ask bill@google.com. If all else fails, ask <a href="http://www.google.com">Google</a> tests/unittest/links.md @@ -16,7 +16,9 @@ md_el(:document,[ md_el(:li,[ md_par(["This is a list item with two paragraphs."]), md_par([ - "This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" + "This is the second paragraph in the list item. You", + md_entity("rsquo"), + "re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" ]) ],{:want_my_paragraph=>true},[]), md_el(:li,[md_par(["other"])],{:want_my_paragraph=>false},[]) @@ -28,7 +30,7 @@ md_el(:document,[ <li> This is a list item with two paragraphs. -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit +This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit </li> <li> @@ -51,73 +53,20 @@ This is the second paragraph in the list item. You're only required to indent th *** Output of to_md *** -This is a list item with two paragraphs. -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit +This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit -ther *** Output of to_s *** -This is a list item with two paragraphs.This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitother +This is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitother *** EOF *** + OK! -Failed tests: [:inspect, :to_html, :to_md, :to_s] -*** Output of inspect *** ------| WARNING | ----- -md_el(:document,[ - md_el(:ul,[ - md_el(:li,[ - md_par(["This is a list item with two paragraphs."]), - md_par([ - "This is the second paragraph in the list item. Yo", - "u", - md_entity("rsquo"), - "re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" - ]) - ],{:want_my_paragraph=>true},[]), - md_el(:li,[md_par(["other"])],{:want_my_paragraph=>false},[]) - ],{},[]) -],{},[]) -*** Output of to_html *** ------| WARNING | ----- - -<ul> -<li> -This is a list item with two paragraphs. - -This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit -</li> -<li> -other -</li> -</ul> - -*** Output of to_latex *** -\begin{itemize}% -\item This is a list item with two paragraphs. - -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit - - -\item other - - - -\end{itemize} - -*** Output of to_md *** ------| WARNING | ----- --This is a list item with two paragraphs. -This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit --ther - - -*** Output of to_s *** ------| WARNING | ----- -This is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitother *** Output of Markdown.pl *** <ul> <li>This is a list item with two paragraphs. tests/unittest/list2.md @@ -70,7 +70,9 @@ md_el(:document,[ md_el(:li,[ md_par(["This is a list item with two paragraphs."]), md_par([ - "This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" + "This is the second paragraph in the list item. You", + md_entity("rsquo"), + "re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" ]) ],{:want_my_paragraph=>true},[]), md_el(:li,[md_par(["Another item in the same list."])],{:want_my_paragraph=>false},[]) @@ -110,7 +112,7 @@ md_el(:document,[ <li> This is a list item with two paragraphs. -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit +This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit </li> <li> @@ -187,185 +189,20 @@ ATTENZIONE! Ancora -This is a list item with two paragraphs. -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit +This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit -nother item in the same list. *** Output of to_s *** -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitAnother item in the same list. +Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitAnother item in the same list. *** EOF *** + OK! -Failed tests: [:inspect, :to_html, :to_md, :to_s] -*** Output of inspect *** ------| WARNING | ----- -md_el(:document,[ - md_el(:ul,[ - md_el(:li_span,[ - "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - "Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - "Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing" - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - "Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing" - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - "Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing." - ],{:want_my_paragraph=>false},[]) - ],{},[]), - md_par(["Ancora"]), - md_el(:ul,[ - md_el(:li,[ - md_par([ - "This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus." - ]), - md_par(["ATTENZIONE!"]) - ],{:want_my_paragraph=>true},[]), - md_el(:li,[ - md_par(["Suspendisse id sem consectetuer libero luctus adipiscing."]) - ],{:want_my_paragraph=>false},[]) - ],{},[]), - md_par(["Ancora"]), - md_el(:ul,[ - md_el(:li,[ - md_par(["This is a list item with two paragraphs."]), - md_par([ - "This is the second paragraph in the list item. Yo", - "u", - md_entity("rsquo"), - "re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" - ]) - ],{:want_my_paragraph=>true},[]), - md_el(:li,[md_par(["Another item in the same list."])],{:want_my_paragraph=>false},[]) - ],{},[]) -],{},[]) -*** Output of to_html *** ------| WARNING | ----- - -<ul> -<li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.</li> -<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li> - -<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing</li> - -<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing</li> - -<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li> -</ul> - -Ancora - -<ul> -<li> -This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. - -ATTENZIONE! -</li> - -<li> -Suspendisse id sem consectetuer libero luctus adipiscing. -</li> -</ul> - -Ancora - -<ul> -<li> -This is a list item with two paragraphs. - -This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit -</li> - -<li> -Another item in the same list. -</li> -</ul> - -*** Output of to_latex *** -\begin{itemize}% -\item Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus. -\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing. -\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing -\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing -\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing. - -\end{itemize} -Ancora - -\begin{itemize}% -\item This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. - -ATTENZIONE! - - -\item Suspendisse id sem consectetuer libero luctus adipiscing. - - - -\end{itemize} -Ancora - -\begin{itemize}% -\item This is a list item with two paragraphs. - -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit - - -\item Another item in the same list. - - - -\end{itemize} - -*** Output of to_md *** ------| WARNING | ----- --orem ipsum dolor sit amet, -consectetuer adipiscing elit. -Aliquam hendrerit mi posuere -lectus. Vestibulum enim wisi, -viverra nec, fringilla in, laoreet -vitae, risus. --onec sit amet nisl. Aliquam semper -ipsum sit amet velit. Suspendisse -id sem consectetuer libero luctus -adipiscing. --onec sit amet nisl. Aliquam semper -ipsum sit amet velit. Suspendisse -id sem consectetuer libero luctus -adipiscing --onec sit amet nisl. Aliquam semper -ipsum sit amet velit. Suspendisse -id sem consectetuer libero luctus -adipiscing --onec sit amet nisl. Aliquam semper -ipsum sit amet velit. Suspendisse -id sem consectetuer libero luctus -adipiscing. - -Ancora - --This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. -ATTENZIONE! --Suspendisse id sem consectetuer libero luctus adipiscing. - -Ancora - --This is a list item with two paragraphs. -This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit --nother item in the same list. - - -*** Output of to_s *** ------| WARNING | ----- -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitAnother item in the same list. *** Output of Markdown.pl *** <ul> <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. tests/unittest/lists.md @@ -164,11 +164,11 @@ Paragraph with header on two lines: Paragraph with html after -{\bf Raw HTML removed in latex version }Paragraph with html after, indented: {\bf Raw HTML removed in latex version } +Paragraph with html after, indented: -Paragraph with html after, indented: {\bf Raw HTML removed in latex version } {\em tralla} {\bf Raw HTML removed in latex version } +Paragraph with html after, indented: {\em tralla} -Paragraph with html after, indented: {\bf Raw HTML removed in latex version } +Paragraph with html after, indented: *** Output of to_md *** tests/unittest/lists_after_paragraph.md @@ -89,7 +89,9 @@ md_el(:document,[ md_el(:li,[ md_par(["This is a list item with two paragraphs."]), md_par([ - "This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" + "This is the second paragraph in the list item. You", + md_entity("rsquo"), + "re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" ]) ],{:want_my_paragraph=>true},[]), md_el(:li,[md_par(["Another item in the same list."])],{:want_my_paragraph=>false},[]) @@ -151,7 +153,7 @@ md_el(:document,[ <li> This is a list item with two paragraphs. -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit +This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit </li> <li> @@ -257,248 +259,20 @@ Ancora Ancora -This is a list item with two paragraphs. -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit +This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit -nother item in the same list. *** Output of to_s *** -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!UnoDuetretretreDueSuspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitAnother item in the same list. +Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!UnoDuetretretreDueSuspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitAnother item in the same list. *** EOF *** - -Failed tests: [:inspect, :to_html, :to_md, :to_s] - -*** Output of inspect *** ------| WARNING | ----- -md_el(:document,[ - md_el(:ol,[ - md_el(:li_span,[ - "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - "Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - "Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing" - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - "Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing" - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - "Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing." - ],{:want_my_paragraph=>false},[]) - ],{},[]), - md_par(["Ancora"]), - md_el(:ol,[ - md_el(:li,[ - md_par([ - "This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus." - ]), - md_par(["ATTENZIONE!"]), - md_el(:ul,[ - md_el(:li,[md_par(["Uno"])],{:want_my_paragraph=>false},[]), - md_el(:li,[ - md_par(["Due"]), - md_el(:ol,[ - md_el(:li_span,["tre"],{:want_my_paragraph=>false},[]), - md_el(:li_span,["tre"],{:want_my_paragraph=>false},[]), - md_el(:li_span,["tre"],{:want_my_paragraph=>false},[]) - ],{},[]) - ],{:want_my_paragraph=>true},[]), - md_el(:li,[md_par(["Due"])],{:want_my_paragraph=>false},[]) - ],{},[]) - ],{:want_my_paragraph=>true},[]), - md_el(:li,[ - md_par(["Suspendisse id sem consectetuer libero luctus adipiscing."]) - ],{:want_my_paragraph=>false},[]) - ],{},[]), - md_par(["Ancora"]), - md_el(:ul,[ - md_el(:li,[ - md_par(["This is a list item with two paragraphs."]), - md_par([ - "This is the second paragraph in the list item. Yo", - "u", - md_entity("rsquo"), - "re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit" - ]) - ],{:want_my_paragraph=>true},[]), - md_el(:li,[md_par(["Another item in the same list."])],{:want_my_paragraph=>false},[]) - ],{},[]) -],{},[]) -*** Output of to_html *** ------| WARNING | ----- - -<ol> -<li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.</li> - -<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li> - -<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing</li> - -<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing</li> - -<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li> -</ol> - -Ancora - -<ol> -<li> -This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. - -ATTENZIONE! - -<ul> -<li> -Uno -</li> - -<li> -Due - -<ol> -<li>tre</li> - -<li>tre</li> - -<li>tre</li> -</ol> -</li> - -<li> -Due -</li> -</ul> -</li> - -<li> -Suspendisse id sem consectetuer libero luctus adipiscing. -</li> -</ol> - -Ancora - -<ul> -<li> -This is a list item with two paragraphs. - -This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit -</li> - -<li> -Another item in the same list. -</li> -</ul> - -*** Output of to_latex *** -\begin{enumerate}% -\item Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus. -\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing. -\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing -\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing -\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing. - -\end{enumerate} -Ancora - -\begin{enumerate}% -\item This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. - -ATTENZIONE! - -\begin{itemize}% -\item Uno - - -\item Due - -\begin{enumerate}% -\item tre -\item tre -\item tre - -\end{enumerate} - -\item Due - - - -\end{itemize} - -\item Suspendisse id sem consectetuer libero luctus adipiscing. - - - -\end{enumerate} -Ancora - -\begin{itemize}% -\item This is a list item with two paragraphs. - -This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit - - -\item Another item in the same list. - + OK! -\end{itemize} -*** Output of to_md *** ------| WARNING | ----- -1. Lorem ipsum dolor sit amet, - consectetuer adipiscing elit. - Aliquam hendrerit mi posuere - lectus. Vestibulum enim wisi, - viverra nec, fringilla in, laoreet - vitae, risus. -2. Donec sit amet nisl. Aliquam semper - ipsum sit amet velit. Suspendisse - id sem consectetuer libero luctus - adipiscing. -3. Donec sit amet nisl. Aliquam semper - ipsum sit amet velit. Suspendisse - id sem consectetuer libero luctus - adipiscing -4. Donec sit amet nisl. Aliquam semper - ipsum sit amet velit. Suspendisse - id sem consectetuer libero luctus - adipiscing -5. Donec sit amet nisl. Aliquam semper - ipsum sit amet velit. Suspendisse - id sem consectetuer libero luctus - adipiscing. - -Ancora - -1. - This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. - ATTENZIONE! - Uno - - Due - - 1. tre - 2. tre - 3. tre - - Due -2. - Suspendisse id sem consectetuer libero luctus adipiscing. - -Ancora - --This is a list item with two paragraphs. -This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit --nother item in the same list. - - -*** Output of to_s *** ------| WARNING | ----- -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!UnoDuetretretreDueSuspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitAnother item in the same list. *** Output of Markdown.pl *** <ol> <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. tests/unittest/lists_ol.md @@ -1,6 +1,6 @@ Write a comment abouth the test here. *** Parameters: *** -{:subject=>"Software not painful to use", :subject_short=>"painless software", :order=>"-9.5", :date=>"Nov 20 2006", :topic=>"/misc/coolsw", :archive=>false, :inmenu=>true} +{:topic=>"/misc/coolsw", :date=>"Nov 20 2006", :archive=>false, :inmenu=>true, :subject=>"Software not painful to use", :order=>"-9.5", :subject_short=>"painless software"} *** Markdown input: *** Subject: Software not painful to use Subject_short: painless software @@ -130,426 +130,11 @@ md_el(:document,[ md_em(["Email"]), ": ", md_link(["GMail"],"gmail"), - ", \"search, don't sort\" really works." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["Text Editor"]), - ": ", - md_link(["TextMate"],"textmate"), - ", you have to buy it, but it's worth every penny. There are rumours that it's been converting (recovering) Emacs users (addicts). Unfortunately, it's Mac only. An alternative is ", - md_link(["jedit"],"jedit"), - " (GPL, Java)." - ],{:want_my_paragraph=>false},[]) - ],{},[]), - md_el(:header,["Development"],{:level=>3},[]), - md_el(:ul,[ - md_el(:li,[ - md_par([ - md_em(["Build system"]), - ": ", - md_link(["cmake"],"cmake"), - ", throw the ", - md_link(["autotools"],"autotools"), - " away." - ]) - ],{:want_my_paragraph=>false},[]), - md_el(:li,[ - md_par([ - md_em(["Source code control system"]), - ": ditch CVS for ", - md_link(["subversion"],"subversion"), - "." - ]) - ],{:want_my_paragraph=>false},[]), - md_el(:li,[ - md_par([ - md_em(["Project management"]), - ": ", - md_link(["Trac"],"trac"), - " tracks everything." - ]) - ],{:want_my_paragraph=>false},[]), - md_el(:li,[ - md_par([ - md_em(["Scripting language"]), - ": ", - md_link(["Ruby"],"ruby"), - " is Japanese pragmatism (and has a ", - md_link(["poignant"],"poignant"), - " guide). Python, you say? Python is too academic and snob:" - ]), - md_el(:code,[],{:raw_code=>"$ python \nPython 2.4.1 (\\#1, Jun 4 2005, 00:54:33) \nType \"help\", \"copyright\", \"credits\" or \"license\" for more information.\n>>> exit\n'Use Ctrl-D (i.e. EOF) to exit.'\n>>> quit\n'Use Ctrl-D (i.e. EOF) to exit.'"},[]) - ],{:want_my_paragraph=>true},[]), - md_el(:li,[ - md_par([ - md_em(["Java IDE"]), - ": ", - md_link(["JBuilder"],"jbuilder"), - " is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained ", - md_link(["generics"],"java-generics"), - " and got opensourced." - ]) - ],{:want_my_paragraph=>false},[]), - md_el(:li,[ - md_par([ - md_em(["Mark-up language"]), - ": HTML is so 2001, why don't you take at look at ", - md_link(["Markdown"],"markdown"), - "? ", - md_im_link(["Look at the source of this page"], "data/misc_markdown.png", nil), - "." - ]) - ],{:want_my_paragraph=>false},[]), - md_el(:li,[ - md_par([ - md_em(["C++ libraries"]), - ": * ", - md_link(["QT"],"qt"), - " for GUIs. * ", - md_link(["GSL"],"gsl"), - " for math. * ", - md_link(["Magick++"],"magick"), - " for manipulating images. * ", - md_link(["Cairo"],"cairo"), - " for creating PDFs. * ", - md_link(["Boost"],"boost"), - " for just about everything else." - ]) - ],{:want_my_paragraph=>false},[]) - ],{},[]), - md_el(:header,["Research"],{:level=>3},[]), - md_el(:ul,[ - md_el(:li_span,[md_em(["Writing papers"]), ": ", md_link(["LaTeX"],"latex")],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["Writing papers & enjoying the process"]), - ": ", - md_link(["LyX"],"lyx") - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["Handsome figures in your papers"]), - ": ", - md_link(["xfig"],"xfig"), - " or, better, ", - md_link(["jfig"],"jfig"), - "." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["The occasional presentation with many graphical content"]), - ": ", - md_link(["OpenOffice Impress"],"impress"), - " (using the ", - md_link(["OOOlatex plugin"],"ooolatex"), - "); the alternative is PowerPoint with the ", - md_link(["TexPoint"],"texpoint"), - " plugin." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["Managing BibTeX"]), - ": ", - md_link(["jabref"],"jabref"), - ": multi-platform, for all your bibtex needs." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["IEEExplore and BibTeX"]), - ": convert citations using ", - md_link(["BibConverter"],"bibconverter"), - "." - ],{:want_my_paragraph=>false},[]) - ],{},[]), - md_el(:header,["Cool websites"],{:level=>3},[]), - md_el(:ul,[ - md_el(:li_span,[ - md_em(["Best site in the wwworld"]), - ": ", - md_link(["Wikipedia"],"wikipedia") - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_link(["Mutopia"],"mutopia"), - " for sheet music; ", - md_link(["the Gutenberg Project"],"gutenberg"), - " for books; ", - md_link(["LiberLiber"],"liberliber"), - " for books in italian." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[md_em(["Blogs"]), ": ", md_link(["Bloglines"],"bloglines")],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["Sharing photos"]), - ": ", - md_link(["flickr"],"flickr"), - " exposes an API you can use." - ],{:want_my_paragraph=>false},[]) - ],{},[]), - md_ref_def("firefox", "http://getfirefox.com/", {:title=>nil}), - md_ref_def("gmail", "http://gmail.com/", {:title=>nil}), - md_ref_def("bloglines", "http://bloglines.com/", {:title=>nil}), - md_ref_def("wikipedia", "http://en.wikipedia.org/", {:title=>nil}), - md_ref_def("ruby", "http://www.ruby-lang.org/", {:title=>nil}), - md_ref_def("poignant", "http://poignantguide.net/ruby/", {:title=>nil}), - md_ref_def("webgen", "http://webgen.rubyforge.org/", {:title=>nil}), - md_ref_def("markdown", "http://daringfireball.net/projects/markdown/", {:title=>nil}), - md_ref_def("latex", "http://en.wikipedia.org/wiki/LaTeX", {:title=>nil}), - md_ref_def("lyx", "http://www.lyx.org", {:title=>nil}), - md_ref_def("impress", "http://www.openoffice.org/product/impress.html", {:title=>nil}), - md_ref_def("ooolatex", "http://ooolatex.sourceforge.net/", {:title=>nil}), - md_ref_def("texpoint", "http://texpoint.necula.org/", {:title=>nil}), - md_ref_def("jabref", "http://jabref.sourceforge.net/", {:title=>nil}), - md_ref_def("camino", "http://www.caminobrowser.org/", {:title=>nil}), - md_ref_def("switch", "http://www.apple.com/getamac/", {:title=>nil}), - md_ref_def("textmate", "http://www.apple.com/getamac/", {:title=>nil}), - md_ref_def("cmake", "http://www.cmake.org/", {:title=>nil}), - md_ref_def("xfig", "http://www.xfig.org/", {:title=>nil}), - md_ref_def("jfig", "http://tams-www.informatik.uni-hamburg.de/applets/jfig/", {:title=>nil}), - md_ref_def("subversion", "http://subversion.tigris.org", {:title=>nil}), - md_ref_def("jbuilder", "http://www.borland.com/us/products/jbuilder/index.html", {:title=>nil}), - md_ref_def("flickr", "http://www.flickr.com/", {:title=>nil}), - md_ref_def("myflickr", "http://www.flickr.com/photos/censi", {:title=>nil}), - md_ref_def("bibconverter", "http://www.bibconverter.net/ieeexplore/", {:title=>nil}), - md_ref_def("autotools", "http://sources.redhat.com/autobook/", {:title=>nil}), - md_ref_def("jedit", "http://www.jedit.org/", {:title=>nil}), - md_ref_def("qt", "http://www.trolltech.no/", {:title=>nil}), - md_ref_def("gsl", "http://www.gnu.org/software/gsl/", {:title=>nil}), - md_ref_def("magick", "http://www.imagemagick.org/Magick++/", {:title=>nil}), - md_ref_def("cairo", "http://cairographics.org/", {:title=>nil}), - md_ref_def("boost", "http://www.boost.org/", {:title=>nil}), - md_ref_def("markdown", "http://en.wikipedia.org/wiki/Markdown", {:title=>nil}), - md_ref_def("trac", "http://trac.edgewall.org/", {:title=>nil}), - md_ref_def("mutopia", "http://www.mutopiaproject.org/", {:title=>nil}), - md_ref_def("liberliber", "http://www.liberliber.it/", {:title=>nil}), - md_ref_def("gutenberg", "http://www.gutenberg.org/", {:title=>nil}), - md_ref_def("java-generics", "http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html", {:title=>nil}) -],{},[]) -*** Output of to_html *** - -<h3 id='general'>General</h3> - -<ul> -<li>Operating System : <a href='http://www.apple.com/getamac/'>Mac OS X</a>: heaven, after the purgatory of Linux and the hell of Windows.</li> - -<li>Browser: <a href='http://getfirefox.com/'>Firefox</a>. On a Mac, <a href='http://www.caminobrowser.org/'>Camino</a>.</li> - -<li>Email: <a href='http://gmail.com/'>GMail</a>, "search, don't sort" really works.</li> - -<li>Text Editor: <a href='http://www.apple.com/getamac/'>TextMate</a>, you have to buy it, but it's worth every penny. There are rumours that it's been converting (recovering) Emacs users (addicts). Unfortunately, it's Mac only. An alternative is <a href='http://www.jedit.org/'>jedit</a> (GPL, Java).</li> -</ul> - -<h3 id='development'>Development</h3> - -<ul> -<li> -Build system: <a href='http://www.cmake.org/'>cmake</a>, throw the <a href='http://sources.redhat.com/autobook/'>autotools</a> away. -</li> - -<li> -Source code control system: ditch CVS for <a href='http://subversion.tigris.org'>subversion</a>. -</li> - -<li> -Project management: <a href='http://trac.edgewall.org/'>Trac</a> tracks everything. -</li> - -<li> -Scripting language: <a href='http://www.ruby-lang.org/'>Ruby</a> is Japanese pragmatism (and has a <a href='http://poignantguide.net/ruby/'>poignant</a> guide). Python, you say? Python is too academic and snob: -<pre><code>$ python -Python 2.4.1 (\#1, Jun 4 2005, 00:54:33) -Type "help", "copyright", "credits" or "license" for more information. ->>> exit -'Use Ctrl-D (i.e. EOF) to exit.' ->>> quit -'Use Ctrl-D (i.e. EOF) to exit.'</code></pre></li> - -<li> -Java IDE: <a href='http://www.borland.com/us/products/jbuilder/index.html'>JBuilder</a> is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained <a href='http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html'>generics</a> and got opensourced. -</li> - -<li> -Mark-up language: HTML is so 2001, why don't you take at look at <a href='http://en.wikipedia.org/wiki/Markdown'>Markdown</a>? <a href='data/misc_markdown.png'>Look at the source of this page</a>. -</li> - -<li> -C++ libraries: * <a href='http://www.trolltech.no/'>QT</a> for GUIs. * <a href='http://www.gnu.org/software/gsl/'>GSL</a> for math. * <a href='http://www.imagemagick.org/Magick++/'>Magick++</a> for manipulating images. * <a href='http://cairographics.org/'>Cairo</a> for creating PDFs. * <a href='http://www.boost.org/'>Boost</a> for just about everything else. -</li> -</ul> - -<h3 id='research'>Research</h3> - -<ul> -<li>Writing papers: <a href='http://en.wikipedia.org/wiki/LaTeX'>LaTeX</a></li> - -<li>Writing papers & enjoying the process: <a href='http://www.lyx.org'>LyX</a></li> - -<li>Handsome figures in your papers: <a href='http://www.xfig.org/'>xfig</a> or, better, <a href='http://tams-www.informatik.uni-hamburg.de/applets/jfig/'>jfig</a>.</li> - -<li>The occasional presentation with many graphical content: <a href='http://www.openoffice.org/product/impress.html'>OpenOffice Impress</a> (using the <a href='http://ooolatex.sourceforge.net/'>OOOlatex plugin</a>); the alternative is PowerPoint with the <a href='http://texpoint.necula.org/'>TexPoint</a> plugin.</li> - -<li>Managing BibTeX: <a href='http://jabref.sourceforge.net/'>jabref</a>: multi-platform, for all your bibtex needs.</li> - -<li>IEEExplore and BibTeX: convert citations using <a href='http://www.bibconverter.net/ieeexplore/'>BibConverter</a>.</li> -</ul> - -<h3 id='cool_websites'>Cool websites</h3> - -<ul> -<li>Best site in the wwworld: <a href='http://en.wikipedia.org/'>Wikipedia</a></li> - -<li><a href='http://www.mutopiaproject.org/'>Mutopia</a> for sheet music; <a href='http://www.gutenberg.org/'>the Gutenberg Project</a> for books; <a href='http://www.liberliber.it/'>LiberLiber</a> for books in italian.</li> - -<li>Blogs: <a href='http://bloglines.com/'>Bloglines</a></li> - -<li>Sharing photos: <a href='http://www.flickr.com/'>flickr</a> exposes an API you can use.</li> -</ul> - -*** Output of to_latex *** -\hypertarget{general}{}\subsubsection*{{General}}\label{general} - -\begin{itemize}% -\item {\em Operating System} : \href{http://www.apple.com/getamac/}{Mac OS X}: heaven, after the purgatory of Linux and the hell of Windows. -\item {\em Browser}: \href{http://getfirefox.com/}{Firefox}. On a Mac, \href{http://www.caminobrowser.org/}{Camino}. -\item {\em Email}: \href{http://gmail.com/}{GMail}, "search, don't sort" really works. -\item {\em Text Editor}: \href{http://www.apple.com/getamac/}{TextMate}, you have to buy it, but it's worth every penny. There are rumours that it's been converting (recovering) Emacs users (addicts). Unfortunately, it's Mac only. An alternative is \href{http://www.jedit.org/}{jedit} (GPL, Java). - -\end{itemize} -\hypertarget{development}{}\subsubsection*{{Development}}\label{development} - -\begin{itemize}% -\item {\em Build system}: \href{http://www.cmake.org/}{cmake}, throw the \href{http://sources.redhat.com/autobook/}{autotools} away. - - -\item {\em Source code control system}: ditch CVS for \href{http://subversion.tigris.org}{subversion}. - - -\item {\em Project management}: \href{http://trac.edgewall.org/}{Trac} tracks everything. - - -\item {\em Scripting language}: \href{http://www.ruby-lang.org/}{Ruby} is Japanese pragmatism (and has a \href{http://poignantguide.net/ruby/}{poignant} guide). Python, you say? Python is too academic and snob: - -\begin{verbatim}$ python -Python 2.4.1 (\#1, Jun 4 2005, 00:54:33) -Type "help", "copyright", "credits" or "license" for more information. ->>> exit -'Use Ctrl-D (i.e. EOF) to exit.' ->>> quit -'Use Ctrl-D (i.e. EOF) to exit.'\end{verbatim} - -\item {\em Java IDE}: \href{http://www.borland.com/us/products/jbuilder/index.html}{JBuilder} is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained \href{http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html}{generics} and got opensourced. - - -\item {\em Mark-up language}: HTML is so 2001, why don't you take at look at \href{http://en.wikipedia.org/wiki/Markdown}{Markdown}? . - - -\item {\em C++ libraries}: * \href{http://www.trolltech.no/}{QT} for GUIs. * \href{http://www.gnu.org/software/gsl/}{GSL} for math. * \href{http://www.imagemagick.org/Magick++/}{Magick++} for manipulating images. * \href{http://cairographics.org/}{Cairo} for creating PDFs. * \href{http://www.boost.org/}{Boost} for just about everything else. - - - -\end{itemize} -\hypertarget{research}{}\subsubsection*{{Research}}\label{research} - -\begin{itemize}% -\item {\em Writing papers}: \href{http://en.wikipedia.org/wiki/LaTeX}{LaTeX} -\item {\em Writing papers \& enjoying the process}: \href{http://www.lyx.org}{LyX} -\item {\em Handsome figures in your papers}: \href{http://www.xfig.org/}{xfig} or, better, \href{http://tams-www.informatik.uni-hamburg.de/applets/jfig/}{jfig}. -\item {\em The occasional presentation with many graphical content}: \href{http://www.openoffice.org/product/impress.html}{OpenOffice Impress} (using the \href{http://ooolatex.sourceforge.net/}{OOOlatex plugin}); the alternative is PowerPoint with the \href{http://texpoint.necula.org/}{TexPoint} plugin. -\item {\em Managing BibTeX}: \href{http://jabref.sourceforge.net/}{jabref}: multi-platform, for all your bibtex needs. -\item {\em IEEExplore and BibTeX}: convert citations using \href{http://www.bibconverter.net/ieeexplore/}{BibConverter}. - -\end{itemize} -\hypertarget{cool_websites}{}\subsubsection*{{Cool websites}}\label{cool_websites} - -\begin{itemize}% -\item {\em Best site in the wwworld}: \href{http://en.wikipedia.org/}{Wikipedia} -\item \href{http://www.mutopiaproject.org/}{Mutopia} for sheet music; \href{http://www.gutenberg.org/}{the Gutenberg Project} for books; \href{http://www.liberliber.it/}{LiberLiber} for books in italian. -\item {\em Blogs}: \href{http://bloglines.com/}{Bloglines} -\item {\em Sharing photos}: \href{http://www.flickr.com/}{flickr} exposes an API you can use. - -\end{itemize} - -*** Output of to_md *** -General-perating System: Mac OS X: heaven, -after the purgatory of Linux and -the hell of Windows. --rowser: Firefox. On a Mac, Camino. --mail: GMail, "search, don't sort" -really works. --ext Editor: TextMate, you have to -buy it, but it's worth every penny. -There are rumours that it's been -converting (recovering) Emacs users -(addicts). Unfortunately, it's Mac -only. An alternative is jedit(GPL, -Java). - -Development-Build system: cmake, throw the autotools away. --Source code control system: ditch CVS for subversion. --Project management: Trac tracks everything. --Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob: --Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced. --Mark-up language: HTML is so 2001, why don't you take at look at Markdown? Look at the source of this page. --C++ libraries: * QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else. - -Research-riting papers: LaTeX --Writing papers & enjoying the process -: LyX --andsome figures in your papers: -xfigor, better, jfig. --The occasional presentation with many graphical content -: OpenOffice Impress(using the -OOOlatex plugin); the alternative -is PowerPoint with the TexPoint -plugin. --anaging BibTeX: jabref: -multi-platform, for all your bibtex -needs. --EEExplore and BibTeX: convert -citations using BibConverter. - -Cool websites-est site in the wwworld: Wikipedia --utopiafor sheet music; -the Gutenberg Projectfor books; -LiberLiberfor books in italian. --logs: Bloglines --haring photos: flickrexposes an -API you can use. - - -*** Output of to_s *** -GeneralOperating System : Mac OS X: heaven, after the purgatory of Linux and the hell of Windows.Browser: Firefox. On a Mac, Camino.Email: GMail, "search, don't sort" really works.Text Editor: TextMate, you have to buy it, but it's worth every penny. There are rumours that it's been converting (recovering) Emacs users (addicts). Unfortunately, it's Mac only. An alternative is jedit (GPL, Java).DevelopmentBuild system: cmake, throw the autotools away.Source code control system: ditch CVS for subversion.Project management: Trac tracks everything.Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob:Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced.Mark-up language: HTML is so 2001, why don't you take at look at Markdown? Look at the source of this page.C++ libraries: * QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else.ResearchWriting papers: LaTeXWriting papers & enjoying the process: LyXHandsome figures in your papers: xfig or, better, jfig.The occasional presentation with many graphical content: OpenOffice Impress (using the OOOlatex plugin); the alternative is PowerPoint with the TexPoint plugin.Managing BibTeX: jabref: multi-platform, for all your bibtex needs.IEEExplore and BibTeX: convert citations using BibConverter.Cool websitesBest site in the wwworld: WikipediaMutopia for sheet music; the Gutenberg Project for books; LiberLiber for books in italian.Blogs: BloglinesSharing photos: flickr exposes an API you can use. -*** EOF *** - - - - -Failed tests: [:inspect, :to_html, :to_latex, :to_md, :to_s] - -*** Output of inspect *** ------| WARNING | ----- -md_el(:document,[ - md_el(:header,["General"],{:level=>3},[]), - md_el(:ul,[ - md_el(:li_span,[ - md_em(["Operating System"]), - " : ", - md_link(["Mac OS X"],"switch"), - ": heaven, after the purgatory of Linux and the hell of Windows." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["Browser"]), - ": ", - md_link(["Firefox"],"firefox"), - ". On a Mac, ", - md_link(["Camino"],"camino"), - "." - ],{:want_my_paragraph=>false},[]), - md_el(:li_span,[ - md_em(["Email"]), - ": ", - md_link(["GMail"],"gmail"), - ",", - " ", + ", ", md_entity("ldquo"), - "search, do", - "n", + "search, don", md_entity("rsquo"), - "t sor", - "t", + "t sort", md_entity("rdquo"), " really works." ],{:want_my_paragraph=>false},[]), @@ -557,14 +142,11 @@ md_el(:document,[ md_em(["Text Editor"]), ": ", md_link(["TextMate"],"textmate"), - ", you have to buy it, but i", - "t", + ", you have to buy it, but it", md_entity("rsquo"), - "s worth every penny. There are rumours that i", - "t", + "s worth every penny. There are rumours that it", md_entity("rsquo"), - "s been converting (recovering) Emacs users (addicts). Unfortunately, i", - "t", + "s been converting (recovering) Emacs users (addicts). Unfortunately, it", md_entity("rsquo"), "s Mac only. An alternative is ", md_link(["jedit"],"jedit"), @@ -623,8 +205,7 @@ md_el(:document,[ md_el(:li,[ md_par([ md_em(["Mark-up language"]), - ": HTML is so 2001, why do", - "n", + ": HTML is so 2001, why don", md_entity("rsquo"), "t you take at look at ", md_link(["Markdown"],"markdown"), @@ -752,7 +333,6 @@ md_el(:document,[ md_ref_def("java-generics", "http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html", {:title=>nil}) ],{},[]) *** Output of to_html *** ------| WARNING | ----- <h3 id='general'>General</h3> @@ -833,7 +413,6 @@ Type "help", "copyright", "credits" or "licen </ul> *** Output of to_latex *** ------| WARNING | ----- \hypertarget{general}{}\subsubsection*{{General}}\label{general} \begin{itemize}% @@ -868,7 +447,7 @@ Type "help", "copyright", "credits" or "license" for more information. \item {\em Java IDE}: \href{http://www.borland.com/us/products/jbuilder/index.html}{JBuilder} is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained \href{http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html}{generics} and got opensourced. -\item {\em Mark-up language}: HTML is so 2001, why don't you take at look at \href{http://en.wikipedia.org/wiki/Markdown}{Markdown}? . +\item {\em Mark-up language}: HTML is so 2001, why don't you take at look at \href{http://en.wikipedia.org/wiki/Markdown}{Markdown}? \href{data/misc_markdown.png}{Look at the source of this page}. \item {\em C++ libraries}: * \href{http://www.trolltech.no/}{QT} for GUIs. * \href{http://www.gnu.org/software/gsl/}{GSL} for math. * \href{http://www.imagemagick.org/Magick++/}{Magick++} for manipulating images. * \href{http://cairographics.org/}{Cairo} for creating PDFs. * \href{http://www.boost.org/}{Boost} for just about everything else. @@ -898,20 +477,19 @@ Type "help", "copyright", "credits" or "license" for more information. \end{itemize} *** Output of to_md *** ------| WARNING | ----- General-perating System: Mac OS X: heaven, after the purgatory of Linux and the hell of Windows. -rowser: Firefox. On a Mac, Camino. --mail: GMail, search, do n t sor t +-mail: GMail, search, don t sort really works. -ext Editor: TextMate, you have to -buy it, but i t s worth every -penny. There are rumours that i t s -been converting (recovering) Emacs -users (addicts). Unfortunately, i t -s Mac only. An alternative is jedit -(GPL, Java). +buy it, but it s worth every penny. +There are rumours that it s been +converting (recovering) Emacs users +(addicts). Unfortunately, it s Mac +only. An alternative is jedit(GPL, +Java). Development-Build system: cmake, throw the autotools away. -Source code control system: ditch CVS for subversion. @@ -947,8 +525,15 @@ API you can use. *** Output of to_s *** ------| WARNING | ----- GeneralOperating System : Mac OS X: heaven, after the purgatory of Linux and the hell of Windows.Browser: Firefox. On a Mac, Camino.Email: GMail, search, dont sort really works.Text Editor: TextMate, you have to buy it, but its worth every penny. There are rumours that its been converting (recovering) Emacs users (addicts). Unfortunately, its Mac only. An alternative is jedit (GPL, Java).DevelopmentBuild system: cmake, throw the autotools away.Source code control system: ditch CVS for subversion.Project management: Trac tracks everything.Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob:Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced.Mark-up language: HTML is so 2001, why dont you take at look at Markdown? Look at the source of this page.C++ libraries: * QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else.ResearchWriting papers: LaTeXWriting papers & enjoying the process: LyXHandsome figures in your papers: xfig or, better, jfig.The occasional presentation with many graphical content: OpenOffice Impress (using the OOOlatex plugin); the alternative is PowerPoint with the TexPoint plugin.Managing BibTeX: jabref: multi-platform, for all your bibtex needs.IEEExplore and BibTeX: convert citations using BibConverter.Cool websitesBest site in the wwworld: WikipediaMutopia for sheet music; the Gutenberg Project for books; LiberLiber for books in italian.Blogs: BloglinesSharing photos: flickr exposes an API you can use. +*** EOF *** + + + + OK! + + + *** Output of Markdown.pl *** Subject: Software not painful to use Subject_short: painless software tests/unittest/misc_sw.md @@ -14,9 +14,9 @@ md_el(:document,[md_par([md_code("\\\\")]), md_par([md_code("\\")])],{},[]) <code>\</code> *** Output of to_latex *** -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char92\char92} +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char92\char92} -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char92} +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char92} *** Output of to_md *** tests/unittest/notyet/escape.md @@ -13,7 +13,7 @@ md_el(:document,[md_par([md_code("There is a literal backtick (`) here.")])],{}, <code>There is a literal backtick (`) here.</code> *** Output of to_latex *** -\colorbox[rgb]{1.00,0.67,1.00}{\tt \char84\char104\char101\char114\char101\char32\char105\char115\char32\char97\char32\char108\char105\char116\char101\char114\char97\char108\char32\char98\char97\char99\char107\char116\char105\char99\char107\char32\char40\char96\char41\char32\char104\char101\char114\char101\char46} +\colorbox[rgb]{1.00,0.93,1.00}{\tt \char84\char104\char101\char114\char101\char32\char105\char115\char32\char97\char32\char108\char105\char116\char101\char114\char97\char108\char32\char98\char97\char99\char107\char116\char105\char99\char107\char32\char40\char96\char41\char32\char104\char101\char114\char101\char46} *** Output of to_md *** tests/unittest/notyet/ticks.md @@ -18,66 +18,6 @@ To this end, Markdown's syntax is comprised entirely of punctuation *** Output of inspect *** md_el(:document,[ md_par([ - "filters -- including ", - md_link(["Setext"],"1"), - ", ", - md_link(["atx"],"2"), - ", ", - md_link(["Textile"],"3"), - ", ", - md_link(["reStructuredText"],"4"), - ", ", - md_link(["Grutatext"],"5"), - ", and ", - md_link(["EtText"],"6"), - " -- the single biggest source of inspiration for Markdown's syntax is the format of plain text email." - ]), - md_ref_def("1", "http://docutils.sourceforge.net/mirror/setext.html", {:title=>nil}), - md_ref_def("2", "http://www.aaronsw.com/2002/atx/", {:title=>nil}), - md_ref_def("3", "http://textism.com/tools/textile/", {:title=>nil}), - md_ref_def("4", "http://docutils.sourceforge.net/rst.html", {:title=>nil}), - md_ref_def("5", "http://www.triptico.com/software/grutatxt.html", {:title=>nil}), - md_ref_def("6", "http://ettext.taint.org/doc/", {:title=>nil}), - md_par([ - "To this end, Markdown's syntax is comprised entirely of punctuation" - ]) -],{},[]) -*** Output of to_html *** - -filters -- including <a href='http://docutils.sourceforge.net/mirror/setext.html'>Setext</a>, <a href='http://www.aaronsw.com/2002/atx/'>atx</a>, <a href='http://textism.com/tools/textile/'>Textile</a>, <a href='http://docutils.sourceforge.net/rst.html'>reStructuredText</a>, <a href='http://www.triptico.com/software/grutatxt.html'>Grutatext</a>, and <a href='http://ettext.taint.org/doc/'>EtText</a> -- the single biggest source of inspiration for Markdown's syntax is the format of plain text email. - -To this end, Markdown's syntax is comprised entirely of punctuation - -*** Output of to_latex *** -filters -- including \href{http://docutils.sourceforge.net/mirror/setext.html}{Setext}, \href{http://www.aaronsw.com/2002/atx/}{atx}, \href{http://textism.com/tools/textile/}{Textile}, \href{http://docutils.sourceforge.net/rst.html}{reStructuredText}, \href{http://www.triptico.com/software/grutatxt.html}{Grutatext}, and \href{http://ettext.taint.org/doc/}{EtText} -- the single biggest source of inspiration for Markdown's syntax is the format of plain text email. - -To this end, Markdown's syntax is comprised entirely of punctuation - - -*** Output of to_md *** -filters -- including Setext, atx, -Textile, reStructuredText, Grutatext, -and EtText-- the single biggest source -of inspiration for Markdown's syntax is -the format of plain text email. - -To this end, Markdown's syntax is -comprised entirely of punctuation - - -*** Output of to_s *** -filters -- including Setext, atx, Textile, reStructuredText, Grutatext, and EtText -- the single biggest source of inspiration for Markdown's syntax is the format of plain text email.To this end, Markdown's syntax is comprised entirely of punctuation -*** EOF *** - - - - -Failed tests: [:inspect, :to_html, :to_md, :to_s] - -*** Output of inspect *** ------| WARNING | ----- -md_el(:document,[ - md_par([ "filters ", md_entity("ndash"), " including ", @@ -94,8 +34,7 @@ md_el(:document,[ md_link(["EtText"],"6"), " ", md_entity("ndash"), - " the single biggest source of inspiration for Markdow", - "n", + " the single biggest source of inspiration for Markdown", md_entity("rsquo"), "s syntax is the format of plain text email." ]), @@ -106,14 +45,12 @@ md_el(:document,[ md_ref_def("5", "http://www.triptico.com/software/grutatxt.html", {:title=>nil}), md_ref_def("6", "http://ettext.taint.org/doc/", {:title=>nil}), md_par([ - "To this end, Markdow", - "n", + "To this end, Markdown", md_entity("rsquo"), "s syntax is comprised entirely of punctuation" ]) ],{},[]) *** Output of to_html *** ------| WARNING | ----- filters – including <a href='http://docutils.sourceforge.net/mirror/setext.html'>Setext</a>, <a href='http://www.aaronsw.com/2002/atx/'>atx</a>, <a href='http://textism.com/tools/textile/'>Textile</a>, <a href='http://docutils.sourceforge.net/rst.html'>reStructuredText</a>, <a href='http://www.triptico.com/software/grutatxt.html'>Grutatext</a>, and <a href='http://ettext.taint.org/doc/'>EtText</a> – the single biggest source of inspiration for Markdown’s syntax is the format of plain text email. @@ -126,20 +63,26 @@ To this end, Markdown's syntax is comprised entirely of punctuation *** Output of to_md *** ------| WARNING | ----- filters including Setext, atx, Textile, reStructuredText, Grutatext, and EtText the single biggest source of -inspiration for Markdow n s syntax is +inspiration for Markdown s syntax is the format of plain text email. -To this end, Markdow n s syntax is +To this end, Markdown s syntax is comprised entirely of punctuation *** Output of to_s *** ------| WARNING | ----- filters including Setext, atx, Textile, reStructuredText, Grutatext, and EtText the single biggest source of inspiration for Markdowns syntax is the format of plain text email.To this end, Markdowns syntax is comprised entirely of punctuation +*** EOF *** + + + + OK! + + + *** Output of Markdown.pl *** filters -- including <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a>, <a href="http://www.aaronsw.com/2002/atx/">atx</a>, <a href="http://textism.com/tools/textile/">Textile</a>, <a href="http://docutils.sourceforge.net/rst.html">reStructuredText</a>, <a href="http://www.triptico.com/software/grutatxt.html">Grutatext</a>, and <a href="http://ettext.taint.org/doc/">EtText</a> -- the single biggest source of tests/unittest/references/long_example.md @@ -2,9 +2,3 @@ Targets <? noTarget?> <?php ?> <?xml ?> <?mrk ?> Inside: <? puts "Inside: Hello"?> last - -after -<?mrk Time.now.year.to_s?> -Year is <?mrk Time.now.year.to_s?> -<?maruku @doc.children.push md_par("A new paragraph")?> -After tests/unittest/xml_instruction.html @@ -12,17 +12,6 @@ Targets <? noTarget?> <?php ?> <?xml ?> <?mrk ?> Inside: <? puts "Inside: Hello" ?>{exec} last -after - -<?mrk Time.now.year.to_s ?> - -Year is <?mrk Time.now.year.to_s ?> - -<?maruku - @doc.children.push md_par("A new paragraph") -?> - -After *** Output of inspect *** md_el(:document,[ @@ -45,16 +34,7 @@ md_el(:document,[ md_el(:xml_instr,[],{:code=>"puts \"Inside: Hello\"",:target=>""},[[:ref, "exec"]]), md_ial([[:ref, "exec"]]), " last" - ]), - md_par(["after"]), - md_el(:xml_instr,[],{:code=>"Time.now.year.to_s ",:target=>"mrk"},[]), - md_par([ - "Year is ", - md_el(:xml_instr,[],{:code=>"Time.now.year.to_s",:target=>"mrk"},[]) - ]), - md_el(:xml_instr,[],{:code=>"\n\t@doc.children.push md_par(\"A new paragraph\")\n",:target=>"maruku"},[]), - md_par(["After"]), - md_par("A new paragraph") + ]) ],{},[]) *** Output of to_html *** <? noTarget?><?php ?><?xml ?><?mrk ?> @@ -62,153 +42,28 @@ md_el(:document,[ Inside: <? puts "Inside: Hello"?> last -after -<?mrk Time.now.year.to_s?> -Year is <?mrk Time.now.year.to_s?> -<?maruku @doc.children.push md_par("A new paragraph")?> -After - -A new paragraph - *** Output of to_latex *** Targets Inside: last -after - -Year is - -After - -A new paragraph - *** Output of to_md *** Targets Inside: last -after - -Year is - -After - -A new paragraph - *** Output of to_s *** -#<NoMethodError: undefined method `join' for "A new paragraph":String> -./lib/maruku/output/to_s.rb:32:in `children_to_s' -./lib/maruku/output/to_s.rb:28:in `to_s' -./lib/maruku/output/to_s.rb:32:in `join' -./lib/maruku/output/to_s.rb:32:in `children_to_s' -./lib/maruku/output/to_s.rb:28:in `to_s' -bin/marutest:67:in `send' -bin/marutest:67:in `run_test' -bin/marutest:62:in `each' -bin/marutest:62:in `run_test' -bin/marutest:235:in `marutest' -bin/marutest:233:in `each' -bin/marutest:233:in `marutest' -bin/marutest:303 +Targets Inside: last *** EOF *** + OK! -Failed tests: [] -*** Output of inspect *** -md_el(:document,[ - md_el(:xml_instr,[],{:code=>" noTarget",:target=>""},[]), - md_el(:xml_instr,[],{:code=>"",:target=>"php"},[]), - md_el(:xml_instr,[],{:code=>"",:target=>"xml"},[]), - md_el(:xml_instr,[],{:code=>"",:target=>"mrk"},[]), - md_par([ - "Targets ", - md_el(:xml_instr,[],{:code=>"noTarget",:target=>""},[]), - " ", - md_el(:xml_instr,[],{:code=>"",:target=>"php"},[]), - " ", - md_el(:xml_instr,[],{:code=>"",:target=>"xml"},[]), - " ", - md_el(:xml_instr,[],{:code=>"",:target=>"mrk"},[]) - ]), - md_par([ - "Inside: ", - md_el(:xml_instr,[],{:code=>"puts \"Inside: Hello\"",:target=>""},[[:ref, "exec"]]), - md_ial([[:ref, "exec"]]), - " last" - ]), - md_par(["after"]), - md_el(:xml_instr,[],{:code=>"Time.now.year.to_s ",:target=>"mrk"},[]), - md_par([ - "Year is ", - md_el(:xml_instr,[],{:code=>"Time.now.year.to_s",:target=>"mrk"},[]) - ]), - md_el(:xml_instr,[],{:code=>"\n\t@doc.children.push md_par(\"A new paragraph\")\n",:target=>"maruku"},[]), - md_par(["After"]), - md_par("A new paragraph") -],{},[]) -*** Output of to_html *** -<? noTarget?><?php ?><?xml ?><?mrk ?> -Targets <? noTarget?> <?php ?> <?xml ?> <?mrk ?> - -Inside: <? puts "Inside: Hello"?> last - -after -<?mrk Time.now.year.to_s?> -Year is <?mrk Time.now.year.to_s?> -<?maruku @doc.children.push md_par("A new paragraph")?> -After - -A new paragraph - -*** Output of to_latex *** -Targets - -Inside: last - -after - -Year is - -After -A new paragraph - - -*** Output of to_md *** -Targets - -Inside: last - -after - -Year is - -After - -A new paragraph - - -*** Output of to_s *** -#<NoMethodError: undefined method `join' for "A new paragraph":String> -./lib/maruku/output/to_s.rb:32:in `children_to_s' -./lib/maruku/output/to_s.rb:28:in `to_s' -./lib/maruku/output/to_s.rb:32:in `join' -./lib/maruku/output/to_s.rb:32:in `children_to_s' -./lib/maruku/output/to_s.rb:28:in `to_s' -bin/marutest:67:in `send' -bin/marutest:67:in `run_test' -bin/marutest:62:in `each' -bin/marutest:62:in `run_test' -bin/marutest:235:in `marutest' -bin/marutest:233:in `each' -bin/marutest:233:in `marutest' -bin/marutest:303 *** Output of Markdown.pl *** <? noTarget?> <?php ?> @@ -219,28 +74,9 @@ bin/marutest:303 Inside: <? puts "Inside: Hello" ?>{exec} last -after - -<?mrk Time.now.year.to_s ?> - -Year is <?mrk Time.now.year.to_s ?> - -<?maruku - @doc.children.push md_par("A new paragraph") -?> - -After - *** Output of Markdown.pl (parsed) *** <? noTarget?> <?php ?> <?xml ?> <?mrk ?>Targets <? noTarget?> <?php ?> <?xml ?> <?mrk ?>Inside: <? puts "Inside: Hello"?>{exec} lastafter <?mrk Time.now.year.to_s?>Year is <?mrk Time.now.year.to_s?> <?maruku @doc.children.push md_par("A new paragraph")?>After \ No newline at end of file tests/unittest/xml_instruction.md docs/changelog-0.2.13.md docs/changelog-0.3.md docs/faq.md docs/todo.md span_tests.sh unit_test.sh 8763fabcc5cb815a190bba528e890f653aa00505 andrea andrea@7e2f57f0-5a75-4fd6-9797-5817c466b243 http://github.com/manveru/maruku/commit/33d5b39cf765ebfeaf9d939dcc8e6c19792d418a 33d5b39cf765ebfeaf9d939dcc8e6c19792d418a

2007-01-08T14:20:02-08:00

0.4.1 git-svn-id: svn://rubyforge.org/var/svn/maruku/trunk@66 7e2f57f0-5a75-4fd6-9797-5817c466b243 4cf8d58c24f77770e560acbfd0442093e66f5747 andrea andrea@7e2f57f0-5a75-4fd6-9797-5817c466b243