use {math...} instead

Signed-off-by: Sacha Ayoun <[email protected]>

Author: giltho

src/lexer.mll

@@ -321,8 +321,12 @@ rule token input = parse
   | "{_"
     { emit input (`Begin_style `Subscript) }
 
+  | "{math" space_char
+    { math false (Buffer.create 1024) 0 (Lexing.lexeme_start lexbuf) input lexbuf }
+    
   | "{m" horizontal_space
-    { inline_math (Buffer.create 1024) 0 (Lexing.lexeme_start lexbuf) input lexbuf }
+    { math true (Buffer.create 1024) 0 (Lexing.lexeme_start lexbuf) input lexbuf }
+    
 
   | "{!modules:" ([^ '}']* as modules) '}'
     { emit input (`Modules modules) }
@@ -366,10 +370,7 @@ rule token input = parse
 
   | "{%" ((raw_markup_target as target) ':')? (raw_markup as s)
     ("%}" | eof as e)
-    { let token =
-      match target with
-      | Some "math" -> `Math (true, s)
-      | _ -> `Raw_markup (target, s)
+    { let token = `Raw_markup (target, s)
       in
       if e <> "%}" then
         warning
@@ -545,40 +546,49 @@ and code_span buffer nesting_level start_offset input = parse
     { Buffer.add_char buffer c;
       code_span buffer nesting_level start_offset input lexbuf }
 
-and inline_math buffer nesting_level start_offset input = parse
+and math inline buffer nesting_level start_offset input = parse
   | '}'
     { if nesting_level == 0 then
-        emit input (`Math (false, Buffer.contents buffer)) ~start_offset
+        emit input (`Math (inline, Buffer.contents buffer)) ~start_offset
       else begin
         Buffer.add_char buffer '}';
-        inline_math buffer (nesting_level - 1) start_offset input lexbuf
+        math inline buffer (nesting_level - 1) start_offset input lexbuf
       end
       }
   | '{'
     { Buffer.add_char buffer '{';
-      inline_math buffer (nesting_level + 1) start_offset input lexbuf }
+      math inline buffer (nesting_level + 1) start_offset input lexbuf }
   | ("\\{" | "\\}") as s
     { Buffer.add_string buffer s;
-      inline_math buffer nesting_level start_offset input lexbuf }
-  | newline newline
-    { warning
-        input
-        (Parse_error.not_allowed
-          ~what:(Token.describe (`Blank_line "\n\n"))
-          ~in_what:(Token.describe (`Math (false, ""))));
-      Buffer.add_char buffer '\n';
-      inline_math buffer nesting_level start_offset input lexbuf }
-
+      math inline buffer nesting_level start_offset input lexbuf }
+  | (newline) as s
+    {
+      if inline then
+        begin
+          warning
+            input
+            (Parse_error.not_allowed
+              ~what:(Token.describe (`Blank_line "\n"))
+              ~in_what:(Token.describe (`Math (inline, ""))));
+          Buffer.add_char buffer '\n';
+          math inline buffer nesting_level start_offset input lexbuf
+        end
+      else
+        begin
+          Buffer.add_string buffer s;
+          math inline buffer nesting_level start_offset input lexbuf
+        end
+    }
   | eof
     { warning
         input
         (Parse_error.not_allowed
           ~what:(Token.describe `End)
-          ~in_what:(Token.describe (`Math (false, ""))));
-      emit input (`Math (false, Buffer.contents buffer)) ~start_offset }
+          ~in_what:(Token.describe (`Math (inline, ""))));
+      emit input (`Math (inline, Buffer.contents buffer)) ~start_offset }
   | _ as c
     { Buffer.add_char buffer c;
-      inline_math buffer nesting_level start_offset input lexbuf }
+      math inline buffer nesting_level start_offset input lexbuf }
 
 and verbatim buffer last_false_terminator start_offset input = parse
   | (space_char as c) "v}"

src/syntax.ml

@@ -106,9 +106,9 @@ let rec inline_element :
   | `Raw_markup (raw_markup_target, s) ->
       junk input;
       Loc.at location (`Raw_markup (raw_markup_target, s))
-  | `Math s ->
+  | `Math _ as tk ->
       junk input;
-      Loc.at location (`Math s)
+      Loc.at location tk
   | `Begin_style s as parent_markup ->
       junk input;
 

src/token.ml

@@ -54,7 +54,7 @@ type t =
   | `Code_span of string
   | `Raw_markup of string option * string
   | `Math of bool * string
-    (* The boolean is true iff the math is a block *)
+    (* The boolean is true iff the math is a inline *)
   | `Begin_style of style
   | `Begin_paragraph_style of paragraph_style
   | (* Other inline element markup. *)
@@ -125,7 +125,7 @@ let describe : [< t | `Comment ] -> string = function
   | `Begin_style `Emphasis -> "'{e ...}' (emphasized text)"
   | `Begin_style `Superscript -> "'{^...}' (superscript)"
   | `Begin_style `Subscript -> "'{_...}' (subscript)"
-  | `Math (b, _) -> if b then "'{%math ...%}' (math block)" else "'{m ...}' (inline math)"
+  | `Math (b, _) -> if b then "'{m ...}' (inline math)" else "'{math ...}' (math block)"
   | `Simple_reference _ -> "'{!...}' (cross-reference)"
   | `Begin_reference_with_replacement_text _ ->
       "'{{!...} ...}' (cross-reference)"

test/test.ml

@@ -42,7 +42,7 @@ module Ast_to_sexp = struct
     | `Raw_markup (target, s) ->
         List [ Atom "raw_markup"; opt str target; Atom s ]
     | `Math (b, s) ->
-      let b_descr = if b then Atom "block" else Atom "inline" in 
+      let b_descr = if b then Atom "inline" else Atom "block" in 
       List [Atom "math"; b_descr; Atom s]
     | `Styled (s, es) ->
         List [ style s; List (List.map (at.at (inline_element at)) es) ]
@@ -5310,42 +5310,43 @@ let%expect_test _ =
 let%expect_test _ =
   let module Math = struct
     let block =
-      test "{%math:\\sum_{i=0}^n x^i%}";
+      test "{math \\sum_{i=0}^n x^i%}";
       [%expect {|
         ((output
-          (((f.ml (1 0) (1 25))
-            (paragraph (((f.ml (1 0) (1 25)) (math block "\\sum_{i=0}^n x^i")))))))
+          (((f.ml (1 0) (1 24))
+            (paragraph (((f.ml (1 0) (1 24)) (math block "\\sum_{i=0}^n x^i%")))))))
          (warnings ())) |}]
 
     let complex_block =
-      test {|{%math
+      test {|{math
       \alpha(x)=\left\{
                 \begin{array}{ll}                 % beginning of the array
                   x \% 4\\                        % some variable modulo 4
                   \frac{1}{1+e^{-kx}}\\           % something else
                   \frac{e^x-e^{-x}}{e^x+e^{-x}}   % another action
                 \end{array}                       % end of the array
               \right.
-      %}|}
-    
-    let inline =
-      test "{m x + 4}";
+      }|};
       [%expect {|
         ((output
-          (((f.ml (1 0) (9 8))
+          (((f.ml (1 0) (9 7))
             (paragraph
-             (((f.ml (1 0) (9 8))
-               (raw_markup ()
-                 "math\
-                \n      \\alpha(x)=\\left\\{\
+             (((f.ml (1 0) (9 7))
+               (math block
+                 "      \\alpha(x)=\\left\\{\
                 \n                \\begin{array}{ll}                 % beginning of the array\
                 \n                  x \\% 4\\\\                        % some variable modulo 4\
                 \n                  \\frac{1}{1+e^{-kx}}\\\\           % something else\
                 \n                  \\frac{e^x-e^{-x}}{e^x+e^{-x}}   % another action\
                 \n                \\end{array}                       % end of the array\
                 \n              \\right.\
                 \n      ")))))))
-         (warnings ()))((output
+         (warnings ())) |}]
+    
+    let inline =
+      test "{m x + 4}";
+      [%expect {|
+        ((output
           (((f.ml (1 0) (1 9))
             (paragraph (((f.ml (1 0) (1 9)) (math inline "x + 4")))))))
          (warnings ())) |}]