Clarify change text color descriptors

Addresses #11704

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 6e3bf0fff754a7bf24548074f33fe9f4a67d34b8..8c96338a40152591a9c1ddcd73f9ccf556fc9bef 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -72,19 +72,19 @@ Color Change::color() const
        Color color = Color_none;
        switch (author % 5) {
                case 0:
-                       color = Color_changedtextauthor1;
+                       color = Color_addedtextauthor1;
                        break;
                case 1:
-                       color = Color_changedtextauthor2;
+                       color = Color_addedtextauthor2;
                        break;
                case 2:
-                       color = Color_changedtextauthor3;
+                       color = Color_addedtextauthor3;
                        break;
                case 3:
-                       color = Color_changedtextauthor4;
+                       color = Color_addedtextauthor4;
                        break;
                case 4:
-                       color = Color_changedtextauthor5;
+                       color = Color_addedtextauthor5;
                        break;
        }
 

diff --git a/src/Color.cpp b/src/Color.cpp
index d9933ce34e342e0611bb6a8b3974c5e875ec7401..dd95e28f70742a99f4666692f77fec657486a0ba 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -277,18 +277,17 @@ ColorSet::ColorSet()
        { Color_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
        { Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" },
        { Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" },
-       { Color_deletedtext, N_("deleted text"), "deletedtext", "#ff0000", "deletedtext" },
-       { Color_addedtext, N_("added text"), "addedtext", "#0000ff", "addedtext" },
-       { Color_changedtextauthor1, N_("changed text 1st author"), "changedtextauthor1", "#0000ff", "changedtextauthor1" },
-       { Color_changedtextauthor2, N_("changed text 2nd author"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" },
-       { Color_changedtextauthor3, N_("changed text 3rd author"), "changedtextauthor3", "#ff0000", "changedtextauthor3" },
-       { Color_changedtextauthor4, N_("changed text 4th author"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" },
-       { Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
-       { Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" },
+       { Color_deletedtext, N_("deleted text (output)"), "deletedtext", "#ff0000", "deletedtext" },
+       { Color_addedtext, N_("added text (output)"), "addedtext", "#0000ff", "addedtext" },
+       { Color_addedtextauthor1, N_("added text (workarea, 1st author)"), "changedtextauthor1", "#0000ff", "changedtextauthor1" },
+       { Color_addedtextauthor2, N_("added text (workarea, 2nd author)"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" },
+       { Color_addedtextauthor3, N_("added text (workarea, 3rd author)"), "changedtextauthor3", "#ff0000", "changedtextauthor3" },
+       { Color_addedtextauthor4, N_("added text (workarea, 4th author)"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" },
+       { Color_addedtextauthor5, N_("added text (workarea, 5th author)"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
+       { Color_deletedtextmodifier, N_("deleted text modifier (workarea)"), "deletedtextmodifier", "white", "deletedtextmodifier" },
        { Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
        { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" },
-       { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline",
-            "LightSteelBlue", "tabularonoffline" },
+       { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", "LightSteelBlue", "tabularonoffline" },
        { Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" },
        { Color_newpage, N_("new page"), "newpage", "Blue", "newpage" },
        { Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" },

diff --git a/src/ColorCode.h b/src/ColorCode.h
index d0973852f8694275aad0adf044e35ce37cd22441..71a9fda77fdc0f765066c9603753041f7b24bead 100644 (file)
--- a/src/ColorCode.h
+++ b/src/ColorCode.h
@@ -179,16 +179,16 @@ enum ColorCode {
        Color_deletedtext,
        /// Added text color
        Color_addedtext,
-       /// Changed text color author 1
-       Color_changedtextauthor1,
-       /// Changed text color author 2
-       Color_changedtextauthor2,
-       /// Changed text color author 3
-       Color_changedtextauthor3,
-       /// Changed text color author 4
-       Color_changedtextauthor4,
-       /// Changed text color author 5
-       Color_changedtextauthor5,
+       /// Added text color author 1
+       Color_addedtextauthor1,
+       /// Added text color author 2
+       Color_addedtextauthor2,
+       /// Added text color author 3
+       Color_addedtextauthor3,
+       /// Added text color author 4
+       Color_addedtextauthor4,
+       /// Added text color author 5
+       Color_addedtextauthor5,
        /// Deleted text modifying color
        Color_deletedtextmodifier,
        /// Table line color