From b5f472c7b8c1eb62baa22a3a017b81cbd1dff034 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Tue, 20 Feb 2024 14:05:03 -0700 Subject: change title to doctitle in warning message about use of abstract to make subject more clear --- CHANGELOG.adoc | 1 + lib/asciidoctor/converter/docbook5.rb | 2 +- lib/asciidoctor/converter/html5.rb | 2 +- test/blocks_test.rb | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 87a77e02..6ea8da53 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -68,6 +68,7 @@ Improvements:: * Use safe navigation to avoid crashing when querying for extensions * Remove empty line at top of table cells in manpage output (#4482) (*@strager*) * Return `nil` if name passed to `Asciidoctor::SafeMode.value_for_name` is not recognized (#3526) + * Change title to doctitle in warning message about use of abstract to make subject more clear * Modify default stylesheet to honor text-* roles on quote blocks * Modify default stylesheet to add text decoration to active footnote number link in footnotes list (#4530) (@Larhzu) diff --git a/lib/asciidoctor/converter/docbook5.rb b/lib/asciidoctor/converter/docbook5.rb index da3a0bd4..8093896d 100644 --- a/lib/asciidoctor/converter/docbook5.rb +++ b/lib/asciidoctor/converter/docbook5.rb @@ -306,7 +306,7 @@ class Converter::DocBook5Converter < Converter::Base case node.style when 'abstract' if (parent = node.parent) == node.document && node.document.doctype == 'book' - logger.warn 'abstract block cannot be used in a document without a title when doctype is book. Excluding block content.' + logger.warn 'abstract block cannot be used in a document without a doctitle when doctype is book. Excluding block content.' '' else result = %( diff --git a/lib/asciidoctor/converter/html5.rb b/lib/asciidoctor/converter/html5.rb index 9b9febe4..09d395bc 100644 --- a/lib/asciidoctor/converter/html5.rb +++ b/lib/asciidoctor/converter/html5.rb @@ -751,7 +751,7 @@ Your browser does not support the audio tag. def convert_open node if (style = node.style) == 'abstract' if node.parent == node.document && node.document.doctype == 'book' - logger.warn 'abstract block cannot be used in a document without a title when doctype is book. Excluding block content.' + logger.warn 'abstract block cannot be used in a document without a doctitle when doctype is book. Excluding block content.' '' else id_attr = node.id ? %( id="#{node.id}") : '' diff --git a/test/blocks_test.rb b/test/blocks_test.rb index c5c15002..d1b1af56 100644 --- a/test/blocks_test.rb +++ b/test/blocks_test.rb @@ -3685,7 +3685,7 @@ context 'Blocks' do output = convert_string input assert_css '.abstract', output, 0 - assert_message @logger, :WARN, 'abstract block cannot be used in a document without a title when doctype is book. Excluding block content.' + assert_message @logger, :WARN, 'abstract block cannot be used in a document without a doctitle when doctype is book. Excluding block content.' end test 'should make abstract on open block without title converted to DocBook' do @@ -3746,7 +3746,7 @@ context 'Blocks' do output = convert_string input, backend: 'docbook' assert_css 'abstract', output, 0 - assert_message @logger, :WARN, 'abstract block cannot be used in a document without a title when doctype is book. Excluding block content.' + assert_message @logger, :WARN, 'abstract block cannot be used in a document without a doctitle when doctype is book. Excluding block content.' end # TODO partintro shouldn't be recognized if doctype is not book, should be in proper place -- cgit v1.2.3