#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "MetricsInfo.h"
+#include "output_docbook.h"
#include "output_xhtml.h"
#include "TexRow.h"
#include "texstream.h"
#include "support/debug.h"
#include "support/docstream.h"
+#include "support/FileName.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/Translator.h"
if (hasFixedWidth())
mi.base.textwidth = mi.base.inPixels(params_.width);
InsetCollapsible::metrics(mi, dim);
- // retore textwidth.
+ // restore textwidth.
mi.base.textwidth = textwidth_backup;
}
return getLayout().bgcolor();
if (params_.type == "Shaded") {
- // FIXME: This hardcoded color is a hack!
- if (buffer().params().boxbgcolor == lyx::rgbFromHexName("#ff0000"))
+ if (!buffer().params().isboxbgcolor)
return getLayout().bgcolor();
- ColorCode c = lcolor.getFromLyXName("boxbgcolor");
+ ColorCode c = lcolor.getFromLyXName("boxbgcolor@" + buffer().fileName().absFileName());
if (c == Color_none)
return getLayout().bgcolor();
return c;
cur.recordUndoInset(this);
if (change_type) {
params_.type = cmd.getArg(1);
- // set a makebox if there is no inner box but Frameless was exectued
+ // set a makebox if there is no inner box but Frameless was executed
// otherwise the result would be a non existent box (no inner AND outer box)
// (this was LyX bug 8712)
if (params_.type == "Frameless" && !params_.inner_box) {
string shadowsize_string = params_.shadowsize.asLatexString();
bool stdwidth = false;
string const cprotect = hasCProtectContent(runparams.moving_arg) ? "\\cprotect" : string();
+ // Colored boxes in RTL need to be wrapped into \beginL...\endL
+ string maybeBeginL;
+ string maybeEndL;
+ bool needEndL = false;
+ if (!runparams.isFullUnicode() && runparams.local_font->isRightToLeft()) {
+ maybeBeginL = "\\beginL";
+ maybeEndL = "\\endL";
+ }
// in general the overall width of some decorated boxes is wider thean the inner box
// we could therefore calculate the real width for all sizes so that if the user wants
// e.g. 0.1\columnwidth or 2cm he gets exactly this size
if (stdwidth && !(buffer().params().paragraph_separation))
os << "\\noindent";
+ bool needendgroup = false;
switch (btype) {
case Frameless:
break;
os << "{\\fboxsep " << from_ascii(separation_string);
if (!params_.inner_box && !width_string.empty()) {
if (params_.framecolor != "black" || params_.backgroundcolor != "none") {
- os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{";
+ os << maybeBeginL << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}{";
os << "\\makebox";
+ needEndL = !maybeBeginL.empty();
} else
os << "\\framebox";
// Special widths, see usrguide sec. 3.5
if (params_.hor_pos != 'c')
os << "[" << params_.hor_pos << "]";
} else {
- if (params_.framecolor != "black" || params_.backgroundcolor != "none")
- os << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
- else
+ if (params_.framecolor != "black" || params_.backgroundcolor != "none") {
+ os << maybeBeginL << "\\fcolorbox{" << params_.framecolor << "}{" << params_.backgroundcolor << "}";
+ needEndL = !maybeBeginL.empty();
+ } else {
+ if (!cprotect.empty() && contains(runparams.active_chars, '^')) {
+ // cprotect relies on ^ being on catcode 7
+ os << "\\begingroup\\catcode`\\^=7";
+ needendgroup = true;
+ }
os << cprotect << "\\fbox";
+ }
}
os << "{";
break;
case Shaded:
// must be set later because e.g. the width settings only work when
// it is inside a minipage or parbox
+ os << maybeBeginL;
+ needEndL = !maybeBeginL.empty();
break;
case Doublebox:
if (thickness_string != defaultThick) {
if (params_.inner_box) {
if (params_.use_parbox) {
- if (params_.backgroundcolor != "none" && btype == Frameless)
- os << "\\colorbox{" << params_.backgroundcolor << "}{";
+ if (params_.backgroundcolor != "none" && btype == Frameless) {
+ os << maybeBeginL << "\\colorbox{" << params_.backgroundcolor << "}{";
+ needEndL = !maybeBeginL.empty();
+ }
os << "\\parbox";
} else if (params_.use_makebox) {
if (!width_string.empty()) {
- if (params_.backgroundcolor != "none")
- os << "\\colorbox{" << params_.backgroundcolor << "}{";
+ if (params_.backgroundcolor != "none") {
+ os << maybeBeginL << "\\colorbox{" << params_.backgroundcolor << "}{";
+ needEndL = !maybeBeginL.empty();
+ }
os << "\\makebox";
// FIXME UNICODE
// output the width and horizontal position
if (params_.hor_pos != 'c')
os << "[" << params_.hor_pos << "]";
} else {
- if (params_.backgroundcolor != "none")
- os << "\\colorbox{" << params_.backgroundcolor << "}";
+ if (params_.backgroundcolor != "none") {
+ os << maybeBeginL << "\\colorbox{" << params_.backgroundcolor << "}";
+ needEndL = !maybeBeginL.empty();
+ }
else
os << "\\mbox";
}
os << "{";
}
else {
- if (params_.backgroundcolor != "none" && btype == Frameless)
- os << "\\colorbox{" << params_.backgroundcolor << "}{";
+ if (params_.backgroundcolor != "none" && btype == Frameless) {
+ os << maybeBeginL << "\\colorbox{" << params_.backgroundcolor << "}{";
+ needEndL = !maybeBeginL.empty();
+ }
os << "\\begin{minipage}";
}
break;
case Framed:
os << "\\end{framed}";
- if (separation_string != defaultSep || thickness_string != defaultThick)
+ if (separation_string != defaultSep || thickness_string != defaultThick)
os << "}";
break;
case Boxed:
if (!params_.inner_box && !width_string.empty()
&& (params_.framecolor != "black" || params_.backgroundcolor != "none"))
os << "}";
- if (separation_string != defaultSep || thickness_string != defaultThick)
+ if (separation_string != defaultSep || thickness_string != defaultThick)
os << "}";
+ if (needendgroup)
+ os << "\\endgroup";
break;
case ovalbox:
os << "}";
// already done
break;
}
+ if (needEndL)
+ os << maybeEndL;
}
}
-int InsetBox::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetBox::docbook(XMLStream & xs, OutputParams const & runparams) const
{
- return InsetText::docbook(os, runparams);
+ // There really should be a wrapper tag for this layout.
+ bool hasBoxTag = !getLayout().docbookwrappertag().empty();
+ if (!hasBoxTag)
+ LYXERR0("Assertion failed: box layout " + getLayout().name() + " missing DocBookWrapperTag.");
+
+ // Avoid nesting boxes in DocBook, it's not allowed. Only make the check for <sidebar> to avoid destroying
+ // tags if this is not the wrapper tag for this layout (unlikely).
+ bool isAlreadyInBox = hasBoxTag && xs.isTagOpen(xml::StartTag(getLayout().docbookwrappertag()));
+
+ bool outputBoxTag = hasBoxTag && !isAlreadyInBox;
+
+ // Generate the box tag (typically, <sidebar>).
+ if (outputBoxTag) {
+ if (!xs.isLastTagCR())
+ xs << xml::CR();
+
+ xs << xml::StartTag(getLayout().docbookwrappertag(), getLayout().docbookwrapperattr());
+ xs << xml::CR();
+ }
+
+ // If the box starts with a sectioning item, use as box title.
+ auto current_par = paragraphs().begin();
+ if (current_par->layout().category() == from_utf8("Sectioning")) {
+ // Only generate the first paragraph.
+ current_par = makeAny(text(), buffer(), xs, runparams, paragraphs().begin());
+ }
+
+ // Don't call InsetText::docbook, as this would generate all paragraphs in the inset, not the ones we are
+ // interested in. The best solution would be to call docbookParagraphs with an updated OutputParams object to only
+ // generate paragraphs after the title, but it leads to strange crashes, as if text().paragraphs() then returns
+ // a smaller set of paragrphs.
+ // Elements in the box must keep their paragraphs.
+ auto rp = runparams;
+ rp.docbook_in_par = false;
+ rp.docbook_force_pars = true;
+
+ xs.startDivision(false);
+ while (current_par != paragraphs().end())
+ current_par = makeAny(text(), buffer(), xs, rp, current_par);
+ xs.endDivision();
+
+ // Close the box.
+ if (outputBoxTag) {
+ if (!xs.isLastTagCR())
+ xs << xml::CR();
+
+ xs << xml::EndTag(getLayout().docbookwrappertag());
+ xs << xml::CR();
+ }
}
-docstring InsetBox::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
+docstring InsetBox::xhtml(XMLStream & xs, OutputParams const & runparams) const
{
// construct attributes
string attrs = "class='" + params_.type + "'";
if (!style.empty())
attrs += " style='" + style + "'";
- xs << html::StartTag("div", attrs);
+ xs << xml::StartTag("div", attrs);
XHTMLOptions const opts = InsetText::WriteLabel | InsetText::WriteInnerTag;
docstring defer = InsetText::insetAsXHTML(xs, runparams, opts);
- xs << html::EndTag("div");
+ xs << xml::EndTag("div");
xs << defer;
return docstring();
}
projects / features.git / blobdiff