From e6101f9807d0e14fdb12567066a9e680bd05d497 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Thu, 15 Sep 2011 21:38:05 +0000 Subject: [PATCH] Get default font color and background color working for XHTML export. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39680 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Buffer.cpp | 21 ++++++++++++++++++--- status.20x | 3 +++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 04b379435d..9c7e40205c 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -702,10 +702,10 @@ int Buffer::readHeader(Lexer & lex) params().indiceslist().clear(); params().backgroundcolor = lyx::rgbFromHexName("#ffffff"); params().isbackgroundcolor = false; - params().fontcolor = lyx::rgbFromHexName("#000000"); + params().fontcolor = RGBColor(0, 0, 0); params().isfontcolor = false; - params().notefontcolor = lyx::rgbFromHexName("#cccccc"); - params().boxbgcolor = lyx::rgbFromHexName("#ff0000"); + params().notefontcolor = RGBColor(0xCC, 0xCC, 0xCC); + params().boxbgcolor = RGBColor(0xFF, 0, 0); params().html_latex_start.clear(); params().html_latex_end.clear(); params().html_math_img_scale = 1.0; @@ -1599,6 +1599,21 @@ void Buffer::writeLyXHTMLSource(odocstream & os, << styleinfo << "\n"; } + + bool const needfg = params().fontcolor != RGBColor(0, 0, 0); + bool const needbg = params().backgroundcolor != RGBColor(OxFF, OxFF, OxFF); + if (needfg || needbg) { + os << "\n"; + } os << "\n\n"; } diff --git a/status.20x b/status.20x index e54df06f34..22f2616813 100644 --- a/status.20x +++ b/status.20x @@ -27,6 +27,9 @@ What's new - Add possibility to export the R code from a sweave-enabled document (part of bug 7555). +- XHTML export now respects font color and background color from + Document>Settings>Colors. + * USER INTERFACE - new menu entry Edit->Select Whole Inset -- 2.39.5