From cf9639908a13c53aca744adeb3fae089491fd7b2 Mon Sep 17 00:00:00 2001 From: Quentin Carbonneaux Date: Tue, 8 Mar 2016 20:47:48 -0500 Subject: hack inline support --- doc/txt.ml | 137 ++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 105 insertions(+), 32 deletions(-) (limited to 'doc/txt.ml') diff --git a/doc/txt.ml b/doc/txt.ml index 60bbc45..6c72bf6 100644 --- a/doc/txt.ml +++ b/doc/txt.ml @@ -6,7 +6,7 @@ and item = | Par of string | Ulist of doc list | Olist of doc list - | Title of int * string + | Title of int * int * string let (|>) x f = f x @@ -24,8 +24,7 @@ module String = struct p = String.sub s 0 lp end -let warn n e = - Printf.eprintf "Warning line %d: %s.\n" n e +let warn = Printf.eprintf let getdent s = let rec f n = @@ -67,9 +66,9 @@ let skipbul s = String.suff s (endbul s) let gettitles lines = let titles = Hashtbl.create 100 in let insert lvl n t = - let t = skipnum t in + let t = skipnum (String.suff t 2) in if Hashtbl.mem titles t then - warn n "title has multiple definitions"; + warn "line %d: title has multiple definitions\n" n; Hashtbl.add titles t (lvl, n) in lines |> List.iter begin fun (n, lvl, t) -> if lvl <> 0 then () else @@ -85,10 +84,7 @@ let top lines = | l :: _ -> Some l let pop lines = - match top lines with - | None -> None - | l -> lines := List.tl !lines; l - + lines := List.tl !lines let push lines l = lines := l :: !lines @@ -99,7 +95,7 @@ let getverb lines idnt = let rec f ls = match top lines with | Some (n, i, l) when i >= idnt || l = "" -> - pop lines |> ignore; + pop lines; f (dedent l idnt :: ls) | _ -> let ls = @@ -118,7 +114,7 @@ let getpar lines idnt = && l <> "" && not (isolist l) && not (isulist l) -> - pop lines |> ignore; + pop lines; f (l :: ls) | _ -> List.rev ls |> @@ -152,37 +148,38 @@ let rec getdoc lines si acc = match top lines with | Some (n, i, l) -> if i = si && isolist l then begin (* Olist item *) - pop lines |> ignore; + pop lines; push lines (n, i+1, skipnum l); let li = getdoc lines (si+1) [] in getdoc lines si (Olist [li] :: acc); end else if i = si && isulist l then begin (* Ulist item *) - pop lines |> ignore; + pop lines; push lines (n, i+1, skipbul l); let li = getdoc lines (si+1) [] in getdoc lines si (Ulist [li] :: acc); end else if i > si then begin (* Verb item *) let ty = + let l = dedent l i in if l.[0] <> '[' then "" else begin - pop lines |> ignore; + pop lines; l end in let verb = getverb lines i in getdoc lines si (Verb (ty, verb) :: acc); end else if si = 0 && String.haspref "~ " l - || si = 0 && String.haspref "- " l then begin (* Titles *) - pop lines |> ignore; + || si = 0 && String.haspref "- " l then begin (* Titles *) + pop lines; let lvl = if l.[0] = '-' then 0 else 1 in let tit = String.suff l 2 in - getdoc lines si (Title (lvl, tit) :: acc); + getdoc lines si (Title (lvl, n, tit) :: acc); end else if String.haspref "---" l || String.haspref "~~~" l || l = "" then begin (* Decorations *) - pop lines |> ignore; + pop lines; getdoc lines si acc; end else if i = si then begin (* Par item *) @@ -192,34 +189,110 @@ let rec getdoc lines si acc = List.rev acc |> mergedoc | None -> List.rev acc |> mergedoc -let rec dochtml d = +type printer = + { pchar: char -> unit + ; plink: string -> unit + ; pcode: string -> unit + } + +let print pp s = + let l = String.length s in + let isspace = String.contains " \n\t" in + let rec getlink j spc = + if j >= l || s.[j] = '>' then j+1, "" else + if isspace s.[j] then + getlink (j+1) true + else + let j', t = getlink (j+1) false in + if spc then + j', Printf.sprintf " %c%s" s.[j] t + else + j', Printf.sprintf "%c%s" s.[j] t in + let getlink j = + let j', s = getlink j false in + if isspace s.[0] + then j', String.suff s 1 + else j', s in + let rec getdlim j d = + if j >= l || s.[j] = d then j+1, "" else + let j', t = getdlim (j+1) d in + j', Printf.sprintf "%c%s" s.[j] t in + let rec f i = + if i >= l then () else + match s.[i] with + | '<' when i < l-1 && s.[i+1] = '@' -> + let i, t = getlink (i+2) in + pp.plink t; + f i + | '`' -> + let i, t = getdlim (i+1) '`' in + pp.pcode t; + f i + | c -> + pp.pchar c; + f (i+1) + in f 0 + +let rec dochtml titles d = let open Printf in - let rec prlist = + let pchar = function + | '<' -> printf "<" + | '>' -> printf ">" + | '&' -> printf "&" + | c -> printf "%c" c in + let escape = String.iter pchar in + let plink l = + try + let (_, n) = Hashtbl.find titles l in + printf "%s" n l + with Not_found -> + warn "warning: unresolved link '%s'\n" l; + printf "%s" l in + let pcode s = + printf ""; + escape s; + printf ""; in + let pp = {pchar; plink; pcode} in + let rec plist = List.iter begin fun d -> match d with - | Par p :: d -> printf "
  • %s\n" p; dochtml d - | d -> printf "
  • "; dochtml d; + | Par p :: d -> + printf "
  • "; + print pp p; + printf "\n"; + dochtml titles d; + | d -> + printf "
  • "; + dochtml titles d; end in let itemhtml = function - | Title (0, t) -> - printf "

    %s

    \n" t; - | Title (_, t) -> - printf "

    %s

    \n" t; + | Title (0, n, t) -> + printf "

    " n; + escape t; + printf "

    \n"; + | Title (_, n, t) -> + printf "

    " n; + escape t; + printf "

    \n"; | Olist l -> printf "
      \n"; - prlist l; + plist l; printf "
    \n"; | Ulist l -> printf "
      \n"; - prlist l; + plist l; printf "
    \n"; | Verb (_, v) -> - printf "
    \n%s\n
    \n" v; + printf "
    \n";
+      escape v;
+      printf "\n
    \n"; | Par p -> - printf "

    \n%s\n

    \n" p; in + printf "

    \n"; + print pp p; + printf "\n

    \n"; in List.iter itemhtml d let _ = let lines = getlines [] 1 in - let _ = gettitles lines in - getdoc (ref lines) 0 [] |> dochtml + let titles = gettitles lines in + getdoc (ref lines) 0 [] |> dochtml titles -- cgit 1.4.1