diff --git a/server/core/Reader/BookConverter/ConvertFb3.js b/server/core/Reader/BookConverter/ConvertFb3.js index 113240e8..0e1a4402 100644 --- a/server/core/Reader/BookConverter/ConvertFb3.js +++ b/server/core/Reader/BookConverter/ConvertFb3.js @@ -2,7 +2,7 @@ const fs = require('fs-extra'); const ConvertHtml = require('./ConvertHtml'); -class ConvertDocX extends ConvertHtml { +class ConvertFb3 extends ConvertHtml { async check(data, opts) { const {inputFiles} = opts; if (this.config.useExternalBookConverter && @@ -42,10 +42,11 @@ class ConvertDocX extends ConvertHtml { text = `${title}` + text .replace(//g, '<br><b>') .replace(/<\/title>/g, '</b><br>') - .replace(/<subtitle>/g, '<br><br><subtitle>') + .replace(/<subtitle>/g, '<br><br><fb2-subtitle>') + .replace(/<\/subtitle>/g, '</fb2-subtitle>') ; return await super.run(Buffer.from(text), {skipCheck: true, cutTitle: true}); } } -module.exports = ConvertDocX; +module.exports = ConvertFb3; diff --git a/server/core/Reader/BookConverter/ConvertHtml.js b/server/core/Reader/BookConverter/ConvertHtml.js index 3c913cdc..4605a4aa 100644 --- a/server/core/Reader/BookConverter/ConvertHtml.js +++ b/server/core/Reader/BookConverter/ConvertHtml.js @@ -148,7 +148,7 @@ class ConvertHtml extends ConvertBase { cutTitle = true; } - if (tag == 'subtitle') { + if (tag == 'fb2-subtitle') { inSubTitle = true; } @@ -184,7 +184,7 @@ class ConvertHtml extends ConvertBase { if (tag == 'title' || tag == 'cut-title') inTitle = false; - if (tag == 'subtitle') + if (tag == 'fb2-subtitle') inSubTitle = false; if (tag == 'fb2-image') diff --git a/server/core/Reader/BookConverter/ConvertSites.js b/server/core/Reader/BookConverter/ConvertSites.js index 5b9a608d..5074f3f8 100644 --- a/server/core/Reader/BookConverter/ConvertSites.js +++ b/server/core/Reader/BookConverter/ConvertSites.js @@ -95,12 +95,12 @@ class ConvertSites extends ConvertHtml { return text.substring(l, r) .replace(/blockquote class="?book"?/g, 'p') .replace(/<br\/?>\s*<\/h3>/g, '</h3>') - .replace(/<h3 class="?book"?>/g, '<br><br><subtitle>') - .replace(/<h5 class="?book"?>/g, '<br><br><subtitle>') - .replace(/<h3>/g, '<br><br><subtitle>') - .replace(/<h5>/g, '<br><br><subtitle>') - .replace(/<\/h3>/g, '</subtitle><br>') - .replace(/<\/h5>/g, '</subtitle><br>') + .replace(/<h3 class="?book"?>/g, '<br><br><fb2-subtitle>') + .replace(/<h5 class="?book"?>/g, '<br><br><fb2-subtitle>') + .replace(/<h3>/g, '<br><br><fb2-subtitle>') + .replace(/<h5>/g, '<br><br><fb2-subtitle>') + .replace(/<\/h3>/g, '</fb2-subtitle><br>') + .replace(/<\/h5>/g, '</fb2-subtitle><br>') .replace(/<div class="?stanza"?>/g, '<br>') .replace(/<div>/g, '<br>') + title;