#include "Changes.h"
#include "Counters.h"
#include "Encoding.h"
-#include "debug.h"
-#include "gettext.h"
#include "InsetList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
-#include "Color.h"
#include "Layout.h"
#include "Length.h"
#include "Font.h"
#include "FontList.h"
#include "LyXRC.h"
-#include "Messages.h"
#include "OutputParams.h"
#include "output_latex.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "sgml.h"
+#include "TextClass.h"
#include "TexRow.h"
#include "VSpace.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetLabel.h"
-#include "insets/InsetOptArg.h"
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
+#include "support/Messages.h"
#include "support/textutils.h"
-#include "support/convert.h"
#include "support/unicode.h"
#include <sstream>
using support::prefixIs;
using support::suffixIs;
using support::rsplit;
-using support::rtrim;
using support::uppercase;
namespace {
/// Output a space in appropriate formatting (or a surrogate pair
/// if the next character is a combining character).
/// \return whether a surrogate pair was output.
- bool simpleTeXBlanks(Encoding const &,
+ bool simpleTeXBlanks(OutputParams const &,
odocstream &, TexRow & texrow,
pos_type i,
unsigned int & column,
Font const & font,
Layout const & style);
- /// Output consecutive known unicode chars, belonging to the same
- /// language as specified by \p preamble, to \p os starting from \p c.
+ /// 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 knownLangChars(odocstream & os, char_type c, string & preamble,
- Change &, Encoding const &, pos_type &);
+ int writeScriptChars(odocstream & os, docstring const & ltx,
+ Change &, Encoding const &, pos_type & i);
/// This could go to ParagraphParameters if we want to.
int startTeXParParams(BufferParams const &, odocstream &, TexRow &,
bool latexSpecialPhrase(
odocstream & os,
pos_type & i,
- unsigned int & column);
+ unsigned int & column,
+ OutputParams & runparams);
///
void validate(LaTeXFeatures & features,
Layout const & layout) const;
- ///
- pos_type size() const { return owner_->size(); }
+ /// Checks if the paragraph contains only text and no inset or font change.
+ bool onlyText(Buffer const & buf, Font const & outerfont,
+ pos_type initial) const;
/// match a string against a particular point in the paragraph
bool isTextAt(std::string const & str, pos_type pos) const;
///
ParagraphParameters params_;
+ /// position of the paragraph in the buffer. Only macros from
+ /// paragraphs strictly smaller are visible in this paragraph
+ unsigned int macrocontext_position_;
+
/// for recording and looking up changes
Changes changes_;
};
special_phrase const special_phrases[] = {
- { "LyX", from_ascii("\\protect\\LyX{}"), false },
- { "TeX", from_ascii("\\protect\\TeX{}"), true },
- { "LaTeX2e", from_ascii("\\protect\\LaTeXe{}"), true },
- { "LaTeX", from_ascii("\\protect\\LaTeX{}"), true },
+ { "LyX", from_ascii("\\LyX{}"), false },
+ { "TeX", from_ascii("\\TeX{}"), true },
+ { "LaTeX2e", from_ascii("\\LaTeXe{}"), true },
+ { "LaTeX", from_ascii("\\LaTeX{}"), true },
};
size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
: owner_(owner), inset_owner_(0), begin_of_body_(0)
{
id_ = paragraph_id++;
+ macrocontext_position_ = 0;
text_.reserve(100);
}
void Paragraph::Private::insertChar(pos_type pos, char_type c,
Change const & change)
{
- BOOST_ASSERT(pos >= 0 && pos <= size());
+ BOOST_ASSERT(pos >= 0 && pos <= int(text_.size()));
// track change
changes_.insert(change, pos);
// This is actually very common when parsing buffers (and
// maybe inserting ascii text)
- if (pos == size()) {
+ if (pos == pos_type(text_.size())) {
// when appending characters, no need to update tables
text_.push_back(c);
return;
}
-bool Paragraph::Private::simpleTeXBlanks(Encoding const & encoding,
+bool Paragraph::Private::simpleTeXBlanks(OutputParams const & runparams,
odocstream & os, TexRow & texrow,
pos_type i,
unsigned int & column,
Font const & font,
Layout const & style)
{
- if (style.pass_thru)
+ if (style.pass_thru || runparams.verbatim)
return false;
- if (i + 1 < size()) {
+ if (i + 1 < int(text_.size())) {
char_type next = text_[i + 1];
if (Encodings::isCombiningChar(next)) {
+ Encoding const & encoding = *(runparams.encoding);
// This space has an accent, so we must always output it.
column += latexSurrogatePair(os, ' ', next, encoding) - 1;
return true;
&& column > lyxrc.plaintext_linelen
&& i
&& text_[i - 1] != ' '
- && (i + 1 < size())
+ && (i + 1 < int(text_.size()))
// same in FreeSpacing mode
&& !owner_->isFreeSpacing()
// In typewriter mode, we want to avoid
// ! . ? : at the end of a line
- && !(font.family() == Font::TYPEWRITER_FAMILY
+ && !(font.fontInfo().family() == TYPEWRITER_FAMILY
&& (text_[i - 1] == '.'
|| text_[i - 1] == '?'
|| text_[i - 1] == ':'
}
-int Paragraph::Private::knownLangChars(odocstream & os,
- char_type c,
- string & preamble,
- Change & runningChange,
- Encoding const & encoding,
- pos_type & i)
-{
- // When the character is marked by the proper language, we simply
- // get its code point in some encoding, otherwise we get the
- // translation specified in the unicodesymbols file, which is
- // something like "\textLANG{<spec>}". So, we have to retain
- // "\textLANG{<spec>" for the first char but only "<spec>" for
- // all subsequent chars.
- docstring const latex1 = rtrim(encoding.latexChar(c), "}");
- int length = latex1.length();
- os << latex1;
- while (i + 1 < size()) {
- char_type next = text_[i + 1];
- // Stop here if next character belongs to another
- // language or there is a change tracking status.
- if (!Encodings::isKnownLangChar(next, preamble) ||
+int Paragraph::Private::writeScriptChars(odocstream & os,
+ docstring const & ltx,
+ Change & runningChange,
+ Encoding const & encoding,
+ pos_type & i)
+{
+ // FIXME: modifying i here is not very nice...
+
+ // We only arrive here when a proper language for character text_[i] has
+ // not been specified (i.e., it could not be translated in the current
+ // latex encoding) 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 length = ltx.substr(0, brace2).length();
+ os << ltx.substr(0, brace2);
+ 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;
if (cit->pos() >= i + 1)
break;
}
- // Stop here if there is a font attribute change.
+ // Stop here if there is a font attribute or encoding change.
if (found && cit != end && prev_font != cit->font())
break;
- docstring const latex = rtrim(encoding.latexChar(next), "}");
- docstring::size_type const j =
+ docstring const latex = encoding.latexChar(next);
+ docstring::size_type const b1 =
latex.find_first_of(from_ascii("{"));
- if (j == docstring::npos) {
- os << latex;
- length += latex.length();
- } else {
- os << latex.substr(j + 1);
- length += latex.substr(j + 1).length();
- }
+ 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;
}
- // When the proper language is set, we are simply passed a code
- // point, so we should not try to close the \textLANG command.
- if (prefixIs(latex1, from_ascii("\\" + preamble))) {
- os << '}';
- ++length;
- }
+ os << '}';
+ ++length;
return length;
}
pos_type const len = str.length();
// is the paragraph large enough?
- if (pos + len > size())
+ if (pos + len > int(text_.size()))
return false;
// does the wanted text start at point?
open_font = false;
}
- if (running_font.family() == Font::TYPEWRITER_FAMILY)
+ if (running_font.fontInfo().family() == TYPEWRITER_FAMILY)
os << '~';
basefont = owner_->getLayoutFont(bparams, outerfont);
if (runparams.moving_arg)
os << "\\protect ";
- os << "\\\\\n";
}
texrow.newline();
texrow.start(owner_->id(), i + 1);
bool close = false;
odocstream::pos_type const len = os.tellp();
- if ((inset->lyxCode() == GRAPHICS_CODE
- || inset->lyxCode() == MATH_CODE
- || inset->lyxCode() == HYPERLINK_CODE)
- && running_font.isRightToLeft()) {
+ if (inset->forceLTR()
+ && running_font.isRightToLeft()
+ // ERT is an exception, it should be output with no decorations at all
+ && inset->lyxCode() != ERT_CODE) {
if (running_font.language()->lang() == "farsi")
os << "\\beginL{}";
else
if (lyxrc.fontenc == "T1" && latexSpecialT1(c, os, i, column))
return;
- if (running_font.family() == Font::TYPEWRITER_FAMILY
+ if (running_font.fontInfo().family() == TYPEWRITER_FAMILY
&& latexSpecialTypewriter(c, os, i, column))
return;
default:
// LyX, LaTeX etc.
- if (latexSpecialPhrase(os, i, column))
+ if (latexSpecialPhrase(os, i, column, runparams))
return;
if (c == '\0')
return;
Encoding const & encoding = *(runparams.encoding);
- if (i + 1 < size()) {
+ if (i + 1 < int(text_.size())) {
char_type next = text_[i + 1];
if (Encodings::isCombiningChar(next)) {
column += latexSurrogatePair(os, c, next, encoding) - 1;
break;
}
}
- string preamble;
- if (Encodings::isKnownLangChar(c, preamble)) {
- column += knownLangChars(os, c, preamble, running_change,
- encoding, i) - 1;
- break;
- }
+ string script;
docstring const latex = encoding.latexChar(c);
- if (latex.length() > 1 && latex[latex.length() - 1] != '}') {
+ if (Encodings::isKnownScriptChar(c, script)
+ && prefixIs(latex, from_ascii("\\" + script)))
+ column += writeScriptChars(os, latex,
+ running_change, encoding, i) - 1;
+ else if (latex.length() > 1 && latex[latex.length() - 1] != '}') {
// Prevent eating of a following
// space or command corruption by
// following characters
os.put(c);
// In T1 encoding, these characters exist
// but we should avoid ligatures
- if (i + 1 > size() || text_[i + 1] != c)
+ if (i + 1 > int(text_.size()) || text_[i + 1] != c)
return true;
os << "\\,{}";
column += 3;
{
switch (c) {
case '-':
- if (i + 1 < size() && text_[i + 1] == '-') {
+ if (i + 1 < int(text_.size()) && text_[i + 1] == '-') {
// "--" in Typewriter mode -> "-{}-"
os << "-{}";
column += 2;
bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
- unsigned int & column)
+ unsigned int & column, OutputParams & runparams)
{
// FIXME: if we have "LaTeX" with a font
// change in the middle (before the 'T', then
for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
if (!isTextAt(special_phrases[pnr].phrase, i))
continue;
+ if (runparams.moving_arg)
+ os << "\\protect";
os << special_phrases[pnr].macro;
i += special_phrases[pnr].phrase.length() - 1;
column += special_phrases[pnr].macro.length() - 1;
}
// then the contents
- for (pos_type i = 0; i < size() ; ++i) {
+ for (pos_type i = 0; i < int(text_.size()) ; ++i) {
for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
if (!special_phrases[pnr].builtin
&& isTextAt(special_phrases[pnr].phrase, i)) {
params().write(os);
- Font font1(Font::ALL_INHERIT, bparams.language);
+ Font font1(inherit_font, bparams.language);
Change running_change = Change(Change::UNCHANGED);
void Paragraph::appendString(docstring const & s, Font const & font,
Change const & change)
{
- size_t end = s.size();
+ pos_type end = s.size();
size_t oldsize = d->text_.size();
size_t newsize = oldsize + end;
size_t capacity = d->text_.capacity();
if (newsize >= capacity)
d->text_.reserve(std::max(capacity + 100, newsize));
+ // when appending characters, no need to update tables
+ d->text_.append(s);
+
// FIXME: Optimize this!
for (pos_type i = 0; i != end; ++i) {
// track change
d->changes_.insert(change, i);
- // when appending characters, no need to update tables
- d->text_.push_back(s[i]);
}
- d->fontlist_.setRange(oldsize, newsize, font);
+ d->fontlist_.set(oldsize, font);
+ d->fontlist_.set(newsize - 1, font);
}
}
+void Paragraph::resetFonts(Font const & font)
+{
+ d->fontlist_.clear();
+ d->fontlist_.set(0, font);
+ d->fontlist_.set(d->text_.size() - 1, font);
+}
+
// Gets uninstantiated font setting at position.
Font const Paragraph::getFontSettings(BufferParams const & bparams,
pos_type pos) const
if (pos == size() && !empty())
return getFontSettings(bparams, pos - 1);
- return Font(Font::ALL_INHERIT, getParLanguage(bparams));
+ return Font(inherit_font, getParLanguage(bparams));
}
if (!empty() && !d->fontlist_.empty())
return d->fontlist_.begin()->font();
- return Font(Font::ALL_INHERIT, bparams.language);
+ return Font(inherit_font, bparams.language);
}
pos_type const body_pos = beginOfBody();
if (pos < body_pos)
- font.realize(d->layout_->labelfont);
+ font.fontInfo().realize(d->layout_->labelfont);
else
- font.realize(d->layout_->font);
+ font.fontInfo().realize(d->layout_->font);
- font.realize(outerfont);
- font.realize(bparams.getFont());
+ font.fontInfo().realize(outerfont.fontInfo());
+ font.fontInfo().realize(bparams.getFont().fontInfo());
return font;
}
Font const Paragraph::getLabelFont
(BufferParams const & bparams, Font const & outerfont) const
{
- Font tmpfont = layout()->labelfont;
- tmpfont.setLanguage(getParLanguage(bparams));
- tmpfont.realize(outerfont);
- tmpfont.realize(bparams.getFont());
- return tmpfont;
+ FontInfo tmpfont = layout()->labelfont;
+ tmpfont.realize(outerfont.fontInfo());
+ tmpfont.realize(bparams.getFont().fontInfo());
+ return Font(tmpfont, getParLanguage(bparams));
}
Font const Paragraph::getLayoutFont
(BufferParams const & bparams, Font const & outerfont) const
{
- Font tmpfont = layout()->font;
- tmpfont.setLanguage(getParLanguage(bparams));
- tmpfont.realize(outerfont);
- tmpfont.realize(bparams.getFont());
- return tmpfont;
+ FontInfo tmpfont = layout()->font;
+ tmpfont.realize(outerfont.fontInfo());
+ tmpfont.realize(bparams.getFont().fontInfo());
+ return Font(tmpfont, getParLanguage(bparams));
}
/// Returns the height of the highest font in range
-Font_size Paragraph::highestFontInRange
- (pos_type startpos, pos_type endpos, Font_size def_size) const
+FontSize Paragraph::highestFontInRange
+ (pos_type startpos, pos_type endpos, FontSize def_size) const
{
return d->fontlist_.highestInRange(startpos, endpos, def_size);
}
}
-InsetBibitem * Paragraph::bibitem() const
-{
- if (!d->insetlist_.empty()) {
- Inset * inset = d->insetlist_.begin()->inset;
- if (inset->lyxCode() == BIBITEM_CODE)
- return static_cast<InsetBibitem *>(inset);
- }
- return 0;
-}
-
-
bool Paragraph::forceDefaultParagraphs() const
{
return inInset() && inInset()->forceDefaultParagraphs(0);
odocstream & os, TexRow & texrow,
OutputParams const & runparams) const
{
- LYXERR(Debug::LATEX) << "SimpleTeXOnePar... " << this << endl;
+ LYXERR(Debug::LATEX, "SimpleTeXOnePar... " << this);
bool return_value = false;
// style->pass_thru is false.
if (i != body_pos - 1) {
if (d->simpleTeXBlanks(
- *(runparams.encoding), os, texrow,
+ runparams, os, texrow,
i, column, font, *style)) {
// A surrogate pair was output. We
// must not call latexSpecialChar
runparams.moving_arg);
}
- LYXERR(Debug::LATEX) << "SimpleTeXOnePar...done " << this << endl;
+ LYXERR(Debug::LATEX, "SimpleTeXOnePar...done " << this);
return return_value;
}
-namespace {
-
-enum PAR_TAG {
- PAR_NONE=0,
- TT = 1,
- SF = 2,
- BF = 4,
- IT = 8,
- SL = 16,
- EM = 32
-};
-
-
-string tag_name(PAR_TAG const & pt) {
- switch (pt) {
- case PAR_NONE: return "!-- --";
- case TT: return "tt";
- case SF: return "sf";
- case BF: return "bf";
- case IT: return "it";
- case SL: return "sl";
- case EM: return "em";
- }
- return "";
-}
-
-
-inline
-void operator|=(PAR_TAG & p1, PAR_TAG const & p2)
-{
- p1 = static_cast<PAR_TAG>(p1 | p2);
-}
-
-
-inline
-void reset(PAR_TAG & p1, PAR_TAG const & p2)
-{
- p1 = static_cast<PAR_TAG>(p1 & ~p2);
-}
-
-} // anon
-
-
bool Paragraph::emptyTag() const
{
for (pos_type i = 0; i < size(); ++i) {
}
-bool Paragraph::onlyText(Buffer const & buf, Font const & outerfont, pos_type initial) const
+bool Paragraph::Private::onlyText(Buffer const & buf, Font const & outerfont, pos_type initial) const
{
Font font_old;
-
- for (pos_type i = initial; i < size(); ++i) {
- Font font = getFont(buf.params(), i, outerfont);
- if (isInset(i))
+ pos_type size = text_.size();
+ for (pos_type i = initial; i < size; ++i) {
+ Font font = owner_->getFont(buf.params(), i, outerfont);
+ if (text_[i] == META_INSET)
return false;
if (i != initial && font != font_old)
return false;
bool emph_flag = false;
LayoutPtr const & style = layout();
- Font font_old =
+ FontInfo font_old =
style->labeltype == LABEL_MANUAL ? style->labelfont : style->font;
- if (style->pass_thru && !onlyText(buf, outerfont, initial))
+ if (style->pass_thru && !d->onlyText(buf, outerfont, initial))
os << "]]>";
// parsing main loop
Font font = getFont(buf.params(), i, outerfont);
// handle <emphasis> tag
- if (font_old.emph() != font.emph()) {
- if (font.emph() == Font::ON) {
+ if (font_old.emph() != font.fontInfo().emph()) {
+ if (font.fontInfo().emph() == FONT_ON) {
os << "<emphasis>";
emph_flag = true;
} else if (i != initial) {
else
os << sgml::escapeChar(c);
}
- font_old = font;
+ font_old = font.fontInfo();
}
if (emph_flag) {
if (style->free_spacing)
os << '\n';
- if (style->pass_thru && !onlyText(buf, outerfont, initial))
+ if (style->pass_thru && !d->onlyText(buf, outerfont, initial))
os << "<
projects / lyx.git / blobdiff