@@ -1,6 +1,7 @@
== Since Mislav forked the project from SVN
- * converted tests to specs, cleaner suite
- * break lib/bluecloth.rb into submodules under lib/transform/
+ * bin/bluecloth doesn't add <html><body> tags by default; instead it's opt-in
* deleted legacy files (tests/, test.rb, docs/, experiments/, install.rb, ...)
+ * break lib/bluecloth.rb into submodules under lib/transform/
+ * converted tests to specs, cleaner suite
* import latest original Markdown.pl for reference (and testing)
CHANGES
@@ -1,47 +1,38 @@
#!/usr/bin/ruby
-#
-# = bluecloth
-#
# Format one or more text files with the markdown formatter.
#
-# = Synopsis
-#
# bluecloth [OPTIONS] [FILES]
#
-#
-#
-
-BEGIN {
- require 'bluecloth'
- require 'optparse'
-}
-
-DocumentWrapper = %{
-<html>
- <head><title>%s</title></head>
+require 'optparse'
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'bluecloth'
+
+DocumentWrapper = %{<html>
+ <head>
+ <title>%s</title>
+ </head>
<body>
-%s
+ %s
</body>
-</html>
-}
+</html>}
-def main
- fragment = false
+begin
+ document = false
destination = '.'
ARGV.options do |oparser|
- oparser.banner = "Usage: #$0 [OPTIONS] FILES"
+ oparser.banner = "Usage: $0 [OPTIONS] FILES"
# Debug mode
oparser.on( "--debug", "-d", TrueClass, "Turn debugging output on" ) {
$DEBUG = true
}
- # 'Fragment' mode
- oparser.on( "--fragment", "-f", TrueClass,
- "Output HTML fragments instead of whole documents" ) {
- fragment = true
+ # Document mode
+ oparser.on( "--document", "-c", TrueClass,
+ "Wrap resulting HTML creating a basic HTML document" ) {
+ document = true
}
# Output destination
@@ -56,28 +47,29 @@ def main
# Filter mode if no arguments
ARGV.push( "-" ) if ARGV.empty?
- ARGV.each {|file|
- if file == '-'
- contents = $stdin.readlines(nil)
- else
- contents = File::readlines( file, nil )
- end
+ ARGV.each do |file|
+ contents = if file == '-'
+ $stdin.read
+ else
+ File::read file
+ end
- bc = BlueCloth::new( contents.join )
+ bc = BlueCloth::new contents
+ html = bc.to_html
- if fragment
- $stdout.puts bc.to_html
+ out = unless document
+ html
else
- $stdout.puts DocumentWrapper % [ file, bc.to_html ]
+ DocumentWrapper % [
+ file,
+ html.gsub("\n", "\n ") # indent 4 spaces
+ ]
end
- }
+
+ $stdout.puts out
+ end
rescue => err
$stderr.puts "Aborting: Fatal error: %s" % err.message
exit 255
end
-
-
-
-main
-
bin/bluecloth
@@ -150,3 +150,21 @@ _acts_as_ferret_
--- Should become:
<p><em>acts_as_ferret</em></p>
>>>
+
+# no emphasis when underscores and asterisks are surrounded by spaces
+<<<
+There * is no emphasis * here.
+Also _ no emphasis _ here.
+--- becomes:
+<p>There * is no emphasis * here.
+Also _ no emphasis _ here.</p>
+>>>
+
+# double asterisks or underscores surrounded by spaces create <em>
+<<<
+This is ** a very weird ** feature.
+I don't think __ this should be __ in.
+--- becomes:
+<p>This is <em>* a very weird *</em> feature.
+I don't think <em>_ this should be _</em> in.</p>
+>>>
spec/samples/emphasis
2382acb9f10bec86c227fbd576a682d593053802
Mislav Marohnić
mislav.marohnic@gmail.com
http://github.com/github/bluecloth/commit/7856b7b2ba1bb5a69f6db0e6374ede61d98a6d89
7856b7b2ba1bb5a69f6db0e6374ede61d98a6d89
2008-04-26T09:15:21-07:00
2008-04-26T09:13:07-07:00
bin/bluecloth doesn't wrap result HTML in <html><body> tags anymore.
add a couple of more tests to emphasis samples, ensuring every bit of http://daringfireball.net/projects/markdown/syntax has tests in our test suite
afd1cd886356fede242d920d8846ef9b4dc5f561
Mislav Marohnić
mislav.marohnic@gmail.com