asciidoctor 2.0.0.rc.2 → 2.0.0.rc.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.adoc +31 -3
  3. data/README-de.adoc +2 -8
  4. data/README-fr.adoc +2 -8
  5. data/README-jp.adoc +2 -2
  6. data/README-zh_CN.adoc +2 -2
  7. data/README.adoc +3 -7
  8. data/data/locale/attributes-fr.adoc +1 -1
  9. data/data/stylesheets/asciidoctor-default.css +3 -2
  10. data/lib/asciidoctor.rb +13 -7
  11. data/lib/asciidoctor/abstract_block.rb +33 -27
  12. data/lib/asciidoctor/abstract_node.rb +6 -10
  13. data/lib/asciidoctor/block.rb +4 -4
  14. data/lib/asciidoctor/cli/options.rb +23 -24
  15. data/lib/asciidoctor/converter.rb +17 -16
  16. data/lib/asciidoctor/converter/docbook5.rb +102 -102
  17. data/lib/asciidoctor/converter/html5.rb +142 -84
  18. data/lib/asciidoctor/converter/manpage.rb +81 -81
  19. data/lib/asciidoctor/converter/template.rb +2 -2
  20. data/lib/asciidoctor/core_ext.rb +1 -0
  21. data/lib/asciidoctor/core_ext/hash/merge.rb +7 -0
  22. data/lib/asciidoctor/document.rb +28 -14
  23. data/lib/asciidoctor/extensions.rb +4 -3
  24. data/lib/asciidoctor/inline.rb +2 -9
  25. data/lib/asciidoctor/parser.rb +27 -17
  26. data/lib/asciidoctor/reader.rb +41 -26
  27. data/lib/asciidoctor/section.rb +1 -8
  28. data/lib/asciidoctor/substitutors.rb +125 -124
  29. data/lib/asciidoctor/syntax_highlighter/highlightjs.rb +1 -1
  30. data/lib/asciidoctor/table.rb +1 -1
  31. data/lib/asciidoctor/version.rb +1 -1
  32. data/man/asciidoctor.1 +4 -4
  33. data/man/asciidoctor.adoc +1 -1
  34. metadata +3 -2
data/lib/asciidoctor/syntax_highlighter/highlightjs.rb CHANGED
@@ -20,7 +20,7 @@ class SyntaxHighlighter::HighlightJsAdapter < SyntaxHighlighter::Base
20
20
  base_url = doc.attr 'highlightjsdir', %(#{opts[:cdn_base_url]}/highlight.js/#{HIGHLIGHT_JS_VERSION})
21
21
  %(<link rel="stylesheet" href="#{base_url}/styles/#{doc.attr 'highlightjs-theme', 'github'}.min.css"#{opts[:self_closing_tag_slash]}>
22
22
  <script src="#{base_url}/highlight.min.js"></script>
23
- <script>hljs.initHighlighting()</script>)
23
+ #{(doc.attr? 'highlightjs-languages') ? ((doc.attr 'highlightjs-languages').split ',').map {|lang| %[<script src="#{base_url}/languages/#{lang.lstrip}.min.js"></script>\n] }.join : ''}<script>hljs.initHighlighting()</script>)
24
24
  end
25
25
  end
26
26
  end
data/lib/asciidoctor/table.rb CHANGED
@@ -299,7 +299,7 @@ class Table::Cell < AbstractBlock
299
299
  inner_document_lines.unshift(*preprocessed_lines) unless preprocessed_lines.empty?
300
300
  end
301
301
  end unless inner_document_lines.empty?
302
- @inner_document = Document.new(inner_document_lines, header_footer: false, parent: @document, cursor: inner_document_cursor)
302
+ @inner_document = Document.new inner_document_lines, standalone: false, parent: @document, cursor: inner_document_cursor
303
303
  @document.attributes['doctitle'] = parent_doctitle unless parent_doctitle.nil?
304
304
  @subs = nil
305
305
  elsif literal
data/lib/asciidoctor/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Asciidoctor
3
- VERSION = '2.0.0.rc.2'
3
+ VERSION = '2.0.0.rc.3'
4
4
  end
data/man/asciidoctor.1 CHANGED
@@ -1,13 +1,13 @@
1
1
  '\" t
2
2
  .\" Title: asciidoctor
3
3
  .\" Author: Dan Allen, Sarah White, Ryan Waldron
4
- .\" Generator: Asciidoctor 2.0.0.rc.2
5
- .\" Date: 2019-03-12
4
+ .\" Generator: Asciidoctor 2.0.0.rc.3
5
+ .\" Date: 2019-03-21
6
6
  .\" Manual: Asciidoctor Manual
7
- .\" Source: Asciidoctor 2.0.0.rc.2
7
+ .\" Source: Asciidoctor 2.0.0.rc.3
8
8
  .\" Language: English
9
9
  .\"
10
- .TH "ASCIIDOCTOR" "1" "2019-03-12" "Asciidoctor 2.0.0.rc.2" "Asciidoctor Manual"
10
+ .TH "ASCIIDOCTOR" "1" "2019-03-21" "Asciidoctor 2.0.0.rc.3" "Asciidoctor Manual"
11
11
  .ie \n(.g .ds Aq \(aq
12
12
  .el .ds Aq '
13
13
  .ss \n[.ss] 0
data/man/asciidoctor.adoc CHANGED
@@ -2,7 +2,7 @@
2
2
  Dan Allen; Sarah White; Ryan Waldron
3
3
  :doctype: manpage
4
4
  :man manual: Asciidoctor Manual
5
- :man source: Asciidoctor 2.0.0.rc.2
5
+ :man source: Asciidoctor 2.0.0.rc.3
6
6
  :page-layout: base
7
7
 
8
8
  == NAME
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: asciidoctor
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc.2
4
+ version: 2.0.0.rc.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dan Allen
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2019-03-12 00:00:00.000000000 Z
16
+ date: 2019-03-21 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: asciimath
@@ -267,6 +267,7 @@ files:
267
267
  - lib/asciidoctor/converter/template.rb
268
268
  - lib/asciidoctor/core_ext.rb
269
269
  - lib/asciidoctor/core_ext/float/truncate.rb
270
+ - lib/asciidoctor/core_ext/hash/merge.rb
270
271
  - lib/asciidoctor/core_ext/match_data/names.rb
271
272
  - lib/asciidoctor/core_ext/nil_or_empty.rb
272
273
  - lib/asciidoctor/core_ext/regexp/is_match.rb