Font const & font,
Layout const & style);
- /// Output consecutive unicode chars, belonging to the same script as
- /// specified by the latex macro \p ltx, to \p os starting from \p i.
- /// \return the number of characters written.
- int writeScriptChars(BufferParams const &, OutputParams const &,
- otexstream & os,
- docstring const & ltx,
- Change const &, Encoding const &,
- std::string const, pos_type & i);
-
/// This could go to ParagraphParameters if we want to.
int startTeXParParams(BufferParams const &, otexstream &,
OutputParams const &) const;
BufferParams const & bparams,
OutputParams const & runparams,
Font const & running_font,
- Change const & running_change,
+ string & alien_script,
Layout const & style,
pos_type & i,
pos_type end_pos,
return end - i;
}
-
+// Handle combining characters
int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
otexstream & os, char_type c, char_type next,
OutputParams const & runparams)
}
docstring latex2 = encoding.latexChar(c).first;
- if (docstring(1, next) == latex1) {
- // The encoding supports the combination:
+ if (bparams.useNonTeXFonts || docstring(1, next) == latex1) {
+ // Encoding supports the combination:
// output as is (combining char after base char).
os << latex2 << latex1;
return latex1.length() + latex2.length();
}
- // Handle combining characters in "script" context (i.e., \textgreek and \textcyrillic)
- docstring::size_type const brace1 = latex2.find_first_of(from_ascii("{"));
- docstring::size_type const brace2 = latex2.find_last_of(from_ascii("}"));
- string script = to_ascii(latex2.substr(1, brace1 - 1));
- // "Script chars" need to embraced in \textcyrillic and \textgreek notwithstanding
- // whether they are encodable or not (it only depends on the font encoding)
- if (!runparams.isFullUnicode())
- // This will get us a script value to deal with below
- Encodings::isKnownScriptChar(c, script);
- int pos = 0;
- int length = brace2;
- string fontenc;
- if (runparams.local_font)
- fontenc = runparams.local_font->language()->fontenc(bparams);
- else
- fontenc = bparams.language->fontenc(bparams);
- docstring scriptmacro;
- docstring cb;
- if (script == "textgreek" || script == "textcyrillic") {
- // We separate the script macro (\text[greek|cyr]) from the rest,
- // since we need to include the combining char in it (#6463).
- // This is "the rest":
- pos = brace1 + 1;
- length -= pos;
- latex2 = latex2.substr(pos, length);
- // We only need the script macro with non-native font encodings
- if (Encodings::needsScriptWrapper(script, fontenc)) {
- scriptmacro = from_ascii("\\" + script + "{");
- cb = from_ascii("}");
- }
- }
-
- docstring lb;
- docstring rb;
- // polutonikogreek does not play nice with brackets
- if (!runparams.local_font
- || runparams.local_font->language()->lang() != "polutonikogreek") {
- lb = from_ascii("{");
- rb = from_ascii("}");
- }
-
- os << scriptmacro << latex1 << lb << latex2 << rb << cb;
- return latex1.length() + latex2.length() + lb.length() + rb.length() + cb.length();
+ os << latex1 << "{" << latex2 << "}";
+ return latex1.length() + latex2.length() + 2;
}
}
-int Paragraph::Private::writeScriptChars(BufferParams const & bparams,
- OutputParams const & runparams,
- otexstream & os,
- docstring const & ltx,
- Change const & runningChange,
- Encoding const & encoding,
- string const fontenc,
- pos_type & i)
-{
- // FIXME: modifying i here is not very nice...
-
- // We only arrive here when character text_[i] could not be translated
- // into the current latex encoding (or its latex translation has been forced,)
- // and it belongs to a known script.
- // Parameter ltx contains the latex translation of text_[i] as specified
- // in the unicodesymbols file and is something like "\textXXX{<spec>}".
- // The latex macro name "textXXX" specifies the script to which text_[i]
- // belongs and we use it in order to check whether characters from the
- // same script immediately follow, such that we can collect them in a
- // single "\textXXX" macro. So, we have to retain "\textXXX{<spec>"
- // for the first char but only "<spec>" for all subsequent chars.
- docstring::size_type const brace1 = ltx.find_first_of(from_ascii("{"));
- docstring::size_type const brace2 = ltx.find_last_of(from_ascii("}"));
- string script = to_ascii(ltx.substr(1, brace1 - 1));
- int pos = 0;
- int length = brace2;
- bool closing_brace = true;
- if (!Encodings::needsScriptWrapper(script, fontenc)) {
- // Correct font encoding is being used, so we can avoid \text[greek|cyr].
- pos = brace1 + 1;
- length -= pos;
- closing_brace = false;
- }
- os << ltx.substr(pos, length);
- int size = text_.size();
- while (i + 1 < size) {
- char_type const next = text_[i + 1];
- // Stop here if next character belongs to another script
- // or there is a change in change tracking status.
- if (!Encodings::isKnownScriptChar(next, script) ||
- runningChange != owner_->lookupChange(i + 1))
- break;
- Font prev_font;
- bool found = false;
- FontList::const_iterator cit = fontlist_.begin();
- FontList::const_iterator end = fontlist_.end();
- for (; cit != end; ++cit) {
- if (cit->pos() >= i && !found) {
- prev_font = cit->font();
- found = true;
- }
- if (cit->pos() >= i + 1)
- break;
- }
- // Stop here if there is a font attribute or encoding change.
- if (found && cit != end && prev_font != cit->font())
- break;
-
- // Check whether we have a combining pair
- char_type next_next = '\0';
- if (i + 2 < size) {
- next_next = text_[i + 2];
- if (Encodings::isCombiningChar(next_next)) {
- length += latexSurrogatePair(bparams, os, next, next_next, runparams) - 1;
- i += 2;
- continue;
- }
- }
-
- docstring const latex = encoding.latexChar(next).first;
- docstring::size_type const b1 =
- latex.find_first_of(from_ascii("{"));
- docstring::size_type const b2 =
- latex.find_last_of(from_ascii("}"));
- int const len = b2 - b1 - 1;
- os << latex.substr(b1 + 1, len);
- length += len;
- ++i;
- }
- if (closing_brace) {
- os << '}';
- ++length;
- }
- return length;
-}
-
-
void Paragraph::Private::latexInset(BufferParams const & bparams,
otexstream & os,
OutputParams & runparams,
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
&& inset->lyxCode() != ERT_CODE) {
if (runparams.use_polyglossia) {
- if (style.isEnvironment())
- os << "\\begin{LTR}";
os << "\\LRE{";
} else if (running_font.language()->lang() == "farsi"
|| running_font.language()->lang() == "arabic_arabi")
throw(e);
}
- if (close) {
- if (runparams.use_polyglossia && style.isEnvironment())
- os << "\\end{LTR}";
- else
- os << '}';
- }
+ if (close)
+ os << '}';
if (os.texrow().rows() > previous_row_count) {
os.texrow().start(owner_->id(), i + 1);
BufferParams const & bparams,
OutputParams const & runparams,
Font const & running_font,
- Change const & running_change,
+ string & alien_script,
Layout const & style,
pos_type & i,
pos_type end_pos,
&& !runparams.isFullUnicode() && bparams.main_font_encoding() == "T1"
&& latexSpecialT1(c, os, i, column))
return;
- // NOTE: XeTeX and LuaTeX use EU1/2 (pre 2017) or TU (as of 2017) encoding
+ // NOTE: "fontspec" (non-TeX fonts) sets the font encoding to "TU" (untill 2017 "EU1" or "EU2")
else if (!runparams.inIPA && !running_font.language()->internalFontEncoding()
&& runparams.isFullUnicode() && latexSpecialTU(c, os, i, column))
return;
break;
}
}
- string script;
pair<docstring, bool> latex = encoding.latexChar(c);
docstring nextlatex;
bool nexttipas = false;
string nexttipashortcut;
- if (next != '\0' && next != META_INSET && encoding.encodable(next)) {
+ if (next != '\0' && next != META_INSET && !encoding.encodable(next)) {
nextlatex = encoding.latexChar(next).first;
if (runparams.inIPA) {
nexttipashortcut = Encodings::TIPAShortcut(next);
tipas = true;
}
}
- string fontenc;
- fontenc = running_font.language()->fontenc(bparams);
- // "Script chars" need to embraced in \textcyrillic and \textgreek notwithstanding
- // whether they are encodable or not (it only depends on the font encoding)
- if (!runparams.isFullUnicode() && Encodings::isKnownScriptChar(c, script)) {
- docstring const wrapper = from_ascii("\\" + script + "{");
- docstring ltx = latex.first;
- if (!prefixIs(ltx, wrapper))
- ltx = wrapper + latex.first + from_ascii("}");
- column += writeScriptChars(bparams, runparams, os, ltx, running_change,
- encoding, fontenc, i) - 1;
- } else if (latex.second
+ // eventually close "script wrapper" command (see `Paragraph::latex`)
+ if (!alien_script.empty()
+ && alien_script != Encodings::isKnownScriptChar(next)) {
+ column += latex.first.length();
+ alien_script.clear();
+ os << latex.first << "}";
+ break;
+ }
+ if (latex.second
&& ((!prefixIs(nextlatex, '\\')
&& !prefixIs(nextlatex, '{')
&& !prefixIs(nextlatex, '}'))
|| (nexttipas
&& !prefixIs(from_ascii(nexttipashortcut), '\\')))
&& !tipas) {
- // Prevent eating of a following
- // space or command corruption by
+ // Prevent eating of a following space or command corruption by
// following characters
if (next == ' ' || next == '\0') {
column += latex.first.length() + 1;
otexstringstream os;
os << layout_->preamble();
size_t const length = os.length();
- TeXOnePar(buf, buf.text(), buf.getParFromID(owner_->id()).pit(), os,
+ TeXOnePar(buf, *inset_owner_->getText(int(buf.getParFromID(owner_->id()).idx())),
+ buf.getParFromID(owner_->id()).pit(), os,
features.runparams(), string(), 0, -1, true);
if (os.length() > length)
features.addPreambleSnippet(os.release(), true);
d->validate(features);
bool fragile = features.runparams().moving_arg;
fragile |= layout().needprotect;
+ if (inInset().getLayout().isNeedProtect())
+ fragile = true;
if (needsCProtection(fragile))
features.require("cprotect");
}
{
char_type c = d->text_[pos];
- // Return unchanged character in LTR languages.
- if (!getFontSettings(bparams, pos).isRightToLeft())
+ // Return unchanged character in LTR languages
+ // or if we use poylglossia/bidi (XeTeX).
+ if (rp.useBidiPackage()
+ || !getFontSettings(bparams, pos).isRightToLeft())
return c;
- // FIXME This is a complete mess due to all the language-specific
- // special cases. We need to unify this eventually, but this
- // requires a file format change and some thought.
- // We also need to unify the input of parentheses in different RTL
- // languages. Currently, some have their own methods (Arabic:
- // 18599/lyxsvn, Hebrew: e5f42f67d/lyxgit), some don't (Urdu, Syriac).
- // Also note that the representation in the LyX file is probably wrong
- // (see FIXME in TextMetrics::breakRow).
- // Most likely, we should simply rely on Qt's unicode handling here.
- string const & lang = getFontSettings(bparams, pos).language()->lang();
+ // Without polyglossia/bidi, we need to account for some special cases.
+ // FIXME This needs to be audited!
+ // Check if:
+ // * The input is as expected for all delimiters
+ // => checked for Hebrew!
+ // * The output matches the display in the LyX workarea
+ // => checked for Hebrew!
+ // * The special cases below are really necessary
+ // => checked for Hebrew!
+ // * In arabic_arabi, brackets are transformed to Arabic
+ // Ornate Parentheses. Is this is really wanted?
- // With polyglossia, brackets and stuff need not be reversed in RTL scripts
- // FIXME: The special casing for Hebrew parens is due to the special
- // handling on input (for Hebrew in e5f42f67d/lyxgit); see #8251.
+ string const & lang = getFontSettings(bparams, pos).language()->lang();
char_type uc = c;
- if (rp.use_polyglossia) {
- switch (c) {
- case '(':
- if (lang == "hebrew")
- uc = ')';
- break;
- case ')':
- if (lang == "hebrew")
- uc = '(';
- break;
- }
- return uc;
- }
- // In the following languages, brackets don't need to be reversed.
- // Furthermore, in arabic_arabi, they are transformed to Arabic
- // Ornate Parentheses (dunno if this is really wanted)
+ // 1. In the following languages, parentheses need to be reversed.
+ // Also with polyglodia/luabidi
+ bool const reverseparens = (lang == "hebrew" || rp.use_polyglossia);
+
+ // 2. In the following languages, brackets don't need to be reversed.
bool const reversebrackets = lang != "arabic_arabtex"
&& lang != "arabic_arabi"
- && lang != "farsi";
+ && lang != "farsi";
+ // Now swap delimiters if needed.
switch (c) {
+ case '(':
+ if (reverseparens)
+ uc = ')';
+ break;
+ case ')':
+ if (reverseparens)
+ uc = '(';
+ break;
case '[':
if (reversebrackets)
uc = ']';
}
-LyXAlignment Paragraph::getAlign() const
+LyXAlignment Paragraph::getAlign(BufferParams const & bparams) const
{
if (d->params_.align() == LYX_ALIGN_LAYOUT)
- return d->layout_->align;
+ return getDefaultAlign(bparams);
else
return d->params_.align();
}
+LyXAlignment Paragraph::getDefaultAlign(BufferParams const & bparams) const
+{
+ LyXAlignment res = layout().align;
+ if (isRTL(bparams)) {
+ // Swap sides
+ if (res == LYX_ALIGN_LEFT)
+ res = LYX_ALIGN_RIGHT;
+ else if (res == LYX_ALIGN_RIGHT)
+ res = LYX_ALIGN_LEFT;
+ }
+ return res;
+}
+
+
docstring const & Paragraph::labelString() const
{
return d->params_.labelString();
string const begin_tag = "\\begin";
InsetCode code = ownerCode();
bool const lastpar = runparams.isLastPar;
+ // RTL in classic (PDF)LaTeX (without the Bidi package)
+ // Luabibdi (used by LuaTeX) behaves like classic
+ bool const rtl_classic = owner_->getParLanguage(bparams)->rightToLeft()
+ && !runparams.useBidiPackage();
switch (curAlign) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_DECIMAL:
break;
case LYX_ALIGN_LEFT: {
- if (!owner_->getParLanguage(bparams)->rightToLeft())
- corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
- else
+ if (rtl_classic)
+ // Classic (PDF)LaTeX switches the left/right logic in RTL mode
corrected_env(os, begin_tag, "flushright", code, lastpar, column);
+ else
+ corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
break;
} case LYX_ALIGN_RIGHT: {
- if (!owner_->getParLanguage(bparams)->rightToLeft())
- corrected_env(os, begin_tag, "flushright", code, lastpar, column);
- else
+ if (rtl_classic)
+ // Classic (PDF)LaTeX switches the left/right logic in RTL mode
corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
+ else
+ corrected_env(os, begin_tag, "flushright", code, lastpar, column);
break;
} case LYX_ALIGN_CENTER: {
corrected_env(os, begin_tag, "center", code, lastpar, column);
string const end_tag = "\\par\\end";
InsetCode code = ownerCode();
bool const lastpar = runparams.isLastPar;
+ // RTL in classic (PDF)LaTeX (without the Bidi package)
+ // Luabibdi (used by LuaTeX) behaves like classic
+ bool const rtl_classic = owner_->getParLanguage(bparams)->rightToLeft()
+ && !runparams.useBidiPackage();
switch (curAlign) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_DECIMAL:
break;
case LYX_ALIGN_LEFT: {
- if (!owner_->getParLanguage(bparams)->rightToLeft())
- output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
- else
+ if (rtl_classic)
+ // Classic (PDF)LaTeX switches the left/right logic in RTL mode
output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
+ else
+ output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
break;
} case LYX_ALIGN_RIGHT: {
- if (!owner_->getParLanguage(bparams)->rightToLeft())
- output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
- else
+ if (rtl_classic)
+ // Classic (PDF)LaTeX switches the left/right logic in RTL mode
output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
+ else
+ output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
break;
} case LYX_ALIGN_CENTER: {
corrected_env(os, end_tag, "center", code, lastpar, col);
// of the body.
Font basefont;
+ // If there is an open font-encoding changing command (script wrapper),
+ // alien_script is set to its name
+ string alien_script;
+ string script;
+
// Maybe we have to create a optional argument.
pos_type body_pos = beginOfBody();
unsigned int column = 0;
}
if (bparams.output_changes && runningChange != change) {
+ if (!alien_script.empty()) {
+ column += 1;
+ os << "}";
+ alien_script.clear();
+ }
if (open_font) {
bool needPar = false;
column += running_font.latexWriteEndChanges(
(current_font != running_font ||
current_font.language() != running_font.language()))
{
+ // ensure there is no open script-wrapper
+ if (!alien_script.empty()) {
+ column += 1;
+ os << "}";
+ alien_script.clear();
+ }
bool needPar = false;
column += running_font.latexWriteEndChanges(
os, bparams, runparams, basefont,
open_font = false;
}
- string const running_lang = runparams.use_polyglossia ?
- running_font.language()->polyglossia() : running_font.language()->babel();
- // close babel's font environment before opening CJK.
- string const lang_end_command = runparams.use_polyglossia ?
- "\\end{$$lang}" : lyxrc.language_command_end;
- bool const using_begin_end = runparams.use_polyglossia ||
- !lang_end_command.empty();
- if (!running_lang.empty() &&
- (!using_begin_end || running_lang == openLanguageName()) &&
- current_font.language()->encoding()->package() == Encoding::CJK) {
- string end_tag = subst(lang_end_command,
- "$$lang",
- running_lang);
- os << from_ascii(end_tag);
- column += end_tag.length();
- if (using_begin_end)
- popLanguageName();
+ // if necessary, close language environment before opening CJK
+ string const running_lang = running_font.language()->babel();
+ string const lang_end_command = lyxrc.language_command_end;
+ if (!lang_end_command.empty() && !bparams.useNonTeXFonts
+ && !running_lang.empty()
+ && running_lang == openLanguageName()
+ && current_font.language()->encoding()->package() == Encoding::CJK) {
+ string end_tag = subst(lang_end_command, "$$lang", running_lang);
+ os << from_ascii(end_tag);
+ column += end_tag.length();
+ popLanguageName();
}
// Switch file encoding if necessary (and allowed)
--parInline;
}
} else if (i >= start_pos && (end_pos == -1 || i < end_pos)) {
+ if (!bparams.useNonTeXFonts)
+ script = Encodings::isKnownScriptChar(c);
+ if (script != alien_script) {
+ if (!alien_script.empty()) {
+ os << "}";
+ alien_script.clear();
+ }
+ string fontenc = running_font.language()->fontenc(bparams);
+ if (!script.empty()
+ && !Encodings::fontencSupportsScript(fontenc, script)) {
+ column += script.length() + 2;
+ os << "\\" << script << "{";
+ alien_script = script;
+ }
+ }
try {
- d->latexSpecialChar(os, bparams, rp,
- running_font, runningChange,
- style, i, end_pos, column);
+ d->latexSpecialChar(os, bparams, rp, running_font,
+ alien_script, style, i, end_pos, column);
} catch (EncodingException & e) {
if (runparams.dryrun) {
os << "<" << _("LyX Warning: ")
// such as Note that do not produce any output, so that no
// command is ever executed but its opening was recorded.
runparams.inulemcmd = rp.inulemcmd;
+
+ // And finally, pass the post_macros upstream
+ runparams.post_macro = rp.post_macro;
+ }
+
+ // Close wrapper for alien script
+ if (!alien_script.empty()) {
+ os << "}";
+ alien_script.clear();
}
// If we have an open font definition, we have to close it
FontShape curr_fs = INHERIT_SHAPE;
FontFamily curr_fam = INHERIT_FAMILY;
- FontSize curr_size = FONT_SIZE_INHERIT;
+ FontSize curr_size = INHERIT_SIZE;
string const default_family =
buf.masterBuffer()->params().fonts_default_family;
if (old_size != curr_size) {
if (size_flag) {
switch (old_size) {
- case FONT_SIZE_TINY:
+ case TINY_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_TINY));
break;
- case FONT_SIZE_SCRIPT:
+ case SCRIPT_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_SCRIPT));
break;
- case FONT_SIZE_FOOTNOTE:
+ case FOOTNOTE_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_FOOTNOTE));
break;
- case FONT_SIZE_SMALL:
+ case SMALL_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_SMALL));
break;
- case FONT_SIZE_LARGE:
+ case LARGE_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_LARGE));
break;
- case FONT_SIZE_LARGER:
+ case LARGER_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_LARGER));
break;
- case FONT_SIZE_LARGEST:
+ case LARGEST_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_LARGEST));
break;
- case FONT_SIZE_HUGE:
+ case HUGE_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_HUGE));
break;
- case FONT_SIZE_HUGER:
+ case HUGER_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_HUGER));
break;
- case FONT_SIZE_INCREASE:
+ case INCREASE_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_INCREASE));
break;
- case FONT_SIZE_DECREASE:
+ case DECREASE_SIZE:
tagsToClose.push_back(html::EndFontTag(html::FT_SIZE_DECREASE));
break;
- case FONT_SIZE_INHERIT:
- case FONT_SIZE_NORMAL:
+ case INHERIT_SIZE:
+ case NORMAL_SIZE:
break;
default:
// the other tags are for internal use
size_flag = false;
}
switch (curr_size) {
- case FONT_SIZE_TINY:
+ case TINY_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_TINY));
size_flag = true;
break;
- case FONT_SIZE_SCRIPT:
+ case SCRIPT_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_SCRIPT));
size_flag = true;
break;
- case FONT_SIZE_FOOTNOTE:
+ case FOOTNOTE_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_FOOTNOTE));
size_flag = true;
break;
- case FONT_SIZE_SMALL:
+ case SMALL_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_SMALL));
size_flag = true;
break;
- case FONT_SIZE_LARGE:
+ case LARGE_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_LARGE));
size_flag = true;
break;
- case FONT_SIZE_LARGER:
+ case LARGER_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_LARGER));
size_flag = true;
break;
- case FONT_SIZE_LARGEST:
+ case LARGEST_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_LARGEST));
size_flag = true;
break;
- case FONT_SIZE_HUGE:
+ case HUGE_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_HUGE));
size_flag = true;
break;
- case FONT_SIZE_HUGER:
+ case HUGER_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_HUGER));
size_flag = true;
break;
- case FONT_SIZE_INCREASE:
+ case INCREASE_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_INCREASE));
size_flag = true;
break;
- case FONT_SIZE_DECREASE:
+ case DECREASE_SIZE:
tagsToOpen.push_back(html::FontTag(html::FT_SIZE_DECREASE));
size_flag = true;
break;
- case FONT_SIZE_NORMAL:
- case FONT_SIZE_INHERIT:
+ case NORMAL_SIZE:
+ case INHERIT_SIZE:
break;
default:
// the other tags are for internal use
} else {
char_type c = getUChar(buf.masterBuffer()->params(),
runparams, i);
- xs << c;
+ if (c == ' ' && (style.free_spacing || runparams.free_spacing))
+ xs << XHTMLStream::ESCAPE_NONE << " ";
+ else
+ xs << c;
}
font_old = font.fontInfo();
}
}
// now check whether we have insets that need cprotection
- pos_type size = d->text_.size();
- for (pos_type i = 0; i < size; ++i)
- if (isInset(i) && getInset(i)->needsCProtection(maintext, fragile))
+ pos_type size = pos_type(d->text_.size());
+ for (pos_type i = 0; i < size; ++i) {
+ if (!isInset(i))
+ continue;
+ Inset const * ins = getInset(i);
+ if (ins->needsCProtection(maintext, fragile))
+ return true;
+ if (ins->getLayout().latextype() == InsetLayout::ENVIRONMENT)
+ // Environments need cprotection regardless the content
+ return true;
+ // Now check math environments
+ InsetMath const * im = getInset(i)->asInsetMath();
+ if (!im || im->cell(0).empty())
+ continue;
+ switch(im->cell(0)[0]->lyxCode()) {
+ case MATH_AMSARRAY_CODE:
+ case MATH_SUBSTACK_CODE:
+ case MATH_ENV_CODE:
+ case MATH_XYMATRIX_CODE:
+ // these need cprotection
return true;
+ default:
+ break;
+ }
+ }
return false;
}
bool Paragraph::brokenBiblio() const
{
- // there is a problem if there is no bibitem at position 0 or
- // if there is another bibitem in the paragraph.
- return d->layout_->labeltype == LABEL_BIBLIO
+ // There is a problem if there is no bibitem at position 0 in
+ // paragraphs that need one, if there is another bibitem in the
+ // paragraph or if this paragraph is not supposed to have
+ // a bibitem inset at all.
+ return ((d->layout_->labeltype == LABEL_BIBLIO
&& (d->insetlist_.find(BIBITEM_CODE) != 0
- || d->insetlist_.find(BIBITEM_CODE, 1) > 0);
+ || d->insetlist_.find(BIBITEM_CODE, 1) > 0))
+ || (d->layout_->labeltype != LABEL_BIBLIO
+ && d->insetlist_.find(BIBITEM_CODE) != -1));
}
int Paragraph::fixBiblio(Buffer const & buffer)
{
- // FIXME: What about the case where paragraph is not BIBLIO
- // but there is an InsetBibitem?
// FIXME: when there was already an inset at 0, the return value is 1,
// which does not tell whether another inset has been remove; the
// cursor cannot be correctly updated.
- if (d->layout_->labeltype != LABEL_BIBLIO)
- return 0;
-
bool const track_changes = buffer.params().track_changes;
int bibitem_pos = d->insetlist_.find(BIBITEM_CODE);
- bool const hasbibitem0 = bibitem_pos == 0;
+ // The case where paragraph is not BIBLIO
+ if (d->layout_->labeltype != LABEL_BIBLIO) {
+ if (bibitem_pos == -1)
+ // No InsetBibitem => OK
+ return 0;
+ // There is an InsetBibitem: remove it!
+ d->insetlist_.release(bibitem_pos);
+ eraseChar(bibitem_pos, track_changes);
+ return (bibitem_pos == 0) ? -1 : -bibitem_pos;
+ }
+
+ bool const hasbibitem0 = bibitem_pos == 0;
if (hasbibitem0) {
bibitem_pos = d->insetlist_.find(BIBITEM_CODE, 1);
- // There was an InsetBibitem at pos 0, and no other one => OK
+ // There was an InsetBibitem at pos 0,
+ // and no other one => OK
if (bibitem_pos == -1)
return 0;
// there is a bibitem at the 0 position, but since
}
// We need to create an inset at the beginning
- Inset * inset = 0;
+ Inset * inset = nullptr;
if (bibitem_pos > 0) {
// there was one somewhere in the paragraph, let's move it
inset = d->insetlist_.release(bibitem_pos);
insertInset(0, inset, font, Change(track_changes ? Change::INSERTED
: Change::UNCHANGED));
+ // This is needed to get the counters right
+ buffer.updateBuffer();
return 1;
}
projects / lyx.git / blobdiff