From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 23 Jan 2017 21:41:56 +0000 (-0600)
Subject: Switch things over to using scrubl
X-Git-Tag: fosdem-2017~93
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=6f7c1d4f9a2043c16f83facef6b3216e45e14f40;p=mudsync.git

Switch things over to using scrubl
---

diff --git a/mudsync/networking.scm b/mudsync/networking.scm
index 228a89f..33ad424 100644
--- a/mudsync/networking.scm
+++ b/mudsync/networking.scm
@@ -27,7 +27,7 @@
   #:use-module (oop goops)
 
   ;; Formatting
-  #:use-module (sxml simple)
+  #:use-module (mudsync scrubl)
 
   ;; used by web server only
   #:use-module (sxml simple)
@@ -194,9 +194,7 @@
 (define* (nm-send-to-client-id nm message #:key client data)
   "Send DATA to TO-CLIENT id"
   (define formatted-data
-    (call-with-output-string
-      (lambda (p)
-        (sxml->xml data p))))
+    (scrubl-write scrubl-sxml data))
   (define client-obj (hash-ref (nm-clients nm) client))
   (match client-obj
     (#f (throw 'no-such-client
diff --git a/mudsync/room.scm b/mudsync/room.scm
index 6efac43..8dc1d84 100644
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -185,7 +185,7 @@
   (define final-text
     (if occupant-names-string
         `(,@room-text
-          (p (i ,occupant-names-string)))
+          (p (em ,occupant-names-string)))
         room-text))
   
   (<- player-id 'tell
diff --git a/mudsync/scrubl.scm b/mudsync/scrubl.scm
index 88438be..a3daa26 100644
--- a/mudsync/scrubl.scm
+++ b/mudsync/scrubl.scm
@@ -30,8 +30,12 @@
   #:use-module (srfi srfi-9)
   #:use-module (sxml simple)
   #:use-module (oop goops)
+  #:use-module (ice-9 vlist)
+  #:use-module (ice-9 vlist)
+  #:use-module (ice-9 hash-table)
   #:export (make-scrubl
             scrubl? scrubl-extend-fields
+            scrubl-write
             scrubl-sxml scrubl-sxml-simple-field))
 
 (define (order-symlist-args symlist-args)
@@ -113,7 +117,10 @@ Pass in optional extra ARGS to the main META-WRITE"
 (define (scrubl-sxml-write scrubl obj)
   (call-with-output-string
     (lambda (p)
-      (sxml->xml (scrubl-write-obj scrubl obj) p))))
+      (sxml->xml
+       (scrubl-write-obj scrubl obj)
+       ;; (list 'pre (scrubl-write-obj scrubl obj))
+       p))))
 
 
 (define (scrubl-sxml-simple-field sym)
@@ -126,7 +133,12 @@ Pass in optional extra ARGS to the main META-WRITE"
 
 (define scrubl-sxml
   (make-scrubl `((p . ,(scrubl-sxml-simple-field 'p))
-                 (strong . ,(scrubl-sxml-simple-field 'strong)) ; usually bold
-                 (emph . ,(scrubl-sxml-simple-field 'em))
-                 (br . ,(scrubl-sxml-simple-field 'br))) ; usually italicized
+                 (strong . ,(scrubl-sxml-simple-field 'strong))
+                 (bold . ,(scrubl-sxml-simple-field 'strong))
+                 (b . ,(scrubl-sxml-simple-field 'strong))
+                 (em . ,(scrubl-sxml-simple-field 'em))
+                 (i . ,(scrubl-sxml-simple-field 'em))
+                 (br . ,(scrubl-sxml-simple-field 'br))  ;; is this useful?
+                 (ul . ,(scrubl-sxml-simple-field 'ul))
+                 (li . ,(scrubl-sxml-simple-field 'li)))
                scrubl-sxml-write))