ansi-sys 0.7.0 → 0.7.1

data/ChangeLog

@@ -1,3 +1,8 @@
+* 2007-11-16 zunda <zunda at freeshell.org>
+- (0.7.1)
+- lib/ansisys.rb: modified not to put wide-characters beyond right edge
+- spec/character_screen_spec.rb: added a spec
+
 * 2007-11-14 zunda <zunda at freeshell.org>
 - (0.7.0)
 - bin/ansi-to-html: added

data/lib/ansisys.rb

@@ -12,7 +12,7 @@ module AnsiSys
 	module VERSION	#:nodoc:
 		MAJOR = 0
 		MINOR = 7
-		TINY = 0
+		TINY = 1
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end
@@ -101,6 +101,7 @@ module AnsiSys
 		def echo_on(screen, cursor)
 			each_char do |c|
 				w = width(c)
+				cursor.fit!(w)
 				screen.write(c, w, cursor.cur_col, cursor.cur_row, @sgr.dup)
 				cursor.advance!(w)
 			end
@@ -194,13 +195,29 @@ module AnsiSys
 			r = nil
 			@cur_col += width
 			if @cur_col > @max_col
+				line_feed!
+				r = "\n"
+			end
+			return r
+		end
+
+		# check if a character with _width_ fits within the maximum columns,
+		# feed a line if not
+		def fit!(width = 1)
+			r = nil
+			if @cur_col + width > @max_col + 1
+				line_feed!
 				r = "\n"
-				@cur_col = 1
-				@cur_row += 1
 			end
 			return r
 		end
 
+		# feed a line
+		def line_feed!
+			@cur_col = 1
+			@cur_row += 1
+			@max_row = @cur_row if @max_row and @cur_row > @max_row
+		end
 	end
 
 	# Select Graphic Rendition

data/spec/character_screen_spec.rb

@@ -30,3 +30,21 @@ _SCREEN
 	end
 end
 
+describe "Wide-characters echoed on right edge of a Screen" do
+	before do
+		$KCODE = 'u'
+		@string = "\346\227\245\346\234\254\350\252\236"	# `Nihongo' in UTF-8
+		@char = Characters.new(@string, SGR.new)
+		@screen = Screen.new(Screen.default_css_colors, 3)
+		@cursor = Cursor.new(1, 1, 3)
+		@char.echo_on(@screen, @cursor)
+	end
+
+	it "should fit in the width" do
+		@screen.render(:text).should == <<_SCREEN.chomp
+\346\227\245
+\346\234\254
+\350\252\236
+_SCREEN
+	end
+end

data/website/index.html

@@ -33,12 +33,9 @@
     <h1>Ruby-ANSI.SYS</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ansi-sys"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/ansi-sys" class="numbers">0.3.0</a>
+      <a href="http://rubyforge.org/projects/ansi-sys" class="numbers">0.7.1</a>
     </div>
-    <h1>&#x2192; &#8216;ansi-sys&#8217;</h1>
-
-
-	<h2>What</h2>
+    <h2>What</h2>
 
 
 	<p>MS-DOS console (with <code>DEVICE=ANSI.SYS</code>), Linux
@@ -85,9 +82,12 @@ misc/plugin directory and configure Hiki to enable the plugin.</p>
 	<p>As a Ruby library:</p>
 
 
-<pre>terminal = Terminal.new
+<pre>
+require 'ansisys'
+terminal = AnsiSys::Terminal.new
 terminal.echo("ansi-escaped-text")
-terminal.render #=&gt; HTML fragment</pre>
+terminal.render #=&gt; HTML fragment
+</pre>
 
 	<p>As a Hiki plugin:</p>
 
@@ -110,7 +110,7 @@ terminal.render #=&gt; HTML fragment</pre>
 	<p>Please refer
 <a href="rdoc/files/License_txt.html">License.txt</a></p>
     <p class="coda">
-      zunda, 23rd October 2007<br>
+      zunda, 3rd November 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ansi-sys
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2007-11-14 00:00:00 -10:00
+  version: 0.7.1
+date: 2007-11-16 00:00:00 -10:00
 summary: Ruby-ANSI.SYS is a library to render texts with ANSI escape sequences.
 require_paths: 
 - lib