sisu/data/sisu/conf/convert/modify.rb | 16 ++++++++-------- sisu/data/sisu/conf/convert/sisu_convert | 1 + sisu/lib/sisu/v0/character_encoding.rb | 14 ++++++-------- sisu/lib/sisu/v0/sst_to_s_xml_node.rb | 4 ++-- sisu/lib/sisu/v0/wikispeak.rb | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/sisu/data/sisu/conf/convert/modify.rb b/sisu/data/sisu/conf/convert/modify.rb index 5f4f9ae..b65803a 100644 --- a/sisu/data/sisu/conf/convert/modify.rb +++ b/sisu/data/sisu/conf/convert/modify.rb @@ -149,13 +149,13 @@ WOK p @files mr=nil #%% changes to make m match, r replace --------------------------> - if @cf =~/--help/: help + if @cf =~/--help/; help else message("WARNING, proceed at your own risk,\npermanent changes requested for the above named files\n best that you check (manually) what this file is set to do\n conversions set are at the top of the file") mr=case @cf - when /--convert|default/: current_match_and_replace - when /--(?:(?:37)?to38|rad)/: convert_pre_37_to_38_experimental - when /--(?:(?:38)?to37)/: convert_38_experimental_to_37 + when /--convert|default/; current_match_and_replace + when /--(?:(?:37)?to38|rad)/; convert_pre_37_to_38_experimental + when /--(?:(?:38)?to37)/; convert_38_experimental_to_37 else help end end @@ -190,7 +190,7 @@ WOK puts "match in #{i}" @flag_start=true cont.each do |y| - if y =~end_processing: @flag_end=true + if y =~end_processing; @flag_end=true end if @flag_start and not @flag_end match_and_replace.each do |m,r| @@ -206,11 +206,11 @@ WOK #end #if y =~m1 #end - if y=~/^\s*$/: @empty1=true + if y=~/^\s*$/; @empty1=true else @empty1=false end @file.puts y unless (@empty1==true and @empty2==true) - if y=~/^\s*$/: @empty2=true + if y=~/^\s*$/; @empty2=true else @empty2=false end #@file << y + "\n" @@ -242,7 +242,7 @@ match_and_replace=Array.new #WOK # exit #end -unless f.length > 0: f=Dir.glob("[a-z]*.ss?") #restricted to sisu type files, it need not be +unless f.length > 0; f=Dir.glob("[a-z]*.ss?") #restricted to sisu type files, it need not be end #f=Dir.glob("{bin,conf,data,lib}/**/*.rb") #sisu development #f=Dir.glob("[^_]/**/*") #all files subdirectories beneath pwd except those starting with _ diff --git a/sisu/data/sisu/conf/convert/sisu_convert b/sisu/data/sisu/conf/convert/sisu_convert index 7be075f..cf6d83b 100644 --- a/sisu/data/sisu/conf/convert/sisu_convert +++ b/sisu/data/sisu/conf/convert/sisu_convert @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# coding: utf-8 # = sisu - SiSU information Structuring Universe # # Copyright (c) Ralph Amissah 1997,2004 diff --git a/sisu/lib/sisu/v0/character_encoding.rb b/sisu/lib/sisu/v0/character_encoding.rb index 23bad37..ac2e4ee 100644 --- a/sisu/lib/sisu/v0/character_encoding.rb +++ b/sisu/lib/sisu/v0/character_encoding.rb @@ -297,7 +297,7 @@ module SiSU_character_encode ['±', 177, '261', '\302\261', '±', '&plusmin;', '±', '', '', 'Plus or minus ±' ], ['²', 178, '262', '\302\262', '²', '²', '²', '', '', 'Superscript 2 ²' ], ['³', 179, '263', '\302\263', '³', '³', '³', '', '', 'Superscript 3 ³' ], - ['', 180, '264', '\302\264', '´', '´', ''', '', '', 'Acute accent ' ], + ['', 180, '264', '\302\264', '´', '´', '', '', '', 'Acute accent ' ], ['µ', 181, '265', '\302\265', 'µ', 'µ', 'µ', '', '', 'Micro sign (Greek mu) µ' ], ['¶', 182, '266', '\302\266', '¶', '¶', '¶', '\textparagraph', '', 'Paragraph sign ¶' ], ['·', 183, '267', '\302\267', '·', '·', %q{·}, '', %q{}, 'Middle dot ' ], @@ -318,17 +318,17 @@ module SiSU_character_encode ['Æ', 198, '306', '\303\206', 'Æ', 'Æ', 'Æ', 'AE', '', 'Capital AE ligature Æ' ], ['Ç', 199, '307', '\303\207', 'Ç', 'Ç', 'Ç', '', '', 'Capital C, cedilla Ç' ], ['È', 200, '310', '\303\210', 'È', 'È', 'È', '`{E}', '', 'Capital E, grave accent È' ], - ['É', 201, '311', '\303\211', 'É', 'É', 'É', ''{E}', '', 'Capital E, acute accent É' ], + ['É', 201, '311', '\303\211', 'É', 'É', 'É', %w{\'{E}}, '', 'Capital E, acute accent É' ], ['Ê', 202, '312', '\303\212', 'Ê', 'Ê', 'Ê', '^{E}', '', 'Capital E, circumflex accent Ê' ], ['Ë', 203, '313', '\303\213', 'Ë', 'Ë', 'Ë', '"{E}', '', 'Capital E, umlaut Ë' ], ['Ì', 204, '314', '\303\214', 'Ì', 'Ì', 'Ì', '`{I}', '', 'Capital I, grave accent Ì' ], - ['Í', 205, '315', '\303\215', 'Í', 'Í', 'Í', ''{I}', '', 'Capital I, acute accent Í' ], + ['Í', 205, '315', '\303\215', 'Í', 'Í', 'Í', %w{\'{I}}, '', 'Capital I, acute accent Í' ], ['Î', 206, '316', '\303\216', 'Î', 'Î', 'Î', '^{I}', '', 'Capital I, circumflex accent Î' ], ['Ï', 207, '317', '\303\217', 'Ï', 'Ï', 'Ï', '"{I}', '', 'Capital I, umlaut Ï' ], ['Ð', 208, '320', '\303\220', 'Ð', 'Ð', 'Ð', '', '', 'Capital eth, Icelandic ' ], ['Ñ', 209, '321', '\303\221', 'Ñ', 'Ñ', 'Ñ', '', '', 'Capital N, tilde Ñ' ], ['Ò', 210, '322', '\303\222', 'Ò', 'Ò', 'Ò', '`{O}', '', 'Capital O, grave accent Ò' ], - ['Ó', 211, '323', '\303\223', 'Ó', 'Ó', 'Ó', ''{O}', '', 'Capital O, acute accent Ó' ], + ['Ó', 211, '323', '\303\223', 'Ó', 'Ó', 'Ó', %w{\'{O}}, '', 'Capital O, acute accent Ó' ], ['Ô', 212, '324', '\303\224', 'Ô', 'Ô', 'Ô', '^{O}', '', 'Capital O, circumflex accent Ô' ], ['Õ', 213, '325', '\303\225', 'Õ', 'Õ', 'Õ', '~{O}', '', 'Capital O, tilde Õ' ], ['Ö', 214, '326', '\303\226', 'Ö', 'Ö', 'Ö', '"{O}', '', 'Capital O, umlaut Ö' ], @@ -354,7 +354,7 @@ module SiSU_character_encode ['ê', 234, '352', '\303\252', 'ê', 'ê', 'ê', '\^{e}', '', 'Small e, circumflex accent ê' ], ['ë', 235, '353', '\303\253', 'ë', 'ë', 'ë', '\"{e}', '', 'Small e, umlaut ë' ], ['ì', 236, '354', '\303\254', 'ì', 'ì', 'ì', '\`{i}', '', 'Small i, grave accent ì' ], - ['í', 237, '355', '\303\255', 'í', 'í', 'í', '\'{i}', '', 'Small i, acute accent í' ], + ['í', 237, '355', '\303\255', 'í', 'í', 'í', %w{\'{i}}, '', 'Small i, acute accent í' ], ['î', 238, '356', '\303\256', 'î', 'î', 'î', '\^{i}', '', 'Small i, circumflex accent î' ], ['ï', 239, '357', '\303\257', 'ï', 'ï', 'ï', '\"{i}', '', 'Small i, umlaut ï' ], ['ð', 240, '360', '\303\260', 'ð', 'ð', 'ð', '', '', 'Small eth, Icelandic ð' ], @@ -372,9 +372,7 @@ module SiSU_character_encode ['ü', 252, '374', '\303\274', 'ü', 'ü', 'ü', '\"{u}', '', 'Small u, umlaut ü' ], ['ý', 253, '375', '\303\275', 'ý', 'ý', 'ý', '', '', 'Small y, acute accent ý' ], ['þ', 254, '376', '\303\276', 'þ', 'þ', 'þ', '', '', 'Small thorn, Icelandic þ' ], - ['ÿ', 255, '377', '\303\277', 'ÿ', 'ÿ', 'ÿ', '', '', 'Smally y, umlaut ÿ' ], - ['∝', , '', '', '∝', '∝', '∝', '', '', 'proportional to U+221D (8733) ∝' ], - ['∞', , '', '', '∞', '∞', '∞', '', '', 'infinity U+221E (8734) ∞' ], + ['ÿ', 255, '377', '\303\277', 'ÿ', 'ÿ', 'ÿ', '', '', 'Smally y, umlaut ÿ' ] ] end end diff --git a/sisu/lib/sisu/v0/sst_to_s_xml_node.rb b/sisu/lib/sisu/v0/sst_to_s_xml_node.rb index 5c34195..decc417 100644 --- a/sisu/lib/sisu/v0/sst_to_s_xml_node.rb +++ b/sisu/lib/sisu/v0/sst_to_s_xml_node.rb @@ -242,7 +242,7 @@ WOK @@parent[:node][o.node]=@node[:no][lv-1] elsif @node[:no][lv-2] != nil @@parent[:node][o.node]=@node[:no][lv-2] - elsif @node[:no][lv-3] != nil: + elsif @node[:no][lv-3] != nil @@parent[:node][o.node]=@node[:no][lv-3] else puts 'error' end @@ -259,7 +259,7 @@ WOK @@parent[:ocn][o.ocn]=@node[:ocn][lv-1] elsif @node[:ocn][lv-2] != nil @@parent[:ocn][o.ocn]=@node[:ocn][lv-2] - elsif @node[:ocn][lv-3] != nil: + elsif @node[:ocn][lv-3] != nil @@parent[:ocn][o.ocn]=@node[:ocn][lv-3] else puts 'error' end diff --git a/sisu/lib/sisu/v0/wikispeak.rb b/sisu/lib/sisu/v0/wikispeak.rb index d29487e..ed55db6 100644 --- a/sisu/lib/sisu/v0/wikispeak.rb +++ b/sisu/lib/sisu/v0/wikispeak.rb @@ -134,7 +134,7 @@ module SiSU_Wikispeak end end format=@format.dup - @lev_para_ocn=if @para =~/.+#{Mx[:id_o]}~\d+;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{#Mx[:id_c]}$/ + @lev_para_ocn=if @para =~/.+#{Mx[:id_o]}~\d+;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/ Format::Format_text_object.new(format,@text,@ocn) else Format::Format_text_object.new(format,@text,"#{Mx[:id_o]}~(\d+);[um]\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}")