diff options
| author | Théo Zimmermann | 2020-05-07 15:38:48 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2020-05-07 15:38:48 +0200 |
| commit | 06b1672e4d4390aad693812321693b3cd5ee668a (patch) | |
| tree | e3352a05a2ec8408d9117a3e3bfb4b3c351628b8 | |
| parent | 18a78b53f6998d3af8f8bb1b7a6b5054af232d4e (diff) | |
| parent | 52145601d33ee3fa81ed3e291f2e4db1c6c1d622 (diff) | |
Merge PR #12024: Fixes for LaTeX/html export of standard library in coqdoc
Reviewed-by: Zimmi48
| -rw-r--r-- | doc/stdlib/Library.tex | 1 | ||||
| -rw-r--r-- | theories/extraction/ExtrOCamlFloats.v | 4 | ||||
| -rw-r--r-- | tools/coqdoc/cpretty.mll | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/stdlib/Library.tex b/doc/stdlib/Library.tex index 44a0b1d361..1a9d4d738f 100644 --- a/doc/stdlib/Library.tex +++ b/doc/stdlib/Library.tex @@ -5,6 +5,7 @@ \usepackage[T1]{fontenc} \usepackage{fullpage} \usepackage{amsfonts} +\usepackage{amssymb} \usepackage{url} \usepackage[color]{../../coqdoc} diff --git a/theories/extraction/ExtrOCamlFloats.v b/theories/extraction/ExtrOCamlFloats.v index 02f4b2898b..8d01620ef2 100644 --- a/theories/extraction/ExtrOCamlFloats.v +++ b/theories/extraction/ExtrOCamlFloats.v @@ -14,10 +14,10 @@ Note: the extraction of primitive floats relies on Coq's internal file kernel/float64.ml, so make sure the corresponding binary is available when linking the extracted OCaml code. -For example, if you build a (_CoqProject + coq_makefile)-based project +For example, if you build a ("_CoqProject" + coq_makefile)-based project and if you created an empty subfolder "extracted" and a file "test.v" containing [Cd "extracted". Separate Extraction function_to_extract.], -you will just need to add in the _CoqProject: [test.v], [-I extracted] +you will just need to add in the "_CoqProject" file: [test.v], [-I extracted] and the list of [extracted/*.ml] and [extracted/*.mli] files, then add [CAMLFLAGS += -w -33] in the Makefile.local file. *) diff --git a/tools/coqdoc/cpretty.mll b/tools/coqdoc/cpretty.mll index 86d213453b..aa3c5b9d3b 100644 --- a/tools/coqdoc/cpretty.mll +++ b/tools/coqdoc/cpretty.mll @@ -316,7 +316,7 @@ let identifier = (* This misses unicode stuff, and it adds "[" and "]". It's only an approximation of idents - used for detecting whether an underscore is part of an identifier or meant to indicate emphasis *) -let nonidentchar = [^ 'A'-'Z' 'a'-'z' '_' '[' ']' '\'' '0'-'9' '@' ] +let nonidentchar = [^ 'A'-'Z' 'a'-'z' '_' '[' ']' '\'' '0'-'9' '@' '\"' '\'' '`'] let printing_token = [^ ' ' '\t']* |