anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DocBook: don't output abstract if it would have no content.

Browse Source 
Restore a change from e709a662 (reverted by d75ff993) that was mixed into another commit.

Also, add a TODO for InsetIndex.
This commit is contained in:
Thibaut Cuvelier 2020-07-31 00:55:00 +02:00
parent e153477bca
commit 6434b666bf
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/insets/InsetIndex.cpp
View File

@ -199,6 +199,7 @@ void InsetIndex::docbook(XMLStream & xs, OutputParams const & runparams) const
"Complete entry: \"") + latexString + from_utf8("\""); "Complete entry: \"") + latexString + from_utf8("\"");
LYXERR0(error); LYXERR0(error);
xs << XMLStream::ESCAPE_NONE << (from_utf8("<!-- Output Error: ") + error + from_utf8(" -->\n")); xs << XMLStream::ESCAPE_NONE << (from_utf8("<!-- Output Error: ") + error + from_utf8(" -->\n"));
// TODO: implement @ using the sortas attribute (on primary, secondary, tertiary).
} }
// Handle several indices. // Handle several indices.

29
src/output_docbook.cpp
View File

@ -39,6 +39,7 @@
#include <stack> #include <stack>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
#include <sstream>
using namespace std; using namespace std;
using namespace lyx::support; using namespace lyx::support;
@ -863,17 +864,25 @@ void outputDocBookInfo(
generateDocBookParagraphWithoutSectioning(text, buf, xs, runparams, paragraphs, bpitInfo, epitInfo); generateDocBookParagraphWithoutSectioning(text, buf, xs, runparams, paragraphs, bpitInfo, epitInfo);
if (hasAbstract) { if (hasAbstract) {
string tag = paragraphs[bpitAbstract].layout().docbookforceabstracttag(); // Sometimes, there are many paragraphs that should go into the abstract, but none generates actual content.
if (tag == "NONE") // Thus, first generate to a temporary stream, then only create the <abstract> tag if these paragraphs
tag = "abstract"; // generate some content.
odocstringstream os2;
XMLStream xs2(os2);
generateDocBookParagraphWithoutSectioning(text, buf, xs2, runparams, paragraphs, bpitAbstract, epitAbstract);
xs << xml::StartTag(tag); // Actually output the abstract if there is something to do.
xs << xml::CR(); if (!os2.str().empty()) {
xs.startDivision(false); string tag = paragraphs[bpitAbstract].layout().docbookforceabstracttag();
generateDocBookParagraphWithoutSectioning(text, buf, xs, runparams, paragraphs, bpitAbstract, epitAbstract); if (tag == "NONE")
xs.endDivision(); tag = "abstract";
xs << xml::EndTag(tag);
xs << xml::CR(); xs << xml::StartTag(tag);
xs << xml::CR();
xs << XMLStream::ESCAPE_NONE << os2.str();
xs << xml::EndTag(tag);
xs << xml::CR();
}
} }
// End the <info> tag if it was started. // End the <info> tag if it was started.