asciidoctor 1.5.6 → 1.5.6.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b9291c3c5872dd8602d062efc979b88ac593eb1e
4
- data.tar.gz: 1424268363aa327aace6ffd2bf7325f4d7eb2b20
3
+ metadata.gz: 9f6a8671e446eb2021a4d58361b682a9add86dd8
4
+ data.tar.gz: d2abd5cd807f990626e065fa311cc95aa1486a4a
5
5
  SHA512:
6
- metadata.gz: 154a4a997b9e3640083df71c1903b069467171504b3241678ffffacd9bf19114be957e92cbcb904fb86de611479ad67864d66daaba7092cd3531de5cb2ee8953
7
- data.tar.gz: 9d2fe8f52e02c0cdecbb5ee3d9159ba79d6bb8ce451a8c2d3803ec65641020f21e4f415e1700f8558ac15db9993a93e22857a81dbaa5a77d2ce7e14441c6704f
6
+ metadata.gz: cb62887144f8afd10837e4cfee140b2f736195d0687dbb94b99b8c66a9b0d47d4dfcd6446275d083afd7c975607faf3bfb52a6986c4e398c60cb16d073ad18c4
7
+ data.tar.gz: 48a70bb8608c6fba88c313b1f0f6fb9ed042cb5e18feea3f6b8346230e811f123be12f3a363c11cecbe0b5158b1f84d7ebb07407c4c7951ab8f3e86c438a094e
@@ -14,6 +14,58 @@ 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
+ == 1.5.6.1 (2017-07-23) - @mojavelinux
18
+
19
+ Bug fixes::
20
+
21
+ * continue to read blocks inside a delimited block after content is skipped (PR #2318)
22
+ * don't create an empty paragraph for skipped content inside a delimited block (PR #2319)
23
+ * allow the subs argument of Substitutors#apply_subs to be nil
24
+ * coerce group name to symbol when registering extension (#2324)
25
+ * eagerly substitute attributes in target of inline image macro (#2330)
26
+ * don't warn if source stylesheet can't be read but destination already exists (#2323)
27
+ * track include path correctly if path is absolute and outside of base directory (#2107)
28
+ * preprocess second line of setext section title (PR #2321)
29
+ * preprocess second line of setext discrete heading (PR #2332)
30
+ * return filename as relative path if filename doesn't share common root with base directory (#2107)
31
+
32
+ Improvements / Refactoring::
33
+
34
+ * change default text for inter-document xref (PR #2316)
35
+ * add additional tests to test behavior of Reader#peek_lines
36
+ * parse revision info line correctly that only has version and remark; add missing test for scenario
37
+ * rename AtxSectionRx constant to AtxSectionTitleRx for consistency with SetextSectionTitleRx constant
38
+ * use terms "atx" and "setext" to refer to section title syntax (PR #2334)
39
+ * rename HybridLayoutBreakRx constant to ExtLayoutBreakRx
40
+ * change terminology from "floating title" to "discrete heading"
41
+ * consolidate skip blank lines and check for end of reader (PR #2325)
42
+ * have Reader#skip_blank_lines report end of file (PR #2325)
43
+ * don't mix return type of Parser.build_block method (PR #2328)
44
+ * don't track eof state in reader (PR #2320)
45
+ * use shift instead of advance to consume line when return value isn't needed (PR #2322)
46
+ * replace terminology "floating title" with "discrete heading"
47
+ * remove unnecessary nil_or_empty? checks in substitutor
48
+ * leverage built-in assert / refute methods in test suite
49
+
50
+ Build / Infrastructure::
51
+
52
+ * config Travis CI job to release gem (PR #2333)
53
+ * add SHA1 hash to message used for triggered builds
54
+ * trigger build of AsciidoctorJ on every change to core
55
+ * trigger build of Asciidoctor Diagram on every change to core
56
+
57
+ Distribution Packages::
58
+
59
+ * http://rubygems.org/gems/asciidoctor[RubyGem (asciidoctor)]
60
+ * https://apps.fedoraproject.org/packages/rubygem-asciidoctor[Fedora (rubygem-asciidoctor)]
61
+ * http://packages.debian.org/sid/asciidoctor[Debian (asciidoctor)]
62
+ * http://packages.ubuntu.com/saucy/asciidoctor[Ubuntu (asciidoctor)]
63
+
64
+ https://github.com/asciidoctor/asciidoctor/issues?q=milestone%3Av1.5.6.1[issues resolved] |
65
+ https://github.com/asciidoctor/asciidoctor/releases/tag/v1.5.6.1[git tag] |
66
+ https://github.com/asciidoctor/asciidoctor/compare/v1.5.6...v1.5.6.1[full diff]
67
+ // end::compact[]
68
+
17
69
  == 1.5.6 (2017-07-12) - @mojavelinux
18
70
 
19
71
  Enhancements::
@@ -228,7 +280,6 @@ Distribution Packages::
228
280
  https://github.com/asciidoctor/asciidoctor/issues?q=milestone%3Av1.5.6[issues resolved] |
229
281
  https://github.com/asciidoctor/asciidoctor/releases/tag/v1.5.6[git tag] |
230
282
  https://github.com/asciidoctor/asciidoctor/compare/v1.5.5...v1.5.6[full diff]
231
- // end::compact[]
232
283
 
233
284
  == 1.5.5 (2016-10-05) - @mojavelinux
234
285
 
@@ -1,18 +1,24 @@
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
- v1.5.6, 2017-07-12
4
- // FIXME use build system to expand includes statically so document renders properly on GitHub
5
- ifeval::[{safe-mode-level} < 20]
6
- include::_settings-README.adoc[]
7
- endif::[]
8
- ifeval::[{safe-mode-level} >= 20]
3
+ v1.5.6.1, 2017-07-23
9
4
  // settings:
10
5
  :page-layout: base
11
6
  :idprefix:
12
7
  :idseparator: -
13
8
  :source-language: ruby
14
9
  :language: {source-language}
15
- ifdef::env-github[:status:]
10
+ ifndef::env-github[:icons: font]
11
+ ifdef::env-github[]
12
+ :status:
13
+ :outfilesuffix: .adoc
14
+ :caution-caption: :fire:
15
+ :important-caption: :exclamation:
16
+ :note-caption: :paperclip:
17
+ :tip-caption: :bulb:
18
+ :warning-caption: :warning:
19
+ endif::[]
20
+ // Variables:
21
+ :release-version: 1.5.6.1
16
22
  // URIs:
17
23
  :uri-org: https://github.com/asciidoctor
18
24
  :uri-repo: {uri-org}/asciidoctor
@@ -53,7 +59,6 @@ endif::[]
53
59
  :uri-ruby: https://ruby-lang.org
54
60
  // images:
55
61
  :image-uri-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
56
- endif::[]
57
62
 
58
63
  {uri-project}/[Asciidoctor] est un processeur de texte _rapide_ et une chaîne de publication pour convertir du contenu {uri-what-is-asciidoc}[AsciiDoc] en HTML5, DocBook 5 (ou 4.5) et d'autres formats.
59
64
  Asciidoctor est écrit en Ruby, packagé sous forme de RubyGem et publié sur {uri-rubygem}[RubyGems.org].
@@ -61,7 +66,8 @@ La gemme est aussi incluse dans plusieurs distributions Linux, dont Fedora, Debi
61
66
  Asciidoctor est open source, {uri-repo}[hébergé sur GitHub] et distribué sous {uri-license}[licence MIT].
62
67
 
63
68
  ifndef::env-site[]
64
- .Ce document est traduit dans les langues suivantes :
69
+ Ce document est traduit dans les langues suivantes :
70
+
65
71
  * {uri-rel-file-base}README.adoc[Anglais]
66
72
  * {uri-rel-file-base}README-zh_CN.adoc[Chinois]
67
73
  * {uri-rel-file-base}README-jp.adoc[Japonais]
@@ -173,12 +179,12 @@ Si c'est le cas, utilisez la commande gem suivante pour supprimer la vieille ver
173
179
  . Créez un fichier Gemfile à la racine de votre projet (ou du répertoire courant)
174
180
  . Ajoutez la gemme `asciidoctor` dans votre fichier Gemfile comme ci-dessous :
175
181
  +
176
- [source]
182
+ [source,subs=attributes+]
177
183
  ----
178
184
  source 'https://rubygems.org'
179
185
  gem 'asciidoctor'
180
186
  # ou spécifier la version explicitement
181
- # gem 'asciidoctor', '1.5.6'
187
+ # gem 'asciidoctor', '{release-version}'
182
188
  ----
183
189
 
184
190
  . Sauvegardez le fichier Gemfile
@@ -261,10 +267,10 @@ Pour vérifier sa disponibilité, exécutez la commande suivante dans votre term
261
267
 
262
268
  Vous devriez voir les informations concernant la version d'Asciidoctor et celle de votre environnement Ruby s'afficher dans le terminal.
263
269
 
264
- [.output]
270
+ [.output,subs=attributes+]
265
271
  ....
266
- Asciidoctor 1.5.6 [http://asciidoctor.org]
267
- Runtime Environment (ruby 2.2.2p95 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
272
+ Asciidoctor {release-version} [http://asciidoctor.org]
273
+ Runtime Environment (ruby 2.4.1p111 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
268
274
  ....
269
275
 
270
276
  Asciidoctor fournit aussi une API.
@@ -411,7 +417,7 @@ Le projet a été initié en 2012 par https://github.com/erebor[Ryan Waldron] et
411
417
  == Changelog
412
418
 
413
419
  ifeval::[{safe-mode-level} < 20]
414
- include::CHANGELOG.adoc[tags=compact;parse,leveloffset=+1]
420
+ include::CHANGELOG.adoc[tag=compact,leveloffset=+1]
415
421
  endif::[]
416
422
 
417
423
  Référez-vous au fichier {uri-changelog}[CHANGELOG] pour une liste complète des changements des versions précédentes.
@@ -1,13 +1,24 @@
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
- v1.5.6, 2017-07-12
3
+ v1.5.6.1, 2017-07-23
4
4
  // settings:
5
5
  :page-layout: base
6
6
  :idprefix:
7
7
  :idseparator: -
8
8
  :source-language: ruby
9
9
  :language: {source-language}
10
- ifdef::env-github[:status:]
10
+ ifndef::env-github[:icons: font]
11
+ ifdef::env-github[]
12
+ :status:
13
+ :outfilesuffix: .adoc
14
+ :caution-caption: :fire:
15
+ :important-caption: :exclamation:
16
+ :note-caption: :paperclip:
17
+ :tip-caption: :bulb:
18
+ :warning-caption: :warning:
19
+ endif::[]
20
+ // Variables:
21
+ :release-version: 1.5.6.1
11
22
  // URIs:
12
23
  :uri-org: https://github.com/asciidoctor
13
24
  :uri-repo: {uri-org}/asciidoctor
@@ -55,7 +66,8 @@ gemはいくつかのLinuxディストリビューション, Fedora, Debian, Ubu
55
66
  Asciidoctorはオープンソース {uri-repo}[hosted on Github] で {uri-license}[the MIT licence]のもとに配布されます.
56
67
 
57
68
  ifndef::env-site[]
58
- .Translations of the document are available in the following languages:
69
+ Translations of this document are available in the following languages:
70
+
59
71
  * {uri-rel-file-base}README-zh_CN.adoc[汉语]
60
72
  * {uri-rel-file-base}README.adoc[English]
61
73
  * {uri-rel-file-base}README-fr.adoc[Français]
@@ -163,12 +175,12 @@ TIP: Linuxパッケージマネージャを用いてインストールするこ
163
175
  . プロジェクトフォルダーのルート(かカレントディレクトリ)にGemfileを作成
164
176
  . `asciidoctor` gemをGemfileに以下のように追加:
165
177
  +
166
- [source]
178
+ [source,subs=attributes+]
167
179
  ----
168
180
  source 'https://rubygems.org'
169
181
  gem 'asciidoctor'
170
182
  # or specify the version explicitly
171
- # gem 'asciidoctor', '1.5.6'
183
+ # gem 'asciidoctor', '{release-version}'
172
184
  ----
173
185
 
174
186
  . Gemfileを保存
@@ -251,10 +263,10 @@ Asciidoctorのインストールに成功すれば, `asciidoctor` コマンド
251
263
 
252
264
  AsciidoctorのバージョンとRuby環境についての情報がターミナルに出力されたのを見ることができるはずです.
253
265
 
254
- [.output]
266
+ [.output,subs=attributes+]
255
267
  ....
256
- Asciidoctor 1.5.6 [http://asciidoctor.org]
257
- Runtime Environment (ruby 2.2.2p95 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
268
+ Asciidoctor {release-version} [http://asciidoctor.org]
269
+ Runtime Environment (ruby 2.4.1p111 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
258
270
  ....
259
271
 
260
272
  AsciidoctorはAPIを提供します.
@@ -1,13 +1,24 @@
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
- v1.5.6, 2017-07-12
3
+ v1.5.6.1, 2017-07-23
4
4
  // settings:
5
5
  :page-layout: base
6
6
  :idprefix:
7
7
  :idseparator: -
8
8
  :source-language: ruby
9
9
  :language: {source-language}
10
- ifdef::env-github[:status:]
10
+ ifndef::env-github[:icons: font]
11
+ ifdef::env-github[]
12
+ :status:
13
+ :outfilesuffix: .adoc
14
+ :caution-caption: :fire:
15
+ :important-caption: :exclamation:
16
+ :note-caption: :paperclip:
17
+ :tip-caption: :bulb:
18
+ :warning-caption: :warning:
19
+ endif::[]
20
+ // Variables:
21
+ :release-version: 1.5.6.1
11
22
  // URIs:
12
23
  :uri-org: https://github.com/asciidoctor
13
24
  :uri-repo: {uri-org}/asciidoctor
@@ -54,7 +65,8 @@ Asciidoctor 由 Ruby 编写,打包成 RubyGem,然后发布到 {uri-rubygem}[
54
65
  这个 gem 还被包含道几个 Linux 发行版中,其中包括 Fedora、Debian 和 Ubuntu。
55
66
  Asciidoctor 是开源的,{uri-repo}[代码托管在 GitHub],并且是以 {uri-license}[MIT 协议]授权。
56
67
 
57
- .该文档有如下语言的翻译版:
68
+ 该文档有如下语言的翻译版:
69
+
58
70
  * {uri-rel-file-base}README.adoc[English]
59
71
  * {uri-rel-file-base}README-fr.adoc[Français]
60
72
 
@@ -76,7 +88,7 @@ Asciidoctor 也可以运行在 JavaScript 上。
76
88
  Asciidoctor.js 被用于 AsciiDoc 预览,支持 Chrome 扩展,Atom,Brackets 或其他基于 Web 的工具。
77
89
  ****
78
90
 
79
- ifdef::badges[]
91
+ ifdef::status[]
80
92
  .*Project health*
81
93
  image:https://img.shields.io/travis/asciidoctor/asciidoctor/master.svg[Build Status (Travis CI), link=https://travis-ci.org/asciidoctor/asciidoctor]
82
94
  image:https://ci.appveyor.com/api/projects/status/ifplu67oxvgn6ceq/branch/master?svg=true&amp;passingText=green%20bar&amp;failingText=%23fail&amp;pendingText=building%2E%2E%2E[Build Status (AppVeyor), link=https://ci.appveyor.com/project/asciidoctor/asciidoctor]
@@ -168,12 +180,12 @@ TIP: 使用 Linux 包管理器安装的好处是如果 Ruby 和 RubyGems 库没
168
180
  . 在项目的根目录(或者当前路径),创建一个 `Gemfile` 文件;
169
181
  . 在这个文件中添加 `asciidoctor` gem 如下:
170
182
  +
171
- [source]
183
+ [source,subs=attributes+]
172
184
  ----
173
185
  source 'https://rubygems.org'
174
186
  gem 'asciidoctor'
175
187
  # 或者明确指明版本
176
- # gem 'asciidoctor', '1.5.6'
188
+ # gem 'asciidoctor', '{release-version}'
177
189
  ----
178
190
 
179
191
  . 保存 `Gemfile` 文件
@@ -260,10 +272,10 @@ TIP: 如果你的 Alpine Linux 系统配置的是自动升级包,在这种情
260
272
 
261
273
  你应该看到关于 Asciidoctor 和 Ruby 环境信息将打印到你的终端上。
262
274
 
263
- [.output]
275
+ [.output,subs=attributes+]
264
276
  ....
265
- Asciidoctor 1.5.6 [http://asciidoctor.org]
266
- Runtime Environment (ruby 2.2.2p95 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
277
+ Asciidoctor {release-version} [http://asciidoctor.org]
278
+ Runtime Environment (ruby 2.4.1p111 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
267
279
  ....
268
280
 
269
281
  Asciidoctor 还提供了一套 API。
@@ -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
- v1.5.6, 2017-07-12
3
+ v1.5.6.1, 2017-07-23
4
4
  // settings:
5
5
  :page-layout: base
6
6
  :idprefix:
@@ -17,6 +17,8 @@ ifdef::env-github[]
17
17
  :tip-caption: :bulb:
18
18
  :warning-caption: :warning:
19
19
  endif::[]
20
+ // Variables:
21
+ :release-version: 1.5.6.1
20
22
  // URIs:
21
23
  :uri-org: https://github.com/asciidoctor
22
24
  :uri-repo: {uri-org}/asciidoctor
@@ -64,7 +66,8 @@ The gem is also included in several Linux distributions, including Fedora, Debia
64
66
  Asciidoctor is open source, {uri-repo}[hosted on GitHub] and released under {uri-license}[the MIT license].
65
67
 
66
68
  ifndef::env-site[]
67
- .Translations of this document are available in the following languages:
69
+ Translations of this document are available in the following languages:
70
+
68
71
  * {uri-rel-file-base}README-zh_CN.adoc[汉语]
69
72
  * {uri-rel-file-base}README-fr.adoc[Français]
70
73
  * {uri-rel-file-base}README-jp.adoc[日本語]
@@ -175,12 +178,12 @@ If that's the case, use the following gem command to remove the old versions:
175
178
  . Create a Gemfile in the root folder of your project (or the current directory)
176
179
  . Add the `asciidoctor` gem to your Gemfile as follows:
177
180
  +
178
- [source]
181
+ [source,subs=attributes+]
179
182
  ----
180
183
  source 'https://rubygems.org'
181
184
  gem 'asciidoctor'
182
185
  # or specify the version explicitly
183
- # gem 'asciidoctor', '1.5.6'
186
+ # gem 'asciidoctor', '{release-version}'
184
187
  ----
185
188
 
186
189
  . Save the Gemfile
@@ -263,10 +266,10 @@ To verify it's available, run the following in your terminal:
263
266
 
264
267
  You should see information about the Asciidoctor version and your Ruby environment printed in the terminal.
265
268
 
266
- [.output]
269
+ [.output,subs=attributes+]
267
270
  ....
268
- Asciidoctor 1.5.6 [http://asciidoctor.org]
269
- Runtime Environment (ruby 2.2.2p95 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
271
+ Asciidoctor {release-version} [http://asciidoctor.org]
272
+ Runtime Environment (ruby 2.4.1p111 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
270
273
  ....
271
274
 
272
275
  Asciidoctor also provides an API.
data/Rakefile CHANGED
@@ -137,23 +137,30 @@ desc 'Trigger builds for all dependent projects on Travis CI'
137
137
  require 'net/http'
138
138
  %w(
139
139
  asciidoctor/asciidoctor.js
140
+ asciidoctor/asciidoctorj
141
+ asciidoctor/asciidoctorj/asciidoctorj-1.6.0
142
+ asciidoctor/asciidoctor-diagram
140
143
  ).each do |project|
141
- org, name = project.split '/', 2
144
+ org, name, branch = project.split '/', 3
145
+ branch ||= 'master'
142
146
  header = {
143
147
  'Content-Type' => 'application/json',
144
148
  'Accept' => 'application/json',
145
149
  'Travis-API-Version' => '3',
146
150
  'Authorization' => %(token #{token})
147
151
  }
148
- payload = '{ "request": { "branch": "master" } }'
152
+ if (commit_hash = ENV['TRAVIS_COMMIT'])
153
+ commit_memo = %( (#{commit_hash.slice 0, 8})\\n\\nhttps://github.com/#{ENV['TRAVIS_REPO_SLUG'] || 'asciidoctor/asciidoctor'}/commit/#{commit_hash})
154
+ end
155
+ payload = %({ "request": { "branch": "#{branch}", "message": "Build triggered by Asciidoctor#{commit_memo}" } })
149
156
  (http = Net::HTTP.new 'api.travis-ci.org', 443).use_ssl = true
150
157
  request = Net::HTTP::Post.new %(/repo/#{org}%2F#{name}/requests), header
151
158
  request.body = payload
152
159
  response = http.request request
153
160
  if response.code == '202'
154
- puts %(Build successfuly triggered on #{project})
161
+ puts %(Successfully triggered build on #{project} repository)
155
162
  else
156
- warn %(Unable to build #{project}: #{response.code} - #{response.message})
163
+ warn %(Unable to trigger build on #{project} repository: #{response.code} - #{response.message})
157
164
  end
158
165
  end
159
166
  end
@@ -145,9 +145,8 @@ module Asciidoctor
145
145
  # Compliance value: false
146
146
  #define :congruent_block_delimiters, true
147
147
 
148
- # AsciiDoc supports both single-line and underlined
149
- # section titles.
150
- # This option disables the underlined variant.
148
+ # AsciiDoc supports both atx (single-line) and setext (underlined) section titles.
149
+ # This option can be used to disable the setext variant.
151
150
  # Compliance value: true
152
151
  define :underline_style_section_titles, true
153
152
 
@@ -278,9 +277,9 @@ module Asciidoctor
278
277
 
279
278
  ADMONITION_STYLES = ['NOTE', 'TIP', 'IMPORTANT', 'WARNING', 'CAUTION'].to_set
280
279
 
281
- ADMONITION_STYLE_LEADERS = ['N', 'T', 'I', 'W', 'C'].to_set
280
+ ADMONITION_STYLE_HEADS = ['N', 'T', 'I', 'W', 'C'].to_set
282
281
 
283
- CALLOUT_LIST_LEADERS = ['<', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'].to_set
282
+ CALLOUT_LIST_HEADS = ['<', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'].to_set
284
283
 
285
284
  PARAGRAPH_STYLES = ['comment', 'example', 'literal', 'listing', 'normal', 'pass', 'quote', 'sidebar', 'source', 'verse', 'abstract', 'partintro'].to_set
286
285
 
@@ -303,7 +302,7 @@ module Asciidoctor
303
302
  '```' => [:fenced_code, ::Set.new]
304
303
  }
305
304
 
306
- DELIMITED_BLOCK_LEADERS = DELIMITED_BLOCKS.keys.map {|key| key.slice 0, 2 }.to_set
305
+ DELIMITED_BLOCK_HEADS = DELIMITED_BLOCKS.keys.map {|key| key.slice 0, 2 }.to_set
307
306
 
308
307
  LAYOUT_BREAK_CHARS = {
309
308
  '\'' => :thematic_break,
@@ -335,6 +334,8 @@ module Asciidoctor
335
334
  'upperroman' => 'I'
336
335
  }
337
336
 
337
+ ATTR_REF_HEAD = '{'
338
+
338
339
  LIST_CONTINUATION = '+'
339
340
 
340
341
  # NOTE AsciiDoc Python allows + to be preceded by TAB; Asciidoctor does not
@@ -434,7 +435,7 @@ module Asciidoctor
434
435
  # v1.0, 2013-01-01: Ring in the new year release
435
436
  # 1.0, Jan 01, 2013
436
437
  #
437
- RevisionInfoLineRx = /^(?:\D*(.*?),)?(?: *(?!:)(.*?))(?: *(?!^): *(.*))?$/
438
+ RevisionInfoLineRx = /^(?:\D*(.*?),)? *(?!:)(.*?)(?: *(?!^),?: *(.*))?$/
438
439
 
439
440
  # Matches the title and volnum in the manpage doctype.
440
441
  #
@@ -609,35 +610,35 @@ module Asciidoctor
609
610
  # This is a block comment.
610
611
  # It can span one or more lines.
611
612
  # ////
612
- CommentBlockRx = %r(^/{4,}$)
613
+ #CommentBlockRx = %r(^/{4,}$)
613
614
 
614
615
  # Matches a comment line.
615
616
  #
616
617
  # Examples
617
618
  #
618
- # // an then whatever
619
+ # // note to author
619
620
  #
620
- CommentLineRx = %r(^//(?=[^/]|$))
621
+ #CommentLineRx = %r(^//(?=[^/]|$))
621
622
 
622
623
  ## Section titles
623
624
 
624
- # Matches a single-line (Atx-style) section title.
625
+ # Matches an Atx (single-line) section title.
625
626
  #
626
627
  # Examples
627
628
  #
628
629
  # == Foo
629
- # # ^ a level 1 (h2) section title
630
+ # // ^ a level 1 (h2) section title
630
631
  #
631
632
  # == Foo ==
632
- # # ^ also a level 1 (h2) section title
633
+ # // ^ also a level 1 (h2) section title
633
634
  #
634
- # match[1] is the delimiter, whose length determines the level
635
- # match[2] is the title itself
636
- # match[3] is an inline anchor, which becomes the section id
637
- AtxSectionRx = /^(=={0,5}|#\#{0,5})[ \t]+(.+?)(?:[ \t]+\1)?$/
635
+ AtxSectionTitleRx = /^(=={0,5})[ \t]+(.+?)(?:[ \t]+\1)?$/
636
+
637
+ # Matches an extended Atx section title that includes support for the Markdown variant.
638
+ ExtAtxSectionTitleRx = /^(=={0,5}|#\#{0,5})[ \t]+(.+?)(?:[ \t]+\1)?$/
638
639
 
639
- # Matches the restricted section name for a two-line (Setext-style) section title.
640
- # The name cannot begin with a dot and has at least one alphanumeric character.
640
+ # Matches the title only (first line) of an Setext (two-line) section title.
641
+ # The title cannot begin with a dot and must have at least one alphanumeric character.
641
642
  SetextSectionTitleRx = /^((?=.*#{CG_WORD}+.*)[^.].*?)$/
642
643
 
643
644
  # Matches an anchor (i.e., id + optional reference text) inside a section title.
@@ -654,14 +655,14 @@ module Asciidoctor
654
655
  # NOTE uppercase chars are not included since the expression is used on a lowercased string
655
656
  InvalidSectionIdCharsRx = /&(?:[a-z][a-z]+\d{0,2}|#\d\d\d{0,4}|#x[\da-f][\da-f][\da-f]{0,3});|[^#{CC_WORD}]+?/
656
657
 
657
- # Matches the block style used to designate a section title as a floating title.
658
+ # Matches the block style used to designate a discrete (aka free-floating) heading.
658
659
  #
659
660
  # Examples
660
661
  #
661
- # [float]
662
- # = Floating Title
662
+ # [discrete]
663
+ # = Discrete Heading
663
664
  #
664
- FloatingTitleStyleRx = /^(?:float|discrete)\b/
665
+ DiscreteHeadingStyleRx = /^(?:discrete|float)\b/
665
666
 
666
667
  ## Lists
667
668
 
@@ -1030,7 +1031,7 @@ module Asciidoctor
1030
1031
  # *** or * * * (horizontal rule, Markdown)
1031
1032
  # ___ or _ _ _ (horizontal rule, Markdown)
1032
1033
  #
1033
- HybridLayoutBreakRx = /^(?:'{3,}|<{3,}|([-*_])( *)\1\2\1)$/
1034
+ ExtLayoutBreakRx = /^(?:'{3,}|<{3,}|([-*_])( *)\1\2\1)$/
1034
1035
 
1035
1036
  ## General
1036
1037
 
@@ -1536,9 +1537,11 @@ module Asciidoctor
1536
1537
  # NOTE in this case, copycss is a source location (but cannot be a URI)
1537
1538
  stylesheet_src = doc.normalize_system_path stylesheet_src
1538
1539
  end
1539
- stylesheet_dst = doc.normalize_system_path stylesheet, stylesoutdir, (doc.safe >= SafeMode::SAFE ? outdir : nil)
1540
- if stylesheet_src != stylesheet_dst && (stylesheet_content = doc.read_asset stylesheet_src, :warn_on_failure => true, :label => 'stylesheet')
1541
- ::IO.write stylesheet_dst, stylesheet_content
1540
+ stylesheet_dest = doc.normalize_system_path stylesheet, stylesoutdir, (doc.safe >= SafeMode::SAFE ? outdir : nil)
1541
+ # NOTE don't warn if src can't be read and dest already exists (see #2323)
1542
+ if stylesheet_src != stylesheet_dest && (stylesheet_data = doc.read_asset stylesheet_src,
1543
+ :warn_on_failure => !(::File.file? stylesheet_dest), :label => 'stylesheet')
1544
+ ::IO.write stylesheet_dest, stylesheet_data
1542
1545
  end
1543
1546
  end
1544
1547