From 954419b5ae79efb032d28b145ee40d0b61c80c23 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 1 Jul 2014 00:33:49 -0400
Subject: v5: merge what was sisu_6.0.8 into v5

* ao,
  * syntax, able optionally to indicate the language syntax of a code block
  * syntax, introduce box text block/group
  * syntax, introduce tics quotes markup (blockquote equivalent)
* docbook,
  * ocn & footnote numbers (as xml comments)
  * metadata header (docinfo)
  * quotes (blockquote)
  * tables
  * images
  * code block
* vim syntax, add
  * code block, language syntax, optional
  * box block
  * quote block
---
 lib/sisu/v5/ao_expand_insertions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sisu/v5/ao_expand_insertions.rb')

diff --git a/lib/sisu/v5/ao_expand_insertions.rb b/lib/sisu/v5/ao_expand_insertions.rb
index ea499119..f47823b6 100644
--- a/lib/sisu/v5/ao_expand_insertions.rb
+++ b/lib/sisu/v5/ao_expand_insertions.rb
@@ -333,7 +333,7 @@ module SiSU_AO_Insertions
       tuned_file,tuned_file_tmp=[],[]
       codeblock_=false
       data.each do |para|
-        codeblock_=if para =~/^(?:code\{|```[ ]+code)/
+        codeblock_=if para =~/^(?:code(?:\.[a-z][0-9a-z_]+)?\{|```[ ]+code(?:\.[a-z][0-9a-z_]+)?)/
           true
         elsif para =~/^(?:\}code|```(?:\s|$))/m
           false
-- 
cgit v1.2.3


From 9347018753e818b49980651df3b77352c5f3792f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 1 Jul 2014 00:45:40 -0400
Subject: v5 v6: ao, code cosmetic rearrangement

---
 lib/sisu/v5/ao_expand_insertions.rb | 48 ++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 14 deletions(-)

(limited to 'lib/sisu/v5/ao_expand_insertions.rb')

diff --git a/lib/sisu/v5/ao_expand_insertions.rb b/lib/sisu/v5/ao_expand_insertions.rb
index f47823b6..dce14ee4 100644
--- a/lib/sisu/v5/ao_expand_insertions.rb
+++ b/lib/sisu/v5/ao_expand_insertions.rb
@@ -77,33 +77,53 @@ module SiSU_AO_Insertions
       end
       file_type_names={}
       file_type_names[:gen],file_type_names[:src]=[],[]
-      file_type_names[:gen] <<= if cmd_list =~ /y/ then "~^ { document manifest }#{lnk[:manifest]}"
+      file_type_names[:gen] <<= if cmd_list =~ /y/
+        "~^ { document manifest }#{lnk[:manifest]}"
       end
-      file_type_names[:gen] <<= if cmd_list =~ /h/ then [" { html, segmented text }#{lnk[:html_toc]}"," { html, scroll, document in one }#{lnk[:html_doc]}"]
+      file_type_names[:gen] <<= if cmd_list =~ /h/
+        [
+          " { html, segmented text }#{lnk[:html_toc]}",
+          " { html, scroll, document in one }#{lnk[:html_doc]}",
+        ]
       end
-      file_type_names[:gen] <<= if cmd_list =~ /e/ then [" { epub }#{lnk[:epub]}"]
+      file_type_names[:gen] <<= if cmd_list =~ /e/
+        [" { epub }#{lnk[:epub]}"]
       end
-      file_type_names[:gen] <<= if cmd_list =~ /p/ then [" { pdf, landscape }#{lnk[:pdf_landscape]}"," { pdf, portrait }#{lnk[:pdf_portrait]}"]
+      file_type_names[:gen] <<= if cmd_list =~ /p/
+        [
+          " { pdf, landscape }#{lnk[:pdf_landscape]}",
+          " { pdf, portrait }#{lnk[:pdf_portrait]}",
+        ]
       end
-      file_type_names[:gen] <<= if cmd_list =~ /o/ then " { odf:odt, open document text }#{lnk[:odt]}"
+      file_type_names[:gen] <<= if cmd_list =~ /o/
+        " { odf:odt, open document text }#{lnk[:odt]}"
       end
-      file_type_names[:gen] <<= if cmd_list =~ /b/ then " { xhtml scroll }#{lnk[:xhtml]}"
+      file_type_names[:gen] <<= if cmd_list =~ /b/
+        " { xhtml scroll }#{lnk[:xhtml]}"
       end
-      file_type_names[:gen] <<= if cmd_list =~ /x/ then " { xml, sax }#{lnk[:xml_sax]}"
+      file_type_names[:gen] <<= if cmd_list =~ /x/
+        " { xml, sax }#{lnk[:xml_sax]}"
       end
-      file_type_names[:gen] <<= if cmd_list =~ /X/ then " { xml, dom }#{lnk[:xml_dom]}"
+      file_type_names[:gen] <<= if cmd_list =~ /X/
+        " { xml, dom }#{lnk[:xml_dom]}"
       end
-      file_type_names[:gen] <<= if cmd_list =~ /a/ then " { plain text utf-8 }#{lnk[:txt]}"
+      file_type_names[:gen] <<= if cmd_list =~ /a/
+        " { plain text utf-8 }#{lnk[:txt]}"
       end
-      file_type_names[:gen] <<= if cmd_list =~ /g/ then 'wiki.txt'
+      file_type_names[:gen] <<= if cmd_list =~ /g/
+        'wiki.txt'
       end
-      file_type_names[:gen] <<= if cmd_list =~ /w/ then " { concordance }#{lnk[:html_concordance]}"
+      file_type_names[:gen] <<= if cmd_list =~ /w/
+        " { concordance }#{lnk[:html_concordance]}"
       end
-      file_type_names[:gen] <<= if cmd_list =~ /N/ then " { dcc, document content certificate (digests) }#{lnk[:digest]}"
+      file_type_names[:gen] <<= if cmd_list =~ /N/
+        " { dcc, document content certificate (digests) }#{lnk[:digest]}"
       end
-      file_type_names[:src] <<= if source and cmd_shortcut =~ /s/ then " { markup source text }#{lnk[:source]}"
+      file_type_names[:src] <<= if source and cmd_shortcut =~ /s/
+        " { markup source text }#{lnk[:source]}"
       end
-      file_type_names[:src] <<= if cmd_shortcut =~ /S/ then " { markup source (zipped) pod }#{lnk[:sisupod]}"
+      file_type_names[:src] <<= if cmd_shortcut =~ /S/
+        " { markup source (zipped) pod }#{lnk[:sisupod]}"
       end
       file_type_names[:gen]=file_type_names[:gen].flatten
       file_type_names[:src]=file_type_names[:src].flatten
-- 
cgit v1.2.3