diff --git a/quad/qtest/fark.rkt b/quad/qtest/fark.rkt index 9569b172..6ba07418 100644 --- a/quad/qtest/fark.rkt +++ b/quad/qtest/fark.rkt @@ -1,4 +1,3 @@ #lang quadwriter - -◊q[#:link "https://beautifulracket.com"]{Hello world} \ No newline at end of file +Hello world \ No newline at end of file diff --git a/quad/qtest/fonts/charter/charter-bold-italic.otf b/quad/qtest/fonts/charter/charter-bold-italic.otf deleted file mode 100644 index f9f56df8..00000000 Binary files a/quad/qtest/fonts/charter/charter-bold-italic.otf and /dev/null differ diff --git a/quad/qtest/fonts/charter/charter-bold.otf b/quad/qtest/fonts/charter/charter-bold.otf deleted file mode 100644 index 2c9089db..00000000 Binary files a/quad/qtest/fonts/charter/charter-bold.otf and /dev/null differ diff --git a/quad/qtest/fonts/charter/charter-italic.otf b/quad/qtest/fonts/charter/charter-italic.otf deleted file mode 100644 index 0b0917e7..00000000 Binary files a/quad/qtest/fonts/charter/charter-italic.otf and /dev/null differ diff --git a/quad/qtest/fonts/charter/charter.otf b/quad/qtest/fonts/charter/charter.otf deleted file mode 100644 index d2314d35..00000000 Binary files a/quad/qtest/fonts/charter/charter.otf and /dev/null differ diff --git a/quad/qtest/sample-main.rkt b/quad/qtest/sample-main.rkt new file mode 100644 index 00000000..40521cf0 --- /dev/null +++ b/quad/qtest/sample-main.rkt @@ -0,0 +1,7 @@ +#lang quadwriter/markup + +◊h2{yes} + +Hello ◊b{world} you are my + +◊em{power animal} \ No newline at end of file diff --git a/quad/quadwriter/core.rkt b/quad/quadwriter/core.rkt index 64d67cc1..aad3219f 100644 --- a/quad/quadwriter/core.rkt +++ b/quad/quadwriter/core.rkt @@ -517,25 +517,25 @@ #:size (pt indent-val 0)) qs-out)]))) (define (render-pdf xs pdf-path) - (define pdf (time-name make-pdf (make-pdf #:compress #t + (define pdf (make-pdf #:compress #t #:auto-first-page #f #:output-path pdf-path #:width (if zoom-mode? 350 612) - #:height (if zoom-mode? 400 792)))) + #:height (if zoom-mode? 400 792))) (define line-width (- (pdf-width pdf) (* 2 side-margin))) (define vertical-height (- (pdf-height pdf) top-margin bottom-margin)) (parameterize ([current-pdf pdf] [verbose-quad-printing? #false]) (setup-font-path-table! pdf-path) - (let* ([x (time-name parse-qexpr - (qexpr->quad `(q ((font-family ,default-font-family) - (font-size ,(number->string default-font-size))) ,xs)))] - [x (time-name atomize (atomize x #:attrs-proc handle-cascading-attrs))] + (let* ([x (qexpr->quad `(q ((font-family ,default-font-family) + (font-size ,(number->string default-font-size))) ,xs))] + [x (atomize x #:attrs-proc handle-cascading-attrs)] [x (time-name hyphenate (handle-hyphenate x))] - [x (time-name ->string-quad (map ->string-quad x))] - [x (time-name insert-first-line-indents (insert-first-line-indents x))] + [x (map ->string-quad x)] + [x (insert-first-line-indents x)] [x (time-name line-wrap (line-wrap x line-width))] - [x (time-name apply-keeps (apply-keeps x))] + [x (apply-keeps x)] [x (time-name page-wrap (page-wrap x vertical-height pdf-path))] [x (time-name position (position (struct-copy quad q:doc [elems x])))]) - (time-name draw (draw x pdf))))) + (time-name draw (draw x pdf)) + (displayln (format "wrote PDF to ~a" pdf-path))))) diff --git a/quad/quadwriter/fonts/charter/charter-bold-italic.otf b/quad/quadwriter/fonts/charter/charter-bold-italic.otf deleted file mode 100644 index f9f56df8..00000000 Binary files a/quad/quadwriter/fonts/charter/charter-bold-italic.otf and /dev/null differ diff --git a/quad/quadwriter/fonts/charter/charter-bold.otf b/quad/quadwriter/fonts/charter/charter-bold.otf deleted file mode 100644 index 2c9089db..00000000 Binary files a/quad/quadwriter/fonts/charter/charter-bold.otf and /dev/null differ diff --git a/quad/quadwriter/fonts/charter/charter-italic.otf b/quad/quadwriter/fonts/charter/charter-italic.otf deleted file mode 100644 index 0b0917e7..00000000 Binary files a/quad/quadwriter/fonts/charter/charter-italic.otf and /dev/null differ diff --git a/quad/quadwriter/fonts/charter/charter.otf b/quad/quadwriter/fonts/charter/charter.otf deleted file mode 100644 index d2314d35..00000000 Binary files a/quad/quadwriter/fonts/charter/charter.otf and /dev/null differ diff --git a/quad/quadwriter/fonts/fira-mono/LICENSE.txt b/quad/quadwriter/fonts/fira-mono/LICENSE.txt new file mode 100755 index 00000000..37c4a30b --- /dev/null +++ b/quad/quadwriter/fonts/fira-mono/LICENSE.txt @@ -0,0 +1,94 @@ +Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A. +with Reserved Font Name < Fira >, + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/quad/qtest/fonts/fira-mono/fira-mono.otf b/quad/quadwriter/fonts/fira-mono/fira-mono.otf similarity index 100% rename from quad/qtest/fonts/fira-mono/fira-mono.otf rename to quad/quadwriter/fonts/fira-mono/fira-mono.otf diff --git a/quad/quadwriter/fonts/fira-sans-light/LICENSE.txt b/quad/quadwriter/fonts/fira-sans-light/LICENSE.txt new file mode 100755 index 00000000..b4a39671 --- /dev/null +++ b/quad/quadwriter/fonts/fira-sans-light/LICENSE.txt @@ -0,0 +1,99 @@ +Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ +with Reserved Font Name Fira Sans. + +Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ +with Reserved Font Name Fira Mono. + +Copyright (c) 2014, Telefonica S.A. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/quad/qtest/fonts/fira-light/fira-light-bold-italic.otf b/quad/quadwriter/fonts/fira-sans-light/fira-sans-light-bold-italic.otf similarity index 100% rename from quad/qtest/fonts/fira-light/fira-light-bold-italic.otf rename to quad/quadwriter/fonts/fira-sans-light/fira-sans-light-bold-italic.otf diff --git a/quad/qtest/fonts/fira-light/fira-light-bold.otf b/quad/quadwriter/fonts/fira-sans-light/fira-sans-light-bold.otf similarity index 100% rename from quad/qtest/fonts/fira-light/fira-light-bold.otf rename to quad/quadwriter/fonts/fira-sans-light/fira-sans-light-bold.otf diff --git a/quad/qtest/fonts/fira-light/fira-light-italic.otf b/quad/quadwriter/fonts/fira-sans-light/fira-sans-light-italic.otf similarity index 100% rename from quad/qtest/fonts/fira-light/fira-light-italic.otf rename to quad/quadwriter/fonts/fira-sans-light/fira-sans-light-italic.otf diff --git a/quad/qtest/fonts/fira-light/fira-light.otf b/quad/quadwriter/fonts/fira-sans-light/fira-sans-light.otf similarity index 100% rename from quad/qtest/fonts/fira-light/fira-light.otf rename to quad/quadwriter/fonts/fira-sans-light/fira-sans-light.otf diff --git a/quad/quadwriter/fonts/fira-sans/LICENSE.txt b/quad/quadwriter/fonts/fira-sans/LICENSE.txt new file mode 100755 index 00000000..b4a39671 --- /dev/null +++ b/quad/quadwriter/fonts/fira-sans/LICENSE.txt @@ -0,0 +1,99 @@ +Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ +with Reserved Font Name Fira Sans. + +Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ +with Reserved Font Name Fira Mono. + +Copyright (c) 2014, Telefonica S.A. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/quad/qtest/fonts/fira/fira-bold-italic.otf b/quad/quadwriter/fonts/fira-sans/fira-sans-bold-italic.otf similarity index 100% rename from quad/qtest/fonts/fira/fira-bold-italic.otf rename to quad/quadwriter/fonts/fira-sans/fira-sans-bold-italic.otf diff --git a/quad/qtest/fonts/fira/fira-bold.otf b/quad/quadwriter/fonts/fira-sans/fira-sans-bold.otf similarity index 100% rename from quad/qtest/fonts/fira/fira-bold.otf rename to quad/quadwriter/fonts/fira-sans/fira-sans-bold.otf diff --git a/quad/qtest/fonts/fira/fira-italic.otf b/quad/quadwriter/fonts/fira-sans/fira-sans-italic.otf similarity index 100% rename from quad/qtest/fonts/fira/fira-italic.otf rename to quad/quadwriter/fonts/fira-sans/fira-sans-italic.otf diff --git a/quad/qtest/fonts/fira/fira.otf b/quad/quadwriter/fonts/fira-sans/fira-sans.otf similarity index 100% rename from quad/qtest/fonts/fira/fira.otf rename to quad/quadwriter/fonts/fira-sans/fira-sans.otf diff --git a/quad/quadwriter/lang-helper.rkt b/quad/quadwriter/lang-helper.rkt index 98709406..01636b9e 100644 --- a/quad/quadwriter/lang-helper.rkt +++ b/quad/quadwriter/lang-helper.rkt @@ -16,10 +16,10 @@ PATH-STRING . PT)))) -(define-syntax-rule (make-mb DOC-PROC) +(define-syntax-rule (make-module-begin DOC-PROC) (begin - (provide (rename-out [mb #%module-begin])) - (define-syntax (mb stx) + (provide (rename-out [new-module-begin #%module-begin])) + (define-syntax (new-module-begin stx) (syntax-case stx () [(_ PATH-STRING . EXPRS) (with-syntax ([DOC (datum->syntax #'PATH-STRING 'doc)]) diff --git a/quad/quadwriter/main.rkt b/quad/quadwriter/main.rkt index 1195c4d0..4550de4c 100644 --- a/quad/quadwriter/main.rkt +++ b/quad/quadwriter/main.rkt @@ -4,7 +4,7 @@ (define q (default-tag-function 'q)) (define (doc-proc strs) (apply q strs)) -(make-mb doc-proc) +(make-module-begin doc-proc) (module reader racket/base (require "lang-helper.rkt") diff --git a/quad/quadwriter/markdown.rkt b/quad/quadwriter/markdown.rkt index a03394ec..890ef0b1 100644 --- a/quad/quadwriter/markdown.rkt +++ b/quad/quadwriter/markdown.rkt @@ -25,7 +25,7 @@ #:before-first (list pbr) #:after-last (list pbr) #:splice? #true))) -(make-mb doc-proc) +(make-module-begin doc-proc) (module reader racket/base (require racket/port markdown "lang-helper.rkt") diff --git a/quad/quadwriter/markup.rkt b/quad/quadwriter/markup.rkt index c217a2bf..8d5fa93f 100644 --- a/quad/quadwriter/markup.rkt +++ b/quad/quadwriter/markup.rkt @@ -1,48 +1,15 @@ #lang debug racket/base -(require (for-syntax racket/base) - racket/list - racket/match - quadwriter/core - "tags.rkt") -(provide (except-out (all-defined-out) mb) - (rename-out [mb #%module-begin]) - #%app #%datum #%top-interaction) -(provide (all-from-out "tags.rkt") - rsquo rsquo lsquo ldquo hellip ndash mdash) +(require "lang-helper.rkt" + (only-in "markdown.rkt" doc-proc)) +(provide #%top #%datum #%app #%top-interaction + (all-from-out "tags.rkt")) -(define rsquo "’") -(define rdquo "”") -(define lsquo "‘") -(define ldquo "“") -(define hellip "…") -(define ndash "–") -(define mdash "—") - -(define-syntax-rule (mb PDF-PATH . STRS) - (#%module-begin - ;; stick an nbsp in the strings so we have one printing char - (define strs (match (list . STRS) - [(? null?) '(" ")] - [strs strs])) - (define qx (root null (add-between strs (list pbr) - #:before-first (list pbr) - #:after-last (list pbr) - #:splice? #true))) - (run qx PDF-PATH))) +(make-module-begin doc-proc) (module reader racket/base - (require pollen/decode syntax/strip-context "reader-helper.rkt") - (provide (rename-out [rs read-syntax])) - - (define (rs path-string p) - (define stx (quad-at-reader path-string p)) - (define parsed-stxs - (datum->syntax stx - (xexpr->parse-tree - (decode-paragraphs (syntax->datum stx))))) - (strip-context - (with-syntax ([STXS parsed-stxs] - [PDF-PATH (path-string->pdf-path path-string)]) - #'(module _ quadwriter/markdown - PDF-PATH - . STXS))))) \ No newline at end of file + (require "lang-helper.rkt" pollen/decode) + (provide read-syntax) + (define read-syntax + (make-read-syntax 'quadwriter/markup + (λ (path-string ip) + (detect-paragraphs (syntax->datum (quad-at-reader path-string ip))))))) \ No newline at end of file diff --git a/quad/quadwriter/tags.rkt b/quad/quadwriter/tags.rkt index 17000671..854da004 100644 --- a/quad/quadwriter/tags.rkt +++ b/quad/quadwriter/tags.rkt @@ -27,7 +27,7 @@ (qexpr (append '((display "block") (first-line-indent "0") (background-color "#eee") - (font-family "fira") (font-size "10") (line-height "14") + (font-family "fira-sans") (font-size "10") (line-height "14") (border-width-top "0.5") (border-color-top "gray") (border-inset-top "8") (border-width-left "3") (border-color-left "gray") (border-inset-left "20") (border-width-bottom "0.5") (border-color-bottom "gray") (border-inset-bottom "-2") @@ -41,17 +41,19 @@ (define-tag-function (strong attrs exprs) (qexpr (list* '(font-bold "true") '(font-size-adjust "100%") attrs) exprs)) +(define b strong) (define-tag-function (a attrs exprs) (qexpr `((link ,(cadr (assoc 'href attrs)))(color "MediumVioletRed")) exprs)) (define-tag-function (em attrs exprs) (qexpr (list* '(font-italic "true") '(font-size-adjust "100%") attrs) exprs)) +(define i em) (define-syntax-rule (attr-list . attrs) 'attrs) (define (heading-base font-size attrs exprs) - (qexpr (append `((font-family "fira-light") (first-line-indent "0") (display "block") (font-size ,(number->string font-size))(line-height ,(number->string (* 1.2 font-size))) (border-width-top "0.5")(border-inset-top "9") (inset-bottom "-3") (inset-top "6") (keep-with-next "true")) attrs) exprs)) + (qexpr (append `((font-family "fira-sans-light") (first-line-indent "0") (display "block") (font-size ,(number->string font-size))(line-height ,(number->string (* 1.2 font-size))) (border-width-top "0.5")(border-inset-top "9") (inset-bottom "-3") (inset-top "6") (keep-with-next "true")) attrs) exprs)) (define-tag-function (h1 attrs exprs) (heading-base 20 (append '() attrs) exprs))