wtex 0.1.1 → 0.1.2

data/lib/wtex.rb

@@ -240,6 +240,7 @@ _eos
     body = convert_ruby      body
     body = convert_strong    body
     body = convert_underline body
+    body = convert_combined  body
     body = escape_specials   body
   end
 
@@ -267,6 +268,11 @@ _eos
     body
   end
 
+  def convert_combined(body)
+    body.gsub!(/[!！\?？]{2,}/u) { '\\WTcombined{' + $&.gsub(/！/, '!').gsub(/？/, '?') + '}' }
+    body
+  end
+
   def escape_specials(body)
     body.gsub!(/[#{Characters::SPECIAL}]/) { Characters::SPECIAL_MAP[$&] }
     body

data/skel/tmpl.tex.report

@@ -14,14 +14,13 @@
 \vfuzz 10pt
 
 %%% custom commands
-\newcommand{\WTunderline}[1]
-{
-  \underline{#1}
-}
+\newcommand{\WTunderline}[1] {\underline{#1}}
+
+\newcommand{\WTcombined}[1] {#1}
 
 \newcommand{\WTseparator}[0]
 {
-  \begin{center}\subsection*{◆◇◆}\end{center}
+  \subsection*{\centering{◆◇◆}}
 }
 
 %%% custom environments

data/skel/tmpl.tex.tbook

@@ -18,14 +18,13 @@
 \vfuzz 10pt
 
 %%% custom commands
-\newcommand{\WTunderline}[1]
-{
-  \bou{#1}
-}
+\newcommand{\WTunderline}[1] {\bou{#1}}
+
+\newcommand{\WTcombined}[1] {\rensuji{#1}}
 
 \newcommand{\WTseparator}[0]
 {
-  \begin{center}\subsection*{◆◇◆}\end{center}
+  \subsection*{\centering{◆◇◆}}
 }
 
 %%% custom environments

data/t/test_wtex_inline.rb

@@ -146,4 +146,68 @@ class TC_WTeX_Inline < Test::Unit::TestCase
     )
   end
 
+  def test_tex_combined_basic
+    assert_equal(
+      "foo\\WTcombined{!!}\n",
+      @wt.tex('foo!!'),
+      "WTeX#tex should combine multiple '!' characters"
+    )
+    assert_equal(
+      "foo\\WTcombined{!!}\n",
+      @wt.tex('foo！！'),
+      "WTeX#tex should combine multiple '!' characters"
+    )
+
+    assert_equal(
+      "foo\\WTcombined{?!}\n",
+      @wt.tex('foo?!'),
+      "WTeX#tex should combine '?' and '!'"
+    )
+    assert_equal(
+      "foo\\WTcombined{?!}\n",
+      @wt.tex('foo？！'),
+      "WTeX#tex should combine '?' and '!'"
+    )
+
+    assert_equal(
+      "foo\\WTcombined{?!}bar\\WTcombined{!!}\n",
+      @wt.tex('foo？！bar!!'),
+      "WTeX#tex should combine '?' and '!'"
+    )
+  end
+
+  def test_tex_combined_irregular
+    assert_equal(
+      "foo!\n",
+      @wt.tex('foo!'),
+      "WTeX#tex should leave single '!' character"
+    )
+    assert_equal(
+      "foo！\n",
+      @wt.tex('foo！'),
+      "WTeX#tex should leave single '!' character"
+    )
+    assert_equal(
+      "foo?\n",
+      @wt.tex('foo?'),
+      "WTeX#tex should leave single '?' character"
+    )
+    assert_equal(
+      "foo？\n",
+      @wt.tex('foo？'),
+      "WTeX#tex should leave single '?' character"
+    )
+
+    assert_equal(
+      "foo\\WTcombined{!!!}\n",
+      @wt.tex('foo！！！'),
+      'WTeX#tex should deal with more than two characters'
+    )
+    assert_equal(
+      "foo\\WTcombined{?!!}\n",
+      @wt.tex('foo？！！'),
+      'WTeX#tex should deal with more than two characters'
+    )
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Akira FUNAI
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +09:00
+date: 2011-03-26 00:00:00 +09:00
 default_executable: wikitex
 dependencies: 
 - !ruby/object:Gem::Dependency