#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;
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_;
///
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_;
};
-
-
-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;
: owner_(owner), inset_owner_(0), begin_of_body_(0)
{
id_ = paragraph_id++;
- macrocontext_position_ = 0;
text_.reserve(100);
}
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
- || (inset->asInsetCollapsable()
- && inset->asInsetCollapsable()->forceLTR()
- // ERT is an exception, since it doesn't go to output
- && inset->lyxCode() != ERT_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
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;
// then the layouts
features.useLayout(layout.name());
+ if (!layout.requires().empty()) {
+ vector<string> req = layout.requires();
+ for (vector<string>::const_iterator it = req.begin();
+ it != req.end(); ++it) {
+ features.require(*it);
+ }
+ }
// then the fonts
fontlist_.validate(features);
// 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
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) {
+ if (runparams.dryrun) {
+ os << "<" << _("LyX Warning: ")
+ << _("uncodable character") << " '";
+ os.put(c);
+ os << "'>";
+ } else {
+ // 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;
}
}
-unsigned int Paragraph::macrocontextPosition() const
-{
- return d->macrocontext_position_;
-}
-
-
-void Paragraph::setMacrocontextPosition(unsigned int pos)
-{
- d->macrocontext_position_ = pos;
-}
-
-
void Paragraph::checkAuthors(AuthorList const & authorList)
{
d->changes_.checkAuthors(authorList);