Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37887800
en ru br
Репозитории ALT
S:0.3.5-alt1_2jpp11
5.1: 0.70.5-alt2
4.1: 0.64.0-alt1
4.0: 0.50.3-alt1
www.altlinux.org/Changes

Группа :: Работа с текстами
Пакет: sisu

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: sisu-alt-syntax.patch
Скачать


 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',     '&#177;', '&plusmin;', 'б╠',    '',                '',                'Plus or minus           б╠' ],
   ['б╡',  178, '262', '\302\262',     '&#178;', '&sup2;',    'б╡',    '',                '',                'Superscript 2           б╡' ],
   ['бЁ',  179, '263', '\302\263',     '&#179;', '&sup3;',    'бЁ',    '',                '',                'Superscript 3           бЁ' ],
-  ['',   180, '264', '\302\264',     '&#180;', '&acute;',   ''',    '',                '',                'Acute accent             ' ],
+  ['',   180, '264', '\302\264',     '&#180;', '&acute;',   '',    '',                '',                'Acute accent             ' ],
   ['б╣',  181, '265', '\302\265',     '&#181;', '&micro;',   'б╣',    '',                '',                'Micro sign (Greek mu)   б╣' ],
   ['б╤',  182, '266', '\302\266',     '&#182;', '&para;',    'б╤',    '\textparagraph',  '',                'Paragraph sign          б╤' ],
   ['б╥',  183, '267', '\302\267',     '&#183;', '&middot;',  %q{б╥},  '',                %q{},              'Middle dot               ' ],
@@ -318,17 +318,17 @@ module SiSU_character_encode
   ['ц├',  198, '306', '\303\206',     '&#198;', '&AElig;',   'ц├',    'AE',              '',                'Capital AE ligature     ц├' ],
   ['ц┤',  199, '307', '\303\207',     '&#199;', '&Ccedil;',  'ц┤',    '',                '',                'Capital C, cedilla      ц┤' ],
   ['ц┬',  200, '310', '\303\210',     '&#200;', '&Egrave;',  'ц┬',    '`{E}',            '',                'Capital E, grave accent ц┬' ],
-  ['ц┴',  201, '311', '\303\211',     '&#201;', '&Eacute;',  'ц┴',    ''{E}',            '',                'Capital E, acute accent ц┴' ],
+  ['ц┴',  201, '311', '\303\211',     '&#201;', '&Eacute;',  'ц┴',    %w{\'{E}},            '',                'Capital E, acute accent ц┴' ],
   ['ц┼',  202, '312', '\303\212',     '&#202;', '&Ecirc;',   'ц┼',    '^{E}',            '',                'Capital E, circumflex accent ц┼' ],
   ['ц▀',  203, '313', '\303\213',     '&#203;', '&Euml;',    'ц▀',    '"{E}',            '',                'Capital E, umlaut       ц▀' ],
   ['ц▄',  204, '314', '\303\214',     '&#204;', '&Igrave;',  'ц▄',    '`{I}',            '',                'Capital I, grave accent ц▄' ],
-  ['ц█',  205, '315', '\303\215',     '&#205;', '&Iacute;',  'ц█',    ''{I}',            '',                'Capital I, acute accent ц█' ],
+  ['ц█',  205, '315', '\303\215',     '&#205;', '&Iacute;',  'ц█',    %w{\'{I}},            '',                'Capital I, acute accent ц█' ],
   ['ц▌',  206, '316', '\303\216',     '&#206;', '&Icirc;',   'ц▌',    '^{I}',            '',                'Capital I, circumflex accent ц▌' ],
   ['ц▐',  207, '317', '\303\217',     '&#207;', '&Iuml;',    'ц▐',    '"{I}',            '',                'Capital I, umlaut       ц▐' ],
   ['ц░',  208, '320', '\303\220',     '&#208;', '&ETH;',     'ц░',    '',                '',                'Capital eth, Icelandic   ' ],
   ['ц▒',  209, '321', '\303\221',     '&#209;', '&Ntilde;',  'ц▒',    '',                '',                'Capital N, tilde        ц▒' ],
   ['ц▓',  210, '322', '\303\222',     '&#210;', '&Ograve;',  'ц▓',    '`{O}',            '',                'Capital O, grave accent ц▓' ],
-  ['ц⌠',  211, '323', '\303\223',     '&#211;', '&Oacute;',  'ц⌠',    ''{O}',            '',                'Capital O, acute accent ц⌠' ],
+  ['ц⌠',  211, '323', '\303\223',     '&#211;', '&Oacute;',  'ц⌠',    %w{\'{O}},            '',                'Capital O, acute accent ц⌠' ],
   ['ц■',  212, '324', '\303\224',     '&#212;', '&Ocirc;',   'ц■',    '^{O}',            '',                'Capital O, circumflex accent ц■' ],
   ['ц∙',  213, '325', '\303\225',     '&#213;', '&Otilde;',  'ц∙',    '~{O}',            '',                'Capital O, tilde        ц∙' ],
   ['ц√',  214, '326', '\303\226',     '&#214;', '&Ouml;',    'ц√',    '"{O}',            '',                'Capital O, umlaut       ц√' ],
@@ -354,7 +354,7 @@ module SiSU_character_encode
   ['ц╙',  234, '352', '\303\252',     '&#234;', '&ecirc;',   'ц╙',    '\^{e}',           '',                'Small e, circumflex accent   ц╙' ],
   ['ц╚',  235, '353', '\303\253',     '&#235;', '&euml;',    'ц╚',    '\"{e}',           '',                'Small e, umlaut         ц╚' ],
   ['ц╛',  236, '354', '\303\254',     '&#236;', '&igrave;',  'ц╛',    '\`{i}',           '',                'Small i, grave accent   ц╛' ],
-  ['ц╜',  237, '355', '\303\255',     '&#237;', '&iacute;',  'ц╜',    '\'{i}',           '',                'Small i, acute accent   ц╜' ],
+  ['ц╜',  237, '355', '\303\255',     '&#237;', '&iacute;',  'ц╜',    %w{\'{i}},           '',                'Small i, acute accent   ц╜' ],
   ['ц╝',  238, '356', '\303\256',     '&#238;', '&icirc;',   'ц╝',    '\^{i}',           '',                'Small i, circumflex accent   ц╝' ],
   ['ц╞',  239, '357', '\303\257',     '&#239;', '&iuml;',    'ц╞',    '\"{i}',           '',                'Small i, umlaut         ц╞' ],
   ['ц╟',  240, '360', '\303\260',     '&#240;', '&eth;',     'ц╟',    '',                '',                'Small eth, Icelandic    ц╟' ],
@@ -372,9 +372,7 @@ module SiSU_character_encode
   ['ц╪',  252, '374', '\303\274',     '&#252;', '&uuml;',    'ц╪',    '\"{u}',           '',                'Small u, umlaut         ц╪' ],
   ['ц╫',  253, '375', '\303\275',     '&#253;', '&yacute;',  'ц╫',    '',                '',                'Small y, acute accent   ц╫' ],
   ['ц╬',  254, '376', '\303\276',     '&#254;', '&thorn;',   'ц╬',    '',                '',                'Small thorn, Icelandic  ц╬' ],
-  ['ц©',  255, '377', '\303\277',     '&#255;', '&yuml;',    'ц©',    '',                '',                'Smally y, umlaut        ц©' ],
-  ['Б┬²',     ,    '',         '',    '&#8733;', '&prop;',    'Б┬²',    '',                '',                'proportional to  U+221D (8733) Б┬²' ],
-  ['Б┬·',     ,    '',         '',    '&#8734;', '&infin;',   'Б┬·',    '',                '',                'infinity  U+221E (8734) Б┬·' ],
+  ['ц©',  255, '377', '\303\277',     '&#255;', '&yuml;',    'ц©',    '',                '',                '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]}")
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin