narou 1.2.4 → 1.2.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ef2417895cd9b2a56ca5744e07f4d27c44585b8
-  data.tar.gz: ecfffc91bf3e5606e56cf94def0e14530906a6e4
+  metadata.gz: 266a11176fef34d114288376d46c72adfb49bd85
+  data.tar.gz: 6ce1270a7e4160d6f4f944bf0b646d53c1cc473b
 SHA512:
-  metadata.gz: 5eb6d0461a5ca6de23c44c174db83d22b667bb296830f7a988d62cf487ededcb22ce4223c9e38720d3ac8339da250d53219a9170dc562e78c49c7c159e17c125
-  data.tar.gz: 9444d31ebacb2df674d59bc7aab3a3de1249063f35d24c24946e972653d6f5bd96ed501a4ee94e7574ce0064271a12e3e6a18b0c5c8928ca421fbb3ba0d45111
+  metadata.gz: c38d8bb4cb167d25350c0f636cf3c70ae1a372f1730c17927a59ec7ad1ebbbf1c34b5adf12f891ede12c2eb728f49ca0263e6e1bf688ea47028a67933463a36d
+  data.tar.gz: 6f8c254231614907a670e12333a9046fd49b88f3dc732015b2d68f1f9d3a1ded5d6eda21f2d2863d819e4ca2c5e640ede30deb309ce64b05f8d5ac96c98ba56a

data/lib/command/diff.rb

@@ -40,6 +40,7 @@ module Command
     #            %OLD : 古い方の差分用ファイルパス
     narou setting difftool.arg='-e -x -ub -dl "NEW" -dr "OLD" %NEW %OLD'
 
+  Options:
       EOS
 
       @options["number"] = 1

data/lib/converterbase.rb

@@ -243,7 +243,7 @@ class ConverterBase
     data.gsub!(/([!?！？]+)([^!?！？])/) do
       m1, m2 = $1, $2
       m2 = "　" if m2 == " "
-      if m2 =~ /[^」］』】〉》〕＞>≫)）"”’〟　☆★♪［―]/
+      if m2 =~ /[^」］\]』】〉》〕＞>≫)）"”’〟　☆★♪［―]/
         "#{m1}　#{m2}"
       else
         "#{m1}#{m2}"
@@ -291,8 +291,8 @@ class ConverterBase
     data.gsub!(/'([^'\n]+)'/, "〝\\1〟")   # MEMO: シングルミュート(ノノカギ)を表示出来るフォントはほとんど無い
     data.gsub!("≪", "※［＃始め二重山括弧］")
     data.gsub!("≫", "※［＃終わり二重山括弧］")
-    data.tr!("-=+/*《》'\"%$#&!?､<>＜＞()|‐,._;:",
-             "－＝＋／＊≪≫’”％＄＃＆！？、〈〉〈〉（）｜－，．＿；：")
+    data.tr!("-=+/*《》'\"%$#&!?､<>＜＞()|‐,._;:[]",
+             "－＝＋／＊≪≫’”％＄＃＆！？、〈〉〈〉（）｜－，．＿；：［］")
     data.gsub!("\\", "￥")
   end
 
@@ -753,10 +753,11 @@ class ConverterBase
     when object_of_ruby?(last_char)
       # なろうのルビ対象文字を辿って｜を挿入する（青空文庫となろうのルビ仕様の差異吸収のため）
       m1.gsub(/([#{CHARACTER_OF_RUBY}　]+)$/) {
-        if $1[0] == "　"
-          "　［＃ルビ用縦線］#{$1[1..-1]}"
+        match_target = $1
+        if match_target =~ /^(　+)/
+          "#{$1}［＃ルビ用縦線］#{match_target[$1.length..-1]}"
         else
-          "［＃ルビ用縦線］#{$1}"
+          "［＃ルビ用縦線］#{match_target}"
         end
       } + "《#{m2}》"
     else

data/lib/novelconverter.rb

@@ -132,6 +132,8 @@ class NovelConverter
     stdout_capture = res[0]
     if Helper.os_windows?
       stdout_capture = stdout_capture.force_encoding(Encoding::Shift_JIS).encode(Encoding::UTF_8)
+    else
+      stdout_capture.force_encoding(Encoding::UTF_8)
     end
 
     Dir.chdir(pwd)

data/lib/novelsetting.rb

@@ -208,12 +208,12 @@ class NovelSetting
     },
     {
       name: "enable_convert_page_break",
-      value: true,
+      value: false,
       help: "`to_page_break_threshold` で設定した個数以上連続する空行を改ページに変換する"
     },
     {
       name: "to_page_break_threshold",
-      value: 8,
+      value: 10,
       help: "ここで設定した値が `enable_convert_page_break` に反映される"
     },
   ]

data/lib/template.rb

@@ -25,7 +25,11 @@ class Template
       return if File.exists?(dest_filepath)
     end
     result = get(src_filename, _binding) or return nil
-    File.write(dest_filepath, result)
+    if Helper.os_windows?
+      File.write(dest_filepath, result)
+    else
+      File.binwrite(dest_filepath, result)
+    end
   end
 
   #

data/lib/version.rb

@@ -3,7 +3,7 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
-Version = "1.2.4"
+Version = "1.2.5.rc1"
 
 cv_path = File.expand_path(File.join(File.dirname(__FILE__), "../commitversion"))
 if File.exists?(cv_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narou
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5.rc1
 platform: ruby
 authors:
 - whiteleaf7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolor
@@ -137,9 +137,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.0