new painter,workarea and lcolor. Read the diff/sources and ChangeLog...

[features.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index 1bd9a76d9583b20d2995054b56a912e589a538ec..0d65e12ee838814a6d84d0f4db81266d69490a3b 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -43,7 +43,11 @@ extern LyXRC * lyxrc;
 
 
 // ale970405
+#ifdef USE_PAINTER
+extern string bibitemWidthest(Painter &);
+#else
 extern string bibitemWidthest();
+#endif
 
 // this is a minibuffer
 static char minibuffer_char;
@@ -344,10 +348,17 @@ void LyXParagraph::validate(LaTeXFeatures & features) const
                                             << endl;
                }
                switch ((*cit).font.color()) {
+#ifdef USE_PAINTER
+               case LColor::none:
+               case LColor::inherit:
+               case LColor::ignore:
+                       break;
+#else
                case LyXFont::NONE:
                case LyXFont::INHERIT_COLOR:
                case LyXFont::IGNORE_COLOR:
                        break;
+#endif
                default:
                        features.color = true;
                        lyxerr[Debug::LATEX] << "Color enabled. Font: "
@@ -3403,7 +3414,12 @@ LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
                } else if (style.labeltype == LABEL_BIBLIO) {
                        // ale970405
                        file += "\\begin{" + style.latexname() + "}{"
+#ifdef USE_PAINTER
+                               + bibitemWidthest(current_view->painter())
+                               + "}\n";
+#else
                                + bibitemWidthest() + "}\n";
+#endif
                } else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
 #ifdef FANCY_FOOTNOTE_CODE
                        if (foot_count < 0) {