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

Respect InsetLayout's PassThru setting in XHTML export.

Browse Source 
(cherry picked from commit 2e764c2c66)
This commit is contained in:
Richard Heck 2012-12-24 12:03:44 -05:00
parent 4b064e3caa
commit 80adc824f6
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Paragraph.cpp
View File

@ -2794,7 +2794,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
} else { } else {
char_type c = getUChar(buf.params(), i); char_type c = getUChar(buf.params(), i);
if (style.pass_thru) if (style.pass_thru || runparams.pass_thru)
xs << c; xs << c;
else if (c == '-') { else if (c == '-') {
docstring str; docstring str;

14
src/insets/InsetText.cpp
View File

@ -526,6 +526,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
InsetLayout const & il = getLayout(); InsetLayout const & il = getLayout();
if (opts & WriteOuterTag) if (opts & WriteOuterTag)
xs << html::StartTag(il.htmltag(), il.htmlattr()); xs << html::StartTag(il.htmltag(), il.htmlattr());
if ((opts & WriteLabel) && !il.counter().empty()) { if ((opts & WriteLabel) && !il.counter().empty()) {
BufferParams const & bp = buffer().masterBuffer()->params(); BufferParams const & bp = buffer().masterBuffer()->params();
Counters & cntrs = bp.documentClass().counters(); Counters & cntrs = bp.documentClass().counters();
@ -545,14 +546,21 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
if (opts & WriteInnerTag) if (opts & WriteInnerTag)
xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr()); xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr());
OutputParams ours = runparams;
// we will eventaully lose information about the containing inset
if (!il.isMultiPar() || opts == JustText) if (!il.isMultiPar() || opts == JustText)
ours.html_make_pars = false; runparams.html_make_pars = false;
xhtmlParagraphs(text_, buffer(), xs, ours); if (il.isPassThru())
runparams.pass_thru = true;
xhtmlParagraphs(text_, buffer(), xs, runparams);
if (opts & WriteInnerTag) if (opts & WriteInnerTag)
xs << html::EndTag(il.htmlinnertag()); xs << html::EndTag(il.htmlinnertag());
if (opts & WriteOuterTag) if (opts & WriteOuterTag)
xs << html::EndTag(il.htmltag()); xs << html::EndTag(il.htmltag());
return docstring(); return docstring();
} }

2
status.20x
View File

@ -78,6 +78,8 @@ What's new
- Fix problem using lyxpak.py when outside the LyX tree: Variable was - Fix problem using lyxpak.py when outside the LyX tree: Variable was
undefined. undefined.
- Resepct InsetLayout's PassThru setting for XHTML export.
- Fix layout conversion bug involving quoted Flex inset names that do not - Fix layout conversion bug involving quoted Flex inset names that do not
contain spaces. contain spaces.