#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 "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>
#include <vector>
-using std::endl;
-using std::string;
-using std::ostream;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::contains;
-using support::lowercase;
-using support::prefixIs;
-using support::suffixIs;
-using support::rsplit;
-using support::uppercase;
-
namespace {
/// Inset identifier (above 0x10ffff, for ucs-4)
char_type const META_INSET = 0x200001;
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 c.
+ /// specified by the latex macro \p ltx, to \p os starting from \p i.
/// \return the number of characters written.
- int writeScriptChars(odocstream & os, char_type c, docstring const & ltx,
- 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,
pos_type initial) const;
/// match a string against a particular point in the paragraph
- bool isTextAt(std::string const & str, pos_type pos) const;
+ bool isTextAt(string const & str, pos_type pos) const;
/// Which Paragraph owns us?
Paragraph * owner_;
};
-
-
-using std::endl;
-using std::upper_bound;
-using std::lower_bound;
-using std::string;
-
-
// Initialization of the counter for the paragraph id's,
unsigned int Paragraph::Private::paragraph_id = 0;
};
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);
// This is actually very common when parsing buffers (and
// maybe inserting ascii text)
- if (pos == text_.size()) {
+ if (pos == pos_type(text_.size())) {
// when appending characters, no need to update tables
text_.push_back(c);
return;
int Paragraph::Private::writeScriptChars(odocstream & os,
- char_type c,
docstring const & ltx,
Change & runningChange,
Encoding const & encoding,
pos_type & i)
{
- // We only arrive here when a proper language for character c has not
- // been specified (i.e., it could not be translated in the current
+ // 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 c as specified in
+ // 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 c
+ // 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>"
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
default:
// LyX, LaTeX etc.
- if (latexSpecialPhrase(os, i, column))
+ if (latexSpecialPhrase(os, i, column, runparams))
return;
if (c == '\0')
docstring const latex = encoding.latexChar(c);
if (Encodings::isKnownScriptChar(c, script)
&& prefixIs(latex, from_ascii("\\" + script)))
- column += writeScriptChars(os, c, latex,
+ column += writeScriptChars(os, latex,
running_change, encoding, i) - 1;
else if (latex.length() > 1 && latex[latex.length() - 1] != '}') {
// Prevent eating of a following
os.put(c);
// In T1 encoding, these characters exist
// but we should avoid ligatures
- if (i + 1 > int(text_.size()) || text_[i + 1] != c)
+ if (i + 1 >= int(text_.size()) || text_[i + 1] != c)
return true;
os << "\\,{}";
column += 3;
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;
// this check is to amend a bug. LyX sometimes
// inserts '\0' this could cause problems.
if (c != '\0') {
- std::vector<char> tmp = ucs4_to_utf8(c);
+ vector<char> tmp = ucs4_to_utf8(c);
tmp.push_back('\0');
os << &tmp[0];
} else
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));
+ d->text_.reserve(max(capacity + 100, newsize));
// when appending characters, no need to update tables
d->text_.append(s);
for (; cit != end; ++cit) {
if (cit->pos() >= pos) {
if (pos >= beginOfBody())
- return FontSpan(std::max(start, beginOfBody()),
+ return FontSpan(max(start, beginOfBody()),
cit->pos());
else
return FontSpan(start,
- std::min(beginOfBody() - 1,
+ min(beginOfBody() - 1,
cit->pos()));
}
start = cit->pos() + 1;
docstring const Paragraph::translateIfPossible(docstring const & s,
BufferParams const & bparams) const
{
- if (!support::isAscii(s) || s.empty()) {
+ if (!isAscii(s) || s.empty()) {
// This must be a user defined layout. We cannot translate
// this, since gettext accepts only ascii keys.
return s;
odocstream & os, TexRow & texrow,
OutputParams const & runparams) const
{
- LYXERR(Debug::LATEX) << "SimpleTeXOnePar... " << this << endl;
+ LYXERR(Debug::LATEX, "SimpleTeXOnePar... " << this);
bool return_value = false;
open_font = false;
}
+ // close babel's font environment before opening CJK.
+ if (!running_font.language()->babel().empty() &&
+ font.language()->encoding()->package() == Encoding::CJK) {
+ string end_tag = subst(lyxrc.language_command_end,
+ "$$lang",
+ running_font.language()->babel());
+ os << from_ascii(end_tag);
+ column += end_tag.length();
+ }
+
// Switch file encoding if necessary (and allowed)
if (!runparams.verbatim &&
- runparams.encoding->package() == Encoding::inputenc &&
- font.language()->encoding()->package() == Encoding::inputenc) {
- std::pair<bool, int> const enc_switch = switchEncoding(os, bparams,
- runparams.moving_arg, *(runparams.encoding),
- *(font.language()->encoding()));
+ runparams.encoding->package() == Encoding::none &&
+ font.language()->encoding()->package() == Encoding::none) {
+ pair<bool, int> const enc_switch = switchEncoding(os, bparams,
+ runparams, *(font.language()->encoding()));
if (enc_switch.first) {
column += enc_switch.second;
runparams.encoding = font.language()->encoding();
texrow, rp, running_font,
basefont, outerfont, open_font,
runningChange, *style, i, column);
- else
- d->latexSpecialChar(os, rp, running_font, runningChange,
- *style, i, column);
+ else {
+ try {
+ d->latexSpecialChar(os, rp, running_font, runningChange,
+ *style, i, column);
+ } catch (EncodingException & e) {
+ // add location information and throw again.
+ e.par_id = id();
+ e.pos = i;
+ throw(e);
+ }
+ }
// Set the encoding to that returned from simpleTeXSpecialChars (see
// comment for encoding member in OutputParams.h)
runparams.moving_arg);
}
- LYXERR(Debug::LATEX) << "SimpleTeXOnePar...done " << this << endl;
+ LYXERR(Debug::LATEX, "SimpleTeXOnePar...done " << this);
return return_value;
}
projects / features.git / blobdiff