Simplify and pythonize.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36072 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py
index b12c8532173f36645984633d85121a44279935a5..54a2325b6016a2b09b1d7d05965007eaacff07ec 100644 (file)
--- a/lib/lyx2lyx/lyx_2_0.py
+++ b/lib/lyx2lyx/lyx_2_0.py
@@ -1175,9 +1175,7 @@ def revert_notefontcolor(document):
       ['% Commands inserted by lyx2lyx to set the font color',
         '% for greyed-out notes',
         '\\@ifundefined{definecolor}{\\usepackage{color}}{}'
-        '\\definecolor{note_fontcolor}{rgb}{'
-          + str(red) + ', ' + str(green)
-          + ', ' + str(blue) + '}',
+        '\\definecolor{note_fontcolor}{rgb}{%s,%s,%s}' % (red, green, blue),
         '\\renewenvironment{lyxgreyedout}',
         ' {\\textcolor{note_fontcolor}\\bgroup}{\\egroup}'])
 
@@ -1218,8 +1216,7 @@ def revert_fontcolor(document):
     insert_to_preamble(0, document,
       ['% Commands inserted by lyx2lyx to set the font color',
       '\\@ifundefined{definecolor}{\\usepackage{color}}{}',
-      '\\definecolor{document_fontcolor}{rgb}{'
-       + str(red) + ', ' + str(green) + ', ' + str(blue) + '}',
+      '\\definecolor{document_fontcolor}{rgb}{%s,%s,%s}' % (red, green, blue),
       '\\color{document_fontcolor}'])