kramdown 0.13.7 → 0.13.8

data/test/test_files.rb

@@ -55,12 +55,17 @@ class TestFiles < Test::Unit::TestCase
     EXCLUDE_HTML_FILES = ['test/testcases/block/06_codeblock/whitespace.html', # bc of span inside pre
                           'test/testcases/block/09_html/simple.html', # bc of xml elements
                           'test/testcases/span/03_codespan/highlighting.html', # bc of span elements inside code element
+                          'test/testcases/block/04_header/with_auto_ids.html', # bc of auto_ids=true option
+                          'test/testcases/block/04_header/header_type_offset.html', # bc of header_offset option
                          ]
     Dir[File.dirname(__FILE__) + '/testcases/**/*.{html, htmlinput}'].each do |html_file|
       next if EXCLUDE_HTML_FILES.any? {|f| html_file =~ /#{f}$/}
       out_file = (html_file =~ /\.htmlinput$/ ? html_file.sub(/input$/, '') : html_file)
       define_method('test_' + html_file.tr('.', '_') + "_to_html") do
-        doc = Kramdown::Document.new(File.read(html_file), :input => 'html', :auto_ids => false, :footnote_nr => 1)
+        opts_file = html_file.sub(/\.html$/, '.options')
+        opts_file = File.join(File.dirname(html_file), 'options') if !File.exist?(opts_file)
+        options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
+        doc = Kramdown::Document.new(File.read(html_file), options.merge(:input => 'html'))
         assert_equal(tidy_output(File.read(out_file)), tidy_output(doc.to_html))
       end
     end
@@ -119,6 +124,7 @@ class TestFiles < Test::Unit::TestCase
                           'test/testcases/block/09_html/simple.text',        # bc of webgen:block elements
                           'test/testcases/block/11_ial/simple.text',         # bc of change of ordering of attributes in header
                           'test/testcases/span/extension/comment.text',      # bc of comment text modifications (can this be avoided?)
+                          'test/testcases/block/04_header/header_type_offset.text', # bc of header_offset being applied twice
                          ]
     Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
       next if EXCLUDE_TEXT_FILES.any? {|f| text_file =~ /#{f}$/}
@@ -149,12 +155,17 @@ class TestFiles < Test::Unit::TestCase
                              'test/testcases/block/06_codeblock/whitespace.html', # bc of entity to char conversion
                              'test/testcases/block/11_ial/simple.html',           # bc of change of ordering of attributes in header
                              'test/testcases/span/03_codespan/highlighting.html', # bc of span elements inside code element
+                             'test/testcases/block/04_header/with_auto_ids.html', # bc of auto_ids=true option
+                             'test/testcases/block/04_header/header_type_offset.html', # bc of header_offset option
                             ]
     Dir[File.dirname(__FILE__) + '/testcases/**/*.html'].each do |html_file|
       next if EXCLUDE_HTML_KD_FILES.any? {|f| html_file =~ /#{f}$/}
       define_method('test_' + html_file.tr('.', '_') + "_to_kramdown_to_html") do
         kd = Kramdown::Document.new(File.read(html_file), :input => 'html', :auto_ids => false, :footnote_nr => 1).to_kramdown
-        doc = Kramdown::Document.new(kd, :auto_ids => false, :footnote_nr => 1)
+        opts_file = html_file.sub(/\.html$/, '.options')
+        opts_file = File.join(File.dirname(html_file), 'options') if !File.exist?(opts_file)
+        options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
+        doc = Kramdown::Document.new(kd, options)
         assert_equal(tidy_output(File.read(html_file)), tidy_output(doc.to_html))
       end
     end

data/test/testcases/block/04_header/header_type_offset.html

@@ -0,0 +1,11 @@
+<h2>Lorem ipsum</h2>
+
+<h3>Lorem ipsum</h3>
+
+<h4>Lorem ipsum</h4>
+
+<h6>Lorem ipsum</h6>
+
+<h2>Lorem ipsum</h2>
+
+<h3>Lorem ipsum</h3>

data/test/testcases/block/04_header/header_type_offset.kramdown

@@ -0,0 +1,12 @@
+## Lorem ipsum
+
+### Lorem ipsum
+
+#### Lorem ipsum
+
+###### Lorem ipsum
+
+## Lorem ipsum
+
+### Lorem ipsum
+

data/test/testcases/block/04_header/header_type_offset.latex

@@ -0,0 +1,12 @@
+\subsection*{Lorem ipsum}
+
+\subsubsection*{Lorem ipsum}
+
+\paragraph*{Lorem ipsum}
+
+\subparagraph*{Lorem ipsum}
+
+\subsection*{Lorem ipsum}
+
+\subsubsection*{Lorem ipsum}
+

data/test/testcases/block/04_header/header_type_offset.options

@@ -0,0 +1,2 @@
+:header_offset: 1
+:auto_ids: false

data/test/testcases/block/04_header/header_type_offset.text

@@ -0,0 +1,13 @@
+# Lorem ipsum
+
+## Lorem ipsum
+
+### Lorem ipsum
+
+###### Lorem ipsum
+
+Lorem ipsum
+===========
+
+Lorem ipsum
+-----------

data/test/testcases/block/06_codeblock/disable-highlighting.html

@@ -0,0 +1,4 @@
+<pre><code>x = Class.new
+</code></pre>
+<pre lang="html"><code>&lt;a&gt;href&lt;/a&gt;
+</code></pre>

data/test/testcases/block/06_codeblock/disable-highlighting.options

@@ -0,0 +1 @@
+:enable_coderay: false

data/test/testcases/block/06_codeblock/disable-highlighting.text

@@ -0,0 +1,4 @@
+    x = Class.new
+^
+    <a>href</a>
+{: lang="html"}

data/test/testcases/span/abbreviations/abbrev.html

@@ -1,8 +1,8 @@
 <p>This <abbr title="It is, yes">is some</abbr> text.</p>
 
-<p>There <em><abbr title="It is, yes">is some</abbr> real</em> concern about <abbr title="Other">OtHeR!</abbr></p>
+<p>There <em><abbr title="It is, yes">is some</abbr> real</em> concern about <abbr title="This &amp; that">OtHeR!</abbr></p>
 
-<p><abbr title="It is, yes">is some</abbr> Think <abbr>empty</abbr> about <abbr title="Very nice country">Österreich</abbr>.</p>
+<p><abbr title="It is, yes">is some</abbr> Think <abbr>empty</abbr> about <abbr title="Very nice country">Österreich</abbr>. <abbr title="Cascading">CSS</abbr> und <abbr title="Cascading 3">CSS3</abbr></p>
 
 <p>no abbrev here because there is someone and kulis some</p>
 

data/test/testcases/span/abbreviations/abbrev.text

@@ -1,15 +1,18 @@
 This is some text.
 
 *[is some]: Yes it is  
-*[OtHeR!]: Other
+*[OtHeR!]: This & that
 
 *[is some]: It is, yes  
 *[empty]:
 
 There *is some real* concern about OtHeR!
 
-is some Think empty about Österreich.
+is some Think empty about Österreich. CSS und CSS3
 
 no abbrev here because there is someone and kulis some
 
 *[Österreich]: 	Very nice country	
+
+*[CSS]: Cascading
+*[CSS3]: Cascading 3

data/test/testcases/span/autolinks/url_links.html

@@ -1,6 +1,7 @@
 <p>This should be a <a href="http://www.example.com/">http://www.example.com/</a> link.
 This should be a <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#106;&#111;&#104;&#110;&#046;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;">&#106;&#111;&#104;&#110;&#046;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;</a> link.
 As should <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#106;&#111;&#104;&#110;&#046;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;">&#106;&#111;&#104;&#110;&#046;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;</a> this.
+As should <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#067;&#083;&#083;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;"><abbr title="Cascading">CSS</abbr>@example.com</a> this.
 Another ampersand <a href="http://www.example.com/?doit&amp;x=y">http://www.example.com/?doit&amp;x=y</a> link.
 More entities  <a href="http://www.example.com/?doit&amp;x=&quot;y&amp;z=y">http://www.example.com/?doit&amp;x=&quot;y&amp;z=y</a>.</p>
 
@@ -10,3 +11,4 @@ Email invalid: &lt;<a href="mailtos:me@example.com">me@example.com</a>&gt;</p>
 <p>Autolink with underscore: <a href="http://www.example.com/with_under_score">http://www.example.com/with_under_score</a></p>
 
 <p><a href="http://www.example.com/">http://www.example.com/</a></p>
+

data/test/testcases/span/autolinks/url_links.text

@@ -1,6 +1,7 @@
 This should be a <http://www.example.com/> link.
 This should be a <mailto:john.doe@example.com> link.
 As should <john.doe@example.com> this.
+As should <CSS@example.com> this.
 Another ampersand <http://www.example.com/?doit&x=y> link.
 More entities  <http://www.example.com/?doit&amp;x=&quot;y&z=y>.
 
@@ -10,3 +11,5 @@ Email invalid: <[me@example.com](mailtos:me@example.com)>
 Autolink with underscore: <http://www.example.com/with_under_score>
 
 <http://www.example.com/>
+
+*[CSS]: Cascading

metadata

@@ -1,55 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kramdown
-version: !ruby/object:Gem::Version 
-  hash: 37
+version: !ruby/object:Gem::Version
+  version: 0.13.8
   prerelease: 
-  segments: 
-  - 0
-  - 13
-  - 7
-  version: 0.13.7
 platform: ruby
-authors: 
+authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: coderay
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-description: |
-  kramdown is yet-another-markdown-parser but fast, pure Ruby,
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+description: ! 'kramdown is yet-another-markdown-parser but fast, pure Ruby,
+
   using a strict syntax definition and supporting several common extensions.
 
+'
 email: t_leitner@gmx.at
-executables: 
+executables:
 - kramdown
 extensions: []
-
-extra_rdoc_files: 
-- README
-files: 
+extra_rdoc_files: []
+files:
 - Rakefile
 - setup.rb
 - COPYING
 - GPL
-- README
+- README.md
 - AUTHORS
 - VERSION
 - ChangeLog
@@ -361,7 +354,9 @@ files:
 - test/testcases/block/04_header/with_auto_id_prefix.text
 - test/testcases/block/04_header/atx_header.text
 - test/testcases/block/04_header/with_auto_id_prefix.options
+- test/testcases/block/04_header/header_type_offset.text
 - test/testcases/block/04_header/atx_header.html
+- test/testcases/block/04_header/header_type_offset.kramdown
 - test/testcases/block/04_header/setext_header_no_newline_at_end.text
 - test/testcases/block/04_header/setext_header.html.19
 - test/testcases/block/04_header/atx_header_no_newline_at_end.text
@@ -371,8 +366,11 @@ files:
 - test/testcases/block/04_header/with_auto_ids.text
 - test/testcases/block/04_header/setext_header_no_newline_at_end.html
 - test/testcases/block/04_header/with_auto_ids.html
+- test/testcases/block/04_header/header_type_offset.html
+- test/testcases/block/04_header/header_type_offset.latex
 - test/testcases/block/04_header/atx_header_no_newline_at_end.html
 - test/testcases/block/04_header/setext_header.text
+- test/testcases/block/04_header/header_type_offset.options
 - test/testcases/block/02_eob/middle.html
 - test/testcases/block/02_eob/end.html
 - test/testcases/block/02_eob/beginning.text
@@ -444,11 +442,13 @@ files:
 - test/testcases/block/06_codeblock/highlighting.html
 - test/testcases/block/06_codeblock/highlighting.options
 - test/testcases/block/06_codeblock/whitespace.text
+- test/testcases/block/06_codeblock/disable-highlighting.text
 - test/testcases/block/06_codeblock/with_eob_marker.text
 - test/testcases/block/06_codeblock/tilde_syntax.html
 - test/testcases/block/06_codeblock/no_newline_at_end_1.text
 - test/testcases/block/06_codeblock/lazy.html
 - test/testcases/block/06_codeblock/with_blank_line.html
+- test/testcases/block/06_codeblock/disable-highlighting.html
 - test/testcases/block/06_codeblock/tilde_syntax.text
 - test/testcases/block/06_codeblock/with_ial.text
 - test/testcases/block/06_codeblock/normal.html
@@ -457,6 +457,7 @@ files:
 - test/testcases/block/06_codeblock/with_blank_line.text
 - test/testcases/block/06_codeblock/with_ial.html
 - test/testcases/block/06_codeblock/no_newline_at_end_1.html
+- test/testcases/block/06_codeblock/disable-highlighting.options
 - test/testcases/block/06_codeblock/error.html
 - test/testcases/block/06_codeblock/lazy.text
 - test/testcases/block/06_codeblock/highlighting.text
@@ -468,37 +469,28 @@ files:
 - test/test_files.rb
 homepage: http://kramdown.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-- README
-require_paths: 
+- lib/kramdown/document.rb
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: kramdown
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: kramdown is a fast, pure-Ruby Markdown-superset converter.
 test_files: []
-

data/README

@@ -1,43 +0,0 @@
-= kramdown
-
-kramdown is yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition and
-supporting several common extensions. The syntax definition for the kramdown syntax can be found in
-doc/syntax.page and a quick reference is available in doc/quickref.page.
-
-The kramdown library is mainly written to support the kramdown-to-HTML conversion chain. However,
-due to its flexibility it supports other input and output formats as well. Here is a list of the
-supported formats:
-
-* input formats: kramdown (a Markdown superset), Markdown, HTML
-* output formats: HTML, kramdown, LaTeX (and therefore PDF)
-
-All the documentation on the available input and output formats is available in the doc/ directory
-and online at http://kramdown.rubyforge.org.
-
-
-== Usage
-
-kramdown has a basic *Cloth API, so using kramdown is as easy as
-
-    require 'kramdown'
-
-    Kramdown::Document.new(text).to_html
-
-For detailed information have a look at the API documentation of the Kramdown::Document class.
-
-The full API documentation is available at http://kramdown.rubyforge.org/rdoc/, other sites with an
-API documentation for kramdown probably don't provide the complete documentation!
-
-
-== Development
-
-Just clone the git repository as described in doc/installation.page and you are good to go. You
-probably want to install `rake` so that you can use the provided rake tasks. Aside from that:
-
-* The +tidy+ binary needs to be installed for the automatically derived tests to work.
-* The +latex+ binary needs to be installed for the latex-compilation tests to work.
-
-
-== License
-
-GPLv3 - see the COPYING file.