diff --git a/extra/chicago-talk/authors.txt b/extra/talks/chicago-talk/authors.txt similarity index 100% rename from extra/chicago-talk/authors.txt rename to extra/talks/chicago-talk/authors.txt diff --git a/extra/chicago-talk/chicago-talk.factor b/extra/talks/chicago-talk/chicago-talk.factor similarity index 98% rename from extra/chicago-talk/chicago-talk.factor rename to extra/talks/chicago-talk/chicago-talk.factor index aa6208cf93..02ddc421af 100644 --- a/extra/chicago-talk/chicago-talk.factor +++ b/extra/talks/chicago-talk/chicago-talk.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: slides help.markup ; -IN: chicago-talk +IN: talks.chicago-talk CONSTANT: chicago-slides { diff --git a/extra/chicago-talk/deploy.factor b/extra/talks/chicago-talk/deploy.factor similarity index 100% rename from extra/chicago-talk/deploy.factor rename to extra/talks/chicago-talk/deploy.factor diff --git a/extra/chicago-talk/summary.txt b/extra/talks/chicago-talk/summary.txt similarity index 100% rename from extra/chicago-talk/summary.txt rename to extra/talks/chicago-talk/summary.txt diff --git a/extra/chicago-talk/tags.txt b/extra/talks/chicago-talk/tags.txt similarity index 100% rename from extra/chicago-talk/tags.txt rename to extra/talks/chicago-talk/tags.txt diff --git a/extra/galois-talk/authors.txt b/extra/talks/galois-talk/authors.txt similarity index 100% rename from extra/galois-talk/authors.txt rename to extra/talks/galois-talk/authors.txt diff --git a/extra/galois-talk/galois-talk.factor b/extra/talks/galois-talk/galois-talk.factor similarity index 99% rename from extra/galois-talk/galois-talk.factor rename to extra/talks/galois-talk/galois-talk.factor index 27f39d3464..ba0e88842c 100644 --- a/extra/galois-talk/galois-talk.factor +++ b/extra/talks/galois-talk/galois-talk.factor @@ -6,7 +6,7 @@ locals kernel.private help.vocabs assocs quotations urls peg.ebnf tools.annotations tools.crossref help.topics math.functions compiler.tree.optimizer compiler.cfg.optimizer fry ; -IN: galois-talk +IN: talks.galois-talk CONSTANT: galois-slides { @@ -230,7 +230,7 @@ CONSTANT: galois-slides "Help markup is just literal data" { "Look at the help for " { $link T{ link f + } } } "These slides are built with the help system and a custom style sheet" - { $vocab-link "galois-talk" } + { $vocab-link "talks.galois-talk" } } { $slide "Why stack-based?" "Because nobody else is doing it" diff --git a/extra/galois-talk/summary.txt b/extra/talks/galois-talk/summary.txt similarity index 100% rename from extra/galois-talk/summary.txt rename to extra/talks/galois-talk/summary.txt diff --git a/extra/galois-talk/tags.txt b/extra/talks/galois-talk/tags.txt similarity index 100% rename from extra/galois-talk/tags.txt rename to extra/talks/galois-talk/tags.txt diff --git a/extra/google-tech-talk/authors.txt b/extra/talks/google-tech-talk/authors.txt similarity index 100% rename from extra/google-tech-talk/authors.txt rename to extra/talks/google-tech-talk/authors.txt diff --git a/extra/google-tech-talk/google-tech-talk.factor b/extra/talks/google-tech-talk/google-tech-talk.factor similarity index 99% rename from extra/google-tech-talk/google-tech-talk.factor rename to extra/talks/google-tech-talk/google-tech-talk.factor index f58e31d868..8e5771c5f2 100644 --- a/extra/google-tech-talk/google-tech-talk.factor +++ b/extra/talks/google-tech-talk/google-tech-talk.factor @@ -6,7 +6,7 @@ locals kernel.private help.vocabs assocs quotations urls peg.ebnf tools.annotations tools.crossref help.topics math.functions compiler.tree.optimizer compiler.cfg.optimizer fry ; -IN: google-tech-talk +IN: talks.google-tech-talk CONSTANT: google-slides { diff --git a/extra/google-tech-talk/summary.txt b/extra/talks/google-tech-talk/summary.txt similarity index 100% rename from extra/google-tech-talk/summary.txt rename to extra/talks/google-tech-talk/summary.txt diff --git a/extra/google-tech-talk/tags.txt b/extra/talks/google-tech-talk/tags.txt similarity index 100% rename from extra/google-tech-talk/tags.txt rename to extra/talks/google-tech-talk/tags.txt diff --git a/extra/jvm-summit-talk/authors.txt b/extra/talks/jvm-summit-talk/authors.txt similarity index 100% rename from extra/jvm-summit-talk/authors.txt rename to extra/talks/jvm-summit-talk/authors.txt diff --git a/extra/jvm-summit-talk/jvm-summit-talk.factor b/extra/talks/jvm-summit-talk/jvm-summit-talk.factor similarity index 99% rename from extra/jvm-summit-talk/jvm-summit-talk.factor rename to extra/talks/jvm-summit-talk/jvm-summit-talk.factor index 61e0d31abb..24969bc5f0 100644 --- a/extra/jvm-summit-talk/jvm-summit-talk.factor +++ b/extra/talks/jvm-summit-talk/jvm-summit-talk.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: slides help.markup math math.private kernel sequences slots.private ; -IN: jvm-summit-talk +IN: talks.jvm-summit-talk CONSTANT: jvm-summit-slides { diff --git a/extra/jvm-summit-talk/summary.txt b/extra/talks/jvm-summit-talk/summary.txt similarity index 100% rename from extra/jvm-summit-talk/summary.txt rename to extra/talks/jvm-summit-talk/summary.txt diff --git a/extra/minneapolis-talk/authors.txt b/extra/talks/minneapolis-talk/authors.txt similarity index 100% rename from extra/minneapolis-talk/authors.txt rename to extra/talks/minneapolis-talk/authors.txt diff --git a/extra/minneapolis-talk/deploy.factor b/extra/talks/minneapolis-talk/deploy.factor similarity index 100% rename from extra/minneapolis-talk/deploy.factor rename to extra/talks/minneapolis-talk/deploy.factor diff --git a/extra/minneapolis-talk/minneapolis-talk.factor b/extra/talks/minneapolis-talk/minneapolis-talk.factor similarity index 99% rename from extra/minneapolis-talk/minneapolis-talk.factor rename to extra/talks/minneapolis-talk/minneapolis-talk.factor index 4bb2b3f6e9..bfdd8e253e 100644 --- a/extra/minneapolis-talk/minneapolis-talk.factor +++ b/extra/talks/minneapolis-talk/minneapolis-talk.factor @@ -1,6 +1,6 @@ USING: slides help.markup math arrays hashtables namespaces sequences kernel parser memoize ; -IN: minneapolis-talk +IN: talks.minneapolis-talk CONSTANT: minneapolis-slides { diff --git a/extra/minneapolis-talk/summary.txt b/extra/talks/minneapolis-talk/summary.txt similarity index 100% rename from extra/minneapolis-talk/summary.txt rename to extra/talks/minneapolis-talk/summary.txt diff --git a/extra/minneapolis-talk/tags.txt b/extra/talks/minneapolis-talk/tags.txt similarity index 100% rename from extra/minneapolis-talk/tags.txt rename to extra/talks/minneapolis-talk/tags.txt diff --git a/extra/otug-talk/2bi.tiff b/extra/talks/otug-talk/2bi.tiff similarity index 100% rename from extra/otug-talk/2bi.tiff rename to extra/talks/otug-talk/2bi.tiff diff --git a/extra/otug-talk/2bi_at.tiff b/extra/talks/otug-talk/2bi_at.tiff similarity index 100% rename from extra/otug-talk/2bi_at.tiff rename to extra/talks/otug-talk/2bi_at.tiff diff --git a/extra/otug-talk/2bi_star.tiff b/extra/talks/otug-talk/2bi_star.tiff similarity index 100% rename from extra/otug-talk/2bi_star.tiff rename to extra/talks/otug-talk/2bi_star.tiff diff --git a/extra/otug-talk/authors.txt b/extra/talks/otug-talk/authors.txt similarity index 100% rename from extra/otug-talk/authors.txt rename to extra/talks/otug-talk/authors.txt diff --git a/extra/otug-talk/bi.tiff b/extra/talks/otug-talk/bi.tiff similarity index 100% rename from extra/otug-talk/bi.tiff rename to extra/talks/otug-talk/bi.tiff diff --git a/extra/otug-talk/bi_at.tiff b/extra/talks/otug-talk/bi_at.tiff similarity index 100% rename from extra/otug-talk/bi_at.tiff rename to extra/talks/otug-talk/bi_at.tiff diff --git a/extra/otug-talk/bi_star.tiff b/extra/talks/otug-talk/bi_star.tiff similarity index 100% rename from extra/otug-talk/bi_star.tiff rename to extra/talks/otug-talk/bi_star.tiff diff --git a/extra/otug-talk/otug-talk.factor b/extra/talks/otug-talk/otug-talk.factor similarity index 96% rename from extra/otug-talk/otug-talk.factor rename to extra/talks/otug-talk/otug-talk.factor index dfdf2c18a3..3e4ab7ea21 100644 --- a/extra/otug-talk/otug-talk.factor +++ b/extra/talks/otug-talk/otug-talk.factor @@ -7,7 +7,7 @@ tools.annotations tools.crossref help.topics math.functions compiler.tree.optimizer compiler.cfg.optimizer fry ui.gadgets.panes tetris tetris.game combinators generalizations multiline sequences.private ; -IN: otug-talk +IN: talks.otug-talk : $tetris ( element -- ) drop [ gadget. ] ($block) ; @@ -78,11 +78,11 @@ CONSTANT: otug-slides } { $slide "Data flow combinators - cleave family" { { $link bi } ", " { $link tri } ", " { $link cleave } } - { $image "resource:extra/otug-talk/bi.tiff" } + { $image "resource:extra/talks/otug-talk/bi.tiff" } } { $slide "Data flow combinators - cleave family" { { $link 2bi } ", " { $link 2tri } ", " { $link 2cleave } } - { $image "resource:extra/otug-talk/2bi.tiff" } + { $image "resource:extra/talks/otug-talk/2bi.tiff" } } { $slide "Data flow combinators" "First, let's define a data type:" @@ -101,19 +101,19 @@ CONSTANT: otug-slides } { $slide "Data flow combinators - spread family" { { $link bi* } ", " { $link tri* } ", " { $link spread } } - { $image "resource:extra/otug-talk/bi_star.tiff" } + { $image "resource:extra/talks/otug-talk/bi_star.tiff" } } { $slide "Data flow combinators - spread family" { { $link 2bi* } } - { $image "resource:extra/otug-talk/2bi_star.tiff" } + { $image "resource:extra/talks/otug-talk/2bi_star.tiff" } } { $slide "Data flow combinators - apply family" { { $link bi@ } ", " { $link tri@ } ", " { $link napply } } - { $image "resource:extra/otug-talk/bi_at.tiff" } + { $image "resource:extra/talks/otug-talk/bi_at.tiff" } } { $slide "Data flow combinators - apply family" { { $link 2bi@ } } - { $image "resource:extra/otug-talk/2bi_at.tiff" } + { $image "resource:extra/talks/otug-talk/2bi_at.tiff" } } { $slide "Shuffle words" "When data flow combinators are not enough" @@ -258,7 +258,7 @@ var price = (order == null ? null : order.price);" } "Help markup is just literal data" { "Look at the help for " { $link T{ link f + } } } "These slides are built with the help system and a custom style sheet" - { $vocab-link "otug-talk" } + { $vocab-link "talks.otug-talk" } } { $slide "The VM" "Lowest level is the VM: ~12,000 lines of C" diff --git a/extra/otug-talk/summary.txt b/extra/talks/otug-talk/summary.txt similarity index 100% rename from extra/otug-talk/summary.txt rename to extra/talks/otug-talk/summary.txt diff --git a/extra/otug-talk/tags.txt b/extra/talks/otug-talk/tags.txt similarity index 100% rename from extra/otug-talk/tags.txt rename to extra/talks/otug-talk/tags.txt diff --git a/extra/tc-lisp-talk/authors.txt b/extra/talks/tc-lisp-talk/authors.txt similarity index 100% rename from extra/tc-lisp-talk/authors.txt rename to extra/talks/tc-lisp-talk/authors.txt diff --git a/extra/tc-lisp-talk/tc-lisp-talk.factor b/extra/talks/tc-lisp-talk/tc-lisp-talk.factor similarity index 99% rename from extra/tc-lisp-talk/tc-lisp-talk.factor rename to extra/talks/tc-lisp-talk/tc-lisp-talk.factor index fd5b786fd7..c2a0c14ed8 100644 --- a/extra/tc-lisp-talk/tc-lisp-talk.factor +++ b/extra/talks/tc-lisp-talk/tc-lisp-talk.factor @@ -3,7 +3,7 @@ USING: assocs combinators constructors eval help.markup kernel multiline namespaces parser sequences sequences.private slides vocabs.refresh words fry ; -IN: tc-lisp-talk +IN: talks.tc-lisp-talk CONSTANT: tc-lisp-slides { diff --git a/extra/vpri-talk/authors.txt b/extra/talks/vpri-talk/authors.txt similarity index 100% rename from extra/vpri-talk/authors.txt rename to extra/talks/vpri-talk/authors.txt diff --git a/extra/vpri-talk/summary.txt b/extra/talks/vpri-talk/summary.txt similarity index 100% rename from extra/vpri-talk/summary.txt rename to extra/talks/vpri-talk/summary.txt diff --git a/extra/vpri-talk/tags.txt b/extra/talks/vpri-talk/tags.txt similarity index 100% rename from extra/vpri-talk/tags.txt rename to extra/talks/vpri-talk/tags.txt diff --git a/extra/vpri-talk/vpri-talk.factor b/extra/talks/vpri-talk/vpri-talk.factor similarity index 99% rename from extra/vpri-talk/vpri-talk.factor rename to extra/talks/vpri-talk/vpri-talk.factor index a3d27f1e44..cba09eb312 100644 --- a/extra/vpri-talk/vpri-talk.factor +++ b/extra/talks/vpri-talk/vpri-talk.factor @@ -6,7 +6,7 @@ locals kernel.private help.vocabs assocs quotations urls peg.ebnf tools.annotations tools.crossref help.topics math.functions compiler.tree.optimizer compiler.cfg.optimizer fry ; -IN: vpri-talk +IN: talks.vpri-talk CONSTANT: vpri-slides { @@ -273,7 +273,7 @@ CONSTANT: vpri-slides "Help markup is just literal data" { "Look at the help for " { $link T{ link f + } } } "These slides are built with the help system and a custom style sheet" - { $vocab-link "vpri-talk" } + { $vocab-link "talks.vpri-talk" } } { $slide "Some line counts" "VM: 12,000 lines of C"