help.markup: allow $url to have display text that's not just the url.

diff --git a/basis/help/markup/markup.factor b/basis/help/markup/markup.factor
index b8638a65de42eed75db00fffce2e8504f64f5855..7bd73e0bb6814e02edd2addbad0e5543750ce937 100644 (file)
--- a/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@ -77,7 +77,7 @@ ALIAS: $slot $snippet
     [ strong-style get print-element* ] ($span) ;
 
 : $url ( children -- )
-    first dup >url [
+    [ ?second ] [ first ] bi over [ nip dup ] unless >url [
         dup present href associate url-style get assoc-union
         [ write-object ] with-style
     ] ($span) ;

diff --git a/extra/unicode/control-pictures/control-pictures-docs.factor b/extra/unicode/control-pictures/control-pictures-docs.factor
index 7567444e3ae2cd66191d59c1de545ae5b2c81b5d..feeca10270710a7836cdefedb554d360cf75f8a2 100644 (file)
--- a/extra/unicode/control-pictures/control-pictures-docs.factor
+++ b/extra/unicode/control-pictures/control-pictures-docs.factor
@@ -1,16 +1,8 @@
 ! Copyright (C) 2017 Pi.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs hashtables help.markup help.stylesheet help.syntax
-help.topics io.styles kernel namespaces present sequences
-strings urls ;
+USING: help.markup help.syntax strings ;
 IN: unicode.control-pictures
 
-: $url-to ( children -- )
-    first2 >url [
-        dup present href associate url-style get assoc-union
-        [ write-object ] with-style
-    ] ($span) ;
-
 HELP: control-pictures
 { $values
     { "string" string }
@@ -18,7 +10,7 @@ HELP: control-pictures
 { $description "Transforms C0 control characters into their corresponding Control Picture block codepoints." } ;
 
 ARTICLE: "unicode.control-pictures" "Control Pictures"
-"The " { $vocab-link "unicode.control-pictures" } " vocabulary provides a utility word " { $link control-pictures } " for transforming characters in the nonprintable " { $url-to "ASCII C0 block" "http://www.unicode.org/charts/PDF/U0000.pdf" } " to their representations in the " { $url-to "Control Pictures" "http://www.unicode.org/charts/PDF/U2400.pdf" } " block. It has no effect on any other characters."
+"The " { $vocab-link "unicode.control-pictures" } " vocabulary provides a utility word " { $link control-pictures } " for transforming characters in the nonprintable " { $url "http://www.unicode.org/charts/PDF/U0000.pdf" "ASCII C0 block" } " to their representations in the " { $url "http://www.unicode.org/charts/PDF/U2400.pdf" "Control Pictures" } " block. It has no effect on any other characters."
 ;
 
 ABOUT: "unicode.control-pictures"