diff --git a/html/logo-64x64.png b/html/logo-64x64.png deleted file mode 100644 Binary files a/html/logo-64x64.png and /dev/null differ diff --git a/html/logo-64x64.svg b/html/logo-64x64.svg new file mode 100644 --- /dev/null +++ b/html/logo-64x64.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/ihaskell.cabal b/ihaskell.cabal --- a/ihaskell.cabal +++ b/ihaskell.cabal @@ -7,7 +7,7 @@ -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -version: 0.9.0.3 +version: 0.9.1.0 -- A short (one-line) description of the package. synopsis: A Haskell backend kernel for the IPython project. @@ -44,7 +44,7 @@ data-files: html/kernel.js - html/logo-64x64.png + html/logo-64x64.svg flag binPkgDb default: False @@ -87,7 +87,7 @@ utf8-string -any, uuid >=1.3, vector -any, - ipython-kernel >=0.8.4 + ipython-kernel >=0.9.1 if flag(binPkgDb) build-depends: bin-package-db diff --git a/main/Main.hs b/main/Main.hs --- a/main/Main.hs +++ b/main/Main.hs @@ -255,7 +255,13 @@ -- Reply to kernel info requests with a kernel info reply. No computation needs to be done, as a -- kernel info reply is a static object (all info is hard coded into the representation of that -- message type). -replyTo _ KernelInfoRequest{} replyHeader state = +replyTo interface KernelInfoRequest{} replyHeader state = do + let send msg = liftIO $ writeChan (iopubChannel interface) msg + + -- Notify the frontend that the Kernel is idle + idleHeader <- liftIO $ dupHeader replyHeader StatusMessage + send $ PublishStatus idleHeader Idle + return (state, KernelInfoReply { header = replyHeader @@ -268,7 +274,9 @@ , languageVersion = VERSION_ghc , languageFileExtension = ".hs" , languageCodeMirrorMode = "ihaskell" + , languagePygmentsLexer = "Haskell" } + , status = Ok }) replyTo _ CommInfoRequest{} replyHeader state = diff --git a/src/IHaskell/Display.hs b/src/IHaskell/Display.hs --- a/src/IHaskell/Display.hs +++ b/src/IHaskell/Display.hs @@ -25,11 +25,18 @@ -- * Constructors for displays plain, html, + bmp, png, jpg, + gif, svg, latex, + markdown, javascript, + json, + vega, + vegalite, + vdom, many, -- ** Image and data encoding functions @@ -118,6 +125,38 @@ -- | Generate a Javascript display. javascript :: String -> DisplayData javascript = DisplayData MimeJavascript . T.pack + +-- | Generate a Json display. +json :: String -> DisplayData +json = DisplayData MimeJson . T.pack + +-- | Generate a Vega display. +vega :: String -> DisplayData +vega = DisplayData MimeVega . T.pack + +-- | Generate a Vegalite display. +vegalite :: String -> DisplayData +vegalite = DisplayData MimeVegalite . T.pack + +-- | Generate a Vdom display. +vdom :: String -> DisplayData +vdom = DisplayData MimeVdom . T.pack + +-- | Generate a Markdown display. +markdown :: String -> DisplayData +markdown = DisplayData MimeMarkdown . T.pack + +-- | Generate a GIF display of the given width and height. Data must be provided in a Base64 encoded +-- manner, suitable for embedding into HTML. The @base64@ function may be used to encode data into +-- this format. +gif :: Width -> Height -> Base64 -> DisplayData +gif width height = DisplayData (MimeGif width height) + +-- | Generate a BMP display of the given width and height. Data must be provided in a Base64 encoded +-- manner, suitable for embedding into HTML. The @base64@ function may be used to encode data into +-- this format. +bmp :: Width -> Height -> Base64 -> DisplayData +bmp width height = DisplayData (MimeBmp width height) -- | Generate a PNG display of the given width and height. Data must be provided in a Base64 encoded -- manner, suitable for embedding into HTML. The @base64@ function may be used to encode data into diff --git a/src/IHaskell/Eval/Parser.hs b/src/IHaskell/Eval/Parser.hs --- a/src/IHaskell/Eval/Parser.hs +++ b/src/IHaskell/Eval/Parser.hs @@ -22,6 +22,7 @@ import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Char8 as CBS +import Data.Char (toLower) import Data.List (maximumBy, inits) import Prelude (head, tail) import Control.Monad (msum) @@ -246,7 +247,9 @@ in case pragmas of --empty string pragmas are unsupported [] -> Pragma (PragmaUnsupported "") [] - "LANGUAGE":xs -> Pragma PragmaLanguage xs + x:xs + | map toLower x == "language" + -> Pragma PragmaLanguage xs x:xs -> Pragma (PragmaUnsupported x) xs -- | Parse a directive of the form :directiveName. diff --git a/src/IHaskell/Eval/Widgets.hs b/src/IHaskell/Eval/Widgets.hs --- a/src/IHaskell/Eval/Widgets.hs +++ b/src/IHaskell/Eval/Widgets.hs @@ -145,7 +145,7 @@ DispMsg widget disp -> do dispHeader <- dupHeader replyHeader DisplayDataMessage - let dmsg = WidgetDisplay dispHeader "haskell" $ unwrap disp + let dmsg = WidgetDisplay dispHeader $ unwrap disp sendMessage widget (toJSON $ CustomContent $ toJSON dmsg) ClrOutput widget wait -> do @@ -170,11 +170,11 @@ unwrap (Display ddatas) = ddatas -- Override toJSON for PublishDisplayData for sending Display messages through [method .= custom] -data WidgetDisplay = WidgetDisplay MessageHeader String [DisplayData] +data WidgetDisplay = WidgetDisplay MessageHeader [DisplayData] instance ToJSON WidgetDisplay where - toJSON (WidgetDisplay replyHeader source ddata) = - let pbval = toJSON $ PublishDisplayData replyHeader source ddata + toJSON (WidgetDisplay replyHeader ddata) = + let pbval = toJSON $ PublishDisplayData replyHeader ddata in toJSON $ IPythonMessage replyHeader pbval DisplayDataMessage -- Override toJSON for ClearOutput diff --git a/src/IHaskell/IPython.hs b/src/IHaskell/IPython.hs --- a/src/IHaskell/IPython.hs +++ b/src/IHaskell/IPython.hs @@ -213,7 +213,7 @@ SH.mkdir_p kernelDir SH.writefile filename $ LT.toStrict $ toLazyText $ encodeToTextBuilder $ toJSON kernelSpec - let files = ["kernel.js", "logo-64x64.png"] + let files = ["kernel.js", "logo-64x64.svg"] forM_ files $ \file -> do src <- liftIO $ Paths.getDataFileName $ "html/" ++ file SH.cp (SH.fromText $ T.pack src) (tmp SH. kernelName SH. file) diff --git a/src/IHaskell/Publish.hs b/src/IHaskell/Publish.hs --- a/src/IHaskell/Publish.hs +++ b/src/IHaskell/Publish.hs @@ -63,7 +63,7 @@ sendOutput (ManyDisplay manyOuts) = mapM_ sendOutput manyOuts sendOutput (Display outs) = do header <- dupHeader replyHeader DisplayDataMessage - send $ PublishDisplayData header "haskell" $ map (convertSvgToHtml . prependCss) outs + send $ PublishDisplayData header $ map (convertSvgToHtml . prependCss) outs convertSvgToHtml (DisplayData MimeSvg svg) = html $ makeSvgImg $ base64 $ E.encodeUtf8 svg convertSvgToHtml x = x diff --git a/src/tests/IHaskell/Test/Parser.hs b/src/tests/IHaskell/Test/Parser.hs --- a/src/tests/IHaskell/Test/Parser.hs +++ b/src/tests/IHaskell/Test/Parser.hs @@ -12,7 +12,7 @@ import IHaskell.Test.Util (ghc, strip) import IHaskell.Eval.Parser (parseString, getModuleName, unloc, layoutChunks, Located(..), - CodeBlock(..), DirectiveType(..), StringLoc(..)) + CodeBlock(..), DirectiveType(..), StringLoc(..), PragmaType(..)) import IHaskell.Eval.ParseShell (parseShell) #if !MIN_VERSION_base(4,8,0) @@ -196,6 +196,9 @@ parses "let x = 3 in" `like` [ ParseError (Loc 1 13) "parse error (possibly incorrect indentation or mismatched brackets)" ] + + it "parses LANGUAGE pragmas case-insensitively" $ + parses "{-# LaNgUaGe OverloadedStrings #-}" `like` [Pragma PragmaLanguage ["OverloadedStrings"]] it "breaks without data kinds" $ parses "data X = 3" `like` [dataKindsError]