diff --git a/README b/README --- a/README +++ b/README @@ -1,32 +1,37 @@ hsc3-dot - haskell supercollider dot ------------------------------------ -[hsc3-dot][hsc3-dot] provides [dot][dot] graph drawing for -[SuperCollider][sc3] unit generator graphs generated by the -[hsc3][hsc3] [haskell][hs] library. +[hsc3-dot](http://rd.slavepianos.org/t/hsc3-dot) +provides +[dot](http://www.graphviz.org/doc/info/lang.html) +graph drawing for +[SuperCollider](http://audiosynth.com/) +unit generator graphs generated by the +[hsc3](http://rd.slavepianos.org/t/hsc3) +[haskell]*http://haskell.org/) +library. -The graph rendering is delegated to [graphviz][graphviz], which must -be installed. +Graph rendering is by +[graphviz](http://graphviz.org/), +which must be installed. -There is an +There is a +[tutorial](?t=hsc3-dot&e=md/dot.md) +and also an [entry](?t=hsc3-texts&e=lhs/hsc3-tutorial.lhs#ugen-graph-drawings) -at the [hsc3-texts](?t=hsc3-texts) +at the +[hsc3-texts](?t=hsc3-texts) [tutorial](?t=hsc3-texts&e=lhs/hsc3-tutorial.lhs). -The default [SVG][svg] viewer is [rsvg-view-3][rsvg], which is in the -debian package `librsvg2-bin`. +The default +[SVG](http://www.w3.org/Graphics/SVG/) +viewer is +[rsvg-view-3]( http://wiki.gnome.org/LibRsvg), +which is in the debian package `librsvg2-bin`. -[hs]: http://haskell.org/ -[sc3]: http://audiosynth.com/ -[graphviz]: http://graphviz.org/ -[dot]: http://www.graphviz.org/doc/info/lang.html -[hsc3-dot]: http://rd.slavepianos.org/?t=hsc3-dot -[hsc3-texts]: http://rd.slavepianos.org/?t=hsc3-texts -[hsc3]: http://rd.slavepianos.org/?t=hsc3 -[svg]: http://www.w3.org/Graphics/SVG/ -[rsvg]: http://wiki.gnome.org/LibRsvg +## cli -© [rohan drape][rd], 2006-2014, [gpl] +[plot-sf](?t=hsc3-plot&e=md/plot-sf.md) -[rd]: http://rd.slavepianos.org/ -[gpl]: http://gnu.org/copyleft/ +© [rohan drape](http://rd.slavepianos.org/), 2006-2017, + [gpl](http://gnu.org/copyleft/) diff --git a/Sound/SC3/UGen/Dot.hs b/Sound/SC3/UGen/Dot.hs --- a/Sound/SC3/UGen/Dot.hs +++ b/Sound/SC3/UGen/Dot.hs @@ -1,145 +1,6 @@ -{- | Module to provide graph drawing of unit generator graphs. The -output is in the form of a dot graph, which can be layed out using the -@graphviz@ tools, see . - -> import Sound.SC3.ID -> import Sound.SC3.UGen.Dot - -Simple a-rate only graph. - -> draw (out 0 (sinOsc AR 440 0 * 0.1)) - -<> - -As above, but using the /record/ interface. - -> import Sound.SC3.UGen.Dot.Type - -> let o = dot_options {use_tables = False} -> in draw_with_opt o (out 0 (sinOsc AR 440 0 * 0.1)) - -<> - -With k-rate subgraph. - -> let f = lfSaw KR 1 0 * 220 + 440 -> in draw (out 0 (sinOsc AR f 0 * 0.1)) - -<> - -With k-rate & i-rate subgraphs - -> let {l = rand 'a' 200 400 -> ;m = rand 'b' l 600 -> ;a = rand 'c' 500 900 -> ;f = lfSaw KR 1 0 * m + a} -> in draw (out 0 (sinOsc AR f 0 * 0.1)) - -<> - -With control input - -> let f = control KR "freq" 440 -> in draw (out 0 (sinOsc AR f 0 * 0.1)) - -<> - -As above but with inlined controls. - -> let {f = control KR "freq" 440 -> ;o = dot_options {inline_controls = True}} -> in draw_with_opt o (out 0 (sinOsc AR f 0 * 0.1)) - -<> - -As above but without control name label. - -> let {o = dot_options {inline_controls = True -> ,display_control_names = False} -> ;f = control KR "freq" 440} -> in draw_with_opt o (out 0 (sinOsc AR f 0 * 0.1)) - -<> - -With multiple channel expansion. - -> let f = mce2 440 220 -> in draw (out 0 (sinOsc AR f 0 * 0.1)) - -<> - -With multiple root graph. - -> let {f = mce2 440 220 + in' 2 KR 0 -> ;o1 = sinOsc AR f 0 * 0.1 -> ;o2 = sinOsc KR (mce2 0.25 0.35) 0 * mce2 10 15 } -> in draw (mrg [out 0 o1,out 0 o2]) - -<> - -With multiple channel UGen. - -> draw (out 0 (pan2 (sinOsc AR 440 0 * 0.1) 0 1)) - -<> - -With reserved labels (ie. <,>,&), and fixed size graph (size in inches). - -> let o = svg_options {graph_size = Just (1,4)} -> in draw_with_opt o (out 0 (sinOsc AR 440 0 >* 0)) - -<> - --} -module Sound.SC3.UGen.Dot where - -import Sound.SC3.UGen.Dot.Class -import Sound.SC3.UGen.Dot.Internal -import Sound.SC3.UGen.Dot.Type - --- | 'dot_with_opt' of 'dot_options'. -dot :: Drawable a => a -> String -dot = dot_with_opt dot_options - --- | 'dot_with_opt' of 'svg_options'. -dot_svg :: Drawable a => a -> String -dot_svg = dot_with_opt svg_options - --- | 'view_with' of 'dot_with_opt'. -draw_with_opt :: Drawable a => Dot_Options -> a -> IO () -draw_with_opt o x = view_with o (dot_with_opt o x) - --- | 'draw_with_opt' of 'dot_options'. -draw :: Drawable a => a -> IO () -draw = draw_with_opt dot_options - --- | 'draw_with_opt' of 'svg_options'. -draw_svg :: Drawable a => a -> IO () -draw_svg = draw_with_opt svg_options - --- | Default @dot@ format 'Dot_Options'. --- --- > std_style dot_options -dot_options :: Dot_Options -dot_options = Dot_Options - {use_tables = True - ,use_splines = False - ,output_format = DOT - ,output_directory = "/tmp" - ,output_file_name = "hsc3" - ,fix_edge_location = False - ,numeric_precision = 3 - ,indicate_precision = False - ,inline_controls = False - ,display_control_names = True - ,dot_viewer = "dotty" - ,svg_viewer = "rsvg-view-3" - ,font_name = "Courier" - ,font_size = 12 - ,graph_size = Nothing - } +-- | Re-export of three main modules. +module Sound.SC3.UGen.Dot (module D) where --- | Default @svg@ format 'Dot_Options'. -svg_options :: Dot_Options -svg_options = dot_options {output_format = SVG - ,fix_edge_location = True} +import Sound.SC3.UGen.Dot.Class as D +import Sound.SC3.UGen.Dot.HL as D +import Sound.SC3.UGen.Dot.Type as D diff --git a/Sound/SC3/UGen/Dot/Common.hs b/Sound/SC3/UGen/Dot/Common.hs new file mode 100644 --- /dev/null +++ b/Sound/SC3/UGen/Dot/Common.hs @@ -0,0 +1,70 @@ +module Sound.SC3.UGen.Dot.Common where + +import Text.Printf {- base -} + +-- | Bracket with elements. +bracket1 :: (a,a) -> [a] -> [a] +bracket1 (l,r) x = [l] ++ x ++ [r] + +-- | Bracket with lists. +bracket :: ([a],[a]) -> [a] -> [a] +bracket (l,r) x = l ++ x ++ r + +-- | 'bracket' with double quotes. +string_pp :: String -> String +string_pp = bracket1 ('"','"') + +-- | 'bracket' with double quotes and braces. +label_pp :: String -> String +label_pp = bracket ("\"{","}\"") + +-- | Type specialised 'show'. +int_pp :: Int -> String +int_pp = show + +-- | 'reverse' of /f/ of 'reverse'. +-- +-- > let drop_while_right f = right_variant (dropWhile f) +-- > in drop_while_right isUpper "abcDEF" == "abc" +right_variant :: ([a] -> [b]) -> [a] -> [b] +right_variant f = reverse . f . reverse + +-- | Limited precision PP for 'n', no scientific notation. +-- +-- > map (limit_precision_p True 2) [1,1.25,1.12345,0,0.05,pi*1e8,1e9] +limit_precision_p :: (PrintfArg n) => Bool -> Int -> n -> String +limit_precision_p r n c = + let i = printf "%.*f" n c + in if r + then i + else right_variant (dropWhile (== '.') . dropWhile (== '0')) i + +-- | Limited precision PP for 'n', with scientific notation. +-- +-- > map (limit_precision_e 3) [1,1.25,0.05,pi*1e8,1e9,read "Infinity"] +limit_precision_e :: (Read n,Show n) => Int -> n -> String +limit_precision_e n c = + case show c of + "Infinity" -> "Infinity" + c' -> + let (i,j') = break (== '.') c' + j = if null j' then error ("limit_precision_e: no dot: " ++ c') else tail j' + (k,l) = break (== 'e') j + f :: String -> Int + f m = round ((read (take (n + 1) m) :: Read n => n) / (10::Double)) + k' = if length k > n + then show (f k) + else k + in i ++ if k == "0" + then l + else "." ++ k' ++ l + +-- | Variant selecting scientific notation more cautiously than haskells default PP. +-- +-- > map (limit_precision True 3) [1,1.25,0.05,0,pi*1e8,1e9] +limit_precision :: (Floating n,Ord n,Read n,Show n,PrintfArg n) => Bool -> Int -> n -> String +limit_precision r n c = + if c /= 0 && (c < (10 ** fromIntegral (- n)) || c > 1e6) + then limit_precision_e n c + else limit_precision_p r n c + diff --git a/Sound/SC3/UGen/Dot/HL.hs b/Sound/SC3/UGen/Dot/HL.hs new file mode 100644 --- /dev/null +++ b/Sound/SC3/UGen/Dot/HL.hs @@ -0,0 +1,60 @@ +-- | High-level dot. +module Sound.SC3.UGen.Dot.HL where + +import Sound.SC3.UGen.Dot.Class +import Sound.SC3.UGen.Dot.Internal +import Sound.SC3.UGen.Dot.Type + +-- | 'dot_with_opt' of 'dot_options'. +dot :: Drawable a => a -> String +dot = dot_with_opt dot_options + +-- | 'dot_with_opt' of 'svg_options'. +dot_svg :: Drawable a => a -> String +dot_svg = dot_with_opt svg_options + +-- | 'view_with' of 'dot_with_opt'. +draw_with_opt :: Drawable a => Dot_Options -> a -> IO () +draw_with_opt o x = view_with o (dot_with_opt o x) + +-- | 'draw_with_opt' with 'run_viewer' set to 'False'. +write_with_opt :: Drawable a => Dot_Options -> a -> IO () +write_with_opt o = draw_with_opt (o {run_viewer = False}) + +-- | 'draw_with_opt' of 'dot_options'. +draw :: Drawable a => a -> IO () +draw = draw_with_opt dot_options + +-- | 'draw_with_opt' of 'svg_options'. +draw_svg :: Drawable a => a -> IO () +draw_svg = draw_with_opt svg_options + +-- | Default @dot@ format 'Dot_Options'. +-- +-- > std_style dot_options +dot_options :: Dot_Options +dot_options = Dot_Options + {use_tables = True + ,use_attr_id = False + ,use_splines = False + ,output_format = DOT + ,output_directory = "/tmp" + ,output_file_name = "hsc3" + ,fix_edge_location = False + ,numeric_precision = 3 + ,indicate_precision = False + ,inline_controls = False + ,display_control_names = True + ,dot_viewer = "dotty" + ,svg_viewer = "rsvg-view-3" + ,font_name = "Courier" + ,font_size = 12 + ,graph_size = Nothing + ,colour_edges = True + ,run_viewer = True + } + +-- | Default @svg@ format 'Dot_Options'. +svg_options :: Dot_Options +svg_options = dot_options {output_format = SVG + ,fix_edge_location = True} diff --git a/Sound/SC3/UGen/Dot/Internal.hs b/Sound/SC3/UGen/Dot/Internal.hs --- a/Sound/SC3/UGen/Dot/Internal.hs +++ b/Sound/SC3/UGen/Dot/Internal.hs @@ -12,23 +12,9 @@ import qualified Sound.SC3 as S {- hsc3 -} import qualified Sound.SC3.UGen.Graph as S {- hsc3 -} -import Sound.SC3.UGen.Dot.Type {- hsc3-dot -} --- | Bracket with elements. -bracket1 :: (a,a) -> [a] -> [a] -bracket1 (l,r) x = [l] ++ x ++ [r] - --- | Bracket with lists. -bracket :: ([a],[a]) -> [a] -> [a] -bracket (l,r) x = l ++ x ++ r - --- | 'bracket' with double quotes. -string_pp :: String -> String -string_pp = bracket1 ('"','"') - --- | 'bracket' with double quotes and braces. -label_pp :: String -> String -label_pp = bracket ("\"{","}\"") +import qualified Sound.SC3.UGen.Dot.Common as C {- hsc3-dot -} +import qualified Sound.SC3.UGen.Dot.Type as D {- hsc3-dot -} -- | Key value pair. type Attr = (String,String) @@ -43,16 +29,12 @@ -- | Attribute lists are in square brackets and comma seperated. attr_list_pp :: [Attr] -> String -attr_list_pp = bracket1 ('[',']') . intercalate "," . mapMaybe attr_pp_maybe +attr_list_pp = C.bracket1 ('[',']') . intercalate "," . mapMaybe attr_pp_maybe -- | Attribute sets are named and semi-colon terminated. attr_set_pp :: String -> [Attr] -> String attr_set_pp nm attr = concat [nm," ",attr_list_pp attr,";"] --- | Type specialised 'show'. -int_pp :: Int -> String -int_pp = show - -- | Size is given as @(width,height)@. size_pp :: (Double,Double) -> String size_pp (x,y) = printf "\"%f,%f\"" x y @@ -62,22 +44,22 @@ bool_pp = map toLower . show -- | Basic attribute sets given 'Dot_Options'. -std_style :: Dot_Options -> [String] +std_style :: D.Dot_Options -> [String] std_style o = - [attr_set_pp "graph" [("splines",bool_pp (use_splines o)) - ,("size",maybe "" size_pp (graph_size o))] - ,attr_set_pp "node" [("fontsize",int_pp (font_size o)) - ,("fontname",string_pp (font_name o))] + [attr_set_pp "graph" [("splines",bool_pp (D.use_splines o)) + ,("size",maybe "" size_pp (D.graph_size o))] + ,attr_set_pp "node" [("fontsize",C.int_pp (D.font_size o)) + ,("fontname",C.string_pp (D.font_name o))] ,attr_set_pp "edge" [("arrowhead","box") ,("arrowsize","0.25")]] -- | Generate dot representation of the provided unit generator graph. -dotGraph :: Dot_Options -> S.Graph -> String +dotGraph :: D.Dot_Options -> S.Graph -> String dotGraph o g = let (S.Graph _ _ ks us) = g ls = concat [["digraph Anonymous {"] ,std_style o - ,if inline_controls o + ,if D.inline_controls o then [] else map (dot_node_k o) ks ,map (dot_node_u o g) us @@ -86,79 +68,36 @@ in unlines (filter (not.null) ls) -- | View @dot@ graph according to 'Dot_Options'. -view_with :: Dot_Options -> String -> IO () +view_with :: D.Dot_Options -> String -> IO () view_with o x = do v <- get_viewer o - let d = output_directory o - f = d output_file_name o + let d = D.output_directory o + f = d D.output_file_name o f_dot = f <.> "dot" f_svg = f <.> "svg" f_svg_gz = f_svg <.> "gz" - f_view = case output_format o of - DOT -> f_dot - SVG -> f_svg - SVG_GZ -> f_svg_gz + f_view = case D.output_format o of + D.DOT -> f_dot + D.SVG -> f_svg + D.SVG_GZ -> f_svg_gz gen_svg = rawSystem "dot" ["-T","svg",f_dot,"-o",f_svg] writeFile f_dot x - when (output_format o `elem` [SVG,SVG_GZ]) (void gen_svg) - when (output_format o == SVG_GZ) (void (rawSystem "gzip" ["-f",f_svg])) - when (False && output_format o /= DOT) (removeFile f_dot) - _ <- rawSystem v [f_view] - return () + when (D.output_format o `elem` [D.SVG,D.SVG_GZ]) (void gen_svg) + when (D.output_format o == D.SVG_GZ) (void (rawSystem "gzip" ["-f",f_svg])) + when (False && D.output_format o /= D.DOT) (removeFile f_dot) + void (rawSystem v [f_view]) -- | Input port. data IP = IP_Label String | IP_Port String Char Int | IP_Const (Maybe String,String,Int) S.Sample --- | 'reverse' of /f/ of 'reverse'. --- --- > let drop_while_right f = right_variant (dropWhile f) --- > in drop_while_right isUpper "abcDEF" == "abc" -right_variant :: ([a] -> [b]) -> [a] -> [b] -right_variant f = reverse . f . reverse - --- | Limited precision PP for 'S.Sample', no scientific notation. --- --- > map (limit_precision_p True 2) [1,1.25,1.12345,0,0.05,pi*1e8,1e9] -limit_precision_p :: Bool -> Int -> S.Sample -> String -limit_precision_p r n c = - let i = printf "%.*f" n c - in if r - then i - else right_variant (dropWhile (== '.') . dropWhile (== '0')) i - --- | Limited precision PP for 'S.Sample', with scientific notation. --- --- > map (limit_precision_e 3) [1,1.25,0.05,pi*1e8,1e9] -limit_precision_e :: Int -> S.Sample -> String -limit_precision_e n c = - let (i,_:j) = break (== '.') (show c) - (k,l) = break (== 'e') j - f :: String -> Int - f m = round ((read (take (n + 1) m) :: S.Sample) / 10) - k' = if length k > n - then show (f k) - else k - in i ++ if k == "0" - then l - else "." ++ k' ++ l - --- | Variant selecting scientific notation more cautiously than haskells default PP. --- --- > map (limit_precision True 3) [1,1.25,0.05,0,pi*1e8,1e9] -limit_precision :: Bool -> Int -> S.Sample -> String -limit_precision r n c = - if c /= 0 && (c < (10 ** fromIntegral (- n)) || c > 1e6) - then limit_precision_e n c - else limit_precision_p r n c - -- | Variant of 'limit_precision' reading parameters from 'Dot_Options'. -limit_precision_o :: Dot_Options -> S.Sample -> String -limit_precision_o o = limit_precision (indicate_precision o) (numeric_precision o) +limit_precision_o :: D.Dot_Options -> S.Sample -> String +limit_precision_o o = C.limit_precision (D.indicate_precision o) (D.numeric_precision o) -- | IP in record form. -ip_record :: Dot_Options -> IP -> String +ip_record :: D.Dot_Options -> IP -> String ip_record o i = case i of IP_Label l -> l @@ -173,29 +112,31 @@ in concatMap f -- | 'IP' as @HTML@ string. -ip_html :: Dot_Options -> IP -> String +ip_html :: D.Dot_Options -> IP -> String ip_html o i = case i of IP_Label l -> printf "%s" (escape_html l) IP_Port u c n -> let p = c : '_' : show n - in printf "" p u p + a = if D.use_attr_id o then printf " ID=\"%s:%s\"" u p else "" + in printf "" p a IP_Const (k,u,p) n -> let p' = "K_" ++ show p n' = limit_precision_o o n l = maybe "" (++":") k ++ n' - in printf "%s" u p' l + a = if D.use_attr_id o then printf " ID=\"%s:%s\"" u p' else "" + in printf "%s" a l -record :: Dot_Options -> String -> String -> ([IP],[IP]) -> String +record :: D.Dot_Options -> String -> String -> ([IP],[IP]) -> String record o nm clr (upr,lwr) = let f l = concat ["{",g (map (ip_record o) l),"}"] g = intercalate "|" lbl = g [f upr,f lwr] - in attr_set_pp nm [("shape",string_pp "record") - ,("color",string_pp clr) - ,("label",label_pp lbl)] + in attr_set_pp nm [("shape",C.string_pp "record") + ,("color",C.string_pp clr) + ,("label",C.label_pp lbl)] -table :: Dot_Options -> String -> String -> ([IP],[IP]) -> String +table :: D.Dot_Options -> String -> String -> ([IP],[IP]) -> String table o lbl clr (upr,lwr) = let k = length upr - length lwr e = concat (replicate k "") @@ -204,17 +145,18 @@ else concat ["",p ++ concatMap (ip_html o) l,""] in attr_set_pp lbl - [("shape",string_pp "plaintext") - ,("color",string_pp clr) + [("shape",C.string_pp "plaintext") + ,("color",C.string_pp clr) ,("label",concat ["<" ,f [] upr ++ f e lwr ,"
>"])] -dot_edge :: Dot_Options -> S.Graph -> S.Edge -> String +dot_edge :: D.Dot_Options -> S.Graph -> S.Edge -> String dot_edge o g (l,S.ToPort ri rn) = let Just ln = S.find_node g (S.port_nid l) - s = if fix_edge_location o then ":s" else "" - in if S.is_node_c ln || S.is_node_k ln && inline_controls o + s = if D.fix_edge_location o then ":s" else "" + clr = if D.colour_edges o then S.rate_color (S.node_rate ln) else "black" + in if S.is_node_c ln || S.is_node_k ln && D.inline_controls o then "" else concat [S.node_label ln ,if S.is_node_u ln @@ -226,28 +168,29 @@ ,let Just ri_n = S.find_node g ri in S.node_label ri_n ,":i_" ,show rn + ," [color=",clr,"]" ,";"] -input :: Dot_Options -> S.Graph -> S.Node -> S.FromPort -> Int -> IP +input :: D.Dot_Options -> S.Graph -> S.Node -> S.FromPort -> Int -> IP input o g u fp k = case fp of S.FromPort_C i -> let Just n = S.find_node g i in IP_Const (Nothing,S.node_label u,k) (S.node_c_value n) S.FromPort_K i _ -> - if inline_controls o + if D.inline_controls o then let Just n = S.find_node g i - l = if display_control_names o + l = if D.display_control_names o then Just (S.node_k_name n) else Nothing in IP_Const (l,S.node_label u,k) (S.node_k_default n) else IP_Port (S.node_label u) 'i' k _ -> IP_Port (S.node_label u) 'i' k -dot_node_u :: Dot_Options -> S.Graph -> S.Node -> String +dot_node_u :: D.Dot_Options -> S.Graph -> S.Node -> String dot_node_u o g u = let lbl = S.node_label u - clr = S.rate_color (S.node_u_rate u) + clr = S.rate_color (S.node_rate u) i = S.node_u_inputs u i' = length i - 1 s = S.node_u_special u @@ -255,7 +198,7 @@ zipWith (input o g u) i [0..i'] lwr = let n = length (S.node_u_outputs u) - 1 in map (IP_Port (S.node_label u) 'o') [0 .. n] - f = if use_tables o then table o else record o + f = if D.use_tables o then table o else record o in if S.is_implicit_control u then "" else f lbl clr (upr,lwr) @@ -265,21 +208,21 @@ let c = if S.node_k_type k == S.K_TR then "cyan" else S.rate_color (S.node_k_rate k) - in ("color",string_pp c) + in ("color",C.string_pp c) -dot_node_k_rec :: Dot_Options -> S.Node -> String +dot_node_k_rec :: D.Dot_Options -> S.Node -> String dot_node_k_rec o u = attr_set_pp (S.node_label u) - [("shape",string_pp "rect") + [("shape",C.string_pp "rect") ,dot_node_k_color u - ,("label",string_pp (S.node_k_name u ++ ":" ++ limit_precision_o o (S.node_k_default u)))] + ,("label",C.string_pp (S.node_k_name u ++ ":" ++ limit_precision_o o (S.node_k_default u)))] -dot_node_k_html :: Dot_Options -> S.Node -> String +dot_node_k_html :: D.Dot_Options -> S.Node -> String dot_node_k_html o u = attr_set_pp (S.node_label u) - [("shape",string_pp "plaintext") + [("shape",C.string_pp "plaintext") ,dot_node_k_color u ,("label",concat ["<" ,"" ,"
" @@ -287,17 +230,17 @@ ,"
>"])] -dot_node_k :: Dot_Options -> S.Node -> String +dot_node_k :: D.Dot_Options -> S.Node -> String dot_node_k o = - if use_tables o + if D.use_tables o then dot_node_k_html o else dot_node_k_rec o -- | Considering 'output_format' read either the environment variable -- @DOTVIEWER@ or @SVGVIEWER@, the default values are 'dot_viewer' and -- 'svg_viewer'. -get_viewer :: Dot_Options -> IO String +get_viewer :: D.Dot_Options -> IO String get_viewer o = - if output_format o == DOT - then S.get_env_default "DOTVIEWER" (dot_viewer o) - else S.get_env_default "SVGVIEWER" (svg_viewer o) + if D.output_format o == D.DOT + then S.get_env_default "DOTVIEWER" (D.dot_viewer o) + else S.get_env_default "SVGVIEWER" (D.svg_viewer o) diff --git a/Sound/SC3/UGen/Dot/Type.hs b/Sound/SC3/UGen/Dot/Type.hs --- a/Sound/SC3/UGen/Dot/Type.hs +++ b/Sound/SC3/UGen/Dot/Type.hs @@ -7,6 +7,7 @@ -- | Dot options record. data Dot_Options = Dot_Options {use_tables :: Bool -- ^ Select @record@ or @html/table@ rendering. + ,use_attr_id :: Bool -- ^ Write @ID@ attributes ,use_splines :: Bool -- ^ Select edge rendering ,output_format :: Dot_Format -- ^ Select viewer format. ,fix_edge_location :: Bool -- ^ Select output port edge location. @@ -14,11 +15,13 @@ ,indicate_precision :: Bool -- ^ Print to precision even if not required ,inline_controls :: Bool -- ^ Draw controls within UGen input port slots. ,display_control_names :: Bool -- ^ Elide control names if 'False'. - ,output_directory :: FilePath -- ^ File name (without suffix). + ,output_directory :: FilePath -- ^ Directory to write files to. ,output_file_name :: String -- ^ File name (without suffix). ,dot_viewer :: String -- ^ @dot@ file viewer (ie. "dotty") ,svg_viewer :: String -- ^ @svg@ file viewer (ie. "rsvg-view","inkview") ,font_name :: String -- ^ Name of font to use ,font_size :: Int -- ^ Font size ,graph_size :: Maybe (Double,Double) -- ^ Graph box size (inches) + ,colour_edges :: Bool -- ^ Colour edges according to source? + ,run_viewer :: Bool -- ^ Run viewer process? } diff --git a/dot/01.dot b/dot/01.dot new file mode 100644 --- /dev/null +++ b/dot/01.dot @@ -0,0 +1,10 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="black",label=<
SinOsc4400
>]; +u_4[shape="plaintext",color="black",label=<
*0.1
>]; +u_5[shape="plaintext",color="black",label=<
Out0
>]; +u_2:o_0 -> u_4:i_0; +u_4:o_0 -> u_5:i_1; +} diff --git a/dot/01.svg b/dot/01.svg deleted file mode 100644 --- a/dot/01.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -SinOsc - -440 - -0 - - - -u_4 - -* - - -0.1 - - - -u_2:o_0->u_4:i_0 - - - - - -u_5 - -Out - -0 - - - -u_4:o_0->u_5:i_1 - - - - - - diff --git a/dot/02.dot b/dot/02.dot new file mode 100644 --- /dev/null +++ b/dot/02.dot @@ -0,0 +1,10 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2 [shape="record",color="black",label="{{SinOsc|440|0}|{}}"]; +u_4 [shape="record",color="black",label="{{*||0.1}|{}}"]; +u_5 [shape="record",color="black",label="{{Out|0|}|{}}"]; +u_2:o_0 -> u_4:i_0; +u_4:o_0 -> u_5:i_1; +} diff --git a/dot/02.svg b/dot/02.svg deleted file mode 100644 --- a/dot/02.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -SinOsc - -440 - -0 - - - - -u_4 - -* - - - -0.1 - - - - -u_2:o_0->u_4:i_0 - - - - - -u_5 - -Out - -0 - - - - - - -u_4:o_0->u_5:i_1 - - - - - - diff --git a/dot/03.dot b/dot/03.dot new file mode 100644 --- /dev/null +++ b/dot/03.dot @@ -0,0 +1,16 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="blue",label=<
LFSaw10
>]; +u_4[shape="plaintext",color="blue",label=<
*220
>]; +u_6[shape="plaintext",color="blue",label=<
+440
>]; +u_7[shape="plaintext",color="black",label=<
SinOsc0
>]; +u_9[shape="plaintext",color="black",label=<
*0.1
>]; +u_10[shape="plaintext",color="black",label=<
Out0
>]; +u_2:o_0 -> u_4:i_0; +u_4:o_0 -> u_6:i_0; +u_6:o_0 -> u_7:i_0; +u_7:o_0 -> u_9:i_0; +u_9:o_0 -> u_10:i_1; +} diff --git a/dot/03.svg b/dot/03.svg deleted file mode 100644 --- a/dot/03.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -LFSaw - -1 - -0 - - - -u_4 - -* - - -220 - - - -u_2:o_0->u_4:i_0 - - - - - -u_6 - -+ - - -440 - - - -u_4:o_0->u_6:i_0 - - - - - -u_7 - -SinOsc - - -0 - - - -u_6:o_0->u_7:i_0 - - - - - -u_9 - -* - - -0.1 - - - -u_7:o_0->u_9:i_0 - - - - - -u_10 - -Out - -0 - - - -u_9:o_0->u_10:i_1 - - - - - - diff --git a/dot/04.dot b/dot/04.dot new file mode 100644 --- /dev/null +++ b/dot/04.dot @@ -0,0 +1,22 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="blue",label=<
LFSaw10
>]; +u_5[shape="plaintext",color="yellow",label=<
Rand200400
>]; +u_7[shape="plaintext",color="yellow",label=<
Rand600
>]; +u_8[shape="plaintext",color="blue",label=<
*
>]; +u_11[shape="plaintext",color="yellow",label=<
Rand500900
>]; +u_12[shape="plaintext",color="blue",label=<
+
>]; +u_13[shape="plaintext",color="black",label=<
SinOsc0
>]; +u_15[shape="plaintext",color="black",label=<
*0.1
>]; +u_16[shape="plaintext",color="black",label=<
Out0
>]; +u_5:o_0 -> u_7:i_0; +u_2:o_0 -> u_8:i_0; +u_7:o_0 -> u_8:i_1; +u_8:o_0 -> u_12:i_0; +u_11:o_0 -> u_12:i_1; +u_12:o_0 -> u_13:i_0; +u_13:o_0 -> u_15:i_0; +u_15:o_0 -> u_16:i_1; +} diff --git a/dot/04.svg b/dot/04.svg deleted file mode 100644 --- a/dot/04.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -LFSaw - -1 - -0 - - - -u_8 - -* - - - - - -u_2:o_0->u_8:i_0 - - - - - -u_5 - -Rand - -200 - -400 - - - -u_7 - -Rand - - -600 - - - -u_5:o_0->u_7:i_0 - - - - - -u_7:o_0->u_8:i_1 - - - - - -u_12 - -+ - - - - - -u_8:o_0->u_12:i_0 - - - - - -u_11 - -Rand - -500 - -900 - - - -u_11:o_0->u_12:i_1 - - - - - -u_13 - -SinOsc - - -0 - - - -u_12:o_0->u_13:i_0 - - - - - -u_15 - -* - - -0.1 - - - -u_13:o_0->u_15:i_0 - - - - - -u_16 - -Out - -0 - - - -u_15:o_0->u_16:i_1 - - - - - - diff --git a/dot/05.dot b/dot/05.dot new file mode 100644 --- /dev/null +++ b/dot/05.dot @@ -0,0 +1,12 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +k_1[shape="plaintext",color="blue",label=<
freq:440
>]; +u_2[shape="plaintext",color="black",label=<
SinOsc0
>]; +u_4[shape="plaintext",color="black",label=<
*0.1
>]; +u_5[shape="plaintext",color="black",label=<
Out0
>]; +k_1:o_0 -> u_2:i_0; +u_2:o_0 -> u_4:i_0; +u_4:o_0 -> u_5:i_1; +} diff --git a/dot/05.svg b/dot/05.svg deleted file mode 100644 --- a/dot/05.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - -Anonymous - - -k_1 - -freq:440 - - -u_2 - -SinOsc - - -0 - - - -k_1:o_0->u_2:i_0 - - - - - -u_4 - -* - - -0.1 - - - -u_2:o_0->u_4:i_0 - - - - - -u_5 - -Out - -0 - - - -u_4:o_0->u_5:i_1 - - - - - - diff --git a/dot/06.dot b/dot/06.dot new file mode 100644 --- /dev/null +++ b/dot/06.dot @@ -0,0 +1,10 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="black",label=<
SinOscfreq:4400
>]; +u_4[shape="plaintext",color="black",label=<
*0.1
>]; +u_5[shape="plaintext",color="black",label=<
Out0
>]; +u_2:o_0 -> u_4:i_0; +u_4:o_0 -> u_5:i_1; +} diff --git a/dot/06.svg b/dot/06.svg deleted file mode 100644 --- a/dot/06.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -SinOsc - -freq:440 - -0 - - - -u_4 - -* - - -0.1 - - - -u_2:o_0->u_4:i_0 - - - - - -u_5 - -Out - -0 - - - -u_4:o_0->u_5:i_1 - - - - - - diff --git a/dot/07.dot b/dot/07.dot new file mode 100644 --- /dev/null +++ b/dot/07.dot @@ -0,0 +1,10 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="black",label=<
SinOsc4400
>]; +u_4[shape="plaintext",color="black",label=<
*0.1
>]; +u_5[shape="plaintext",color="black",label=<
Out0
>]; +u_2:o_0 -> u_4:i_0; +u_4:o_0 -> u_5:i_1; +} diff --git a/dot/07.svg b/dot/07.svg deleted file mode 100644 --- a/dot/07.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -SinOsc - -440 - -0 - - - -u_4 - -* - - -0.1 - - - -u_2:o_0->u_4:i_0 - - - - - -u_5 - -Out - -0 - - - -u_4:o_0->u_5:i_1 - - - - - - diff --git a/dot/08.dot b/dot/08.dot new file mode 100644 --- /dev/null +++ b/dot/08.dot @@ -0,0 +1,14 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="black",label=<
SinOsc4400
>]; +u_4[shape="plaintext",color="black",label=<
*0.1
>]; +u_6[shape="plaintext",color="black",label=<
SinOsc2200
>]; +u_7[shape="plaintext",color="black",label=<
*0.1
>]; +u_8[shape="plaintext",color="black",label=<
Out0
>]; +u_2:o_0 -> u_4:i_0; +u_6:o_0 -> u_7:i_0; +u_4:o_0 -> u_8:i_1; +u_7:o_0 -> u_8:i_2; +} diff --git a/dot/08.svg b/dot/08.svg deleted file mode 100644 --- a/dot/08.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -SinOsc - -440 - -0 - - - -u_4 - -* - - -0.1 - - - -u_2:o_0->u_4:i_0 - - - - - -u_8 - -Out - -0 - - - - -u_4:o_0->u_8:i_1 - - - - - -u_6 - -SinOsc - -220 - -0 - - - -u_7 - -* - - -0.1 - - - -u_6:o_0->u_7:i_0 - - - - - -u_7:o_0->u_8:i_2 - - - - - - diff --git a/dot/09.dot b/dot/09.dot new file mode 100644 --- /dev/null +++ b/dot/09.dot @@ -0,0 +1,30 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="blue",label=<
SinOsc0.250
>]; +u_4[shape="plaintext",color="blue",label=<
*10
>]; +u_6[shape="plaintext",color="blue",label=<
SinOsc0.350
>]; +u_8[shape="plaintext",color="blue",label=<
*15
>]; +u_9[shape="plaintext",color="blue",label=<
Out0
>]; +u_11[shape="plaintext",color="blue",label=<
In0
>]; +u_13[shape="plaintext",color="blue",label=<
+440
>]; +u_14[shape="plaintext",color="black",label=<
SinOsc0
>]; +u_16[shape="plaintext",color="black",label=<
*0.1
>]; +u_19[shape="plaintext",color="blue",label=<
+220
>]; +u_20[shape="plaintext",color="black",label=<
SinOsc0
>]; +u_21[shape="plaintext",color="black",label=<
*0.1
>]; +u_22[shape="plaintext",color="black",label=<
Out0
>]; +u_2:o_0 -> u_4:i_0; +u_6:o_0 -> u_8:i_0; +u_4:o_0 -> u_9:i_1; +u_8:o_0 -> u_9:i_2; +u_11:o_0 -> u_13:i_1; +u_13:o_0 -> u_14:i_0; +u_14:o_0 -> u_16:i_0; +u_11:o_1 -> u_19:i_1; +u_19:o_0 -> u_20:i_0; +u_20:o_0 -> u_21:i_0; +u_16:o_0 -> u_22:i_1; +u_21:o_0 -> u_22:i_2; +} diff --git a/dot/09.svg b/dot/09.svg deleted file mode 100644 --- a/dot/09.svg +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -SinOsc - -0.25 - -0 - - - -u_4 - -* - - -10 - - - -u_2:o_0->u_4:i_0 - - - - - -u_9 - -Out - -0 - - - - -u_4:o_0->u_9:i_1 - - - - - -u_6 - -SinOsc - -0.35 - -0 - - - -u_8 - -* - - -15 - - - -u_6:o_0->u_8:i_0 - - - - - -u_8:o_0->u_9:i_2 - - - - - -u_11 - -In - -0 - - - - -u_13 - -+ - -440 - - - - -u_11:o_0->u_13:i_1 - - - - - -u_19 - -+ - -220 - - - - -u_11:o_1->u_19:i_1 - - - - - -u_14 - -SinOsc - - -0 - - - -u_13:o_0->u_14:i_0 - - - - - -u_16 - -* - - -0.1 - - - -u_14:o_0->u_16:i_0 - - - - - -u_22 - -Out - -0 - - - - -u_16:o_0->u_22:i_1 - - - - - -u_20 - -SinOsc - - -0 - - - -u_19:o_0->u_20:i_0 - - - - - -u_21 - -* - - -0.1 - - - -u_20:o_0->u_21:i_0 - - - - - -u_21:o_0->u_22:i_2 - - - - - - diff --git a/dot/10.dot b/dot/10.dot new file mode 100644 --- /dev/null +++ b/dot/10.dot @@ -0,0 +1,13 @@ +digraph Anonymous { +graph [splines=false]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="black",label=<
SinOsc4400
>]; +u_4[shape="plaintext",color="black",label=<
*0.1
>]; +u_6[shape="plaintext",color="black",label=<
Pan201
>]; +u_9[shape="plaintext",color="black",label=<
Out0
>]; +u_2:o_0 -> u_4:i_0; +u_4:o_0 -> u_6:i_0; +u_6:o_0 -> u_9:i_1; +u_6:o_1 -> u_9:i_2; +} diff --git a/dot/10.svg b/dot/10.svg deleted file mode 100644 --- a/dot/10.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -SinOsc - -440 - -0 - - - -u_4 - -* - - -0.1 - - - -u_2:o_0->u_4:i_0 - - - - - -u_6 - -Pan2 - - -0 - -1 - - - - -u_4:o_0->u_6:i_0 - - - - - -u_9 - -Out - -0 - - - - -u_6:o_0->u_9:i_1 - - - - - -u_6:o_1->u_9:i_2 - - - - - - diff --git a/dot/11.dot b/dot/11.dot new file mode 100644 --- /dev/null +++ b/dot/11.dot @@ -0,0 +1,10 @@ +digraph Anonymous { +graph [splines=false,size="1.0,4.0"]; +node [fontsize=12,fontname="Courier"]; +edge [arrowhead=box,arrowsize=0.25]; +u_2[shape="plaintext",color="black",label=<
SinOsc4400
>]; +u_3[shape="plaintext",color="black",label=<
>0
>]; +u_4[shape="plaintext",color="black",label=<
Out0
>]; +u_2:o_0:s -> u_3:i_0; +u_3:o_0:s -> u_4:i_1; +} diff --git a/dot/11.svg b/dot/11.svg deleted file mode 100644 --- a/dot/11.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - -Anonymous - - -u_2 - -SinOsc - -440 - -0 - - - -u_3 - -> - - -0 - - - -u_2:o_0:s->u_3:i_0 - - - - - -u_4 - -Out - -0 - - - -u_3:o_0:s->u_4:i_1 - - - - - - diff --git a/hsc3-dot.cabal b/hsc3-dot.cabal --- a/hsc3-dot.cabal +++ b/hsc3-dot.cabal @@ -1,33 +1,36 @@ Name: hsc3-dot -Version: 0.15 +Version: 0.16 Synopsis: haskell supercollider graph drawing Description: dot format graph generator for SuperCollider unit generator graphs constructed using hsc3. License: GPL Category: Sound -Copyright: (c) Rohan Drape, 2006-2014 +Copyright: (c) Rohan Drape, 2006-2017 Author: Rohan Drape Maintainer: rd@slavepianos.org Stability: Experimental Homepage: http://rd.slavepianos.org/t/hsc3-dot -Tested-With: GHC == 7.8.2 +Tested-With: GHC == 8.0.1 Build-Type: Simple -Cabal-Version: >= 1.8 +Cabal-Version: >= 1.18 Data-files: README -Extra-Doc-Files: dot/*.svg +Extra-Doc-Files: dot/*.dot svg/*.svg Library - Build-Depends: base == 4.*, - directory, - filepath, - hsc3 == 0.15.*, - process - GHC-Options: -Wall -fwarn-tabs - Exposed-modules: Sound.SC3.UGen.Dot - Sound.SC3.UGen.Dot.Class - Sound.SC3.UGen.Dot.Internal - Sound.SC3.UGen.Dot.Type + Default-Language: Haskell2010 + Build-Depends: base >= 4.8 && < 5, + directory, + filepath, + hsc3 == 0.16.*, + process + GHC-Options: -Wall -fwarn-tabs + Exposed-modules: Sound.SC3.UGen.Dot + Sound.SC3.UGen.Dot.Class + Sound.SC3.UGen.Dot.Common + Sound.SC3.UGen.Dot.HL + Sound.SC3.UGen.Dot.Internal + Sound.SC3.UGen.Dot.Type Source-Repository head Type: darcs diff --git a/svg/01.svg b/svg/01.svg new file mode 100644 --- /dev/null +++ b/svg/01.svg @@ -0,0 +1,52 @@ + + + + + + +Anonymous + + +u_2 + +SinOsc + +440 + +0 + + + +u_4 + +* + + +0.1 + + + +u_2:o_0->u_4:i_0 + + + + + +u_5 + +Out + +0 + + + +u_4:o_0->u_5:i_1 + + + + + + diff --git a/svg/02.svg b/svg/02.svg new file mode 100644 --- /dev/null +++ b/svg/02.svg @@ -0,0 +1,58 @@ + + + + + + +Anonymous + + +u_2 + +SinOsc + +440 + +0 + + + + +u_4 + +* + + + +0.1 + + + + +u_2:o_0->u_4:i_0 + + + + + +u_5 + +Out + +0 + + + + + + +u_4:o_0->u_5:i_1 + + + + + + diff --git a/svg/03.svg b/svg/03.svg new file mode 100644 --- /dev/null +++ b/svg/03.svg @@ -0,0 +1,97 @@ + + + + + + +Anonymous + + +u_2 + +LFSaw + +1 + +0 + + + +u_4 + +* + + +220 + + + +u_2:o_0->u_4:i_0 + + + + + +u_6 + ++ + + +440 + + + +u_4:o_0->u_6:i_0 + + + + + +u_7 + +SinOsc + + +0 + + + +u_6:o_0->u_7:i_0 + + + + + +u_9 + +* + + +0.1 + + + +u_7:o_0->u_9:i_0 + + + + + +u_10 + +Out + +0 + + + +u_9:o_0->u_10:i_1 + + + + + + diff --git a/svg/04.svg b/svg/04.svg new file mode 100644 --- /dev/null +++ b/svg/04.svg @@ -0,0 +1,142 @@ + + + + + + +Anonymous + + +u_2 + +LFSaw + +1 + +0 + + + +u_8 + +* + + + + + +u_2:o_0->u_8:i_0 + + + + + +u_5 + +Rand + +200 + +400 + + + +u_7 + +Rand + + +600 + + + +u_5:o_0->u_7:i_0 + + + + + +u_7:o_0->u_8:i_1 + + + + + +u_12 + ++ + + + + + +u_8:o_0->u_12:i_0 + + + + + +u_11 + +Rand + +500 + +900 + + + +u_11:o_0->u_12:i_1 + + + + + +u_13 + +SinOsc + + +0 + + + +u_12:o_0->u_13:i_0 + + + + + +u_15 + +* + + +0.1 + + + +u_13:o_0->u_15:i_0 + + + + + +u_16 + +Out + +0 + + + +u_15:o_0->u_16:i_1 + + + + + + diff --git a/svg/05.svg b/svg/05.svg new file mode 100644 --- /dev/null +++ b/svg/05.svg @@ -0,0 +1,62 @@ + + + + + + +Anonymous + + +k_1 + +freq:440 + + +u_2 + +SinOsc + + +0 + + + +k_1:o_0->u_2:i_0 + + + + + +u_4 + +* + + +0.1 + + + +u_2:o_0->u_4:i_0 + + + + + +u_5 + +Out + +0 + + + +u_4:o_0->u_5:i_1 + + + + + + diff --git a/svg/06.svg b/svg/06.svg new file mode 100644 --- /dev/null +++ b/svg/06.svg @@ -0,0 +1,52 @@ + + + + + + +Anonymous + + +u_2 + +SinOsc + +freq:440 + +0 + + + +u_4 + +* + + +0.1 + + + +u_2:o_0->u_4:i_0 + + + + + +u_5 + +Out + +0 + + + +u_4:o_0->u_5:i_1 + + + + + + diff --git a/svg/07.svg b/svg/07.svg new file mode 100644 --- /dev/null +++ b/svg/07.svg @@ -0,0 +1,52 @@ + + + + + + +Anonymous + + +u_2 + +SinOsc + +440 + +0 + + + +u_4 + +* + + +0.1 + + + +u_2:o_0->u_4:i_0 + + + + + +u_5 + +Out + +0 + + + +u_4:o_0->u_5:i_1 + + + + + + diff --git a/svg/08.svg b/svg/08.svg new file mode 100644 --- /dev/null +++ b/svg/08.svg @@ -0,0 +1,84 @@ + + + + + + +Anonymous + + +u_2 + +SinOsc + +440 + +0 + + + +u_4 + +* + + +0.1 + + + +u_2:o_0->u_4:i_0 + + + + + +u_8 + +Out + +0 + + + + +u_4:o_0->u_8:i_1 + + + + + +u_6 + +SinOsc + +220 + +0 + + + +u_7 + +* + + +0.1 + + + +u_6:o_0->u_7:i_0 + + + + + +u_7:o_0->u_8:i_2 + + + + + + diff --git a/svg/09.svg b/svg/09.svg new file mode 100644 --- /dev/null +++ b/svg/09.svg @@ -0,0 +1,204 @@ + + + + + + +Anonymous + + +u_2 + +SinOsc + +0.25 + +0 + + + +u_4 + +* + + +10 + + + +u_2:o_0->u_4:i_0 + + + + + +u_9 + +Out + +0 + + + + +u_4:o_0->u_9:i_1 + + + + + +u_6 + +SinOsc + +0.35 + +0 + + + +u_8 + +* + + +15 + + + +u_6:o_0->u_8:i_0 + + + + + +u_8:o_0->u_9:i_2 + + + + + +u_11 + +In + +0 + + + + +u_13 + ++ + +440 + + + + +u_11:o_0->u_13:i_1 + + + + + +u_19 + ++ + +220 + + + + +u_11:o_1->u_19:i_1 + + + + + +u_14 + +SinOsc + + +0 + + + +u_13:o_0->u_14:i_0 + + + + + +u_16 + +* + + +0.1 + + + +u_14:o_0->u_16:i_0 + + + + + +u_22 + +Out + +0 + + + + +u_16:o_0->u_22:i_1 + + + + + +u_20 + +SinOsc + + +0 + + + +u_19:o_0->u_20:i_0 + + + + + +u_21 + +* + + +0.1 + + + +u_20:o_0->u_21:i_0 + + + + + +u_21:o_0->u_22:i_2 + + + + + + diff --git a/svg/10.svg b/svg/10.svg new file mode 100644 --- /dev/null +++ b/svg/10.svg @@ -0,0 +1,77 @@ + + + + + + +Anonymous + + +u_2 + +SinOsc + +440 + +0 + + + +u_4 + +* + + +0.1 + + + +u_2:o_0->u_4:i_0 + + + + + +u_6 + +Pan2 + + +0 + +1 + + + + +u_4:o_0->u_6:i_0 + + + + + +u_9 + +Out + +0 + + + + +u_6:o_0->u_9:i_1 + + + + + +u_6:o_1->u_9:i_2 + + + + + + diff --git a/svg/11.svg b/svg/11.svg new file mode 100644 --- /dev/null +++ b/svg/11.svg @@ -0,0 +1,52 @@ + + + + + + +Anonymous + + +u_2 + +SinOsc + +440 + +0 + + + +u_3 + +> + + +0 + + + +u_2:o_0:s->u_3:i_0 + + + + + +u_4 + +Out + +0 + + + +u_3:o_0:s->u_4:i_1 + + + + + +