X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=2e3a09feb90743f57049f9464cc9308d89bdad66;hb=9a5f7d1fe43ddbc1308f69bc609825ac9d618922;hp=de831a0d210f461e9f038c4f6cf20cbc890b60f1;hpb=af7109795725294e87e7c2fd29d13eddb837c769;p=lyx.git

diff --git a/src/paragraph.C b/src/paragraph.C
index de831a0d21..2e3a09feb9 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -14,35 +14,38 @@
 #pragma implementation
 #endif
 
-#include <algorithm>
-#include <fstream>
-#include <csignal>
-
 #include "paragraph.h"
 #include "paragraph_pimpl.h"
-#include "support/textutils.h"
 #include "lyxrc.h"
 #include "layout.h"
 #include "language.h"
 #include "tex-strings.h"
 #include "buffer.h"
 #include "bufferparams.h"
-#include "support/FileInfo.h"
-#include "support/LAssert.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
-#include "insets/insetinclude.h"
-#include "insets/insetbib.h"
-#include "insets/insettext.h"
-#include "support/filetools.h"
-#include "support/lstrings.h"
 #include "lyx_gui_misc.h"
 #include "texrow.h"
-#include "support/lyxmanip.h"
 #include "BufferView.h"
 #include "encoding.h"
 #include "ParameterStruct.h"
 #include "gettext.h"
+#include "lyxtextclasslist.h"
+
+#include "insets/insetinclude.h"
+#include "insets/insetbib.h"
+#include "insets/insettext.h"
+
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/lyxmanip.h"
+#include "support/FileInfo.h"
+#include "support/LAssert.h"
+#include "support/textutils.h"
+
+#include <algorithm>
+#include <fstream>
+#include <csignal>
 
 using std::ostream;
 using std::endl;
@@ -716,8 +719,7 @@ Paragraph::highestFontInRange(pos_type startpos, pos_type endpos,
 
 
 Paragraph::value_type
-Paragraph::getUChar(BufferParams const & bparams,
-		       pos_type pos) const
+Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 {
 	value_type c = getChar(pos);
 	if (!lyxrc.rtl_support)
@@ -757,8 +759,7 @@ Paragraph::getUChar(BufferParams const & bparams,
 }
 
 
-void Paragraph::setFont(pos_type pos,
-			   LyXFont const & font)
+void Paragraph::setFont(pos_type pos, LyXFont const & font)
 {
 	lyx::Assert(pos <= size());
 
@@ -1190,22 +1191,6 @@ Paragraph const * Paragraph::outerHook() const
 	return depthHook(depth_type(getDepth() - 1));
 }
 
-int Paragraph::autoDeleteInsets()
-{
-	int count = 0;
-	InsetList::size_type index = 0;
-	while (index < insetlist.size()) {
-		if (insetlist[index].inset && insetlist[index].inset->autoDelete()) {
-			erase(insetlist[index].pos); 
-			// erase() calls to insetlist.erase(&insetlist[index])
-			// so index shouldn't be increased.
-			++count;
-		} else
-			++index;
-	}
-	return count;
-}
-
 
 Paragraph::inset_iterator
 Paragraph::InsetIterator(pos_type pos)
@@ -1236,51 +1221,59 @@ int Paragraph::getPositionOfInset(Inset const * inset) const
 
 
 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.Style(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.Style(bparams.textclass, 0);
 	}
 
 	Language const * language = getParLanguage(bparams);
@@ -1290,22 +1283,24 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 
 	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();
 		}
@@ -1351,11 +1346,10 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	// 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 << "{";
@@ -1389,31 +1383,33 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 		}
 	}
 	
-	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!!!
@@ -1447,17 +1443,29 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 
 // 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.Style(bparams.textclass, 0);
+	} else {
+		style = textclasslist.Style(bparams.textclass, layout);
+	}
+	
 	LyXFont basefont;
 
 	// Maybe we have to create a optional argument.
@@ -1477,8 +1485,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		basefont = getLayoutFont(bparams);
 	}
 
-	if (main_body >= 0
-	    && !pimpl_->size()) {
+	if (main_body >= 0 && !pimpl_->size()) {
 		if (style.isCommand()) {
 			os << '{';
 			++column;
@@ -1513,39 +1520,42 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 				++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;
+			if (!asdefault) {
+				if (params().noindent()) {
+					os << "\\noindent ";
+					column += 10;
 				}
-				break;
-			case LYX_ALIGN_RIGHT:
-				if (getParLanguage(bparams)->babel() != "hebrew") {
-					os << "\\begin{flushright}";
-					column += 18;
-				} else {
-					os << "\\begin{flushleft}";
-					column += 17;
+			
+				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;
 				}
-				break;
-			case LYX_ALIGN_CENTER:
-				os << "\\begin{center}";
-				column += 14;
-				break;
-			}	 
+			}
 		}
 
 		value_type c = getChar(i);
@@ -1652,35 +1662,37 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		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;
+	if (!asdefault) {
+		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;
 		}
-		break;
-	case LYX_ALIGN_CENTER:
-		os << "\\end{center}";
-		column+= 12;
-		break;
-	}	 
+	}
 
 	lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
 	return return_value;
@@ -1803,8 +1815,7 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 	}
 	Paragraph * par = this;
 	do {
-		par = par->TeXOnePar(buf, bparams,
-				     os, texrow, false);
+		par = par->TeXOnePar(buf, bparams, os, texrow, false);
 
 		if (par && par->params().depth() > params().depth()) {
 			if (textclasslist.Style(bparams.textclass,