From b5c036a6cc00ed4c507d93efd2e2e2053c9786f3 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 21 Nov 2011 00:06:15 -0500
Subject: v3: dal_expand_insertions, link shortcut for sisu documents, omit
 codeblocks

---
 data/doc/sisu/CHANGELOG_v3           | 3 +++
 lib/sisu/v3/dal_expand_insertions.rb | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 5bd188a9..cc6b805f 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.5.orig.tar.xz
   sisu_3.1.5-1.dsc
   sisu_3.1.5-1.debian.tar.gz
 
+  * dal_expand_insertions, link shortcut for multiple versions of sisu document,
+    omit codeblocks
+
 %% 3.1.4.orig.tar.xz (2011-11-11:45/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.4
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.4-1
diff --git a/lib/sisu/v3/dal_expand_insertions.rb b/lib/sisu/v3/dal_expand_insertions.rb
index cef75432..cfd8fe54 100644
--- a/lib/sisu/v3/dal_expand_insertions.rb
+++ b/lib/sisu/v3/dal_expand_insertions.rb
@@ -258,8 +258,16 @@ module SiSU_insertions
     def expand_insertions?
       data=@data
       tuned_file,tuned_file_tmp=[],[]
+      codeblock_=false
       data.each do |para|
+        codeblock_=if para =~/^code\{/
+          true
+        elsif para =~/^\}code/
+          false
+        else codeblock_
+        end
         if para !~/^%+\s/ \
+        and not codeblock_ \
         and para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/
           txt,cmd,source,linked_doc,note,manifest=nil,nil,nil,nil,nil,nil
           @u=SiSU_Env::Info_env.new.url
-- 
cgit v1.2.3