From dc0648fefb0f43e6432d55d05416a1b38bafeb95 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 10 May 2008 01:38:12 -0400 Subject: addition of a couple of multiline search tags, and minor rearrangement --- lib/sisu/v0/dal_doc_str.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/sisu/v0/dal_doc_str.rb') diff --git a/lib/sisu/v0/dal_doc_str.rb b/lib/sisu/v0/dal_doc_str.rb index 27e37826..ebaa8625 100644 --- a/lib/sisu/v0/dal_doc_str.rb +++ b/lib/sisu/v0/dal_doc_str.rb @@ -142,8 +142,6 @@ module SiSU_document_structure data=@data @o_array=[] node=ocn=ocn_dv=ocn_sp=ocnh=ocnh1=ocnh2=ocnh3=ocnh4=ocnh5=ocnh6=ocno=ocnp=ocnt=ocnc=ocng=ocni=ocnm=ocnu=ocnk=0 # h heading, o other, t table, g group, i image - number_small,letter_small=0,0 - letter=%w( a b c d e f g h i j k l m n o p q r s t u v w x y z ) node_count_flag=false headings='' #where headings omitted an alternative form of ocn heading numbering is required for html and other linking... #headings=if @md.ocn.inspect =~/skip=headings/; '^(?:[A-C]|[1-9])~\S* |' @@ -173,7 +171,7 @@ module SiSU_document_structure ocnh+=1 if para=~/^1~(?:\s+|\S)/ \ or para =~@md.lv1 - ocnh1+=1 + ocnh1+=1 #heading ocn_dv,ocn_sp="1:#{ocnh1}","h#{ocnh}" elsif para=~/^2~(?:\s+|\S)/ \ or para =~@md.lv2; ocnh2+=1 @@ -193,15 +191,15 @@ module SiSU_document_structure end else ocno+=1 - if para=~//; ocnt+=1 #tables + if para=~//; ocnt+=1 #table ocn_dv,ocn_sp="o#{ocno}","t#{ocnt}" - elsif para=~/^<:code>/; ocnc+=1 + elsif para=~/^<:code>/; ocnc+=1 #code block ocn_dv,ocn_sp="o#{ocno}","c#{ocnc}" - elsif para=~/^<:(?:group|alt|verse)>/; ocng+=1 + elsif para=~/^<:(?:group|alt|verse)>/; ocng+=1 #group, poem ocn_dv,ocn_sp="o#{ocno}","g#{ocng}" - elsif para=~/\{\S+?\.(?:png|jpg|gif)\s+/m; ocni+=1 + elsif para=~/\{\S+?\.(?:png|jpg|gif)\s+/m; ocni+=1 #image ocn_dv,ocn_sp="o#{ocno}","i#{ocni}" - else ocnp+=1 + else ocnp+=1 #paragraph ocn_dv,ocn_sp="o#{ocno}","p#{ocnp}" end end -- cgit v1.2.3