SCRIPT: Update specification

utils/lua/sample-spec.lua

@@ -16,12 +16,10 @@
 
     Create a new script. All the options and other stuff is defined in the
     `.spek` file.
-        local script = Vivy:newScript {
-            name = "sample_script", author = "Vivy", revision = "rev-1254"
-        }
+        local script = Vivy:newScript ("sample_script")
 
     A local function to the script may be used by another script with the
-    "Vivy:getScript" function call.
+    "Vivy:import" function call.
 
     All job functions take as first parameter the opt structure. This is really
     usefull when calling multiple scripts on the same Vivy document with a
@@ -30,25 +28,20 @@
 ]]
 
 local global      = Vivy:global ()
-local utils  = Vivy:getScript { script = "utils", author = "std" }
-local script = Vivy:newScript {
-    name     = "sample_script",
-    author   = "Vivy",
-    revision = "rev-1254",
-}
+local script      = Vivy:newScript ("sample-spec")
+local utils       = Vivy:import { script = "utils" }
+local prettyPrint = Vivy:import { script = "utils", func = "prettyPrint" }
 
-Vivy:newFunction ("tripleCopySyl", function (syl)
+local tripleCopySyl = Vivy:newFunction ("tripleCopySyl", function (syl)
     return { syl:copy(), syl:copy(), syl:copy() }
 end)
 
-Vivy:newFunction ("printFoo", function ()
-    print "Bar"
-end)
+Vivy:newFunction ("printFoo", function () print "Bar" end)
 
 Vivy:newJob ("retime_lines", Iterable.LINE, function (opt, line)
     line.start  += opt.preTime
     line.finish += opt.postTime
-    if line.start <= 0 then line.start = 0; end
+    if line.start <= 0 then line.start = 0 end
     if line.finish >= global.finish() then line.finish = global.finish() end
     return line
 end)

utils/lua/sample-spec.spek

--- The name and description of the script. Spaces and column `:` characters in
--- the script name are illegal. Comments begin by `--`.
-|> sample-spec
-#(Sample script use for the specification)
-
--- Set some usefull informations
-file     <- sample-spec.lua
-author   <- Vivy
-revision <- rev-1254
-
--- Register option tipes
-#{custom-opt}
-optin1 : boolean -> false
-
-#{time-opt}
-preTime  : integer -> -900
-postTime : integer -> 300
-
-#{color-opt}
-color1 : color -> Vivy:newColor("#314159")
-
--- Register used job functions. Here the `sample-spec:` is implied.
-@set_retime#{time-opt}
-@demultiply_syllabes
-@utils:color_after_read_3#{color-opt}
-
--- Here we have the free functions defined in the script, a comma-separated
--- list, thus comma and spaces and brackets in function names are not allowed.
-#[tripleCopySyl, printFoo]
-
--- vim: ft=
+-- vim: ft=lua
+DeclareScript {
+    name        = [[ sample-spec ]],
+    description = [[ Sample script used for the specification proposition ]],
+    file        = [[ sample-spec.lua ]],
+    author      = [[ Vivy ]],
+    revision    = [[ rev-1254 ]],
+    imports     = { "utils" },
+    options     = {
+        "custom-opt" = { option1 = false },
+        "time-opt"   = { preTime = -900, postTime = 300, },
+        "color-opt"  = { color1 = Vivy:newColor("#314159") }
+    },
+    functions = {
+        DeclareFunctopn { name = "tripleCopySyl" },
+        DeclareFunction { name = "printFoo" },
+        ImportFunction  { name = "prettyPrint", script = "utils" },
+    },
+    jobs = {
+        DeclareJob { name = "set_retime", options = { "time-opt" } },
+        DeclareJob { name = "demultiply_syllabes" },
+        ImportJob  { name = "color_after_read_3", script = "utils", options = { "color-opt" } }
+    }
+}