diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-09-03 21:46:47 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-09-03 21:46:47 +0100 |
commit | 2cd558f67f44cca787013c02b665533b97c90f0e (patch) | |
tree | b3b596e2d094014b897dabd1c93e91623b1663d0 /lib/sisu/v0/param.rb | |
parent | sisu-0.57.0 md5s (diff) |
sisu-0.58 work towards making it possible to describe sisu and sisu markup within sisu
Diffstat (limited to 'lib/sisu/v0/param.rb')
-rw-r--r-- | lib/sisu/v0/param.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb index 9462d8d2..690163d4 100644 --- a/lib/sisu/v0/param.rb +++ b/lib/sisu/v0/param.rb @@ -178,7 +178,6 @@ module SiSU_Param @sfx=nil @flag_pdf=true #watch @flag_auto_heading_num=false -#watch if @fns =~ /[_-]?sst$/ #watch @env_out_root=@env.path.output @dir_out="#{@env.path.output}/#@fnb" @@ -235,13 +234,19 @@ module SiSU_Param tell=SiSU_Screen::Ansi.new(@cmd,'SiSU filetype indicator not provided') tell.warn unless @cmd =~/q/ end + @code_flag=false fns_array.each do |par| #% Scan document para=par.gsub(/\n/,' ') if para !~/^\%+\s/ and para =~/<![abcdeghijklmnopqrstuvwxyz]/i # <!f not included raise "Old markup style in file #@fns, current version #{@sisu_version[:project]} #{@sisu_version[:version]} #{@sisu_version[:date_stamp]} #{@sisu_version[:date]}:\n\t\t#{para}\n\n" end + @code_flag=case par + when /^code\{\s*$/; true + when /^\}code\s*$/; false + else @code_flag + end regx_header=/^(?:0~|@\S+?:[+-]?\s)/ - if para =~regx_header #or para=~/^(?:1|:?A)~/ + if para =~regx_header and not @code_flag #or para=~/^(?:1|:?A)~/ case para when /^(?:0~ocn|@ocn:)\s+(.+?)$/m; @ocn=$1 #% processing when /^(?:0~title|@title:)\s+(.+?)$/m #% metainfo DC |