diff -r 14680839ad7a -r d062df8f1d9f E5XML/HighlightingStylesWriter.py
--- a/E5XML/HighlightingStylesWriter.py Sat Mar 02 11:17:15 2019 +0100
+++ b/E5XML/HighlightingStylesWriter.py Fri Apr 05 19:06:39 2019 +0200
@@ -59,16 +59,27 @@
for lexer in self.lexers:
self.writeStartElement("Lexer")
self.writeAttribute("name", lexer.language())
- for style in lexer.descriptions:
+ for description, style, substyle in lexer.getStyles():
self.writeStartElement("Style")
self.writeAttribute("style", str(style))
- self.writeAttribute("color", lexer.color(style).name())
- self.writeAttribute("paper", lexer.paper(style).name())
- self.writeAttribute("font", lexer.font(style).toString())
- self.writeAttribute("eolfill", str(lexer.eolFill(style)))
- self.writeCharacters(lexer.description(style))
- self.writeEndElement()
- self.writeEndElement()
+ self.writeAttribute("substyle", str(substyle))
+ self.writeAttribute("color",
+ lexer.color(style, substyle).name())
+ self.writeAttribute("paper",
+ lexer.paper(style, substyle).name())
+ self.writeAttribute("font",
+ lexer.font(style, substyle).toString())
+ self.writeAttribute("eolfill",
+ str(lexer.eolFill(style, substyle)))
+ self.writeStartElement("Description")
+ self.writeCharacters(description)
+ self.writeEndElement() # Description
+ if substyle >= 0:
+ self.writeStartElement("Words")
+ self.writeCharacters(lexer.words(style, substyle).strip())
+ self.writeEndElement() # Words
+ self.writeEndElement() # Style
+ self.writeEndElement() # Lexer
- self.writeEndElement()
+ self.writeEndElement() # HighlightingStyles
self.writeEndDocument()
