diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2020-05-10 12:52:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 04:52:43 -0600 |
| commit | 54bebf91020a6b4e7fb9aeeb061f753b976246c3 (patch) | |
| tree | 8d5202cc30f15e8efc806b6f0989f9e3982547a0 | |
| parent | 11aaeabed5935cdb7e65b65eb44b44210f039b87 (diff) | |
resolves #3645 fix escaping ellipsis at start of line (PR #3644)
| -rw-r--r-- | CHANGELOG.adoc | 1 | ||||
| -rw-r--r-- | lib/asciidoctor/converter/manpage.rb | 2 | ||||
| -rw-r--r-- | test/manpage_test.rb | 28 |
3 files changed, 30 insertions, 1 deletions
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 355124f8..1094650d 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -34,6 +34,7 @@ Bug Fixes:: * Removing leading and trailing blank lines in AsciiDoc include file to match assumption of parser (#3470) * Activate extensions when :extensions option is set even if Extensions API is not yet loaded (#3570) * Don't activate global extensions if :extensions option is false (#3570) + * In manpages backend, escape ellipsis at start of line Compliance:: diff --git a/lib/asciidoctor/converter/manpage.rb b/lib/asciidoctor/converter/manpage.rb index 0ad2e7b3..2beee41a 100644 --- a/lib/asciidoctor/converter/manpage.rb +++ b/lib/asciidoctor/converter/manpage.rb @@ -704,6 +704,7 @@ allbox tab(:);' end str = str. gsub(LiteralBackslashRx) { %[#{$1}#{'\\(rs' * $2.length}] }. # literal backslash (not a troff escape sequence) + gsub(EllipsisCharRefRx, '...'). # horizontal ellipsis gsub(LeadingPeriodRx, '\\\&.'). # leading . is used in troff for macro call or other formatting; replace with \&. # drop orphaned \c escape lines, unescape troff macro, quote adjacent character, isolate macro line gsub(EscapedMacroRx) { (rest = $3.lstrip).empty? ? %(.#$1"#$2") : %(.#$1"#$2"#{LF}#{rest}) }. @@ -721,7 +722,6 @@ allbox tab(:);' gsub('’', '\(cq'). # right single quotation mark gsub('“', '\(lq'). # left double quotation mark gsub('”', '\(rq'). # right double quotation mark - gsub(EllipsisCharRefRx, '...'). # horizontal ellipsis gsub('←', '\(<-'). # leftwards arrow gsub('→', '\(->'). # rightwards arrow gsub('⇐', '\(lA'). # leftwards double arrow diff --git a/test/manpage_test.rb b/test/manpage_test.rb index 60e4ea29..fd0923a7 100644 --- a/test/manpage_test.rb +++ b/test/manpage_test.rb @@ -216,6 +216,34 @@ context 'Manpage' do assert_equal '\&.if 1 .nx', output.lines[-2].chomp end + test 'should escape ellipsis at start of line' do + input = <<~EOS.chop + #{SAMPLE_MANPAGE_HEADER} + + -x:: + Ao gravar o commit, acrescente uma linha que diz "(cherry picked from commit + ...)" à mensagem de commit original para indicar qual commit esta mudança + foi escolhida. Isso é feito apenas para picaretas de cereja sem conflitos. + EOS + output = Asciidoctor.convert input, backend: :manpage + assert_equal '\&...', output.lines[-3][0..4].chomp + end + + test 'should not escape ellipsis in the middle of a line' do + input = <<~EOS.chop + #{SAMPLE_MANPAGE_HEADER} + + -x:: + Ao gravar o commit, acrescente uma linha que diz + "(cherry picked from commit...)" à mensagem de commit + original para indicar qual commit esta mudança + foi escolhida. Isso é feito apenas para picaretas + de cereja sem conflitos. + EOS + output = Asciidoctor.convert input, backend: :manpage + assert(output.lines[-5].include? 'commit...') + end + test 'should normalize whitespace in a paragraph' do input = <<~EOS.chop #{SAMPLE_MANPAGE_HEADER} |