diff --git a/unmaintained/4DNav/4DNav-docs.factor b/extra/4DNav/4DNav-docs.factor similarity index 68% rename from unmaintained/4DNav/4DNav-docs.factor rename to extra/4DNav/4DNav-docs.factor index 95f231ecb9..6d7ebe4cfc 100755 --- a/unmaintained/4DNav/4DNav-docs.factor +++ b/extra/4DNav/4DNav-docs.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Jean-François Bigot. ! See http://factorcode.org/license.txt for BSD license. -USING: help.markup help.syntax kernel quotations strings ; +USING: help.markup help.syntax kernel quotations strings multiline ; IN: 4DNav @@ -87,60 +87,57 @@ ARTICLE: "Space file" "Create a new space file" $nl "An example is:" -$nl +{ $code <" + + + 4 + + 4cube1 + 4 + 1,0,0,0,100 + -1,0,0,0,-150 + 0,1,0,0,100 + 0,-1,0,0,-150 + 0,0,1,0,100 + 0,0,-1,0,-150 + 0,0,0,1,100 + 0,0,0,-1,-150 + 1,0,0 + + + 4triancube + 4 + 1,0,0,0,160 + -0.4999999999999998,-0.8660254037844387,0,0,-130 + -0.5000000000000004,0.8660254037844384,0,0,-130 + 0,0,1,0,140 + 0,0,-1,0,-180 + 0,0,0,1,110 + 0,0,0,-1,-180 + 0,1,0 + + + triangone + 4 + 1,0,0,0,60 + 0.5,0.8660254037844386,0,0,60 + -0.5,0.8660254037844387,0,0,-20 + -1.0,0,0,0,-100 + -0.5,-0.8660254037844384,0,0,-100 + 0.5,-0.8660254037844387,0,0,-20 + 0,0,1,0,120 + 0,0,-0.4999999999999998,-0.8660254037844387,-120 + 0,0,-0.5000000000000004,0.8660254037844384,-120 + 0,1,1 + + + 1,1,1,1 + 0.2,0.2,0.6 + + 0.8,0.9,0.9 + + "> } ; -"\n" -"\n" -"\n 4" -"\n " -"\n 4cube1" -"\n 4" -"\n 1,0,0,0,100" -"\n -1,0,0,0,-150" -"\n 0,1,0,0,100" -"\n 0,-1,0,0,-150" -"\n 0,0,1,0,100" -"\n 0,0,-1,0,-150" -"\n 0,0,0,1,100" -"\n 0,0,0,-1,-150" -"\n 1,0,0" -"\n " -"\n " -"\n 4triancube" -"\n 4" -"\n 1,0,0,0,160" -"\n -0.4999999999999998,-0.8660254037844387,0,0,-130" -"\n -0.5000000000000004,0.8660254037844384,0,0,-130" -"\n 0,0,1,0,140" -"\n 0,0,-1,0,-180" -"\n 0,0,0,1,110" -"\n 0,0,0,-1,-180" -"\n 0,1,0" -"\n " -"\n " -"\n triangone" -"\n 4" -"\n 1,0,0,0,60" -"\n 0.5,0.8660254037844386,0,0,60" -"\n -0.5,0.8660254037844387,0,0,-20" -"\n -1.0,0,0,0,-100" -"\n -0.5,-0.8660254037844384,0,0,-100" -"\n 0.5,-0.8660254037844387,0,0,-20" -"\n 0,0,1,0,120" -"\n 0,0,-0.4999999999999998,-0.8660254037844387,-120" -"\n 0,0,-0.5000000000000004,0.8660254037844384,-120" -"\n 0,1,1" -"\n " -"\n " -"\n 1,1,1,1" -"\n 0.2,0.2,0.6" -"\n " -"\n 0.8,0.9,0.9" -"\n" -"\n" - - -; ARTICLE: "TODO" "Todo" { $list "A vocab to initialize parameters" @@ -168,7 +165,7 @@ ARTICLE: "4DNav" "The 4DNav app" $nl { $heading "4D Navigator" } "4DNav is a simple tool to visualize 4 dimensionnal objects." -"\n" +$nl "It uses " { $vocab-link "adsoda" } " library to display a 4D space and navigate thru it." $nl "It will display:" diff --git a/unmaintained/4DNav/4DNav.factor b/extra/4DNav/4DNav.factor similarity index 100% rename from unmaintained/4DNav/4DNav.factor rename to extra/4DNav/4DNav.factor diff --git a/unmaintained/4DNav/authors.txt b/extra/4DNav/authors.txt similarity index 100% rename from unmaintained/4DNav/authors.txt rename to extra/4DNav/authors.txt diff --git a/unmaintained/4DNav/camera/authors.txt b/extra/4DNav/camera/authors.txt similarity index 100% rename from unmaintained/4DNav/camera/authors.txt rename to extra/4DNav/camera/authors.txt diff --git a/unmaintained/4DNav/camera/camera-docs.factor b/extra/4DNav/camera/camera-docs.factor similarity index 88% rename from unmaintained/4DNav/camera/camera-docs.factor rename to extra/4DNav/camera/camera-docs.factor index 4898c4e580..65afafc141 100755 --- a/unmaintained/4DNav/camera/camera-docs.factor +++ b/extra/4DNav/camera/camera-docs.factor @@ -32,15 +32,15 @@ HELP: do-look-at ARTICLE: "4DNav.camera" "Camera" { $vocab-link "4DNav.camera" } -"\n" +$nl "A camera is defined by:" { $list { "a position (" { $link camera-eye } ")" } -{ "a focus direction (" { $link camera-focus } ")\n" } -{ "an attitude information (" { $link camera-up } ")\n" } +{ "a focus direction (" { $link camera-focus } ")" } +{ "an attitude information (" { $link camera-up } ")" } } -"\nUse " { $link do-look-at } " in opengl statement in placement of gl-look-at" -"\n\n" +"Use " { $link do-look-at } " in opengl statement in placement of gl-look-at" +$nl "A camera is a " { $vocab-link "4DNav.turtle" } " object. Its a special vocab to handle mouvements of a 3D object:" { $list { "To define a camera" diff --git a/unmaintained/4DNav/camera/camera.factor b/extra/4DNav/camera/camera.factor similarity index 100% rename from unmaintained/4DNav/camera/camera.factor rename to extra/4DNav/camera/camera.factor diff --git a/unmaintained/4DNav/deep/deep-docs.factor b/extra/4DNav/deep/deep-docs.factor similarity index 100% rename from unmaintained/4DNav/deep/deep-docs.factor rename to extra/4DNav/deep/deep-docs.factor diff --git a/unmaintained/4DNav/deep/deep.factor b/extra/4DNav/deep/deep.factor similarity index 100% rename from unmaintained/4DNav/deep/deep.factor rename to extra/4DNav/deep/deep.factor diff --git a/unmaintained/4DNav/deploy.factor b/extra/4DNav/deploy.factor similarity index 100% rename from unmaintained/4DNav/deploy.factor rename to extra/4DNav/deploy.factor diff --git a/unmaintained/4DNav/file-chooser/authors.txt b/extra/4DNav/file-chooser/authors.txt similarity index 100% rename from unmaintained/4DNav/file-chooser/authors.txt rename to extra/4DNav/file-chooser/authors.txt diff --git a/unmaintained/4DNav/file-chooser/file-chooser.factor b/extra/4DNav/file-chooser/file-chooser.factor similarity index 100% rename from unmaintained/4DNav/file-chooser/file-chooser.factor rename to extra/4DNav/file-chooser/file-chooser.factor diff --git a/unmaintained/4DNav/hypercube.xml b/extra/4DNav/hypercube.xml similarity index 100% rename from unmaintained/4DNav/hypercube.xml rename to extra/4DNav/hypercube.xml diff --git a/unmaintained/4DNav/light_test.xml b/extra/4DNav/light_test.xml similarity index 100% rename from unmaintained/4DNav/light_test.xml rename to extra/4DNav/light_test.xml diff --git a/unmaintained/4DNav/multi solids.xml b/extra/4DNav/multi solids.xml similarity index 100% rename from unmaintained/4DNav/multi solids.xml rename to extra/4DNav/multi solids.xml diff --git a/unmaintained/4DNav/prismetriagone.xml b/extra/4DNav/prismetriagone.xml similarity index 100% rename from unmaintained/4DNav/prismetriagone.xml rename to extra/4DNav/prismetriagone.xml diff --git a/unmaintained/4DNav/space-file-decoder/authors.txt b/extra/4DNav/space-file-decoder/authors.txt similarity index 100% rename from unmaintained/4DNav/space-file-decoder/authors.txt rename to extra/4DNav/space-file-decoder/authors.txt diff --git a/unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor b/extra/4DNav/space-file-decoder/space-file-decoder-docs.factor similarity index 100% rename from unmaintained/4DNav/space-file-decoder/space-file-decoder-docs.factor rename to extra/4DNav/space-file-decoder/space-file-decoder-docs.factor diff --git a/unmaintained/4DNav/space-file-decoder/space-file-decoder.factor b/extra/4DNav/space-file-decoder/space-file-decoder.factor similarity index 100% rename from unmaintained/4DNav/space-file-decoder/space-file-decoder.factor rename to extra/4DNav/space-file-decoder/space-file-decoder.factor diff --git a/unmaintained/4DNav/summary.txt b/extra/4DNav/summary.txt similarity index 100% rename from unmaintained/4DNav/summary.txt rename to extra/4DNav/summary.txt diff --git a/unmaintained/4DNav/tags.txt b/extra/4DNav/tags.txt similarity index 100% rename from unmaintained/4DNav/tags.txt rename to extra/4DNav/tags.txt diff --git a/unmaintained/4DNav/triancube.xml b/extra/4DNav/triancube.xml similarity index 100% rename from unmaintained/4DNav/triancube.xml rename to extra/4DNav/triancube.xml diff --git a/unmaintained/4DNav/turtle/authors.txt b/extra/4DNav/turtle/authors.txt similarity index 100% rename from unmaintained/4DNav/turtle/authors.txt rename to extra/4DNav/turtle/authors.txt diff --git a/unmaintained/4DNav/turtle/turtle-docs.factor b/extra/4DNav/turtle/turtle-docs.factor similarity index 100% rename from unmaintained/4DNav/turtle/turtle-docs.factor rename to extra/4DNav/turtle/turtle-docs.factor diff --git a/unmaintained/4DNav/turtle/turtle.factor b/extra/4DNav/turtle/turtle.factor similarity index 100% rename from unmaintained/4DNav/turtle/turtle.factor rename to extra/4DNav/turtle/turtle.factor diff --git a/unmaintained/4DNav/window3D/authors.txt b/extra/4DNav/window3D/authors.txt similarity index 100% rename from unmaintained/4DNav/window3D/authors.txt rename to extra/4DNav/window3D/authors.txt diff --git a/unmaintained/4DNav/window3D/window3D-docs.factor b/extra/4DNav/window3D/window3D-docs.factor similarity index 100% rename from unmaintained/4DNav/window3D/window3D-docs.factor rename to extra/4DNav/window3D/window3D-docs.factor diff --git a/unmaintained/4DNav/window3D/window3D.factor b/extra/4DNav/window3D/window3D.factor similarity index 100% rename from unmaintained/4DNav/window3D/window3D.factor rename to extra/4DNav/window3D/window3D.factor diff --git a/unmaintained/adsoda/adsoda-docs.factor b/extra/adsoda/adsoda-docs.factor similarity index 100% rename from unmaintained/adsoda/adsoda-docs.factor rename to extra/adsoda/adsoda-docs.factor diff --git a/unmaintained/adsoda/adsoda-tests.factor b/extra/adsoda/adsoda-tests.factor similarity index 100% rename from unmaintained/adsoda/adsoda-tests.factor rename to extra/adsoda/adsoda-tests.factor diff --git a/unmaintained/adsoda/adsoda.factor b/extra/adsoda/adsoda.factor similarity index 100% rename from unmaintained/adsoda/adsoda.factor rename to extra/adsoda/adsoda.factor diff --git a/unmaintained/adsoda/adsoda.tests b/extra/adsoda/adsoda.tests similarity index 100% rename from unmaintained/adsoda/adsoda.tests rename to extra/adsoda/adsoda.tests diff --git a/unmaintained/adsoda/authors.txt b/extra/adsoda/authors.txt similarity index 100% rename from unmaintained/adsoda/authors.txt rename to extra/adsoda/authors.txt diff --git a/unmaintained/adsoda/combinators/authors.txt b/extra/adsoda/combinators/authors.txt similarity index 100% rename from unmaintained/adsoda/combinators/authors.txt rename to extra/adsoda/combinators/authors.txt diff --git a/unmaintained/adsoda/combinators/combinators-docs.factor b/extra/adsoda/combinators/combinators-docs.factor similarity index 100% rename from unmaintained/adsoda/combinators/combinators-docs.factor rename to extra/adsoda/combinators/combinators-docs.factor diff --git a/unmaintained/adsoda/combinators/combinators-tests.factor b/extra/adsoda/combinators/combinators-tests.factor similarity index 100% rename from unmaintained/adsoda/combinators/combinators-tests.factor rename to extra/adsoda/combinators/combinators-tests.factor diff --git a/unmaintained/adsoda/combinators/combinators.factor b/extra/adsoda/combinators/combinators.factor similarity index 100% rename from unmaintained/adsoda/combinators/combinators.factor rename to extra/adsoda/combinators/combinators.factor diff --git a/unmaintained/adsoda/solution2/solution2.factor b/extra/adsoda/solution2/solution2.factor similarity index 100% rename from unmaintained/adsoda/solution2/solution2.factor rename to extra/adsoda/solution2/solution2.factor diff --git a/unmaintained/adsoda/solution2/summary.txt b/extra/adsoda/solution2/summary.txt similarity index 100% rename from unmaintained/adsoda/solution2/summary.txt rename to extra/adsoda/solution2/summary.txt diff --git a/unmaintained/adsoda/summary.txt b/extra/adsoda/summary.txt similarity index 100% rename from unmaintained/adsoda/summary.txt rename to extra/adsoda/summary.txt diff --git a/unmaintained/adsoda/tags.txt b/extra/adsoda/tags.txt similarity index 100% rename from unmaintained/adsoda/tags.txt rename to extra/adsoda/tags.txt diff --git a/unmaintained/adsoda/tools/authors.txt b/extra/adsoda/tools/authors.txt similarity index 100% rename from unmaintained/adsoda/tools/authors.txt rename to extra/adsoda/tools/authors.txt diff --git a/unmaintained/adsoda/tools/tools-docs.factor b/extra/adsoda/tools/tools-docs.factor similarity index 100% rename from unmaintained/adsoda/tools/tools-docs.factor rename to extra/adsoda/tools/tools-docs.factor diff --git a/unmaintained/adsoda/tools/tools-tests.factor b/extra/adsoda/tools/tools-tests.factor similarity index 100% rename from unmaintained/adsoda/tools/tools-tests.factor rename to extra/adsoda/tools/tools-tests.factor diff --git a/unmaintained/adsoda/tools/tools.factor b/extra/adsoda/tools/tools.factor similarity index 100% rename from unmaintained/adsoda/tools/tools.factor rename to extra/adsoda/tools/tools.factor