Fixed wrong formatting of unicode separators

4 files changed, 34 insertions, 6 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 9861c51..180ded1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,3 +26,4 @@ unicode-width = "^0.1"
 term = "^0.4"

 lazy_static = "^0.2"

 atty = "^0.1"

+encode_unicode = "^0.2"

diff --git a/examples/formatting.rs b/examples/formatting.rs
index 946d326..1ea0e18 100644
--- a/examples/formatting.rs
+++ b/examples/formatting.rs
@@ -63,4 +63,26 @@ fn main() {
             .build()

     );

     table.printstd();

+

+    // Customized format with unicode

+    // Example to print

+    // ┌─────────────┬────────────┐

+    // | Title 1     | Title 2    |

+    // ├─────────────┼────────────┤

+    // | Value 1     | Value 2    |

+    // ├─────────────┼────────────┤

+    // | Value three | Value four |

+    // └─────────────┴────────────┘

+    println!("With unicode:");

+    table.set_format(

+        format::FormatBuilder::new()

+            .column_separator('|')

+            .borders('|')

+            .separators( &[format::LinePosition::Top],    format::LineSeparator::new('─', '┬', '┌', '┐'))

+            .separators( &[format::LinePosition::Intern], format::LineSeparator::new('─', '┼', '├', '┤'))

+            .separators( &[format::LinePosition::Bottom], format::LineSeparator::new('─', '┴', '└', '┘'))

+            .padding(1, 1)

+            .build()

+    );

+    table.printstd();

 }

diff --git a/src/format.rs b/src/format.rs
index d0d816e..49e1a96 100644
--- a/src/format.rs
+++ b/src/format.rs
@@ -1,6 +1,8 @@
 //! Define table formatting utilities

 

-use std::io::{Write, Error};

+use std::io::{Write, Error};
+
+use encode_unicode::Utf8Char;
 

 use super::utils::NEWLINE;

 

@@ -53,17 +55,19 @@ impl LineSeparator {
 	/// Print a full line separator to `out`. `col_width` is a slice containing the width of each column

 	pub fn print<T: Write+?Sized>(&self, out: &mut T, col_width: &[usize], colsep: bool, lborder: bool, rborder: bool) -> Result<(), Error> {

 		if lborder {

-			try!(out.write_all(&[self.ljunc as u8]));

+			try!(out.write_all(Utf8Char::from(self.ljunc).as_bytes()));

 		}

 		let mut iter = col_width.into_iter().peekable();

 		while let Some(width) = iter.next() {

-			try!(out.write_all(&vec![self.line as u8; width+2]));

+			for _ in 0..width+2 {

+				try!(out.write_all(Utf8Char::from(self.line).as_bytes()));

+			}

 			if colsep && iter.peek().is_some() {

-				try!(out.write_all(&[self.junc as u8]));

+				try!(out.write_all(Utf8Char::from(self.junc).as_bytes()));

 			}

 		}

 		if rborder {

-			try!(out.write_all(&[self.rjunc as u8]));

+			try!(out.write_all(Utf8Char::from(self.rjunc).as_bytes()));

 		}

 		out.write_all(NEWLINE)

 	}

@@ -185,7 +189,7 @@ impl TableFormat {
 	/// Print a column separator or a table border

 	pub fn print_column_separator<T: Write+?Sized>(&self, out: &mut T, pos: ColumnPosition) -> Result<(), Error> {

 		match self.get_column_separator(pos) {

-			Some(s) => out.write_all(&[s as u8]),

+			Some(s) => out.write_all(Utf8Char::from(s).as_bytes()),

 			None => Ok(())

 		}

 	}

diff --git a/src/lib.rs b/src/lib.rs
index 2b72a4a..cf60fe3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,6 +5,7 @@ extern crate unicode_width;
 extern crate term;

 extern crate atty;

 #[macro_use] extern crate lazy_static;

+extern crate encode_unicode;

 

 use std::io;

 use std::io::{Write, Error};