diff --git a/client/components/Reader/ContentsPage/ContentsPage.vue b/client/components/Reader/ContentsPage/ContentsPage.vue
index a3aa966e..8c3b35b6 100644
--- a/client/components/Reader/ContentsPage/ContentsPage.vue
+++ b/client/components/Reader/ContentsPage/ContentsPage.vue
@@ -26,33 +26,34 @@
-
@@ -91,28 +92,34 @@ class ContentsPage extends Vue {
init(currentBook, parsed) {
this.$refs.window.init();
- const prepareLabel = (title) => {
+ const prepareLabel = (title, bolder = false) => {
let titleParts = title.split('');
- const textParts = titleParts.filter(v => v).map(v => v.replace(/( |<([^>]+)>)/ig, ''));
- return textParts.join('
');
+ const textParts = titleParts.filter(v => v).map(v => `
${v.replace(/(<([^>]+)>)/ig, '')}
`);
+ if (bolder && textParts.length > 1)
+ textParts[0] = `${textParts[0]}`;
+ return textParts.join('');
}
+ const insetStyle = inset => `width: ${(inset > 1 ? inset - 1 : 0)*20}px`;
+
let i = 0;
const newContents = [];
parsed.contents.forEach((cont) => {
- const label = prepareLabel(cont.title);
+ const label = prepareLabel(cont.title, true);
+ const style = insetStyle(cont.inset);
let j = 0;
const list = [];
cont.subtitles.forEach((sub) => {
const l = prepareLabel(sub.title);
+ const s = insetStyle(sub.inset + 1);
const p = parsed.para[sub.paraIndex];
- list.push({perc: (p.offset/parsed.textLength*100).toFixed(2), label: l, key: j, offset: p.offset});
+ list.push({perc: (p.offset/parsed.textLength*100).toFixed(2), label: l, key: j, offset: p.offset, style: s});
j++;
});
const p = parsed.para[cont.paraIndex];
- newContents.push({perc: (p.offset/parsed.textLength*100).toFixed(0), label, key: i, offset: p.offset, list});
+ newContents.push({perc: (p.offset/parsed.textLength*100).toFixed(0), label, key: i, offset: p.offset, style, list});
i++;
});
@@ -157,4 +164,11 @@ class ContentsPage extends Vue {
.subitem:hover {
background-color: #e0e0e0;
}
+
+.separator-top {
+ border-top: 1px solid #e0e0e0;
+}
+.separator-bottom {
+ border-top: 1px solid #e0e0e0;
+}
diff --git a/client/components/Reader/share/BookParser.js b/client/components/Reader/share/BookParser.js
index 8a44a0a9..ec314fb0 100644
--- a/client/components/Reader/share/BookParser.js
+++ b/client/components/Reader/share/BookParser.js
@@ -58,6 +58,7 @@ export default class BookParser {
let curSubtitle = {paraIndex: -1, title: ''};
let inTitle = false;
let inSubtitle = false;
+ let sectionLevel = 0;
let paraIndex = -1;
let paraOffset = 0;
@@ -234,7 +235,7 @@ export default class BookParser {
center = true;
inTitle = true;
- curTitle = {paraIndex, title: '', subtitles: []};
+ curTitle = {paraIndex, title: '', inset: sectionLevel, subtitles: []};
this.contents.push(curTitle);
}
@@ -242,6 +243,7 @@ export default class BookParser {
if (!isFirstSection)
newParagraph(' ', 1);
isFirstSection = false;
+ sectionLevel++;
}
if (tag == 'emphasis' || tag == 'strong') {
@@ -264,7 +266,7 @@ export default class BookParser {
center = true;
inSubtitle = true;
- curSubtitle = {paraIndex, title: ''};
+ curSubtitle = {paraIndex, inset: sectionLevel, title: ''};
curTitle.subtitles.push(curSubtitle);
}
@@ -298,6 +300,10 @@ export default class BookParser {
inTitle = false;
}
+ if (tag == 'section') {
+ sectionLevel--;
+ }
+
if (tag == 'emphasis' || tag == 'strong') {
growParagraph(`${tag}>`, 0);
}