diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 8d6ab4f8..bc890feb 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -1271,8 +1271,14 @@ class TextPage { if (note) { if (orig) {//show dialog this.noteId = noteId; - const pad = (note.para.length > 1 ? 20 : 0); - this.noteHtml = note.para.map(p => `
${p}
`).join(''); + this.noteHtml = note.xml + .replace(//g, '
')
+ .replace(/ ').replace(/<\/v>/g, '
').replace(/<\/stanza>/g, '')
+ .replace(/
').replace(/<\/text-author>/g, '')
+ ;
+
this.noteDialogVisible = true;
} else {//go to orig
this.goToOrigNote(noteId);
@@ -1335,3 +1341,10 @@ export default vueComponent(TextPage);
}
+
\ No newline at end of file
diff --git a/client/components/Reader/share/BookParser.js b/client/components/Reader/share/BookParser.js
index 54f6236d..79c28749 100644
--- a/client/components/Reader/share/BookParser.js
+++ b/client/components/Reader/share/BookParser.js
@@ -94,6 +94,7 @@ export default class BookParser {
let inNote = false;
let noteId = '';
let inNotesBody = false;
+ const noteTags = new Set(['p', 'poem', 'stanza', 'v', 'text-author', 'emphasis']);
//оглавление
this.contents = [];
@@ -429,7 +430,7 @@ export default class BookParser {
}
note.noteParaIndex = paraIndex;
- note.para = [];
+ note.xml = '';
noteId = id;
}
@@ -447,12 +448,8 @@ export default class BookParser {
inPara = true;
isFirstTitlePara = false;
- if (inNotesBody && noteId) {
- if (!inTitle) {
- this.notes[noteId].para.push('');
- } else {
- growParagraph(`