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

DocBook: avoid generating fonts for "special cases" like equations.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-08-31 00:18:35 +02:00
parent 654559feb8
commit e995414917
5 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotests/export/docbook/lists.xml
View File

@ -125,7 +125,7 @@
<varlistentry>
<term>LyX:</term>
<listitem>
<para />
<variablelist>
<varlistentry>
<term>lyx16</term>

8
autotests/export/docbook/math_in_font.xml
View File

@ -4,7 +4,8 @@
<article xml:lang="en_US" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.2">
<title>LyX</title>
<para>Some text before.</para>
<informalequation><alt role='tex'>\cfrac[l]{A}{B+C}\,,\,\cfrac{A}{B+C}\,,\,\cfrac[r]{A}{B+C}</alt>
<informalequation>
<alt role='tex'>\cfrac[l]{A}{B+C}\,,\,\cfrac{A}{B+C}\,,\,\cfrac[r]{A}{B+C}</alt>
<m:math>
<m:mrow>
@ -35,6 +36,7 @@
</m:mfrac>
</m:mrow>
</m:mrow>
</m:math></informalequation><para>Some text after.</para>
</m:math>
</informalequation>
<para>Some text after.</para>
</article>

10
src/Paragraph.cpp
View File

@ -3333,7 +3333,8 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
OutputParams const & runparams,
Font const & outerfont,
pos_type initial,
bool is_last_par) const
bool is_last_par,
bool ignore_fonts) const
{
// Track whether we have opened these tags
DocBookFontState fs;
@ -3362,16 +3363,19 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
// If this is an InsetNewline, generate a new paragraph. Also reset the fonts, so that tags are closed in
// this paragraph.
if (getInset(i) != nullptr && getInset(i)->lyxCode() == NEWLINE_CODE) {
if (!ignore_fonts)
xs->closeFontTags();
generatedParagraphs.push_back(os.str());
os = odocstringstream();
delete xs;
xs = new XMLStream(os);
if (!ignore_fonts)
font_old = outerfont.fontInfo();
}
// Determine which tags should be opened or closed.
// Determine which tags should be opened or closed regarding fonts.
Font const font = getFont(buf.masterBuffer()->params(), i, outerfont);
if (!ignore_fonts) {
tie(tagsToOpen, tagsToClose) = computeDocBookFontSwitch(font_old, font, default_family, fs);
// FIXME XHTML
@ -3389,6 +3393,7 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
tagsToClose.clear();
tagsToOpen.clear();
}
if (Inset const * inset = getInset(i)) {
if (!runparams.for_toc || inset->isInToc()) {
@ -3409,6 +3414,7 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
// FIXME, this code is just imported from XHTML
// I'm worried about what happens if a branch, say, is itself
// wrapped in some font stuff. I think that will not work.
if (!ignore_fonts)
xs->closeFontTags();
// In listings, new lines are very important. Avoid generating one for the last line.

3
src/Paragraph.h
View File

@ -214,7 +214,8 @@ public:
OutputParams const & runparams,
Font const & outerfont,
pos_type initial = 0,
bool is_last_par = false) const;
bool is_last_par = false,
bool ignore_fonts = false) const;
/// \return any material that has had to be deferred until after the
/// paragraph has closed.

2
src/output_docbook.cpp
View File

@ -513,7 +513,7 @@ void makeParagraph(
// Open and close tags around each contained paragraph.
auto nextpar = par;
++nextpar;
auto pars = par->simpleDocBookOnePar(buf, runparams, text.outerFont(distance(begin, par)), 0, nextpar == end);
auto pars = par->simpleDocBookOnePar(buf, runparams, text.outerFont(distance(begin, par)), 0, nextpar == end, special_case);
for (auto & parXML : pars) {
if (!std::all_of(parXML.begin(), parXML.end(), ::isspace)) {
if (open_par)