mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
parent
8acbcebf11
commit
231b36d950
@ -1005,7 +1005,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
|
||||
bool close = false;
|
||||
odocstream::pos_type const len = os.os().tellp();
|
||||
|
||||
if (inset->forceLTR()
|
||||
if (inset->forceLTR(runparams)
|
||||
&& running_font.isRightToLeft()
|
||||
// ERT is an exception, it should be output with no
|
||||
// decorations at all
|
||||
|
@ -246,7 +246,7 @@ bool Inset::allowEmpty() const
|
||||
}
|
||||
|
||||
|
||||
bool Inset::forceLTR() const
|
||||
bool Inset::forceLTR(OutputParams const &) const
|
||||
{
|
||||
return getLayout().forceLTR();
|
||||
}
|
||||
|
@ -242,7 +242,7 @@ public:
|
||||
/// Don't eliminate empty paragraphs
|
||||
virtual bool allowEmpty() const;
|
||||
/// Force inset into LTR environment if surroundings are RTL
|
||||
virtual bool forceLTR() const;
|
||||
virtual bool forceLTR(OutputParams const &) const;
|
||||
/// whether to include this inset in the strings generated for the TOC
|
||||
virtual bool isInToc() const;
|
||||
|
||||
|
@ -110,7 +110,7 @@ private:
|
||||
///
|
||||
std::string contextMenuName() const;
|
||||
/// Force inset into LTR environment if surroundings are RTL
|
||||
bool forceLTR() const { return true; }
|
||||
bool forceLTR(OutputParams const &) const { return true; }
|
||||
///
|
||||
void doDispatch(Cursor & cur, FuncRequest & cmd);
|
||||
///
|
||||
|
@ -32,7 +32,7 @@ public:
|
||||
///
|
||||
bool hasSettings() const { return true; }
|
||||
///
|
||||
bool forceLTR() const { return true; }
|
||||
bool forceLTR(OutputParams const &) const { return true; }
|
||||
///
|
||||
bool isInToc() const { return true; }
|
||||
///
|
||||
|
@ -743,7 +743,7 @@ void InsetInfo::setText(docstring const & str, Language const * lang)
|
||||
}
|
||||
|
||||
|
||||
bool InsetInfo::forceLTR() const
|
||||
bool InsetInfo::forceLTR(OutputParams const &) const
|
||||
{
|
||||
return params_.force_ltr;
|
||||
}
|
||||
|
@ -196,7 +196,7 @@ public:
|
||||
///
|
||||
void doDispatch(Cursor & cur, FuncRequest & cmd);
|
||||
/// Force inset into LTR environment if surroundings are RTL
|
||||
bool forceLTR() const;
|
||||
bool forceLTR(OutputParams const &) const;
|
||||
///
|
||||
void setInfo(std::string const & info);
|
||||
///
|
||||
|
@ -471,11 +471,16 @@ void InsetRef::validate(LaTeXFeatures & features) const
|
||||
features.require("nameref");
|
||||
}
|
||||
|
||||
bool InsetRef::forceLTR() const
|
||||
bool InsetRef::forceLTR(OutputParams const & rp) const
|
||||
{
|
||||
// We force LTR for references. Namerefs are output in the scripts direction
|
||||
// at least with fontspec/bidi, though (see #11518).
|
||||
// We force LTR for references. However,
|
||||
// * Namerefs are output in the scripts direction
|
||||
// at least with fontspec/bidi and luabidi, though (see #11518).
|
||||
// * Parentheses are automatically swapped with XeTeX/bidi
|
||||
// [not with LuaTeX/luabidi] (see #11626).
|
||||
// FIXME: Re-Audit all other RTL cases.
|
||||
if (rp.useBidiPackage())
|
||||
return false;
|
||||
return (getCmdName() != "nameref" || !buffer().masterParams().useNonTeXFonts);
|
||||
}
|
||||
|
||||
|
@ -73,7 +73,7 @@ public:
|
||||
void addToToc(DocIterator const & di, bool output_active,
|
||||
UpdateType utype, TocBackend & backend) const;
|
||||
///
|
||||
bool forceLTR() const;
|
||||
bool forceLTR(OutputParams const &) const;
|
||||
//@}
|
||||
|
||||
/// \name Static public methods obligated for InsetCommand derived classes
|
||||
|
@ -172,7 +172,7 @@ public:
|
||||
void initUnicodeMath() const;
|
||||
|
||||
/// Force inset into LTR environment if surroundings are RTL
|
||||
virtual bool forceLTR() const { return true; }
|
||||
virtual bool forceLTR(OutputParams const &) const { return true; }
|
||||
///
|
||||
void recordLocation(DocIterator const & di);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user