help.markup: change default-style to use with-nesting.

diff --git a/basis/help/markup/markup.factor b/basis/help/markup/markup.factor
index c38be79b8ff19a38a99aed1ab158d1fcbe09f333..b8d58c43286b51fc39ad412b1839a48383efc7a0 100644 (file)
--- a/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@ -49,9 +49,7 @@ M: f print-element drop ;
     [ print-element ] with-style ;
 
 : with-default-style ( quot -- )
-    default-span-style get [
-        default-block-style get swap with-nesting
-    ] with-style ; inline
+    default-style get swap with-nesting ; inline
 
 : print-content ( element -- )
     [ print-element ] with-default-style ;

diff --git a/basis/help/stylesheet/stylesheet.factor b/basis/help/stylesheet/stylesheet.factor
index fdc7b64364ea7521539b3e068f18c046104604f3..ad5f38e58cec12a3b6cc30c1bd5761c990ef1f01 100644 (file)
--- a/basis/help/stylesheet/stylesheet.factor
+++ b/basis/help/stylesheet/stylesheet.factor
@@ -22,18 +22,14 @@ IN: help.stylesheet
 : font-size-span ( -- n )
     13/12 default-font-size * >integer ;
 
-SYMBOL: default-span-style
+SYMBOL: default-style
 H{
     { font-name $ default-sans-serif-font-name }
     { font-size $ font-size-span }
     { foreground $ text-color }
     { font-style plain }
-} default-span-style set-global
-
-SYMBOL: default-block-style
-H{
     { wrap-margin $ wrap-margin-full }
-} default-block-style set-global
+} default-style set-global
 
 SYMBOL: link-style
 H{
@@ -148,7 +144,7 @@ SYMBOL: bullet
     [
         font-size
         {
-            default-span-style title-style
+            default-style title-style
             help-path-style heading-style
             subsection-style snippet-style
             code-char-style

diff --git a/basis/ui/theme/switching/switching.factor b/basis/ui/theme/switching/switching.factor
index bd866c92cced9a52e69a7baa65bb8abbc775300b..8a39da356adcc2703893f54420d9de7ad2bfafd3 100644 (file)
--- a/basis/ui/theme/switching/switching.factor
+++ b/basis/ui/theme/switching/switching.factor
@@ -16,7 +16,7 @@ IN: ui.theme.switching
     content-background default-font-background-color set-global
 
     ! help.stylesheet
-    default-span-style text-color foreground update-style
+    default-style text-color foreground update-style
     link-style link-color foreground update-style
     title-style title-color foreground update-style
     help-path-style help-path-border-color table-border update-style