From 8709d5d97bbae29b35268332a45331f0b2f9c987 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 24 Jan 2005 13:00:11 +0000 Subject: [PATCH] Improve OS X help: split back up into multiple files (thanks to Halibut's new \cfg{html-local-head} directive), and add some CSS to mimic the font choices of system help files. git-svn-id: svn://svn.tartarus.org/sgt/puzzles@5194 cda61777-01e9-0310-a592-d414129be87e --- Recipe | 5 +++-- osx-help.but | 14 ++++++++++++++ osx.m | 9 ++------- puzzles.but | 10 ++++------ 4 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 osx-help.but diff --git a/Recipe b/Recipe index 6c4d302..0191601 100644 --- a/Recipe +++ b/Recipe @@ -48,8 +48,9 @@ Puzzles : [MX] osx osx.icns osx-info.plist COMMON ALL CFLAGS += -DCOMBINED Puzzles_extra = Puzzles.app/Contents/Resources/Help/index.html Puzzles.app/Contents/Resources/Help/index.html: \ - Puzzles.app/Contents/Resources/Help puzzles.but - halibut --html=$@ puzzles.but + Puzzles.app/Contents/Resources/Help osx-help.but puzzles.but + cd Puzzles.app/Contents/Resources/Help; \ + halibut --html ../../../../osx-help.but ../../../../puzzles.but Puzzles.app/Contents/Resources/Help: Puzzles.app/Contents/Resources mkdir -p Puzzles.app/Contents/Resources/Help !end diff --git a/osx-help.but b/osx-help.but new file mode 100644 index 0000000..fa45996 --- /dev/null +++ b/osx-help.but @@ -0,0 +1,14 @@ +\# Additional Halibut fragment to set up the HTML output +\# appropriately for MacOS online help. + +\cfg{html-head-end}{ + +} diff --git a/osx.m b/osx.m index 245672a..7d0dddb 100644 --- a/osx.m +++ b/osx.m @@ -3,13 +3,8 @@ * * Still to do: * - * - Improve the help. For a start I probably ought to split it - * into pieces (which means Halibut needs to acquire a mechanism - * of putting something in the head section of _only one_ HTML - * file); then I'd also like to be able to call up context help - * for a specific game at a time. Also I just idly wonder - * whether changing font might be nice, to match up to Apple - * norms. + * - I'd like to be able to call up context help for a specific + * game at a time. * * Mac interface issues that possibly could be done better: * diff --git a/puzzles.but b/puzzles.but index 305340a..44081e3 100644 --- a/puzzles.but +++ b/puzzles.but @@ -5,17 +5,14 @@ \cfg{text-filename}{puzzles.txt} -\# \cfg{html-contents-filename}{index.html} +\cfg{html-template-filename}{%k.html} +\cfg{html-index-filename}{docindex.html} \cfg{html-leaf-level}{1} \cfg{html-contents-depth-0}{1} \cfg{html-contents-depth-1}{2} \cfg{html-leaf-contains-contents}{true} -\cfg{html-single-filename}{index.html} -\cfg{html-head-end}{} -\cfg{html-leaf-level}{0} - \cfg{info-filename}{puzzles.info} \cfg{ps-filename}{puzzles.ps} @@ -27,8 +24,9 @@ This is a collection of small one-player puzzle games. reserved. You may distribute this documentation under the MIT licence. See \k{licence} for the licence text in full. -\versionid $Id$ +\cfg{html-local-head}{} +\versionid $Id$ \C{intro} Introduction -- 2.11.0