From 9cdd523ca3a5eccf25c96795cfefcc8999b84265 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 8 Dec 2011 21:01:14 -0500
Subject: v3: dal, codeblocks, removed identifier tags, changed markup of "<" &
 ">"

---
 data/doc/sisu/CHANGELOG_v3 | 4 ++++
 lib/sisu/v3/dal_doc_str.rb | 3 ++-
 lib/sisu/v3/dal_syntax.rb  | 5 +----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 5ba162ea..a4b82d4e 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.7.orig.tar.xz
   sisu_3.1.7-1.dsc
   sisu_3.1.7-1.debian.tar.gz
 
+  * dal, codeblocks
+    * internal document identifier tags removed, consider
+    * markup of greater than & less than, fix (but watch)
+
 %% 3.1.6.orig.tar.xz (2011-12-02:48/5)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.6
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.6-1
diff --git a/lib/sisu/v3/dal_doc_str.rb b/lib/sisu/v3/dal_doc_str.rb
index 2bf0305e..91110b44 100644
--- a/lib/sisu/v3/dal_doc_str.rb
+++ b/lib/sisu/v3/dal_doc_str.rb
@@ -376,7 +376,8 @@ module SiSU_document_structure_extract
         if @@flag['code']
           if t_o =~/^\}code/
             @@flag['code']=false
-            obj,tags=extract_tags(@tuned_code.join("\n"))
+            obj=@tuned_code.join("\n")
+            tags=[]
             h={ obj: obj, tags: tags, number_: @codeblock_numbered }
             t_o=SiSU_document_structure::Object_block_txt.new.code(h)
             @tuned_code=[]
diff --git a/lib/sisu/v3/dal_syntax.rb b/lib/sisu/v3/dal_syntax.rb
index 6d56e4aa..b887904e 100644
--- a/lib/sisu/v3/dal_syntax.rb
+++ b/lib/sisu/v3/dal_syntax.rb
@@ -332,7 +332,7 @@ module SiSU_Syntax
         and defined? @md.creator \
         and @md.creator
           if dob.is =='heading'
-            dob.obj.gsub!(/^\s*@title\s*$/,@md.title.full) if dob.lv =~/1/                #
+            dob.obj.gsub!(/^\s*@title\s*$/,@md.title.full) if dob.lv =~/1/
             if dob.lv =~/[23]/ \
             and defined? @md.creator.author \
             and @md.creator.author
@@ -432,9 +432,6 @@ module SiSU_Syntax
         dob=fontface(dob)
       elsif dob.is =='code'
         dob.obj.gsub!(/#{Mx[:meta_o]}(\S+?)#{Mx[:meta_c]}\s*/,'@\1: ')
-        dob.obj.gsub!(/([<>])/,'_\1')
-        dob.obj.gsub!(/_<:(\S+?)_>/,'<:\1>') #convert <:\S+> back, clumsy
-        dob.obj.gsub!(/_<(br(?: \/)?)_>/,'<\1>') #convert <br> <br /> back, clumsy
         dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s)&lt;(br(?: \/)?)&gt;([\s,.]|$)/,'\1<\2>\3') #convert <br> <br /> back, clumsy
         if dob.number_
           codeline=[]
-- 
cgit v1.2.3