schinese-punc && bug fixed

Author: Seng-Jik

src/atlas_generator.rs

@@ -48,8 +48,8 @@ impl AtlasGenerator {
         }
     }
 
-    fn next_line(&mut self) -> bool {
-        if self.y + self.current_height < self.page.height {            
+    fn next_line(&mut self, character_height: usize) -> bool {
+        if self.y + self.current_height + character_height < self.page.height {            
             self.y += self.current_height;
             self.current_height = 0;
             self.x = 0;
@@ -80,8 +80,13 @@ impl AtlasGenerator {
             panic!("Page size is too small!");
         }
 
+        if self.y + height >= self.page.height {
+            self.save_current_page();
+            self.next_page();
+        }
+
         if self.x + width >= self.page.width {
-            if !self.next_line() {
+            if !self.next_line(height) {
                 self.save_current_page();
                 self.next_page();
             }

src/charset.rs

@@ -2,6 +2,7 @@ use std::{collections::BTreeSet, path::PathBuf, str::FromStr};
 
 pub struct CharsetRequest {
     pub ascii: bool,
+    pub schinese_punc: bool,
     pub schinese1: bool,
     pub schinese2: bool,
     pub schinese3: bool,
@@ -16,6 +17,10 @@ impl CharsetRequest {
             x.ascii = false;
         }
 
+        if arg.is_present("schinese-punc") {
+            x.schinese_punc = true;
+        }
+
         if arg.is_present("schinese1") {
             x.schinese1 = true;
         }
@@ -44,6 +49,7 @@ impl CharsetRequest {
     pub fn new() -> Self {
         Self {
             ascii: true,
+            schinese_punc: false,
             schinese1: false,
             schinese2: false,
             schinese3: false,
@@ -58,6 +64,10 @@ impl CharsetRequest {
             s.push_str(include_str!("./charset/ascii.txt"));
         }
 
+        if self.schinese_punc {
+            s.push_str(include_str!("./charset/schinese-punctuation.txt"));
+        }
+
         if self.schinese1 {
             s.push_str(include_str!("./charset/common-standard-chinese-characters-table/level-1.txt"));
         }

src/charset/schinese-punctuation.txt

@@ -0,0 +1,21 @@
+，
+。
+？
+《
+》
+：
+；
+‘
+’
+“
+”
+【
+】
+、
+·
+！
+￥
+…
+（
+）
+—

src/main.rs

@@ -83,6 +83,10 @@ fn main() {
                     .long("no-ascii")
                     .multiple(false)
                     .help("Do not generate ascii charset"))
+                .arg(Arg::with_name("schinese-punc")
+                    .long("schinese-punc")
+                    .multiple(false)
+                    .help("Generate punctuations for schinese"))
                 .arg(Arg::with_name("schinese1")
                     .long("schinese-1")
                     .multiple(false)