2003-11-05 12:06:20 +00:00
|
|
|
/**
|
2007-04-26 04:41:58 +00:00
|
|
|
* \file output_latex.cpp
|
2003-11-05 12:06:20 +00:00
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
*
|
2008-11-14 15:58:50 +00:00
|
|
|
* \author Lars Gullik Bjønnes
|
2003-11-05 12:06:20 +00:00
|
|
|
*
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include "output_latex.h"
|
|
|
|
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Buffer.h"
|
|
|
|
#include "BufferParams.h"
|
|
|
|
#include "Encoding.h"
|
2010-10-31 01:04:03 +00:00
|
|
|
#include "Font.h"
|
2007-10-18 15:29:51 +00:00
|
|
|
#include "InsetList.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Language.h"
|
2007-09-29 20:02:32 +00:00
|
|
|
#include "Layout.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "LyXRC.h"
|
|
|
|
#include "OutputParams.h"
|
|
|
|
#include "Paragraph.h"
|
2003-11-05 12:06:20 +00:00
|
|
|
#include "ParagraphParameters.h"
|
2007-11-07 23:25:08 +00:00
|
|
|
#include "TextClass.h"
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2007-04-25 01:24:38 +00:00
|
|
|
#include "insets/InsetBibitem.h"
|
2010-06-04 22:44:58 +00:00
|
|
|
#include "insets/InsetArgument.h"
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2008-04-30 08:26:40 +00:00
|
|
|
#include "support/lassert.h"
|
2012-11-19 13:21:02 +00:00
|
|
|
#include "support/convert.h"
|
2008-02-18 07:14:42 +00:00
|
|
|
#include "support/debug.h"
|
2003-11-05 12:06:20 +00:00
|
|
|
#include "support/lstrings.h"
|
2015-05-15 22:05:23 +00:00
|
|
|
#include "support/lyxalgo.h"
|
2012-12-30 10:58:21 +00:00
|
|
|
#include "support/textutils.h"
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2014-07-05 12:23:43 +00:00
|
|
|
#include <QThreadStorage>
|
|
|
|
|
2010-06-04 21:50:08 +00:00
|
|
|
#include <list>
|
2006-10-21 00:16:43 +00:00
|
|
|
|
2007-12-12 10:16:00 +00:00
|
|
|
using namespace std;
|
2007-12-12 18:57:56 +00:00
|
|
|
using namespace lyx::support;
|
2007-12-12 10:16:00 +00:00
|
|
|
|
2008-04-10 21:49:34 +00:00
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
namespace lyx {
|
|
|
|
|
2003-11-05 12:06:20 +00:00
|
|
|
namespace {
|
|
|
|
|
2007-12-08 11:21:00 +00:00
|
|
|
enum OpenEncoding {
|
2012-10-27 13:45:27 +00:00
|
|
|
none,
|
|
|
|
inputenc,
|
|
|
|
CJK
|
2008-03-21 22:51:36 +00:00
|
|
|
};
|
2007-12-08 11:21:00 +00:00
|
|
|
|
2014-07-05 12:23:43 +00:00
|
|
|
|
|
|
|
struct OutputState
|
|
|
|
{
|
|
|
|
OutputState() : open_encoding_(none), cjk_inherited_(0),
|
2015-06-19 07:25:11 +00:00
|
|
|
prev_env_language_(0), open_polyglossia_lang_("")
|
2014-07-05 12:23:43 +00:00
|
|
|
{
|
|
|
|
}
|
2015-10-18 18:55:53 +00:00
|
|
|
OpenEncoding open_encoding_;
|
2014-07-05 12:23:43 +00:00
|
|
|
int cjk_inherited_;
|
|
|
|
Language const * prev_env_language_;
|
2015-06-19 07:25:11 +00:00
|
|
|
string open_polyglossia_lang_;
|
2014-07-05 12:23:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
OutputState * getOutputState()
|
|
|
|
{
|
|
|
|
// FIXME An instance of OutputState should be kept around for each export
|
|
|
|
// instead of using local thread storage
|
|
|
|
static QThreadStorage<OutputState *> outputstate;
|
|
|
|
if (!outputstate.hasLocalData())
|
|
|
|
outputstate.setLocalData(new OutputState);
|
|
|
|
return outputstate.localData();
|
|
|
|
}
|
2007-12-08 11:21:00 +00:00
|
|
|
|
|
|
|
|
2010-11-22 12:10:16 +00:00
|
|
|
string const getPolyglossiaEnvName(Language const * lang)
|
|
|
|
{
|
|
|
|
string result = lang->polyglossia();
|
|
|
|
if (result == "arabic")
|
|
|
|
// exceptional spelling; see polyglossia docs.
|
|
|
|
result = "Arabic";
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-05-03 14:08:14 +00:00
|
|
|
string const getPolyglossiaBegin(string const & lang_begin_command,
|
|
|
|
string const & lang, string const & opts)
|
|
|
|
{
|
|
|
|
string result;
|
|
|
|
if (!lang.empty())
|
|
|
|
result = subst(lang_begin_command, "$$lang", lang);
|
|
|
|
string options = opts.empty() ?
|
|
|
|
string() : "[" + opts + "]";
|
|
|
|
result = subst(result, "$$opts", options);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-06-02 19:39:44 +00:00
|
|
|
struct TeXEnvironmentData
|
2003-11-05 12:06:20 +00:00
|
|
|
{
|
2010-12-15 23:39:38 +00:00
|
|
|
bool cjk_nested;
|
|
|
|
Layout const * style;
|
|
|
|
Language const * par_language;
|
|
|
|
Encoding const * prev_encoding;
|
|
|
|
bool leftindent_open;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2011-06-02 19:39:44 +00:00
|
|
|
static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
|
2011-02-10 20:02:48 +00:00
|
|
|
Text const & text,
|
|
|
|
ParagraphList::const_iterator pit,
|
|
|
|
otexstream & os,
|
|
|
|
OutputParams const & runparams)
|
2010-12-15 23:39:38 +00:00
|
|
|
{
|
2011-06-02 19:39:44 +00:00
|
|
|
TeXEnvironmentData data;
|
2003-11-05 12:06:20 +00:00
|
|
|
|
|
|
|
BufferParams const & bparams = buf.params();
|
|
|
|
|
2008-10-31 15:33:48 +00:00
|
|
|
// FIXME This test should not be necessary.
|
|
|
|
// We should perhaps issue an error if it is.
|
2009-08-09 16:19:43 +00:00
|
|
|
Layout const & style = text.inset().forcePlainLayout() ?
|
2008-08-01 20:57:27 +00:00
|
|
|
bparams.documentClass().plainLayout() : pit->layout();
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2008-01-25 13:27:08 +00:00
|
|
|
ParagraphList const & paragraphs = text.paragraphs();
|
2009-07-30 00:58:37 +00:00
|
|
|
ParagraphList::const_iterator const priorpit =
|
2015-05-15 22:05:23 +00:00
|
|
|
pit == paragraphs.begin() ? pit : prev(pit, 1);
|
2009-07-30 00:58:37 +00:00
|
|
|
|
2014-07-05 12:23:43 +00:00
|
|
|
OutputState * state = getOutputState();
|
|
|
|
bool const use_prev_env_language = state->prev_env_language_ != 0
|
2009-07-30 03:21:04 +00:00
|
|
|
&& priorpit->layout().isEnvironment()
|
2009-07-30 00:58:37 +00:00
|
|
|
&& (priorpit->getDepth() > pit->getDepth()
|
|
|
|
|| (priorpit->getDepth() == pit->getDepth()
|
|
|
|
&& priorpit->layout() != pit->layout()));
|
2008-01-25 13:27:08 +00:00
|
|
|
|
2010-12-15 23:39:38 +00:00
|
|
|
data.prev_encoding = runparams.encoding;
|
|
|
|
data.par_language = pit->getParLanguage(bparams);
|
2007-03-12 17:19:08 +00:00
|
|
|
Language const * const doc_language = bparams.language;
|
|
|
|
Language const * const prev_par_language =
|
2009-07-30 00:37:53 +00:00
|
|
|
(pit != paragraphs.begin())
|
2014-07-05 12:23:43 +00:00
|
|
|
? (use_prev_env_language ? state->prev_env_language_
|
2009-07-30 00:58:37 +00:00
|
|
|
: priorpit->getParLanguage(bparams))
|
2009-07-30 00:37:53 +00:00
|
|
|
: doc_language;
|
2011-06-02 19:55:08 +00:00
|
|
|
|
2012-06-23 13:41:05 +00:00
|
|
|
bool const use_polyglossia = runparams.use_polyglossia;
|
|
|
|
string const par_lang = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
getPolyglossiaEnvName(data.par_language) : data.par_language->babel();
|
2012-06-23 13:41:05 +00:00
|
|
|
string const prev_par_lang = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
getPolyglossiaEnvName(prev_par_language) : prev_par_language->babel();
|
2012-06-23 13:41:05 +00:00
|
|
|
string const doc_lang = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
getPolyglossiaEnvName(doc_language) : doc_language->babel();
|
2012-06-23 13:41:05 +00:00
|
|
|
string const lang_begin_command = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
"\\begin{$$lang}" : lyxrc.language_command_begin;
|
2012-06-23 13:41:05 +00:00
|
|
|
string const lang_end_command = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
"\\end{$$lang}" : lyxrc.language_command_end;
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2010-11-22 12:10:16 +00:00
|
|
|
if (par_lang != prev_par_lang) {
|
|
|
|
if (!lang_end_command.empty() &&
|
|
|
|
prev_par_lang != doc_lang &&
|
|
|
|
!prev_par_lang.empty()) {
|
2006-10-21 00:16:43 +00:00
|
|
|
os << from_ascii(subst(
|
2010-11-22 12:10:16 +00:00
|
|
|
lang_end_command,
|
2006-10-19 16:51:30 +00:00
|
|
|
"$$lang",
|
2010-11-22 12:10:16 +00:00
|
|
|
prev_par_lang))
|
|
|
|
// the '%' is necessary to prevent unwanted whitespace
|
|
|
|
<< "%\n";
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
|
2010-12-08 18:25:21 +00:00
|
|
|
if ((lang_end_command.empty() ||
|
2010-11-22 12:10:16 +00:00
|
|
|
par_lang != doc_lang) &&
|
|
|
|
!par_lang.empty()) {
|
2015-05-03 14:08:14 +00:00
|
|
|
string bc = use_polyglossia ?
|
|
|
|
getPolyglossiaBegin(lang_begin_command, par_lang,
|
|
|
|
data.par_language->polyglossiaOpts())
|
|
|
|
: subst(lang_begin_command, "$$lang", par_lang);
|
|
|
|
os << bc;
|
|
|
|
// the '%' is necessary to prevent unwanted whitespace
|
|
|
|
os << "%\n";
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-15 23:39:38 +00:00
|
|
|
data.leftindent_open = false;
|
2003-11-05 12:06:20 +00:00
|
|
|
if (!pit->params().leftIndent().zero()) {
|
2006-10-19 16:51:30 +00:00
|
|
|
os << "\\begin{LyXParagraphLeftIndent}{"
|
2006-10-21 00:16:43 +00:00
|
|
|
<< from_ascii(pit->params().leftIndent().asLatexString())
|
2006-10-19 16:51:30 +00:00
|
|
|
<< "}\n";
|
2010-12-15 23:39:38 +00:00
|
|
|
data.leftindent_open = true;
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
|
2008-03-06 21:31:27 +00:00
|
|
|
if (style.isEnvironment()) {
|
2015-06-19 17:02:35 +00:00
|
|
|
if (par_lang != doc_lang)
|
|
|
|
state->open_polyglossia_lang_ = par_lang;
|
2008-10-31 01:26:11 +00:00
|
|
|
os << "\\begin{" << from_ascii(style.latexname()) << '}';
|
2012-11-28 18:02:07 +00:00
|
|
|
if (!style.latexargs().empty()) {
|
2012-12-23 16:37:50 +00:00
|
|
|
OutputParams rp = runparams;
|
|
|
|
rp.local_font = &pit->getFirstFontSettings(bparams);
|
|
|
|
latexArgInsets(paragraphs, pit, os, rp, style.latexargs());
|
2012-11-28 18:02:07 +00:00
|
|
|
}
|
2008-03-06 21:31:27 +00:00
|
|
|
if (style.latextype == LATEX_LIST_ENVIRONMENT) {
|
2006-10-19 16:51:30 +00:00
|
|
|
os << '{'
|
2006-10-20 19:26:23 +00:00
|
|
|
<< pit->params().labelWidthString()
|
2006-10-19 16:51:30 +00:00
|
|
|
<< "}\n";
|
2008-03-06 21:31:27 +00:00
|
|
|
} else if (style.labeltype == LABEL_BIBLIO) {
|
2009-05-25 08:13:56 +00:00
|
|
|
if (pit->params().labelWidthString().empty())
|
2010-02-12 16:08:30 +00:00
|
|
|
os << '{' << bibitemWidest(buf, runparams) << "}\n";
|
2009-05-25 08:13:56 +00:00
|
|
|
else
|
|
|
|
os << '{'
|
|
|
|
<< pit->params().labelWidthString()
|
|
|
|
<< "}\n";
|
2003-11-05 12:06:20 +00:00
|
|
|
} else
|
2008-03-06 21:31:27 +00:00
|
|
|
os << from_ascii(style.latexparam()) << '\n';
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
2010-12-15 23:39:38 +00:00
|
|
|
data.style = &style;
|
2007-12-08 11:21:00 +00:00
|
|
|
|
|
|
|
// in multilingual environments, the CJK tags have to be nested properly
|
2010-12-15 23:39:38 +00:00
|
|
|
data.cjk_nested = false;
|
|
|
|
if (data.par_language->encoding()->package() == Encoding::CJK &&
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
|
2008-11-22 16:40:39 +00:00
|
|
|
if (prev_par_language->encoding()->package() == Encoding::CJK)
|
2010-12-15 23:39:38 +00:00
|
|
|
os << "\\begin{CJK}{" << from_ascii(data.par_language->encoding()->latexName())
|
2010-11-26 18:32:29 +00:00
|
|
|
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = CJK;
|
2010-12-15 23:39:38 +00:00
|
|
|
data.cjk_nested = true;
|
|
|
|
}
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-05-27 23:07:47 +00:00
|
|
|
static void finishEnvironment(otexstream & os, OutputParams const & runparams,
|
2014-05-16 13:39:33 +00:00
|
|
|
TeXEnvironmentData const & data)
|
2010-12-15 23:39:38 +00:00
|
|
|
{
|
2014-07-05 12:23:43 +00:00
|
|
|
OutputState * state = getOutputState();
|
2015-11-09 10:45:01 +00:00
|
|
|
// BufferParams const & bparams = buf.params(); // FIXME: for speedup shortcut below, would require passing of "buf" as argument
|
2014-07-05 12:23:43 +00:00
|
|
|
if (state->open_encoding_ == CJK && data.cjk_nested) {
|
2010-12-15 23:39:38 +00:00
|
|
|
// We need to close the encoding even if it does not change
|
|
|
|
// to do correct environment nesting
|
|
|
|
os << "\\end{CJK}\n";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = none;
|
2010-12-15 23:39:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (data.style->isEnvironment()) {
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
os << breakln
|
|
|
|
<< "\\end{" << from_ascii(data.style->latexname()) << "}\n";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->prev_env_language_ = data.par_language;
|
2010-12-15 23:39:38 +00:00
|
|
|
if (runparams.encoding != data.prev_encoding) {
|
|
|
|
runparams.encoding = data.prev_encoding;
|
2015-11-12 15:55:04 +00:00
|
|
|
os << setEncoding(data.prev_encoding->iconvName());
|
2010-12-15 23:39:38 +00:00
|
|
|
}
|
2007-12-08 11:21:00 +00:00
|
|
|
}
|
|
|
|
|
2010-12-15 23:39:38 +00:00
|
|
|
if (data.leftindent_open) {
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
os << breakln << "\\end{LyXParagraphLeftIndent}\n";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->prev_env_language_ = data.par_language;
|
2010-12-15 23:39:38 +00:00
|
|
|
if (runparams.encoding != data.prev_encoding) {
|
|
|
|
runparams.encoding = data.prev_encoding;
|
2015-11-12 15:55:04 +00:00
|
|
|
os << setEncoding(data.prev_encoding->iconvName());
|
2010-12-15 23:39:38 +00:00
|
|
|
}
|
|
|
|
}
|
2014-05-16 13:39:33 +00:00
|
|
|
|
|
|
|
// Check whether we should output a blank line after the environment
|
2014-05-27 23:07:47 +00:00
|
|
|
if (!data.style->nextnoindent)
|
2014-05-16 13:39:33 +00:00
|
|
|
os << '\n';
|
2010-12-15 23:39:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-02-10 20:02:48 +00:00
|
|
|
void TeXEnvironment(Buffer const & buf, Text const & text,
|
|
|
|
OutputParams const & runparams,
|
|
|
|
pit_type & pit, otexstream & os)
|
2010-12-15 23:39:38 +00:00
|
|
|
{
|
|
|
|
ParagraphList const & paragraphs = text.paragraphs();
|
2010-12-18 13:49:39 +00:00
|
|
|
ParagraphList::const_iterator par = paragraphs.constIterator(pit);
|
|
|
|
LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << pit);
|
2010-12-15 23:39:38 +00:00
|
|
|
|
2010-12-18 13:49:39 +00:00
|
|
|
Layout const & current_layout = par->layout();
|
|
|
|
depth_type const current_depth = par->params().depth();
|
|
|
|
Length const & current_left_indent = par->params().leftIndent();
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2010-12-18 13:49:39 +00:00
|
|
|
// This is for debugging purpose at the end.
|
|
|
|
pit_type const par_begin = pit;
|
|
|
|
for (; pit < runparams.par_end; ++pit) {
|
|
|
|
ParagraphList::const_iterator par = paragraphs.constIterator(pit);
|
|
|
|
|
|
|
|
// check first if this is an higher depth paragraph.
|
|
|
|
bool go_out = (par->params().depth() < current_depth);
|
|
|
|
if (par->params().depth() == current_depth) {
|
|
|
|
// This environment is finished.
|
|
|
|
go_out |= (par->layout() != current_layout);
|
|
|
|
go_out |= (par->params().leftIndent() != current_left_indent);
|
|
|
|
}
|
|
|
|
if (go_out) {
|
|
|
|
// nothing to do here, restore pit and go out.
|
|
|
|
pit--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (par->layout() == current_layout
|
|
|
|
&& par->params().depth() == current_depth
|
|
|
|
&& par->params().leftIndent() == current_left_indent) {
|
|
|
|
// We are still in the same environment so TeXOnePar and continue;
|
2011-02-10 20:02:48 +00:00
|
|
|
TeXOnePar(buf, text, pit, os, runparams);
|
2010-12-18 13:49:39 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We are now in a deeper environment.
|
|
|
|
// Either par->layout() != current_layout
|
|
|
|
// Or par->params().depth() > current_depth
|
|
|
|
// Or par->params().leftIndent() != current_left_indent)
|
|
|
|
|
|
|
|
// FIXME This test should not be necessary.
|
|
|
|
// We should perhaps issue an error if it is.
|
|
|
|
bool const force_plain_layout = text.inset().forcePlainLayout();
|
|
|
|
Layout const & style = force_plain_layout
|
|
|
|
? buf.params().documentClass().plainLayout()
|
|
|
|
: par->layout();
|
|
|
|
|
|
|
|
if (!style.isEnvironment()) {
|
|
|
|
// This is a standard paragraph, no need to call TeXEnvironment.
|
2011-02-10 20:02:48 +00:00
|
|
|
TeXOnePar(buf, text, pit, os, runparams);
|
2010-12-18 13:49:39 +00:00
|
|
|
continue;
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
|
2010-12-18 13:49:39 +00:00
|
|
|
// This is a new environment.
|
2011-06-02 19:39:44 +00:00
|
|
|
TeXEnvironmentData const data =
|
|
|
|
prepareEnvironment(buf, text, par, os, runparams);
|
2010-12-18 13:49:39 +00:00
|
|
|
// Recursive call to TeXEnvironment!
|
2011-02-10 20:02:48 +00:00
|
|
|
TeXEnvironment(buf, text, runparams, pit, os);
|
2014-05-27 23:07:47 +00:00
|
|
|
finishEnvironment(os, runparams, data);
|
2010-12-18 13:49:39 +00:00
|
|
|
}
|
2007-11-15 20:04:51 +00:00
|
|
|
|
2010-12-18 13:49:39 +00:00
|
|
|
if (pit != runparams.par_end)
|
|
|
|
LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << par_begin << " done.");
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-12-23 16:37:50 +00:00
|
|
|
void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs,
|
2012-12-28 10:21:24 +00:00
|
|
|
map<int, lyx::InsetArgument const *> ilist, vector<string> required, string const & prefix)
|
2003-11-05 12:06:20 +00:00
|
|
|
{
|
2012-11-19 13:21:02 +00:00
|
|
|
unsigned int const argnr = latexargs.size();
|
|
|
|
if (argnr == 0)
|
2011-02-10 20:02:48 +00:00
|
|
|
return;
|
2010-06-04 21:50:08 +00:00
|
|
|
|
2014-05-21 11:12:14 +00:00
|
|
|
// Default and preset args are always output, so if they require
|
|
|
|
// other arguments, consider this.
|
|
|
|
Layout::LaTeXArgMap::const_iterator lit = latexargs.begin();
|
|
|
|
Layout::LaTeXArgMap::const_iterator const lend = latexargs.end();
|
|
|
|
for (; lit != lend; ++lit) {
|
|
|
|
Layout::latexarg arg = (*lit).second;
|
|
|
|
if ((!arg.presetarg.empty() || !arg.defaultarg.empty()) && !arg.requires.empty()) {
|
|
|
|
vector<string> req = getVectorFromString(arg.requires);
|
|
|
|
required.insert(required.end(), req.begin(), req.end());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-19 13:21:02 +00:00
|
|
|
for (unsigned int i = 1; i <= argnr; ++i) {
|
|
|
|
map<int, InsetArgument const *>::const_iterator lit = ilist.find(i);
|
|
|
|
bool inserted = false;
|
|
|
|
if (lit != ilist.end()) {
|
|
|
|
InsetArgument const * ins = (*lit).second;
|
|
|
|
if (ins) {
|
|
|
|
Layout::LaTeXArgMap::const_iterator const lait =
|
2012-11-29 14:34:20 +00:00
|
|
|
latexargs.find(ins->name());
|
2012-11-19 13:21:02 +00:00
|
|
|
if (lait != latexargs.end()) {
|
|
|
|
Layout::latexarg arg = (*lait).second;
|
|
|
|
docstring ldelim = arg.mandatory ?
|
|
|
|
from_ascii("{") : from_ascii("[");
|
|
|
|
docstring rdelim = arg.mandatory ?
|
|
|
|
from_ascii("}") : from_ascii("]");
|
|
|
|
if (!arg.ldelim.empty())
|
|
|
|
ldelim = arg.ldelim;
|
|
|
|
if (!arg.rdelim.empty())
|
|
|
|
rdelim = arg.rdelim;
|
2012-12-10 13:09:51 +00:00
|
|
|
ins->latexArgument(os, runparams, ldelim, rdelim, arg.presetarg);
|
2012-11-19 13:21:02 +00:00
|
|
|
inserted = true;
|
|
|
|
}
|
|
|
|
}
|
2010-06-04 21:50:08 +00:00
|
|
|
}
|
2012-11-19 13:21:02 +00:00
|
|
|
if (!inserted) {
|
|
|
|
Layout::LaTeXArgMap::const_iterator lait = latexargs.begin();
|
|
|
|
Layout::LaTeXArgMap::const_iterator const laend = latexargs.end();
|
|
|
|
for (; lait != laend; ++lait) {
|
2012-12-28 10:21:24 +00:00
|
|
|
string const name = prefix + convert<string>(i);
|
2012-11-29 14:34:20 +00:00
|
|
|
if ((*lait).first == name) {
|
2012-11-19 13:21:02 +00:00
|
|
|
Layout::latexarg arg = (*lait).second;
|
2013-02-24 10:29:21 +00:00
|
|
|
docstring preset = arg.presetarg;
|
|
|
|
if (!arg.defaultarg.empty()) {
|
|
|
|
if (!preset.empty())
|
|
|
|
preset += ",";
|
|
|
|
preset += arg.defaultarg;
|
|
|
|
}
|
2012-11-19 13:21:02 +00:00
|
|
|
if (arg.mandatory) {
|
|
|
|
docstring ldelim = arg.ldelim.empty() ?
|
|
|
|
from_ascii("{") : arg.ldelim;
|
|
|
|
docstring rdelim = arg.rdelim.empty() ?
|
|
|
|
from_ascii("}") : arg.rdelim;
|
2013-02-24 10:29:21 +00:00
|
|
|
os << ldelim << preset << rdelim;
|
|
|
|
} else if (!preset.empty()) {
|
|
|
|
docstring ldelim = arg.ldelim.empty() ?
|
|
|
|
from_ascii("[") : arg.ldelim;
|
|
|
|
docstring rdelim = arg.rdelim.empty() ?
|
|
|
|
from_ascii("]") : arg.rdelim;
|
|
|
|
os << ldelim << preset << rdelim;
|
2012-11-19 13:21:02 +00:00
|
|
|
} else if (find(required.begin(), required.end(),
|
2012-11-29 14:34:20 +00:00
|
|
|
(*lait).first) != required.end()) {
|
2012-11-19 13:21:02 +00:00
|
|
|
docstring ldelim = arg.ldelim.empty() ?
|
|
|
|
from_ascii("[") : arg.ldelim;
|
|
|
|
docstring rdelim = arg.rdelim.empty() ?
|
|
|
|
from_ascii("]") : arg.rdelim;
|
|
|
|
os << ldelim << rdelim;
|
|
|
|
} else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-23 16:37:50 +00:00
|
|
|
|
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
|
|
|
void latexArgInsets(Paragraph const & par, otexstream & os,
|
2012-12-28 10:21:24 +00:00
|
|
|
OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix)
|
2012-12-23 16:37:50 +00:00
|
|
|
{
|
|
|
|
map<int, InsetArgument const *> ilist;
|
|
|
|
vector<string> required;
|
|
|
|
|
|
|
|
InsetList::const_iterator it = par.insetList().begin();
|
|
|
|
InsetList::const_iterator end = par.insetList().end();
|
|
|
|
for (; it != end; ++it) {
|
|
|
|
if (it->inset->lyxCode() == ARG_CODE) {
|
|
|
|
InsetArgument const * ins =
|
|
|
|
static_cast<InsetArgument const *>(it->inset);
|
|
|
|
if (ins->name().empty())
|
|
|
|
LYXERR0("Error: Unnamed argument inset!");
|
|
|
|
else {
|
2012-12-28 10:21:24 +00:00
|
|
|
string const name = prefix.empty() ? ins->name() : split(ins->name(), ':');
|
2012-12-23 16:37:50 +00:00
|
|
|
unsigned int const nr = convert<unsigned int>(name);
|
|
|
|
ilist[nr] = ins;
|
|
|
|
Layout::LaTeXArgMap::const_iterator const lit =
|
|
|
|
latexargs.find(ins->name());
|
|
|
|
if (lit != latexargs.end()) {
|
|
|
|
Layout::latexarg const & arg = (*lit).second;
|
|
|
|
if (!arg.requires.empty()) {
|
|
|
|
vector<string> req = getVectorFromString(arg.requires);
|
|
|
|
required.insert(required.end(), req.begin(), req.end());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-12-28 10:21:24 +00:00
|
|
|
getArgInsets(os, runparams, latexargs, ilist, required, prefix);
|
2012-12-23 16:37:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pit,
|
2012-12-28 10:21:24 +00:00
|
|
|
otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs,
|
|
|
|
string const & prefix)
|
2012-12-23 16:37:50 +00:00
|
|
|
{
|
|
|
|
map<int, InsetArgument const *> ilist;
|
|
|
|
vector<string> required;
|
|
|
|
|
|
|
|
depth_type const current_depth = pit->params().depth();
|
|
|
|
Layout const current_layout = pit->layout();
|
|
|
|
|
|
|
|
// get the first paragraph in sequence with this layout and depth
|
|
|
|
pit_type offset = 0;
|
|
|
|
while (true) {
|
2015-05-15 22:05:23 +00:00
|
|
|
if (prev(pit, offset) == pars.begin())
|
2012-12-23 16:37:50 +00:00
|
|
|
break;
|
2015-05-15 22:05:23 +00:00
|
|
|
ParagraphList::const_iterator priorpit = prev(pit, offset + 1);
|
2012-12-23 16:37:50 +00:00
|
|
|
if (priorpit->layout() == current_layout
|
|
|
|
&& priorpit->params().depth() == current_depth)
|
|
|
|
++offset;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-05-15 22:05:23 +00:00
|
|
|
ParagraphList::const_iterator spit = prev(pit, offset);
|
2012-12-23 16:37:50 +00:00
|
|
|
|
|
|
|
for (; spit != pars.end(); ++spit) {
|
2012-12-24 12:02:24 +00:00
|
|
|
if (spit->layout() != current_layout || spit->params().depth() < current_depth)
|
2012-12-23 16:37:50 +00:00
|
|
|
break;
|
2012-12-24 12:02:24 +00:00
|
|
|
if (spit->params().depth() > current_depth)
|
|
|
|
continue;
|
2012-12-23 16:37:50 +00:00
|
|
|
InsetList::const_iterator it = spit->insetList().begin();
|
|
|
|
InsetList::const_iterator end = spit->insetList().end();
|
|
|
|
for (; it != end; ++it) {
|
|
|
|
if (it->inset->lyxCode() == ARG_CODE) {
|
|
|
|
InsetArgument const * ins =
|
|
|
|
static_cast<InsetArgument const *>(it->inset);
|
|
|
|
if (ins->name().empty())
|
|
|
|
LYXERR0("Error: Unnamed argument inset!");
|
|
|
|
else {
|
2012-12-28 10:21:24 +00:00
|
|
|
string const name = prefix.empty() ? ins->name() : split(ins->name(), ':');
|
2012-12-23 16:37:50 +00:00
|
|
|
unsigned int const nr = convert<unsigned int>(name);
|
|
|
|
if (ilist.find(nr) == ilist.end())
|
|
|
|
ilist[nr] = ins;
|
|
|
|
Layout::LaTeXArgMap::const_iterator const lit =
|
|
|
|
latexargs.find(ins->name());
|
|
|
|
if (lit != latexargs.end()) {
|
|
|
|
Layout::latexarg const & arg = (*lit).second;
|
|
|
|
if (!arg.requires.empty()) {
|
|
|
|
vector<string> req = getVectorFromString(arg.requires);
|
|
|
|
required.insert(required.end(), req.begin(), req.end());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-12-28 10:21:24 +00:00
|
|
|
getArgInsets(os, runparams, latexargs, ilist, required, prefix);
|
2012-12-23 16:37:50 +00:00
|
|
|
}
|
|
|
|
|
2011-01-25 11:22:47 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
// output the proper paragraph start according to latextype.
|
2011-02-10 20:02:48 +00:00
|
|
|
void parStartCommand(Paragraph const & par, otexstream & os,
|
|
|
|
OutputParams const & runparams, Layout const & style)
|
2011-01-25 11:22:47 +00:00
|
|
|
{
|
|
|
|
switch (style.latextype) {
|
|
|
|
case LATEX_COMMAND:
|
|
|
|
os << '\\' << from_ascii(style.latexname());
|
|
|
|
|
2012-11-29 14:34:20 +00:00
|
|
|
// Command arguments
|
2012-11-24 01:40:38 +00:00
|
|
|
if (!style.latexargs().empty())
|
2012-11-19 13:21:02 +00:00
|
|
|
latexArgInsets(par, os, runparams, style.latexargs());
|
2012-11-26 12:09:54 +00:00
|
|
|
os << from_ascii(style.latexparam());
|
2011-01-25 11:22:47 +00:00
|
|
|
break;
|
|
|
|
case LATEX_ITEM_ENVIRONMENT:
|
|
|
|
case LATEX_LIST_ENVIRONMENT:
|
2012-12-19 15:55:22 +00:00
|
|
|
os << "\\" + style.itemcommand();
|
2012-11-29 14:34:20 +00:00
|
|
|
// Item arguments
|
|
|
|
if (!style.itemargs().empty())
|
2012-12-28 10:21:24 +00:00
|
|
|
latexArgInsets(par, os, runparams, style.itemargs(), "item:");
|
2012-11-29 14:34:20 +00:00
|
|
|
os << " ";
|
2011-01-25 11:22:47 +00:00
|
|
|
break;
|
|
|
|
case LATEX_BIB_ENVIRONMENT:
|
|
|
|
// ignore this, the inset will write itself
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace anon
|
2010-06-04 21:50:08 +00:00
|
|
|
|
2008-11-16 00:12:21 +00:00
|
|
|
// FIXME: this should be anonymous
|
2010-12-15 20:51:25 +00:00
|
|
|
void TeXOnePar(Buffer const & buf,
|
2011-02-10 20:02:48 +00:00
|
|
|
Text const & text,
|
|
|
|
pit_type pit,
|
|
|
|
otexstream & os,
|
|
|
|
OutputParams const & runparams_in,
|
|
|
|
string const & everypar,
|
|
|
|
int start_pos, int end_pos)
|
2003-11-05 12:06:20 +00:00
|
|
|
{
|
2013-11-18 07:46:50 +00:00
|
|
|
BufferParams const & bparams = runparams_in.is_child
|
2014-03-13 05:43:38 +00:00
|
|
|
? buf.masterParams() : buf.params();
|
2010-12-18 15:57:27 +00:00
|
|
|
ParagraphList const & paragraphs = text.paragraphs();
|
|
|
|
Paragraph const & par = paragraphs.at(pit);
|
2010-06-15 15:37:39 +00:00
|
|
|
// FIXME This check should not really be needed.
|
|
|
|
// Perhaps we should issue an error if it is.
|
2014-08-12 16:32:01 +00:00
|
|
|
Layout const & style = text.inset().forcePlainLayout() ?
|
2010-12-18 15:57:27 +00:00
|
|
|
bparams.documentClass().plainLayout() : par.layout();
|
2008-03-21 22:51:36 +00:00
|
|
|
|
2010-06-15 15:37:39 +00:00
|
|
|
if (style.inpreamble)
|
2010-12-15 20:51:25 +00:00
|
|
|
return;
|
2010-06-15 15:37:39 +00:00
|
|
|
|
2010-12-18 15:57:27 +00:00
|
|
|
LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '"
|
2010-12-18 13:49:39 +00:00
|
|
|
<< everypar << "'");
|
|
|
|
|
2008-09-18 14:51:16 +00:00
|
|
|
OutputParams runparams = runparams_in;
|
2010-12-20 00:57:16 +00:00
|
|
|
runparams.isLastPar = (pit == pit_type(paragraphs.size() - 1));
|
2010-12-18 14:04:02 +00:00
|
|
|
// We reinitialze par begin and end to be on the safe side
|
|
|
|
// with embedded inset as we don't know if they set those
|
|
|
|
// value correctly.
|
|
|
|
runparams.par_begin = 0;
|
|
|
|
runparams.par_end = 0;
|
2008-09-18 14:51:16 +00:00
|
|
|
|
2010-02-09 14:01:21 +00:00
|
|
|
bool const maintext = text.isMainText();
|
|
|
|
// we are at the beginning of an inset and CJK is already open;
|
|
|
|
// we count inheritation levels to get the inset nesting right.
|
2014-07-05 12:23:43 +00:00
|
|
|
OutputState * state = getOutputState();
|
2010-12-18 15:57:27 +00:00
|
|
|
if (pit == 0 && !maintext
|
2014-07-05 12:23:43 +00:00
|
|
|
&& (state->cjk_inherited_ > 0 || state->open_encoding_ == CJK)) {
|
|
|
|
state->cjk_inherited_ += 1;
|
|
|
|
state->open_encoding_ = none;
|
2010-02-09 14:01:21 +00:00
|
|
|
}
|
|
|
|
|
2012-11-28 18:02:07 +00:00
|
|
|
if (text.inset().isPassThru()) {
|
2010-12-18 15:57:27 +00:00
|
|
|
Font const outerfont = text.outerFont(pit);
|
2007-10-30 16:22:56 +00:00
|
|
|
|
2010-11-06 15:06:19 +00:00
|
|
|
// No newline before first paragraph in this lyxtext
|
2010-12-18 15:57:27 +00:00
|
|
|
if (pit > 0) {
|
2007-10-30 16:22:56 +00:00
|
|
|
os << '\n';
|
2011-02-10 20:02:48 +00:00
|
|
|
if (!text.inset().getLayout().parbreakIsNewline())
|
2010-11-06 15:06:19 +00:00
|
|
|
os << '\n';
|
2007-10-30 16:22:56 +00:00
|
|
|
}
|
2007-10-24 07:13:20 +00:00
|
|
|
|
2011-02-10 20:02:48 +00:00
|
|
|
par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
|
2010-12-15 20:51:25 +00:00
|
|
|
return;
|
2007-10-23 18:23:03 +00:00
|
|
|
}
|
|
|
|
|
2010-12-18 15:57:27 +00:00
|
|
|
Paragraph const * nextpar = runparams.isLastPar
|
|
|
|
? 0 : ¶graphs.at(pit + 1);
|
|
|
|
|
2010-11-06 15:06:19 +00:00
|
|
|
if (style.pass_thru) {
|
2010-12-18 15:57:27 +00:00
|
|
|
Font const outerfont = text.outerFont(pit);
|
2011-02-10 20:02:48 +00:00
|
|
|
parStartCommand(par, os, runparams, style);
|
2011-01-16 19:14:14 +00:00
|
|
|
|
2011-02-10 20:02:48 +00:00
|
|
|
par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
|
2011-01-25 11:22:47 +00:00
|
|
|
|
|
|
|
// I did not create a parEndCommand for this minuscule
|
|
|
|
// task because in the other user of parStartCommand
|
|
|
|
// the code is different (JMarc)
|
|
|
|
if (style.isCommand())
|
Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
|
|
|
os << "}\n";
|
2011-01-25 11:22:47 +00:00
|
|
|
else
|
Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
|
|
|
os << '\n';
|
2010-11-06 15:06:19 +00:00
|
|
|
if (!style.parbreak_is_newline) {
|
|
|
|
os << '\n';
|
2013-01-23 23:16:42 +00:00
|
|
|
} else if (nextpar && !style.isEnvironment()) {
|
2011-02-10 20:02:48 +00:00
|
|
|
Layout const nextstyle = text.inset().forcePlainLayout()
|
|
|
|
? bparams.documentClass().plainLayout()
|
|
|
|
: nextpar->layout();
|
|
|
|
if (nextstyle.name() != style.name())
|
2010-11-06 15:06:19 +00:00
|
|
|
os << '\n';
|
|
|
|
}
|
|
|
|
|
2010-12-15 20:51:25 +00:00
|
|
|
return;
|
2010-11-06 15:06:19 +00:00
|
|
|
}
|
|
|
|
|
2007-07-20 01:28:20 +00:00
|
|
|
// This paragraph's language
|
2010-12-18 15:57:27 +00:00
|
|
|
Language const * const par_language = par.getParLanguage(bparams);
|
2015-10-27 21:36:52 +00:00
|
|
|
Language const * const nextpar_language = nextpar ?
|
|
|
|
nextpar->getParLanguage(bparams) : 0;
|
2007-07-20 01:28:20 +00:00
|
|
|
// The document's language
|
2007-03-12 17:19:08 +00:00
|
|
|
Language const * const doc_language = bparams.language;
|
2008-10-13 11:25:37 +00:00
|
|
|
// The language that was in effect when the environment this paragraph is
|
2007-07-20 01:28:20 +00:00
|
|
|
// inside of was opened
|
2008-10-13 11:25:37 +00:00
|
|
|
Language const * const outer_language =
|
2007-07-20 01:28:20 +00:00
|
|
|
(runparams.local_font != 0) ?
|
|
|
|
runparams.local_font->language() : doc_language;
|
2009-07-30 00:58:37 +00:00
|
|
|
|
2010-12-18 15:57:27 +00:00
|
|
|
Paragraph const * priorpar = (pit == 0) ? 0 : ¶graphs.at(pit - 1);
|
|
|
|
|
2009-07-30 00:58:37 +00:00
|
|
|
// The previous language that was in effect is the language of the
|
|
|
|
// previous paragraph, unless the previous paragraph is inside an
|
|
|
|
// environment with nesting depth greater than (or equal to, but with
|
|
|
|
// a different layout) the current one. If there is no previous
|
|
|
|
// paragraph, the previous language is the outer language.
|
2014-07-05 12:23:43 +00:00
|
|
|
bool const use_prev_env_language = state->prev_env_language_ != 0
|
2010-12-18 15:57:27 +00:00
|
|
|
&& priorpar
|
|
|
|
&& priorpar->layout().isEnvironment()
|
|
|
|
&& (priorpar->getDepth() > par.getDepth()
|
|
|
|
|| (priorpar->getDepth() == par.getDepth()
|
2010-12-18 16:19:05 +00:00
|
|
|
&& priorpar->layout() != par.layout()));
|
2009-07-28 16:15:34 +00:00
|
|
|
Language const * const prev_language =
|
2010-12-18 15:57:27 +00:00
|
|
|
(pit != 0)
|
2014-07-05 12:23:43 +00:00
|
|
|
? (use_prev_env_language ? state->prev_env_language_
|
2010-12-18 15:57:27 +00:00
|
|
|
: priorpar->getParLanguage(bparams))
|
2009-07-30 00:58:37 +00:00
|
|
|
: outer_language;
|
2009-07-28 16:15:34 +00:00
|
|
|
|
2011-06-02 19:55:08 +00:00
|
|
|
|
2012-06-23 13:41:05 +00:00
|
|
|
bool const use_polyglossia = runparams.use_polyglossia;
|
|
|
|
string const par_lang = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
getPolyglossiaEnvName(par_language): par_language->babel();
|
2012-06-23 13:41:05 +00:00
|
|
|
string const prev_lang = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
getPolyglossiaEnvName(prev_language) : prev_language->babel();
|
2012-06-23 13:41:05 +00:00
|
|
|
string const outer_lang = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
getPolyglossiaEnvName(outer_language) : outer_language->babel();
|
2015-10-27 21:36:52 +00:00
|
|
|
string const nextpar_lang = nextpar_language ? (use_polyglossia ?
|
|
|
|
getPolyglossiaEnvName(nextpar_language) :
|
|
|
|
nextpar_language->babel()) : string();
|
2012-11-28 19:55:21 +00:00
|
|
|
string lang_begin_command = use_polyglossia ?
|
2015-05-03 14:08:14 +00:00
|
|
|
"\\begin{$$lang}$$opts" : lyxrc.language_command_begin;
|
2012-11-28 19:55:21 +00:00
|
|
|
string lang_end_command = use_polyglossia ?
|
2011-06-02 19:55:08 +00:00
|
|
|
"\\end{$$lang}" : lyxrc.language_command_end;
|
2012-11-28 19:55:21 +00:00
|
|
|
// the '%' is necessary to prevent unwanted whitespace
|
|
|
|
string lang_command_termination = "%\n";
|
|
|
|
|
|
|
|
// In some insets (such as Arguments), we cannot use \selectlanguage
|
2015-05-03 14:08:14 +00:00
|
|
|
bool const localswitch = text.inset().forceLocalFontSwitch();
|
2012-11-28 19:55:21 +00:00
|
|
|
if (localswitch) {
|
2015-05-03 14:08:14 +00:00
|
|
|
lang_begin_command = use_polyglossia ?
|
|
|
|
"\\text$$lang$$opts{" : lyxrc.language_command_local;
|
2012-11-28 19:55:21 +00:00
|
|
|
lang_end_command = "}";
|
|
|
|
lang_command_termination.clear();
|
|
|
|
}
|
2011-06-02 19:55:08 +00:00
|
|
|
|
2010-11-22 12:10:16 +00:00
|
|
|
if (par_lang != prev_lang
|
2010-12-18 16:19:05 +00:00
|
|
|
// check if we already put language command in TeXEnvironment()
|
|
|
|
&& !(style.isEnvironment()
|
|
|
|
&& (pit == 0 || (priorpar->layout() != par.layout()
|
|
|
|
&& priorpar->getDepth() <= par.getDepth())
|
|
|
|
|| priorpar->getDepth() < par.getDepth())))
|
2003-11-05 12:06:20 +00:00
|
|
|
{
|
2010-11-22 12:10:16 +00:00
|
|
|
if (!lang_end_command.empty() &&
|
|
|
|
prev_lang != outer_lang &&
|
|
|
|
!prev_lang.empty())
|
2003-11-05 12:06:20 +00:00
|
|
|
{
|
2010-11-22 12:10:16 +00:00
|
|
|
os << from_ascii(subst(lang_end_command,
|
2006-10-19 16:51:30 +00:00
|
|
|
"$$lang",
|
2010-11-22 12:10:16 +00:00
|
|
|
prev_lang))
|
2012-11-28 19:55:21 +00:00
|
|
|
<< lang_command_termination;
|
2015-10-19 19:08:01 +00:00
|
|
|
if (prev_lang == state->open_polyglossia_lang_)
|
|
|
|
state->open_polyglossia_lang_ = "";
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
|
2008-10-13 11:25:37 +00:00
|
|
|
// We need to open a new language if we couldn't close the previous
|
2007-07-20 01:28:20 +00:00
|
|
|
// one (because there's no language_command_end); and even if we closed
|
|
|
|
// the previous one, if the current language is different than the
|
|
|
|
// outer_language (which is currently in effect once the previous one
|
|
|
|
// is closed).
|
2010-12-18 16:19:05 +00:00
|
|
|
if ((lang_end_command.empty() || par_lang != outer_lang)
|
|
|
|
&& !par_lang.empty()) {
|
2007-07-20 01:28:20 +00:00
|
|
|
// If we're inside an inset, and that inset is within an \L or \R
|
|
|
|
// (or equivalents), then within the inset, too, any opposite
|
|
|
|
// language paragraph should appear within an \L or \R (in addition
|
|
|
|
// to, outside of, the normal language switch commands).
|
|
|
|
// This behavior is not correct for ArabTeX, though.
|
2012-06-23 13:41:05 +00:00
|
|
|
if (!use_polyglossia
|
2010-11-22 12:10:16 +00:00
|
|
|
// not for ArabTeX
|
2010-12-18 16:19:05 +00:00
|
|
|
&& par_language->lang() != "arabic_arabtex"
|
|
|
|
&& outer_language->lang() != "arabic_arabtex"
|
2010-11-22 12:10:16 +00:00
|
|
|
// are we in an inset?
|
2010-12-18 16:19:05 +00:00
|
|
|
&& runparams.local_font != 0
|
2010-11-22 12:10:16 +00:00
|
|
|
// is the inset within an \L or \R?
|
|
|
|
//
|
|
|
|
// FIXME: currently, we don't check this; this means that
|
|
|
|
// we'll have unnnecessary \L and \R commands, but that
|
|
|
|
// doesn't seem to hurt (though latex will complain)
|
|
|
|
//
|
|
|
|
// is this paragraph in the opposite direction?
|
2010-12-18 16:19:05 +00:00
|
|
|
&& runparams.local_font->isRightToLeft() != par_language->rightToLeft()) {
|
2007-07-20 01:28:20 +00:00
|
|
|
// FIXME: I don't have a working copy of the Arabi package, so
|
|
|
|
// I'm not sure if the farsi and arabic_arabi stuff is correct
|
|
|
|
// or not...
|
|
|
|
if (par_language->lang() == "farsi")
|
|
|
|
os << "\\textFR{";
|
|
|
|
else if (outer_language->lang() == "farsi")
|
|
|
|
os << "\\textLR{";
|
|
|
|
else if (par_language->lang() == "arabic_arabi")
|
|
|
|
os << "\\textAR{";
|
|
|
|
else if (outer_language->lang() == "arabic_arabi")
|
|
|
|
os << "\\textLR{";
|
|
|
|
// remaining RTL languages currently is hebrew
|
|
|
|
else if (par_language->rightToLeft())
|
|
|
|
os << "\\R{";
|
|
|
|
else
|
|
|
|
os << "\\L{";
|
|
|
|
}
|
2007-12-08 11:21:00 +00:00
|
|
|
// With CJK, the CJK tag has to be closed first (see below)
|
2012-06-24 08:56:08 +00:00
|
|
|
if (runparams.encoding->package() != Encoding::CJK
|
|
|
|
&& !par_lang.empty()) {
|
2015-05-03 14:08:14 +00:00
|
|
|
string bc = use_polyglossia ?
|
|
|
|
getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts())
|
|
|
|
: subst(lang_begin_command, "$$lang", par_lang);
|
|
|
|
os << bc;
|
2012-11-28 19:55:21 +00:00
|
|
|
os << lang_command_termination;
|
2007-12-08 11:21:00 +00:00
|
|
|
}
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-05 19:19:41 +00:00
|
|
|
// Switch file encoding if necessary; no need to do this for "default"
|
|
|
|
// encoding, since this only affects the position of the outputted
|
|
|
|
// \inputencoding command; the encoding switch will occur when necessary
|
2010-12-18 16:32:29 +00:00
|
|
|
if (bparams.inputenc == "auto"
|
2015-11-12 15:55:04 +00:00
|
|
|
&& !runparams.isFullUnicode() // Xe/LuaTeX use one document-wide encoding (see also switchEncoding())
|
2010-12-18 16:32:29 +00:00
|
|
|
&& runparams.encoding->package() != Encoding::none) {
|
2007-04-16 18:06:01 +00:00
|
|
|
// 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
|
2010-03-27 17:29:56 +00:00
|
|
|
// sections. For this reason we only set runparams.moving_arg
|
|
|
|
// after checking for the encoding change, otherwise the
|
|
|
|
// change would be always avoided by switchEncoding().
|
2010-12-18 15:57:27 +00:00
|
|
|
for (pos_type i = 0; i < par.size(); ++i) {
|
|
|
|
char_type const c = par.getChar(i);
|
2008-01-25 13:27:08 +00:00
|
|
|
Encoding const * const encoding =
|
2010-12-18 15:57:27 +00:00
|
|
|
par.getFontSettings(bparams, i).language()->encoding();
|
2010-12-18 16:32:29 +00:00
|
|
|
if (encoding->package() != Encoding::CJK
|
|
|
|
&& runparams.encoding->package() == Encoding::inputenc
|
2012-12-30 10:58:21 +00:00
|
|
|
&& isASCII(c))
|
2007-04-16 18:06:01 +00:00
|
|
|
continue;
|
2010-12-18 15:57:27 +00:00
|
|
|
if (par.isInset(i))
|
2007-04-16 18:06:01 +00:00
|
|
|
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.
|
2008-01-25 13:27:08 +00:00
|
|
|
// With CJK, only add switch if we have CJK content at the beginning
|
2007-12-08 11:21:00 +00:00
|
|
|
// of the paragraph
|
2010-12-18 16:32:29 +00:00
|
|
|
if (i != 0 && encoding->package() == Encoding::CJK)
|
|
|
|
continue;
|
|
|
|
|
Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
|
|
|
pair<bool, int> enc_switch = switchEncoding(os.os(),
|
|
|
|
bparams, runparams, *encoding);
|
2010-12-18 16:32:29 +00:00
|
|
|
// the following is necessary after a CJK environment in a multilingual
|
|
|
|
// context (nesting issue).
|
|
|
|
if (par_language->encoding()->package() == Encoding::CJK
|
2014-07-05 12:23:43 +00:00
|
|
|
&& state->open_encoding_ != CJK && state->cjk_inherited_ == 0) {
|
2010-12-18 16:32:29 +00:00
|
|
|
os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
|
|
|
|
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = CJK;
|
2010-12-18 16:32:29 +00:00
|
|
|
}
|
|
|
|
if (encoding->package() != Encoding::none && enc_switch.first) {
|
|
|
|
if (enc_switch.second > 0) {
|
|
|
|
// the '%' is necessary to prevent unwanted whitespace
|
|
|
|
os << "%\n";
|
2007-07-05 19:19:41 +00:00
|
|
|
}
|
2010-12-18 16:32:29 +00:00
|
|
|
// With CJK, the CJK tag had to be closed first (see above)
|
2012-06-24 08:56:08 +00:00
|
|
|
if (runparams.encoding->package() == Encoding::CJK
|
|
|
|
&& !par_lang.empty()) {
|
2010-12-18 16:32:29 +00:00
|
|
|
os << from_ascii(subst(
|
|
|
|
lang_begin_command,
|
|
|
|
"$$lang",
|
|
|
|
par_lang))
|
2012-11-28 19:55:21 +00:00
|
|
|
<< lang_command_termination;
|
2007-12-08 11:21:00 +00:00
|
|
|
}
|
2010-12-18 16:32:29 +00:00
|
|
|
runparams.encoding = encoding;
|
2007-04-16 18:06:01 +00:00
|
|
|
}
|
2010-12-18 16:32:29 +00:00
|
|
|
break;
|
2007-04-16 18:06:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-27 17:29:56 +00:00
|
|
|
runparams.moving_arg |= style.needprotect;
|
2009-08-03 18:31:20 +00:00
|
|
|
Encoding const * const prev_encoding = runparams.encoding;
|
|
|
|
|
2008-02-28 01:42:02 +00:00
|
|
|
bool const useSetSpace = bparams.documentClass().provides("SetSpace");
|
2010-12-18 15:57:27 +00:00
|
|
|
if (par.allowParagraphCustomization()) {
|
|
|
|
if (par.params().startOfAppendix()) {
|
2014-05-16 13:39:33 +00:00
|
|
|
os << "\n\\appendix\n";
|
2004-09-28 13:29:19 +00:00
|
|
|
}
|
|
|
|
|
2010-12-18 15:57:27 +00:00
|
|
|
if (!par.params().spacing().isDefault()
|
|
|
|
&& (pit == 0 || !priorpar->hasSameLayout(par)))
|
2004-09-28 13:29:19 +00:00
|
|
|
{
|
2010-12-18 15:57:27 +00:00
|
|
|
os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
|
2006-10-19 16:51:30 +00:00
|
|
|
<< '\n';
|
2004-09-28 13:29:19 +00:00
|
|
|
}
|
|
|
|
|
2008-03-06 21:31:27 +00:00
|
|
|
if (style.isCommand()) {
|
2004-09-28 13:29:19 +00:00
|
|
|
os << '\n';
|
|
|
|
}
|
2004-10-05 10:11:42 +00:00
|
|
|
}
|
2004-09-28 13:29:19 +00:00
|
|
|
|
2011-02-10 20:02:48 +00:00
|
|
|
parStartCommand(par, os, runparams, style);
|
2010-12-18 15:57:27 +00:00
|
|
|
Font const outerfont = text.outerFont(pit);
|
2007-03-18 10:59:16 +00:00
|
|
|
|
2006-10-19 16:51:30 +00:00
|
|
|
// FIXME UNICODE
|
2006-10-21 00:16:43 +00:00
|
|
|
os << from_utf8(everypar);
|
2011-02-10 20:02:48 +00:00
|
|
|
par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
|
2003-11-05 12:06:20 +00:00
|
|
|
|
|
|
|
// Make sure that \\par is done with the font of the last
|
|
|
|
// character if this has another size as the default.
|
|
|
|
// This is necessary because LaTeX (and LyX on the screen)
|
|
|
|
// calculates the space between the baselines according
|
|
|
|
// to this font. (Matthias)
|
|
|
|
//
|
2014-09-01 07:14:26 +00:00
|
|
|
// We must not change the font for the last paragraph
|
2015-06-09 05:57:19 +00:00
|
|
|
// of non-multipar insets, tabular cells or commands,
|
|
|
|
// since this produces unwanted whitespace.
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2010-12-18 15:57:27 +00:00
|
|
|
Font const font = par.empty()
|
|
|
|
? par.getLayoutFont(bparams, outerfont)
|
|
|
|
: par.getFont(bparams, par.size() - 1, outerfont);
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2008-10-31 15:33:48 +00:00
|
|
|
bool const is_command = style.isCommand();
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2008-03-06 21:31:27 +00:00
|
|
|
if (style.resfont.size() != font.fontInfo().size()
|
2014-09-01 07:14:26 +00:00
|
|
|
&& (nextpar || maintext
|
2015-06-09 06:18:19 +00:00
|
|
|
|| (text.inset().paragraphs().size() > 1
|
2015-06-09 05:57:19 +00:00
|
|
|
&& text.inset().lyxCode() != CELL_CODE))
|
2003-11-05 12:06:20 +00:00
|
|
|
&& !is_command) {
|
2010-06-15 15:49:24 +00:00
|
|
|
os << '{';
|
2006-10-21 00:16:43 +00:00
|
|
|
os << "\\" << from_ascii(font.latexSize()) << " \\par}";
|
2009-08-03 18:31:20 +00:00
|
|
|
} else if (is_command) {
|
2003-11-05 12:06:20 +00:00
|
|
|
os << '}';
|
2012-12-28 10:21:24 +00:00
|
|
|
if (!style.postcommandargs().empty())
|
|
|
|
latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
|
2009-09-16 20:50:40 +00:00
|
|
|
if (runparams.encoding != prev_encoding) {
|
|
|
|
runparams.encoding = prev_encoding;
|
2015-11-12 15:55:04 +00:00
|
|
|
os << setEncoding(prev_encoding->iconvName());
|
2009-09-16 20:50:40 +00:00
|
|
|
}
|
2009-08-03 18:31:20 +00:00
|
|
|
}
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2007-01-17 22:01:08 +00:00
|
|
|
bool pending_newline = false;
|
2011-09-17 15:25:14 +00:00
|
|
|
bool unskip_newline = false;
|
2008-03-06 21:31:27 +00:00
|
|
|
switch (style.latextype) {
|
2003-11-05 12:06:20 +00:00
|
|
|
case LATEX_ITEM_ENVIRONMENT:
|
|
|
|
case LATEX_LIST_ENVIRONMENT:
|
2014-05-20 22:59:36 +00:00
|
|
|
if (nextpar && par.params().depth() < nextpar->params().depth())
|
2007-01-17 22:01:08 +00:00
|
|
|
pending_newline = true;
|
2003-11-05 12:06:20 +00:00
|
|
|
break;
|
|
|
|
case LATEX_ENVIRONMENT: {
|
|
|
|
// if its the last paragraph of the current environment
|
|
|
|
// skip it otherwise fall through
|
2010-12-18 16:19:05 +00:00
|
|
|
if (nextpar
|
|
|
|
&& (nextpar->layout() != par.layout()
|
|
|
|
|| nextpar->params().depth() != par.params().depth()))
|
2003-11-05 12:06:20 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-02-11 17:16:05 +00:00
|
|
|
// fall through possible
|
2003-11-05 12:06:20 +00:00
|
|
|
default:
|
|
|
|
// we don't need it for the last paragraph!!!
|
2014-05-20 22:59:36 +00:00
|
|
|
if (nextpar)
|
2007-01-17 22:01:08 +00:00
|
|
|
pending_newline = true;
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
|
2010-12-18 15:57:27 +00:00
|
|
|
if (par.allowParagraphCustomization()) {
|
|
|
|
if (!par.params().spacing().isDefault()
|
2010-12-18 16:19:05 +00:00
|
|
|
&& (runparams.isLastPar || !nextpar->hasSameLayout(par))) {
|
2011-02-10 20:02:48 +00:00
|
|
|
if (pending_newline)
|
2007-01-17 22:01:08 +00:00
|
|
|
os << '\n';
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
|
|
|
|
string const endtag =
|
|
|
|
par.params().spacing().writeEnvirEnd(useSetSpace);
|
|
|
|
if (prefixIs(endtag, "\\end{"))
|
|
|
|
os << breakln;
|
|
|
|
|
|
|
|
os << from_ascii(endtag);
|
2007-01-17 22:01:08 +00:00
|
|
|
pending_newline = true;
|
2004-09-28 13:29:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-20 01:28:20 +00:00
|
|
|
// Closing the language is needed for the last paragraph; it is also
|
|
|
|
// needed if we're within an \L or \R that we may have opened above (not
|
|
|
|
// necessarily in this paragraph) and are about to close.
|
2012-06-23 13:41:05 +00:00
|
|
|
bool closing_rtl_ltr_environment = !use_polyglossia
|
2007-07-20 01:28:20 +00:00
|
|
|
// not for ArabTeX
|
2010-12-18 16:11:38 +00:00
|
|
|
&& (par_language->lang() != "arabic_arabtex"
|
|
|
|
&& outer_language->lang() != "arabic_arabtex")
|
2013-05-20 10:31:46 +00:00
|
|
|
// have we opened an \L or \R environment?
|
2010-12-18 16:11:38 +00:00
|
|
|
&& runparams.local_font != 0
|
|
|
|
&& runparams.local_font->isRightToLeft() != par_language->rightToLeft()
|
2007-07-20 01:28:20 +00:00
|
|
|
// are we about to close the language?
|
2015-10-27 21:36:52 +00:00
|
|
|
&&((nextpar && par_lang != nextpar_lang)
|
|
|
|
|| (runparams.isLastPar && par_lang != outer_lang));
|
2010-12-18 15:57:27 +00:00
|
|
|
|
|
|
|
if (closing_rtl_ltr_environment
|
2012-06-23 13:44:25 +00:00
|
|
|
|| (runparams.isLastPar
|
2015-10-27 21:36:52 +00:00
|
|
|
&& par_lang != outer_lang)) {
|
2004-04-22 13:59:39 +00:00
|
|
|
// Since \selectlanguage write the language to the aux file,
|
|
|
|
// we need to reset the language at the end of footnote or
|
|
|
|
// float.
|
|
|
|
|
2011-02-10 20:02:48 +00:00
|
|
|
if (pending_newline)
|
2007-01-17 22:01:08 +00:00
|
|
|
os << '\n';
|
2011-02-10 20:02:48 +00:00
|
|
|
|
2007-12-08 11:21:00 +00:00
|
|
|
// when the paragraph uses CJK, the language has to be closed earlier
|
|
|
|
if (font.language()->encoding()->package() != Encoding::CJK) {
|
2010-11-22 12:10:16 +00:00
|
|
|
if (lang_end_command.empty()) {
|
2009-10-18 21:48:13 +00:00
|
|
|
// If this is a child, we should restore the
|
|
|
|
// master language after the last paragraph.
|
|
|
|
Language const * const current_language =
|
2010-12-18 15:57:27 +00:00
|
|
|
(runparams.isLastPar && runparams.master_language)
|
2009-10-18 21:48:13 +00:00
|
|
|
? runparams.master_language
|
2010-01-06 17:36:22 +00:00
|
|
|
: outer_language;
|
2012-06-23 13:41:05 +00:00
|
|
|
string const current_lang = use_polyglossia
|
2011-06-02 19:55:08 +00:00
|
|
|
? getPolyglossiaEnvName(current_language)
|
2010-11-22 12:10:16 +00:00
|
|
|
: current_language->babel();
|
|
|
|
if (!current_lang.empty()) {
|
2015-05-03 14:08:14 +00:00
|
|
|
string bc = use_polyglossia ?
|
|
|
|
getPolyglossiaBegin(lang_begin_command, current_lang,
|
|
|
|
current_language->polyglossiaOpts())
|
|
|
|
: subst(lang_begin_command, "$$lang", current_lang);
|
|
|
|
os << bc;
|
2012-11-28 19:55:21 +00:00
|
|
|
pending_newline = !localswitch;
|
|
|
|
unskip_newline = !localswitch;
|
2007-12-08 11:21:00 +00:00
|
|
|
}
|
2010-11-22 12:10:16 +00:00
|
|
|
} else if (!par_lang.empty()) {
|
2015-06-19 17:02:35 +00:00
|
|
|
// If we are in an environment, we have to close the "outer" language afterwards
|
|
|
|
if (!style.isEnvironment() || state->open_polyglossia_lang_ != par_lang) {
|
2015-06-19 07:25:11 +00:00
|
|
|
os << from_ascii(subst(
|
|
|
|
lang_end_command,
|
|
|
|
"$$lang",
|
|
|
|
par_lang));
|
|
|
|
pending_newline = !localswitch;
|
|
|
|
unskip_newline = !localswitch;
|
|
|
|
}
|
2007-05-05 19:18:34 +00:00
|
|
|
}
|
2007-05-05 20:27:43 +00:00
|
|
|
}
|
2004-04-22 13:59:39 +00:00
|
|
|
}
|
2007-07-20 01:28:20 +00:00
|
|
|
if (closing_rtl_ltr_environment)
|
|
|
|
os << "}";
|
2004-04-22 13:59:39 +00:00
|
|
|
|
2014-05-20 22:59:36 +00:00
|
|
|
bool const last_was_separator =
|
|
|
|
par.size() > 0 && par.isEnvSeparator(par.size() - 1);
|
|
|
|
|
2011-09-17 15:25:14 +00:00
|
|
|
if (pending_newline) {
|
|
|
|
if (unskip_newline)
|
|
|
|
// prevent unwanted whitespace
|
|
|
|
os << '%';
|
2014-05-20 22:59:36 +00:00
|
|
|
if (!os.afterParbreak() && !last_was_separator)
|
|
|
|
os << '\n';
|
2011-09-17 15:25:14 +00:00
|
|
|
}
|
2007-07-20 01:28:20 +00:00
|
|
|
|
2007-12-08 11:21:00 +00:00
|
|
|
// 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)
|
2010-12-18 16:11:38 +00:00
|
|
|
if (nextpar
|
2014-07-05 12:23:43 +00:00
|
|
|
&& state->open_encoding_ == CJK
|
2015-10-27 21:36:52 +00:00
|
|
|
&& (nextpar_language->encoding()->package() != Encoding::CJK
|
2010-12-18 16:11:38 +00:00
|
|
|
|| (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams)))
|
|
|
|
// inbetween environments, CJK has to be closed later (nesting!)
|
|
|
|
&& (!style.isEnvironment() || !nextpar->layout().isEnvironment())) {
|
2007-12-08 11:21:00 +00:00
|
|
|
os << "\\end{CJK}\n";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = none;
|
2007-12-08 11:21:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// If this is the last paragraph, close the CJK environment
|
|
|
|
// if necessary. If it's an environment, we'll have to \end that first.
|
2010-12-18 15:57:27 +00:00
|
|
|
if (runparams.isLastPar && !style.isEnvironment()) {
|
2014-07-05 12:23:43 +00:00
|
|
|
switch (state->open_encoding_) {
|
2007-12-08 11:21:00 +00:00
|
|
|
case CJK: {
|
2008-10-21 17:03:49 +00:00
|
|
|
// do nothing at the end of child documents
|
|
|
|
if (maintext && buf.masterBuffer() != &buf)
|
|
|
|
break;
|
2007-12-08 11:21:00 +00:00
|
|
|
// end of main text
|
2008-01-25 13:27:08 +00:00
|
|
|
if (maintext) {
|
2011-02-10 20:02:48 +00:00
|
|
|
os << "\n\\end{CJK}\n";
|
2007-12-08 11:21:00 +00:00
|
|
|
// end of an inset
|
|
|
|
} else
|
|
|
|
os << "\\end{CJK}";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = none;
|
2007-12-08 11:21:00 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case inputenc: {
|
|
|
|
os << "\\egroup";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = none;
|
2007-12-08 11:21:00 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case none:
|
|
|
|
default:
|
|
|
|
// do nothing
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-20 01:28:20 +00:00
|
|
|
// If this is the last paragraph, and a local_font was set upon entering
|
2015-11-12 15:55:04 +00:00
|
|
|
// the inset, and we're using "auto" or "default" encoding, and not
|
|
|
|
// compiling with XeTeX or LuaTeX, the encoding
|
2008-03-26 22:38:41 +00:00
|
|
|
// should be set back to that local_font's encoding.
|
2010-12-18 15:57:27 +00:00
|
|
|
if (runparams.isLastPar && runparams_in.local_font != 0
|
2008-07-09 07:21:02 +00:00
|
|
|
&& runparams_in.encoding != runparams_in.local_font->language()->encoding()
|
2009-04-06 06:58:30 +00:00
|
|
|
&& (bparams.inputenc == "auto" || bparams.inputenc == "default")
|
2015-11-12 15:55:04 +00:00
|
|
|
&& !runparams.isFullUnicode()
|
2015-11-10 23:10:06 +00:00
|
|
|
) {
|
2007-07-20 01:28:20 +00:00
|
|
|
runparams_in.encoding = runparams_in.local_font->language()->encoding();
|
2008-03-26 22:38:41 +00:00
|
|
|
os << setEncoding(runparams_in.encoding->iconvName());
|
2007-07-20 01:28:20 +00:00
|
|
|
}
|
|
|
|
// Otherwise, the current encoding should be set for the next paragraph.
|
|
|
|
else
|
|
|
|
runparams_in.encoding = runparams.encoding;
|
|
|
|
|
2007-01-09 19:25:40 +00:00
|
|
|
|
2008-10-31 15:37:34 +00:00
|
|
|
// we don't need a newline for the last paragraph!!!
|
|
|
|
// Note from JMarc: we will re-add a \n explicitly in
|
2004-04-22 13:59:39 +00:00
|
|
|
// TeXEnvironment, because it is needed in this case
|
2014-05-20 22:59:36 +00:00
|
|
|
if (nextpar && !os.afterParbreak() && !last_was_separator) {
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
// Make sure to start a new line
|
|
|
|
os << breakln;
|
2010-12-18 15:57:27 +00:00
|
|
|
Layout const & next_layout = nextpar->layout();
|
2014-05-14 20:25:15 +00:00
|
|
|
// A newline '\n' is always output before a command,
|
|
|
|
// so avoid doubling it.
|
|
|
|
if (!next_layout.isCommand()) {
|
|
|
|
// Here we now try to avoid spurious empty lines by
|
|
|
|
// outputting a paragraph break only if: (case 1) the
|
|
|
|
// paragraph style allows parbreaks and no \begin, \end
|
|
|
|
// or \item tags are going to follow (i.e., if the next
|
|
|
|
// isn't the first or the current isn't the last
|
|
|
|
// paragraph of an environment or itemize) and the
|
|
|
|
// depth and alignment of the following paragraph is
|
|
|
|
// unchanged, or (case 2) the following is a
|
|
|
|
// non-environment paragraph whose depth is increased
|
|
|
|
// but whose alignment is unchanged, or (case 3) the
|
2014-05-21 19:08:11 +00:00
|
|
|
// paragraph is not an environment and the next one is a
|
|
|
|
// non-itemize-like env at lower depth, or (case 4) the
|
2014-05-14 20:25:15 +00:00
|
|
|
// paragraph is a command not followed by an environment
|
|
|
|
// and the alignment of the current and next paragraph
|
2014-05-21 19:08:11 +00:00
|
|
|
// is unchanged, or (case 5) the current alignment is
|
2014-05-16 13:39:33 +00:00
|
|
|
// changed and a standard paragraph follows.
|
|
|
|
DocumentClass const & tclass = bparams.documentClass();
|
2014-05-14 20:25:15 +00:00
|
|
|
if ((style == next_layout
|
|
|
|
&& !style.parbreak_is_newline
|
2015-04-21 17:43:41 +00:00
|
|
|
&& !text.inset().getLayout().parbreakIsNewline()
|
2014-05-14 20:25:15 +00:00
|
|
|
&& style.latextype != LATEX_ITEM_ENVIRONMENT
|
|
|
|
&& style.latextype != LATEX_LIST_ENVIRONMENT
|
|
|
|
&& style.align == par.getAlign()
|
|
|
|
&& nextpar->getDepth() == par.getDepth()
|
|
|
|
&& nextpar->getAlign() == par.getAlign())
|
|
|
|
|| (!next_layout.isEnvironment()
|
|
|
|
&& nextpar->getDepth() > par.getDepth()
|
|
|
|
&& nextpar->getAlign() == par.getAlign())
|
2014-05-21 19:08:11 +00:00
|
|
|
|| (!style.isEnvironment()
|
|
|
|
&& next_layout.latextype == LATEX_ENVIRONMENT
|
|
|
|
&& nextpar->getDepth() < par.getDepth())
|
2014-05-14 20:25:15 +00:00
|
|
|
|| (style.isCommand()
|
|
|
|
&& !next_layout.isEnvironment()
|
|
|
|
&& style.align == par.getAlign()
|
2014-05-16 13:39:33 +00:00
|
|
|
&& next_layout.align == nextpar->getAlign())
|
|
|
|
|| (style.align != par.getAlign()
|
|
|
|
&& tclass.isDefaultLayout(next_layout))) {
|
2014-05-14 20:25:15 +00:00
|
|
|
os << '\n';
|
|
|
|
}
|
2008-07-02 08:34:55 +00:00
|
|
|
}
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
|
2010-12-18 15:57:27 +00:00
|
|
|
LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " done; ptr "
|
|
|
|
<< &par << " next " << nextpar);
|
2006-10-26 15:01:45 +00:00
|
|
|
|
2010-12-15 20:51:25 +00:00
|
|
|
return;
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
|
2004-02-11 14:45:44 +00:00
|
|
|
|
|
|
|
// LaTeX all paragraphs
|
2003-11-05 12:06:20 +00:00
|
|
|
void latexParagraphs(Buffer const & buf,
|
2008-01-25 13:27:08 +00:00
|
|
|
Text const & text,
|
Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
|
|
|
otexstream & os,
|
2003-11-05 12:06:20 +00:00
|
|
|
OutputParams const & runparams,
|
|
|
|
string const & everypar)
|
|
|
|
{
|
2013-04-25 21:27:10 +00:00
|
|
|
LASSERT(runparams.par_begin <= runparams.par_end,
|
|
|
|
{ os << "% LaTeX Output Error\n"; return; } );
|
|
|
|
|
2008-01-25 13:27:08 +00:00
|
|
|
BufferParams const & bparams = buf.params();
|
view-source feature, from Bo Peng <ben.bob@gmail.com>
* src/buffer.h buffer.C - getSourceCode()
* src/lyxfunc.C - open view-source dialog
* src/text3.C - change LFUN_MOUSE_RELEASE
* src/output_linuxdoc.C, src/output_docbook.C, src/output_latex.C
- intercept output
* src/outputparams.h, outputparams.C - add par_begin, par_end, dryrun
* src/insets/insetgraphics.C - add dryrun mode of file conversion
* lib/ui/stdmenus.ui - add view-source menu item under view
* Add view-source dialog, add
src/frontends/qt2/QViewSourceDialog.h, QViewSource.C, QViewSource.h, QViewSourceDialog.C
src/frontends/qt2/ui/QViewSourceDialogBase.ui
src/frontends/controllers/ControlViewSource.h ControlViewSource.C
modify
src/frontends/qt2/Makefile.dialogs, Makefile.am, Dialogs.C,
src/frontends/controllers/Makefile.am, po.POTFILES.in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13610 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-09 02:48:54 +00:00
|
|
|
|
2009-08-09 15:29:34 +00:00
|
|
|
bool const maintext = text.isMainText();
|
2008-10-21 17:03:49 +00:00
|
|
|
bool const is_child = buf.masterBuffer() != &buf;
|
2008-01-25 13:27:08 +00:00
|
|
|
|
|
|
|
// Open a CJK environment at the beginning of the main buffer
|
|
|
|
// if the document's language is a CJK language
|
2008-10-21 17:03:49 +00:00
|
|
|
// (but not in child documents)
|
2014-07-05 12:23:43 +00:00
|
|
|
OutputState * state = getOutputState();
|
2008-10-21 17:03:49 +00:00
|
|
|
if (maintext && !is_child
|
|
|
|
&& bparams.encoding().package() == Encoding::CJK) {
|
2008-01-25 13:27:08 +00:00
|
|
|
os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
|
2010-11-26 18:32:29 +00:00
|
|
|
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = CJK;
|
2008-01-25 13:27:08 +00:00
|
|
|
}
|
2010-01-29 14:44:21 +00:00
|
|
|
// if "auto begin" is switched off, explicitly switch the
|
2008-01-25 13:27:08 +00:00
|
|
|
// language on at start
|
2011-06-02 19:55:08 +00:00
|
|
|
string const mainlang = runparams.use_polyglossia
|
|
|
|
? getPolyglossiaEnvName(bparams.language)
|
2010-11-22 12:10:16 +00:00
|
|
|
: bparams.language->babel();
|
|
|
|
string const lang_begin_command = runparams.use_polyglossia ?
|
2015-05-03 14:08:14 +00:00
|
|
|
"\\begin{$$lang}$$opts" : lyxrc.language_command_begin;
|
2010-11-22 12:10:16 +00:00
|
|
|
|
2008-01-25 13:27:08 +00:00
|
|
|
if (maintext && !lyxrc.language_auto_begin &&
|
2010-11-22 12:10:16 +00:00
|
|
|
!mainlang.empty()) {
|
2008-01-25 13:27:08 +00:00
|
|
|
// FIXME UNICODE
|
2015-05-03 14:08:14 +00:00
|
|
|
string bc = runparams.use_polyglossia ?
|
|
|
|
getPolyglossiaBegin(lang_begin_command, mainlang,
|
|
|
|
bparams.language->polyglossiaOpts())
|
|
|
|
: subst(lang_begin_command, "$$lang", mainlang);
|
|
|
|
os << bc;
|
2010-11-22 12:10:16 +00:00
|
|
|
os << '\n';
|
2008-01-25 13:27:08 +00:00
|
|
|
}
|
|
|
|
|
2010-12-18 08:31:34 +00:00
|
|
|
ParagraphList const & paragraphs = text.paragraphs();
|
2010-12-18 13:49:39 +00:00
|
|
|
|
|
|
|
if (runparams.par_begin == runparams.par_end) {
|
|
|
|
// The full doc will be exported but it is easier to just rely on
|
|
|
|
// runparams range parameters that will be passed TeXEnvironment.
|
|
|
|
runparams.par_begin = 0;
|
|
|
|
runparams.par_end = paragraphs.size();
|
2010-12-18 08:23:14 +00:00
|
|
|
}
|
|
|
|
|
2010-12-18 13:49:39 +00:00
|
|
|
pit_type pit = runparams.par_begin;
|
2010-12-18 08:23:14 +00:00
|
|
|
// lastpit is for the language check after the loop.
|
2010-12-20 00:57:16 +00:00
|
|
|
pit_type lastpit = pit;
|
2011-01-06 13:41:50 +00:00
|
|
|
// variables used in the loop:
|
|
|
|
bool was_title = false;
|
|
|
|
bool already_title = false;
|
2010-12-18 08:31:34 +00:00
|
|
|
DocumentClass const & tclass = bparams.documentClass();
|
|
|
|
|
2010-12-18 13:49:39 +00:00
|
|
|
for (; pit < runparams.par_end; ++pit) {
|
2010-12-18 08:23:14 +00:00
|
|
|
lastpit = pit;
|
2010-12-18 08:31:34 +00:00
|
|
|
ParagraphList::const_iterator par = paragraphs.constIterator(pit);
|
2010-12-18 08:23:14 +00:00
|
|
|
|
2008-10-31 15:33:48 +00:00
|
|
|
// FIXME This check should not be needed. We should
|
|
|
|
// perhaps issue an error if it is.
|
2009-08-09 16:19:43 +00:00
|
|
|
Layout const & layout = text.inset().forcePlainLayout() ?
|
2009-02-11 17:16:05 +00:00
|
|
|
tclass.plainLayout() : par->layout();
|
2008-04-22 18:33:07 +00:00
|
|
|
|
|
|
|
if (layout.intitle) {
|
2011-01-06 13:41:50 +00:00
|
|
|
if (already_title) {
|
2010-12-18 13:49:39 +00:00
|
|
|
LYXERR0("Error in latexParagraphs: You"
|
2008-04-22 18:33:07 +00:00
|
|
|
" should not mix title layouts"
|
2010-12-18 13:49:39 +00:00
|
|
|
" with normal ones.");
|
2011-01-06 13:41:50 +00:00
|
|
|
} else if (!was_title) {
|
|
|
|
was_title = true;
|
2003-11-05 12:06:20 +00:00
|
|
|
if (tclass.titletype() == TITLE_ENVIRONMENT) {
|
2008-04-22 18:33:07 +00:00
|
|
|
os << "\\begin{"
|
|
|
|
<< from_ascii(tclass.titlename())
|
|
|
|
<< "}\n";
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
|
|
|
}
|
2011-01-06 13:41:50 +00:00
|
|
|
} else if (was_title && !already_title) {
|
2008-04-22 18:33:07 +00:00
|
|
|
if (tclass.titletype() == TITLE_ENVIRONMENT) {
|
|
|
|
os << "\\end{" << from_ascii(tclass.titlename())
|
|
|
|
<< "}\n";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
os << "\\" << from_ascii(tclass.titlename())
|
|
|
|
<< "\n";
|
|
|
|
}
|
2011-01-06 13:41:50 +00:00
|
|
|
already_title = true;
|
|
|
|
was_title = false;
|
2008-04-22 18:33:07 +00:00
|
|
|
}
|
2003-11-05 12:06:20 +00:00
|
|
|
|
2010-12-18 13:49:39 +00:00
|
|
|
|
2010-12-18 08:23:14 +00:00
|
|
|
if (!layout.isEnvironment() && par->params().leftIndent().zero()) {
|
2010-12-18 13:49:39 +00:00
|
|
|
// This is a standard top level paragraph, TeX it and continue.
|
2011-02-10 20:02:48 +00:00
|
|
|
TeXOnePar(buf, text, pit, os, runparams, everypar);
|
2010-12-18 08:23:14 +00:00
|
|
|
continue;
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
2010-12-18 08:23:14 +00:00
|
|
|
|
2011-06-02 19:39:44 +00:00
|
|
|
TeXEnvironmentData const data =
|
|
|
|
prepareEnvironment(buf, text, par, os, runparams);
|
2010-12-18 13:49:39 +00:00
|
|
|
// pit can be changed in TeXEnvironment.
|
2011-02-10 20:02:48 +00:00
|
|
|
TeXEnvironment(buf, text, runparams, pit, os);
|
2014-05-27 23:07:47 +00:00
|
|
|
finishEnvironment(os, runparams, data);
|
2010-12-18 13:49:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (pit == runparams.par_end) {
|
|
|
|
// Make sure that the last paragraph is
|
|
|
|
// correctly terminated (because TeXOnePar does
|
|
|
|
// not add a \n in this case)
|
|
|
|
//os << '\n';
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
2008-04-22 18:33:07 +00:00
|
|
|
|
2003-11-05 12:06:20 +00:00
|
|
|
// It might be that we only have a title in this document
|
2011-01-06 13:41:50 +00:00
|
|
|
if (was_title && !already_title) {
|
2003-11-05 12:06:20 +00:00
|
|
|
if (tclass.titletype() == TITLE_ENVIRONMENT) {
|
2006-10-21 00:16:43 +00:00
|
|
|
os << "\\end{" << from_ascii(tclass.titlename())
|
Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
|
|
|
<< "}\n";
|
|
|
|
} else {
|
2006-10-21 00:16:43 +00:00
|
|
|
os << "\\" << from_ascii(tclass.titlename())
|
Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
|
|
|
<< "\n";
|
|
|
|
}
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
2008-04-22 18:33:07 +00:00
|
|
|
|
2010-01-29 14:44:21 +00:00
|
|
|
// if "auto end" is switched off, explicitly close the language at the end
|
2015-10-18 18:55:53 +00:00
|
|
|
// but only if the last par is in a babel or polyglossia language
|
2010-11-22 12:10:16 +00:00
|
|
|
string const lang_end_command = runparams.use_polyglossia ?
|
|
|
|
"\\end{$$lang}" : lyxrc.language_command_end;
|
|
|
|
if (maintext && !lyxrc.language_auto_end && !mainlang.empty() &&
|
2010-12-18 08:23:14 +00:00
|
|
|
paragraphs.at(lastpit).getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {
|
2010-11-22 12:10:16 +00:00
|
|
|
os << from_utf8(subst(lang_end_command,
|
2008-01-25 13:27:08 +00:00
|
|
|
"$$lang",
|
2010-11-22 12:10:16 +00:00
|
|
|
mainlang))
|
2008-01-25 13:27:08 +00:00
|
|
|
<< '\n';
|
2015-10-19 19:08:01 +00:00
|
|
|
if (state->open_polyglossia_lang_ == mainlang)
|
|
|
|
state->open_polyglossia_lang_ = "";
|
2008-01-25 13:27:08 +00:00
|
|
|
}
|
2008-04-22 18:33:07 +00:00
|
|
|
|
2007-12-08 11:21:00 +00:00
|
|
|
// If the last paragraph is an environment, we'll have to close
|
|
|
|
// CJK at the very end to do proper nesting.
|
2014-07-05 12:23:43 +00:00
|
|
|
if (maintext && !is_child && state->open_encoding_ == CJK) {
|
2007-12-08 11:21:00 +00:00
|
|
|
os << "\\end{CJK}\n";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = none;
|
2007-12-08 11:21:00 +00:00
|
|
|
}
|
2015-06-19 07:25:11 +00:00
|
|
|
// Likewise for polyglossia
|
|
|
|
if (maintext && !is_child && state->open_polyglossia_lang_ != "") {
|
2015-10-18 18:55:53 +00:00
|
|
|
os << from_utf8(subst(lang_end_command,
|
|
|
|
"$$lang",
|
|
|
|
state->open_polyglossia_lang_))
|
|
|
|
<< '\n';
|
2015-06-19 07:25:11 +00:00
|
|
|
state->open_polyglossia_lang_ = "";
|
|
|
|
}
|
2008-04-22 18:33:07 +00:00
|
|
|
|
2007-12-08 11:21:00 +00:00
|
|
|
// reset inherited encoding
|
2014-07-05 12:23:43 +00:00
|
|
|
if (state->cjk_inherited_ > 0) {
|
|
|
|
state->cjk_inherited_ -= 1;
|
|
|
|
if (state->cjk_inherited_ == 0)
|
|
|
|
state->open_encoding_ = CJK;
|
2007-12-08 11:21:00 +00:00
|
|
|
}
|
2003-11-05 12:06:20 +00:00
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
2007-07-05 19:19:41 +00:00
|
|
|
pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
|
2008-07-20 17:14:10 +00:00
|
|
|
OutputParams const & runparams, Encoding const & newEnc,
|
|
|
|
bool force)
|
2007-01-09 19:25:40 +00:00
|
|
|
{
|
2015-11-12 15:55:04 +00:00
|
|
|
// XeTeX/LuaTeX use only one encoding per document:
|
|
|
|
// * with useNonTeXFonts: "utf8plain",
|
|
|
|
// * with XeTeX and TeX fonts: "ascii" (inputenc fails),
|
|
|
|
// * with LuaTeX and TeX fonts: only one encoding accepted by luainputenc.
|
|
|
|
if (runparams.isFullUnicode())
|
|
|
|
return make_pair(false, 0);
|
|
|
|
|
2008-10-14 13:06:47 +00:00
|
|
|
Encoding const & oldEnc = *runparams.encoding;
|
2007-12-08 11:21:00 +00:00
|
|
|
bool moving_arg = runparams.moving_arg;
|
2013-05-20 11:40:40 +00:00
|
|
|
// If we switch from/to CJK, we need to switch anyway, despite custom inputenc
|
|
|
|
bool const from_to_cjk =
|
|
|
|
(oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
|
|
|
|
|| (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK);
|
|
|
|
if (!force && !from_to_cjk
|
|
|
|
&& ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
|
2007-07-05 19:19:41 +00:00
|
|
|
return make_pair(false, 0);
|
2007-05-07 17:10:10 +00:00
|
|
|
|
|
|
|
// Do nothing if the encoding is unchanged.
|
|
|
|
if (oldEnc.name() == newEnc.name())
|
2007-07-05 19:19:41 +00:00
|
|
|
return make_pair(false, 0);
|
2007-05-07 17:10:10 +00:00
|
|
|
|
2007-05-06 20:26:02 +00:00
|
|
|
// FIXME We ignore encoding switches from/to encodings that do
|
|
|
|
// neither support the inputenc package nor the CJK package here.
|
|
|
|
// This does of course only work in special cases (e.g. switch from
|
2007-06-27 14:50:50 +00:00
|
|
|
// tis620-0 to latin1, but the text in latin1 contains ASCII only),
|
2007-05-06 20:26:02 +00:00
|
|
|
// but it is the best we can do
|
2007-05-07 17:10:10 +00:00
|
|
|
if (oldEnc.package() == Encoding::none
|
|
|
|
|| newEnc.package() == Encoding::none)
|
2007-07-05 19:19:41 +00:00
|
|
|
return make_pair(false, 0);
|
2007-05-07 17:10:10 +00:00
|
|
|
|
2007-11-15 20:04:51 +00:00
|
|
|
LYXERR(Debug::LATEX, "Changing LaTeX encoding from "
|
|
|
|
<< oldEnc.name() << " to " << newEnc.name());
|
2007-05-07 17:10:10 +00:00
|
|
|
os << setEncoding(newEnc.iconvName());
|
|
|
|
if (bparams.inputenc == "default")
|
2007-07-05 19:19:41 +00:00
|
|
|
return make_pair(true, 0);
|
2007-05-07 17:10:10 +00:00
|
|
|
|
2007-12-08 11:21:00 +00:00
|
|
|
docstring const inputenc_arg(from_ascii(newEnc.latexName()));
|
2014-07-05 12:23:43 +00:00
|
|
|
OutputState * state = getOutputState();
|
2007-05-07 17:10:10 +00:00
|
|
|
switch (newEnc.package()) {
|
|
|
|
case Encoding::none:
|
2008-08-18 17:26:09 +00:00
|
|
|
case Encoding::japanese:
|
2007-07-05 19:19:41 +00:00
|
|
|
// shouldn't ever reach here, see above
|
|
|
|
return make_pair(true, 0);
|
2007-05-07 17:10:10 +00:00
|
|
|
case Encoding::inputenc: {
|
2007-12-08 11:21:00 +00:00
|
|
|
int count = inputenc_arg.length();
|
|
|
|
if (oldEnc.package() == Encoding::CJK &&
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ == CJK) {
|
2007-05-07 17:10:10 +00:00
|
|
|
os << "\\end{CJK}";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = none;
|
2007-05-07 17:10:10 +00:00
|
|
|
count += 9;
|
|
|
|
}
|
2007-12-08 11:21:00 +00:00
|
|
|
else if (oldEnc.package() == Encoding::inputenc &&
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ == inputenc) {
|
2007-12-08 11:21:00 +00:00
|
|
|
os << "\\egroup";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = none;
|
2007-12-08 11:21:00 +00:00
|
|
|
count += 7;
|
|
|
|
}
|
2008-08-19 07:51:40 +00:00
|
|
|
if (runparams.local_font != 0
|
2008-11-16 00:12:21 +00:00
|
|
|
&& oldEnc.package() == Encoding::CJK) {
|
2008-08-19 07:51:40 +00:00
|
|
|
// within insets, \inputenc switches need
|
|
|
|
// to be embraced within \bgroup...\egroup;
|
|
|
|
// else CJK fails.
|
2007-12-08 11:21:00 +00:00
|
|
|
os << "\\bgroup";
|
|
|
|
count += 7;
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = inputenc;
|
2007-12-08 11:21:00 +00:00
|
|
|
}
|
2008-08-18 17:26:09 +00:00
|
|
|
// with the japanese option, inputenc is omitted.
|
|
|
|
if (runparams.use_japanese)
|
|
|
|
return make_pair(true, count);
|
2007-12-08 11:21:00 +00:00
|
|
|
os << "\\inputencoding{" << inputenc_arg << '}';
|
2007-07-05 19:19:41 +00:00
|
|
|
return make_pair(true, count + 16);
|
2007-11-15 20:04:51 +00:00
|
|
|
}
|
2007-05-07 17:10:10 +00:00
|
|
|
case Encoding::CJK: {
|
2007-12-08 11:21:00 +00:00
|
|
|
int count = inputenc_arg.length();
|
2008-10-13 11:25:37 +00:00
|
|
|
if (oldEnc.package() == Encoding::CJK &&
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ == CJK) {
|
2007-05-07 17:10:10 +00:00
|
|
|
os << "\\end{CJK}";
|
|
|
|
count += 9;
|
2007-05-06 20:26:02 +00:00
|
|
|
}
|
2008-10-13 11:25:37 +00:00
|
|
|
if (oldEnc.package() == Encoding::inputenc &&
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ == inputenc) {
|
2007-12-08 11:21:00 +00:00
|
|
|
os << "\\egroup";
|
|
|
|
count += 7;
|
|
|
|
}
|
2008-06-05 06:18:34 +00:00
|
|
|
os << "\\begin{CJK}{" << inputenc_arg << "}{"
|
2010-11-26 18:32:29 +00:00
|
|
|
<< from_ascii(bparams.fonts_cjk) << "}";
|
2014-07-05 12:23:43 +00:00
|
|
|
state->open_encoding_ = CJK;
|
2007-07-05 19:19:41 +00:00
|
|
|
return make_pair(true, count + 15);
|
2007-01-13 14:36:54 +00:00
|
|
|
}
|
2007-01-09 19:25:40 +00:00
|
|
|
}
|
2007-05-07 17:10:10 +00:00
|
|
|
// Dead code to avoid a warning:
|
2007-07-05 19:19:41 +00:00
|
|
|
return make_pair(true, 0);
|
2007-12-08 11:21:00 +00:00
|
|
|
|
2007-01-09 19:25:40 +00:00
|
|
|
}
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
} // namespace lyx
|