@kobalab/liulian 1.1.3 → 1.1.5

package/ChangeLog.md

@@ -1,3 +1,12 @@
+### v1.1.5 / 2022-10-25
+
+ - #8 整形済みテキスト内などで不必要な行連結を行なっているバグを修正
+ - 脆弱性警告に対応(minimatch 3.0.4 → 3.1.2)
+
+### v1.1.4 / 2022-09-11
+
+ - size モジュールをブロックでも使えるよう修正
+
 ### v1.1.3 / 2022-07-18
 
  - 脆弱性警告に対処(passport 0.4.1 → 0.6.0)

package/lib/module/core.js

@@ -30,7 +30,7 @@ module.exports = class Core {
         this._req    = parser._r._req;
         this._inline = ['img','color','size','br','clear','class','lang'];
         this._block  = ['title','contents','nav','footnote','include','img',
-                        'clear','class','style','icon','lang','redirect',
+                        'size','clear','class','style','icon','lang','redirect',
                         'script'];
         this._np     = ['style','script'];
     }
@@ -189,7 +189,11 @@ module.exports = class Core {
     }
 
     size(type, param, value) {
-        return `<span style="font-size:${cdata(param)}">${value}</span>`;
+        if (type == '#')
+            return `<div style="font-size:${cdata(param)}">\n`
+                                                    + `${value}</div>\n\n`;
+        else
+            return `<span style="font-size:${cdata(param)}">${value}</span>`;
     }
 
     br(type, param) {

package/lib/text/liulian.js

@@ -28,10 +28,7 @@ class LiuLian {
     insertText(text, head) {
         let lines = [];
         for (let line of text.replace(/\r?\n$/,'').split(/\r?\n/)) {
-            if (lines.length && lines[lines.length - 1].substr(-1) == '\\')
-                    lines[lines.length - 1]
-                            = lines[lines.length - 1].replace(/\\$/,'') + line;
-            else    lines.push(line);
+            lines.push(line);
         }
         if (head) this._lines = lines.concat(this._lines);
         else      this._lines = this._lines.concat(lines);
@@ -50,8 +47,27 @@ class LiuLian {
         }
     }
 
-    readline() { return ! this.eod && this._lines.shift() }
-    nextline() { return ! this.eod && this._lines[0]      }
+    nextline(npb) {
+        if (this.eod) return;
+        if (npb) return this._lines[0];
+        let line = '';
+        for (let l of this._lines) {
+            line += l;
+            if (line.substr(-1) != '\\') break;
+            line = line.replace(/\\$/,'');
+        }
+        return line;
+    }
+    readline(npb) {
+        if (this.eod) return;
+        if (npb) return this._lines.shift();
+        let line = this._lines.shift();
+        while (line.substr(-1) == '\\') {
+            line = line.replace(/\\$/,'');
+            line += this._lines.shift();
+        }
+        return line;
+    }
 
     get(key) { return this._[key] }
     noteref(note) {
@@ -73,7 +89,7 @@ class LiuLian {
         this.eod = eod;
         let text = '';
         while (! this.eod) {
-            let line = this.readline();
+            let line = this.readline(1);
             text += line + '\n';
         }
         this.reset(eod);
@@ -292,9 +308,9 @@ class LiuLian {
     pre() {
         let html = '<pre>';
         for (;;) {
-            html += cdata(this.readline().replace(/^\ /,'')) + '\n';
+            html += cdata(this.readline(1).replace(/^\ /,'')) + '\n';
 
-            let line = this.nextline();
+            let line = this.nextline(1);
             if (! line || ! line.match(/^\s/)) break;
         }
         return html.replace(/\n$/,'') + '</pre>\n\n';
@@ -328,7 +344,7 @@ class LiuLian {
         this.readline();
         let html = '<pre>';
         while (! this.eod) {
-            let line = this.readline();
+            let line = this.readline(1);
             if (line == '||<') break;
             html += this.inline(line) + '\n';
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kobalab/liulian",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Node.jsで動作するWebサイト作成ツール",
   "publishConfig": {
     "access": "public"