diff --git a/syntaxes/Asciidoctor.json b/syntaxes/Asciidoctor.json
index b0fbeefa..86efca0e 100644
--- a/syntaxes/Asciidoctor.json
+++ b/syntaxes/Asciidoctor.json
@@ -337,7 +337,7 @@
         {
           "comment": "attributes",
           "name": "markup.meta.attribute-list.asciidoc",
-          "match": "(?<=\\{|,|.|#|\"|'|%)([^\\],.#%]+)",
+          "match": "(?<=\\{|,|\\.|#|\"|'|%)(?:[^\\],.#%]|\\](?=[ \\t]*\\S))+",
           "captures": {
             "0": {
               "patterns": [
@@ -1710,10 +1710,10 @@
       "patterns": [
         {
           "name": "markup.italic.quotes.asciidoc",
-          "begin": "(?=(?>(?:^\\[(quote|verse)((?:,|#|\\.|%)([^,\\]]+))*\\]$)))",
+          "begin": "(?=(?>(?:^\\[(quote|verse)(?:(?:,|#|\\.|%)(?:[^,\\]]|\\](?=[ \\t]*\\S))+)*\\]$)))",
           "patterns": [
             {
-              "match": "^\\[(quote|verse)((?:,|#|\\.|%)([^,\\]]+))*\\]$",
+              "match": "^\\[(quote|verse)(?:(?:,|#|\\.|%)(?:[^,\\]]|\\](?=[ \\t]*\\S))+)*\\]$",
               "captures": {
                 "0": {
                   "patterns": [