Allow dots in attributes

appml · Sep 6, 2023 · a0785c1 · a0785c1
1 parent 5133335
commit a0785c1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/app/src/main/java/com/appmindlab/nano/Const.java b/app/src/main/java/com/appmindlab/nano/Const.java
@@ -458,6 +458,7 @@ public class Const {
     protected final static String TAG_CONTENT_CLOSE_SYM = "}";
     protected final static String TAG_MULTI_SYM = "*";
     protected final static String TAG_PLACEHOLDER_SYM = "???";
+    protected final static String TAG_CLASS_PLACEHOLDER_SYM = "---";
     protected final static String TAG_CLASS_SYM = ".";
     protected final static String TAG_ID_SYM = "#";
     protected final static String TAG_NUM_SYM = "$";

diff --git a/app/src/main/java/com/appmindlab/nano/Utils.java b/app/src/main/java/com/appmindlab/nano/Utils.java
@@ -805,6 +805,18 @@ private static String[] makeTagPair(String tag) {
 
         if (tag.length() > 0) {
             if (tag.contains(Const.TAG_CLASS_SYM)) {
+                // Prepare attributes containing dots
+                if (tag.contains(Const.TAG_ATTR_OPEN_SYM)) {
+                    parts = tag.split("\\" + Const.TAG_ATTR_OPEN_SYM);
+                    for (int i=0; i < parts.length; i++) {
+                        if (parts[i].indexOf(Const.TAG_CLASS_SYM) < parts[i].indexOf(Const.TAG_ATTR_CLOSE_SYM))
+                            parts[i] = parts[i].replace(Const.TAG_CLASS_SYM, Const.TAG_CLASS_PLACEHOLDER_SYM);
+                    }
+
+                    // Reconstruct the tag
+                    tag = String.join(Const.TAG_ATTR_OPEN_SYM, parts);
+                }
+
                 parts = tag.split("\\" + Const.TAG_CLASS_SYM);
                 if (parts.length > 1) {
                     // Check if id exists
@@ -840,6 +852,7 @@ else if (tag.contains(Const.TAG_ID_SYM)) {  // Only id, no class
 
             // Handle attributes
             opening_tag = opening_tag.replaceAll("\\" + Const.TAG_ATTR_OPEN_SYM, Const.EMPTY_SYM). replaceAll("\\" + Const.TAG_ATTR_CLOSE_SYM,Const.NULL_SYM);
+            opening_tag = opening_tag.replace(Const.TAG_CLASS_PLACEHOLDER_SYM, Const.TAG_CLASS_SYM);
             closing_tag = closing_tag.replaceAll("\\[.*?\\]", "");
         }