X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetquotes.C;h=d4e1541ad8721a8bf7ee7bd98c4189d8c000f664;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=0ad0d96b203b2d2567d7b81efdda340f16499f35;hpb=2470d9297d3f2c303f555c8f235d022b19396679;p=lyx.git

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 0ad0d96b20..d4e1541ad8 100644
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -15,17 +15,19 @@
 #endif
 
 #include "insetquotes.h"
-#include "support/lyxlib.h"
-#include "debug.h"
-#include "lyxfont.h"
-#include "lyxrc.h"
-#include "buffer.h"
-#include "LaTeXFeatures.h"
+
+#include "support/LAssert.h"
 #include "support/lstrings.h"
+#include "BufferView.h"
+#include "LaTeXFeatures.h"
 #include "Painter.h"
+#include "buffer.h"
+#include "debug.h"
 #include "font.h"
 #include "language.h"
-#include "BufferView.h"
+#include "lyxfont.h"
+#include "lyxrc.h"
+#include "paragraph.h"
 
 using std::ostream;
 using std::endl;
@@ -85,7 +87,7 @@ InsetQuotes::InsetQuotes(char c, BufferParams const & params)
 {
 	// Decide whether left or right 
 	switch (c) {
-	case ' ': case '(': case '{': case '[': case '-': case ':':
+	case ' ': case '(': 
 	case Paragraph::META_HFILL:
 	case Paragraph::META_NEWLINE: 
 		side_ = LeftQ;   // left quote 
@@ -153,13 +155,18 @@ string const InsetQuotes::dispString(Language const * loclang) const
 		disp += disp;
 
  	if (lyxrc.font_norm_type == LyXRC::ISO_8859_1
- 	    || lyxrc.font_norm_type == LyXRC::ISO_8859_9
- 	    || lyxrc.font_norm_type == LyXRC::ISO_8859_15) {
+ 	    || lyxrc.font_norm_type == LyXRC::ISO_8859_3
+ 	    || lyxrc.font_norm_type == LyXRC::ISO_8859_4
+ 	    || lyxrc.font_norm_type == LyXRC::ISO_8859_9) {
 		if (disp == "'")
 			disp = "´";
 		else if (disp == "''")
 			disp = "´´";
-		else if (disp == "<<")
+	}
+ 	if (lyxrc.font_norm_type == LyXRC::ISO_8859_1
+ 	    || lyxrc.font_norm_type == LyXRC::ISO_8859_9
+ 	    || lyxrc.font_norm_type == LyXRC::ISO_8859_15) {
+		if (disp == "<<")
 			disp = '«';
 		else if (disp == ">>")
 			disp = '»';
@@ -254,22 +261,26 @@ void InsetQuotes::read(Buffer const *, LyXLex & lex)
 extern bool use_babel;
 
 int InsetQuotes::latex(Buffer const * buf, ostream & os,
-		       bool /*fragile*/, bool) const
+		       bool /*fragile*/, bool /* free_spc */) const
 {
 	// How do we get the local language here??
+	lyx::pos_type curr_pos = parOwner()->getPositionOfInset(this);
+	lyx::Assert(curr_pos != -1);
+	string const curr_lang =
+		parOwner()->getFont(buf->params,
+				    curr_pos).language()->babel();
 
-	string const doclang = buf->getLanguage()->babel();
 	const int quoteind = quote_index[side_][language_];
 	string qstr;
 	
 	if (language_ == FrenchQ && times_ == DoubleQ
-	    && doclang == "frenchb") {
+	    && curr_lang == "frenchb") {
 		if (side_ == LeftQ) 
 			qstr = "\\og "; //the spaces are important here
 		else 
 			qstr = " \\fg{}"; //and here
 	} else if (language_ == FrenchQ && times_ == DoubleQ
-		   && doclang == "french") {
+		   && curr_lang == "french") {
 		if (side_ == LeftQ) 
 			qstr = "<< "; //the spaces are important here
 		else 
@@ -338,16 +349,16 @@ void InsetQuotes::validate(LaTeXFeatures & features) const
 	    && lyxrc.fontenc != "T1") {
 		if (times_ == SingleQ) 
 			switch (type) {
-			case ',': features.quotesinglbase = true; break;
-			case '<': features.guilsinglleft = true; break;
-			case '>': features.guilsinglright = true; break;
+			case ',': features.require("quotesinglbase");  break;
+			case '<': features.require("guilsinglleft");  break;
+			case '>': features.require("guilsinglright"); break;
 			default: break;
 			}
 		else 
 			switch (type) {
-			case ',': features.quotedblbase = true; break;
-			case '<': features.guillemotleft = true; break;
-			case '>': features.guillemotright = true; break;
+			case ',': features.require("quotedblbase");   break;
+			case '<': features.require("guillemotleft");  break;
+			case '>': features.require("guillemotright"); break;
 			default: break;
 			}
 	}