diff --git a/quad/qtest/test-docs-tester.pdf b/quad/qtest/test-docs-tester.pdf index afa87047..526345a2 100644 Binary files a/quad/qtest/test-docs-tester.pdf and b/quad/qtest/test-docs-tester.pdf differ diff --git a/quad/qtest/test-emoji-tester.pdf b/quad/qtest/test-emoji-tester.pdf index caef089d..2ccbbd31 100644 Binary files a/quad/qtest/test-emoji-tester.pdf and b/quad/qtest/test-emoji-tester.pdf differ diff --git a/quad/qtest/test-emoji.pdf b/quad/qtest/test-emoji.pdf new file mode 100644 index 00000000..02be425f Binary files /dev/null and b/quad/qtest/test-emoji.pdf differ diff --git a/quad/qtest/test-fallback-mini-tester.pdf b/quad/qtest/test-fallback-mini-tester.pdf index c110f1a5..bad85e6a 100644 Binary files a/quad/qtest/test-fallback-mini-tester.pdf and b/quad/qtest/test-fallback-mini-tester.pdf differ diff --git a/quad/qtest/test-fallback-super-tester.pdf b/quad/qtest/test-fallback-super-tester.pdf index 8e304d4c..b0c79d7a 100644 Binary files a/quad/qtest/test-fallback-super-tester.pdf and b/quad/qtest/test-fallback-super-tester.pdf differ diff --git a/quad/qtest/test-hello-tester.pdf b/quad/qtest/test-hello-tester.pdf index 3a101a7c..8dd9b641 100644 Binary files a/quad/qtest/test-hello-tester.pdf and b/quad/qtest/test-hello-tester.pdf differ diff --git a/quad/qtest/test-kafka-tester.pdf b/quad/qtest/test-kafka-tester.pdf index 3e2a8634..dcf6d3ab 100644 Binary files a/quad/qtest/test-kafka-tester.pdf and b/quad/qtest/test-kafka-tester.pdf differ diff --git a/quad/qtest/test-symbol-tester.pdf b/quad/qtest/test-symbol-tester.pdf index 07141559..b509f3e6 100644 Binary files a/quad/qtest/test-symbol-tester.pdf and b/quad/qtest/test-symbol-tester.pdf differ diff --git a/quad/quad/scribblings/quad.scrbl b/quad/quad/scribblings/quad.scrbl index 00cf9d59..c84f6f73 100644 --- a/quad/quad/scribblings/quad.scrbl +++ b/quad/quad/scribblings/quad.scrbl @@ -620,6 +620,46 @@ Though this system may seem like a lot of housekeeping, it's nice for two reason TK: example of font setup +@subsubsection{Default font families} + +Quadwriter typesets documents by looking up families with the names below. You can override the default selections by providing a family in the @racket[fonts] folder of your project that has the same name. + +@defthing[#:kind "font directory" text path-string?]{ +Used for all body text. Default is a serif font. +} + +@defthing[#:kind "font directory" heading path-string?]{ +Used for headings. Default is a sans serif font.. +} + +@defthing[#:kind "font directory" code path-string?]{ +Used for code. Default is a monospaced font. +} + +@defthing[#:kind "font directory" blockquote path-string?]{ +Used for blockquote boxes. Defaults is a sans serif font. +} + + +@defthing[#:kind "font directory" default path-string?]{ +Used for any miscellaneous elements. Default is same as @racket[text]. +} + + +@defthing[#:kind "font directory" fallback-emoji path-string?]{ +Fallback only. Used for emoji not present in the currently selected font. +} + +@defthing[#:kind "font directory" fallback-math path-string?]{ +Fallback only. Used for math symbols not present in the currently selected font. +} + +@defthing[#:kind "font directory" fallback path-string?]{ +Fallback only. Used for other glyphs not present in the currently selected font. +} + + + @subsection{Utility} @defproc[ diff --git a/quad/quadwriter/fonts/emoji/LICENSE_OFL.txt b/quad/quadwriter/fonts/fallback-emoji/LICENSE_OFL.txt similarity index 100% rename from quad/quadwriter/fonts/emoji/LICENSE_OFL.txt rename to quad/quadwriter/fonts/fallback-emoji/LICENSE_OFL.txt diff --git a/quad/quadwriter/fonts/emoji/NotoEmoji-Regular.ttf b/quad/quadwriter/fonts/fallback-emoji/NotoEmoji-Regular.ttf similarity index 100% rename from quad/quadwriter/fonts/emoji/NotoEmoji-Regular.ttf rename to quad/quadwriter/fonts/fallback-emoji/NotoEmoji-Regular.ttf diff --git a/quad/quadwriter/fonts/emoji/README b/quad/quadwriter/fonts/fallback-emoji/README similarity index 100% rename from quad/quadwriter/fonts/emoji/README rename to quad/quadwriter/fonts/fallback-emoji/README diff --git a/quad/quadwriter/fonts/math/LICENSE_OFL.txt b/quad/quadwriter/fonts/fallback-math/LICENSE_OFL.txt similarity index 100% rename from quad/quadwriter/fonts/math/LICENSE_OFL.txt rename to quad/quadwriter/fonts/fallback-math/LICENSE_OFL.txt diff --git a/quad/quadwriter/fonts/math/NotoSansMath-Regular.ttf b/quad/quadwriter/fonts/fallback-math/NotoSansMath-Regular.ttf similarity index 100% rename from quad/quadwriter/fonts/math/NotoSansMath-Regular.ttf rename to quad/quadwriter/fonts/fallback-math/NotoSansMath-Regular.ttf diff --git a/quad/quadwriter/render.rkt b/quad/quadwriter/render.rkt index 3465b90b..63d8f74b 100644 --- a/quad/quadwriter/render.rkt +++ b/quad/quadwriter/render.rkt @@ -88,8 +88,8 @@ #:attrs-proc handle-cascading-attrs #:missing-glyph-action 'fallback #:fallback "fallback" - #:emoji "emoji" - #:math "math" + #:emoji "fallback-emoji" + #:math "fallback-math" #:font-path-resolver resolve-font-path))] [define hyphenated-qs (time-log hyphenate (handle-hyphenate atomized-qs))] [define stringified-qs (map ->string-quad hyphenated-qs)]