libvaladoc: Change monospace-rule from `<run>` to ``<run>``

diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index 071c67924a470ff2a4355f5dd397bf7ef5288cb2..9696d516649b033971490b270fac1522238f621b 100644 (file)
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -822,7 +822,7 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
                                .set_name ("Underlined")
                                .set_start (() => { push (_factory.create_run (Run.Style.UNDERLINED)); });
                Rule monospace =
-                       Rule.seq ({ TokenType.BACK_QUOTE, run, TokenType.BACK_QUOTE })
+                       Rule.seq ({ TokenType.BACK_QUOTE_2, run, TokenType.BACK_QUOTE_2 })
                                .set_name ("Monospace")
                                .set_start (() => { push (_factory.create_run (Run.Style.MONOSPACED)); });
 

diff --git a/src/libvaladoc/documentation/wikiscanner.vala b/src/libvaladoc/documentation/wikiscanner.vala
index c2ae1772e4854a4dc3248b2e08a270da12262f7e..f9730bd572f8c0abfe6d5075800e727dd1cf9980 100644 (file)
--- a/src/libvaladoc/documentation/wikiscanner.vala
+++ b/src/libvaladoc/documentation/wikiscanner.vala
@@ -262,7 +262,12 @@ public class Valadoc.WikiScanner : Object, Scanner {
                                break;
 
                        case '`':
-                               emit_token (TokenType.BACK_QUOTE);
+                               if (get_next_char () == '`') {
+                                       emit_token (TokenType.BACK_QUOTE_2);
+                                       _skip = 1;
+                               } else {
+                                       append_char (c);
+                               }
                                break;
 
                        case '\t':

diff --git a/src/libvaladoc/parser/tokentype.vala b/src/libvaladoc/parser/tokentype.vala
index 44108906d94debcba8396f3fd546d8042a039363..871cf0bb60b23b6d62ff74d19462598b34931957 100644 (file)
--- a/src/libvaladoc/parser/tokentype.vala
+++ b/src/libvaladoc/parser/tokentype.vala
@@ -46,7 +46,7 @@ public class Valadoc.TokenType : Object {
        public static TokenType SINGLE_QUOTE_2;
        public static TokenType SLASH_2;
        public static TokenType UNDERSCORE_2;
-       public static TokenType BACK_QUOTE;
+       public static TokenType BACK_QUOTE_2;
        public static TokenType OPEN_BRACE;
        public static TokenType CLOSED_BRACE;
        public static TokenType DOUBLE_OPEN_BRACE;
@@ -152,7 +152,7 @@ public class Valadoc.TokenType : Object {
                        SINGLE_QUOTE_2 = new TokenType.basic ("''");
                        SLASH_2 = new TokenType.basic ("//");
                        UNDERSCORE_2 = new TokenType.basic ("__");
-                       BACK_QUOTE = new TokenType.basic ("`");
+                       BACK_QUOTE_2 = new TokenType.basic ("``");
                        OPEN_BRACE = new TokenType.basic ("{");
                        CLOSED_BRACE = new TokenType.basic ("}");
                        DOUBLE_OPEN_BRACE = new TokenType.basic ("{{");