#include "Buffer.h"
#include "BufferParams.h"
-#include "debug.h"
#include "Encoding.h"
#include "InsetList.h"
#include "Language.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
+#include "TextClass.h"
#include "TexRow.h"
#include "VSpace.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetOptArg.h"
+#include "support/assert.h"
+#include "support/debug.h"
#include "support/lstrings.h"
#include <boost/next_prior.hpp>
+using namespace std;
+using namespace lyx::support;
+
+
namespace lyx {
-using support::subst;
+namespace {
-using std::endl;
-using std::string;
-using std::pair;
-using std::make_pair;
+enum OpenEncoding {
+ none,
+ inputenc,
+ CJK
+};
+static int open_encoding_ = none;
+static bool cjk_inherited_ = false;
-namespace {
ParagraphList::const_iterator
TeXEnvironment(Buffer const & buf,
- ParagraphList const & paragraphs,
+ Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams);
ParagraphList::const_iterator
TeXOnePar(Buffer const & buf,
- ParagraphList const & paragraphs,
+ Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams,
ParagraphList::const_iterator
TeXDeeper(Buffer const & buf,
- ParagraphList const & paragraphs,
+ Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams)
{
- LYXERR(Debug::LATEX) << "TeXDeeper... " << &*pit << endl;
+ LYXERR(Debug::LATEX, "TeXDeeper... " << &*pit);
ParagraphList::const_iterator par = pit;
+ ParagraphList const & paragraphs = text.paragraphs();
+
while (par != paragraphs.end() &&
par->params().depth() == pit->params().depth()) {
- if (par->layout()->isEnvironment()) {
- par = TeXEnvironment(buf, paragraphs, par,
+ if (par->layout().isEnvironment()) {
+ par = TeXEnvironment(buf, text, par,
os, texrow, runparams);
} else {
- par = TeXOnePar(buf, paragraphs, par,
+ par = TeXOnePar(buf, text, par,
os, texrow, runparams);
}
}
- LYXERR(Debug::LATEX) << "TeXDeeper...done " << endl;
+ LYXERR(Debug::LATEX, "TeXDeeper...done ");
return par;
}
ParagraphList::const_iterator
TeXEnvironment(Buffer const & buf,
- ParagraphList const & paragraphs,
+ Text const & text,
ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams)
{
- LYXERR(Debug::LATEX) << "TeXEnvironment... " << &*pit << endl;
+ LYXERR(Debug::LATEX, "TeXEnvironment... " << &*pit);
BufferParams const & bparams = buf.params();
- LayoutPtr const & style = pit->layout();
+ Layout const & style = pit->forceEmptyLayout() ?
+ bparams.documentClass().emptyLayout() : pit->layout();
+
+ ParagraphList const & paragraphs = text.paragraphs();
Language const * const par_language = pit->getParLanguage(bparams);
Language const * const doc_language = bparams.language;
lyxrc.language_command_end,
"$$lang",
prev_par_language->babel()))
- << '\n';
+ // the '%' is necessary to prevent unwanted whitespace
+ << "%\n";
texrow.newline();
}
lyxrc.language_command_begin,
"$$lang",
par_language->babel()))
- << '\n';
+ // the '%' is necessary to prevent unwanted whitespace
+ << "%\n";
texrow.newline();
}
}
leftindent_open = true;
}
- if (style->isEnvironment()) {
- os << "\\begin{" << from_ascii(style->latexname()) << '}';
- if (style->optionalargs > 0) {
- int ret = latexOptArgInsets(buf, *pit, os, runparams,
- style->optionalargs);
+ if (style.isEnvironment()) {
+ os << "\\begin{" << from_ascii(style.latexname()) << '}';
+ if (style.optionalargs > 0) {
+ int ret = latexOptArgInsets(*pit, os, runparams,
+ style.optionalargs);
while (ret > 0) {
texrow.newline();
--ret;
}
}
- if (style->latextype == LATEX_LIST_ENVIRONMENT) {
+ if (style.latextype == LATEX_LIST_ENVIRONMENT) {
os << '{'
<< pit->params().labelWidthString()
<< "}\n";
- } else if (style->labeltype == LABEL_BIBLIO) {
+ } else if (style.labeltype == LABEL_BIBLIO) {
// ale970405
os << '{' << bibitemWidest(buf) << "}\n";
} else
- os << from_ascii(style->latexparam()) << '\n';
+ os << from_ascii(style.latexparam()) << '\n';
texrow.newline();
}
+
+ // in multilingual environments, the CJK tags have to be nested properly
+ bool cjk_nested = false;
+ if (par_language->encoding()->package() == Encoding::CJK &&
+ open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
+ os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
+ << "}{}%\n";
+ open_encoding_ = CJK;
+ cjk_nested = true;
+ texrow.newline();
+ }
+
ParagraphList::const_iterator par = pit;
do {
- par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
+ par = TeXOnePar(buf, text, par, os, texrow, runparams);
if (par == paragraphs.end()) {
// Make sure that the last paragraph is
os << '\n';
texrow.newline();
} else if (par->params().depth() > pit->params().depth()) {
- if (par->layout()->isParagraph()) {
+ if (par->layout().isParagraph()) {
// Thinko!
// How to handle this? (Lgb)
//&& !suffixIs(os, "\n\n")
- //) {
// There should be at least one '\n' already
// but we need there to be two for Standard
os << '\n';
texrow.newline();
}
- par = TeXDeeper(buf, paragraphs, par, os, texrow,
+ par = TeXDeeper(buf, text, par, os, texrow,
runparams);
}
} while (par != paragraphs.end()
&& par->params().depth() == pit->params().depth()
&& par->params().leftIndent() == pit->params().leftIndent());
- if (style->isEnvironment()) {
- os << "\\end{" << from_ascii(style->latexname()) << "}\n";
+ if (open_encoding_ == CJK && cjk_nested) {
+ // We need to close the encoding even if it does not change
+ // to do correct environment nesting
+ os << "\\end{CJK}\n";
+ texrow.newline();
+ open_encoding_ = none;
+ }
+
+ if (style.isEnvironment()) {
+ os << "\\end{" << from_ascii(style.latexname()) << "}\n";
texrow.newline();
}
texrow.newline();
}
- if (par != paragraphs.end()) {
- LYXERR(Debug::LATEX) << "TeXEnvironment...done " << &*par << endl;
- }
+ if (par != paragraphs.end())
+ LYXERR(Debug::LATEX, "TeXEnvironment...done " << &*par);
+
return par;
}
-}
+} // namespace anon
-int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
- odocstream & os, OutputParams const & runparams, int number)
+int latexOptArgInsets(Paragraph const & par, odocstream & os,
+ OutputParams const & runparams, int number)
{
int lines = 0;
if (it->inset->lyxCode() == OPTARG_CODE) {
InsetOptArg * ins =
static_cast<InsetOptArg *>(it->inset);
- lines += ins->latexOptional(buf, os, runparams);
+ lines += ins->latexOptional(os, runparams);
--number;
}
}
ParagraphList::const_iterator
TeXOnePar(Buffer const & buf,
- ParagraphList const & paragraphs,
- ParagraphList::const_iterator pit,
+ Text const & text,
+ ParagraphList::const_iterator const pit,
odocstream & os, TexRow & texrow,
OutputParams const & runparams_in,
string const & everypar)
{
- LYXERR(Debug::LATEX) << "TeXOnePar... " << &*pit << " '"
- << everypar << "'" << endl;
+ LYXERR(Debug::LATEX, "TeXOnePar... " << &*pit << " '"
+ << everypar << "'");
BufferParams const & bparams = buf.params();
- LayoutPtr style;
+ ParagraphList const & paragraphs = text.paragraphs();
+
+ ParagraphList::const_iterator priorpit = pit;
+ if (priorpit != paragraphs.begin())
+ --priorpit;
+ ParagraphList::const_iterator nextpit = pit;
+ if (nextpit != paragraphs.end())
+ ++nextpit;
if (runparams_in.verbatim) {
- int dist = std::distance(paragraphs.begin(), pit);
+ int const dist = distance(paragraphs.begin(), pit);
Font const outerfont = outerFont(dist, paragraphs);
// No newline if only one paragraph in this lyxtext
texrow.newline();
}
- /*bool need_par = */ pit->latex(buf, bparams, outerfont,
+ /*bool need_par = */ pit->latex(bparams, outerfont,
os, texrow, runparams_in);
-
- return ++pit;
+ return nextpit;
}
+ // FIXME This comment doesn't make sense. What's the
+ // length got to do with forceEmptyLayout()? I.e., what
+ // was forceDefaultParagraphs()?
// In an inset with unlimited length (all in one row),
// force layout to default
- if (!pit->forceDefaultParagraphs())
- style = pit->layout();
- else
- style = bparams.getTextClass().defaultLayout();
+ Layout const style = pit->forceEmptyLayout() ?
+ bparams.documentClass().emptyLayout() : pit->layout();
OutputParams runparams = runparams_in;
- runparams.moving_arg |= style->needprotect;
+ runparams.moving_arg |= style.needprotect;
+
+ bool const maintext = text.isMainText(buf);
+ // we are at the beginning of an inset and CJK is already open.
+ if (pit == paragraphs.begin() && !maintext && open_encoding_ == CJK) {
+ cjk_inherited_ = true;
+ open_encoding_ = none;
+ }
// This paragraph's language
Language const * const par_language = pit->getParLanguage(bparams);
// The document's language
Language const * const doc_language = bparams.language;
- // The language that was in effect when the environemnt this paragraph is
+ // The language that was in effect when the environment this paragraph is
// inside of was opened
Language const * const outer_language =
(runparams.local_font != 0) ?
// if there is no previous paragraph
Language const * const prev_language =
(pit != paragraphs.begin()) ?
- boost::prior(pit)->getParLanguage(bparams) : outer_language;
+ priorpit->getParLanguage(bparams) : outer_language;
if (par_language->babel() != prev_language->babel()
// check if we already put language command in TeXEnvironment()
- && !(style->isEnvironment()
+ && !(style.isEnvironment()
&& (pit == paragraphs.begin() ||
- (boost::prior(pit)->layout() != pit->layout() &&
- boost::prior(pit)->getDepth() <= pit->getDepth())
- || boost::prior(pit)->getDepth() < pit->getDepth())))
+ (priorpit->layout() != pit->layout() &&
+ priorpit->getDepth() <= pit->getDepth())
+ || priorpit->getDepth() < pit->getDepth())))
{
if (!lyxrc.language_command_end.empty() &&
prev_language->babel() != outer_language->babel() &&
os << from_ascii(subst(lyxrc.language_command_end,
"$$lang",
prev_language->babel()))
- << '\n';
+ // the '%' is necessary to prevent unwanted whitespace
+ << "%\n";
texrow.newline();
}
else
os << "\\L{";
}
- os << from_ascii(subst(
- lyxrc.language_command_begin,
- "$$lang",
- par_language->babel()))
- << '\n';
- texrow.newline();
+ // With CJK, the CJK tag has to be closed first (see below)
+ if (runparams.encoding->package() != Encoding::CJK) {
+ os << from_ascii(subst(
+ lyxrc.language_command_begin,
+ "$$lang",
+ par_language->babel()))
+ // the '%' is necessary to prevent unwanted whitespace
+ << "%\n";
+ texrow.newline();
+ }
}
}
// encoding, since this only affects the position of the outputted
// \inputencoding command; the encoding switch will occur when necessary
if (bparams.inputenc == "auto" &&
- runparams.encoding->package() == Encoding::inputenc) {
+ runparams.encoding->package() != Encoding::none) {
// Look ahead for future encoding changes.
// We try to output them at the beginning of the paragraph,
// since the \inputencoding command is not allowed e.g. in
// sections.
for (pos_type i = 0; i < pit->size(); ++i) {
char_type const c = pit->getChar(i);
- if (c < 0x80)
+ Encoding const * const encoding =
+ pit->getFontSettings(bparams, i).language()->encoding();
+ if (encoding->package() != Encoding::CJK &&
+ runparams.encoding->package() == Encoding::inputenc &&
+ c < 0x80)
continue;
if (pit->isInset(i))
break;
// All characters before c are in the ASCII range, and
// c is non-ASCII (but no inset), so change the
// encoding to that required by the language of c.
- Encoding const * const encoding =
- pit->getFontSettings(bparams, i).language()->encoding();
- pair<bool, int> enc_switch = switchEncoding(os, bparams, false,
- *(runparams.encoding), *encoding);
- if (encoding->package() == Encoding::inputenc && enc_switch.first) {
- runparams.encoding = encoding;
- if (enc_switch.second > 0) {
- os << '\n';
+ // With CJK, only add switch if we have CJK content at the beginning
+ // of the paragraph
+ if (encoding->package() != Encoding::CJK || i == 0) {
+ OutputParams tmp_rp = runparams;
+ runparams.moving_arg = false;
+ pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
+ *encoding);
+ runparams = tmp_rp;
+ // the following is necessary after a CJK environment in a multilingual
+ // context (nesting issue).
+ if (par_language->encoding()->package() == Encoding::CJK &&
+ open_encoding_ != CJK && !cjk_inherited_) {
+ os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
+ << "}{}%\n";
+ open_encoding_ = CJK;
texrow.newline();
}
+ if (encoding->package() != Encoding::none && enc_switch.first) {
+ if (enc_switch.second > 0) {
+ // the '%' is necessary to prevent unwanted whitespace
+ os << "%\n";
+ texrow.newline();
+ }
+ // With CJK, the CJK tag had to be closed first (see above)
+ if (runparams.encoding->package() == Encoding::CJK) {
+ os << from_ascii(subst(
+ lyxrc.language_command_begin,
+ "$$lang",
+ par_language->babel()))
+ // the '%' is necessary to prevent unwanted whitespace
+ << "%\n";
+ texrow.newline();
+ }
+ runparams.encoding = encoding;
+ }
+ break;
}
- break;
}
}
- // In an inset with unlimited length (all in one row),
- // don't allow any special options in the paragraph
- if (!pit->forceDefaultParagraphs()) {
+ bool const useSetSpace = bparams.documentClass().provides("SetSpace");
+ if (pit->allowParagraphCustomization()) {
if (pit->params().startOfAppendix()) {
os << "\\appendix\n";
texrow.newline();
if (!pit->params().spacing().isDefault()
&& (pit == paragraphs.begin()
- || !boost::prior(pit)->hasSameLayout(*pit)))
+ || !priorpit->hasSameLayout(*pit)))
{
- os << from_ascii(pit->params().spacing().writeEnvirBegin())
+ os << from_ascii(pit->params().spacing().writeEnvirBegin(useSetSpace))
<< '\n';
texrow.newline();
}
- if (style->isCommand()) {
+ if (style.isCommand()) {
os << '\n';
texrow.newline();
}
}
- switch (style->latextype) {
+ switch (style.latextype) {
case LATEX_COMMAND:
- os << '\\' << from_ascii(style->latexname());
+ os << '\\' << from_ascii(style.latexname());
// Separate handling of optional argument inset.
- if (style->optionalargs > 0) {
- int ret = latexOptArgInsets(buf, *pit, os, runparams,
- style->optionalargs);
+ if (style.optionalargs > 0) {
+ int ret = latexOptArgInsets(*pit, os, runparams,
+ style.optionalargs);
while (ret > 0) {
texrow.newline();
--ret;
}
}
else
- os << from_ascii(style->latexparam());
+ os << from_ascii(style.latexparam());
break;
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
break;
}
- Font const outerfont =
- outerFont(std::distance(paragraphs.begin(), pit),
+ Font const outerfont = outerFont(distance(paragraphs.begin(), pit),
paragraphs);
// FIXME UNICODE
os << from_utf8(everypar);
- bool need_par = pit->latex(buf, bparams, outerfont,
+ bool need_par = pit->latex(bparams, outerfont,
os, texrow, runparams);
// Make sure that \\par is done with the font of the last
// We do not need to use to change the font for the last paragraph
// or for a command.
- Font const font =
- (pit->empty()
+ Font const font = pit->empty()
? pit->getLayoutFont(bparams, outerfont)
- : pit->getFont(bparams, pit->size() - 1, outerfont));
+ : pit->getFont(bparams, pit->size() - 1, outerfont);
- bool is_command = style->isCommand();
+ bool is_command = style.isCommand();
- if (style->resfont.size() != font.fontInfo().size()
- && boost::next(pit) != paragraphs.end()
+ if (style.resfont.size() != font.fontInfo().size()
+ && nextpit != paragraphs.end()
&& !is_command) {
if (!need_par)
os << '{';
os << '}';
bool pending_newline = false;
- switch (style->latextype) {
+ switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
- if (boost::next(pit) != paragraphs.end()
- && (pit->params().depth() < boost::next(pit)->params().depth()))
+ if (nextpit != paragraphs.end()
+ && (pit->params().depth() < nextpit->params().depth()))
pending_newline = true;
break;
case LATEX_ENVIRONMENT: {
// if its the last paragraph of the current environment
// skip it otherwise fall through
- ParagraphList::const_iterator next = boost::next(pit);
+ ParagraphList::const_iterator next = nextpit;
- if (next != paragraphs.end()
- && (next->layout() != pit->layout()
+ if (next != paragraphs.end() && (next->layout() != pit->layout()
|| next->params().depth() != pit->params().depth()))
break;
}
// fall through possible
default:
// we don't need it for the last paragraph!!!
- if (boost::next(pit) != paragraphs.end())
+ if (nextpit != paragraphs.end())
pending_newline = true;
}
- if (!pit->forceDefaultParagraphs()) {
+ if (pit->allowParagraphCustomization()) {
if (!pit->params().spacing().isDefault()
- && (boost::next(pit) == paragraphs.end()
- || !boost::next(pit)->hasSameLayout(*pit)))
+ && (nextpit == paragraphs.end() || !nextpit->hasSameLayout(*pit)))
{
if (pending_newline) {
os << '\n';
texrow.newline();
}
- os << from_ascii(pit->params().spacing().writeEnvirEnd());
+ os << from_ascii(pit->params().spacing().writeEnvirEnd(useSetSpace));
pending_newline = true;
}
}
runparams.local_font != 0 &&
runparams.local_font->isRightToLeft() != par_language->rightToLeft() &&
// are we about to close the language?
- ((boost::next(pit) != paragraphs.end() &&
+ ((nextpit != paragraphs.end() &&
par_language->babel() !=
- (boost::next(pit)->getParLanguage(bparams))->babel()) ||
- (boost::next(pit) == paragraphs.end() &&
+ (nextpit->getParLanguage(bparams))->babel()) ||
+ (nextpit == paragraphs.end() &&
par_language->babel() != outer_language->babel()));
- if (closing_rtl_ltr_environment || (boost::next(pit) == paragraphs.end()
+ if (closing_rtl_ltr_environment || (nextpit == paragraphs.end()
&& par_language->babel() != outer_language->babel())) {
// Since \selectlanguage write the language to the aux file,
// we need to reset the language at the end of footnote or
os << '\n';
texrow.newline();
}
- if (lyxrc.language_command_end.empty()) {
- if (!prev_language->babel().empty()) {
+ // when the paragraph uses CJK, the language has to be closed earlier
+ if (font.language()->encoding()->package() != Encoding::CJK) {
+ if (lyxrc.language_command_end.empty()) {
+ if (!prev_language->babel().empty()) {
+ os << from_ascii(subst(
+ lyxrc.language_command_begin,
+ "$$lang",
+ prev_language->babel()));
+ pending_newline = true;
+ }
+ } else if (!par_language->babel().empty()) {
os << from_ascii(subst(
- lyxrc.language_command_begin,
+ lyxrc.language_command_end,
"$$lang",
- prev_language->babel()));
+ par_language->babel()));
pending_newline = true;
}
- } else if (!par_language->babel().empty()) {
- os << from_ascii(subst(
- lyxrc.language_command_end,
- "$$lang",
- par_language->babel()));
- pending_newline = true;
}
}
if (closing_rtl_ltr_environment)
texrow.newline();
}
+ // if this is a CJK-paragraph and the next isn't, close CJK
+ // also if the next paragraph is a multilingual environment (because of nesting)
+ if (nextpit != paragraphs.end() && open_encoding_ == CJK &&
+ (nextpit->getParLanguage(bparams)->encoding()->package() != Encoding::CJK ||
+ nextpit->layout().isEnvironment() && nextpit->isMultiLingual(bparams))
+ // in environments, CJK has to be closed later (nesting!)
+ && !style.isEnvironment()) {
+ os << "\\end{CJK}\n";
+ open_encoding_ = none;
+ }
+
+ // If this is the last paragraph, close the CJK environment
+ // if necessary. If it's an environment, we'll have to \end that first.
+ if (nextpit == paragraphs.end() && !style.isEnvironment()) {
+ switch (open_encoding_) {
+ case CJK: {
+ // end of main text
+ if (maintext) {
+ os << '\n';
+ texrow.newline();
+ os << "\\end{CJK}\n";
+ texrow.newline();
+ // end of an inset
+ } else
+ os << "\\end{CJK}";
+ open_encoding_ = none;
+ break;
+ }
+ case inputenc: {
+ os << "\\egroup";
+ open_encoding_ = none;
+ break;
+ }
+ case none:
+ default:
+ // do nothing
+ break;
+ }
+ }
+
// If this is the last paragraph, and a local_font was set upon entering
- // the inset, the encoding should be set back to that local_font's
- // encoding. We don't use switchEncoding(), because no explicit encoding
- // switch command is needed, since latex will automatically revert to it
- // when this inset closes.
- // This switch is only necessary if we're using "auto" or "default"
- // encoding.
- if (boost::next(pit) == paragraphs.end() && runparams_in.local_font != 0) {
+ // the inset, and we're using "auto" or "default" encoding, the encoding
+ // should be set back to that local_font's encoding.
+ if (nextpit == paragraphs.end() && runparams_in.local_font != 0
+ && (bparams.inputenc == "auto" || bparams.inputenc == "default")) {
runparams_in.encoding = runparams_in.local_font->language()->encoding();
- if (bparams.inputenc == "auto" || bparams.inputenc == "default")
- os << setEncoding(runparams_in.encoding->iconvName());
+ os << setEncoding(runparams_in.encoding->iconvName());
}
// Otherwise, the current encoding should be set for the next paragraph.
// we don't need it for the last paragraph!!!
// Note from JMarc: we will re-add a \n explicitely in
// TeXEnvironment, because it is needed in this case
- if (boost::next(pit) != paragraphs.end()) {
+ if (nextpit != paragraphs.end()) {
os << '\n';
texrow.newline();
}
- if (boost::next(pit) != paragraphs.end()) {
- LYXERR(Debug::LATEX) << "TeXOnePar...done " << &*boost::next(pit) << endl;
- }
+ if (nextpit != paragraphs.end())
+ LYXERR(Debug::LATEX, "TeXOnePar...done " << &*nextpit);
- return ++pit;
+ return nextpit;
}
} // anon namespace
// LaTeX all paragraphs
void latexParagraphs(Buffer const & buf,
- ParagraphList const & paragraphs,
+ Text const & text,
odocstream & os,
TexRow & texrow,
OutputParams const & runparams,
{
bool was_title = false;
bool already_title = false;
- TextClass const & tclass = buf.params().getTextClass();
+ BufferParams const & bparams = buf.params();
+ DocumentClass const & tclass = bparams.documentClass();
+ ParagraphList const & paragraphs = text.paragraphs();
ParagraphList::const_iterator par = paragraphs.begin();
ParagraphList::const_iterator endpar = paragraphs.end();
- BOOST_ASSERT(runparams.par_begin <= runparams.par_end);
+ LASSERT(runparams.par_begin <= runparams.par_end, /**/);
// if only part of the paragraphs will be outputed
if (runparams.par_begin != runparams.par_end) {
par = boost::next(paragraphs.begin(), runparams.par_begin);
const_cast<OutputParams&>(runparams).par_end = 0;
}
+ bool const maintext = text.isMainText(buf);
+
+ // Open a CJK environment at the beginning of the main buffer
+ // if the document's language is a CJK language
+ if (maintext && bparams.encoding().package() == Encoding::CJK) {
+ os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
+ << "}{}%\n";
+ texrow.newline();
+ open_encoding_ = CJK;
+ }
+ // if "auto begin" is switched off, explicitely switch the
+ // language on at start
+ if (maintext && !lyxrc.language_auto_begin &&
+ !bparams.language->babel().empty()) {
+ // FIXME UNICODE
+ os << from_utf8(subst(lyxrc.language_command_begin,
+ "$$lang",
+ bparams.language->babel()))
+ << '\n';
+ texrow.newline();
+ }
+
+ ParagraphList::const_iterator lastpar;
// if only_body
while (par != endpar) {
- ParagraphList::const_iterator lastpar = par;
+ lastpar = par;
// well we have to check if we are in an inset with unlimited
// length (all in one row) if that is true then we don't allow
// any special options in the paragraph and also we don't allow
// any environment other than the default layout of the
// text class to be valid!
- if (!par->forceDefaultParagraphs()) {
- LayoutPtr const & layout = par->layout();
+ if (par->allowParagraphCustomization()) {
+ Layout const & layout = par->forceEmptyLayout() ?
+ tclass.emptyLayout() :
+ par->layout();
- if (layout->intitle) {
+ if (layout.intitle) {
if (already_title) {
lyxerr << "Error in latexParagraphs: You"
" should not mix title layouts"
was_title = false;
}
- if (layout->is_environment) {
- par = TeXOnePar(buf, paragraphs, par, os, texrow,
+ if (layout.is_environment) {
+ par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
- } else if (layout->isEnvironment() ||
+ } else if (layout.isEnvironment() ||
!par->params().leftIndent().zero()) {
- par = TeXEnvironment(buf, paragraphs, par, os,
+ par = TeXEnvironment(buf, text, par, os,
texrow, runparams);
} else {
- par = TeXOnePar(buf, paragraphs, par, os, texrow,
+ par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
}
} else {
- par = TeXOnePar(buf, paragraphs, par, os, texrow,
+ par = TeXOnePar(buf, text, par, os, texrow,
runparams, everypar);
}
- if (std::distance(lastpar, par) >= std::distance(lastpar, endpar))
+ if (distance(lastpar, par) >= distance(lastpar, endpar))
break;
}
// It might be that we only have a title in this document
}
texrow.newline();
}
+ // if "auto end" is switched off, explicitely close the language at the end
+ // but only if the last par is in a babel language
+ if (maintext && !lyxrc.language_auto_end && !bparams.language->babel().empty() &&
+ lastpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {
+ os << from_utf8(subst(lyxrc.language_command_end,
+ "$$lang",
+ bparams.language->babel()))
+ << '\n';
+ texrow.newline();
+ }
+ // If the last paragraph is an environment, we'll have to close
+ // CJK at the very end to do proper nesting.
+ if (maintext && open_encoding_ == CJK) {
+ os << "\\end{CJK}\n";
+ texrow.newline();
+ open_encoding_ = none;
+ }
+ // reset inherited encoding
+ if (cjk_inherited_) {
+ open_encoding_ = CJK;
+ cjk_inherited_ = false;
+ }
}
pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
- bool moving_arg, Encoding const & oldEnc,
- Encoding const & newEnc)
+ OutputParams const & runparams, Encoding const & newEnc)
{
+ Encoding const oldEnc = *runparams.encoding;
+ bool moving_arg = runparams.moving_arg;
if ((bparams.inputenc != "auto" && bparams.inputenc != "default")
|| moving_arg)
return make_pair(false, 0);
|| newEnc.package() == Encoding::none)
return make_pair(false, 0);
- LYXERR(Debug::LATEX) << "Changing LaTeX encoding from "
- << oldEnc.name() << " to "
- << newEnc.name() << endl;
+ LYXERR(Debug::LATEX, "Changing LaTeX encoding from "
+ << oldEnc.name() << " to " << newEnc.name());
os << setEncoding(newEnc.iconvName());
if (bparams.inputenc == "default")
return make_pair(true, 0);
- docstring const inputenc(from_ascii(newEnc.latexName()));
+ docstring const inputenc_arg(from_ascii(newEnc.latexName()));
switch (newEnc.package()) {
case Encoding::none:
// shouldn't ever reach here, see above
return make_pair(true, 0);
case Encoding::inputenc: {
- int count = inputenc.length();
- if (oldEnc.package() == Encoding::CJK) {
+ int count = inputenc_arg.length();
+ if (oldEnc.package() == Encoding::CJK &&
+ open_encoding_ == CJK) {
os << "\\end{CJK}";
+ open_encoding_ = none;
count += 9;
}
- os << "\\inputencoding{" << inputenc << '}';
+ else if (oldEnc.package() == Encoding::inputenc &&
+ open_encoding_ == inputenc) {
+ os << "\\egroup";
+ open_encoding_ = none;
+ count += 7;
+ }
+ if (runparams.local_font != 0 && oldEnc.package() == Encoding::CJK) {
+ // within insets, \inputenc switches need to be
+ // embraced within \bgroup ... \egroup; else CJK fails.
+ os << "\\bgroup";
+ count += 7;
+ open_encoding_ = inputenc;
+ }
+ os << "\\inputencoding{" << inputenc_arg << '}';
return make_pair(true, count + 16);
- }
+ }
case Encoding::CJK: {
- int count = inputenc.length();
- if (oldEnc.package() == Encoding::CJK) {
+ int count = inputenc_arg.length();
+ if (oldEnc.package() == Encoding::CJK &&
+ open_encoding_ == CJK) {
os << "\\end{CJK}";
count += 9;
}
- os << "\\begin{CJK}{" << inputenc << "}{}";
+ if (oldEnc.package() == Encoding::inputenc &&
+ open_encoding_ == inputenc) {
+ os << "\\egroup";
+ count += 7;
+ }
+ os << "\\begin{CJK}{" << inputenc_arg << "}{}";
+ open_encoding_ = CJK;
return make_pair(true, count + 15);
}
}
// Dead code to avoid a warning:
return make_pair(true, 0);
+
}
} // namespace lyx
projects / lyx.git / blobdiff