#include "bufferparams.h"
#include "debug.h"
#include "LaTeXFeatures.h"
-#include "lyx_gui_misc.h"
#include "texrow.h"
#include "BufferView.h"
#include "encoding.h"
using std::reverse;
using lyx::pos_type;
-using lyx::layout_type;
int tex_code_break_column = 72; // needs non-zero initialization. set later.
// this is a bad idea, but how can Paragraph find its buffer to get
Paragraph::Paragraph()
- : layout(0), pimpl_(new Paragraph::Pimpl(this))
+ : pimpl_(new Paragraph::Pimpl(this))
{
for (int i = 0; i < 10; ++i)
setCounter(i, 0);
// This constructor inserts the new paragraph in a list.
Paragraph::Paragraph(Paragraph * par)
- : layout(0), pimpl_(new Paragraph::Pimpl(this))
+ : pimpl_(new Paragraph::Pimpl(this))
{
for (int i = 0; i < 10; ++i)
setCounter(i, 0);
Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
- : layout(0), pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
+ : pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
{
for (int i = 0; i < 10; ++i)
setCounter(i, 0);
// this is because of the dummy layout of the paragraphs that
// follow footnotes
- layout = lp.layout;
+ layout_ = lp.layout();
// ale970302
if (lp.bibkey) {
}
// First write the layout
- os << "\n\\layout "
- << textclasslist.NameOfLayout(bparams.textclass, layout)
- << "\n";
+ os << "\n\\layout " << layout() << "\n";
// Maybe some vertical spaces.
if (params().spaceTop().kind() != VSpace::NONE)
features.require("setspace");
// then the layouts
- features.useLayout(getLayout());
+ features.useLayout(layout());
// then the fonts
Language const * doc_language = bparams.language;
}
// then the insets
- LyXLayout const & layout =
- textclasslist.Style(bparams.textclass, getLayout());
+ LyXLayout const & lout = textclasslist[bparams.textclass][layout()];
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
if (cit->inset) {
cit->inset->validate(features);
- if (layout.needprotect &&
+ if (lout.needprotect &&
cit->inset->lyxCode() == Inset::FOOT_CODE)
features.require("NeedLyXFootnoteCode");
}
void Paragraph::clear()
{
params().clear();
-
- layout = 0;
+
+ layout_.erase();
+
bibkey = 0;
}
{
lyx::Assert(pos >= 0);
- LyXLayout const & layout =
- textclasslist.Style(bparams.textclass,
- getLayout());
+ LyXLayout const & lout =
+ textclasslist[bparams.textclass][layout()];
pos_type main_body = 0;
- if (layout.labeltype == LABEL_MANUAL)
+ if (lout.labeltype == LABEL_MANUAL)
main_body = beginningOfMainBody();
LyXFont layoutfont;
if (pos < main_body)
- layoutfont = layout.labelfont;
+ layoutfont = lout.labelfont;
else
- layoutfont = layout.font;
+ layoutfont = lout.font;
LyXFont tmpfont = getFontSettings(bparams, pos);
#ifndef INHERIT_LANGUAGE
LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
{
- LyXLayout const & layout =
- textclasslist.Style(bparams.textclass, getLayout());
+ LyXLayout const & lout =
+ textclasslist[bparams.textclass][layout()];
- LyXFont tmpfont = layout.labelfont;
+ LyXFont tmpfont = lout.labelfont;
tmpfont.setLanguage(getParLanguage(bparams));
return pimpl_->realizeFont(tmpfont, bparams);
LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
{
- LyXLayout const & layout =
- textclasslist.Style(bparams.textclass,
- getLayout());
+ LyXLayout const & lout =
+ textclasslist[bparams.textclass][layout()];
- LyXFont tmpfont = layout.font;
+ LyXFont tmpfont = lout.font;
tmpfont.setLanguage(getParLanguage(bparams));
return pimpl_->realizeFont(tmpfont, bparams);
// layout stays the same with latex-environments
if (flag) {
- tmp->setOnlyLayout(layout);
+ tmp->layout(layout());
tmp->setLabelWidthString(params().labelWidthString());
}
if (size() > pos || !size() || flag == 2) {
- tmp->setOnlyLayout(layout);
+ tmp->layout(layout());
tmp->params().align(params().align());
tmp->setLabelWidthString(params().labelWidthString());
// copy everything behind the break-position
// to the new paragraph
- pos_type pos_end = pimpl_->size() - 1;
+ pos_type pos_end = size() - 1;
pos_type i = pos;
pos_type j = pos;
for (; i <= pos_end; ++i) {
clear();
// layout stays the same with latex-environments
if (flag) {
- setOnlyLayout(tmp->layout);
+ layout(tmp->layout());
setLabelWidthString(tmp->params().labelWidthString());
params().depth(tmp->params().depth());
}
void Paragraph::makeSameLayout(Paragraph const * par)
{
- layout = par->layout;
+ layout(par->layout());
// move to pimpl?
params() = par->params();
}
int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass)
{
- if (textclasslist.Style(tclass, getLayout()).free_spacing ||
- isFreeSpacing())
- {
+ if (textclasslist[tclass][layout()].free_spacing ||
+ isFreeSpacing()) {
return 0;
}
bool Paragraph::hasSameLayout(Paragraph const * par) const
{
return
- par->layout == layout &&
+ par->layout() == layout() &&
params().sameLayout(par->params());
}
if (size() > pos) {
// copy everything behind the break-position to the new
// paragraph
- pos_type pos_end = pimpl_->size() - 1;
+ pos_type pos_end = size() - 1;
//pos_type i = pos;
//pos_type j = pos;
Paragraph const * par = this;
depth_type par_depth = getDepth();
while (par) {
- layout_type layout = par->getLayout();
+ string const & layout = par->layout();
int const endlabeltype =
- textclasslist.Style(bparams.textclass,
- layout).endlabeltype;
+ textclasslist[bparams.textclass][layout].endlabeltype;
if (endlabeltype != END_LABEL_NO_LABEL) {
if (!next_)
return endlabeltype;
depth_type const next_depth = next_->getDepth();
if (par_depth > next_depth ||
(par_depth == next_depth
- && layout != next_->getLayout()))
+ && layout != next_->layout()))
return endlabeltype;
break;
}
}
+Paragraph::depth_type Paragraph::getMaxDepthAfter(Buffer const * buffer) const
+{
+ bool const isenv = textclasslist[buffer->params.textclass][layout()].isEnvironment();
+
+ if (isenv)
+ return params().depth() + 1;
+ else
+ return params().depth();
+
+}
+
char Paragraph::getAlign() const
{
return params().align();
}
-void Paragraph::setOnlyLayout(layout_type new_layout)
+void Paragraph::applyLayout(string const & new_layout)
{
- layout = new_layout;
-}
-
-
-void Paragraph::setLayout(layout_type new_layout)
-{
- layout = new_layout;
+ layout(new_layout);
params().labelWidthString(string());
params().align(LYX_ALIGN_LAYOUT);
params().spaceTop(VSpace(VSpace::NONE));
Paragraph * Paragraph::outerHook()
{
- if(!getDepth())
+ if (!getDepth())
return 0;
return depthHook(depth_type(getDepth() - 1));
}
Paragraph const * Paragraph::outerHook() const
{
- if(!getDepth())
+ if (!getDepth())
return 0;
return depthHook(depth_type(getDepth() - 1));
}
Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
- BufferParams const & bparams,
- ostream & os, TexRow & texrow,
- bool moving_arg)
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ bool moving_arg)
{
lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl;
- LyXLayout const & style =
- textclasslist.Style(bparams.textclass,
- layout);
-
+ Inset const * in = inInset();
bool further_blank_line = false;
+ LyXLayout style;
+
+ // well we have to check if we are in an inset with unlimited
+ // lenght (all in one row) if that is true then we don't allow
+ // any special options in the paragraph and also we don't allow
+ // any environment other then "Standard" to be valid!
+ if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+ style = textclasslist[bparams.textclass][layout()];
+
+ if (params().startOfAppendix()) {
+ os << "\\appendix\n";
+ texrow.newline();
+ }
- if (params().startOfAppendix()) {
- os << "\\appendix\n";
- texrow.newline();
- }
-
- if (!params().spacing().isDefault()
- && (!previous() || !previous()->hasSameLayout(this))) {
- os << params().spacing().writeEnvirBegin() << "\n";
- texrow.newline();
- }
+ if (!params().spacing().isDefault()
+ && (!previous() || !previous()->hasSameLayout(this))) {
+ os << params().spacing().writeEnvirBegin() << "\n";
+ texrow.newline();
+ }
- if (tex_code_break_column && style.isCommand()){
- os << '\n';
- texrow.newline();
- }
+ if (tex_code_break_column && style.isCommand()) {
+ os << '\n';
+ texrow.newline();
+ }
- if (params().pagebreakTop()) {
- os << "\\newpage";
- further_blank_line = true;
- }
- if (params().spaceTop().kind() != VSpace::NONE) {
- os << params().spaceTop().asLatexCommand(bparams);
- further_blank_line = true;
- }
+ if (params().pagebreakTop()) {
+ os << "\\newpage";
+ further_blank_line = true;
+ }
+ if (params().spaceTop().kind() != VSpace::NONE) {
+ os << params().spaceTop().asLatexCommand(bparams);
+ further_blank_line = true;
+ }
- if (params().lineTop()) {
- os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
- << "\\vspace{-1\\parskip}";
- further_blank_line = true;
- }
+ if (params().lineTop()) {
+ os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
+ << "\\vspace{-1\\parskip}";
+ further_blank_line = true;
+ }
- if (further_blank_line){
- os << '\n';
- texrow.newline();
+ if (further_blank_line) {
+ os << '\n';
+ texrow.newline();
+ }
+ } else {
+ style = textclasslist[bparams.textclass].defaultLayout();
}
Language const * language = getParLanguage(bparams);
if (language->babel() != previous_language->babel()
// check if we already put language command in TeXEnvironment()
- && !(textclasslist.Style(bparams.textclass, layout).isEnvironment()
- && (!previous() || previous()->layout != layout ||
- previous()->params().depth() != params().depth()))) {
-
+ && !(style.isEnvironment()
+ && (!previous() || previous()->layout() != layout() ||
+ previous()->params().depth() != params().depth())))
+ {
if (!lyxrc.language_command_end.empty() &&
- previous_language->babel() != doc_language->babel()) {
+ previous_language->babel() != doc_language->babel())
+ {
os << subst(lyxrc.language_command_end, "$$lang",
- previous_language->babel())
+ previous_language->babel())
<< endl;
texrow.newline();
}
if (lyxrc.language_command_end.empty() ||
- language->babel() != doc_language->babel()) {
+ language->babel() != doc_language->babel())
+ {
os << subst(lyxrc.language_command_begin, "$$lang",
- language->babel())
+ language->babel())
<< endl;
texrow.newline();
}
// or for a command.
LyXFont const font =
(size() == 0
- ? getLayoutFont(bparams)
- : getFont(bparams, size() - 1));
+ ? getLayoutFont(bparams) : getFont(bparams, size() - 1));
- bool is_command = textclasslist.Style(bparams.textclass,
- getLayout()).isCommand();
+ bool is_command = style.isCommand();
+
if (style.resfont.size() != font.size() && next_ && !is_command) {
if (!need_par)
os << "{";
// if its the last paragraph of the current environment
// skip it otherwise fall through
if (next_
- && (next_->layout != layout
+ && (next_->layout() != layout()
|| next_->params().depth() != params().depth()))
break;
// fall through possible
}
}
- further_blank_line = false;
- if (params().lineBottom()) {
- os << "\\lyxline{\\" << font.latexSize() << '}';
- further_blank_line = true;
- }
+ if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+ further_blank_line = false;
+ if (params().lineBottom()) {
+ os << "\\lyxline{\\" << font.latexSize() << '}';
+ further_blank_line = true;
+ }
- if (params().spaceBottom().kind() != VSpace::NONE) {
- os << params().spaceBottom().asLatexCommand(bparams);
- further_blank_line = true;
- }
+ if (params().spaceBottom().kind() != VSpace::NONE) {
+ os << params().spaceBottom().asLatexCommand(bparams);
+ further_blank_line = true;
+ }
- if (params().pagebreakBottom()) {
- os << "\\newpage";
- further_blank_line = true;
- }
+ if (params().pagebreakBottom()) {
+ os << "\\newpage";
+ further_blank_line = true;
+ }
- if (further_blank_line){
- os << '\n';
- texrow.newline();
- }
+ if (further_blank_line) {
+ os << '\n';
+ texrow.newline();
+ }
- if (!params().spacing().isDefault()
- && (!next_ || !next_->hasSameLayout(this))) {
- os << params().spacing().writeEnvirEnd() << "\n";
- texrow.newline();
+ if (!params().spacing().isDefault()
+ && (!next_ || !next_->hasSameLayout(this))) {
+ os << params().spacing().writeEnvirEnd() << "\n";
+ texrow.newline();
+ }
}
// we don't need it for the last paragraph!!!
return next_;
}
+// This could go to ParagraphParameters if we want to
+int Paragraph::startTeXParParams(BufferParams const & bparams,
+ ostream & os) const
+{
+ int column = 0;
+
+ if (params().noindent()) {
+ os << "\\noindent ";
+ column += 10;
+ }
+
+ switch (params().align()) {
+ case LYX_ALIGN_NONE:
+ case LYX_ALIGN_BLOCK:
+ case LYX_ALIGN_LAYOUT:
+ case LYX_ALIGN_SPECIAL:
+ break;
+ case LYX_ALIGN_LEFT:
+ if (getParLanguage(bparams)->babel() != "hebrew") {
+ os << "\\begin{flushleft}";
+ column += 17;
+ } else {
+ os << "\\begin{flushright}";
+ column += 18;
+ }
+ break;
+ case LYX_ALIGN_RIGHT:
+ if (getParLanguage(bparams)->babel() != "hebrew") {
+ os << "\\begin{flushright}";
+ column += 18;
+ } else {
+ os << "\\begin{flushleft}";
+ column += 17;
+ }
+ break;
+ case LYX_ALIGN_CENTER:
+ os << "\\begin{center}";
+ column += 14;
+ break;
+ }
+
+ return column;
+}
+
+// This could go to ParagraphParameters if we want to
+int Paragraph::endTeXParParams(BufferParams const & bparams,
+ ostream & os) const
+{
+ int column = 0;
+
+ switch (params().align()) {
+ case LYX_ALIGN_NONE:
+ case LYX_ALIGN_BLOCK:
+ case LYX_ALIGN_LAYOUT:
+ case LYX_ALIGN_SPECIAL:
+ break;
+ case LYX_ALIGN_LEFT:
+ if (getParLanguage(bparams)->babel() != "hebrew") {
+ os << "\\end{flushleft}";
+ column = 15;
+ } else {
+ os << "\\end{flushright}";
+ column = 16;
+ }
+ break;
+ case LYX_ALIGN_RIGHT:
+ if (getParLanguage(bparams)->babel() != "hebrew") {
+ os << "\\end{flushright}";
+ column+= 16;
+ } else {
+ os << "\\end{flushleft}";
+ column = 15;
+ }
+ break;
+ case LYX_ALIGN_CENTER:
+ os << "\\end{center}";
+ column = 12;
+ break;
+ }
+ return column;
+}
+
// This one spits out the text of the paragraph
bool Paragraph::simpleTeXOnePar(Buffer const * buf,
- BufferParams const & bparams,
- ostream & os, TexRow & texrow,
- bool moving_arg)
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ bool moving_arg)
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
bool return_value = false;
- LyXLayout const & style =
- textclasslist.Style(bparams.textclass,
- getLayout());
+ LyXLayout style;
+
+ // well we have to check if we are in an inset with unlimited
+ // lenght (all in one row) if that is true then we don't allow
+ // any special options in the paragraph and also we don't allow
+ // any environment other then "Standard" to be valid!
+ bool asdefault =
+ (inInset() && inInset()->forceDefaultParagraphs(inInset()));
+
+ if (asdefault) {
+ style = textclasslist[bparams.textclass].defaultLayout();
+ } else {
+ style = textclasslist[bparams.textclass][layout()];
+ }
+
LyXFont basefont;
// Maybe we have to create a optional argument.
basefont = getLayoutFont(bparams);
}
- if (main_body >= 0 && !pimpl_->size()) {
- if (style.isCommand()) {
- os << '{';
- ++column;
- }
- }
-
moving_arg |= style.needprotect;
// Which font is currently active?
texrow.start(this, 0);
+ // if the paragraph is empty, the loop will not be entered at all
+ if (!size()) {
+ if (style.isCommand()) {
+ os << '{';
+ ++column;
+ }
+ if (!asdefault)
+ column += startTeXParParams(bparams, os);
+
+ }
+
for (pos_type i = 0; i < size(); ++i) {
++column;
// First char in paragraph or after label?
os << '{';
++column;
}
-
- if (params().noindent()) {
- os << "\\noindent ";
- column += 10;
- }
- switch (params().align()) {
- case LYX_ALIGN_NONE:
- case LYX_ALIGN_BLOCK:
- case LYX_ALIGN_LAYOUT:
- case LYX_ALIGN_SPECIAL:
- break;
- case LYX_ALIGN_LEFT:
- if (getParLanguage(bparams)->babel() != "hebrew") {
- os << "\\begin{flushleft}";
- column += 17;
- } else {
- os << "\\begin{flushright}";
- column += 18;
- }
- break;
- case LYX_ALIGN_RIGHT:
- if (getParLanguage(bparams)->babel() != "hebrew") {
- os << "\\begin{flushright}";
- column += 18;
- } else {
- os << "\\begin{flushleft}";
- column += 17;
- }
- break;
- case LYX_ALIGN_CENTER:
- os << "\\begin{center}";
- column += 14;
- break;
- }
+
+ if (!asdefault)
+ column += startTeXParParams(bparams, os);
}
-
+
value_type c = getChar(i);
// Fully instantiated font
LyXFont font = getFont(bparams, i);
- LyXFont const last_font = running_font;
+ LyXFont const & last_font = running_font;
// Spaces at end of font change are simulated to be
// outside font change, i.e. we write "\textXX{text} "
// rather than "\textXX{text }". (Asger)
if (open_font && c == ' ' && i <= size() - 2) {
- LyXFont const next_font = getFont(bparams, i + 1);
+ LyXFont const & next_font = getFont(bparams, i + 1);
if (next_font != running_font
&& next_font != font) {
font = next_font;
return_value = false;
}
- switch (params().align()) {
- case LYX_ALIGN_NONE:
- case LYX_ALIGN_BLOCK:
- case LYX_ALIGN_LAYOUT:
- case LYX_ALIGN_SPECIAL:
- break;
- case LYX_ALIGN_LEFT:
- if (getParLanguage(bparams)->babel() != "hebrew") {
- os << "\\end{flushleft}";
- column+= 15;
- } else {
- os << "\\end{flushright}";
- column+= 16;
- }
- break;
- case LYX_ALIGN_RIGHT:
- if (getParLanguage(bparams)->babel() != "hebrew") {
- os << "\\end{flushright}";
- column+= 16;
- } else {
- os << "\\end{flushleft}";
- column+= 15;
- }
- break;
- case LYX_ALIGN_CENTER:
- os << "\\end{center}";
- column+= 12;
- break;
- }
+ if (!asdefault) {
+ column += endTeXParParams(bparams, os);
+ }
lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
return return_value;
lyxerr[Debug::LATEX] << "TeXEnvironment... " << this << endl;
LyXLayout const & style =
- textclasslist.Style(bparams.textclass,
- layout);
+ textclasslist[bparams.textclass][layout()];
Language const * language = getParLanguage(bparams);
Language const * doc_language = bparams.language;
par = par->TeXOnePar(buf, bparams, os, texrow, false);
if (par && par->params().depth() > params().depth()) {
- if (textclasslist.Style(bparams.textclass,
- par->layout).isParagraph()
+ if (textclasslist[bparams.textclass][par->layout()].isParagraph()
// Thinko!
// How to handle this? (Lgb)
//&& !suffixIs(os, "\n\n")
par = par->pimpl_->TeXDeeper(buf, bparams, os, texrow);
}
} while (par
- && par->layout == layout
+ && par->layout() == layout()
&& par->params().depth() == params().depth());
if (style.isEnvironment()) {
bool Paragraph::isLineSeparator(pos_type pos) const
{
- return IsLineSeparatorChar(getChar(pos));
+ value_type const c = getChar(pos);
+ return IsLineSeparatorChar(c)
+ || (IsInsetChar(c) && getInset(pos)->isLineSeparator());
}
}
-bool Paragraph::isWord(pos_type pos ) const
+bool Paragraph::isWord(pos_type pos) const
{
return IsWordChar(getChar(pos)) ;
}
return getFirstFontSettings().language();
#else
Language const * lang = getFirstFontSettings().language();
+#ifdef WITH_WARNINGS
#warning We should make this somewhat better, any ideas? (Jug)
+#endif
if (lang == inherit_language || lang == ignore_language)
lang = bparams.language;
return lang;
}
-layout_type Paragraph::getLayout() const
+string const & Paragraph::layout() const
+{
+ return layout_;
+}
+
+
+void Paragraph::layout(string const & new_layout)
{
- return layout;
+ layout_ = new_layout;
}
{
Paragraph const * dhook = depthHook(getDepth());
return (dhook == this
- || dhook->getLayout() != getLayout()
+ || dhook->layout() != layout()
|| dhook->getDepth() != getDepth());
}
projects / lyx.git / blobdiff