deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправки багов

Browse Source
This commit is contained in:
Book Pauk
2019-02-20 19:25:52 +07:00
parent 5496e874c4
commit dd61c04d63
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
client/components/Reader/share/BookParser.js
View File

@@ -39,6 +39,8 @@ export default class BookParser {
let center = false;
let bold = false;
let italic = false;
let space = false;
this.binary = {};
let binaryId = '';
let binaryType = '';
@@ -177,6 +179,7 @@ export default class BookParser {
if (tag == 'epigraph') {
italic = true;
space = true;
}
if (tag == 'poem') {
@@ -184,7 +187,7 @@ export default class BookParser {
}
if (tag == 'text-author') {
newParagraph(' <s> <s> <s> ', 4);
space = true;
}
}
};
@@ -211,11 +214,16 @@ export default class BookParser {
if (tag == 'epigraph') {
italic = false;
space = false;
}
if (tag == 'stanza') {
newParagraph(' ', 1);
}
if (tag == 'text-author') {
space = false;
}
}
path = path.substr(0, path.length - tag.length - 1);
@@ -277,7 +285,9 @@ export default class BookParser {
let tOpen = (center ? '<center>' : '');
tOpen += (bold ? '<strong>' : '');
tOpen += (italic ? '<emphasis>' : '');
let tClose = (italic ? '</emphasis>' : '');
tOpen += (space ? '<space>' : '');
let tClose = (space ? '</space>' : '');
tClose += (italic ? '</emphasis>' : '');
tClose += (bold ? '</strong>' : '');
tClose += (center ? '</center>' : '');
@@ -352,7 +362,7 @@ export default class BookParser {
splitToStyle(s) {
let result = [];/*array of {
style: {bold: Boolean, italic: Boolean, center: Boolean},
style: {bold: Boolean, italic: Boolean, center: Boolean, space: Number},
image: {local: Boolean, inline: Boolean, id: String},
text: String,
}*/
@@ -378,19 +388,23 @@ export default class BookParser {
case 'center':
style.center = true;
break;
case 'space': {
style.space = true;
break;
}
case 'image': {
let attrs = sax.getAttrsSync(tail);
let id = attrs.href.value;
if (id) {
let local = false;
if (id[0] == '#') {
id = id.substr(1);
local = true;
}
image = {local, inline: false, id};
let attrs = sax.getAttrsSync(tail);
let id = attrs.href.value;
if (id) {
let local = false;
if (id[0] == '#') {
id = id.substr(1);
local = true;
}
break;
image = {local, inline: false, id};
}
break;
}
}
};
@@ -405,6 +419,9 @@ export default class BookParser {
case 'center':
style.center = false;
break;
case 'space':
style.space = false;
break;
case 'image':
image = {};
break;
@@ -588,7 +605,7 @@ export default class BookParser {
continue;
}
const words = part.text.split(' ');
let words = part.text.split(' ');
let sp1 = '';
let sp2 = '';
@@ -602,6 +619,7 @@ export default class BookParser {
str += sp1 + word;
let p = (j == 0 ? parsed.p : 0);
p = (style.space ? p + parsed.p : p);
let w = this.measureText(str, style) + p;
let wordTail = word;
if (w > parsed.w && prevStr != '') {