From 84c59012ab5711b1b620c8b83cc68906c64c826f Mon Sep 17 00:00:00 2001 From: sanette Date: Sat, 9 Dec 2023 20:11:43 +0100 Subject: [PATCH] minor formatting changes --- bogue.opam | 2 +- docs/Bogue.html | 2 +- dune-project | 2 +- lib/b_theme.ml | 22 ++++++++++++---------- lib/bogue.mli | 2 +- share/themes/default/bogue.conf | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/bogue.opam b/bogue.opam index 891f471..b584d8f 100644 --- a/bogue.opam +++ b/bogue.opam @@ -1,6 +1,6 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" -version: "20231125" +version: "20231209" synopsis: "GUI library for ocaml, with animations, based on SDL2" description: """ Bogue is an all-purpose GUI library for ocaml, with animations, based on SDL2. diff --git a/docs/Bogue.html b/docs/Bogue.html index bf5f894..4849441 100644 --- a/docs/Bogue.html +++ b/docs/Bogue.html @@ -34,7 +34,7 @@

Module Bogue

diff --git a/dune-project b/dune-project index b3349d0..178d612 100644 --- a/dune-project +++ b/dune-project @@ -1,7 +1,7 @@ (lang dune 2.7) (cram enable) (name bogue) -(version "20231125") +(version "20231209") (generate_opam_files true) (license ISC) (maintainers "Vu Ngoc San ") diff --git a/lib/b_theme.ml b/lib/b_theme.ml index a284ebb..2d2f045 100644 --- a/lib/b_theme.ml +++ b/lib/b_theme.ml @@ -22,7 +22,7 @@ DIR = /home/john/.config/bogue/themes *) -let this_version = "20231125" (* see VERSION file *) +let this_version = "20231209" (* see VERSION file *) (* Versions are compared using usual (lexicographic) string ordering. *) let default_vars = [ @@ -94,6 +94,7 @@ let id x = x let (//) = Filename.concat (* Some global environment variables *) + module User_dirs = Directories.User_dirs () module Project_dirs = Directories.Project_dirs (struct let qualifier = "org" @@ -132,8 +133,8 @@ let load_vars config_file = config_file version; if version > this_version then printd debug_warning - "The version indicated in the config file (%s) is more recent than your \ - this version of Bogue (%s)" version this_version; + "The version indicated in the config file (%s) is more recent than your \ + version of Bogue (%s)" version this_version; let rec loop list = skip_comment buffer; try @@ -278,12 +279,13 @@ let find_share prog file = let () = let opam = "opam var share" in try - let system = Unix.open_process_in opam in - let res = input_line system in - (* We could also use [sprintf "opam var %s:share" prog] *) - Unix.close_process_in system |> ignore; - Queue.add (res // prog) queue; - Queue.add (res // "bogue") queue; + printd debug_io "Invoking opam"; + let system = Unix.open_process_in opam in + let res = input_line system in + (* We could also use [sprintf "opam var %s:share" prog] *) + Unix.close_process_in system |> ignore; + Queue.add (res // prog) queue; + Queue.add (res // "bogue") queue; with _ -> printd debug_io "Cannot execute '%s'" opam in Sys.chdir cwd; match Queue.fold (fun list path -> @@ -473,7 +475,7 @@ let scale_from_float x = let unscale_to_float i = !scale *. (float i) -(** font awesome variables *) +(** Font Awesome variables *) let load_fa_variables () = let file = fa_dir // "less" // "variables.less" in let buffer = Scanf.Scanning.from_file file in diff --git a/lib/bogue.mli b/lib/bogue.mli index 282f65a..5bfd2db 100644 --- a/lib/bogue.mli +++ b/lib/bogue.mli @@ -14,7 +14,7 @@ Copyright: see LICENCE Bogue is entirely written in {{:https://ocaml.org/}ocaml} except for the hardware accelerated graphics library {{:https://www.libsdl.org/}SDL2}. -@version 20231125 +@version 20231209 @author Vu Ngoc San diff --git a/share/themes/default/bogue.conf b/share/themes/default/bogue.conf index e57ae58..4b37f38 100644 --- a/share/themes/default/bogue.conf +++ b/share/themes/default/bogue.conf @@ -1,4 +1,4 @@ -## BOGUE version 20231125 +## BOGUE version 20231209 ## Theme: default BACKGROUND = color:white