/// if the next character is a combining character).
/// \return whether a surrogate pair was output.
bool simpleTeXBlanks(OutputParams const &,
- otexstream &, TexRow & texrow,
+ otexstream &,
pos_type i,
unsigned int & column,
Font const & font,
Change const &, Encoding const &, pos_type & i);
/// This could go to ParagraphParameters if we want to.
- int startTeXParParams(BufferParams const &, otexstream &, TexRow &,
+ int startTeXParParams(BufferParams const &, otexstream &,
OutputParams const &) const;
/// This could go to ParagraphParameters if we want to.
- int endTeXParParams(BufferParams const &, otexstream &, TexRow &,
+ int endTeXParParams(BufferParams const &, otexstream &,
OutputParams const &) const;
///
void latexInset(BufferParams const &,
otexstream &,
- TexRow & texrow, OutputParams &,
+ OutputParams &,
Font & running_font,
Font & basefont,
Font const & outerfont,
Change const & running_change,
Layout const & style,
pos_type & i,
+ pos_type end_pos,
unsigned int & column);
///
bool latexSpecialPhrase(
otexstream & os,
pos_type & i,
+ pos_type end_pos,
unsigned int & column,
OutputParams const & runparams);
bool Paragraph::Private::simpleTeXBlanks(OutputParams const & runparams,
- otexstream & os, TexRow & texrow,
+ otexstream & os,
pos_type i,
unsigned int & column,
Font const & font,
|| text_[i - 1] == ':'
|| text_[i - 1] == '!'))) {
os << '\n';
- texrow.newline();
- texrow.start(owner_->id(), i + 1);
+ os.texrow().start(owner_->id(), i + 1);
column = 0;
} else if (style.free_spacing) {
os << '~';
void Paragraph::Private::latexInset(BufferParams const & bparams,
otexstream & os,
- TexRow & texrow,
OutputParams & runparams,
Font & running_font,
Font & basefont,
os << "\\protect ";
}
- texrow.newline();
- texrow.start(owner_->id(), i + 1);
+ os.texrow().start(owner_->id(), i + 1);
column = 0;
}
// ArabTeX, though, cannot handle this special behavior, it seems.
bool arabtex = basefont.language()->lang() == "arabic_arabtex"
|| running_font.language()->lang() == "arabic_arabtex";
- if (open_font && inset->noFontChange()) {
+ if (open_font && !inset->inheritFont()) {
bool closeLanguage = arabtex
|| basefont.isRightToLeft() == running_font.isRightToLeft();
unsigned int count = running_font.latexWriteEndChanges(os,
}
}
- int tmp;
+ int prev_rows = os.texrow().rows();
try {
- tmp = inset->latex(os, runparams);
+ inset->latex(os, runparams);
} catch (EncodingException & e) {
// add location information and throw again.
e.par_id = id_;
os << '}';
}
- if (tmp) {
- texrow.newlines(tmp);
- texrow.start(owner_->id(), i + 1);
+ if (os.texrow().rows() > prev_rows) {
+ os.texrow().start(owner_->id(), i + 1);
column = 0;
} else {
column += (unsigned int)(os.os().tellp() - len);
Change const & running_change,
Layout const & style,
pos_type & i,
+ pos_type end_pos,
unsigned int & column)
{
char_type const c = text_[i];
if (style.pass_thru || runparams.pass_thru) {
- if (c != '\0')
- // FIXME UNICODE: This can fail if c cannot
- // be encoded in the current encoding.
+ if (c != '\0') {
+ Encoding const * const enc = runparams.encoding;
+ if (enc && enc->latexChar(c, true).empty())
+ throw EncodingException(c);
os.put(c);
+ }
return;
}
default:
// LyX, LaTeX etc.
- if (latexSpecialPhrase(os, i, column, runparams))
+ if (latexSpecialPhrase(os, i, end_pos, column, runparams))
return;
if (c == '\0')
}
-bool Paragraph::Private::latexSpecialPhrase(otexstream & os, pos_type & i,
+/// \param end_pos
+/// If [start_pos, end_pos) does not include entirely the special phrase, then
+/// do not apply the macro transformation.
+bool Paragraph::Private::latexSpecialPhrase(otexstream & os, pos_type & i, pos_type end_pos,
unsigned int & column, OutputParams const & runparams)
{
// FIXME: if we have "LaTeX" with a font
// "words" for some definition of word
for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
- if (!isTextAt(special_phrases[pnr].phrase, i))
+ if (!isTextAt(special_phrases[pnr].phrase, i)
+ || (end_pos != -1 && i + int(special_phrases[pnr].phrase.size()) > end_pos))
continue;
if (runparams.moving_arg)
os << "\\protect";
Buffer const & buf = inset_owner_->buffer();
BufferParams const & bp = buf.params();
Font f;
- TexRow tr;
+ TexRow texrow;
// Using a string stream here circumvents the encoding
// switching machinery of odocstream. Therefore the
// output is wrong if this paragraph contains content
// that needs to switch encoding.
odocstringstream ods;
- otexstream os(ods);
+ otexstream os(ods, texrow);
if (is_command) {
- ods << '\\' << from_ascii(layout_->latexname());
+ os << '\\' << from_ascii(layout_->latexname());
// we have to provide all the optional arguments here, even though
// the last one is the only one we care about.
// Separate handling of optional argument inset.
}
docstring::size_type const length = ods.str().length();
// this will output "{" at the beginning, but not at the end
- owner_->latex(bp, f, os, tr, features.runparams(), 0, -1, true);
+ owner_->latex(bp, f, os, features.runparams(), 0, -1, true);
if (ods.str().length() > length) {
if (is_command)
ods << '}';
}
-void adjust_row_column(string const & str, TexRow & texrow, int & column)
+void adjust_column(string const & str, int & column)
{
if (!contains(str, "\n"))
column += str.size();
else {
string tmp;
- texrow.newline();
column = rsplit(str, tmp, '\n').size();
}
}
int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
- otexstream & os, TexRow & texrow,
- OutputParams const & runparams) const
+ otexstream & os, OutputParams const & runparams) const
{
int column = 0;
else
output = corrected_env(begin_tag, "flushright", code, lastpar);
os << from_ascii(output);
- adjust_row_column(output, texrow, column);
+ adjust_column(output, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
else
output = corrected_env(begin_tag, "flushleft", code, lastpar);
os << from_ascii(output);
- adjust_row_column(output, texrow, column);
+ adjust_column(output, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
output = corrected_env(begin_tag, "center", code, lastpar);
os << from_ascii(output);
- adjust_row_column(output, texrow, column);
+ adjust_column(output, column);
break;
}
}
int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
- otexstream & os, TexRow & texrow,
- OutputParams const & runparams) const
+ otexstream & os, OutputParams const & runparams) const
{
int column = 0;
else
output = corrected_env(end_tag, "flushright", code, lastpar);
os << from_ascii(output);
- adjust_row_column(output, texrow, column);
+ adjust_column(output, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
else
output = corrected_env(end_tag, "flushleft", code, lastpar);
os << from_ascii(output);
- adjust_row_column(output, texrow, column);
+ adjust_column(output, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
output = corrected_env(end_tag, "center", code, lastpar);
os << from_ascii(output);
- adjust_row_column(output, texrow, column);
+ adjust_column(output, column);
break;
}
}
// This one spits out the text of the paragraph
void Paragraph::latex(BufferParams const & bparams,
Font const & outerfont,
- otexstream & os, TexRow & texrow,
+ otexstream & os,
OutputParams const & runparams,
int start_pos, int end_pos, bool force) const
{
Encoding const * const prev_encoding = runparams.encoding;
- texrow.start(id(), 0);
+ os.texrow().start(id(), 0);
// if the paragraph is empty, the loop will not be entered at all
if (empty()) {
++column;
}
if (allowcust)
- column += d->startTeXParParams(bparams, os, texrow,
- runparams);
+ column += d->startTeXParParams(bparams, os, runparams);
}
for (pos_type i = 0; i < size(); ++i) {
if (allowcust)
column += d->startTeXParParams(bparams, os,
- texrow,
runparams);
}
// latexSpecialChar ignores spaces if
// style.pass_thru is false.
if (i != body_pos - 1) {
- if (d->simpleTeXBlanks(
- runparams, os, texrow,
+ if (d->simpleTeXBlanks(runparams, os,
i, column, font, style)) {
// A surrogate pair was output. We
// must not call latexSpecialChar
// and then split to handle the two modes separately.
if (c == META_INSET) {
if (i >= start_pos && (end_pos == -1 || i < end_pos)) {
- d->latexInset(bparams, os,
- texrow, rp, running_font,
+ d->latexInset(bparams, os, rp, running_font,
basefont, outerfont, open_font,
runningChange, style, i, column);
}
if (i >= start_pos && (end_pos == -1 || i < end_pos)) {
try {
d->latexSpecialChar(os, rp, running_font, runningChange,
- style, i, column);
+ style, i, end_pos, column);
} catch (EncodingException & e) {
if (runparams.dryrun) {
os << "<" << _("LyX Warning: ")
os << "}]~";
}
- if (allowcust && d->endTeXParParams(bparams, os, texrow, runparams)
+ if (allowcust && d->endTeXParParams(bparams, os, runparams)
&& runparams.encoding != prev_encoding) {
runparams.encoding = prev_encoding;
if (!runparams.isFullUnicode())