From: Michael D. Lowis Date: Mon, 13 Nov 2017 21:28:08 +0000 (-0500) Subject: added stub unit test files and switched Draw.ml over to use the Cfg font setting X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=f0c981f9b09fc89c9f450912deaed238fb82812d;p=archive%2Ftide-ocaml.git added stub unit test files and switched Draw.ml over to use the Cfg font setting --- diff --git a/Makefile b/Makefile index da529fd..5a47793 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,9 @@ LIBOBJS = \ TESTOBJS = \ tests/test.$(OBJEXT) \ + tests/buf_tests.$(OBJEXT) \ tests/rope_tests.$(OBJEXT) \ + tests/misc_tests.$(OBJEXT) \ tests/scrollmap_tests.$(OBJEXT) .PHONY: all clean docs diff --git a/lib/cfg.ml b/lib/cfg.ml index ea6b566..6a41fbf 100644 --- a/lib/cfg.ml +++ b/lib/cfg.ml @@ -28,7 +28,7 @@ let cmd_tags = strvar "tide.ui.font" (* font settings *) let font = strvar "tide.ui.tags.edit" - "Liberation Mono:pixelsize=14:antialias=true:autohint=true" + "Liberation Sans:size=11:antialias=true:autohint=true" let line_spacing = intvar "tide.ui.line_spacing" 1 (* user interface related options *) diff --git a/lib/draw.ml b/lib/draw.ml index b636ada..6131223 100644 --- a/lib/draw.ml +++ b/lib/draw.ml @@ -1,5 +1,5 @@ (* config settings. eventually move to Cfg module *) -let font = X11.font_load "Verdana:size=11" +let font = X11.font_load Cfg.font let font_height = let open X11 in font.height let tabglyph = 0x30 let tabwidth = 4 diff --git a/lib/view_tests.ml b/lib/view_tests.ml new file mode 100644 index 0000000..e69de29 diff --git a/tests/buf_tests.ml b/tests/buf_tests.ml new file mode 100644 index 0000000..e69de29 diff --git a/tests/misc_tests.ml b/tests/misc_tests.ml new file mode 100644 index 0000000..e69de29 diff --git a/unittests.ml b/unittests.ml index 7f3f2fe..4a8ae9f 100644 --- a/unittests.ml +++ b/unittests.ml @@ -1,3 +1,5 @@ +open Buf_tests +open Misc_tests open Rope_tests open Scrollmap_tests