diff --git a/autotests/folding/modelines.sh.fold b/autotests/folding/modelines.sh.fold new file mode 100644 --- /dev/null +++ b/autotests/folding/modelines.sh.fold @@ -0,0 +1,10 @@ +# Comment\ + +# kate: syntax Bash ; scheme Normal; +# kate: font-size 14; background-color #FAFAFA ; + +# kate: remove-trailing-spaces *; +# kate: remove-trailing-spaces all; + +# kate: replace-tabs false; +# kate: byte-order-mark true ; diff --git a/autotests/html/modelines.sh.html b/autotests/html/modelines.sh.html new file mode 100644 --- /dev/null +++ b/autotests/html/modelines.sh.html @@ -0,0 +1,17 @@ + + + +modelines.sh + +
+# Comment\
+
+# kate: syntax Bash ; scheme Normal;
+# kate: font-size 14; background-color #FAFAFA ;
+
+# kate: remove-trailing-spaces *;
+# kate: remove-trailing-spaces all;
+
+# kate: replace-tabs false;
+# kate: byte-order-mark true ;
+
diff --git a/autotests/input/modelines.sh b/autotests/input/modelines.sh new file mode 100644 --- /dev/null +++ b/autotests/input/modelines.sh @@ -0,0 +1,10 @@ +# Comment\ + +# kate: syntax Bash ; scheme Normal; +# kate: font-size 14; background-color #FAFAFA ; + +# kate: remove-trailing-spaces *; +# kate: remove-trailing-spaces all; + +# kate: replace-tabs false; +# kate: byte-order-mark true ; diff --git a/autotests/reference/highlight.css.ref b/autotests/reference/highlight.css.ref --- a/autotests/reference/highlight.css.ref +++ b/autotests/reference/highlight.css.ref @@ -6,7 +6,7 @@
body {
font-size: 15pt;
- font-family: Verdana, Helvetica, "Bitstream Vera Sans", sans-serif;
+ font-family: Verdana, Helvetica, "Bitstream Vera Sans", sans-serif;
margin-top: 0px; /* yet another comment */
margin-bottom: 0px;
// this is no comment, it's just broken!
@@ -187,7 +187,7 @@
@font-face {
font-family: "Open Sans";
- src: url("/fonts/OpenSans-Regular-webfont.woff2") format("woff2"),
+ src: url("/fonts/OpenSans-Regular-webfont.woff2") format("woff2"),
url("/fonts/OpenSans-Regular-webfont.woff") format("woff");
}

diff --git a/autotests/reference/modelines.sh.ref b/autotests/reference/modelines.sh.ref new file mode 100644 --- /dev/null +++ b/autotests/reference/modelines.sh.ref @@ -0,0 +1,10 @@ +# Comment\
+
+# kate: syntax Bash ; scheme Normal;
+# kate: font-size 14; background-color #FAFAFA ;
+
+# kate: remove-trailing-spaces *;
+# kate: remove-trailing-spaces all;
+
+# kate: replace-tabs ;
+# kate: byte-order-mark ;
diff --git a/autotests/reference/review128925-1.css.ref b/autotests/reference/review128925-1.css.ref --- a/autotests/reference/review128925-1.css.ref +++ b/autotests/reference/review128925-1.css.ref @@ -23,7 +23,7 @@ /* Properties */

html, body {
- font-family: "Droid Sans", Arial, sans-serif;
+ font-family: "Droid Sans", Arial, sans-serif;
font-size: 11pt;
line-height: 1.5em;
max-width: calc(100% - 300px);
@@ -81,8 +81,8 @@
@font-face {
font-family: MyHelvetica;
- src: local("Helvetica Neue Bold"),
- local("HelveticaNeue-Bold"),
+ src: local("Helvetica Neue Bold"),
+ local("HelveticaNeue-Bold"),
url(MgOpenModernaBold.ttf);
font-weight: bold;
}
diff --git a/autotests/reference/review128925-2.css.ref b/autotests/reference/review128925-2.css.ref --- a/autotests/reference/review128925-2.css.ref +++ b/autotests/reference/review128925-2.css.ref @@ -22,8 +22,8 @@
header/* comment here */.active /* comment here */ {
/* comment here */ color : /* comment here */ blue/* comment here */;
- font-family: Arial /* comment here */,
- "Droid Sans", /* comment here */
+ font-family: Arial /* comment here */,
+ "Droid Sans", /* comment here */
sans-serif/* comment here */;
}

diff --git a/data/syntax/modelines.xml b/data/syntax/modelines.xml --- a/data/syntax/modelines.xml +++ b/data/syntax/modelines.xml @@ -8,7 +8,7 @@ Copyright (c) 2012-2014 by Alex Turbov (i.zaufi@gmail.com) --> bookmark-sorting bom byte-order-marker + byte-order-mark dynamic-word-wrap folding-markers folding-preview @@ -130,7 +131,6 @@ - @@ -166,10 +166,13 @@ - + + + + @@ -187,7 +190,7 @@ - +