xturtle 0.1.24 → 0.1.25

raw patch · 3 files changed

+5/−5 lines, 3 filesdep ~yjsvg

Dependency ranges changed: yjsvg

Files

• src/Graphics/X11/Turtle/Input.hs +2/−2
• src/Graphics/X11/Turtle/Move.hs +2/−2
• xturtle.cabal +1/−1

@@ -1,7 +1,7 @@ module Graphics.X11.Turtle.Input(TurtleInput(..), turtleSeries) where  import Graphics.X11.Turtle.State(TurtleState(..), initTurtleState, makeShape)-import Text.XML.YJSVG(SVG(..), Color(..), Position(..))+import Text.XML.YJSVG(SVG(..), Color(..), Position(..), Font(..), FontWeight(..)) import Control.Concurrent.Chan (Chan)  --------------------------------------------------------------------------------@@ -83,7 +83,7 @@ nextTurtle t@TurtleState{pencolor = clr} Stamp = reset t `set` 	Just (Polyline (makeShape t (direction t) (position t)) clr clr 0) nextTurtle t@TurtleState{pencolor = clr} (Write fnt sz str) = reset t `set`-	Just (Text (position t) sz clr fnt str)+	Just (Text (position t) sz clr (Font fnt Normal) str) nextTurtle t (PutImage fp w h) = reset t `set` Just (Image (position t) w h fp) nextTurtle t (Undonum un) = (reset t){undonum = un} nextTurtle t Clear = (reset t){clear = True, drawed = [last $ drawed t]}

@@ -39,7 +39,7 @@ 	onclick, onrelease, ondrag, onmotion, onkeypress, ontimer, 	fieldColor, drawLine, fillRectangle, fillPolygon, writeString, 	drawImage, undoLayer, drawCharacter, drawCharacterAndLine)-import Text.XML.YJSVG(SVG(..), Position(..))+import Text.XML.YJSVG(SVG(..), Position(..), Font(..), FontWeight(..)) import qualified Text.XML.YJSVG as S(topleft)  import Control.Concurrent(threadDelay)@@ -88,7 +88,7 @@ drawSVG f l (Rect pos w h 0 fc _) = fillRectangle f l pos w h fc drawSVG f l (Polyline ps fc _ 0) = fillPolygon f l ps fc drawSVG f l (Fill clr) = fieldColor f l clr-drawSVG f l (Text pos sz clr fnt str) = writeString f l fnt sz clr pos str+drawSVG f l (Text pos sz clr (Font fnt _) str) = writeString f l fnt sz clr pos str drawSVG f l (Image pos w h fp) = drawImage f l fp pos w h drawSVG _ _ _ = error "not implemented" 

@@ -2,7 +2,7 @@ cabal-version:	>= 1.6  name:		xturtle-version:	0.1.24+version:	0.1.25 stability:	experimental author:		Yoshikuni Jujo <PAF01143@nifty.ne.jp> maintainer:	Yoshikuni Jujo <PAF01143@nifty.ne.jp>