Правка багов
This commit is contained in:
@@ -138,6 +138,8 @@ export default class BookParser {
|
|||||||
});
|
});
|
||||||
|
|
||||||
parser.on('textNode', (text) => {
|
parser.on('textNode', (text) => {
|
||||||
|
text = text.replace(/[\t\n\r]/g, ' ');
|
||||||
|
|
||||||
if (text != ' ' && text.trim() == '')
|
if (text != ' ' && text.trim() == '')
|
||||||
text = text.trim();
|
text = text.trim();
|
||||||
|
|
||||||
|
|||||||
@@ -225,11 +225,6 @@ class BookConverter {
|
|||||||
body.section._a[0] = pars;
|
body.section._a[0] = pars;
|
||||||
}
|
}
|
||||||
|
|
||||||
//убрать лишнее
|
|
||||||
for (let p of body.section._a[0]) {
|
|
||||||
p._t = p._t.replace(/[\t\n\r]/g, ' ');
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.formatFb2(fb2);
|
return this.formatFb2(fb2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -397,15 +392,18 @@ class BookConverter {
|
|||||||
|
|
||||||
formatFb2Node(node, name) {
|
formatFb2Node(node, name) {
|
||||||
let out = '';
|
let out = '';
|
||||||
|
|
||||||
|
const repl = (text) => text.replace(/[\t\n\r]/g, ' ');
|
||||||
|
|
||||||
if (Array.isArray(node)) {
|
if (Array.isArray(node)) {
|
||||||
for (const n of node) {
|
for (const n of node) {
|
||||||
out += this.formatFb2Node(n);
|
out += this.formatFb2Node(n);
|
||||||
}
|
}
|
||||||
} else if (typeof node == 'string') {
|
} else if (typeof node == 'string') {
|
||||||
if (name)
|
if (name)
|
||||||
out += `<${name}>${node}</${name}>`;
|
out += `<${name}>${repl(node)}</${name}>`;
|
||||||
else
|
else
|
||||||
out += node;
|
out += repl(node);
|
||||||
} else {
|
} else {
|
||||||
if (node._n)
|
if (node._n)
|
||||||
name = node._n;
|
name = node._n;
|
||||||
@@ -413,7 +411,7 @@ class BookConverter {
|
|||||||
if (name)
|
if (name)
|
||||||
out += `<${name}>`;
|
out += `<${name}>`;
|
||||||
if (node.hasOwnProperty('_t'))
|
if (node.hasOwnProperty('_t'))
|
||||||
out += node._t;
|
out += repl(node._t);
|
||||||
|
|
||||||
for (let nodeName in node) {
|
for (let nodeName in node) {
|
||||||
if (nodeName && nodeName[0] == '_' && nodeName != '_a')
|
if (nodeName && nodeName[0] == '_' && nodeName != '_a')
|
||||||
|
|||||||
Reference in New Issue
Block a user