260809.1.6 · 21aae6a8b37203925c8374f74abd7b0cc459a11c
Merge branch 'master' into 'feature/indent-guides'
# Conflicts: # src/cli/cmdlineoptions.cpp # src/core/codegenerator.cpp # src/core/htmlgenerator.cpp
reading declarations
Changes to src/core/themereader.cpp. All files
@@ -102,6 +102,7 @@ void ThemeReader::initStyle(ElementStyle& style, const Diluculum::LuaVariable& v string styleColor="#000000"; bool styleBold=false, styleItalic=false, styleUnderline=false;+ int styleAnsiIndex=-1; if (var["Colour"].value()!=Diluculum::Nil) { styleColor= var["Colour"].value().asString();@@ -123,10 +124,16 @@ void ThemeReader::initStyle(ElementStyle& style, const Diluculum::LuaVariable& v style.setCustomOverride(false); } + if (var["AnsiIndex"].value()!=Diluculum::Nil) {+ lua_Integer idx = var["AnsiIndex"].value().asInteger();+ if (idx>=0 && idx<=15) styleAnsiIndex=idx;+ }+ style.setColour(Colour(styleColor)); style.setBold(styleBold); style.setItalic(styleItalic); style.setUnderline(styleUnderline);+ style.setAnsiIndex(styleAnsiIndex); } bool ThemeReader::load ( const string &styleDefinitionPath , OutputType type, bool loadSemanticStyles)