Merge tag 'sisu_5.8.0' into debian/sid

SiSU 5.8.0

Conflicts:
	.gitignore
	data/doc/sisu/CHANGELOG_v5
	data/doc/sisu/CHANGELOG_v6
	data/sisu/v5/v/version.yml
	data/sisu/v6/v/version.yml
	setup/sisu_version.rb

1 files changed, 140 insertions, 0 deletions

diff --git a/data/doc/sisu/org/in_progress/sisu_asciidoc.org b/data/doc/sisu/org/in_progress/sisu_asciidoc.org
new file mode 100644
index 00000000..bd2ec738
--- /dev/null
+++ b/data/doc/sisu/org/in_progress/sisu_asciidoc.org
@@ -0,0 +1,140 @@
+***** urls
+#% asciidoc
+<http://asciidoc.org/>
+<http://asciidoctor.org/>
+<http://www.methods.co.nz/asciidoc/>
+<http://en.wikipedia.org/wiki/AsciiDoc>
+
+cheatsheets
+<http://powerman.name/doc/asciidoc>
+<http://powerman.name/doc/asciidoc-index>
+
+<http://www.methods.co.nz/asciidoc/asciidoc.txt>
+<http://www.methods.co.nz/asciidoc/userguide.html>
+
+<http://www.methods.co.nz/asciidoc/asciidoc.css-embedded.html>
+<http://www.methods.co.nz/asciidoc/asciidoc.html>
+<http://www.methods.co.nz/asciidoc/chunked/index.html>
+
+***** rb file
+lib/sisu/v6/txt_asaciidoc.rb
+
+***** transformations :transformations:markup_asciidoc: #%
+#% structure - headings, levels
+  [] sisu (A-C, 1-3)
+  [] collapsed (1-4) (decoration)
+    [] inline
+      '== '
+      '=== '
+      '==== '
+      '===== '
+      ''
+      ''
+    [] underscore
+      '-'
+      '~'
+      '^'
+      '+'
+      '' ['.' proposed]
+      '' ['.' proposed]
+  [] node (child, parent ...)
+
+#% font face
+  [open & close marks]
+  [] bold
+      '*'
+  [] italics
+      '_'
+  [] underscore
+      ''
+  [] superscript
+      '^'
+  [] subscript
+      '~'
+  [] strike
+      '-'
+  [] add
+  [] monospace
+      '+'
+      '`' pass markup through unchanged, monospace code
+
+#% para
+  [] default
+  [] indent
+    [] default, all
+    [] first line hang or indent further
+  [] bullet
+    [levels 1-6]
+      '*'
+      '**'
+      '***'
+      '****'
+      '*****'
+      '*******'
+  [] numbered list
+    [levels 1-3]
+      '. '     number
+      '.. '    lower alpha
+      '... '   lower roman
+      '.... '  upper alpha
+      '..... ' upper roman
+
+#% blocks
+  [] code
+      [source,perl]
+      ----
+      code here
+      ----
+    [] [type of markup if any]
+  [] poem
+  [] group
+      ----
+      grouped text here, actually a listing block
+      ----
+  [] alt
+  [] tables
+
+#% notes
+  [] footnotes
+    [] [bibliography?]
+
+#% links, linking
+  [] links - external, web, url
+       http://google.com[Google Search]
+  [] links - internal
+
+#% images [multimedia?]
+  [] images
+    [] [base 64]
+
+#% object numbers
+  [] ocn (object numbers)
+
+#% contents
+  [] toc (table of contents)
+  [] index (book index)
+
+#% breaks
+  [] line break
+      "+\n"
+      forced +
+      line break
+  [] horizontal rule
+  [] column break
+  [] page break
+
+#% comment
+  [] comment
+      //
+
+#% misc
+
+  [] term & definition
+Term 1:: Definition 1
+Term 2:: Definition 2
+[horizontal]
+    Term 2.1;;
+        Definition 2.1
+    Term 2.2;;
+        Definition 2.2
+