From 9cdd523ca3a5eccf25c96795cfefcc8999b84265 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 8 Dec 2011 21:01:14 -0500 Subject: v3: dal, codeblocks, removed identifier tags, changed markup of "<" & ">" --- lib/sisu/v3/dal_doc_str.rb | 3 ++- lib/sisu/v3/dal_syntax.rb | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'lib') 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

back, clumsy dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s)<(br(?: \/)?)>([\s,.]|$)/,'\1<\2>\3') #convert

back, clumsy if dob.number_ codeline=[] -- cgit v1.2.3