suzanne.soy/scribble-math
1
0
Fork 0
Code Issues 8 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Added support for tex2svg #10

Merged
wilbowma merged 9 commits from master into master 2020-07-25 06:13:48 +01:00
Conversation 1 Commits 9 Files Changed 3 +130 -3
wilbowma commented 2020-07-20 07:10:53 +01:00 (Migrated from github.com)
Copy Link

This adds (and documents) support for using tex2svg, from the node package mathjax-node-cli, to statically render math to SVG in the HTML backend.

This adds (and documents) support for using `tex2svg`, from the node package `mathjax-node-cli`, to statically render math to SVG in the HTML backend.
coveralls commented 2020-07-20 07:26:15 +01:00 (Migrated from github.com)
Copy Link

Coverage Status

Coverage increased (+2.3%) to 66.85% when pulling f6b388b462 on wilbowma:master into 1793123c88 on jsmaniac:master.

[![Coverage Status](https://coveralls.io/builds/32316373/badge)](https://coveralls.io/builds/32316373) Coverage increased (+2.3%) to 66.85% when pulling **f6b388b4629d37664de061371c92c81eca91b993 on wilbowma:master** into **1793123c881915c1731620f99aa8e4e281abb59b on jsmaniac:master**.
SuzanneSoy (Migrated from github.com) approved these changes 2020-07-23 19:22:09 +01:00
SuzanneSoy (Migrated from github.com) left a comment
Copy Link

Sorry for the delayed review and thanks a lot for the patch!

Sorry for the delayed review and thanks a lot for the patch!
scribblings/scribble-math.scrbl
SuzanneSoy (Migrated from github.com) commented 2020-07-23 19:16:29 +01:00
Copy Link
 Produces an @racket[element?] which contains the given
 @racket[math] rendered as an HTML SVG literal.
```suggestion Produces an @racket[element?] which contains the given @racket[math] rendered as an HTML SVG literal. ```
SuzanneSoy (Migrated from github.com) commented 2020-07-23 19:17:52 +01:00
Copy Link
Produces an @racket[element?] which contains the given
@racket[math] rendered as an HTML SVG literal.
```suggestion Produces an @racket[element?] which contains the given @racket[math] rendered as an HTML SVG literal. ```
scribblings/scribble-math.scrbl
SuzanneSoy (Migrated from github.com) commented 2020-07-23 19:21:03 +01:00
Copy Link
The functions @racket[$-tex2svg] and @racket[$$-tex2svg] use this parameter only
when rendering the document as HTML.
```suggestion The functions @racket[$-tex2svg] and @racket[$$-tex2svg] use this parameter only when rendering the document as HTML. ```
SuzanneSoy (Migrated from github.com) reviewed 2020-07-23 21:25:17 +01:00
SuzanneSoy (Migrated from github.com) left a comment
Copy Link

Use version-case to enable tex2svg on Racket 6.12 and above (previous versions lack xexpr-property).

Use version-case to enable tex2svg on Racket 6.12 and above (previous versions lack `xexpr-property`).
dollar.rkt
@ -11,2 +11,3 @@
"mathjax-convert-unicode.rkt"
racket/list)
racket/list
(only-in xml cdata)
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:06:37 +01:00
Copy Link
         racket/list
         version-case
```suggestion racket/list version-case ```
dollar.rkt
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:13:00 +01:00
Copy Link
(version-case
 [(version>= (version) "6.11.0.900"]
  (define current-tex2svg-path (make-parameter #f))

  (define (find-tex2svg)
    (define paths
      (list
       "./node_modules/.bin/"
       "/usr/local/lib/node_modules/mathjax-node-cli/bin/"
       "/usr/lib/node_modules/mathjax-node-cli/bin/"
       "/usr/local/bin/"
       "/usr/local/sbin/"
       "/usr/bin/"
       "/usr/sbin/"))
    (for/or ([path paths])
      (file-exists? (format "~a/tex2svg" path))))

  (define tex2svg
    (let ([tex2svg-path (find-tex2svg)])
      (lambda (#:inline [inline #f] strs)
        (if (or (current-tex2svg-path) tex2svg-path)
            (match (process (format
                             "tex2svg ~a'~a'"
                             (if inline "--inline " "")
                                 (apply string-append strs)))
              [`(,stdout . ,_)
               (port->string stdout)])
            (error 'tex2svg "Cannot find tex2svg in path or common places; set path manually with current-tex2svg-path.")))))


  (define ($-tex2svg strs)
    (elem #:style (style #f
                         (list
                          (xexpr-property
                           (cdata #f #f (tex2svg #:inline #t (flatten strs)))
                           (cdata #f #f ""))))))])
```suggestion (version-case [(version>= (version) "6.11.0.900"] (define current-tex2svg-path (make-parameter #f)) (define (find-tex2svg) (define paths (list "./node_modules/.bin/" "/usr/local/lib/node_modules/mathjax-node-cli/bin/" "/usr/lib/node_modules/mathjax-node-cli/bin/" "/usr/local/bin/" "/usr/local/sbin/" "/usr/bin/" "/usr/sbin/")) (for/or ([path paths]) (file-exists? (format "~a/tex2svg" path)))) (define tex2svg (let ([tex2svg-path (find-tex2svg)]) (lambda (#:inline [inline #f] strs) (if (or (current-tex2svg-path) tex2svg-path) (match (process (format "tex2svg ~a'~a'" (if inline "--inline " "") (apply string-append strs))) [`(,stdout . ,_) (port->string stdout)]) (error 'tex2svg "Cannot find tex2svg in path or common places; set path manually with current-tex2svg-path."))))) (define ($-tex2svg strs) (elem #:style (style #f (list (xexpr-property (cdata #f #f (tex2svg #:inline #t (flatten strs))) (cdata #f #f ""))))))]) ```
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:13:37 +01:00
Copy Link
(version-case
 [(version>= (version) "6.11.0.900"]
  (define ($$-tex2svg strs)
    (elem #:style (style #f
                         (list
                          (xexpr-property
                           (cdata #f #f (tex2svg (flatten strs)))
                           (cdata #f #f ""))))))])
```suggestion (version-case [(version>= (version) "6.11.0.900"] (define ($$-tex2svg strs) (elem #:style (style #f (list (xexpr-property (cdata #f #f (tex2svg (flatten strs))) (cdata #f #f ""))))))]) ```
dollar.rkt
@ -303,0 +359,4 @@
(define ($$-tex2svg strs)
(elem #:style (style #f
(list
(xexpr-property
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:14:04 +01:00
Copy Link
(version-case
 [(version>= (version) "6.11.0.900"]
  (define (use-tex2svg)
    ($-html-handler $-tex2svg)
    ($$-html-handler $$-tex2svg)
    (void))])
```suggestion (version-case [(version>= (version) "6.11.0.900"] (define (use-tex2svg) ($-html-handler $-tex2svg) ($$-html-handler $$-tex2svg) (void))]) ```
scribblings/scribble-math.scrbl
SuzanneSoy (Migrated from github.com) commented 2020-07-23 20:48:00 +01:00
Copy Link

 This procedure requires Racket 6.12 or later.}
```suggestion This procedure requires Racket 6.12 or later.} ```
SuzanneSoy (Migrated from github.com) commented 2020-07-23 20:58:29 +01:00
Copy Link
@defproc[($$-tex2svg [math (listof? string?)]) element?]{
 Produces an @racket[element?] which contains the given
 @racket[math] rendered as an HTML SVG literal.
 It is rendered in @tech{display mode} math using @tt{tex2svg}.
 More precisely, the resulting element uses the @racket[xexpr-property] to
 render the SVG directly to the HTML document.
 This means no new scripts or stylesheets are added to the document.
 It also has no style, so its style cannot be customized.

 This procedure requires Racket 6.12 or later.}
```suggestion @defproc[($$-tex2svg [math (listof? string?)]) element?]{ Produces an @racket[element?] which contains the given @racket[math] rendered as an HTML SVG literal. It is rendered in @tech{display mode} math using @tt{tex2svg}. More precisely, the resulting element uses the @racket[xexpr-property] to render the SVG directly to the HTML document. This means no new scripts or stylesheets are added to the document. It also has no style, so its style cannot be customized. This procedure requires Racket 6.12 or later.} ```
scribblings/scribble-math.scrbl
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:00:16 +01:00
Copy Link

 This procedure requires Racket 6.12 or later.}
```suggestion This procedure requires Racket 6.12 or later.} ```
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:01:07 +01:00
Copy Link
 A parameter whose value is the path to the @tt{tex2svg} binary.
 This binary is used to transform math code into HTML when using the @tt{tex2svg}
 backend.
 
 The functions @racket[$-tex2svg] and @racket[$$-tex2svg] use this parameter only
 when rendering the document as HTML.

 This parameter requires Racket 6.12 or later.}
```suggestion A parameter whose value is the path to the @tt{tex2svg} binary. This binary is used to transform math code into HTML when using the @tt{tex2svg} backend. The functions @racket[$-tex2svg] and @racket[$$-tex2svg] use this parameter only when rendering the document as HTML. This parameter requires Racket 6.12 or later.} ```
SuzanneSoy (Migrated from github.com) reviewed 2020-07-23 21:56:14 +01:00
SuzanneSoy (Migrated from github.com) left a comment
Copy Link

version-case is not compatible with some older Racket versions (6.1), using a hand-made macro.

`version-case` is not compatible with some older Racket versions (6.1), using a hand-made macro.
dollar.rkt
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:49:48 +01:00
Copy Link
```suggestion ```
dollar.rkt
@ -26,0 +37,4 @@
#'(begin)
#'(begin . rest))]))
(if-version≥6.12
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:50:39 +01:00
Copy Link

(define-syntax (if-version≥6.12 stx)
  (syntax-case stx ()
    [(_ . rest)
     (if (version>= (version) "6.11.0.900")
         #'(begin . rest)
         #'(begin))]))
```suggestion (define-syntax (if-version≥6.12 stx) (syntax-case stx () [(_ . rest) (if (version>= (version) "6.11.0.900") #'(begin . rest) #'(begin))])) ```
dollar.rkt
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:51:13 +01:00
Copy Link
(if-version≥6.12
```suggestion (if-version≥6.12 ```
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:51:39 +01:00
Copy Link
                           (cdata #f #f "")))))))
```suggestion (cdata #f #f ""))))))) ```
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:51:54 +01:00
Copy Link
(if-version≥6.12
```suggestion (if-version≥6.12 ```
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:52:04 +01:00
Copy Link
                           (cdata #f #f "")))))))
```suggestion (cdata #f #f ""))))))) ```
dollar.rkt
@ -303,2 +364,4 @@
(cdata #f #f "")))))))
(define $-html-handler (make-parameter $-katex))
(define $$-html-handler (make-parameter $$-katex))
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:52:12 +01:00
Copy Link
(if-version≥6.12
```suggestion (if-version≥6.12 ```
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:52:20 +01:00
Copy Link
    (void)))
```suggestion (void))) ```
info.rkt
SuzanneSoy (Migrated from github.com) commented 2020-07-23 21:53:09 +01:00
Copy Link
               "scribble-lib"))
```suggestion "scribble-lib")) ```
SuzanneSoy (Migrated from github.com) reviewed 2020-07-23 22:03:59 +01:00
dollar.rkt
SuzanneSoy (Migrated from github.com) commented 2020-07-23 22:03:41 +01:00
Copy Link
         (only-in racket/port port->string)
         (for-syntax racket/base))
```suggestion (only-in racket/port port->string) (for-syntax racket/base)) ```
SuzanneSoy (Migrated from github.com) reviewed 2020-07-23 22:24:11 +01:00
dollar.rkt
SuzanneSoy (Migrated from github.com) commented 2020-07-23 22:23:33 +01:00
Copy Link
(define-syntax (if-version≥6.12 stx)
  (syntax-case stx ()
    [(_ . rest)
     (if (and (not (regexp-match #px"^6\.11\.0\.900$" (version)))
              (or (regexp-match #px"^6(\\.([0123456789]|10|11)(\\..*|)|)$" (version))
                  (regexp-match #px"^[123245]\\..*$" (version))))
         #'(begin)
         #'(begin . rest))]))
```suggestion (define-syntax (if-version≥6.12 stx) (syntax-case stx () [(_ . rest) (if (and (not (regexp-match #px"^6\.11\.0\.900$" (version))) (or (regexp-match #px"^6(\\.([0123456789]|10|11)(\\..*|)|)$" (version)) (regexp-match #px"^[123245]\\..*$" (version)))) #'(begin) #'(begin . rest))])) ```
SuzanneSoy (Migrated from github.com) reviewed 2020-07-23 23:09:45 +01:00
dollar.rkt
SuzanneSoy (Migrated from github.com) commented 2020-07-23 23:08:36 +01:00
Copy Link
     (if (and (not (regexp-match #px"^6\\.11\\.0\\.900$" (version)))
```suggestion (if (and (not (regexp-match #px"^6\\.11\\.0\\.900$" (version))) ```
SuzanneSoy (Migrated from github.com) reviewed 2020-07-25 04:35:45 +01:00
dollar.rkt
SuzanneSoy (Migrated from github.com) commented 2020-07-25 04:32:15 +01:00
Copy Link
         use-katex
         use-mathjax
         with-html5)
```suggestion use-katex use-mathjax with-html5) ```
dollar.rkt
@ -26,3 +44,4 @@
current-tex2svg-path))
;; KaTeX does not work well with the HTML 4.01 Transitional loose DTD,
;; so we define a style modifier which replaces the prefix for HTML rendering.
(define (with-html5 doc-style)
SuzanneSoy (Migrated from github.com) commented 2020-07-25 04:33:30 +01:00
Copy Link
         #'(begin . rest))]))

(if-version≥6.12
  (provide $-tex2svg
           $$-tex2svg
           use-tex2svg
           current-tex2svg-path))
```suggestion #'(begin . rest))])) (if-version≥6.12 (provide $-tex2svg $$-tex2svg use-tex2svg current-tex2svg-path)) ```
Sign in to join this conversation.
Reviewers
No reviewers
SuzanneSoy
Labels
Clear labels   
bug

   
duplicate

   
enhancement

   
help wanted

   
invalid

   
question

   
wontfix
No Label
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: suzanne.soy/scribble-math#10
No description provided.
Delete Branch "master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?