add very WIP math gestion (of $ $) with codecogs API

Charlotte Thomas · Charlotte Thomas · commit 85f529513bcd · 2022-03-22T20:07:09.000+01:00
diff --git a/lib/dune b/lib/dune
@@ -2,4 +2,4 @@
 
 (library
  (name htmlfromtexbooks)
- (libraries str netstring))
+ (libraries str))
diff --git a/lib/htmlgen.ml b/lib/htmlgen.ml
@@ -2,7 +2,7 @@ open Parser
 open Glossary
 open Utils
 
-let url_encoded_str s = Netencoding.Url.encode s;;
+let url_encoded_str s = s;;
 
 let print_table_of_content ast min_chap =
   let count = [|1;1;1;1|] in
@@ -58,9 +58,9 @@ let print_table_of_content ast min_chap =
       | _::q -> aux acc q
   in (aux "" ast);;
 
-  let parse_to_html ?(min_chap=1) ast= 
+  let parse_to_html ?(min_chap=1) write_before ast= 
   let count = [|1;1;1;1|] in
-  let rec aux ?(write=false) acc ast = 
+  let rec aux ?(write=write_before) acc ast = 
   match ast with
     | [] -> acc
     | Nul::q -> aux acc q
@@ -209,9 +209,10 @@ let prepare_body name str toc =
     doc;;
 
 
-let print_file_in_html ?(min_chap=1) file outname =
+let print_file_in_html ?(min_chap=1) ?(write_before=false) file outname =
   let a = pre_parse_file file in
-  let html = parse_to_html ~min_chap:min_chap a in 
+  let html = parse_to_html ~min_chap:min_chap write_before a in 
   let toc = print_table_of_content a min_chap in
-  prepare_body (Hashtbl.find preamble "title") html toc
+  let name = try Hashtbl.find preamble "title" with _ -> "Generic" in
+  prepare_body name html toc
   |> write_to_file outname;;
diff --git a/lib/parser.ml b/lib/parser.ml
@@ -94,7 +94,7 @@ let rec parse_string str =
 let rec parse current_acc acc lst = 
       match lst with
         | [] -> append_line current_acc acc
-        | t::q when t='$' -> let a,q2 = parse_math q in parse "" (a::acc) q2
+        | t::q when t='$' -> let a,q2 = parse_math q in parse "" (a::(append_line current_acc acc)) q2
         | t::q when t='\\' -> 
           let cmd,l = parse_command q in 
           parse "" (Cmd(cmd)::(append_line current_acc acc)) l
diff --git a/test.html b/test.html
@@ -0,0 +1,31 @@
+<title>Generic</title>
+<body>
+<style>
+.center {
+margin:auto;
+text-align:center;
+}
+ </style><div class="center">
+<h1>Generic</h1>
+<h2>Table of Content</h2>
+<ul>
+
+</ul>
+</div>
+tralalala
+</p>
+
+<p>
+
+This is an integral
+<img src="https://latex.codecogs.com/svg.image?x"/>
+<div style="margin: auto; text-align: center;">
+au center
+
+</div>
+<i><b>!!!
+</b></i>selsle
+
+
+
+</body>
diff --git a/test.txt b/test.txt
@@ -1,11 +1,11 @@
 \documentclass{article}
-\newcommand{\sep}{\begin{center}
-  \boldmath $\ast$~$\ast$~$\ast$
-\end{center}} 
 \usepackage{babel}
 Hello 
 \begin{document}
 tralalala
+\bigskip
+This is an integral 
+$\int^a_b f(x) \mathrm{d}x$
 \begin{center}
 au center
 \end{center}
