From e6a5bbb6395696a99115d578d397f6931565c74f Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Mon, 16 Jul 2018 14:04:04 -0700 Subject: [PATCH] input leniency --- pollen/private/ts.rktd | 2 +- pollen/unstable/convert.rkt | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd index e98198d..9055056 100644 --- a/pollen/private/ts.rktd +++ b/pollen/private/ts.rktd @@ -1 +1 @@ -1531059962 +1531775044 diff --git a/pollen/unstable/convert.rkt b/pollen/unstable/convert.rkt index d36ec0c..169fae7 100644 --- a/pollen/unstable/convert.rkt +++ b/pollen/unstable/convert.rkt @@ -55,9 +55,10 @@ You are kitty}") (define (conjoin . fs) (λ (x) (andmap (λ (f) (f x)) fs))) -(define/contract+provide (html->xexpr html-string) - (string? . -> . xexpr?) +(define/contract+provide (html->xexpr . html-strings) + (() () #:rest (listof string?) . ->* . xexpr?) (use-html-spec #f) + (define html-string (string-join html-strings "")) (define xexpr-results ; loop result will be a list with whitespace elements, so strip those out (filter-not (conjoin string? whitespace?) @@ -81,9 +82,9 @@ You are kitty}") (check-equal? (html->xexpr "\n") "")) -(define/contract+provide (html->pollen html-string #:white-p? [white-p? #f]) - ((string?) (#:white-p? boolean?) . ->* . string?) - (xexpr->pollen #:white-p? white-p? (html->xexpr html-string))) +(define/contract+provide (html->pollen #:white-p? [white-p? #f] . html-strings) + (() (#:white-p? boolean?) #:rest (listof string?) . ->* . string?) + (xexpr->pollen #:white-p? white-p? (apply html->xexpr html-strings))) (define/contract+provide (url->pollen url-or-string #:white-p? [white-p? #f])