* \author Jean-Marc Lasgouttes
* \author Angus Leeming
* \author John Levon
- * \author André Pöntiz
+ * \author André Pönitz
* \author Allan Rae
* \author Dekel Tsur
*
#include "converter.h"
#include "format.h"
#include "gettext.h"
+#include "LColor.h"
#include "lyxlex.h"
#include "lyxfont.h"
-#include "support/tostr.h"
+#include "graphics/GraphicsTypes.h"
+
#include "support/filetools.h"
#include "support/lstrings.h"
-#include "support/userinfo.h"
#include "support/translator.h"
+#include "support/tostr.h"
+#include "support/userinfo.h"
-using namespace lyx::support;
+using lyx::support::ascii_lowercase;
+using lyx::support::ExpandPath;
+using lyx::support::GetEnv;
+using lyx::support::LibFileSearch;
+using lyx::support::token;
-using std::ostream;
-using std::ofstream;
using std::cout;
-using std::ios;
using std::endl;
-using std::vector;
-namespace lyx {
-namespace graphics {
-/// The translator between the DisplayType and the corresponding lyx string.
-extern Translator<DisplayType, string> displayTranslator;
-}
-}
+using std::ios;
+using std::ofstream;
+using std::ostream;
+using std::string;
+
namespace {
case RC_DISPLAY_GRAPHICS:
if (lexrc.next()) {
- display_graphics = lyx::graphics::displayTranslator.find(lexrc.getString());
+ display_graphics = lyx::graphics::displayTranslator().find(lexrc.getString());
}
break;
default_papersize =
PAPER_LEGALPAPER;
else if (size == "executive")
- default_papersize =
+ default_papersize =
PAPER_EXECUTIVEPAPER;
else if (size == "a3")
default_papersize =
break;
}
- if (!lcolor.setColor(lyx_name, x11_name)) {
+ LColor::color col = lcolor.getFromLyXName(lyx_name);
+ if (!lcolor.setColor(col, x11_name)) {
lyxerr << "Bad lyxrc set_color for "
<< lyx_name << endl;
os << "# Display graphics within LyX\n"
<< "# monochrome|grayscale|color|none\n"
<< "\\display_graphics "
- << lyx::graphics::displayTranslator.find(display_graphics)
+ << lyx::graphics::displayTranslator().find(display_graphics)
<< '\n';
}