diff --git a/ChangeLog.md b/ChangeLog.md new file mode 100644 --- /dev/null +++ b/ChangeLog.md @@ -0,0 +1,22 @@ +# Revision history for dihaa + +## 0.2.1.1 -- 2017-05-06 + +* First version to be released on hackage. +* Fixed rendering of cross sections with adjacent arrow heads. +* Moved most documentation to haddock of Main and expanded it with + more detailed information. + +## 0.2.1.0 -- 2017-05-03 + +* Search for font in data dir instead of current directory. + Basically that means now you can finally dihaa from anywhere after + installation. + +## 0.2.0.0 -- 2017-05-01 + +* Added colors for boxes. + +## 0.1.0.0 + +* Development versions never formally released. diff --git a/Dihaa.hs b/Dihaa.hs new file mode 100644 --- /dev/null +++ b/Dihaa.hs @@ -0,0 +1,95 @@ +-- | ditaa clone in haskell + +-- ------------------------------------------------------------------- +-- Copyright (C) 2017 by Sascha Wilde + +-- This program is free software under the GNU GPL (>=v2) +-- Read the file COPYING coming with the software for details. +-- ------------------------------------------------------------------- + +module Dihaa (Glyph(..), Text, Dia, lines2text, text2dia) +where + +import TwoD + +data Glyph = LineH | LineV + | CornerNW | CornerNE | CornerSW | CornerSE + | TeeWNE | TeeWSE | TeeNWS | TeeNES + | Cross + | ArrowN | ArrowS | ArrowW | ArrowE + | Space + | Verbatim Char + deriving (Eq, Show) + +type Text = TwoD Char +type Dia = TwoD Glyph + +toGlyph :: Char -> TwoD Char -> Int -> Int -> Glyph +toGlyph ' ' _ _ _ = Space +toGlyph c t x y + | c == '─' = LineH + | c == '│' = LineV + | c == '┌' = CornerNW + | c == '┐' = CornerNE + | c == '└' = CornerSW + | c == '┘' = CornerSE + | c == '┴' = TeeWNE + | c == '┬' = TeeWSE + | c == '┤' = TeeNWS + | c == '├' = TeeNES + | c == '┼' = Cross + | c == '▲' = ArrowN + | c == '▼' = ArrowS + | c == '◀' = ArrowW + | c == '▶' = ArrowE + | c == '|' + && ( nOsIsIn "|+" + || nIsIn "^" + || sIsIn "v" ) = LineV + | c == '-' + && ( wOeIsIn "-+" + || wIsIn "<" + || eIsIn ">" ) = LineH + | c == '^' + && sIsIn "|+" = ArrowN + | c == 'v' + && nIsIn "|+" = ArrowS + | c == '<' + && eIsIn "-+" = ArrowW + | c == '>' + && wIsIn "-+" = ArrowE + | c == '+' + && nIsIn "|+^" && wIsIn "<-+" + && sIsIn "|+v" && eIsIn ">-+" = Cross + | c == '+' + && nAsIsIn "|+" && wIsIn "-+<" = TeeNWS + | c == '+' + && nAsIsIn "|+" && eIsIn "-+>" = TeeNES + | c == '+' + && wAeIsIn "-+" && nIsIn "|+^" = TeeWNE + | c == '+' + && wAeIsIn "-+" && sIsIn "|+v" = TeeWSE + | c == '+' + && eIsIn "-+>" && sIsIn "|+v" = CornerNW + | c == '+' + && wIsIn "-+<" && sIsIn "|+v" = CornerNE + | c == '+' + && eIsIn "-+>" && nIsIn "|+^" = CornerSW + | c == '+' + && wIsIn "-+<" && nIsIn "|+^" = CornerSE + | otherwise = Verbatim c + where + nIsIn = isInAny [getN] x y t + sIsIn = isInAny [getS] x y t + wIsIn = isInAny [getW] x y t + eIsIn = isInAny [getE] x y t + nOsIsIn = isInAny [getN,getS] x y t + wOeIsIn = isInAny [getW,getE] x y t + nAsIsIn = isInAll [getN,getS] x y t + wAeIsIn = isInAll [getW,getE] x y t + +lines2text :: [[Char]] -> Text +lines2text x = fromLists x + +text2dia :: Text -> Dia +text2dia = mapTwoDXY toGlyph diff --git a/Dihaa/OutputPNG.hs b/Dihaa/OutputPNG.hs new file mode 100644 --- /dev/null +++ b/Dihaa/OutputPNG.hs @@ -0,0 +1,128 @@ +-- | output module for dihaa: write PNG using Rasterific + +-- ------------------------------------------------------------------- +-- Copyright (C) 2017 by Sascha Wilde + +-- This program is free software under the GNU GPL (>=v2) +-- Read the file COPYING coming with the software for details. +-- ------------------------------------------------------------------- + +module Dihaa.OutputPNG (outputFilePNG) where + +import Dihaa +import Dihaa.Vectorize +import TwoD + +import Paths_dihaa + +import Control.Applicative +import Data.Maybe +import Data.Monoid +import Graphics.Text.TrueType (loadFontFile, Font) +import Codec.Picture( PixelRGBA8( .. ), writePng ) +import Graphics.Rasterific +import Graphics.Rasterific.Texture + +scaleXFactor :: Int +scaleXFactor = 9 +scaleYFactor :: Int +scaleYFactor = 15 +margin :: Int +margin = 6 + +scaleX :: Float -> Float +scaleX = (fromIntegral margin +) . (fromIntegral scaleXFactor *) +scaleY :: Float -> Float +scaleY = (fromIntegral margin +) . (fromIntegral scaleYFactor *) + +pToV2 :: Dihaa.Vectorize.Point -> Float -> Graphics.Rasterific.Point +pToV2 (P x y) o = V2 (scaleX (fromIntegral x) + + (fromIntegral scaleXFactor/2) + o) + (scaleY (fromIntegral y) + + (fromIntegral scaleYFactor/2) + o) + +drawBoxes :: Float -> Maybe PixelRGBA8 -> [Shape] -> Drawing PixelRGBA8 () +drawBoxes o maybeColor = mconcat . fmap drawBox + where + drawBox (Box p1 p2 (RGB r g b)) = let color = fromJust + $ maybeColor + <|> Just (PixelRGBA8 + (fromIntegral r) + (fromIntegral g) + (fromIntegral b) 255) + in + withTexture (uniformTexture color) + $ fill $ rectangle (pToV2 p1 o) (calcW p1 p2) (calcH p1 p2) + drawBox _ = return () + calcW (P x1 _) (P x2 _) = fromIntegral ((x2 - x1) * scaleXFactor) + calcH (P _ y1) (P _ y2) = fromIntegral ((y2 - y1) * scaleYFactor) + +drawLabels :: Float -> Font -> [Shape] -> Drawing px () +drawLabels o fnt = mconcat . fmap drawLabel + where + drawLabel (Label p s) = let (V2 x y) = pToV2 p o in + printTextAt fnt (PointSize 11.25) + (V2 (x - (fromIntegral scaleXFactor*0.6)) + (y + (fromIntegral scaleXFactor*0.5))) + s + drawLabel _ = return () + +drawLines :: Float -> [Shape] -> Drawing px () +drawLines o = mconcat . fmap drawLine + where + drawLine (Dihaa.Vectorize.Line p1 p2) = + stroke 1 (JoinMiter 0) (CapStraight 1,CapStraight 1) $ + line (pToV2 p1 o) (pToV2 p2 o) + drawLine _ = return () + +diaArrow :: Graphics.Rasterific.Point -> TwoD.Direction -> Drawing px () +diaArrow (V2 x y) dir = fill $ case dir of + N -> polygon [V2 x (y-hH+sp), + V2 (x+hS) (y-hH+sp+fS), + V2 (x-hS) (y-hH+sp+fS)] + S -> polygon [V2 x (y+hH-sp), + V2 (x+hS) (y+hH-sp-fS), + V2 (x-hS) (y+hH-sp-fS)] + W -> polygon [V2 (x-hW+sp) y, + V2 (x-hW+sp+fS) (y-hS), + V2 (x-hW+sp+fS) (y+hS)] + E -> polygon [V2 (x+hW-sp) y, + V2 (x+hW-sp-fS) (y-hS), + V2 (x+hW-sp-fS) (y+hS)] + where + hW = fromIntegral scaleXFactor / 2 + hH = fromIntegral scaleYFactor / 2 + hS = min hW hH * 0.8 + fS = hS * 2 + sp = min hW hH * 0.2 + +drawArrows :: Float -> [Shape] -> Drawing px () +drawArrows o = mconcat . fmap drawArrow + where + drawArrow (Arrow p1 d) = diaArrow (pToV2 p1 o) d + drawArrow _ = return () + +outputFilePNG :: String -> Dia -> IO () +outputFilePNG name d = do + fontFileName <- getDataFileName "fonts/DroidSansMono.ttf" + fontErr <- loadFontFile fontFileName + case fontErr of + Left err -> error err + Right font -> + writePng name img + where bgColor = PixelRGBA8 240 240 240 255 + black = PixelRGBA8 0 0 0 255 + boxColor = PixelRGBA8 255 255 255 255 + shdwColor = PixelRGBA8 0 0 0 40 + (w,h) = getSize d + vs = vectorize d + img = renderDrawing + (w * scaleXFactor + 2 * margin) + (h * scaleYFactor + 2 * margin) + bgColor + $ drawBoxes 5 (Just shdwColor) vs + >> drawBoxes 0 Nothing vs + >> (withTexture (uniformTexture black) + $ mconcat [drawLines 0 vs, + drawArrows 0 vs, + drawLabels 0 font vs]) diff --git a/Dihaa/OutputUTF8.hs b/Dihaa/OutputUTF8.hs new file mode 100644 --- /dev/null +++ b/Dihaa/OutputUTF8.hs @@ -0,0 +1,36 @@ +-- | output module for dihaa: write UTF8 using unicode box drawing + +-- ------------------------------------------------------------------- +-- Copyright (C) 2017 by Sascha Wilde + +-- This program is free software under the GNU GPL (>=v2) +-- Read the file COPYING coming with the software for details. +-- ------------------------------------------------------------------- + +module Dihaa.OutputUTF8 (outputUTF8) where + +import Dihaa +import TwoD +import qualified Data.Vector as V + +graph2utf8 :: Glyph -> Char +graph2utf8 LineH = '─' +graph2utf8 LineV = '│' +graph2utf8 CornerNW = '┌' +graph2utf8 CornerNE = '┐' +graph2utf8 CornerSW = '└' +graph2utf8 CornerSE = '┘' +graph2utf8 TeeWNE = '┴' +graph2utf8 TeeWSE = '┬' +graph2utf8 TeeNWS = '┤' +graph2utf8 TeeNES = '├' +graph2utf8 Cross = '┼' +graph2utf8 ArrowN = '▲' +graph2utf8 ArrowS = '▼' +graph2utf8 ArrowW = '◀' +graph2utf8 ArrowE = '▶' +graph2utf8 Space = ' ' +graph2utf8 (Verbatim c) = c + +outputUTF8 :: Dia -> String +outputUTF8 d = unlines $ toLists $ graph2utf8 <$> d diff --git a/Dihaa/Vectorize.hs b/Dihaa/Vectorize.hs new file mode 100644 --- /dev/null +++ b/Dihaa/Vectorize.hs @@ -0,0 +1,184 @@ +-- | Convert dihaa TwoD Dia to simple vector shapes. + +-- ------------------------------------------------------------------- +-- Copyright (C) 2017 by Sascha Wilde + +-- This program is free software under the GNU GPL (>=v2) +-- Read the file COPYING coming with the software for details. +-- ------------------------------------------------------------------- + +module Dihaa.Vectorize (Point (P), Shape (..), RGB (..), + findArrows, findBoxes, + findLabels, findLines, + vectorize) where + +import Dihaa +import TwoD + +import Control.Applicative +import Control.Monad +import Data.Char (isHexDigit, digitToInt) +import Data.List (find) +import Data.Maybe + +-- for testing and debugging only: +import System.Environment (getArgs) + +data Point = P Int Int + deriving (Eq, Show) + +data Shape = Box Point Point RGB + | Line Point Point + | Label Point String + | Arrow Point Direction + | StyleColor { stylePoint :: Point, + styleColor :: RGB } + deriving Show + +data RGB = RGB Int Int Int + deriving Show + +pointOnLine :: Point -> Shape -> Bool +pointOnLine (P x y) (Line (P lx1 ly1) (P lx2 ly2)) + = (y == ly1 && ly1 == ly2 && x <= max lx1 lx2 && x >= min lx1 lx2) + || (x == lx1 && lx1 == lx2 && y <= max ly1 ly2 && y >= min ly1 ly2) +pointOnLine _ _ = False + +followWhile :: Direction -> [Glyph] -> Dia -> Point -> Point +followWhile dir way d (P x y) + | isInAny [getFromDirection dir] x y d way = + callOnDirection (\x y -> followWhile dir way d (P x y)) dir x y + | otherwise = P x y + +followTo :: Direction -> [Glyph] -> [Glyph] -> Dia -> Point -> Maybe Point +followTo dir way goal d (P x y) + | isInAny [getFromDirection dir] x y d goal = + callOnDirection (\x y -> Just (P x y)) dir x y + | isInAny [getFromDirection dir] x y d way = + callOnDirection (\x y -> followTo dir way goal d (P x y)) dir x y + | otherwise = Nothing + +findBoxAt :: [Shape] -> Dia -> Int -> Int -> Maybe Shape +findBoxAt ss d x y + | elem (P x y) cNW = liftM3 Box cNW cSE (color <|> Just (RGB 255 255 255)) + | otherwise = Nothing + where + cNE = followTo E [LineH, TeeWNE] + [CornerNE, TeeWSE, TeeNWS, Cross] + d (P x y) + cSE = followTo S [LineV, TeeNES] + [CornerSE, TeeWNE, TeeNWS, Cross] + d =<< cNE + cSW = followTo W [LineH, TeeWSE] + [CornerSW, TeeWNE, TeeNES, Cross] + d =<< cSE + cNW = followTo N [LineV, TeeNWS] + [CornerNW, TeeWSE, TeeNES, Cross] + d =<< cSW + colorStyleInBox (P x1 y1) (P x2 y2) c@(StyleColor (P xs ys) _) = + x1 < xs && xs < x2 && y1 < ys && ys < y2 + colorStyleInBox _ _ _ = False + color = join $ liftM2 + (\p1 p2 -> styleColor <$> find (colorStyleInBox p1 p2) ss) + cNW cSE + +findBoxes :: [Shape] -> Dia -> [Shape] +findBoxes ls = catMaybes . foldrTwoDXY addBoxAt [] + where + addBoxAt :: Glyph -> [Maybe Shape] -> Dia -> Int -> Int -> [Maybe Shape] + addBoxAt c ss d x y + | elem c [CornerNW, TeeWSE, TeeNES, Cross] = findBoxAt ls d x y : ss + | otherwise = ss + +findLineDirAt :: Direction -> [Glyph] -> [Glyph] -> Dia -> Int -> Int + -> Maybe Shape +findLineDirAt dir way goal d x y = liftM2 Line p1 p2 + where + p1 = followTo dir way goal d (P x y) + <|> find (/= P x y) [followWhile dir way d (P x y)] + p2 = Just (P x y) + +findLineHAt :: Dia -> Int -> Int -> Maybe Shape +findLineHAt = findLineDirAt W [LineH, TeeWNE, TeeWSE, Cross] + [CornerNW, CornerSW, TeeNES, ArrowW] + +findLineVAt :: Dia -> Int -> Int -> Maybe Shape +findLineVAt = findLineDirAt N [LineV, TeeNWS, TeeNES, Cross] + [CornerNW, CornerNE, TeeWSE, ArrowN] + +findLinesH :: Dia -> [Shape] +findLinesH = catMaybes . foldrTwoDXY addLineAt [] + where + addLineAt :: Glyph -> [Maybe Shape] -> Dia -> Int -> Int -> [Maybe Shape] + addLineAt c ss d x y + | elem c [LineH, CornerNE, CornerSE, TeeNWS, ArrowE ] + && not (any (pointOnLine (P x y)) (catMaybes ss)) = findLineHAt d x y : ss + | otherwise = ss + +findLinesV :: Dia -> [Shape] +findLinesV = catMaybes . foldrTwoDXY addLineAt [] + where + addLineAt :: Glyph -> [Maybe Shape] -> Dia -> Int -> Int -> [Maybe Shape] + addLineAt c ss d x y + | elem c [LineV, CornerSW, CornerSE, TeeWNE, ArrowS ] + && not (any (pointOnLine (P x y)) (catMaybes ss)) = findLineVAt d x y : ss + | otherwise = ss + +findLines :: Dia -> [Shape] +findLines d = findLinesH d ++ findLinesV d + +findArrows :: Dia -> [Shape] +findArrows = foldrTwoDXY addArrowAt [] + where + addArrowAt :: Glyph -> [Shape] -> Dia -> Int -> Int -> [Shape] + addArrowAt ArrowN ss _ x y = Arrow (P x y) N : ss + addArrowAt ArrowS ss _ x y = Arrow (P x y) S : ss + addArrowAt ArrowW ss _ x y = Arrow (P x y) W : ss + addArrowAt ArrowE ss _ x y = Arrow (P x y) E : ss + addArrowAt _ ss _ _ _ = ss + +collectString :: String -> Dia -> Int -> Int -> String +collectString s d x y + | any isStrElem g = let ns = case fromJust g of + Verbatim c -> c : s + Space -> ' ' : s + in + callOnDirection (collectString ns d) W x y + | otherwise = dropWhile (== ' ') s + where + g = getXY d x y + isStrElem (Verbatim _) = True + isStrElem Space = True + isStrElem _ = False + +findLabels :: Dia -> [Shape] +findLabels = foldrTwoDXY addLabelAt [] + where + addLabelAt :: Glyph -> [Shape] -> Dia -> Int -> Int -> [Shape] + addLabelAt (Verbatim _) ss d x y + | not $ atAnyString x y ss = let s=collectString "" d x y + in Label (P (x - length s + 1) y) s : ss + | otherwise = ss + addLabelAt _ ss _ _ _ = ss + atString :: Int -> Int -> Shape -> Bool + atString x y (Label (P lx ly) s) = y == ly + && x >= lx && x < (lx + length s) + atString _ _ _ = False + atAnyString :: Int -> Int -> [Shape] -> Bool + atAnyString x y = any (atString x y) + +parseStyleLabel :: Shape -> Shape +parseStyleLabel l@(Label p (':':'#':r:g:b:[])) + | isHexDigit r && isHexDigit g && isHexDigit b = StyleColor p + $ RGB (digitToInt r * 17) + (digitToInt g * 17) + (digitToInt b * 17) + | otherwise = l +parseStyleLabel s = s + +parseStyleLabels :: [Shape] -> [Shape] +parseStyleLabels = Prelude.map parseStyleLabel + +vectorize :: Dia -> [Shape] +vectorize d = let ls = parseStyleLabels $ findLabels d + in ls ++ findBoxes ls d ++ findLines d ++ findArrows d diff --git a/LICENSE b/LICENSE new file mode 100644 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program 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 program 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. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README.md b/README.md new file mode 100644 --- /dev/null +++ b/README.md @@ -0,0 +1,43 @@ +dihaa -- Creating Diagrams from ASCII Art +========================================= + +*dihaa* is a tool to create pictures of diagrams from ASCII art: + + This is an simple example of valid dihaa input: + + +----------------+ + +--->| PNG Image File | + +-------------+ +-------+ | +----------------+ + | Text Source +----->| dihaa +---+ + +-------------+ +-------+ | +-------------------+ + ^ +--->| UTF-8 Box Drawing | + Commandline Options -----+ +-------------------+ + + +Building +-------- + +*dihaa* is written in Haskell and can be build using cabal. I +recommend using a sandbox for building the dependencies (Rasterific is +used for image creation) and dihaa it self: + + cabal sandbox init + cabal install + + +Usage +----- + +To process the text input call *dihaa* with either `-p` to create a +PNG image or `-u` to create UTF-8 output using unicode box drawing +elements. Try `.cabal-sandbox/bin/dihaa -p test.dihaa`, his will +create `test.dihaa.png`. + +For more details refer to the haddoc documentation of *Main*. + + +Acknowledgment +-------------- + +This tool is inspired by: https://github.com/stathissideris/ditaa +which currently has far more features than *dihaa*. diff --git a/Setup.hs b/Setup.hs new file mode 100644 --- /dev/null +++ b/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/TwoD.hs b/TwoD.hs new file mode 100644 --- /dev/null +++ b/TwoD.hs @@ -0,0 +1,81 @@ +-- | A two dimensional type, based on Vectors... + +-- ------------------------------------------------------------------- +-- Copyright (C) 2017 by Sascha Wilde + +-- This program is free software under the GNU GPL (>=v2) +-- Read the file COPYING coming with the software for details. +-- ------------------------------------------------------------------- + +module TwoD (TwoD, Direction (..), fromLists, toLists, + TwoD.map, mapTwoDXY, foldrTwoDXY, + getSize, getXY, getN, getS, getW, getE, + callOnDirection, getFromDirection, + isInAny, isInAll) +where + +import Control.Monad (join) +import qualified Data.Vector as V + +newtype TwoD a = TwoD (V.Vector (V.Vector a)) +type GetTwoD a = TwoD a -> Int -> Int -> Maybe a + +instance Functor TwoD where + fmap = TwoD.map + +instance Foldable TwoD where + foldr f b (TwoD t) = V.foldr f b $ V.concat $ V.toList t + +instance Show a => Show (TwoD a) where + show (TwoD t) = show t + +fromLists :: [[a]] -> TwoD a +fromLists ls = TwoD (V.fromList $ V.fromList <$> ls) + +toLists :: TwoD a -> [[a]] +toLists (TwoD t) = V.toList $ V.toList <$> t + +map :: (a -> b) -> TwoD a -> TwoD b +map f (TwoD t)= TwoD (V.map (V.map f) t) + +getSize :: TwoD a -> (Int,Int) +getSize (TwoD t) = (maximum $ V.map V.length t, V.length t) + +getXY :: GetTwoD a +getXY (TwoD t) x y = join $ (V.!? x) <$> (t V.!? y) +data Direction = N | S | W | E + deriving Show + +callOnDirection :: (Int -> Int -> a) -> Direction -> Int -> Int -> a +callOnDirection f N x y = f x (y-1) +callOnDirection f S x y = f x (y+1) +callOnDirection f W x y = f (x-1) y +callOnDirection f E x y = f (x+1) y + +getFromDirection :: Direction -> GetTwoD a +getFromDirection d td = callOnDirection (getXY td) d + +getN :: GetTwoD a +getN = getFromDirection N +getS = getFromDirection S +getW = getFromDirection W +getE = getFromDirection E + +mapTwoDXY :: (a -> TwoD a -> Int -> Int -> b) -> TwoD a -> TwoD b +mapTwoDXY f td@(TwoD t) = TwoD (V.imap (\y -> V.imap (\x e -> f e td x y)) t) + +foldrTwoDXY :: (a -> b -> TwoD a -> Int -> Int -> b) -> b -> TwoD a -> b +foldrTwoDXY f i td = foldr f' i $ mapTwoDXY injectXY td + where + injectXY :: a -> TwoD a -> Int -> Int -> (Int, Int, a) + injectXY a _ x y = (x,y,a) + f' (x,y,a) b = f a b td x y + +elemF :: (Eq a, Foldable f) => f a -> [a] -> Bool +elemF e es = any (`elem` es) e + +isInAny :: Eq a => [GetTwoD a] -> Int -> Int -> TwoD a -> [a] -> Bool +isInAny fs x y t es = any (\f -> elemF (f t x y) es) fs + +isInAll :: Eq a => [GetTwoD a] -> Int -> Int -> TwoD a -> [a] -> Bool +isInAll fs x y t es = all (\f -> elemF (f t x y) es) fs diff --git a/dihaa.cabal b/dihaa.cabal new file mode 100644 --- /dev/null +++ b/dihaa.cabal @@ -0,0 +1,45 @@ +-- Initial dihaa.cabal generated by cabal init. For further documentation, +-- see http://haskell.org/cabal/users-guide/ + +name: dihaa +version: 0.2.1.1 +synopsis: ASCII based Diagram drawing in Haskell (Idea based on ditaa) +-- description: +description: dihaa is a tool which allows converting simple ASCII art + drawings of box diagrams to images. + . + See documentation of "Main" for more details. +homepage: http://sha-bang.de +license: GPL-2 +license-file: LICENSE +author: Sascha Wilde +maintainer: Sascha Wilde + +-- copyright: +category: Graphics +build-type: Simple +cabal-version: >=1.10 + +-- extra files: +data-files: fonts/DroidSansMono.ttf, fonts/LICENSE.txt +extra-doc-files: examples/arrows.dihaa.png, examples/box.dihaa.png, + examples/example1.dihaa.png, examples/lines.dihaa.png, + examples/color.dihaa.png +extra-source-files: ChangeLog.md, README.md, + examples/arrows.dihaa, examples/box.dihaa, + examples/color.dihaa, examples/example1.dihaa, + examples/lines.dihaa, examples/test.dihaa + +executable dihaa + main-is: main.hs + other-modules: Paths_dihaa, Dihaa, Dihaa.OutputPNG, Dihaa.OutputUTF8, + Dihaa.Vectorize, TwoD + -- other-extensions: + build-depends: FontyFruity >= 0.5.3, JuicyPixels >= 3.2.8, + Rasterific >= 0.7.2, base >= 4.8 && <5, vector + -- hs-source-dirs: + default-language: Haskell2010 + +source-repository head + type: mercurial + location: https://bitbucket.org/sascha_wilde/dihaa diff --git a/examples/arrows.dihaa b/examples/arrows.dihaa new file mode 100644 --- /dev/null +++ b/examples/arrows.dihaa @@ -0,0 +1,3 @@ +--> ^ ---+ <-+-> ^ + | | | <-+-> + | +-------+ v diff --git a/examples/arrows.dihaa.png b/examples/arrows.dihaa.png new file mode 100644 Binary files /dev/null and b/examples/arrows.dihaa.png differ diff --git a/examples/box.dihaa b/examples/box.dihaa new file mode 100644 --- /dev/null +++ b/examples/box.dihaa @@ -0,0 +1,3 @@ ++-------+ +| A box | ++-------+ diff --git a/examples/box.dihaa.png b/examples/box.dihaa.png new file mode 100644 Binary files /dev/null and b/examples/box.dihaa.png differ diff --git a/examples/color.dihaa b/examples/color.dihaa new file mode 100644 --- /dev/null +++ b/examples/color.dihaa @@ -0,0 +1,5 @@ ++----------------------+ +|:#fe8 | +| Nice warm yellow box | +| | ++----------------------+ diff --git a/examples/color.dihaa.png b/examples/color.dihaa.png new file mode 100644 Binary files /dev/null and b/examples/color.dihaa.png differ diff --git a/examples/example1.dihaa b/examples/example1.dihaa new file mode 100644 --- /dev/null +++ b/examples/example1.dihaa @@ -0,0 +1,12 @@ +Example 1 + ++----------------------+ +| This is a simple box +----+---- + Color Code ":#0f0" ++----------------------+ | + | + v + +-----------+ + |:#0f0 | + | Green Box | + | | + +-----------+ diff --git a/examples/example1.dihaa.png b/examples/example1.dihaa.png new file mode 100644 Binary files /dev/null and b/examples/example1.dihaa.png differ diff --git a/examples/lines.dihaa b/examples/lines.dihaa new file mode 100644 --- /dev/null +++ b/examples/lines.dihaa @@ -0,0 +1,3 @@ +--- | ---+ --+-- | + | | | --+-- + | +-------+ | diff --git a/examples/lines.dihaa.png b/examples/lines.dihaa.png new file mode 100644 Binary files /dev/null and b/examples/lines.dihaa.png differ diff --git a/examples/test.dihaa b/examples/test.dihaa new file mode 100644 --- /dev/null +++ b/examples/test.dihaa @@ -0,0 +1,25 @@ ++------------------------------------------------------------------+ +|+----------------------------------------------------------------+| +|| ASCII based Diagram drawing in Haskell || +|| (Idea based on ditaa )|| +|+----------------------------------------------------------------+| ++------------------------------------------------------------------+ + + +---------------+ +----------------------------------------+ + | Text Input | | Conversion to internal representation | + | Using: +--->| Based on rules to decide whether chars | + | |,-,+,<,>,v,^ | | are interpreted as Graphic elements or | + +---------------+ | verbatim... | + +--------------------+-------------------+ + Idea: | + maybe support v + Unicode-Box-Drawing +------------------------------------+ + Input, too... | Convert to Output: e.g. UTF8, PNG | + +------------------------------------+ + + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + | ^ | | | | + +-+ - Just some Tests here... <+ <-+ <--+ | + +---+ diff --git a/fonts/DroidSansMono.ttf b/fonts/DroidSansMono.ttf new file mode 100644 Binary files /dev/null and b/fonts/DroidSansMono.ttf differ diff --git a/fonts/LICENSE.txt b/fonts/LICENSE.txt new file mode 100644 --- /dev/null +++ b/fonts/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/main.hs b/main.hs new file mode 100644 --- /dev/null +++ b/main.hs @@ -0,0 +1,146 @@ +-- ------------------------------------------------------------------- +-- Copyright (C) 2017 by Sascha Wilde + +-- This program is free software under the GNU GPL (>=v2) +-- Read the file COPYING coming with the software for details. +-- ------------------------------------------------------------------- + +-- | +-- = dihaa +-- Convert simple ASCII art diagrams to nice images. +-- +-- == Usage: +-- > Usage: dihaa [OPTION...] files... +-- > -p --png Output as PNG file. +-- > -u --utf8 Output as UTF-8 to stdout. +-- +-- +-- == Drawing +-- The input file(s) can contain certain “graphical” ASCII art +-- elements, which will be converted to real graphics by dihaa. +-- Everything else wil just be rendered as plain text. +-- +-- === The recognised ASCII art elements are: +-- +-- Boxes can be drawn using @|@ and @-@ with @+@ as corners: +-- +-- > +-------+ +-- > | A box | +-- > +-------+ +-- generates: +-- +-- <<../examples/box.dihaa.png>> +-- +-- Lines can be drawn with the same characters, where @+@ can be used +-- for corners, tees and crossings: +-- +-- > --- | ---+ --+-- | +-- > | | | --+-- +-- > | +-------+ | +-- generates: +-- +-- <<../examples/lines.dihaa.png>> +-- +-- Using @<@, @>@, @^@ and @v@ as heads, lines become Arrows: +-- +-- > --> ^ ---+ <-+-> ^ +-- > | | | <-+-> +-- > | +-------+ v +-- generates: +-- +-- <<../examples/arrows.dihaa.png>> +-- +-- +-- == Styles +-- +-- To create colored boxes you may put a special string `:#RGB` with RGB +-- being three single digit hexadezimal numbers into a box, like so: +-- +-- > +----------------------+ +-- > |:#fe8 | +-- > | Nice warm yellow box | +-- > | | +-- > +----------------------+ +-- generates: +-- +-- <<../examples/color.dihaa.png>> +-- +-- +-- == Example: +-- The input +-- +-- > Example 1 +-- > +-- > +----------------------+ +-- > | This is a simple box +----+---- + Color Code ":#0f0" +-- > +----------------------+ | +-- > | +-- > v +-- > +-----------+ +-- > |:#0f0 | +-- > | Green Box | +-- > | | +-- > +-----------+ +-- +-- produces this image (using the @-p@ option): +-- +-- <<../examples/example1.dihaa.png>> + + +module Main where + +import Dihaa +import Dihaa.OutputPNG +import Dihaa.OutputUTF8 +import System.Console.GetOpt +import System.Environment (getArgs, getProgName) +import System.IO (stderr, hPutStrLn, readFile) + +data Options = Options + { optOutUTF8 :: Bool, + optOutPNG :: Bool + } deriving Show + +defaultOptions :: Options +defaultOptions = Options + { optOutUTF8 = False, + optOutPNG = False + } + +options :: [OptDescr (Options -> Options)] +options = + [ Option ['p'] ["png"] + (NoArg (\opts -> opts { optOutPNG = True })) + "Output as PNG file." + , Option ['u'] ["utf8"] + (NoArg (\opts -> opts { optOutUTF8 = True })) + "Output as UTF-8 to stdout." + ] + +compilerOpts :: [String] -> IO (Options, [String]) +compilerOpts argv = + case getOpt Permute options argv of + (o,s,[] ) -> return $ (foldl (flip id) defaultOptions o, s) + (_,_,errs) -> do + h <- header + ioError (userError (concat errs ++ usageInfo h options)) + where header = do + prg <- getProgName + return ("Usage: " ++ prg ++ " [OPTION...] files...") + +main :: IO () +main = do + args <- getArgs + (opts, argv) <- compilerOpts args + mapM_ (doFile opts) argv + where + doFile opts name = do + f <- readFile name + if optOutPNG opts + then + outputFilePNG (name ++ ".png") $ text2dia $ lines2text $ lines f + else if optOutUTF8 opts + then + putStrLn $ outputUTF8 $ text2dia $ lines2text $ lines f + else + hPutStrLn stderr "You should choose an output mode -u or -p"