diff options
| author | Alasdair Armstrong | 2020-09-27 02:10:37 +0100 |
|---|---|---|
| committer | GitHub | 2020-09-27 02:10:37 +0100 |
| commit | b73aaf6d7209d693e295abcc499fa2f759cb877e (patch) | |
| tree | d9ede8241219029de255b4ccd9f29f473e711495 /src | |
| parent | 70221a666d5106cfdc5991e2fa13636c73cac042 (diff) | |
| parent | e6dadf146f699a7ac28228659832d31100861d17 (diff) | |
Merge pull request #94 from jrtc27/latex-custom-label
Wrap saildoc LaTeX in \saildoclabelled macro
Diffstat (limited to 'src')
| -rw-r--r-- | src/latex.ml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/latex.ml b/src/latex.ml index 128d0ec1..2bb38bd7 100644 --- a/src/latex.ml +++ b/src/latex.ml @@ -333,9 +333,9 @@ let doc_spec_simple (VS_aux (VS_val_spec (ts, id, ext, is_cast), _)) = let rec latex_command cat id no_loc ((l, _) as annot) = state.this <- Some id; - let labelling = match cat with - | Val -> sprintf "\\label{%s}" (refcode_id id) - | _ -> sprintf "\\label{%s%s}" (category_name cat) (refcode_id id) + let labelname = match cat with + | Val -> sprintf "%s" (refcode_id id) + | _ -> sprintf "%s%s" (category_name cat) (refcode_id id) in (* To avoid problems with verbatim environments in commands, we have to put the sail code for each command in a separate file. *) @@ -351,9 +351,9 @@ let rec latex_command cat id no_loc ((l, _) as annot) = begin state.commands <- StringSet.add command state.commands; - ksprintf string "\\newcommand{%s}{\\phantomsection%s\\saildoc%s{" command labelling (category_name_simple cat) + ksprintf string "\\newcommand{%s}{\\saildoclabelled{%s}{\\saildoc%s{" command labelname (category_name_simple cat) ^^ docstring l ^^ string "}{" - ^^ ksprintf string "\\lstinputlisting[language=sail]{%s}}}" (Filename.concat !opt_directory code_file) + ^^ ksprintf string "\\lstinputlisting[language=sail]{%s}}}}" (Filename.concat !opt_directory code_file) end let latex_label str id = @@ -434,6 +434,8 @@ let tdef_id = function let defs (Defs defs) = reset_state state; + let preamble = string "\\providecommand\\saildoclabelled[2]{\\phantomsection\\label{#1}#2}" ^^ twice hardline in + let overload_counter = ref 0 in let valspecs = ref IdSet.empty in @@ -505,7 +507,8 @@ let defs (Defs defs) = |> string in - tex + preamble + ^^ tex ^^ separate (twice hardline) [id_command Val !valspecs; ref_command Val !valspecs; id_command Function !fundefs; |