asciidoctor-pdf 2.0.0.alpha.2 → 2.0.0.beta.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.adoc +185 -83
  3. data/README.adoc +31 -126
  4. data/data/fonts/ABOUT-mplus1p-subset +1 -0
  5. data/data/fonts/ABOUT-notosans-subset +1 -0
  6. data/data/fonts/ABOUT-notoserif-subset +1 -0
  7. data/data/fonts/mplus1mn-bold-subset.ttf +0 -0
  8. data/data/fonts/mplus1mn-bold_italic-subset.ttf +0 -0
  9. data/data/fonts/mplus1mn-italic-subset.ttf +0 -0
  10. data/data/fonts/mplus1mn-regular-subset.ttf +0 -0
  11. data/data/fonts/mplus1p-regular-fallback.ttf +0 -0
  12. data/data/fonts/notosans-bold-subset.ttf +0 -0
  13. data/data/fonts/notosans-bold_italic-subset.ttf +0 -0
  14. data/data/fonts/notosans-italic-subset.ttf +0 -0
  15. data/data/fonts/notosans-regular-subset.ttf +0 -0
  16. data/data/fonts/notoserif-bold-subset.ttf +0 -0
  17. data/data/fonts/notoserif-bold_italic-subset.ttf +0 -0
  18. data/data/fonts/notoserif-italic-subset.ttf +0 -0
  19. data/data/fonts/notoserif-regular-subset.ttf +0 -0
  20. data/data/themes/base-theme.yml +10 -20
  21. data/data/themes/default-for-print-theme.yml +4 -4
  22. data/data/themes/default-for-print-with-fallback-font-theme.yml +2 -3
  23. data/data/themes/default-for-print-with-font-fallbacks-theme.yml +3 -0
  24. data/data/themes/{sans-with-fallback-font-theme.yml → default-sans-theme.yml} +1 -1
  25. data/data/themes/default-sans-with-font-fallbacks-theme.yml +3 -0
  26. data/data/themes/default-theme.yml +5 -4
  27. data/data/themes/default-with-fallback-font-theme.yml +2 -9
  28. data/data/themes/default-with-font-fallbacks-theme.yml +9 -0
  29. data/docs/theming-guide.adoc +5 -6050
  30. data/lib/asciidoctor/pdf/converter.rb +505 -294
  31. data/lib/asciidoctor/pdf/ext/pdf-core/page.rb +8 -0
  32. data/lib/asciidoctor/pdf/ext/prawn/document/column_box.rb +16 -0
  33. data/lib/asciidoctor/pdf/ext/prawn/extensions.rb +110 -58
  34. data/lib/asciidoctor/pdf/ext/prawn/formatted_text/box.rb +14 -0
  35. data/lib/asciidoctor/pdf/ext/prawn/formatted_text/indented_paragraph_wrap.rb +39 -0
  36. data/lib/asciidoctor/pdf/ext/prawn-table/cell/asciidoc.rb +3 -10
  37. data/lib/asciidoctor/pdf/ext/prawn.rb +2 -0
  38. data/lib/asciidoctor/pdf/formatted_text/source_wrap.rb +7 -2
  39. data/lib/asciidoctor/pdf/nopngmagick.rb +3 -0
  40. data/lib/asciidoctor/pdf/optimizer.rb +12 -5
  41. data/lib/asciidoctor/pdf/text_transformer.rb +14 -0
  42. data/lib/asciidoctor/pdf/theme_loader.rb +9 -3
  43. data/lib/asciidoctor/pdf/version.rb +1 -1
  44. metadata +9 -3
data/README.adoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor PDF: A native PDF converter for AsciiDoc
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
3
- v2.0.0.alpha.2, 2022-04-29
3
+ v2.0.0.beta.2, 2022-05-14
4
4
  // Settings:
5
5
  :experimental:
6
6
  :idprefix:
@@ -24,7 +24,7 @@ endif::[]
24
24
  :project-handle: asciidoctor-pdf
25
25
  // Variables:
26
26
  :release-line: 2.0.x
27
- :release-version: 2.0.0.alpha.2
27
+ :release-version: 2.0.0.beta.2
28
28
  // URIs:
29
29
  :url-asciidoctor: http://asciidoctor.org
30
30
  :url-gem: http://rubygems.org/gems/asciidoctor-pdf
@@ -49,7 +49,7 @@ It bypasses the requirement to generate an intermediary format such as DocBook,
49
49
  Instead, you can use this extension to convert your documents directly from AsciiDoc to PDF.
50
50
  Its aim is to take the pain out of creating PDF documents from AsciiDoc.
51
51
 
52
- NOTE: You're viewing the documentation for the (unreleased) {release-line} release line.
52
+ NOTE: The documentation for Asciidoctor PDF {release-line} is now available at https://docs.asciidoctor.org/pdf-converter/latest/.
53
53
  If you're looking for the documentation for another release line, please refer to one of the following branches: +
54
54
  {url-project-repo}/tree/v1.5.x#readme[1.5.x]
55
55
  -
@@ -75,7 +75,7 @@ But don't miss the <<Highlights>> to get a preview of what's possible.
75
75
  == Highlights
76
76
 
77
77
  * Direct AsciiDoc to PDF conversion
78
- * <<docs/theming-guide.adoc#,Configuration-driven theme (style and layout)>>
78
+ * Configuration-driven theme (style and layout)
79
79
  * Custom fonts (TTF or OTF)
80
80
  * Full SVG support (thanks to https://github.com/mogest/prawn-svg[prawn-svg])
81
81
  * PDF document outline (i.e., bookmarks)
@@ -319,7 +319,7 @@ The pain of the DocBook toolchain should be melting away about now.
319
319
  == Themes
320
320
 
321
321
  The layout and styling of the PDF is driven by a YAML configuration file.
322
- To learn how the theming system works and how to create and apply custom themes, refer to the <<docs/theming-guide.adoc#,Asciidoctor PDF Theming Guide>>.
322
+ To learn how the theming system works and how to create and apply custom themes, refer to the https://docs.asciidoctor.org/pdf-converter/latest/theme/[Asciidoctor PDF theming documentation].
323
323
  You can use the built-in theme files, which you can find in the [.path]_data/themes_ directory, as examples.
324
324
 
325
325
  If you've enabled a source highlighter, you can control the style (aka theme) it applies to source blocks using the `coderay-style`, `pygments-style`, and `rouge-style` attributes, respectively.
@@ -328,7 +328,7 @@ For example, to configure Rouge to use the built-in monokai theme, run Asciidoct
328
328
  $ asciidoctor-pdf -a rouge-style=monokai basic-example.adoc
329
329
 
330
330
  It's possible to develop your own theme for Rouge.
331
- Refer to the <<docs/theming-guide.adoc#,Asciidoctor PDF Theming Guide>> for details.
331
+ Refer to the https://docs.asciidoctor.org/pdf-converter/latest/theme/[Asciidoctor PDF theming documentation] for details.
332
332
 
333
333
  == Support for Non-Latin Languages
334
334
 
@@ -343,80 +343,6 @@ There's no one font that supports all the world's languages (though some, like N
343
343
  Even if there were such a font, bundling that font with the main gem would make it enormous.
344
344
  It would also severely limit the style choices in the default theme, which targets Latin-based languages.
345
345
  Therefore, we're taking the strategy of creating separate dedicated theme gems that target each language family, such as CJK.
346
- Read on to find out how to use these themes.
347
-
348
- Asciidoctor PDF provides a built-in theme that provides a broad range of characters in the CJK charsets, so you can start with that theme:
349
-
350
- $ asciidoctor-pdf -a scripts=cjk -a pdf-theme=default-with-fallback-font document.adoc
351
-
352
- Notice the `-a scripts=cjk` option.
353
- That's important.
354
- It tells the converter to insert break opportunities between CJK characters so that the line wraps properly when mixing English and a CJK language like Japanese.
355
-
356
- If the built-in theme with the fallback font doesn't go far enough, you'll need to use a theme that is optimized for CJK text.
357
- You can get such a theme by installing the `asciidoctor-pdf-cjk-kai_gen_gothic` gem.
358
- The https://github.com/chloerei/asciidoctor-pdf-cjk-kai_gen_gothic[asciidoctor-pdf-cjk-kai_gen_gothic] project provides themes optimized for CJK languages based on the kai_gen_gothic font.
359
- See the https://github.com/chloerei/asciidoctor-pdf-cjk-kai_gen_gothic[asciidoctor-pdf-cjk-kai_gen_gothic] project README for detailed setup instructions.
360
-
361
- WARNING: The theme provided by the `asciidoctor-pdf-cjk-kai_gen_gothic` gem is no longer compatiable with the stable release of Asciidoctor PDF.
362
- However, you can still use it to create a <<Create a Custom CJK Theme,custom CJK theme>>.
363
-
364
- Once you have that gem installed (and the fonts), you need to tell Asciidoctor PDF to use one of the themes.
365
- If you're converting a document that is primarily written in Japanese, you'd run Asciidoctor PDF as follows:
366
-
367
- asciidoctor-pdf -r asciidoctor-pdf-cjk-kai_gen_gothic -a pdf-theme=KaiGenGothicJP document.adoc
368
-
369
- If that command fails, you may have better luck creating your own CJK theme.
370
-
371
- === Create a Custom CJK Theme
372
-
373
- You also have to option of creating your own theme gem that uses fonts of your choice.
374
- For example, if you want to use the `asciidoctor-pdf-cjk-kai_gen_gothic` gem to fetch fonts, but then use them in your own theme, here's how you'd do it.
375
-
376
- . Install the `asciidoctor-pdf-cjk-kai_gen_gothic` gem:
377
-
378
- $ gem install asciidoctor-pdf-cjk-kai_gen_gothic
379
-
380
- . Download / install the fonts:
381
-
382
- $ asciidoctor-pdf-cjk-kai_gen_gothic-install
383
-
384
- . Create a theme file named [.path]_cjk-theme.yml_ that extends the default theme to override the fonts:
385
- +
386
- [source,yml]
387
- ----
388
- extends: default
389
- font:
390
- catalog:
391
- merge: true
392
- KaiGen Gothic CN:
393
- normal: KaiGenGothicCN-Regular.ttf
394
- bold: KaiGenGothicCN-Bold.ttf
395
- italic: KaiGenGothicCN-Regular-Italic.ttf
396
- bold_italic: KaiGenGothicCN-Bold-Italic.ttf
397
- fallbacks:
398
- - KaiGen Gothic CN
399
- base:
400
- font-family: KaiGen Gothic CN
401
- heading:
402
- font-family: $base-font-family
403
- abstract:
404
- title:
405
- font-family: $heading-font-family
406
- sidebar:
407
- title:
408
- font-family: $heading-font-family
409
- ----
410
-
411
- . Load your theme when running Asciidoctor PDF:
412
-
413
- $ asciidoctor-pdf -a scripts=cjk -a pdf-theme=./cjk-theme.yml -a pdf-fontsdir=GEM_FONTS_DIR,`ruby -r asciidoctor-pdf-cjk-kai_gen_gothic -e "print File.expand_path '../fonts', (Gem.datadir 'asciidoctor-pdf-cjk-kai_gen_gothic')"` document.adoc
414
-
415
- The `-a pdf-fontsdir` option is important to tell Asciidoctor PDF where to find your custom fonts.
416
- (Note that the inclusion of GEM_FONTS_DIR in the value is only required when using Asciidoctor PDF 1.5).
417
-
418
- Rather than using the installer from the `asciidoctor-pdf-cjk-kai_gen_gothic` gem, you can download fonts whatever way you choose.
419
- When using your own fonts, be sure to consult the <<docs/theming-guide.adoc#preparing-a-custom-font,Preparing a Custom Font>> section of the theming guide to find recommended modifications.
420
346
 
421
347
  == Font-Based Icons
422
348
 
@@ -672,64 +598,43 @@ Here's how to move it to the bottom right:
672
598
 
673
599
  If an image dimension matches the height or width of the page, the positioning keyword for that axis has no effect.
674
600
 
675
- == Fonts in SVG Images
676
-
677
- Asciidoctor PDF uses {url-prawn-svg}[prawn-svg] to embed SVGs in the PDF document, including SVGs generated by Asciidoctor Diagram.
678
-
679
- Actually, it's not accurate to say that prawn-svg embeds the SVG.
680
- Rather, prawn-svg is an SVG _renderer_.
681
- prawn-svg translates an SVG into native PDF text and graphic objects.
682
- You can think of the SVG as a sequence of drawing commands.
683
- The result becomes indistinguishable from other PDF objects.
684
-
685
- What that means for text is that any font family used for text in the SVG _must_ be registered in the Asciidoctor PDF theme file (and thus with Prawn).
686
- Otherwise, Prawn will fallback to using the closest matching built-in (afm) font from PDF (e.g., sans-serif becomes Helvetica).
687
- Recall that afm fonts only support basic Latin.
688
- As we like to say, PDF is <<docs/theming-guide.adoc#built-in-afm-fonts,bring your own font>>.
689
-
690
- If you're using Asciidoctor Diagram to generate SVGs to embed in the PDF, you likely need to specify the default font the diagramming tool uses.
691
- Let's assume you are making a plantuml diagram.
601
+ == Supporting Additional Image File Formats
692
602
 
693
- To set the font used in the diagram, first create a file named [.path]_plantuml.cfg_ and populate it with the following content:
603
+ In order to embed an image into a PDF, Asciidoctor PDF must understand how to decode it.
604
+ To perform this work, Asciidoctor delegates to the underlying libraries.
605
+ {url-prawn}[Prawn] provides support for decoding JPG and PNG images.
606
+ {url-prawn-svg}[prawn-svg] brings support for translating SVG images to PDF commands.
607
+ Without any additional libraries, those are the only image file formats supported by Asciidoctor PDF.
694
608
 
695
- ----
696
- skinparam defaultFontName Noto Serif
697
- ----
609
+ If you need support for additional image formats, such as GIF, TIFF, WebP, or interlaced PNG--and you don't want to convert those images to a supported format like JPG--you must install the {url-prawn-gmagick}[prawn-gmagick] (>= 0.0.9) Ruby gem.
610
+ prawn-gmagick is an extension for Prawn that delegates image decoding to {url-graphicsmagick}[GraphicsMagick] to add support for all image formats recognized by that library.
698
611
 
699
- TIP: You can choose any font name that is registered in your Asciidoctor PDF theme file.
700
- When using the default theme, your options are "Noto Serif", "M+ 1mn", and "M+ 1p Fallback".
612
+ prawn-gmagick has the additional benefit of *significantly* reducing the processing time, power, and memory necessary to generate a PDF that contains a lot of PNG images.
613
+ For large books (such as Pro Git), you might see the conversion time drop by as much as half.
614
+ Decoding PNG images requires a lot of mathematical computation, a task Ruby is not particularly efficient at performing.
615
+ That's why adding the prawn-gmagick gem to the converter makes such a substantial difference.
701
616
 
702
- Next, pass that path to the `plantumlconfig` attribute in your AsciiDoc document (or set the attribute via the CLI or API):
617
+ As an alternative to using prawn-gmagick, you could optimize the images you pass into Asciidoctor PDF, either by scaling them down or converting them to an uncompressed format like JPG.
703
618
 
704
- ----
705
- :plantumlconfig: plantuml.cfg
706
- ----
619
+ The prawn-gmagick gem uses native extensions to compile against GraphicsMagick.
620
+ This system prerequisite limits installation to C Ruby running on Linux and macOS.
621
+ Please refer to the {url-prawn-gmagick}[README for prawn-gmagick] to learn how to install it.
707
622
 
708
- Clear the cache of your diagrams and run Asciidoctor PDF with Asciidoctor Diagram enabled.
709
- The diagrams will be generated using Noto Serif as the default font, and Asciidoctor PDF will know what to do.
623
+ $ gem install prawn-gmagick
710
624
 
711
- The bottom line is this:
712
- If you're using fonts in your SVG, and you want those fonts to be preserved, those fonts must be defined in the Asciidoctor PDF theme file.
625
+ When this gem is installed, Asciidoctor automatically detects and loads it, then delegates all image decoding to GraphicsMagick by way of the bridge it provides.
626
+ We highly recommend using this gem with Asciidoctor PDF if you're able to install it.
713
627
 
714
- == Supporting Additional Image File Formats
628
+ The one downside of delegating to GraphicsMagick is that it can mangle certain PNG images.
629
+ If this happens, you can instruct Asciidoctor PDF to not delegate to GraphicsMagick to load PNG images by requiring `asciidoctor/pdf/nopngmagick` when calling Asciidoctor PDF, as follows:
715
630
 
716
- In order to embed an image into a PDF, Asciidoctor PDF must understand how to read it.
717
- To perform this work, Asciidoctor delegates to the underlying libraries.
718
- {url-prawn}[Prawn] provides support for reading JPG and PNG images.
719
- {url-prawn-svg}[prawn-svg] brings support for SVG images.
720
- Without any additional libraries, those are the only supported image file formats.
631
+ $ asciidoctor-pdf -r asciidoctor/pdf/nopngmagick doc.adoc
721
632
 
722
- If you need support for additional image formats, such as GIF, TIFF, or interlaced PNG--and you don't want to convert those images to a supported format--you must install the {url-prawn-gmagick}[prawn-gmagick] (>= 0.0.9) Ruby gem.
723
- prawn-gmagick is an extension for Prawn based on {url-graphicsmagick}[GraphicsMagick] that adds support for all the image formats recognized by that library.
724
- prawn-gmagick has the added benefit of significantly reducing the time it takes to generate a PDF containing a lot of images.
633
+ You can also tell Asciidoctor PDF not to use prawn-gmagick at all by requiring `asciidoctor/pdf/nogmagick` when calling Asciidoctor PDF, as follows:
725
634
 
726
- The prawn-gmagick gem uses native extensions to compile against GraphicsMagick.
727
- This system prerequisite limits installation to Linux and OSX.
728
- Please refer to the {url-prawn-gmagick}[README for prawn-gmagick] to learn how to install it.
635
+ $ asciidoctor-pdf -r asciidoctor/pdf/nogmagick doc.adoc
729
636
 
730
- Once this gem is installed, Asciidoctor automatically loads it, then delegates to it to handle all image embedding.
731
- In addition to support for additional image file formats, this gem also speeds up image processing considerably.
732
- We highly recommend using this gem if you're able to install it.
637
+ Granted, bypassing prawn-gmagick means you no longer get support for additional image formats that Prawn cannot handle or the PNG acceleration.
733
638
 
734
639
  == Importing PDF Pages
735
640
 
@@ -17,6 +17,7 @@ The following changes were made using fontforge to produce mplus1p-regular-fallb
17
17
  ** General Punctuation (U+2000–U203a)
18
18
  ** Geometric Shapes (U+25a0–U25ff)
19
19
  ** Assorted Symbols (U+20ac, U+2122, U+21d0–U+21d5, U+2190–U+2195, U+2610–U+2611, U+2713–U+2714)
20
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730, U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731, U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22)
20
21
  ** .notdef glyph
21
22
  * Added BOM (U+feff), hair space (U+200a), zero-width space (U+200b) and line feed (U+000a) characters (from blank)
22
23
  * Manually added non-breaking hyphen (U+2011) from hyphen (U+002d)
@@ -17,6 +17,7 @@ The following changes were made using fontforge to produce the notosans-*-subset
17
17
  ** General Punctuation (U+2000–U203a)
18
18
  ** Geometric Shapes (U+25a0–U25ff)
19
19
  ** Assorted Symbols (U+20ac, U+2122, U+21d0, U+21d2, U+2190, U+2192)
20
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730 (missing), U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731 (missing), U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+01EB)
20
21
  ** .notdef glyph
21
22
  * Imported ballot boxes from Font Awesome (U+2610, U+2611) (Noto Serif Regular only)
22
23
  * Added line feed character (U+000a)
@@ -17,6 +17,7 @@ The following changes were made using fontforge to produce the notoserif-*-subse
17
17
  ** General Punctuation (U+2000–U203a)
18
18
  ** Geometric Shapes (U+25a0–U25ff)
19
19
  ** Assorted Symbols (U+20ac, U+2122, U+21d0, U+21d2, U+2190, U+2192)
20
+ ** Latin Small Capital Letters (U+1D00, U+0299, U+1D04, U+1D05, U+1D07, U+A730 (missing), U+0262, U+029C, U+026A, U+1D0A, U+1D0B, U+029F, U+1D0D, U+0274, U+1D0F, U+1D18, U+A7AF (missing), U+0280, U+A731 (missing), U+1D1B, U+1D1C, U+1D20, U+1D21, U+028F, U+1D22, U+01EB)
20
21
  ** .notdef glyph
21
22
  * Imported ballot boxes from Font Awesome (U+2610, U+2611) (Noto Serif Regular only)
22
23
  * Added line feed character (U+000a)
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -1,24 +1,19 @@
1
- # NOTE file is read "as is"; variables are not parsed; key layout must be flat
1
+ # NOTE: file is read "as is"; variables are not parsed; key layout must be flat
2
2
  page_background_color: 'FFFFFF'
3
3
  page_layout: portrait
4
4
  page_initial_zoom: FitH
5
- # 36 is equivalent to 0.5in
6
- page_margin: 36
5
+ page_margin: 36 # 36 is 0.5in
7
6
  page_margin_inner: 48
8
7
  page_margin_outer: 24
9
8
  page_size: A4
10
9
  base_text_align: left
11
- #base_font_color: '333333'
12
10
  base_font_color: '000000'
13
- #base_font_family: Times-Roman
14
11
  base_font_family: Helvetica
15
12
  base_font_size: 12
16
- # QUESTION should we rename to min_font_size?
17
13
  base_font_size_min: 6
18
14
  base_font_style: normal
19
15
  base_line_height: 1.15
20
- base_border_color: 'EEEEEE'
21
- base_border_width: 0.5
16
+ base_border_color: '000000'
22
17
  role_lead_font_size: 13.5
23
18
  role_line-through_text_decoration: line-through
24
19
  role_underline_text_decoration: underline
@@ -47,7 +42,6 @@ heading_margin_top: 4
47
42
  heading_margin_bottom: 12
48
43
  heading_min_height_after: 20
49
44
  title_page_text_align: center
50
- title_page_line_height: 1.15
51
45
  title_page_logo_top: 10%
52
46
  title_page_title_top: 40%
53
47
  title_page_title_font_size: 18
@@ -69,50 +63,46 @@ abstract_line_height: 1.4
69
63
  abstract_padding: 0
70
64
  abstract_title_align: center
71
65
  abstract_title_font_style: bold
72
- admonition_column_rule_color: 'EEEEEE'
73
66
  admonition_column_rule_width: 0.5
74
67
  admonition_padding: [4, 12, 4, 12]
75
68
  admonition_label_font_style: bold
76
69
  admonition_label_text_transform: uppercase
77
- quote_border_color: 'EEEEEE'
78
70
  quote_border_left_width: 4
79
- quote_padding: [6, 12, 6, 14]
80
- verse_border_color: 'EEEEEE'
71
+ quote_padding: [3, 12, 3, 14]
81
72
  verse_border_left_width: 4
82
- verse_padding: [6, 12, 6, 14]
73
+ verse_padding: [3, 12, 3, 14]
83
74
  code_font_family: Courier
84
75
  code_font_size: 10.8
85
76
  code_line_height: 1.2
86
77
  code_padding: 9
87
- code_border_color: 'EEEEEE'
88
78
  code_border_width: 0.5
89
79
  conum_line_height: 1.15
90
80
  conum_glyphs: circled
91
81
  example_background_color: 'FFFFFF'
92
- example_border_color: 'EEEEEE'
93
82
  example_border_width: 0.5
94
83
  example_padding: 12
95
84
  image_align: left
96
85
  prose_margin_bottom: 12
97
86
  sidebar_background_color: 'EEEEEE'
87
+ sidebar_border_width: 0.5
98
88
  sidebar_padding: 12
99
89
  sidebar_title_align: center
100
90
  sidebar_title_font_style: bold
101
- table_border_color: '000000'
102
91
  table_border_style: solid
103
92
  table_border_width: 0.5
104
- table_grid_width: 0.5
105
93
  table_cell_padding: 2
106
94
  table_head_font_style: bold
107
95
  table_head_border_bottom_width: 1.25
108
96
  table_body_stripe_background_color: 'EEEEEE'
109
- thematic_break_border_color: 'EEEEEE'
110
97
  thematic_break_border_style: solid
111
98
  thematic_break_border_width: 0.5
112
- thematic_break_margin_bottom: 12
99
+ thematic_break_padding: 0
113
100
  toc_indent: 15
114
101
  toc_line_height: 1.4
115
102
  footnotes_font_size: 9
116
103
  footnotes_item_spacing: 3
104
+ footer_border_width: 0.5
105
+ footer_font_size: 10
106
+ footer_height: 30
117
107
  footer_recto_right_content: '{page-number}'
118
108
  footer_verso_left_content: '{page-number}'
@@ -3,7 +3,7 @@ base_border_color: BBBBBB
3
3
  base_font_color: 000000
4
4
  role_subtitle_font_color: 666666
5
5
  link_font_color: ~
6
- literal_font_color: ~
6
+ codespan_font_color: ~
7
7
  mark_background_color: CCCCCC
8
8
  menu_caret_content: " <font size=\"1.15em\">\u203a</font> "
9
9
  heading_font_color: $base_font_color
@@ -11,10 +11,10 @@ title_page_title_font_color: $role_subtitle_font_color
11
11
  abstract_font_color: 2C2C2C
12
12
  abstract_title_font_color: $heading_font_color
13
13
  admonition_column_rule_color: $base_border_color
14
- blockquote_border_color: $base_border_color
15
- blockquote_cite_font_color: $role_subtitle_font_color
14
+ quote_border_color: $base_border_color
15
+ quote_cite_font_color: $role_subtitle_font_color
16
16
  verse_border_color: $base_border_color
17
- verse_cite_font_color: $blockquote_cite_font_color
17
+ verse_cite_font_color: $quote_cite_font_color
18
18
  code_font_color: $base_font_color
19
19
  conum_font_color: $base_font_color
20
20
  example_border_color: $base_border_color
@@ -1,3 +1,2 @@
1
- extends:
2
- - default-for-print
3
- - default-with-fallback-font
1
+ # DEPRECATED
2
+ extends: default-for-print-with-font-fallbacks
@@ -0,0 +1,3 @@
1
+ extends:
2
+ - default-with-font-fallbacks
3
+ - default-for-print
@@ -1,4 +1,4 @@
1
- extends: default-with-fallback-font
1
+ extends: default
2
2
  font:
3
3
  catalog:
4
4
  merge: true
@@ -0,0 +1,3 @@
1
+ extends:
2
+ - default-with-font-fallbacks
3
+ - default-sans
@@ -168,8 +168,8 @@ quote:
168
168
  font_size: $base_font_size_large
169
169
  border_color: $base_border_color
170
170
  border_width: 0
171
- border_left_width: 5
172
- padding: [0, $horizontal_rhythm, $block_margin_bottom * 0.25, $horizontal_rhythm + $quote_border_left_width / 2]
171
+ border_left_width: $horizontal_rhythm / 3
172
+ padding: [$vertical_rhythm / 4, $horizontal_rhythm, $vertical_rhythm / 4, $horizontal_rhythm + $quote_border_left_width / 2]
173
173
  cite:
174
174
  font_size: $base_font_size_small
175
175
  font_color: $role_subtitle_font_color
@@ -226,8 +226,7 @@ thematic_break:
226
226
  border_color: $base_border_color
227
227
  border_style: solid
228
228
  border_width: $base_border_width
229
- margin_top: $vertical_rhythm * 0.5
230
- margin_bottom: $vertical_rhythm * 1.5
229
+ padding: [$vertical_rhythm * 0.5, 0]
231
230
  list:
232
231
  indent: $horizontal_rhythm * 1.5
233
232
  #marker_font_color: 404040
@@ -262,6 +261,8 @@ toc:
262
261
  footnotes:
263
262
  font_size: round($base_font_size * 0.75)
264
263
  item_spacing: $list_item_spacing / 2
264
+ index:
265
+ column_gap: $vertical_rhythm
265
266
  header:
266
267
  font_size: $base_font_size_small
267
268
  line_height: 1
@@ -1,9 +1,2 @@
1
- extends: default
2
- font:
3
- catalog:
4
- merge: true
5
- # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
6
- # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
7
- M+ 1p Fallback: GEM_FONTS_DIR/mplus1p-regular-fallback.ttf
8
- Noto Emoji: GEM_FONTS_DIR/notoemoji-subset.ttf
9
- fallbacks: [M+ 1p Fallback, Noto Emoji]
1
+ # DEPRECATED
2
+ extends: default-with-font-fallbacks
@@ -0,0 +1,9 @@
1
+ extends: default
2
+ font:
3
+ catalog:
4
+ merge: true
5
+ # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
6
+ # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
7
+ M+ 1p Fallback: GEM_FONTS_DIR/mplus1p-regular-fallback.ttf
8
+ Noto Emoji: GEM_FONTS_DIR/notoemoji-subset.ttf
9
+ fallbacks: [M+ 1p Fallback, Noto Emoji]