Improvements and adding removed info just now

#990
bibledit · Feb 19, 2025 · 86578d1 · 86578d1
1 parent cddaf32
commit 86578d1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/styles/logic.h b/styles/logic.h
@@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 // Todo old styles logic, to be replaced one by one.
 
-#define StyleTypeIdentifier            0
-#define StyleTypeNotUsedComment        1 
+#define StyleTypeIdentifier            0 // Todo out eventually after all identifiers moved to v2.
+#define StyleTypeNotUsedComment        1
 #define StyleTypeNotUsedRunningHeader  2 
 #define StyleTypeStartsParagraph       3 
 #define StyleTypeInlineText            4 
@@ -41,6 +41,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define StyleTypeWordlistElement       13 
 
 
+// The following lot goes out once all identifiers are in v2.
+#define IdentifierSubtypeBook                     0
+#define IdentifierSubtypeEncoding                 1
+#define IdentifierSubtypeComment                  2
+#define IdentifierSubtypeRunningHeader            3
+#define IdentifierSubtypeLongTOC                  4
+#define IdentifierSubtypeShortTOC                 5
+#define IdentifierSubtypeBookAbbrev               6
+#define IdentifierSubtypeChapterLabel             7
+#define IdentifierSubtypePublishedChapterMarker   8
+#define IdentifierSubtypeCommentWithEndmarker     9
+#define IdentifierSubtypePublishedVerseMarker    10
+
+
 #define FootEndNoteSubtypeFootnote                 0 
 #define FootEndNoteSubtypeEndnote                  1 
 #define FootEndNoteSubtypeStandardContent          2 

diff --git a/unittests/styles.cpp b/unittests/styles.cpp
@@ -608,7 +608,7 @@ TEST_F (styles, editors_application)
   for (const auto& pair : marker_action) {
     const std::string action = Editor_Styles::getAction (webserver_request, pair.first);
     if (action != pair.second)
-      FAIL() << "Marker " << pair.first << " got action " << action << " but the expected action is " << pair.second;
+      FAIL() << "Marker " << std::quoted(pair.first) << " got action " << std::quoted(action) << " but the expected action is " << std::quoted(pair.second);
   }
 }