diff --git a/autotests/folding/highlight.po.fold b/autotests/folding/highlight.po.fold
new file mode 100644
--- /dev/null
+++ b/autotests/folding/highlight.po.fold
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Test\n"
+"POT-Creation-Date: \n"
+".....\n"
+
+#: file.ext:442
+msgid "test"
+msgstr "test"
+
+msgstr
+"test"
+"t{+est+}t"
+"t{-est-}t"
+"test"
+"t{+est"
+"test"
+"+}est"
+"t{-est"
+"test"
+"-}est"
+
+msgid_plural "test"
+msgstr[0] "test" "test"
+msgstr[1] "test"
+
+msgstr "testt{+estt"
+msgid "est+}ta < &sasa; ª a < b"
+
+unknown command
+# simple comment
+#= not Gettext standard
+#. extracted comments
+#, fuzzy
+#, fuzzy, c-format
+#, fuzzyerror
+#| msgid_plural "test\n{+a+}{-S-}s&&;"
+#| msgstr "test{+"
+#| "xx+}x"
+msgid "x"
+
+msgstr "translated-
+"string"
+"string"
+#| msgid_plural "test
+#| "test"
+#| "test"
+
+#| msgid_plural "test"
+# "test"
diff --git a/autotests/html/highlight.po.html b/autotests/html/highlight.po.html
new file mode 100644
--- /dev/null
+++ b/autotests/html/highlight.po.html
@@ -0,0 +1,57 @@
+
+
+
+highlight.po
+
+
+msgid ""
+msgstr ""
+"Project-Id-Version: Test\n"
+"POT-Creation-Date: \n"
+".....\n"
+
+#: file.ext:442
+msgid "test"
+msgstr "test"
+
+msgstr
+"test"
+"t{+est+}t"
+"t{-est-}t"
+"test"
+"t{+est"
+"test"
+"+}est"
+"t{-est"
+"test"
+"-}est"
+
+msgid_plural "test"
+msgstr[0] "test" "test"
+msgstr[1] "test"
+
+msgstr "testt{+estt"
+msgid "est+}t<b>a</b> < &sasa;  ª a < b"
+
+unknown command
+# simple comment
+#= not Gettext standard
+#. extracted comments
+#, fuzzy
+#, fuzzy, c-format
+#, fuzzyerror
+#| msgid_plural "test\n{+a+}{-S-}<b>s</b>&&;"
+#| msgstr "test{+"
+#| "xx+}x"
+msgid "x"
+
+msgstr "translated-
+"string"
+"string"
+#| msgid_plural "test
+#| "test"
+#| "test"
+
+#| msgid_plural "test"
+# "test"
+
diff --git a/autotests/input/highlight.po b/autotests/input/highlight.po
new file mode 100644
--- /dev/null
+++ b/autotests/input/highlight.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Test\n"
+"POT-Creation-Date: \n"
+".....\n"
+
+#: file.ext:442
+msgid "test"
+msgstr "test"
+
+msgstr
+"test"
+"t{+est+}t"
+"t{-est-}t"
+"test"
+"t{+est"
+"test"
+"+}est"
+"t{-est"
+"test"
+"-}est"
+
+msgid_plural "test"
+msgstr[0] "test" "test"
+msgstr[1] "test"
+
+msgstr "testt{+estt"
+msgid "est+}ta < &sasa; ª a < b"
+
+unknown command
+# simple comment
+#= not Gettext standard
+#. extracted comments
+#, fuzzy
+#, fuzzy, c-format
+#, fuzzyerror
+#| msgid_plural "test\n{+a+}{-S-}s&&;"
+#| msgstr "test{+"
+#| "xx+}x"
+msgid "x"
+
+msgstr "translated-
+"string"
+"string"
+#| msgid_plural "test
+#| "test"
+#| "test"
+
+#| msgid_plural "test"
+# "test"
diff --git a/autotests/reference/highlight.po.ref b/autotests/reference/highlight.po.ref
new file mode 100644
--- /dev/null
+++ b/autotests/reference/highlight.po.ref
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Test\n"
+"POT-Creation-Date: \n"
+".....\n"
+
+#: file.ext:442
+msgid "test"
+msgstr "test"
+
+msgstr
+"test"
+"t{+est+}t"
+"t{-est-}t"
+"test"
+"t{+est"
+"test"
+"+}est"
+"t{-est"
+"test"
+"-}est"
+
+msgid_plural "test"
+msgstr[0] "test" "test"
+msgstr[1] "test"
+
+msgstr "testt{+estt"
+msgid "est+}ta < &sasa; ª a < b"
+
+unknown command
+# simple comment
+#= not Gettext standard
+#. extracted comments
+#, fuzzy
+#, fuzzy, c-format
+#, fuzzyerror
+#| msgid_plural "test\n{+a+}{-S-}s&&;"
+#| msgstr "test{+"
+#| "xx+}x"
+msgid "x"
+
+msgstr "translated-
+"string"
+"string"
+#| msgid_plural "test
+#| "test"
+#| "test"
+
+#| msgid_plural "test"
+# "test"
diff --git a/data/syntax/gettext.xml b/data/syntax/gettext.xml
--- a/data/syntax/gettext.xml
+++ b/data/syntax/gettext.xml
@@ -1,164 +1,192 @@
-
-
+
+
+
+]>
+
+
+ - msgid
+ - msgid_plural
+ - msgstr
+ - msgctxt
+
+
+
+ - fuzzy
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+