Permalink
Browse files

Switch to WikiCreole (for working image inside link) and update creol…

…e test
  • Loading branch information...
petteyg committed Aug 27, 2011
1 parent ef77239 commit cd1156dd29cad82c8f04a5b41583b6c1e7793fb4
Showing with 45 additions and 6 deletions.
  1. +1 −1 Gemfile
  2. +2 −1 lib/github/markups.rb
  3. +11 −2 test/markups/README.creole
  4. +31 −2 test/markups/README.creole.html
View
@@ -3,6 +3,6 @@ gem "redcarpet"
gem "RedCloth"
gem "rdoc", "~>3.6"
gem "org-ruby"
-gem "creole", "~>0.3.6"
+gem "WikiCreole", "~>0.1.3"
gem "wikicloth", "=0.6.0"
gem "rake"
View
@@ -15,7 +15,8 @@
end
markup(:creole, /creole/) do |content|
- Creole.creolize(content)
+ require 'wiki_creole'
+ WikiCreole.creole_parse(content)
end
markup(:wikicloth, /mediawiki|wiki/) do |content|
View
@@ -2,9 +2,18 @@
== H2 ==
-paragraph of text that will be turned into a paragraph element. It can
+=== H3 ===
+
+==== H4 ====
+
+~** not ~~bold~~ ~**
+~// not ~~italic~~ ~//
+
+[[https://github.com|{{https://a248.e.akamai.net/assets.github.com/images/modules/header/logov6-hover.png|github social coding}}]]
+
+paragraph of text that will be turned into a //paragraph element//. It can
go over several lines with line breaks, it will be turned into a
-contiguous paragraph element.
+**contiguous //paragraph element//**.
You can force a linebreak in your paragraph text\\thusly.
@@ -1,4 +1,31 @@
-<h1>H1</h1><h2>H2</h2><p>paragraph of text that will be turned into a paragraph element. It can go over several lines with line breaks, it will be turned into a contiguous paragraph element.</p><p>You can force a linebreak in your paragraph text<br/>thusly.</p><ul><li>a list element<ul><li>sub list element</li></ul></li><li>2nd list element</li></ul><pre>pre formatted text
+<h1>H1</h1>
+
+<h2>H2</h2>
+
+<h3>H3</h3>
+
+<h4>H4</h4>
+
+<p>** not ~bold~ **
+// not ~italic~ //</p>
+
+<p><a href="https://github.com"><img src="https://a248.e.akamai.net/assets.github.com/images/modules/header/logov6-hover.png" alt="github social coding" /></a></p>
+
+<p>paragraph of text that will be turned into a <em>paragraph element</em>. It can
+go over several lines with line breaks, it will be turned into a
+<strong>contiguous <em>paragraph element</em></strong>.</p>
+
+<p>You can force a linebreak in your paragraph text<br />thusly.</p>
+
+<ul>
+ <li>a list element</li>
+<ul>
+ <li>sub list element</li>
+</ul>
+ <li>2nd list element</li>
+</ul>
+<pre>
+pre formatted text
$ ls -la
total 56
@@ -13,4 +40,6 @@ <h1>H1</h1><h2>H2</h2><p>paragraph of text that will be turned into a paragraph
-rw-r--r-- 1 nferrier users 1050 Jul 5 18:19 LICENSE
-rw-r--r-- 1 nferrier users 1312 Jul 5 18:19 Rakefile
-rw-r--r-- 1 nferrier users 3390 Jul 5 18:19 README.md
-drwxr-xr-x 3 nferrier users 4096 Jul 5 18:19 test</pre>
+drwxr-xr-x 3 nferrier users 4096 Jul 5 18:19 test
+</pre>
+

0 comments on commit cd1156d

Please sign in to comment.