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

DocBook: ignore fonts in ERT.

Browse Source 
Also, mark a Slides test as passing, because it is valid DocBook (but not really useful).
This commit is contained in:
Thibaut Cuvelier 2020-11-28 05:15:34 +01:00
parent 12d512d4e4
commit a6cc62f6ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
development/autotests/invertedTests
View File

@ -530,6 +530,7 @@ Sublabel: docbook poster
export/.*Poster.*_docbook5 export/.*Poster.*_docbook5
Sublabel: docbook beamer Sublabel: docbook beamer
# Beamer is not yet implemented. # Beamer is not yet implemented. One test passes, but mostly by chance.
!export/templates/Presentations/Slides_docbook5
export/(examples|templates)/(de|es|fr|ja|ru)/Presentations/.*_docbook5 export/(examples|templates)/(de|es|fr|ja|ru)/Presentations/.*_docbook5
export/(examples|templates)/Presentations/.*_docbook5 export/(examples|templates)/Presentations/.*_docbook5

3
src/insets/InsetERT.cpp
View File

@ -98,7 +98,7 @@ void InsetERT::docbook(XMLStream & xs, OutputParams const & runparams) const
// in an ERT, use simple line breaks. // in an ERT, use simple line breaks.
// New line after each paragraph of the ERT, save the last one. // New line after each paragraph of the ERT, save the last one.
while (true) { // For each paragraph in the ERT... while (true) { // For each paragraph in the ERT...
auto pars = par->simpleDocBookOnePar(buffer(), runparams, text().outerFont(distance(begin, par))); auto pars = par->simpleDocBookOnePar(buffer(), runparams, text().outerFont(distance(begin, par)), 0, false, true);
auto p = pars.begin(); auto p = pars.begin();
while (true) { // For each line of this ERT paragraph... while (true) { // For each line of this ERT paragraph...
os << *p; os << *p;
@ -125,7 +125,6 @@ void InsetERT::docbook(XMLStream & xs, OutputParams const & runparams) const
xs << XMLStream::ESCAPE_NONE << "<!-- "; xs << XMLStream::ESCAPE_NONE << "<!-- ";
xs << XMLStream::ESCAPE_COMMENTS << os.str(); xs << XMLStream::ESCAPE_COMMENTS << os.str();
xs << XMLStream::ESCAPE_NONE << " -->"; xs << XMLStream::ESCAPE_NONE << " -->";
xs << xml::CR();
} }