asciidoctor 0.1.4 → 1.5.0

data/bin/asciidoctor

@@ -1,14 +1,11 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rubygems' if RUBY_VERSION < '1.9'
 
-if RUBY_VERSION < '1.9'
-  require 'rubygems'
-end
-require 'asciidoctor'
-require 'asciidoctor/cli/options'
-require 'asciidoctor/cli/invoker'
+require File.join File.dirname(__FILE__), '../lib/asciidoctor'
+require 'asciidoctor/cli'
 
-invoker = Asciidoctor::Cli::Invoker.new(ARGV)
+invoker = Asciidoctor::Cli::Invoker.new ARGV
+GC.start
 invoker.invoke!
 exit invoker.code

data/bin/asciidoctor-safe

@@ -1,16 +1,12 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rubygems' if RUBY_VERSION < '1.9'
 
-if RUBY_VERSION < '1.9'
-  require 'rubygems'
-end
-require 'asciidoctor'
-require 'asciidoctor/cli/options'
-require 'asciidoctor/cli/invoker'
+require File.join File.dirname(__FILE__), '../lib/asciidoctor'
+require 'asciidoctor/cli'
 
 options = Asciidoctor::Cli::Options.parse! ARGV
 options[:safe] = Asciidoctor::SafeMode::SAFE
-invoker = Asciidoctor::Cli::Invoker.new(options)
+invoker = Asciidoctor::Cli::Invoker.new options
 invoker.invoke!
 exit invoker.code

data/compat/asciidoc.conf

@@ -12,12 +12,39 @@ newline=\n
 backend-alias-html=html5
 apostrophe='
 asterisk=*
-caret=^
 backtick=`
+brvbar=¦
+caret=^
 # plus introduced in AsciiDoc 8.6.9
 plus=+
 space=" "
 tilde=~
+user-home={eval:os.path.expanduser('~')}
+vbar=|
+# NOTE use -a no-inline-literal to set compat-mode to default when using AsciiDoc Python
+ifndef::no-inline-literal[]
+compat-mode=legacy
+endif::[]
+
+[replacements]
+# right single quote
+(?<!\\)`'=&#8217;
+# escaped right single quote
+\\`'=`'
+
+[quotes]
+# disable single quotes as constrained formatting marks for emphasis
+# this change can also be made in the document using the attribute entry :quotes.':
+ifdef::compat-mode[]
+'=
++=
+++=
+`=
+``=#monospaced
+`|`=monospaced
+\##=#mark
+\#=mark
+endif::[]
 
 # enables markdown-style headings
 [titles]
@@ -28,6 +55,10 @@ sect3=^(====|####) +(?P<title>[\S].*?)(?: +\1)?$
 sect4=^(=====|#####) +(?P<title>[\S].*?)(?: +\1)?$
 sect5=^(======|######) +(?P<title>[\S].*?)(?: +\1)?$
 
+# Disable subs on pass block by default
+[blockdef-pass]
+subs=none
+
 # enables fenced code blocks
 # FIXME I haven't sorted out yet how to do syntax highlighting
 [blockdef-fenced-code]
@@ -62,10 +93,28 @@ type=callout
 tags=callout
 style=arabic
 
-# enables literal block to be used as code block
+# enables literal block to be used as source block
 [blockdef-literal]
 template::[source-filter-style]
 
+# enables source block when source-highlighter is not defined
+ifndef::source-highlighter[]
+[source-filter-style]
+source-style=template="listingblock",subs=("specialcharacters","callouts"),posattrs=("style","language","src_numbered","src_tab")
+
+[paradef-default]
+template::[source-filter-style]
+
+[paradef-literal]
+template::[source-filter-style]
+
+[blockdef-open]
+template::[source-filter-style]
+
+[blockdef-listing]
+template::[source-filter-style]
+endif::source-highlighter[]
+
 [tabledef-csv]
 template::[tabledef-default]
 delimiter=^,={3,}$
@@ -77,6 +126,13 @@ delimiter=^:={3,}$
 format=dsv
 
 [macros]
+ifdef::no-inline-literal[]
+(?su)\\?\+\+(?P<passtext>.*?)\+\+=pass[specialcharacters]
+(?su)(?<![+\w])(\\?\+(?P<passtext>\S|\S.*?\S)\+)(?![+\w])=pass[specialcharacters]
+endif::no-inline-literal[]
+
+# additional callout match behind line comments
+#(?://|#|;;) ?\((?P<index>\d+)\)=callout
 # additional callout match for XML
 [\\]?&lt;!--(?P<index>\d+)--&gt;=callout
 
@@ -127,25 +183,26 @@ strong=<strong{1? class="{1}"}>|</strong>
 monospaced=<code{1? class="{1}"}>|</code>
 superscript=<sup{1? class="{1}"}>|</sup>
 subscript=<sub{1? class="{1}"}>|</sub>
+mark={1=<mark>}{1?<span class="{1}">}|{1?</span>}{1=</mark>}
 
 [monospacedwords]
 <code>{words}</code>
 
 ifdef::linkattrs[]
 [http-inlinemacro]
-<a href="{name}:{target}"{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
+<a href="{name}:{target}"{id? id="{id}"}{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
 [https-inlinemacro]
-<a href="{name}:{target}"{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
+<a href="{name}:{target}"{id? id="{id}"}{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
 [ftp-inlinemacro]
-<a href="{name}:{target}"{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
+<a href="{name}:{target}"{id? id="{id}"}{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
 [file-inlinemacro]
-<a href="{name}:{target}"{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
+<a href="{name}:{target}"{id? id="{id}"}{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
 [irc-inlinemacro]
-<a href="{name}:{target}"{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
+<a href="{name}:{target}"{id? id="{id}"}{role? class="{role}"}{window? target="{window}"}>{1={name}:{target}}</a>
 [mailto-inlinemacro]
-<a href="mailto:{target}"{role? class="{role}"}{window? target="{window}"}>{1={target}}</a>
+<a href="mailto:{target}"{id? id="{id}"}{role? class="{role}"}{window? target="{window}"}>{1={target}}</a>
 [link-inlinemacro]
-<a href="{target}"{role? class="{role}"}{window? target="{window}"}>{1={target}}</a>
+<a href="{target}"{id? id="{id}"}{role? class="{role}"}{window? target="{window}"}>{1={target}}</a>
 endif::linkattrs[]
 
 [listtags-numbered]
@@ -229,8 +286,8 @@ endif::[]
 # don't output attribution div if attribution or citetitle are both empty
 [attribution]
 {attribution,citetitle#}<div class="attribution">
-<cite>{citetitle}</cite>{attribution?<br>}
-&#8212; {attribution}
+&#8212; {attribution}{citetitle?<br>}
+<cite>{citetitle}</cite>
 {attribution,citetitle#}</div>
 
 # override to use blockquote element for content and cite element for cite title
@@ -258,6 +315,11 @@ template::[attribution]
 headdata=<th class="tableblock halign-{halign=left} valign-{valign=top}"{colspan@1:: colspan="{colspan}"}{rowspan@1:: rowspan="{rowspan}"}{cellbgcolor? style="background-color:{cellbgcolor};"}>|</th>
 bodydata=<td class="tableblock halign-{halign=left} valign-{valign=top}"{colspan@1:: colspan="{colspan}"}{rowspan@1:: rowspan="{rowspan}"}{cellbgcolor? style="background-color:{cellbgcolor};"}>|</td>
 
+# override header cells to use th
+[tabletags-header]
+bodydata=<th class="tableblock halign-{halign=left} valign-{valign=top}" {colspan@1::colspan="{colspan}" }{rowspan@1::rowspan="{rowspan}" }>|</th>
+paragraph=<p class="tableblock">|</p>
+
 [toc]
 <div id="toc">
 <div id="toctitle">{toc-title}</div>
@@ -281,6 +343,11 @@ ifdef::basebackend-docbook[]
 |
 </section>
 
+[tags]
+monospaced=<literal{1? role="{1}"}>|</literal>
+subscript=<subscript{1? role="{1}"}>|</subscript>
+superscript=<superscript{1? role="{1}"}>|</superscript>
+
 [button-inlinemacro]
 <guibutton>{1}</guibutton>
 

data/compat/font-awesome-3-compat.css

@@ -0,0 +1,397 @@
+.fa-envelope-alt:before {
+  content: "\f003";
+}
+.fa-star-empty:before {
+  content: "\f006";
+}
+.fa-ok:before {
+  content: "\f00c";
+}
+.fa-remove:before {
+  content: "\f00d";
+}
+.fa-zoom-in:before {
+  content: "\f00e";
+}
+.fa-zoom-out:before {
+  content: "\f010";
+}
+.fa-off:before {
+  content: "\f011";
+}
+.fa-trash:before {
+  content: "\f014";
+}
+.fa-file-alt:before {
+  content: "\f016";
+}
+.fa-time:before {
+  content: "\f017";
+}
+.fa-download-alt:before {
+  content: "\f019";
+}
+.fa-download-alt:before {
+  content: "\f01a";
+}
+.fa-upload-alt:before {
+  content: "\f01b";
+}
+.fa-play-sign:before {
+  content: "\f01d";
+}
+.fa-indent-right-left:before {
+  content: "\f03b";
+}
+.fa-indent-right:before {
+  content: "\f03c";
+}
+.fa-facetime-video:before {
+  content: "\f03d";
+}
+.fa-picture:before {
+  content: "\f03e";
+}
+.fa-edit-sign-o:before {
+  content: "\f044";
+}
+.fa-share-alt-square-o:before {
+  content: "\f045";
+}
+.fa-ok-sign-o:before {
+  content: "\f046";
+}
+.fa-move:before {
+  content: "\f047";
+}
+.fa-plus-sign:before {
+  content: "\f055";
+}
+.fa-minus-sign:before {
+  content: "\f056";
+}
+.fa-remove-sign:before {
+  content: "\f057";
+}
+.fa-ok-sign:before {
+  content: "\f058";
+}
+.fa-question-sign:before {
+  content: "\f059";
+}
+.fa-info-sign:before {
+  content: "\f05a";
+}
+.fa-screenshot:before {
+  content: "\f05b";
+}
+.fa-remove-circle:before {
+  content: "\f05c";
+}
+.fa-ok-circle:before {
+  content: "\f05d";
+}
+.fa-ban-circle:before {
+  content: "\f05e";
+}
+.fa-share-alt:before {
+  content: "\f064";
+}
+.fa-resize-full:before {
+  content: "\f065";
+}
+.fa-resize-small:before {
+  content: "\f066";
+}
+.fa-exclamation-sign:before {
+  content: "\f06a";
+}
+.fa-eye-open:before {
+  content: "\f06e";
+}
+.fa-eye-open-close:before {
+  content: "\f070";
+}
+.fa-warning-sign:before {
+  content: "\f071";
+}
+.fa-folder-close:before {
+  content: "\f07b";
+}
+.fa-folder-close-close-altpen:before {
+  content: "\f07c";
+}
+.fa-move-v:before {
+  content: "\f07d";
+}
+.fa-move-h:before {
+  content: "\f07e";
+}
+.fa-bar-chart:before {
+  content: "\f080";
+}
+.fa-twitter-sign:before {
+  content: "\f081";
+}
+.fa-facebook-sign:before {
+  content: "\f082";
+}
+.fa-thumbs-up-alt:before {
+  content: "\f087";
+}
+.fa-thumbs-down-alt:before {
+  content: "\f088";
+}
+.fa-heart-empty:before {
+  content: "\f08a";
+}
+.fa-signout:before {
+  content: "\f08b";
+}
+.fa-linkedin-sign:before {
+  content: "\f08c";
+}
+.fa-pushpin:before {
+  content: "\f08d";
+}
+.fa-signin:before {
+  content: "\f090";
+}
+.fa-github-sign:before {
+  content: "\f092";
+}
+.fa-upload-alt:before {
+  content: "\f093";
+}
+.fa-lemon:before {
+  content: "\f094";
+}
+.fa-ok-empty:before {
+  content: "\f096";
+}
+.fa-bookmark-empty:before {
+  content: "\f097";
+}
+.fa-phone-sign:before {
+  content: "\f098";
+}
+.fa-hdd:before {
+  content: "\f0a0";
+}
+.fa-bell-alt:before {
+  content: "\f0f3";
+}
+.fa-hand-right:before {
+  content: "\f0a4";
+}
+.fa-hand-left:before {
+  content: "\f0a5";
+}
+.fa-hand-up:before {
+  content: "\f0a6";
+}
+.fa-hand-down:before {
+  content: "\f0a7";
+}
+.fa-circle-arrow-left:before {
+  content: "\f0a8";
+}
+.fa-circle-arrow-right:before {
+  content: "\f0a9";
+}
+.fa-circle-arrow-up:before {
+  content: "\f0aa";
+}
+.fa-circle-arrow-down:before {
+  content: "\f0ab";
+}
+.fa-fullscreen:before {
+  content: "\f0b2";
+}
+.fa-group:before {
+  content: "\f0c0";
+}
+.fa-beaker:before {
+  content: "\f0c3";
+}
+.fa-paper-clip:before {
+  content: "\f0c6";
+}
+.fa-sign-blank:before {
+  content: "\f0c8";
+}
+.fa-pinterest-sign:before {
+  content: "\f0d3";
+}
+.fa-google-plus-sign:before {
+  content: "\f0d4";
+}
+.fa-comment-alt:before {
+  content: "\f0e5";
+}
+.fa-comments-alt:before {
+  content: "\f0e6";
+}
+.fa-lightbulb:before {
+  content: "\f0eb";
+}
+.fa-bell-alt:before {
+  content: "\f0a2";
+}
+.fa-food:before {
+  content: "\f0f5";
+}
+.fa-file-text-alt:before {
+  content: "\f0f6";
+}
+.fa-building:before {
+  content: "\f0f7";
+}
+.fa-hospital:before {
+  content: "\f0f8";
+}
+.fa-h-sign:before {
+  content: "\f0fd";
+}
+.fa-plus-sign-alt:before {
+  content: "\f0fe";
+}
+.fa-double-angle-left:before {
+  content: "\f100";
+}
+.fa-double-angle-right:before {
+  content: "\f101";
+}
+.fa-double-angle-up:before {
+  content: "\f102";
+}
+.fa-double-angle-down:before {
+  content: "\f103";
+}
+.fa-circle-blank:before {
+  content: "\f10c";
+}
+.fa-folder-close-close-alt:before {
+  content: "\f114";
+}
+.fa-folder-close-close-altpen-o:before {
+  content: "\f115";
+}
+.fa-smile:before {
+  content: "\f118";
+}
+.fa-frown:before {
+  content: "\f119";
+}
+.fa-meh:before {
+  content: "\f11a";
+}
+.fa-keyboard:before {
+  content: "\f11c";
+}
+.fa-flag-alt:before {
+  content: "\f11d";
+}
+.fa-microphone-off:before {
+  content: "\f131";
+}
+.fa-calendar-empty:before {
+  content: "\f133";
+}
+.fa-chevron-sign-left:before {
+  content: "\f137";
+}
+.fa-chevron-sign-right:before {
+  content: "\f138";
+}
+.fa-chevron-sign-up:before {
+  content: "\f139";
+}
+.fa-chevron-sign-down:before {
+  content: "\f13a";
+}
+.fa-ellipsis-horizontal:before {
+  content: "\f141";
+}
+.fa-ellipsis-vertical:before {
+  content: "\f142";
+}
+.fa-rss-sign:before {
+  content: "\f143";
+}
+.fa-play-sign:before {
+  content: "\f144";
+}
+.fa-minus-sign-alt:before {
+  content: "\f146";
+}
+.fa-ok-minus:before {
+  content: "\f147";
+}
+.fa-ok-sign:before {
+  content: "\f14a";
+}
+.fa-edit-sign:before {
+  content: "\f14b";
+}
+.fa-external-link-sign:before {
+  content: "\f14c";
+}
+.fa-share-alt-square:before {
+  content: "\f14d";
+}
+.fa-collapse:before {
+  content: "\f150";
+}
+.fa-collapse-top:before {
+  content: "\f151";
+}
+.fa-resize-full:before {
+  content: "\f152";
+}
+.fa-cnyle:before,
+.fa-cny:before {
+  content: "\f158";
+}
+.fa-sort-by-alphabet:before {
+  content: "\f15d";
+}
+.fa-sort-by-alphabet-alt:before {
+  content: "\f15e";
+}
+.fa-sort-by-attributes:before {
+  content: "\f160";
+}
+.fa-sort-by-attributes-alt:before {
+  content: "\f161";
+}
+.fa-sort-by-order:before {
+  content: "\f162";
+}
+.fa-sort-by-order-alt:before {
+  content: "\f163";
+}
+.fa-youtube-sign:before {
+  content: "\f166";
+}
+.fa-xing-sign:before {
+  content: "\f169";
+}
+.fa-stackexchange:before {
+  content: "\f16c";
+}
+.fa-bitbucket-sign:before {
+  content: "\f172";
+}
+.fa-tumblr-sign:before {
+  content: "\f174";
+}
+.fa-sun:before {
+  content: "\f185";
+}
+.fa-moon:before {
+  content: "\f186";
+}
+.fa-expand-alt:before {
+  content: "\f196";
+}