cakyrespa 0.0.27 → 0.0.28

raw patch · 4 files changed

+15/−4 lines, 4 filesdep ~gluturtle

Dependency ranges changed: gluturtle

Files

cakyrespa.cabal +2/−2
src/Jimpe.hs +10/−1
src/Klesi.hs +1/−0
src/Minde.hs +2/−1

cakyrespa.cabal view

@@ -2,7 +2,7 @@ cabal-version:	>= 1.6  name:		cakyrespa-version:	0.0.27+version:	0.0.28 stability:	Alpha license:	BSD3 license-file:	LICENSE@@ -26,5 +26,5 @@     main-is:		cakyrespa.hs     other-modules:	Minde, Jimpe, Tcidu, Liste, Klesi     build-depends:	base >3 && <5, lojbanParser >= 0.1.6,-        gluturtle >= 0.0.39, GLUT, yjsvg, yjtools >= 0.9.18+        gluturtle >= 0.0.43, GLUT, yjsvg, yjtools >= 0.9.18     ghc-options:	-Wall

src/Jimpe.hs view

@@ -39,6 +39,7 @@ 	("crakla", crakla), 	("rixykla", rixykla), 	("carna", carna),+	("xrukla", xrukla), 	("clugau", clugau), 	("galfi", galfi), 	("pilno", pilno),@@ -66,7 +67,15 @@ apply2 args s1 s2 cmd = apply args s2 =<< apply args s1 (return . cmd)  klama, crakla, rixykla, carna, clugau, galfi, pilno, cisni, cisnygau, viska,-	rapli, xruti, morji, gasnu, rejgau, tcidu, napilno, naviska :: Midytcidu+	rapli, xruti, morji, gasnu, rejgau, tcidu, napilno, naviska, vimcu,+	xrukla :: Midytcidu++xrukla terms args = do+	KOhA "ko" <- lookup (FA 1) terms+	selxrukla <- lookup (FA 2) terms+	apply args selxrukla $ \sxk -> case sxk of+		LO (Brivla "krasi") _ -> return XRUKLALOKRASI+		_ -> return $ SRERA $ show terms ++ " " ++ show args  vimcu terms args = do 	KOhA "ko" <- lookup (FA 1) terms

src/Klesi.hs view

@@ -11,6 +11,7 @@ 	= KLAMA Double Double 	| CRAKLA Double				| RIXYKLA Double 	| ZUNLE Double				| PRITU Double+	| XRUKLALOKRASI 	| COhACLUGAU				| COhUCLUGAU 	| PEBYCISNI Double			| PEBYSKA Int Int Int 	| BURSKA Int Int Int			| FLOSKA Int Int Int

src/Minde.hs view

@@ -3,7 +3,7 @@ import Klesi(Minde(..), Sumti)  import Text.XML.YJSVG(showSVG)-import Graphics.UI.GLUT.Turtle(setFieldSize, Console,+import Graphics.UI.GLUT.Turtle(setFieldSize, Console, home, 	Field, consoleOutput, clear, 	Turtle, runInputs, inputs, getSVG, 	goto, forward, backward, left, right, beginfill, endfill, undo,@@ -28,6 +28,7 @@ minde _ _ t _ (RIXYKLA d) = backward t d >> return True minde _ _ t _ (ZUNLE d) = left t d >> return True minde _ _ t _ (PRITU d) = right t d >> return True+minde _ _ t _ XRUKLALOKRASI = home t >> return True minde _ _ t _ COhACLUGAU = beginfill t >> return True minde _ _ t _ COhUCLUGAU = endfill t >> return True minde _ _ t _ (PEBYCISNI s) = pensize t s >> return True