Menu
▾
▴
gtk2hs-commit — Mailing list for Darcs commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(68) |
Aug
(4) |
Sep
|
Oct
(23) |
Nov
(95) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
(51) |
May
(81) |
Jun
(2) |
Jul
(86) |
Aug
(143) |
Sep
(3) |
Oct
(31) |
Nov
(63) |
Dec
(90) |
| 2005 |
Jan
(277) |
Feb
(157) |
Mar
(99) |
Apr
(195) |
May
(151) |
Jun
(148) |
Jul
(98) |
Aug
(123) |
Sep
(20) |
Oct
(174) |
Nov
(155) |
Dec
(26) |
| 2006 |
Jan
(51) |
Feb
(19) |
Mar
(16) |
Apr
(12) |
May
(5) |
Jun
|
Jul
(11) |
Aug
(7) |
Sep
(10) |
Oct
(31) |
Nov
(174) |
Dec
(56) |
| 2007 |
Jan
(45) |
Feb
(52) |
Mar
(10) |
Apr
(5) |
May
(47) |
Jun
(16) |
Jul
(80) |
Aug
(29) |
Sep
(14) |
Oct
(59) |
Nov
(46) |
Dec
(16) |
| 2008 |
Jan
(10) |
Feb
(1) |
Mar
|
Apr
|
May
(49) |
Jun
(26) |
Jul
(8) |
Aug
(4) |
Sep
(25) |
Oct
(53) |
Nov
(9) |
Dec
(1) |
| 2009 |
Jan
(66) |
Feb
(11) |
Mar
(1) |
Apr
(14) |
May
(8) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(23) |
Nov
(35) |
Dec
|
| 2010 |
Jan
(7) |
Feb
(2) |
Mar
(39) |
Apr
(19) |
May
(161) |
Jun
(19) |
Jul
(32) |
Aug
(65) |
Sep
(113) |
Oct
(120) |
Nov
(2) |
Dec
|
| 2012 |
Jan
|
Feb
(5) |
Mar
(4) |
Apr
(7) |
May
(9) |
Jun
(14) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(12) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
(17) |
Mar
(4) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Duncan C. <dun...@us...> - 2005-01-13 23:09:31
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28223/mk Modified Files: chsDepend.in Log Message: Add an extra check to the chsDepend script (disabled). Dare anyone to enable it and watch the build break! We still have some issues with the NAME make var being set incorrectly. I have a plan to replace the cunning NAME hack with a different hack. Index: chsDepend.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/chsDepend.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- chsDepend.in 18 Dec 2004 20:46:29 -0000 1.9 +++ chsDepend.in 13 Jan 2005 23:09:20 -0000 1.10 @@ -37,6 +37,8 @@ DEPNAMES="$DEPNAMES $DEPNAME.chi"; break; fi; +# echo could not find $DEP '('$DEPNAME.chs')' on search path $SEARCHPATH; +# exit 1; done; IFS=$OLDIFS; done; |
|
From: Duncan C. <dun...@us...> - 2005-01-13 23:09:30
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28223 Modified Files: ChangeLog Log Message: Add an extra check to the chsDepend script (disabled). Dare anyone to enable it and watch the build break! We still have some issues with the NAME make var being set incorrectly. I have a plan to replace the cunning NAME hack with a different hack. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.288 retrieving revision 1.289 diff -u -d -r1.288 -r1.289 --- ChangeLog 13 Jan 2005 23:01:16 -0000 1.288 +++ ChangeLog 13 Jan 2005 23:09:20 -0000 1.289 @@ -8,6 +8,11 @@ gtk package only so far. Also move some defines from Makefile.am to configure.ac as requested by a FIXME comment. + * mk/chsDepend.in: add extra check to the chsDepend script (disabled). + Dare anyone to enable it and watch the build break! We still have some + issues with the NAME make var being set incorrectly. I have a plan to + replace the cunning NAME hack with a different hack. + 2005-01-12 Axel Simon <A....@ke...> * Makefile.am, gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp, |
|
From: Duncan C. <dun...@us...> - 2005-01-13 23:01:28
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26319 Modified Files: ChangeLog configure.ac Makefile.am Log Message: Do detection of haddock and add --enable-docs to configure. First hash at building haddock docs (gtk package only so far). Also move some defines from Makefile.am to configure.ac as requested by a FIXME comment. Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- configure.ac 8 Jan 2005 17:52:36 -0000 1.15 +++ configure.ac 13 Jan 2005 23:01:16 -0000 1.16 @@ -510,8 +510,33 @@ esac; fi +dnl The hsc2hs preprocessor +AC_PATH_PROG(HSC2HS,hsc2hs) +if test "$HSC2HS" = "no"; then + AC_MSG_ERROR([Could not find hsc2hs. This should be isntalled with GHC!]) +fi + +dnl The preprocessor to use on Haskell sources +HSCPP='$(CPP) -x c -traditional-cpp -P' + dnl Documentation -AC_PATH_PROG(HADDOCK,haddock) +AC_ARG_ENABLE(docs, + [ --enable-docs build html documentation], + [BUILDDOCS=$enableval],[BUILDDOCS=no]) +if test "$BUILDDOCS" = "yes"; then + AC_PATH_PROG(HADDOCK,haddock, no) + if test "$HADDOCK" = "no"; then + AC_MSG_ERROR([Could not find haddock which is required to build the documentation. + Install haddock or re-run configure without --enable-docs]) + fi + AC_MSG_CHECKING([version of haddock]) + HADDOCK_VERSION=`$HADDOCK --version | $CUT -d' ' -f3 | $CUT -d, -f1` + AC_MSG_RESULT([$HADDOCK_VERSION]) + GTKHS_PROG_CHECK_VERSION($HADDOCK_VERSION, -lt, 0.6, [ + AC_MSG_ERROR([I need haddock 0.6 or later to build the documentation. + Upgrade your version of haddock or re-run configure without --enable-docs])]) +fi +AM_CONDITIONAL(BUILDDOCS, test "$BUILDDOCS" = "yes") AC_ARG_WITH(ghc-docdir, [ --with-ghc-docdir=GHC_DOCDIR location of top of ghc haddockified html documentation], @@ -527,6 +552,8 @@ AC_SUBST(PKGCONF) AC_SUBST(HCFLAGS) AC_SUBST(C2HS) +AC_SUBST(HSC2HS) +AC_SUBST(HSCPP) AC_SUBST(MARSHALLDEFS) AC_SUBST(VERSION) dnl Platform specific flags @@ -585,11 +612,11 @@ echo "**************************************************" echo "* Configuration completed successfully. *" echo "* *" -if test -z "$HADDOCK"; then - echo "* Warning: The documentation will not be built: *" - echo "* - haddock was not found *" - echo "* *" -fi +dnl if test x$BUILDDOCS = xyes && test -z "$HADDOCK"; then +dnl echo "* Warning: The documentation will not be built: *" +dnl echo "* - haddock was not found *" +dnl echo "* *" +dnl fi dnl if test $BUILDDOCS = no; then dnl echo "* Warning: The documentation will not be built: *" dnl if test $FOUNDTRANSLATOR = no; then Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Makefile.am 12 Jan 2005 18:19:52 -0000 1.32 +++ Makefile.am 13 Jan 2005 23:01:16 -0000 1.33 @@ -19,13 +19,8 @@ tools/hierarchyGen/hierarchy.list \ tools/hierarchyGen/Hierarchy.chs.template -# fixme: this should be in configure.ac: -HSCPP = $(CPP) -x c -traditional-cpp -P - CHSDEPEND = $(srcdir)/mk/chsDepend -HSC = hsc2hs - # all packages and applications lib_LIBRARIES = \ libHSglib.a \ @@ -478,6 +473,27 @@ nobase_hi_SCRIPTS += $(libHSgtk_a_HSFILES:.hs=.hi) +if BUILDDOCS +htmldir = $(prefix)/html +html_DATA = $(foreach HSFILE, $(libHSgtk_a_HSFILES), \ + $(patsubst gtk.%.hs, doc/%.html, $(subst /,.,$(HSFILE)))) +EXCLUDE_DOCS = +PREPROC_DOCS = gtk/Graphics/UI/Gtk.hs + +$(html_DATA) : $(libHSgtk_a_HSFILES) $(PREPROC_DOCS:.hs=.hs.uncpp) + mkdir -p doc + $(HADDOCK) --html -o doc \ + --title="Gtk2Hs" --package=$(libHSgtk_a_NAME) \ + --dump-interface=doc/gtk.haddock \ + $(filter-out $(EXCLUDE_DOCS) $(PREPROC_DOCS), $^) + +.hs.hs.uncpp : $(CONFIG_H) + $(HSCPP) -I. $< -o $@ + +MOSTLYCLEANFILES += $(html_DATA) + +endif #BUILDDOCS + MOSTLYCLEANFILES += $(am_libHSgtk_a_OBJECTS) MOSTLYCLEANFILES += $(libHSgtk_a_HSFILES:.hs=.hi) MOSTLYCLEANFILES += \ Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.287 retrieving revision 1.288 diff -u -d -r1.287 -r1.288 --- ChangeLog 13 Jan 2005 22:16:34 -0000 1.287 +++ ChangeLog 13 Jan 2005 23:01:16 -0000 1.288 @@ -3,6 +3,11 @@ * gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp: fix whitespace problem that caused compile failure. + * configure.ac, Makefile.am, mk/common.mk: Do detection of haddock and + add --enable-docs to configure. First hash at building haddock docs - + gtk package only so far. Also move some defines from Makefile.am to + configure.ac as requested by a FIXME comment. + 2005-01-12 Axel Simon <A....@ke...> * Makefile.am, gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp, |
|
From: Duncan C. <dun...@us...> - 2005-01-13 23:01:27
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26319/mk Modified Files: common.mk Log Message: Do detection of haddock and add --enable-docs to configure. First hash at building haddock docs (gtk package only so far). Also move some defines from Makefile.am to configure.ac as requested by a FIXME comment. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- common.mk 8 Jan 2005 17:38:03 -0000 1.48 +++ common.mk 13 Jan 2005 23:01:17 -0000 1.49 @@ -82,7 +82,7 @@ $< -o $@) .hsc.hs: $(CONFIG_H) - $(strip $(HSC) $(HSCFLAGS) +RTS $(HSTOOLFLAGS) -RTS \ + $(strip $(HSC2HS) $(HSCFLAGS) +RTS $(HSTOOLFLAGS) -RTS \ $(addprefix -L-optl,\ $(AM_LDFLAGS) $($(NAME)_EXTRA_LIBS) $($(NAME)_LIBS)) \ $(addprefix -C, $(filter-out -I%,$(AM_CPPFLAGS)) \ |
|
From: Duncan C. <dun...@us...> - 2005-01-13 22:16:56
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16900/gtk/Graphics/UI/Gtk/Pango Modified Files: Enums.chs.pp Log Message: Fix whitespace problem that caused compile failure. Index: Enums.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Enums.chs.pp 12 Jan 2005 18:19:53 -0000 1.1 +++ Enums.chs.pp 13 Jan 2005 22:16:39 -0000 1.2 @@ -93,6 +93,6 @@ showsPrec _ UnderlineDouble = shows "double" showsPrec _ UnderlineLow = shows "low" #if GTK_CHECK_VERSION(2,4,0) - showsPrec _ UnderlineError = shows "error" + showsPrec _ UnderlineError = shows "error" #endif |
|
From: Duncan C. <dun...@us...> - 2005-01-13 22:16:54
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16900 Modified Files: ChangeLog Log Message: Fix whitespace problem that caused compile failure. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.286 retrieving revision 1.287 diff -u -d -r1.286 -r1.287 --- ChangeLog 12 Jan 2005 18:22:09 -0000 1.286 +++ ChangeLog 13 Jan 2005 22:16:34 -0000 1.287 @@ -1,3 +1,8 @@ +2005-01-13 Duncan Coutts <du...@co...> + + * gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp: fix whitespace problem that + caused compile failure. + 2005-01-12 Axel Simon <A....@ke...> * Makefile.am, gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp, |
|
From: Axel S. <as...@us...> - 2005-01-12 18:22:22
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25728 Modified Files: ChangeLog Log Message: Forgot to mention the mending of hierarchy.list for Gtk 2.2. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.285 retrieving revision 1.286 diff -u -d -r1.285 -r1.286 --- ChangeLog 12 Jan 2005 18:19:38 -0000 1.285 +++ ChangeLog 12 Jan 2005 18:22:09 -0000 1.286 @@ -6,6 +6,9 @@ is now necessary to accommodate the lack of some enum names in Gtk 2.2. + * tools/hierarchyGen/hierarchy.list: Only create the FileChooser + interface object when building for Gtk 2.4 or higher. + 2005-01-12 Duncan Coutts <du...@co...> * demo/hello/World.hs: update to work with the new module names. |
|
From: Axel S. <as...@us...> - 2005-01-12 18:20:07
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25220 Modified Files: ChangeLog Makefile.am Log Message: Make compile with Gtk 2.2. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Makefile.am 12 Jan 2005 00:00:46 -0000 1.31 +++ Makefile.am 12 Jan 2005 18:19:52 -0000 1.32 @@ -408,9 +408,9 @@ gtk/Graphics/UI/Gtk/Gdk/Keys.chs \ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs \ gtk/Graphics/UI/Gtk/Pango/Description.chs \ - gtk/Graphics/UI/Gtk/Pango/Enums.chs \ + gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp \ gtk/Graphics/UI/Gtk/Pango/Layout.chs \ - gtk/Graphics/UI/Gtk/Pango/Rendering.chs \ + gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp \ gtk/Graphics/UI/Gtk/Embedding/Plug.chs \ gtk/Graphics/UI/Gtk/Embedding/Socket.chs \ gtk/Graphics/UI/Gtk/General/StockItems.hsc \ Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.284 retrieving revision 1.285 diff -u -d -r1.284 -r1.285 --- ChangeLog 12 Jan 2005 02:44:27 -0000 1.284 +++ ChangeLog 12 Jan 2005 18:19:38 -0000 1.285 @@ -1,3 +1,11 @@ +2005-01-12 Axel Simon <A....@ke...> + + * Makefile.am, gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp, + gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp: Renames both files from + .chs to .chs.pp and changed the Makefile accordingly. Preprocessing + is now necessary to accommodate the lack of some enum names in + Gtk 2.2. + 2005-01-12 Duncan Coutts <du...@co...> * demo/hello/World.hs: update to work with the new module names. |
|
From: Axel S. <as...@us...> - 2005-01-12 18:20:06
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25220/tools/hierarchyGen Modified Files: hierarchy.list Log Message: Make compile with Gtk 2.2. Index: hierarchy.list =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/hierarchy.list,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- hierarchy.list 17 Dec 2004 21:21:45 -0000 1.13 +++ hierarchy.list 12 Jan 2005 18:19:53 -0000 1.14 @@ -182,7 +182,7 @@ # These ones are actualy interfaces, but interface implementations are GObjects GtkEditable GtkSourceStyleScheme if sourceview - GtkFileChooser + GtkFileChooser if gtk-2.4 ## This now became a GObject in version 2: GdkGC as GC, gdk_gc_get_type ## These are Pango structures |
|
From: Axel S. <as...@us...> - 2005-01-12 18:20:06
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25220/gtk/Graphics/UI/Gtk/Pango Added Files: Enums.chs.pp Rendering.chs.pp Removed Files: Enums.chs Rendering.chs Log Message: Make compile with Gtk 2.2. --- NEW FILE: Rendering.chs.pp --- -- -*-haskell-*- -- GIMP Toolkit (GTK) - text layout functions Rendering -- -- Author : Axel Simon -- -- Created: 8 Feburary 2003 -- -- Version $Revision: 1.1 $ from $Date: 2005/01/12 18:19:53 $ -- -- Copyright (c) 1999..2003 Axel Simon -- -- This file is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This file is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- | -- -- Functions to run the rendering pipeline. -- -- * The Pango rendering pipeline takes a string of Unicode characters -- and converts it into glyphs. The functions described in this module -- accomplish various steps of this process. -- module Graphics.UI.Gtk.Pango.Rendering ( PangoContext, contextListFamilies, -- contextLoadFont, -- contextLoadFontSet, contextGetMetrics, FontMetrics(..), contextSetFontDescription, contextGetFontDescription, contextSetLanguage, contextGetLanguage, contextSetTextDir, contextGetTextDir, TextDirection(..) ) where import Monad (liftM) import Data.Ratio import System.Glib.FFI import Graphics.UI.Gtk.General.Structs (pangoScale) {#import Graphics.UI.Gtk.Types#} import System.Glib.GObject (makeNewGObject) import Graphics.UI.Gtk.General.Enums {#import Graphics.UI.Gtk.Pango.Types#} {# context lib="pango" prefix="pango" #} -- | Retrieve a list of all available font families. -- -- * A font family is the name of the font without further attributes -- like slant, variant or size. -- contextListFamilies :: PangoContext -> IO [FontFamily] contextListFamilies c = alloca $ \sizePtr -> alloca $ \ptrPtr -> do {#call unsafe context_list_families#} c ptrPtr sizePtr ptr <- peek ptrPtr size <- peek sizePtr -- c2hs get FontFamily*** wrong as FontFamily**, therefore the cast familyPtrs <- peekArray (fromIntegral size) (castPtr ptr) fams <- mapM (makeNewGObject mkFontFamily . return) familyPtrs {#call unsafe g_free#} (castPtr ptr) return fams -- | Load a font. -- --contextLoadFont :: PangoContext -> FontDescription -> Language -> -- IO (Maybe Font) --contextLoadFont pc fd l = do -- fsPtr <- {#call context_load_font#} pc fd l -- if fsPtr==nullPtr then return Nothing else -- liftM Just $ makeNewGObject mkFont (return fsPtr) -- | Load a font set. -- --contextLoadFontSet :: PangoContext -> FontDescription -> Language -> -- IO (Maybe FontSet) --contextLoadFontSet pc fd l = do -- fsPtr <- {#call context_load_fontset#} pc fd l -- if fsPtr==nullPtr then return Nothing else -- liftM Just $ makeNewGObject mkFontSet (return fsPtr) -- | Query the metrics of the given font implied by the font description. -- contextGetMetrics :: PangoContext -> FontDescription -> Language -> IO FontMetrics contextGetMetrics pc fd l = do mPtr <- {#call unsafe context_get_metrics#} pc fd l ascend <- liftM fromIntegral $ {#call unsafe font_metrics_get_ascent#} mPtr descend <- liftM fromIntegral $ {#call unsafe font_metrics_get_descent#} mPtr cWidth <- liftM fromIntegral $ {#call unsafe font_metrics_get_approximate_char_width#} mPtr dWidth <- liftM fromIntegral $ {#call unsafe font_metrics_get_approximate_digit_width#} mPtr {#call unsafe font_metrics_unref#} mPtr return (FontMetrics (ascend % pangoScale) (descend % pangoScale) (cWidth % pangoScale) (dWidth % pangoScale)) -- | The characteristic measurements of a font. -- -- * All values are measured in pixels. -- data FontMetrics = FontMetrics { -- | The ascent is the distance from the baseline to the logical top -- of a line of text. (The logical top may be above or below the -- top of the actual drawn ink. It is necessary to lay out the -- text to figure where the ink will be.) ascent :: Rational, -- | The descent is the distance from the baseline to the logical -- bottom of a line of text. (The logical bottom may be above or -- below the bottom of the actual drawn ink. It is necessary to -- lay out the text to figure where the ink will be.) descent :: Rational, -- | The approximate character width. This is merely a -- representative value useful, for example, for determining the -- initial size for a window. Actual characters in text will be -- wider and narrower than this. approximateCharWidth :: Rational, -- | The approximate digit widt. This is merely a representative -- value useful, for example, for determining the initial size for -- a window. Actual digits in text can be wider and narrower than -- this, though this value is generally somewhat more accurate -- than @approximateCharWidth@. approximateDigitWidth :: Rational } -- | Set the default 'FontDescription' of this context. -- contextSetFontDescription :: PangoContext -> FontDescription -> IO () contextSetFontDescription pc fd = {#call unsafe context_set_font_description#} pc fd -- | Get the current 'FontDescription' of this context. -- contextGetFontDescription :: PangoContext -> IO FontDescription contextGetFontDescription pc = do fdPtrConst <- {#call unsafe context_get_font_description#} pc fdPtr <- pango_font_description_copy fdPtrConst makeNewFontDescription fdPtr foreign import ccall unsafe "pango_font_description_copy" pango_font_description_copy :: Ptr FontDescription -> IO (Ptr FontDescription) -- | Set the default 'Language' of this context. -- contextSetLanguage :: PangoContext -> Language -> IO () contextSetLanguage = {#call unsafe context_set_language#} -- | Get the current 'Language' of this context. -- contextGetLanguage :: PangoContext -> IO Language contextGetLanguage pc = liftM Language $ {#call unsafe context_get_language#} pc -- only used internally {#enum PangoDirection {underscoreToCase} #} -- | Set the default text direction of this context. -- contextSetTextDir :: PangoContext -> TextDirection -> IO () contextSetTextDir pc dir = {#call unsafe context_set_base_dir#} pc (convert dir) where #if GTK_CHECK_VERSION(2,4,0) convert TextDirNone = fromIntegral (fromEnum DirectionNeutral) #else convert TextDirNone = fromIntegral (fromEnum DirectionLtr) #endif convert TextDirLtr = fromIntegral (fromEnum DirectionLtr) convert TextDirRtl = fromIntegral (fromEnum DirectionRtl) -- | Get the current text direction of this context. -- contextGetTextDir :: PangoContext -> IO TextDirection contextGetTextDir pc = liftM (convert . toEnum . fromIntegral) $ {#call unsafe context_get_base_dir#} pc where convert DirectionLtr = TextDirLtr convert DirectionRtl = TextDirRtl convert _ = TextDirNone --- Enums.chs DELETED --- --- NEW FILE: Enums.chs.pp --- -- -*-haskell-*- -- GIMP Toolkit (GTK) Enumerations for Pango. -- -- Author : Axel Simon -- -- Created: 12 September 2004 -- -- Version $Revision: 1.1 $ from $Date: 2005/01/12 18:19:53 $ -- -- Copyright (c) 1999..2004 Axel Simon -- -- This file is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This file is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- | -- -- Enumerations for describing font characteristics. -- module Graphics.UI.Gtk.Pango.Enums ( FontStyle(..), Weight(..), Variant(..), Stretch(..), Underline(..) ) where {# context lib="pango" prefix="pango" #} -- | The style of a font. -- -- * 'StyleOblique' is a slanted font like 'StyleItalic', -- but in a roman style. -- {#enum Style as FontStyle {underscoreToCase}#} instance Show FontStyle where showsPrec _ StyleNormal = shows "normal" showsPrec _ StyleOblique = shows "oblique" showsPrec _ StyleItalic = shows "italic" -- | Define attributes for 'FontWeight'. -- {#enum Weight {underscoreToCase}#} instance Show Weight where showsPrec _ WeightUltralight = shows "ultralight" showsPrec _ WeightLight = shows "light" showsPrec _ WeightNormal = shows "normal" showsPrec _ WeightBold = shows "bold" showsPrec _ WeightUltrabold = shows "ultrabold" showsPrec _ WeightHeavy = shows "heavy" -- | The variant of a font. -- -- * The 'VariantCmallCaps' is a version of a font where lower case -- letters are shown as physically smaller upper case letters. -- {#enum Variant {underscoreToCase}#} instance Show Variant where showsPrec _ VariantNormal = shows "normal" showsPrec _ VariantSmallCaps = shows "smallcaps" -- | Define how wide characters are. -- {#enum Stretch {underscoreToCase}#} instance Show Stretch where showsPrec _ StretchUltraCondensed = shows "ultracondensed" showsPrec _ StretchExtraCondensed = shows "extracondensed" showsPrec _ StretchCondensed = shows "condensed" showsPrec _ StretchSemiCondensed = shows "semicondensed" showsPrec _ StretchNormal = shows "normal" showsPrec _ StretchSemiExpanded = shows "semiexpanded" showsPrec _ StretchExpanded = shows "expanded" showsPrec _ StretchExtraExpanded = shows "extraexpanded" showsPrec _ StretchUltraExpanded = shows "ultraexpanded" -- | Define attributes for 'FontUnderline'. -- {#enum Underline {underscoreToCase}#} instance Show Underline where showsPrec _ UnderlineNone = shows "none" showsPrec _ UnderlineSingle = shows "single" showsPrec _ UnderlineDouble = shows "double" showsPrec _ UnderlineLow = shows "low" #if GTK_CHECK_VERSION(2,4,0) showsPrec _ UnderlineError = shows "error" #endif --- Rendering.chs DELETED --- |
|
From: Duncan C. <dun...@us...> - 2005-01-12 02:44:41
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/apiGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6344/tools/apiGen Modified Files: ApiGen.hs format-docs.xsl gen-all.sh Template.chs Log Message: Add support for documentation of function arguments. It's mostly and improvement I think though it does add a lot of extra stuff to the final documentation. On the other hand the gtk documentation for functions often refer to argument names so the generated haddoc docs make more sense now. Index: Template.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/Template.chs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Template.chs 10 Jan 2005 17:23:05 -0000 1.3 +++ Template.chs 12 Jan 2005 02:44:28 -0000 1.4 @@ -29,7 +29,7 @@ @EXPORTS@ ) where -import Monad (liftM) +import Monad (liftM) import System.Glib.FFI @IMPORTS@ Index: format-docs.xsl =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/format-docs.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- format-docs.xsl 10 Jan 2005 17:23:04 -0000 1.4 +++ format-docs.xsl 12 Jan 2005 02:44:28 -0000 1.5 @@ -98,6 +98,14 @@ <doc> <xsl:apply-templates select="para[not(starts-with(text(),'Since')) and normalize-space(text())!='']"/> </doc> + <params> + <xsl:for-each select="variablelist/varlistentry"> + <param> + <name><xsl:value-of select="term/parameter | term/emphasis"/></name> + <xsl:apply-templates select="listitem/simpara"/> + </param> + </xsl:for-each> + </params> </function> </xsl:for-each> </apidoc> Index: gen-all.sh =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/gen-all.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gen-all.sh 10 Jan 2005 17:23:05 -0000 1.3 +++ gen-all.sh 12 Jan 2005 02:44:28 -0000 1.4 @@ -28,10 +28,12 @@ xsltproc format-docs.xsl $DOCBOOKFILE > $DOCFILE || exit echo ./ApiGen $APIFILE Template.chs --doc=$DOCFILE --outdir=modules - ./ApiGen $APIFILE Template.chs --doc=$DOCFILE --outdir=modules || exit + ./ApiGen $APIFILE Template.chs --doc=$DOCFILE \ + --outdir=modules --modprefix=Graphics.UI.Gtk.[category] || exit else echo ./ApiGen $APIFILE Template.chs --outdir=modules - ./ApiGen $APIFILE Template.chs --outdir=modules || exit + ./ApiGen $APIFILE Template.chs --outdir=modules \ + --modprefix=Graphics.UI.Gtk.[category]|| exit echo $HEADDER: could not find $DOCBOOKFRAG >> modules/missing_docs fi done Index: ApiGen.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/ApiGen.hs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ApiGen.hs 10 Jan 2005 17:23:05 -0000 1.4 +++ ApiGen.hs 12 Jan 2005 02:44:28 -0000 1.5 @@ -1,12 +1,17 @@ -- ApiGen: takes an xml description of a GObject-style API and produces a .chs --- binding module. +-- binding module. Optionally it can be supplied with an xml documentation file +-- in which case the .chs file will contain haddock-format documentation too. ---module Main (main) where +-- If you want to teach ApiGen how to marshal new types, the function you want +-- to modify is either genMarshalParameter or genMarshalResult near the end of +-- this file. + +module Main (main) where import Prelude hiding (Enum, lines) import Monad (when) import Maybe (catMaybes, fromJust) -import Char (toLower, toUpper, isAlpha, isAlphaNum, isUpper) +import Char (toLower, toUpper, isSpace, isAlpha, isAlphaNum, isUpper) import List (isPrefixOf, groupBy, sortBy) import qualified List (lines) import System (getArgs, exitWith, ExitCode(..)) @@ -157,10 +162,10 @@ } extractConstructor _ = Nothing + ------------------------------------------------------------------------------- --- extract functions to convert the doc xml file to the internal representation +-- Types representing the content of the documentation XML file ------------------------------------------------------------------------------- - data ApiDoc = ApiDoc { apidoc_name :: String, -- these docs apply to this object apidoc_summary :: String, -- a one line summary @@ -185,8 +190,14 @@ data FuncDoc = FuncDoc { funcdoc_name :: String, -- C function name funcdoc_paragraphs :: [DocPara], -- documentation markup + funcdoc_params :: [ParamDoc], -- parameter documentation funcdoc_since :: Maybe String -- which version of the api the - } -- function is avaliable from, eg "2.4" + } -- function is available from, eg "2.4" + +data ParamDoc = ParamDoc { + paramdoc_name :: String, -- parameter name or "Returns" + paramdoc_paragraph :: [DocParaSpan] -- a simple paragraph + } data DocPara = DocParaText [DocParaSpan] -- an ordinary word-wrapped paragraph @@ -203,6 +214,10 @@ | DocLiteral String -- some literal like numbers | DocArg String -- function argument names + +------------------------------------------------------------------------------- +-- extract functions to convert the doc xml file to the internal representation +------------------------------------------------------------------------------- extractDocumentation :: Xml.Document -> ApiDoc extractDocumentation (Xml.Document _ _ (Xml.Elem "apidoc" [] (moduleinfo:functions))) = (extractDocModuleinfo moduleinfo) { @@ -245,7 +260,8 @@ (Xml.CElem (Xml.Elem "function" [] [Xml.CElem (Xml.Elem "name" [] [Xml.CString _ name]) ,Xml.CElem (Xml.Elem "since" [] since') - ,Xml.CElem (Xml.Elem "doc" [] paras)] + ,Xml.CElem (Xml.Elem "doc" [] paras) + ,Xml.CElem (Xml.Elem "params" [] params)] )) = let since = case since' of [] -> Nothing @@ -253,9 +269,20 @@ in FuncDoc { funcdoc_name = name, funcdoc_paragraphs = concatMap extractDocPara paras, + funcdoc_params = map extractParamDoc params, funcdoc_since = since } - + +extractParamDoc :: Xml.Content -> ParamDoc +extractParamDoc + (Xml.CElem (Xml.Elem "param" [] + (Xml.CElem (Xml.Elem "name" [] [Xml.CString _ name]) + :spans))) = + ParamDoc { + paramdoc_name = name, + paramdoc_paragraph = map extractDocParaSpan spans + } + extractDocPara :: Xml.Content -> [DocPara] extractDocPara (Xml.CElem elem@(Xml.Elem "para" [] _)) = case Xml.xmlUnEscape Xml.stdXmlEscaper elem of @@ -268,10 +295,6 @@ ,(Xml.CElem (Xml.Elem "programlisting" _ content))])) = let listing = concat [ str | (Xml.CString _ str) <- content ] in [DocParaExample title listing] -{-extractDocPara (Xml.CElem (Xml.Elem "example" _ - [Xml.CElem (Xml.Elem "title" [] [Xml.CString _ title]) - ,(Xml.CElem (Xml.Elem "programlisting" _ other))])) = error $ "extractDocPara: example1:\n" ++ Prelude.unlines (map ((++ "\n\n\nFOOBAR\n\n\n") . Xml.verbatim) other) ++ "\n len = " ++ show (length other) -extractDocPara (Xml.CElem (Xml.Elem "example" _ other)) = error $ "extractDocPara: example2:\n" ++ Xml.verbatim other ++ "\n len = " ++ show (length other)-} extractDocPara other = error $ "extractDocPara: " ++ Xml.verbatim other extractDocPara' :: [Xml.Content] -> [DocPara] @@ -338,7 +361,7 @@ [ if funcdoc_since funcdoc > baseVersion then funcdoc { funcdoc_paragraphs = funcdoc_paragraphs funcdoc ++ - let line = "Available since " ++ namespace_name namespace + let line = "* Available since " ++ namespace_name namespace ++ " version " ++ fromJust (funcdoc_since funcdoc) in [DocParaText [DocText line]] } @@ -349,7 +372,7 @@ case moduleVersion of Nothing -> [] Just since -> - let line = "Module available since " ++ namespace_name namespace + let line = "* Module available since " ++ namespace_name namespace ++ " version " ++ since in [DocParaText [DocText line]] @@ -365,7 +388,7 @@ haddocFormatSections = sepBy' "\n\n-- " . map (\section -> - ss "* ". ss (section_title section). nl. + ss "** ". ss (section_title section). nl. comment.nl. comment.ss "| ".haddocFormatParas (section_paras section)) @@ -389,7 +412,7 @@ . List.lines $ prog haddocFormatPara (DocParaDefItem term spans) = - sc '['. ss term. sc ']'. + sc '['. ss term. ss "] ". haddocFormatSpans spans haddocFormatPara (DocParaListItem spans) = ss "* ". @@ -413,9 +436,9 @@ haddocFormatSpan (DocLiteral "FALSE") = "@False@" --likely that something should be changed to a Maybe type if this is emitted: haddocFormatSpan (DocLiteral "NULL") = "{@NULL@, FIXME: this should probably be converted" - ++ "to a Maybe data type}" + ++ " to a Maybe data type}" haddocFormatSpan (DocLiteral text) = "@" ++ text ++ "@" -haddocFormatSpan (DocArg text) = "@" ++ text ++ "@" +haddocFormatSpan (DocArg text) = "@" ++ cParamNameToHsName text ++ "@" cFuncNameToHsName :: String -> String cFuncNameToHsName = @@ -425,6 +448,24 @@ . splitBy '_' . takeWhile ('('/=) +stripKnownPrefixes :: String -> String +stripKnownPrefixes ('G':'t':'k':remainder) = remainder +stripKnownPrefixes ('G':'d':'k':remainder) = remainder +stripKnownPrefixes ('P':'a':'n':'g':'o':remainder) = remainder +stripKnownPrefixes other = other + +cParamNameToHsName :: String -> String +cParamNameToHsName = --change "gtk_foo_bar" to "gtkFooBar" + lowerCaseFirstChar + . concatMap upperCaseFirstChar + . filter (not.null) --to ignore tailing underscores + . splitBy '_' + +changeIllegalNames :: String -> String +changeIllegalNames "type" = "type_" --this is a common variable name in C but of + --course a keyword in Haskell +changeIllegalNames other = other + escapeHaddockSpecialChars = escape where escape [] = [] escape (''':'s':cs) = ''' : 's' : escape cs --often don't need to escape @@ -454,28 +495,70 @@ ss functionName. sc ' '. sepBy " " paramNames. ss " =". indent 1. body - where functionName = lowerCaseFirstChar (method_name method) + where functionName = cFuncNameToHsName (method_cname method) (classConstraints', paramTypes', paramMarshalers) = - unzip3 [ genMarshalParameter (changeParamNames (parameter_name p)) - (parameter_type p) + unzip3 [ case genMarshalParameter + (changeIllegalNames (cParamNameToHsName (parameter_name p))) + (parameter_type p) of + (c, ty, m) -> (c, (ty, parameter_name p), m) | p <- method_parameters method ] classConstraints = [ c | Just c <- classConstraints' ] - paramTypes = [ c | Just c <- paramTypes' ] - paramNames = [ changeParamNames (parameter_name p) - | (Just _, p) <- zip paramTypes' (method_parameters method) ] - (returnType, returnMarshaler) = + paramTypes = [ (paramType, lookup name paramDocMap) + | (Just paramType, name) <- paramTypes' ] + paramNames = [ changeIllegalNames (cParamNameToHsName (parameter_name p)) + | ((Just _, _), p) <- zip paramTypes' (method_parameters method) ] + (returnType', returnMarshaler) = genMarshalResult (method_return_type method) + returnType = (returnType', lookup "Returns" paramDocMap) functionType = (case classConstraints of [] -> id [c] -> ss c. ss " => " cs -> sc '('. sepBy ", " classConstraints. ss ") => "). - sepBy " -> " (paramTypes ++ [returnType]) - body = foldl (\body marshaler -> marshaler body) call (paramMarshalers++[returnMarshaler]) + formatParamTypes (paramTypes ++ [returnType]) + body = foldl (\body marshaler -> marshaler body) + call (paramMarshalers++[returnMarshaler]) call = ss "{# call ". ss (method_cname method). ss " #}" formattedDoc = case doc of - Nothing -> ss "-- | \n-- \n" + Nothing -> ss "-- | \n-- \n" Just doc -> ss "-- | ". haddocFormatParas (funcdoc_paragraphs doc). nl. comment. nl + paramDocMap = case doc of + Nothing -> [] + Just doc -> [ (paramdoc_name paramdoc + ,(if paramdoc_name paramdoc == "Returns" + then [DocText "returns "] + else [DocArg (paramdoc_name paramdoc) + ,DocText " - "] + ) ++ paramdoc_paragraph paramdoc) + | paramdoc <- funcdoc_params doc ] + + formatParamTypes :: [(String, Maybe [DocParaSpan])] -> ShowS + formatParamTypes paramTypes = format True False paramTypes + -- True to indicate first elem + -- False to mean previous param had no doc + where format _ _ [] = id + format True _ ((t,Nothing) :ts) = ss t. + format False False ts + format True _ ((t,Just doc) :ts) = ss "\n ". ss t. + ss (replicate (columnIndent - length t) ' '). + ss " -- ^ ". formatDoc t doc. + format False True ts + format _ True ((t, Nothing) :ts) = ss "\n -> ". ss t. + format False False ts + format _ False ((t, Nothing) :ts) = ss " -> ". ss t. + format False False ts + format _ _ ((t, Just doc) :ts) = ss "\n -> ". ss t. + ss (replicate (columnIndent - length t) ' '). + ss " -- ^ ". formatDoc t doc. + format False True ts + formatDoc :: String -> [DocParaSpan] -> ShowS + formatDoc typeName = + sepBy' ("\n" ++ replicate (columnIndent+5) ' ' ++ "-- ") + . map (sepBy " ") + . wrapText (80 - columnIndent - 8) + . words + . concatMap haddocFormatSpan + columnIndent = maximum [ length parmType | (parmType, _) <- paramTypes ] genModuleBody :: Object -> ApiDoc -> ShowS genModuleBody object apiDoc = @@ -504,7 +587,7 @@ mungeMethod object method = let self = Parameter { parameter_type = object_cname object ++ "*", - parameter_name = "obj", + parameter_name = "self", parameter_isArray = False } in method { @@ -527,12 +610,7 @@ mungeConstructor :: Object -> Constructor -> Method mungeConstructor object constructor = Method { - method_name = (object_name object++) - . drop (length (object_cname object)) - . concatMap upperCaseFirstChar - . splitBy '_' - . constructor_cname - $ constructor, + method_name = cFuncNameToHsName (constructor_cname constructor), method_cname = constructor_cname constructor, method_return_type = object_cname object ++ "*", method_parameters = constructor_parameters constructor @@ -543,13 +621,13 @@ nl. comment.ss "* Constructors".nl. doVersionIfDefs lines - [ (ss " ". ss (lowerCaseFirstChar (method_name constructor)). sc ',', doc) + [ (ss " ". ss (cFuncNameToHsName (method_cname constructor)). sc ',', doc) | (constructor, doc) <- constructors object docs]. nl. nl. comment.ss "* Methods".nl. doVersionIfDefs lines - [ (ss " ". ss (lowerCaseFirstChar (method_name method)). sc ',', doc) + [ (ss " ". ss (cFuncNameToHsName (method_cname method)). sc ',', doc) | (method, doc) <- methods object docs] genTodoItems :: Object -> ShowS @@ -576,7 +654,7 @@ . groupBy (\(_,a) (_,b) -> fmap funcdoc_since a == fmap funcdoc_since b) sinceVersion :: Maybe FuncDoc -> ShowS -> ShowS -sinceVersion (Just (FuncDoc _ _ (Just (major:'.':minor:[])))) body = +sinceVersion (Just (FuncDoc _ _ _ (Just (major:'.':minor:[])))) body = ss "#if GTK_CHECK_VERSION(". sc major. ss ",". sc minor. ss ",0)\n". body. ss "\n#endif" @@ -608,7 +686,8 @@ || typeName == "gsize" --should they be Word or Int? || typeName == "gssize" = (Nothing, Just "Int", - \body -> body. ss " (fromIntegral ". ss name. ss ")") + \body -> body. + indent 2. ss " (fromIntegral ". ss name. ss ")") genMarshalParameter name typeName | typeName == "const-gchar*" || typeName == "const-char*" = @@ -641,6 +720,8 @@ genMarshalResult "void" = ("IO ()", id) genMarshalResult "const-gchar*" = ("IO String", \body -> body. indent 1. ss ">>= peekUTFString") +genMarshalResult "gchar*" = ("IO String", \body -> body. + indent 1. ss ">>= readUTFString") genMarshalResult "const-GSList*" = ("[{- element type -}]", \body -> body. @@ -668,22 +749,6 @@ genMarshalResult unknownType = ("{-" ++ unknownType ++ "-}", id) -stripKnownPrefixes :: String -> String -stripKnownPrefixes ('G':'t':'k':remainder) = remainder -stripKnownPrefixes ('G':'d':'k':remainder) = remainder -stripKnownPrefixes ('P':'a':'n':'g':'o':remainder) = remainder -stripKnownPrefixes other = other - -changeParamNames :: String -> String -changeParamNames "type" = "type_" --this is a common variable name in C but of - --course a keyword in Haskell -changeParamNames other = --change "gtk_foo_bar" to "gtkFooBar" - lowerCaseFirstChar - . concatMap upperCaseFirstChar - . filter (not.null) --to ignore tailing underscores - . splitBy '_' - $ other - ------------------------------------------------------------------------------- -- Top level stuff ------------------------------------------------------------------------------- @@ -837,4 +902,3 @@ doSubst ('@':cs) = let (var,_:cs') = span ('@'/=) cs in varSubst var . doSubst cs' doSubst (c:cs) = sc c . doSubst cs - |
|
From: Duncan C. <dun...@us...> - 2005-01-12 02:44:39
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6344 Modified Files: ChangeLog Log Message: Add support for documentation of function arguments. It's mostly and improvement I think though it does add a lot of extra stuff to the final documentation. On the other hand the gtk documentation for functions often refer to argument names so the generated haddoc docs make more sense now. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.283 retrieving revision 1.284 diff -u -d -r1.283 -r1.284 --- ChangeLog 12 Jan 2005 02:24:03 -0000 1.283 +++ ChangeLog 12 Jan 2005 02:44:27 -0000 1.284 @@ -6,6 +6,14 @@ the old build system. This makefile will not build in-place it requires everything to be installed. + * tools/apiGen/ApiGen.hs, tools/apiGen/format-docs.xsl, + tools/apiGen/gen-all.sh, tools/apiGen/Template.chs: add support for + documentation of function arguments. It's mostly and improvement I + think though it does add a lot of extra stuff to the final + documentation. On the other hand the gtk documentation for functions + often refer to argument names so the generated haddoc docs make more + sense now. + 2005-01-11 Duncan Coutts <du...@co...> * glib/glib.pkg.in, gtk/gtk.pkg.in, mogul/mogul.pkg.in, |
|
From: Duncan C. <dun...@us...> - 2005-01-12 02:24:16
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2551 Modified Files: ChangeLog Log Message: Update the hello world demo to work with the new module names. Add a simple makefile. The old makefile relied on the old build system. This makefile will not build 'in-place' it requires everything to be installed. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.282 retrieving revision 1.283 diff -u -d -r1.282 -r1.283 --- ChangeLog 12 Jan 2005 01:34:54 -0000 1.282 +++ ChangeLog 12 Jan 2005 02:24:03 -0000 1.283 @@ -1,3 +1,11 @@ +2005-01-12 Duncan Coutts <du...@co...> + + * demo/hello/World.hs: update to work with the new module names. + + * demo/hello/Makefile: a simple makefile. The old makefile relied on + the old build system. This makefile will not build in-place it + requires everything to be installed. + 2005-01-11 Duncan Coutts <du...@co...> * glib/glib.pkg.in, gtk/gtk.pkg.in, mogul/mogul.pkg.in, |
|
From: Duncan C. <dun...@us...> - 2005-01-12 02:24:15
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/hello In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2551/demo/hello Modified Files: World.hs Makefile Log Message: Update the hello world demo to work with the new module names. Add a simple makefile. The old makefile relied on the old build system. This makefile will not build 'in-place' it requires everything to be installed. Index: World.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/demo/hello/World.hs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- World.hs 3 Dec 2002 13:20:06 -0000 1.2 +++ World.hs 12 Jan 2005 02:24:05 -0000 1.3 @@ -1,6 +1,6 @@ module Main (Main.main) where -import Gtk +import Graphics.UI.Gtk -- If you return False in the "delete_event" signal handler, GTK will -- emit the "destroy" signal. Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/demo/hello/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 2 May 2004 13:13:26 -0000 1.2 +++ Makefile 12 Jan 2005 02:24:05 -0000 1.3 @@ -1,11 +1,6 @@ -TOP = ../.. - -include $(TOP)/mk/config.mk - -MAIN = World.hs - -APPNAME = helloWorld -NEEDPACKAGES = gtk2 +helloworld : World.hs + ghc --make $< -o $@ -include $(TOP)/mk/common.mk +clean: + rm -f World.hi World.o helloworld |
|
From: Duncan C. <dun...@us...> - 2005-01-12 01:35:06
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26538/gtk/Graphics/UI Modified Files: Gtk.hs Log Message: Tiny haddock markup fixes. Index: Gtk.hs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk.hs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Gtk.hs 8 Jan 2005 15:05:14 -0000 1.1 +++ Gtk.hs 12 Jan 2005 01:34:56 -0000 1.2 @@ -112,7 +112,7 @@ module Graphics.UI.Gtk.MenuComboToolbar.TearoffMenuItem, module Graphics.UI.Gtk.MenuComboToolbar.Toolbar, module Graphics.UI.Gtk.MenuComboToolbar.ToolItem, - -- * Selectors (file/font/color) + -- * Selectors (file\/font\/color) module Graphics.UI.Gtk.Selectors.ColorSelection, module Graphics.UI.Gtk.Selectors.ColorSelectionDialog, -- module FileSelection, |
|
From: Duncan C. <dun...@us...> - 2005-01-12 01:35:06
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26538/gtk/Graphics/UI/Gtk/Pango Modified Files: Description.chs Log Message: Tiny haddock markup fixes. Index: Description.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Pango/Description.chs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Description.chs 8 Jan 2005 15:31:04 -0000 1.1 +++ Description.chs 12 Jan 2005 01:34:55 -0000 1.2 @@ -168,7 +168,7 @@ -- | Set the size field. -- --- * The given size is in points (pts). One point is 1/72 inch. +-- * The given size is in points (pts). One point is 1\/72 inch. -- fontDescriptionSetSize :: FontDescription -> Rational -> IO () fontDescriptionSetSize fd p = |
|
From: Duncan C. <dun...@us...> - 2005-01-12 01:35:05
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26538 Modified Files: ChangeLog Log Message: Tiny haddock markup fixes. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.281 retrieving revision 1.282 diff -u -d -r1.281 -r1.282 --- ChangeLog 12 Jan 2005 00:00:46 -0000 1.281 +++ ChangeLog 12 Jan 2005 01:34:54 -0000 1.282 @@ -12,6 +12,9 @@ files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. + * gtk/Graphics/UI/Gtk/Pango/Description.chs, gtk/Graphics/UI/Gtk.hs: + tiny haddock markup fixes. + 2005-01-10 Duncan Coutts <du...@co...> * tools/apiGen/format-docs.xsl: nicer code and more comprehensively |
|
From: Duncan C. <dun...@us...> - 2005-01-12 00:01:33
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562 Modified Files: ChangeLog Makefile.am Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Makefile.am 8 Jan 2005 17:52:36 -0000 1.30 +++ Makefile.am 12 Jan 2005 00:00:46 -0000 1.31 @@ -244,6 +244,9 @@ glib_System_Glib_Types_hs_HCFLAGS = -fglasgow-exts glib_System_Glib_GError_hs_HCFLAGS = -fglasgow-exts +libHSglib_a_LIBADD = \ + glib/System/Glib/GObject_stub.o + am_libHSglib_a_OBJECTS = $(libHSglib_a_HSFILES:.hs=.$(OBJEXT)) libHSglib_a_CHSPPFILES = $(filter %.chs.pp,$(libHSglib_a_SOURCES)) @@ -260,7 +263,7 @@ $(filter %.hs,$(libHSglib_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSglib_a_SOURCES)) -nobase_pkglib_SCRIPTS = $(libHSglib_a_HSFILES:.hs=.hi) +nobase_hi_SCRIPTS = $(libHSglib_a_HSFILES:.hs=.hi) MOSTLYCLEANFILES += $(am_libHSglib_a_OBJECTS) MOSTLYCLEANFILES += $(libHSglib_a_HSFILES:.hs=.hi) @@ -473,7 +476,7 @@ $(filter %.hs,$(libHSgtk_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSgtk_a_SOURCES)) -nobase_hi_SCRIPTS = $(libHSgtk_a_HSFILES:.hs=.hi) +nobase_hi_SCRIPTS += $(libHSgtk_a_HSFILES:.hs=.hi) MOSTLYCLEANFILES += $(am_libHSgtk_a_OBJECTS) MOSTLYCLEANFILES += $(libHSgtk_a_HSFILES:.hs=.hi) Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.280 retrieving revision 1.281 diff -u -d -r1.280 -r1.281 --- ChangeLog 10 Jan 2005 17:25:27 -0000 1.280 +++ ChangeLog 12 Jan 2005 00:00:46 -0000 1.281 @@ -1,4 +1,18 @@ -2005-01-09 Duncan Coutts <du...@co...> +2005-01-11 Duncan Coutts <du...@co...> + + * glib/glib.pkg.in, gtk/gtk.pkg.in, mogul/mogul.pkg.in, + glade/glade.pkg.in, gconf/gconf.pkg.in, sourceview/sourceview.pkg.in, + mozembed/mozembed.pkg.in: correct import_dirs. Each module has its own + directory under the hi difrectory. Also, since all packages now use + the hierachrical module namespace we can install all packages as 'Auto' + packages which means that users do not have to specify -package to ghc + most of the time. + + * Makefile.am: correct the install location for glib package's .hi + files. Correct a linker error caused by a missing _stub.o file. + Everything should install correctly now and the demos should build ok. + +2005-01-10 Duncan Coutts <du...@co...> * tools/apiGen/format-docs.xsl: nicer code and more comprehensively deal with various sorts of paragrahps, lists, sections and examples. |
|
From: Duncan C. <dun...@us...> - 2005-01-12 00:01:33
|
Update of /cvsroot/gtk2hs/gtk2hs/mozembed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562/mozembed Modified Files: mozembed.pkg.in Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: mozembed.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mozembed/mozembed.pkg.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mozembed.pkg.in 17 Dec 2004 21:21:44 -0000 1.1 +++ mozembed.pkg.in 12 Jan 2005 00:00:51 -0000 1.2 @@ -1,7 +1,7 @@ Package { name = "mozembed", - auto = False, - import_dirs = ["@hidir@"], + auto = True, + import_dirs = ["@hidir@/mozembed"], source_dirs = [], library_dirs = [@MOZEMBED_LIBDIR_CQ@], hs_libraries = ["HSmozembed"], |
|
From: Duncan C. <dun...@us...> - 2005-01-12 00:01:32
|
Update of /cvsroot/gtk2hs/gtk2hs/sourceview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562/sourceview Modified Files: sourceview.pkg.in Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: sourceview.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/sourceview.pkg.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sourceview.pkg.in 12 Dec 2004 14:28:13 -0000 1.3 +++ sourceview.pkg.in 12 Jan 2005 00:00:48 -0000 1.4 @@ -1,7 +1,7 @@ Package { name = "sourceview", - auto = False, - import_dirs = ["@hidir@"], + auto = True, + import_dirs = ["@hidir@/sourceview"], source_dirs = [], library_dirs = [@SOURCEVIEW_LIBDIR_CQ@], hs_libraries = ["HSsourceview"], |
|
From: Duncan C. <dun...@us...> - 2005-01-12 00:01:31
|
Update of /cvsroot/gtk2hs/gtk2hs/gconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562/gconf Modified Files: gconf.pkg.in Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: gconf.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/gconf.pkg.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gconf.pkg.in 9 Dec 2004 18:44:59 -0000 1.2 +++ gconf.pkg.in 12 Jan 2005 00:00:48 -0000 1.3 @@ -1,7 +1,7 @@ Package { name = "gconf", - auto = False, - import_dirs = ["@hidir@"], + auto = True, + import_dirs = ["@hidir@/gconf"], source_dirs = [], library_dirs = [@GCONF_LIBDIR_CQ@], hs_libraries = ["HSgconf"], |
|
From: Duncan C. <dun...@us...> - 2005-01-12 00:01:29
|
Update of /cvsroot/gtk2hs/gtk2hs/mogul In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562/mogul Modified Files: mogul.pkg.in Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: mogul.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/mogul.pkg.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mogul.pkg.in 9 Dec 2004 18:44:59 -0000 1.2 +++ mogul.pkg.in 12 Jan 2005 00:00:47 -0000 1.3 @@ -1,7 +1,7 @@ Package { name = "mogul", - auto = False, - import_dirs = ["@hidir@"], + auto = True, + import_dirs = ["@hidir@/mogul"], source_dirs = [], library_dirs = [], hs_libraries = ["HSmogul"], |
|
From: Duncan C. <dun...@us...> - 2005-01-12 00:01:28
|
Update of /cvsroot/gtk2hs/gtk2hs/glib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562/glib Modified Files: glib.pkg.in Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: glib.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/glib/glib.pkg.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- glib.pkg.in 8 Jan 2005 17:43:37 -0000 1.1 +++ glib.pkg.in 12 Jan 2005 00:00:47 -0000 1.2 @@ -1,7 +1,7 @@ Package { name = "glib", - auto = False, - import_dirs = ["@hidir@"], + auto = True, + import_dirs = ["@hidir@/glib"], source_dirs = [], library_dirs = [@GLIB_LIBDIR_CQ@], hs_libraries = ["HSglib"], |
|
From: Duncan C. <dun...@us...> - 2005-01-12 00:01:01
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562/gtk Modified Files: gtk.pkg.in Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: gtk.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gtk.pkg.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gtk.pkg.in 12 Dec 2004 21:57:31 -0000 1.2 +++ gtk.pkg.in 12 Jan 2005 00:00:50 -0000 1.3 @@ -1,14 +1,14 @@ Package { name = "gtk", - auto = False, - import_dirs = ["@hidir@"], + auto = True, + import_dirs = ["@hidir@/gtk"], source_dirs = [], library_dirs = [@GTK_LIBDIR_CQ@], hs_libraries = ["HSgtk"], extra_libraries = [@GTK_LIBS_CQ@], include_dirs = [@GTK_CFLAGS_CQ@], c_includes = ["gtk/gtk.h"], - package_deps = ["haskell98"], + package_deps = ["glib"], extra_ghc_opts = [], extra_cc_opts = [], extra_ld_opts = [@GTK_LIBEXTRA_CQ@] |
|
From: Duncan C. <dun...@us...> - 2005-01-12 00:00:59
|
Update of /cvsroot/gtk2hs/gtk2hs/glade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562/glade Modified Files: glade.pkg.in Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: glade.pkg.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/glade/glade.pkg.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- glade.pkg.in 9 Dec 2004 18:44:59 -0000 1.2 +++ glade.pkg.in 12 Jan 2005 00:00:49 -0000 1.3 @@ -1,7 +1,7 @@ Package { name = "glade", - auto = False, - import_dirs = ["@hidir@"], + auto = True, + import_dirs = ["@hidir@/glade"], source_dirs = [], library_dirs = [@LIBGLADE_LIBDIR_CQ@], hs_libraries = ["HSglade"], |
2 messages has been excluded from this view by a project administrator.
