asciidoctor 2.0.10 → 2.0.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.adoc +89 -5
  3. data/LICENSE +1 -1
  4. data/README-de.adoc +4 -4
  5. data/README-fr.adoc +4 -4
  6. data/README-jp.adoc +4 -4
  7. data/README-zh_CN.adoc +6 -6
  8. data/README.adoc +14 -10
  9. data/asciidoctor.gemspec +3 -3
  10. data/data/locale/attributes-ar.adoc +4 -3
  11. data/data/locale/attributes-bg.adoc +4 -3
  12. data/data/locale/attributes-ca.adoc +6 -5
  13. data/data/locale/attributes-cs.adoc +4 -3
  14. data/data/locale/attributes-da.adoc +6 -5
  15. data/data/locale/attributes-de.adoc +4 -4
  16. data/data/locale/attributes-en.adoc +4 -4
  17. data/data/locale/attributes-es.adoc +6 -5
  18. data/data/locale/attributes-fa.adoc +4 -3
  19. data/data/locale/attributes-fi.adoc +4 -3
  20. data/data/locale/attributes-fr.adoc +6 -5
  21. data/data/locale/attributes-hu.adoc +4 -3
  22. data/data/locale/attributes-id.adoc +4 -3
  23. data/data/locale/attributes-it.adoc +4 -3
  24. data/data/locale/attributes-ja.adoc +4 -3
  25. data/data/locale/{attributes-kr.adoc → attributes-ko.adoc} +4 -3
  26. data/data/locale/attributes-nb.adoc +4 -3
  27. data/data/locale/attributes-nl.adoc +4 -3
  28. data/data/locale/attributes-nn.adoc +4 -3
  29. data/data/locale/attributes-pl.adoc +8 -7
  30. data/data/locale/attributes-pt.adoc +6 -5
  31. data/data/locale/attributes-pt_BR.adoc +6 -5
  32. data/data/locale/attributes-ro.adoc +4 -3
  33. data/data/locale/attributes-ru.adoc +6 -5
  34. data/data/locale/attributes-sr.adoc +4 -4
  35. data/data/locale/attributes-sr_Latn.adoc +4 -4
  36. data/data/locale/attributes-sv.adoc +4 -4
  37. data/data/locale/attributes-tr.adoc +4 -3
  38. data/data/locale/attributes-uk.adoc +6 -5
  39. data/data/locale/attributes-zh_CN.adoc +4 -3
  40. data/data/locale/attributes-zh_TW.adoc +4 -3
  41. data/data/stylesheets/asciidoctor-default.css +22 -20
  42. data/lib/asciidoctor.rb +33 -7
  43. data/lib/asciidoctor/abstract_block.rb +9 -4
  44. data/lib/asciidoctor/abstract_node.rb +16 -6
  45. data/lib/asciidoctor/attribute_list.rb +59 -67
  46. data/lib/asciidoctor/cli/invoker.rb +2 -0
  47. data/lib/asciidoctor/cli/options.rb +3 -3
  48. data/lib/asciidoctor/convert.rb +167 -162
  49. data/lib/asciidoctor/converter.rb +13 -12
  50. data/lib/asciidoctor/converter/docbook5.rb +3 -7
  51. data/lib/asciidoctor/converter/html5.rb +59 -42
  52. data/lib/asciidoctor/converter/manpage.rb +12 -11
  53. data/lib/asciidoctor/converter/template.rb +3 -0
  54. data/lib/asciidoctor/document.rb +23 -38
  55. data/lib/asciidoctor/extensions.rb +2 -2
  56. data/lib/asciidoctor/helpers.rb +17 -9
  57. data/lib/asciidoctor/load.rb +101 -101
  58. data/lib/asciidoctor/parser.rb +26 -23
  59. data/lib/asciidoctor/path_resolver.rb +14 -12
  60. data/lib/asciidoctor/reader.rb +14 -7
  61. data/lib/asciidoctor/rx.rb +5 -4
  62. data/lib/asciidoctor/substitutors.rb +57 -38
  63. data/lib/asciidoctor/syntax_highlighter.rb +8 -5
  64. data/lib/asciidoctor/syntax_highlighter/coderay.rb +1 -1
  65. data/lib/asciidoctor/syntax_highlighter/highlightjs.rb +12 -4
  66. data/lib/asciidoctor/syntax_highlighter/prettify.rb +7 -4
  67. data/lib/asciidoctor/syntax_highlighter/pygments.rb +2 -3
  68. data/lib/asciidoctor/syntax_highlighter/rouge.rb +15 -7
  69. data/lib/asciidoctor/table.rb +49 -20
  70. data/lib/asciidoctor/version.rb +1 -1
  71. data/man/asciidoctor.1 +6 -6
  72. data/man/asciidoctor.adoc +3 -3
  73. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 640106c18c7aea466ae751e3843fd6e98668877a37f3cf1882fa9b613d088272
4
- data.tar.gz: 8c3f3ff1fd9cb5d2b63a2bc90abf6e1d3adcdeb846cae2098254e3ce3991f3fd
3
+ metadata.gz: 11a800adcdf4265d33a08cd8a131f72c4d0ae4fbafdca247c857743151f7a62a
4
+ data.tar.gz: d469b8d294a613e6cf41d8bfb20064adfae9f053bb37b23873a0dc18247d7060
5
5
  SHA512:
6
- metadata.gz: 6034c64dab7dfb1f3d6e0ccf8832ec6a78d65fc1f8deac12754b83fb1243792d72fc07dc1dbeb5177ab23eab5c35208c8f8bb04ce3818ec0deb8de1d865a6a54
7
- data.tar.gz: 64ce9f1291bd632ca2dc243c7d25d6a7e04c2f1f0902a583c7bbcf27ec69395b9bc87adfef5e926d39fb274b5bae6d902624f8e99bff49a6d6c6646fed2b87ca
6
+ metadata.gz: 471623feae9609099d5687e8a0231650990fb4b8fc39f95cfa64a8afcfc6777465354fec84e2d083088fb3706016eb3146cd83305c0c9242de61ded5bb10d046
7
+ data.tar.gz: 73959dff4b12916de260b924d5496ecef849e1989e9167ad3a74f812d937a7697b97289af0e74c85ed139aad962730b6f516f41e09d870ffbe5839afbba469db
@@ -14,6 +14,86 @@ This document provides a high-level view of the changes introduced in Asciidocto
14
14
  For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
15
15
 
16
16
  // tag::compact[]
17
+ == 2.0.11 (2020-11-02) - @mojavelinux
18
+
19
+ Bug Fixes::
20
+
21
+ * Fix infinite loop when callout list with obsolete syntax is found inside list item (#3472)
22
+ * Fix infinite loop when xreftext contains a circular reference path in HTML and manpage converters (#3543)
23
+ * Apply text formatting to table cells in implicit header row when column has the "a" or "l" style (#3760)
24
+ * Fix errant reference warning for valid reference when running in compat mode (#3555)
25
+ * Initialize backend traits for converter (if not previously initialized) using assigned basebackend; mimics Asciidoctor < 2 behavior (#3341)
26
+ * Set source_location on preamble block when sourcemap option is enabled (#3799)
27
+ * Link the notitle and showtitle attributes so they act as opposites for the same toggle (#3804)
28
+ * Pass options to constructor of Rouge lexer instead of #lex method; restores compatibility with Rouge >= 3.4 (#3336)
29
+ * Don't clobber cgi-style options on language when enabling start_inline option on the Rouge PHP lexer (#3336)
30
+ * Fix parsing of wrapped link and xref text, including when an attrlist signature is detected (#3331)
31
+ * Restore deprecated writable number property on AbstractBlock
32
+ * Always use title as xreftext if target block has an empty caption, regardless of xrefstyle value (#3745)
33
+ * Allow a bibliography reference to be used inside a footnote (#3325)
34
+ * Fix bottom margin collapsing on AsciiDoc table cell (#3370)
35
+ * Remove excess hard line break in multi-line AsciiMath blocks (#3407)
36
+ * Only strip trailing spaces from lines of AsciiDoc include file (#3436)
37
+ * Remove errant optional flag in regexp for menu macro that breaks Asciidoctor.js (#3433)
38
+ * Preserve repeating backslashes when generating manpage output (#3456)
39
+ * Honor percentage width specified on macro of inline SVG (#3464)
40
+ * Removing leading and trailing blank lines in AsciiDoc include file to match assumption of parser (#3470)
41
+ * Activate extensions when :extensions option is set even if Extensions API is not yet loaded (#3570)
42
+ * Don't activate global extensions if :extensions option is false (#3570)
43
+ * Escape ellipsis at start of line in manpage output (#3645) (*@jnavila*)
44
+ * Don't register footnote with ID if a footnote is already registered with that ID (#3690)
45
+ * Honor start attribute on ordered list in manpage output (#3714)
46
+ * Warn instead of crashing if SVG to inline is empty (#3638) (*@mogztter*)
47
+ * Compute highlight line ranges on source block relative to value of start attribute (#3519) (*@mogztter*)
48
+ * Prevent collapsible block from incrementing example number by assigning an empty caption (#3639)
49
+ * Use custom init function for highlight.js to select the correct `code` elements (#3761)
50
+ * Fix resolved value of :to_dir when both :to_file and :to_dir options are set to absolute paths (#3778)
51
+ * Fix crash if value of `stylesheets` attribute contains a folder and the destination directory for the stylesheet does not exist (even when the `:mkdirs` option is set) (#3808)
52
+ * Fix crash if value passed by API for `copycss` attribute is not a string (#3592)
53
+ * Restore label in front of each bibliography entry in DocBook output that was dropped by fix for #3085 (#3782)
54
+ * Apply max width to each top-level container instead of body in HTML output (#3513)
55
+ * Don't apply border-collapse: separate to HTML for table blocks; fixes double border at boundary of colspan/rowspan (#3793) (*@ahus1*)
56
+ * Don't remove right border on last table cell in row (#2563)
57
+ * Rework table borders to leverage border collapsing (apply frame border to table, grid border to cells, and selectively override border on cells to accommodate frame) (#3387)
58
+
59
+ Compliance::
60
+
61
+ * Add support for muted option to self-hosted video (#3408)
62
+ * Move style tag for convert-time syntax highlighters (coderay, rouge, pygments) into head (#3462)
63
+ * Move style tag for client-side syntax highlighters (highlight.js, prettify) into head (#3503)
64
+ * Define entry point API methods (load, convert, load_file, convert_file) as class methods instead of module_function to avoid conflict with Kernel.load (#3625)
65
+ * Retain attribute order on HTML code tag for source block to remain consistent with output from 1.5.x (#3786)
66
+ * Correct language code for Korean language file from kr to ko (#3807) (*@jnavila*)
67
+
68
+ Improvements::
69
+
70
+ * Apply word wrap (i.e., `word-wrap: anywhere`) to body in default stylesheet (#3544)
71
+ * Allow `nobreak` and `nowrap` roles to be used on any inline element (#3544)
72
+ * Add CSS class to support pre-wrap role to preserve leading, trailing, and repeating spaces in phrase (#3815)
73
+ * Preserve guard around XML-style callout when icons are not enabled (#3319)
74
+ * Use `.fam C` command to switch font family for verbatim blocks to monospaced text in manpage output (#3561)
75
+ * Remove redundant test for halign and valign attributes on table cell in DocBook converter
76
+ * Allow encoding of include file to be specified using encoding attribute (#3248)
77
+ * Allow template to be used to override outline by only specifying the outline template (#3491)
78
+ * Upgrade MathJax from 2.7.5 to 2.7.9
79
+ * Upgrade highlight.js from 9.15.10 to 9.18.3 (note that this increases script size from 48.8 KB to 71.5 KB)
80
+ * Skip unused default attribute assignments for embedded document
81
+ * Allow a URL macro to have a preceding single or double quote (#3376)
82
+ * Add support for erubi template engine; use it in place of erubis in test suite; note the use of erubis is deprecated (#3737)
83
+ * Download and embed remote custom stylesheet if allow-uri-read is set (#3765)
84
+ * Remove direction property from default stylesheet (#3753) (*@abdnh*)
85
+ * remove max width setting on content column for print media in default stylesheet (#3802)
86
+ * Normalize frame value "topbot" to "ends" in HTML output (consistently use frame-ends class) (#3797)
87
+ * Add role setter method on AbstractNode (#3614)
88
+ * Map chapter-signifier and part-signifier attributes in locale attribute files to replace chapter-label and part-label (#3817)
89
+
90
+ Build / Infrastructure::
91
+
92
+ * Run test suite on TruffleRuby nightly (*@mogztter*, *@erebor*)
93
+ * Upgrade TruffleRuby to 20.0.0 (*@mogztter*)
94
+ * Trigger upstream builds for AsciidoctorJ on Github Actions (*@robertpanzer*)
95
+
96
+ // end::compact[]
17
97
  == 2.0.10 (2019-05-31) - @mojavelinux
18
98
 
19
99
  Bug Fixes::
@@ -24,7 +104,6 @@ Bug Fixes::
24
104
  * fix signature of SyntaxHighlighter#docinfo method (#3300)
25
105
  * when `icons` is set to `image`, enable image icons, but don't use it as the value of the `icontype` attribute (#3308)
26
106
 
27
- // end::compact[]
28
107
  == 2.0.9 (2019-04-30) - @mojavelinux
29
108
 
30
109
  Bug Fixes::
@@ -148,7 +227,7 @@ Enhancements / Compliance::
148
227
 
149
228
  * drop support for Ruby < 2.3 and JRuby < 9.1 and remove workarounds (#2764)
150
229
  * drop support for Slim < 3 (#2998)
151
- * drop the converter for the docbook45 backend (#3005)
230
+ * drop the converter for the docbook45 backend from core; moved to https://github.com/asciidoctor/asciidoctor-docbook45 (#3005)
152
231
  * apply substitutions to section and block titles in normal substitution order (#1173)
153
232
  * make syntax highlighter pluggable; extract all logic into adapter classes (#2106)
154
233
  * add syntax highlighter adapter for Rouge (#1040)
@@ -337,6 +416,7 @@ Enhancements::
337
416
  * add support for start attribute on source block to set starting line number when converting to DocBook (#2915)
338
417
  * track imagesdir for image on node and in catalog (#2779)
339
418
  * allow starting line number to be set using start attribute when highighting source block with Pygments or CodeRay (#1742)
419
+ * add intrinsic attribute named `pp` that effectively resolves to `++` (#2807)
340
420
  * upgrade highlight.js to 9.13.1
341
421
 
342
422
  Bug Fixes::
@@ -421,6 +501,11 @@ Enhancements::
421
501
 
422
502
  * BREAKING: drop XML tags, character refs, and non-word characters (except hyphen, dot, and space) when auto-generating section IDs (#794)
423
503
  ** hyphen, dot, and space are replaced with value of idseparator, if set; otherwise, spaces are dropped
504
+ * BREAKING: disable interdocument xrefs in compat mode (#2740)
505
+ * BREAKING: automatically parse attributes in link macro if equals is present, ignoring linkattrs (except in compat mode) (#2059)
506
+ * pass non-AsciiDoc file extensions in target of xref through unprocessed (#2740)
507
+ * process any known AsciiDoc file extension in target of shorthand interdocument xref if hash is also present (e.g., `<<target.asciidoc#,text>>`) (#2740)
508
+ * only allow .adoc to be used in target of formal xref macro to create an interdocument xref (with or without a hash) (#2740)
424
509
  * allow attribute names to contain any word character defined by Unicode (#2376, PR #2393)
425
510
  * do not recognize attribute entry line if name contains a colon (PR #2377)
426
511
  * route all processor messages through a logger instead of using Kernel#warn (#44, PR #2660)
@@ -540,7 +625,6 @@ Improvements / Refactoring::
540
625
  * move callouts into document catalog (PR #2394)
541
626
  * document ID defined in block attribute line takes precedence over ID defined inside document title line
542
627
  * don't look for link and window attributes on document when resolving these attributes for an image
543
- * when linkattrs is set, only parse attributes in link macro if equals is present
544
628
  * skip line comments in name section of manpage (#2584, PR #2585)
545
629
  * always activate extension registry passed to processor (PR #2379)
546
630
  * skip extension registry activation if no groups are registered (PR #2373)
@@ -917,7 +1001,7 @@ Enhancements::
917
1001
  * Honor SOURCE_DATE_EPOCH environment variable to accomodate reproducible builds (#1721) (*@JojoBoulix*)
918
1002
  * Add reversed attribute to ordered list if reversed option is enabled (#1830)
919
1003
  * Add support for additional docinfo locations (e.g., :header)
920
- * Configure default stylesheet to break monospace word if exceeds length of line; add roles to prevent breaks (#1814)
1004
+ * Configure default stylesheet to break monospace word if exceeds length of line using `word-wrap: break-word`; add `nobreak` and `nowrap` roles to prevent breaks (#1814)
921
1005
  * Introduce translation file for built-in labels (*@ciampix*)
922
1006
  * Provide translations for built-in labels (*@JmyL* - kr, *@ciampix* - it, *@ivannov* - bg, *@maxandersen* - da, *@radcortez* - pt, *@eddumelendez* - es, *@leathersole* - jp, *@aslakknutsen* - no, *@shahryareiv* - fa, *@AlexanderZobkov* - ru, *@dongwq* - zh, *@rmpestano* - pt_BR, *@ncomet* - fr, *@lgvz* - fi, *@patoi* - hu, *@BojanStipic* - sr, *@fwilhe* - de, *@rahmanusta* - tr, *@abelsromero* - ca, *@aboullaite* - ar, *@roelvs* - nl)
923
1007
  * Translate README to Chinese (*@diguage*)
@@ -1171,7 +1255,7 @@ Improvements::
1171
1255
  * define JAVASCRIPT_PLATFORM constant to simplify conditional logic in the JavaScript environment (#897)
1172
1256
  * provide access to destination directory, outfile and outdir via Document object (#1203)
1173
1257
  * print encoding information in version report produced by `asciidoctor -v` (#1210)
1174
- * add intrinsic attribute named `cpp` with value `C++` (#1208)
1258
+ * add intrinsic attribute named `cpp` that effectively resolves to `C++` (#1208)
1175
1259
  * preserve URI targets passed to `stylesheet` and related attributes (#1192)
1176
1260
  * allow numeric characters in block attribute name (#1103)
1177
1261
  * support custom YouTube playlists (#1105)
data/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  MIT License
2
2
 
3
- Copyright (C) 2012-2019 Dan Allen, Sarah White, Ryan Waldron, and the
3
+ Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, and the
4
4
  individual contributors to Asciidoctor.
5
5
 
6
6
  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.10, 2019-05-31
3
+ v2.0.11, 2020-11-02
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
17
17
  :warning-caption: :warning:
18
18
  endif::[]
19
19
  // Variables:
20
- :release-version: 2.0.10
20
+ :release-version: 2.0.11
21
21
  // URIs:
22
22
  :uri-org: https://github.com/asciidoctor
23
23
  :uri-repo: {uri-org}/asciidoctor
@@ -40,7 +40,7 @@ endif::[]
40
40
  :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
41
41
  :uri-license: {uri-rel-file-base}LICENSE
42
42
  :uri-tests: {uri-rel-tree-base}test
43
- :uri-discuss: http://discuss.asciidoctor.org
43
+ :uri-discuss: https://discuss.asciidoctor.org
44
44
  :uri-irc: irc://irc.freenode.org/#asciidoctor
45
45
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
46
46
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
@@ -453,7 +453,7 @@ Asciidoctor Organization auf GitHub:: {uri-org}
453
453
 
454
454
  == Lizenz
455
455
 
456
- Copyright (C) 2012-2019 Dan Allen, Sarah White, Ryan Waldron, und die einzelnen Mitarbeiter von Asciidoctor.
456
+ Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, und die einzelnen Mitarbeiter von Asciidoctor.
457
457
  Die Nutzung dieser Software wird unter den Bedingungen der MIT-Lizenz gewährt.
458
458
 
459
459
  Siehe die {uri-license}[LIZENZ] für den vollen Lizenztext.
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.10, 2019-05-31
3
+ v2.0.11, 2020-11-02
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
17
17
  :warning-caption: :warning:
18
18
  endif::[]
19
19
  // Variables:
20
- :release-version: 2.0.10
20
+ :release-version: 2.0.11
21
21
  // URIs:
22
22
  :uri-org: https://github.com/asciidoctor
23
23
  :uri-repo: {uri-org}/asciidoctor
@@ -40,7 +40,7 @@ endif::[]
40
40
  :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
41
41
  :uri-license: {uri-rel-file-base}LICENSE
42
42
  :uri-tests: {uri-rel-tree-base}test
43
- :uri-discuss: http://discuss.asciidoctor.org
43
+ :uri-discuss: https://discuss.asciidoctor.org
44
44
  :uri-irc: irc://irc.freenode.org/#asciidoctor
45
45
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
46
46
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
@@ -422,7 +422,7 @@ L'organisation Asciidoctor sur GitHub:: {uri-org}
422
422
 
423
423
  == Licence
424
424
 
425
- Copyright (C) 2012-2019 Dan Allen, Sarah White, Ryan Waldron, et les contributeurs individuels d'Asciidoctor.
425
+ Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, et les contributeurs individuels d'Asciidoctor.
426
426
  Une utilisation libre de ce logiciel est autorisée sous les termes de la licence MIT.
427
427
 
428
428
  Consultez le fichier {uri-license}[LICENSE] pour plus de détails.
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.10, 2019-05-31
3
+ v2.0.11, 2020-11-02
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
17
17
  :warning-caption: :warning:
18
18
  endif::[]
19
19
  // Variables:
20
- :release-version: 2.0.10
20
+ :release-version: 2.0.11
21
21
  // URIs:
22
22
  :uri-org: https://github.com/asciidoctor
23
23
  :uri-repo: {uri-org}/asciidoctor
@@ -44,7 +44,7 @@ endif::[]
44
44
  :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
45
45
  :uri-license: {uri-rel-file-base}LICENSE
46
46
  :uri-tests: {uri-rel-tree-base}test
47
- :uri-discuss: http://discuss.asciidoctor.org
47
+ :uri-discuss: https://discuss.asciidoctor.org
48
48
  :uri-irc: irc://irc.freenode.org/#asciidoctor
49
49
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
50
50
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
@@ -460,7 +460,7 @@ GitHub上のAsciidoctorのorganization:: {uri-org}
460
460
 
461
461
  == ライセンス
462
462
 
463
- Copyright (C) 2012-2019 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
463
+ Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
464
464
  本ソフトウェアはMITライセンスのもとで使用できます.
465
465
 
466
466
  ライセンスの詳細については {uri-license}[LICENSE] ファイルを参照してください.
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.10, 2019-05-31
3
+ v2.0.11, 2020-11-02
4
4
  // settings:
5
5
  :page-layout: base
6
6
  :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
18
18
  :warning-caption: :warning:
19
19
  endif::[]
20
20
  // Variables:
21
- :release-version: 2.0.10
21
+ :release-version: 2.0.11
22
22
  // URIs:
23
23
  :uri-org: https://github.com/asciidoctor
24
24
  :uri-repo: {uri-org}/asciidoctor
@@ -41,7 +41,7 @@ endif::[]
41
41
  :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
42
42
  :uri-license: {uri-rel-file-base}LICENSE
43
43
  :uri-tests: {uri-rel-tree-base}test
44
- :uri-discuss: http://discuss.asciidoctor.org
44
+ :uri-discuss: https://discuss.asciidoctor.org
45
45
  :uri-irc: irc://irc.freenode.org/#asciidoctor
46
46
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
47
47
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
@@ -62,8 +62,8 @@ endif::[]
62
62
 
63
63
  {uri-project}/[Asciidoctor] 是一个 _快速_ 文本处理器和发布工具链,它可以将 {uri-what-is-asciidoc}[AsciiDoc] 文档转化成 HTML 5、 DocBook 5 以及其他格式。
64
64
  Asciidoctor 由 Ruby 编写,打包成 RubyGem,然后发布到 {uri-rubygem}[RubyGems.org] 上。
65
- 这个 gem 还被包含道几个 Linux 发行版中,其中包括 Fedora、Debian 和 Ubuntu。
66
- Asciidoctor 是开源的,{uri-repo}[代码]托管在 GitHub,遵从 {uri-license}[MIT] 协议。
65
+ 这个 gem 还被包含到几个 Linux 发行版中,其中包括 Fedora、Debian 和 Ubuntu。
66
+ Asciidoctor 是开源的,link:{uri-repo}[代码托管在 GitHub],遵从 {uri-license}[MIT] 协议。
67
67
 
68
68
  该文档有如下语言的翻译版:
69
69
 
@@ -412,7 +412,7 @@ Asciidoctor 组织在 GitHub 托管代码、议案跟踪和相关子项目。
412
412
  [#copyright-and-licensing]
413
413
  == 版权和协议
414
414
 
415
- Copyright (C) 2012-2019 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
415
+ Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
416
416
  这个软件的免费使用是在MIT许可条款授予的。
417
417
 
418
418
  请看 {uri-license}[版权声明] 文件来获取更多详细信息。
@@ -1,6 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
- v2.0.10, 2019-05-31
3
+ v2.0.11, 2020-11-02
4
4
  // settings:
5
5
  :idprefix:
6
6
  :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
17
17
  :warning-caption: :warning:
18
18
  endif::[]
19
19
  // Variables:
20
- :release-version: 2.0.10
20
+ :release-version: 2.0.11
21
21
  // URIs:
22
22
  :uri-org: https://github.com/asciidoctor
23
23
  :uri-repo: {uri-org}/asciidoctor
@@ -44,7 +44,7 @@ endif::[]
44
44
  :uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
45
45
  :uri-license: {uri-rel-file-base}LICENSE
46
46
  :uri-tests: {uri-rel-tree-base}test
47
- :uri-discuss: http://discuss.asciidoctor.org
47
+ :uri-discuss: https://discuss.asciidoctor.org
48
48
  :uri-irc: irc://irc.freenode.org/#asciidoctor
49
49
  :uri-rubygem: https://rubygems.org/gems/asciidoctor
50
50
  :uri-what-is-asciidoc: {uri-docs}/what-is-asciidoc
@@ -166,7 +166,7 @@ Asciidoctor works best when you use UTF-8 everywhere.
166
166
 
167
167
  == Installation
168
168
 
169
- Asciidoctor can be installed using (a) package managers for popular Linux distributions, (b) Homebrew for macOS, (c) the `gem install` command (recommended for Windows users), (d) the Asciidoctor Docker image, or (e) Bundler.
169
+ Asciidoctor can be installed using (a) package managers for popular Linux distributions, (b) Homebrew for macOS, (c) the `gem install` command (recommended for Windows users or if you'll be installing additional gems), (d) the Asciidoctor Docker image, or (e) Bundler.
170
170
 
171
171
  The benefit of using your operating system's package manager to install the gem is that it handles installing Ruby and the RubyGems library if those packages are not already installed on your machine.
172
172
 
@@ -243,11 +243,11 @@ Or you use the https://rubyinstaller.org/downloads/[Rubyinstaller], download the
243
243
  [#gem-install]
244
244
  === (d) gem install
245
245
 
246
- Before installing Asciidoctor using `gem install`, you should use https://rvm.io[RVM] to install Ruby in your home directory (i.e., user space).
247
- Then, you can safely use the `gem` command to install or update the Asciidoctor gem.
246
+ Before installing Asciidoctor using `gem install`, you should set up https://rvm.io[RVM] to install Ruby in your home directory (i.e., user space).
247
+ Then, you can safely use the `gem` command to install or update the Asciidoctor gem, or any other gem for that matter.
248
248
  When using RVM, gems are installed in a location isolated from the system.
249
249
 
250
- Open a terminal and type:
250
+ Once you've installed Ruby using RVM, and you have activated it using `rvm use 2.6`, open a terminal and type:
251
251
 
252
252
  $ gem install asciidoctor
253
253
 
@@ -458,9 +458,9 @@ Source repository (git):: {uri-repo}
458
458
  Issue tracker:: {uri-issues}
459
459
  Asciidoctor organization on GitHub:: {uri-org}
460
460
 
461
- == License
461
+ == Copyright and License
462
462
 
463
- Copyright (C) 2012-2019 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
463
+ Copyright (C) 2012-2020 Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
464
464
  Use of this software is granted under the terms of the MIT License.
465
465
 
466
466
  See the {uri-license}[LICENSE] for the full license text.
@@ -470,7 +470,11 @@ See the {uri-license}[LICENSE] for the full license text.
470
470
  *Asciidoctor* is led by https://github.com/mojavelinux[Dan Allen] and https://github.com/graphitefriction[Sarah White] and has received contributions from {uri-contributors}[many individuals] in Asciidoctor's awesome community.
471
471
  The project was initiated in 2012 by https://github.com/erebor[Ryan Waldron] and based on {uri-prototype}[a prototype] written by https://github.com/nickh[Nick Hengeveld].
472
472
 
473
- *AsciiDoc* was started by Stuart Rackham and has received contributions from many individuals in the AsciiDoc community.
473
+ *AsciiDoc* was started and maintained by Stuart Rackham from https://github.com/asciidoc/asciidoc/blob/master/CHANGELOG.txt[2002 to 2013] and has received contributions from many individuals in the https://github.com/asciidoc/asciidoc/graphs/contributors[AsciiDoc community].
474
+
475
+ == Trademarks
476
+
477
+ AsciiDoc is a Trademark of the Eclipse Foundation, Inc.
474
478
 
475
479
  ifndef::env-site[]
476
480
  == Changelog
@@ -40,14 +40,14 @@ Gem::Specification.new do |s|
40
40
  # concurrent-ruby, haml, slim, and tilt are needed for testing custom templates
41
41
  s.add_development_dependency 'concurrent-ruby', '~> 1.1.0'
42
42
  s.add_development_dependency 'cucumber', '~> 3.1.0'
43
- # erubis is needed for testing alternate eRuby impls
44
- s.add_development_dependency 'erubis', '~> 2.7.0'
43
+ # erubi is needed for testing alternate eRuby impls
44
+ s.add_development_dependency 'erubi', '~> 1.9.0'
45
45
  s.add_development_dependency 'haml', '~> 5.0.0'
46
46
  s.add_development_dependency 'minitest', '~> 5.11.0'
47
47
  s.add_development_dependency 'nokogiri', '~> 1.10.0'
48
48
  s.add_development_dependency 'rake', '~> 12.3.0'
49
49
  # Asciidoctor supports Rouge >= 2
50
- s.add_development_dependency 'rouge', '~> 3.3.0'
50
+ s.add_development_dependency 'rouge', '~> 3.15.0'
51
51
  s.add_development_dependency 'rspec-expectations', '~> 3.8.0'
52
52
  s.add_development_dependency 'slim', '~> 4.0.0'
53
53
  s.add_development_dependency 'tilt', '~> 2.0.0'
@@ -2,8 +2,8 @@
2
2
  :appendix-caption: ملحق
3
3
  :appendix-refsig: {appendix-caption}
4
4
  :caution-caption: تنبيه
5
- //:chapter-label: ???
6
- //:chapter-refsig: {chapter-label}
5
+ //:chapter-signifier: ???
6
+ //:chapter-refsig: {chapter-signifier}
7
7
  :example-caption: مثال
8
8
  :figure-caption: الشكل
9
9
  :important-caption: مهم
@@ -11,7 +11,8 @@
11
11
  ifdef::listing-caption[:listing-caption: قائمة]
12
12
  ifdef::manname-title[:manname-title: اسم]
13
13
  :note-caption: ملاحظة
14
- //:part-refsig: ???
14
+ //:part-signifier: ???
15
+ //:part-refsig: {part-signifier}
15
16
  ifdef::preface-title[:preface-title: تمهيد]
16
17
  //:section-refsig: ???
17
18
  :table-caption: جدول
@@ -2,8 +2,8 @@
2
2
  :appendix-caption: Приложение
3
3
  :appendix-refsig: {appendix-caption}
4
4
  :caution-caption: Внимание
5
- //:chapter-label: ???
6
- //:chapter-refsig: {chapter-label}
5
+ //:chapter-signifier: ???
6
+ //:chapter-refsig: {chapter-signifier}
7
7
  :example-caption: Пример
8
8
  :figure-caption: Фигура
9
9
  :important-caption: Важно
@@ -11,7 +11,8 @@
11
11
  ifdef::listing-caption[:listing-caption: Листинг]
12
12
  ifdef::manname-title[:manname-title: Име]
13
13
  :note-caption: Забележка
14
- //:part-refsig: ???
14
+ //:part-signifier: ???
15
+ //:part-refsig: {part-signifier}
15
16
  ifdef::preface-title[:preface-title: Предговор]
16
17
  //:section-refsig: ???
17
18
  :table-caption: Таблица