From 1c8b5728754ab4b79aff7fafbf79ef37936ffdc1 Mon Sep 17 00:00:00 2001 From: Matthew Willis Date: Sat, 31 May 2008 01:11:47 -0700 Subject: [PATCH] cairo.pango renamed to pango.cairo --- .../{cairo/pango/pango.factor => pango/cairo/cairo.factor} | 2 +- extra/{cairo/pango => pango/cairo}/gadgets/gadgets.factor | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename extra/{cairo/pango/pango.factor => pango/cairo/cairo.factor} (99%) rename extra/{cairo/pango => pango/cairo}/gadgets/gadgets.factor (85%) diff --git a/extra/cairo/pango/pango.factor b/extra/pango/cairo/cairo.factor similarity index 99% rename from extra/cairo/pango/pango.factor rename to extra/pango/cairo/cairo.factor index bb9c473047..889052c385 100644 --- a/extra/cairo/pango/pango.factor +++ b/extra/pango/cairo/cairo.factor @@ -5,7 +5,7 @@ USING: cairo.ffi alien.c-types math alien.syntax system combinators alien arrays pango pango.fonts ; -IN: cairo.pango +IN: pango.cairo << "pangocairo" { ! { [ os winnt? ] [ "libpangocairo-1.dll" ] } diff --git a/extra/cairo/pango/gadgets/gadgets.factor b/extra/pango/cairo/gadgets/gadgets.factor similarity index 85% rename from extra/cairo/pango/gadgets/gadgets.factor rename to extra/pango/cairo/gadgets/gadgets.factor index 44ebfc30a5..9e8a99515e 100644 --- a/extra/cairo/pango/gadgets/gadgets.factor +++ b/extra/pango/cairo/gadgets/gadgets.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2008 Matthew Willis. ! See http://factorcode.org/license.txt for BSD license. -USING: cairo.pango cairo cairo.ffi cairo.gadgets +USING: pango.cairo cairo cairo.ffi cairo.gadgets alien.c-types kernel math ; -IN: cairo.pango.gadgets +IN: pango.cairo.gadgets : (pango-gadget) ( setup show -- gadget ) [ drop layout-size ] @@ -23,7 +23,7 @@ threads io.backend io.encodings.utf8 io.files ; gadget. yield ] each [ - "resource:extra/cairo/pango/gadgets/gadgets.factor" + "resource:extra/pango/cairo/gadgets/gadgets.factor" normalize-path utf8 file-contents layout-text ] gadget. ; -- 2.34.1