io.styles: bailed out on the with-nested-styles combinator

diff --git a/basis/help/help.factor b/basis/help/help.factor
index 214ff14632ecdc432861f1d71730f0a8e39c4d21..e31c705e2673882164e112a97765305bc81a699f 100644 (file)
--- a/basis/help/help.factor
+++ b/basis/help/help.factor
@@ -117,8 +117,10 @@ M: word set-article-parent swap "help-parent" set-word-prop ;
 
 : $title ( topic -- )
     title-style get [
-        [ ($title) ] [ ($navigation) ] bi
-    ] with-nested-style nl ;
+        title-style get [
+            [ ($title) ] [ ($navigation) ] bi
+        ] with-nesting
+    ] with-style nl ;
 
 : print-topic ( topic -- )
     >link

diff --git a/basis/io/styles/styles-docs.factor b/basis/io/styles/styles-docs.factor
index 19952b2b157ccbbb93171ab9240a69716ac6f795..8d29cffb0466261102c249b921c8557946af5f1a 100755 (executable)
--- a/basis/io/styles/styles-docs.factor
+++ b/basis/io/styles/styles-docs.factor
@@ -90,13 +90,6 @@ HELP: with-style
 { $notes "Details are in the documentation for " { $link make-span-stream } "." }
 $io-error ;
 
-HELP: with-nested-style
-{ $values { "style" assoc } { "quot" quotation } }
-{ $description "Calls the quotation in a new dynamic scope where calls to " { $link write } ", " { $link format } " and other stream output words automatically inherit style settings from " { $snippet "style" } "." }
-$nl
-"This word is intended to be used when you have a single style assoc that contains both character and paragraph styles."
-$io-error ;
-
 ARTICLE: "formatted-stream-protocol" "Formatted stream protocol"
 "The " { $vocab-link "io.styles" } " vocabulary defines a protocol for output streams that support rich text."
 { $subsection stream-format }

diff --git a/basis/io/styles/styles.factor b/basis/io/styles/styles.factor
index a3a1d991f36e06a31cc70521f6562dc85c58c434..b141d8d2f713e0299ba23db3749c919c82bf3894 100644 (file)
--- a/basis/io/styles/styles.factor
+++ b/basis/io/styles/styles.factor
@@ -42,9 +42,6 @@ make-cell-stream stream-write-table ;
     [ output-stream get make-block-stream ] dip
     with-output-stream ; inline
 
-: with-nested-style ( style quot -- )
-    over [ with-nesting ] with-style ; inline
-
 TUPLE: filter-writer stream ;
 
 CONSULT: output-stream-protocol filter-writer stream>> ;