SHIBATA Hiroshi
null****@okkez*****
2014年 2月 28日 (金) 19:00:09 JST
SHIBATA Hiroshi 2014-02-28 19:00:09 +0900 (Fri, 28 Feb 2014) New Revision: 7ae194b824c818c4f5619d132a5103d0f9868f61 https://github.com/hiki/hiki/commit/7ae194b824c818c4f5619d132a5103d0f9868f61 Message: remove trailing white space Modified files: debian/install.rb hiki/filter/bayes_filter.rb hiki/filter/bayes_filter/bayes.rb misc/plugin/amazon.rb misc/plugin/attach.rb misc/plugin/de/attach.rb misc/plugin/en/amazon.rb misc/plugin/highlight.rb misc/plugin/similarity.rb plugin/01sp.rb plugin/02help.rb plugin/50bayes_filter.rb plugin/50word_filter.rb plugin/de/00default.rb plugin/en/00default.rb plugin/en/50bayes_filter.rb plugin/en/50word_filter.rb plugin/ja/50bayes_filter.rb plugin/ja/50word_filter.rb spec/spec_50bayes_filter.rb spec/spec_bayes_filter.rb spec/spec_filter.rb style/default/parser.rb style/math/html_formatter.rb style/math/latex.rb style/rd+/anchorlist.rb style/rd+/parser.rb style/rd+/rd2html.rb test/hikifarm_test.rb test/ptstore_test.rb tool/convert.rb Modified: debian/install.rb (+1 -1) =================================================================== --- debian/install.rb 2014-02-28 16:53:35 +0900 (bba2089) +++ debian/install.rb 2014-02-28 19:00:09 +0900 (a59c2b1) @@ -23,7 +23,7 @@ begin puts "install succeed!" -rescue +rescue puts "install failed!" puts $! end Modified: hiki/filter/bayes_filter.rb (+1 -1) =================================================================== --- hiki/filter/bayes_filter.rb 2014-02-28 16:53:35 +0900 (1efe36a) +++ hiki/filter/bayes_filter.rb 2014-02-28 19:00:09 +0900 (02bf44d) @@ -1,5 +1,5 @@ # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. require "fileutils" require "hiki/filter/bayes_filter/bayes.rb" Modified: hiki/filter/bayes_filter/bayes.rb (+1 -1) =================================================================== --- hiki/filter/bayes_filter/bayes.rb 2014-02-28 16:53:35 +0900 (0532d08) +++ hiki/filter/bayes_filter/bayes.rb 2014-02-28 19:00:09 +0900 (4bf3e4a) @@ -1,6 +1,6 @@ # coding: ASCII-8BIT # Copyright (C) 2007, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. require "pstore" Modified: misc/plugin/amazon.rb (+1 -1) =================================================================== --- misc/plugin/amazon.rb 2014-02-28 16:53:35 +0900 (a56e474) +++ misc/plugin/amazon.rb 2014-02-28 19:00:09 +0900 (651b0fe) @@ -93,7 +93,7 @@ def amazon_image( item ) image = {} begin size = case @conf['amazon.imgsize'] - when 0; 'Large' + when 0; 'Large' when 2; 'Small' else; 'Medium' end Modified: misc/plugin/attach.rb (+1 -1) =================================================================== --- misc/plugin/attach.rb 2014-02-28 16:53:35 +0900 (bfa1686) +++ misc/plugin/attach.rb 2014-02-28 19:00:09 +0900 (c8e96cb) @@ -197,7 +197,7 @@ def attach_show_page_files_checkbox s << %Q!<form method="post" enctype="multipart/form-data" action="#{attach_cgi}"> <input type="hidden" name="p" value="#{h(@page)}"> <input type="hidden" name="command" value="#{@command == 'create' ? 'edit' : @command}"> - <p>#{attach_files_label}: + <p>#{attach_files_label}: ! files.each do |file_name| f = unescape(file_name) Modified: misc/plugin/de/attach.rb (+1 -1) =================================================================== --- misc/plugin/de/attach.rb 2014-02-28 16:53:35 +0900 (4833894) +++ misc/plugin/de/attach.rb 2014-02-28 19:00:09 +0900 (99ef070) @@ -15,7 +15,7 @@ end def plugin_usage_label attach_usage -end +end def attach_usage '<div><ul> Modified: misc/plugin/en/amazon.rb (+2 -2) =================================================================== --- misc/plugin/en/amazon.rb 2014-02-28 16:53:35 +0900 (8062c29) +++ misc/plugin/en/amazon.rb 2014-02-28 19:00:09 +0900 (abc8263) @@ -11,7 +11,7 @@ # asin: ASIN or ISBN # comment: comment (optional) # -# isbn_image_right: +# isbn_image_right: # Parameter: # asin: ASIN or ISBN # comment: comment (optional) @@ -38,7 +38,7 @@ # amazon.rb uses images on tDiary.org when this # option not specified. If you want to use your # original images, modify PNG file in amazon directory. -# @options['amazon.nodefault']: If you dosen't want to show default image +# @options['amazon.nodefault']: If you dosen't want to show default image # when the book image not found, set true. @amazon_default_country = 'us' Modified: misc/plugin/highlight.rb (+8 -8) =================================================================== --- misc/plugin/highlight.rb 2014-02-28 16:53:35 +0900 (d02b3df) +++ misc/plugin/highlight.rb 2014-02-28 19:00:09 +0900 (0fb2c62) @@ -22,10 +22,10 @@ add_footer_proc do var highlightStyle = new Object(); highlightStyle.color = "#{h(@options['highlight.color'])}"; highlightStyle.backgroundColor = "#{h(@options['highlight.background'])}"; - + var highlightElem = null; var saveStyle = null; - + function highlightElement(name) { if (highlightElem) { for (var key in saveStyle) { @@ -33,17 +33,17 @@ add_footer_proc do } highlightElem = null; } - + highlightElem = getHighlightElement(name); if (!highlightElem) return; - + saveStyle = new Object(); for (var key in highlightStyle) { saveStyle[key] = highlightElem.style[key]; highlightElem.style[key] = highlightStyle[key]; } } - + function getHighlightElement(name) { for (var i=0; i<document.anchors.length; ++i) { var anchor = document.anchors[i]; @@ -59,18 +59,18 @@ add_footer_proc do } return null; } - + if (document.location.hash) { highlightElement(document.location.hash.substr(1)); } - + hereURL = document.location.href.split(/\#/)[0]; for (var i=0; i<document.links.length; ++i) { if (hereURL == document.links[i].href.split(/\#/)[0]) { document.links[i].onclick = handleLinkClick; } } - + function handleLinkClick() { highlightElement(this.hash.substr(1)); } Modified: misc/plugin/similarity.rb (+2 -2) =================================================================== --- misc/plugin/similarity.rb 2014-02-28 16:53:35 +0900 (8bc0d12) +++ misc/plugin/similarity.rb 2014-02-28 19:00:09 +0900 (8dd3ad3) @@ -8,8 +8,8 @@ var url = '#{permalink}'; var n = 10; var oe = 'euc-jp'; var style = '#{style}' -document.write('<scr' + 'ipt language="JavaScript" src="http://bulkfeeds.net/app/similar.js?url=' + escape(url) -+ '&n=' + n + '&style=' + style +document.write('<scr' + 'ipt language="JavaScript" src="http://bulkfeeds.net/app/similar.js?url=' + escape(url) ++ '&n=' + n + '&style=' + style + '&oe=' + oe + '"></scr' + 'ipt>'); </script> </div> Modified: plugin/01sp.rb (+1 -1) =================================================================== --- plugin/01sp.rb 2014-02-28 16:53:35 +0900 (a5f7bb2) +++ plugin/01sp.rb 2014-02-28 19:00:09 +0900 (2522f70) @@ -106,7 +106,7 @@ def sp_list_plugins( sp_opt, with_checkbox ) r << @sp_label_please_select unless unknown.empty? then r << @sp_label_new - r << "<ul>\n" + r << "<ul>\n" r << sp_li_plugins( unknown, with_checkbox, sp_option( 'usenew' ) ) r << "</ul>\n" end Modified: plugin/02help.rb (+3 -3) =================================================================== --- plugin/02help.rb 2014-02-28 16:53:35 +0900 (9add7e2) +++ plugin/02help.rb 2014-02-28 19:00:09 +0900 (81cff33) @@ -90,7 +90,7 @@ function set_s( pre, suf, mg ){ str = str.replace(/\\r\\n|\\r|\\n/mg, "\\n"); var s = str.split("\\n"); var i; - for ( i = 0; i < s.length ; i++ ) { + for ( i = 0; i < s.length ; i++ ) { j = j + pre + s[i] + "\\n"; } break; @@ -126,7 +126,7 @@ function set_s( pre, suf, mg ){ str = str.replace( /\\r\\n|\\r/mg, "\\n" ); var s = str.split( "\\n" ); var i; - for ( i = 0; i < s.length ; i++ ) { + for ( i = 0; i < s.length ; i++ ) { j = j + pre + s[i] + "\\n"; } rng.text = j; @@ -137,7 +137,7 @@ function set_s( pre, suf, mg ){ var s = str.split( "\\n" ); var i; var re; - for ( i = 0; i < s.length ; i++ ) { + for ( i = 0; i < s.length ; i++ ) { re = new RegExp( "^" + pre ); j = j + s[i].replace( re, "" ) + "\\n"; } Modified: plugin/50bayes_filter.rb (+1 -1) =================================================================== --- plugin/50bayes_filter.rb 2014-02-28 16:53:35 +0900 (7346f1d) +++ plugin/50bayes_filter.rb 2014-02-28 19:00:09 +0900 (d39e603) @@ -1,5 +1,5 @@ # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. require "hiki/util" class BayesFilterConfig Modified: plugin/50word_filter.rb (+1 -1) =================================================================== --- plugin/50word_filter.rb 2014-02-28 16:53:35 +0900 (644e602) +++ plugin/50word_filter.rb 2014-02-28 19:00:09 +0900 (4124e53) @@ -1,5 +1,5 @@ # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. add_conf_proc("word_filter", WordFilterMessage.word_filter) do pre = "word_filter" Modified: plugin/de/00default.rb (+1 -1) =================================================================== --- plugin/de/00default.rb 2014-02-28 16:53:35 +0900 (90c135d) +++ plugin/de/00default.rb 2014-02-28 19:00:09 +0900 (acd9d5a) @@ -61,7 +61,7 @@ add_conf_proc( 'theme', 'Aussehen' ) do <p>Ordner der vorhandenen Themes.</p> <p><input name="theme_path" value="#{h(@conf.theme_path)}" size="60"></p> <h3 class="subtitle">Seitenleiste</h3> - <p>Manche Themes können die Seitenleiste nicht ordnungsgemäß darstellen. Wenn sie eines dieser Themes benutzten, den Wert auf 'Aus' setzen.</p> + <p>Manche Themes können die Seitenleiste nicht ordnungsgemäß darstellen. Wenn sie eines dieser Themes benutzten, den Wert auf 'Aus' setzen.</p> <p><select name="sidebar"> <option value="true"#{@conf.use_sidebar ? ' selected' : ''}>An</option> <option value="false"#{@conf.use_sidebar ? '' : ' selected'}>Aus</option> Modified: plugin/en/00default.rb (+1 -1) =================================================================== --- plugin/en/00default.rb 2014-02-28 16:53:35 +0900 (6d3df6a) +++ plugin/en/00default.rb 2014-02-28 19:00:09 +0900 (10ef593) @@ -61,7 +61,7 @@ add_conf_proc( 'theme', 'Appearance' ) do <p>Enter the directory where themes are located.</p> <p><input name="theme_path" value="#{h(@conf.theme_path)}" size="60"></p> <h3 class="subtitle">Sidebar</h3> - <p>Some themes cannot properly display the sidebar. If you are using one of these themes, set this value to off.</p> + <p>Some themes cannot properly display the sidebar. If you are using one of these themes, set this value to off.</p> <p><select name="sidebar"> <option value="true"#{@conf.use_sidebar ? ' selected' : ''}>On</option> <option value="false"#{@conf.use_sidebar ? '' : ' selected'}>Off</option> Modified: plugin/en/50bayes_filter.rb (+1 -1) =================================================================== --- plugin/en/50bayes_filter.rb 2014-02-28 16:53:35 +0900 (00d779b) +++ plugin/en/50bayes_filter.rb 2014-02-28 19:00:09 +0900 (bd08b98) @@ -1,5 +1,5 @@ # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. class BayesFilterConfig module Res Modified: plugin/en/50word_filter.rb (+1 -1) =================================================================== --- plugin/en/50word_filter.rb 2014-02-28 16:53:35 +0900 (901bd0b) +++ plugin/en/50word_filter.rb 2014-02-28 19:00:09 +0900 (bd82bcf) @@ -1,5 +1,5 @@ # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. module WordFilterMessage def self.word_filter; "Word filter"; end Modified: plugin/ja/50bayes_filter.rb (+1 -1) =================================================================== --- plugin/ja/50bayes_filter.rb 2014-02-28 16:53:35 +0900 (2d0409d) +++ plugin/ja/50bayes_filter.rb 2014-02-28 19:00:09 +0900 (5484ae7) @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. class BayesFilterConfig module Res Modified: plugin/ja/50word_filter.rb (+1 -1) =================================================================== --- plugin/ja/50word_filter.rb 2014-02-28 16:53:35 +0900 (f07d952) +++ plugin/ja/50word_filter.rb 2014-02-28 19:00:09 +0900 (a9266ad) @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. module WordFilterMessage def self.word_filter; "単語フィルタ"; end Modified: spec/spec_50bayes_filter.rb (+1 -1) =================================================================== --- spec/spec_50bayes_filter.rb 2014-02-28 16:53:35 +0900 (6f3385f) +++ spec/spec_50bayes_filter.rb 2014-02-28 19:00:09 +0900 (7e58ba4) @@ -1,5 +1,5 @@ # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. module Hiki class Plugin Modified: spec/spec_bayes_filter.rb (+1 -1) =================================================================== --- spec/spec_bayes_filter.rb 2014-02-28 16:53:35 +0900 (4b536d6) +++ spec/spec_bayes_filter.rb 2014-02-28 19:00:09 +0900 (11f578d) @@ -1,5 +1,5 @@ # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. require "tmpdir" require "fileutils" Modified: spec/spec_filter.rb (+1 -1) =================================================================== --- spec/spec_filter.rb 2014-02-28 16:53:35 +0900 (b20bf41) +++ spec/spec_filter.rb 2014-02-28 19:00:09 +0900 (da0e1b1) @@ -1,5 +1,5 @@ # Copyright (C) 2008, KURODA Hiraku <hirak****@hinet*****> -# You can redistribute it and/or modify it under GPL2. +# You can redistribute it and/or modify it under GPL2. require "tmpdir" require "fileutils" Modified: style/default/parser.rb (+1 -1) =================================================================== --- style/default/parser.rb 2014-02-28 16:53:35 +0900 (2f71cdc) +++ style/default/parser.rb 2014-02-28 19:00:09 +0900 (6f1be97) @@ -19,7 +19,7 @@ module Hiki str.split(/\n/).collect{|s| %Q|""#{s}\n|}.join end end - + def initialize( conf ) @use_wiki_name = conf.use_wikiname end Modified: style/math/html_formatter.rb (+1 -1) =================================================================== --- style/math/html_formatter.rb 2014-02-28 16:53:35 +0900 (a045ecf) +++ style/math/html_formatter.rb 2014-02-28 19:00:09 +0900 (5de7c3d) @@ -20,7 +20,7 @@ module Hiki math.text_mode(unescape_html($1) ) end str.gsub!( /(^\$\$.*\n?)+/ ) do |match| - '<div class="displaymath">%s</div>' % + '<div class="displaymath">%s</div>' % math.display_mode( unescape_html(match).gsub( /^\$\$/, '' ) ) end end Modified: style/math/latex.rb (+1 -1) =================================================================== --- style/math/latex.rb 2014-02-28 16:53:35 +0900 (001f806) +++ style/math/latex.rb 2014-02-28 19:00:09 +0900 (3405852) @@ -62,7 +62,7 @@ module Hiki f.puts("cd #{@image_path} && #{run}") } if @log raise unless system("cd #{@image_path} && #{run} #{log}") end - + %w( tex aux log dvi ps err ).each do |ext| next if ext == "err" and @log gabage = "#{@image_path}/#{filename}.#{ext}" Modified: style/rd+/anchorlist.rb (+5 -5) =================================================================== --- style/rd+/anchorlist.rb 2014-02-28 16:53:35 +0900 (1105dcf) +++ style/rd+/anchorlist.rb 2014-02-28 19:00:09 +0900 (48ee29a) @@ -40,7 +40,7 @@ module Hiki else name, data = nil, word end - + option = nil if data =~ REG_URL key = data @@ -51,7 +51,7 @@ module Hiki end [key, option, name] end - + def convert_charset(option, charset) return "" unless option return option unless charset @@ -64,7 +64,7 @@ module Hiki end ret end - + def data(key) data = @anchors[key] if data @@ -73,7 +73,7 @@ module Hiki [nil, nil, nil] end end - + def create_anchor(key, option_or_name = nil, name = nil, charset = nil) url, value, cset = data(key) if url.nil? @@ -84,7 +84,7 @@ module Hiki charset = cset unless charset option_or_name = "#{option_or_name}" if option_or_name value = "#{key}:#{option_or_name}" if value == "" - + if url.nil? url = key if name Modified: style/rd+/parser.rb (+1 -1) =================================================================== --- style/rd+/parser.rb 2014-02-28 16:53:35 +0900 (3181e11) +++ style/rd+/parser.rb 2014-02-28 19:00:09 +0900 (6cbffde) @@ -26,7 +26,7 @@ module Hiki str # RD does not support blockquote. end end - + def initialize( conf ) end Modified: style/rd+/rd2html.rb (+2 -2) =================================================================== --- style/rd+/rd2html.rb 2014-02-28 16:53:35 +0900 (3a7856e) +++ style/rd+/rd2html.rb 2014-02-28 19:00:09 +0900 (60b0926) @@ -92,7 +92,7 @@ module Hiki err += v + "\n" break if v =~ /special_parse/ end - err += "</pre>" + err += "</pre>" end ret = err end @@ -283,5 +283,5 @@ module Hiki super(element) end end -end +end Modified: test/hikifarm_test.rb (+1 -1) =================================================================== --- test/hikifarm_test.rb 2014-02-28 16:53:35 +0900 (8d8ef39) +++ test/hikifarm_test.rb 2014-02-28 19:00:09 +0900 (b9bffa4) @@ -13,7 +13,7 @@ class Wiki_Unit_Tests < Test::Unit::TestCase @now = Time.now end File.open("#{@data_root}/#{name}/hiki.conf", 'w'){|f| f.puts '@site_name = "FooBar"'} - + @wiki = Wiki.new(name, @data_root) end Modified: test/ptstore_test.rb (+1 -1) =================================================================== --- test/ptstore_test.rb 2014-02-28 16:53:35 +0900 (5205bb8) +++ test/ptstore_test.rb 2014-02-28 19:00:09 +0900 (e5abb63) @@ -27,7 +27,7 @@ class PTStore_Unit_Tests < Test::Unit::TestCase assert(roots.include?(n)) end end - + def test_settter_and_getter 10.times do @db.transaction do Modified: tool/convert.rb (+1 -1) =================================================================== --- tool/convert.rb 2014-02-28 16:53:35 +0900 (9fdd469) +++ tool/convert.rb 2014-02-28 19:00:09 +0900 (6b24bd2) @@ -65,7 +65,7 @@ def convert(data_path, database_class, input_encoding, output_encoding, nkf) old_page = page.force_encoding(input_encoding) new_page = encode(old_page, input_encoding, output_encoding, nkf) print "#{new_page}: #{Hiki::Util.escape(old_page)} => #{Hiki::Util.escape(new_page)}" - convert_attachments(data_path, old_page, new_page, input_encoding, + convert_attachments(data_path, old_page, new_page, input_encoding, output_encoding, nkf) old_text = db.load(old_page) new_text = encode(old_text, input_encoding, output_encoding, nkf)
