[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _protect_
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _protect_space): rename nolinebreak class as w-nolinebreak-text. Call html_attribute_class() only if the element will be substituted in the protected text. |
|
Date: |
Mon, 10 Jan 2022 19:36:02 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 5ad775530b * tp/Texinfo/Convert/HTML.pm (%css_map, _protect_space):
rename nolinebreak class as w-nolinebreak-text. Call html_attribute_class()
only if the element will be substituted in the protected text.
5ad775530b is described below
commit 5ad775530bc9ff9b6a0752aff5b0a8b836ffb6ed
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 11 01:35:47 2022 +0100
* tp/Texinfo/Convert/HTML.pm (%css_map, _protect_space):
rename nolinebreak class as w-nolinebreak-text. Call
html_attribute_class() only if the element will be substituted
in the protected text.
---
ChangeLog | 7 +++++++
tp/Texinfo/Convert/HTML.pm | 18 ++++++++++--------
tp/t/results/formats_encodings/at_commands_in_refs.pl | 1 -
.../res_html/-_0040-_007b_007d-_002e-.html | 1 -
.../res_html/8_002e27in.html | 1 -
.../cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html | 1 -
.../env-code-option-samp-command-file-C_002dx-ESC.html | 1 -
.../at_commands_in_refs_latin1/res_html/gH-3rd.html | 1 -
...here_005faaa-url-_002fman_002ecgi_002f1_002fls.html | 1 -
.../at_commands_in_refs_latin1/res_html/index.html | 1 -
.../res_html/indicateurl.html | 1 -
.../res_html/sansserif-slanted.html | 1 -
.../res_html/-_0040-_007b_007d-_002e-.html | 1 -
.../at_commands_in_refs_utf8/res_html/8_002e27in.html | 1 -
.../cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html | 1 -
.../env-code-option-samp-command-file-C_002dx-ESC.html | 1 -
.../at_commands_in_refs_utf8/res_html/gH-3rd.html | 1 -
...here_005faaa-url-_002fman_002ecgi_002f1_002fls.html | 1 -
.../at_commands_in_refs_utf8/res_html/index.html | 1 -
.../at_commands_in_refs_utf8/res_html/indicateurl.html | 1 -
.../res_html/sansserif-slanted.html | 1 -
tp/t/results/indices/w_lines_count.pl | 2 +-
tp/t/results/misc_commands/test_allowcodebreaks.pl | 2 +-
tp/tests/layout/res_parser/formatting/formatting.html | 1 -
tp/tests/layout/res_parser/formatting_chm/chapter.html | 1 -
.../layout/res_parser/formatting_chm/formatting.html | 1 -
.../formatting_enable_encoding/formatting.html | 1 -
.../EPUB/xhtml/formatting.xhtml | 1 -
.../formatting_epub_package/EPUB/xhtml/chapter.xhtml | 1 -
.../EPUB/xhtml/formatting.xhtml | 1 -
.../layout/res_parser/formatting_exotic/chapter.html | 1 -
.../res_parser/formatting_fr_icons/formatting.html | 1 -
.../layout/res_parser/formatting_html/formatting.html | 1 -
.../formatting_html_no_texi2html/formatting.html | 1 -
.../res_parser/formatting_html_nodes/chapter.html | 1 -
.../layout/res_parser/formatting_html_nodes/index.html | 1 -
.../res_parser/formatting_mathjax/formatting.html | 1 -
.../layout/res_parser/formatting_nodes/chapter.html | 1 -
tp/tests/layout/res_parser/formatting_nodes/index.html | 1 -
.../formatting_numerical_entities/formatting.html | 1 -
.../formatting_regions/formatting_regions.html | 1 -
.../res_parser/formatting_weird_quotes/formatting.html | 1 -
.../layout/res_parser/formatting_xhtml/formatting.html | 1 -
.../res_parser/formatting_singular/chapter.html | 1 -
44 files changed, 19 insertions(+), 50 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 21907dd64c..0a61d63e1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-01-10 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (%css_map, _protect_space):
+ rename nolinebreak class as w-nolinebreak-text. Call
+ html_attribute_class() only if the element will be substituted
+ in the protected text.
+
2022-01-10 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (%css_map, %pre_class_commands)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d21989fd22..ad54834341 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1743,7 +1743,7 @@ my %css_map = (
'span.program-in-footer' => 'font-size: smaller', # used with
PROGRAM_NAME_IN_FOOTER
'span.sansserif' => 'font-family: sans-serif; font-weight: normal',
'span.r' => 'font-family: initial; font-weight: normal',
- 'span.nolinebreak' => 'white-space: nowrap',
+ 'span.w-nolinebreak-text' => 'white-space: nowrap',
'kbd.key' => 'font-style: normal',
'kbd.kbd' => 'font-style: oblique',
'p.flushleft-paragraph' => 'text-align:left',
@@ -9035,13 +9035,15 @@ sub _protect_space($$)
return $text if ($self->in_preformatted());
if ($self->in_space_protected()) {
- my $open = $self->html_attribute_class('span', 'nolinebreak');
- if ($open ne '') {
- $open .= '>';
- # Protect spaces in the html leading attribute in case we are in 'w'
- $open =~ s/ /\x{1F}/g;
- # Special span to avoid breaking at _-
- $text =~ s/(\S*[_-]\S*)/${open}$1<\/span>/g;
+ if ($text =~ /(\S*[_-]\S*)/) {
+ my $open = $self->html_attribute_class('span', 'w-nolinebreak-text');
+ if ($open ne '') {
+ $open .= '>';
+ # Protect spaces in the html leading attribute in case we are in 'w'
+ $open =~ s/ /\x{1F}/g;
+ # Special span to avoid breaking at _-
+ $text =~ s/(\S*[_-]\S*)/${open}$1<\/span>/g;
+ }
}
$text .= $self->html_non_breaking_space() if (chomp($text));
# Protect spaces within text
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index b562c1496c..f23ba42382 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -22875,7 +22875,6 @@ $result_converted{'html'}->{'at_commands_in_refs'} =
'<!DOCTYPE html>
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
index f79a0e661c..3d93abe5e1 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
@@ -17,7 +17,6 @@
<link href="f_002d_002dile1-f_002d_002dile.html" rel="prev" title="f--ile1
f--ile">
<style type="text/css">
<!--
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
-->
</style>
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/8_002e27in.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/8_002e27in.html
index ecb01c20f9..51e14444ca 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/8_002e27in.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/8_002e27in.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index 9e1dbadf28..433fee7ed3 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
-->
</style>
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
index 3b5ca0e49a..6e4757a18b 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
-->
</style>
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/gH-3rd.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/gH-3rd.html
index da4c95f715..e4d5cb9c6c 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/gH-3rd.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/gH-3rd.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 150f1f6dac..5132147a7f 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -18,7 +18,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
index 06ef246c79..95a97046bf 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
@@ -17,7 +17,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/indicateurl.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/indicateurl.html
index efb292ec00..f7ce97d044 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/indicateurl.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/indicateurl.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
index 3d1387a338..8f0b1d724e 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
index dec0883ecd..32ee193f62 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
@@ -17,7 +17,6 @@
<link href="f_002d_002dile1-f_002d_002dile.html" rel="prev" title="f--ile1
f--ile">
<style type="text/css">
<!--
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
-->
</style>
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/8_002e27in.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/8_002e27in.html
index 56f7c41ee0..b5a86b0d53 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/8_002e27in.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/8_002e27in.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index 8aac84d228..59aad0126b 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
-->
</style>
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
index 9a7f7acf96..07f3726cd2 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
-->
</style>
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/gH-3rd.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/gH-3rd.html
index e242ce9811..ff23336876 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/gH-3rd.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/gH-3rd.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 4efa818b29..da2b726e6c 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -18,7 +18,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
index 7d0625a704..78e6efcab4 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
@@ -17,7 +17,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/indicateurl.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/indicateurl.html
index f5a09c8d02..b16b469e87 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/indicateurl.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/indicateurl.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
index 3f7bac5bcb..4ff137d999 100644
---
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
+++
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
@@ -19,7 +19,6 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
diff --git a/tp/t/results/indices/w_lines_count.pl
b/tp/t/results/indices/w_lines_count.pl
index 8ca0988aa1..d828f0e69f 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -456,7 +456,7 @@ $result_converted{'plaintext'}->{'w_lines_count'} =
'xzcompilationxdmbufferxmsub
$result_converted{'html_text'}->{'w_lines_count'} = '<div class="top" id="Top">
<a class="top-anchor" id="SEC_Top"></a>
<p>xzcompilationxdmbufferxmsubsequentmxCtxaxxmcommandsmadvancemfrommthere.
-<code class="code"><span class="nolinebreak">C-u</span></code><!-- /@w -->
starts again from the beginning
+<code class="code"><span class="w-nolinebreak-text">C-u</span></code><!-- /@w
--> starts again from the beginning
</p>
<a class="index-entry-anchor" id="index-compilation_002dnext_002derror"></a>
<p>Compilation mode also defines the keys <kbd class="key">SPC</kbd> and <kbd
class="key">DEL</kbd> to
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 90bf170b54..54cfb95e85 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2769,7 +2769,7 @@ anc-hor<a class="anchor" id="A-node1"></a></samp>’
</pre></div>
<p>In w:
-Out of code — <span
class="nolinebreak">out-of-code.</span> <code
class="code">1aaa</code> <code class="code"><span
class="nolinebreak">2aaa-</span></code> <code class="code"><span
class="nolinebreak">-3bbb</span></code> <code class="code"><span
class="nolinebreak">4aaa-bbb</span></code> <code
class="code"> <span class="nolinebreak">5aaa-bb</span></code> <code
class="code"><span class="nolinebreak">6aaa-bb</span> </c [...]
+Out of code — <span
class="w-nolinebreak-text">out-of-code.</span> <code
class="code">1aaa</code> <code class="code"><span
class="w-nolinebreak-text">2aaa-</span></code> <code class="code"><span
class="w-nolinebreak-text">-3bbb</span></code> <code class="code"><span
class="w-nolinebreak-text">4aaa-bbb</span></code> <code
class="code"> <span
class="w-nolinebreak-text">5aaa-bb</span></code> <code class="code"><span
class="w [...]
</p>
<div class="example">
<pre class="example-preformatted"><code class="code">in-example</code><!-- /@w
-->
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index e2af7a1ca3..c2f2f3d141 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 3a0d1b9c76..3220e28eff 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -812,7 +812,6 @@ p.flushleft-paragraph {text-align:left}
p.flushright-paragraph {text-align:right}
pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-anchor {visibility: visible}
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 57f8bcce44..3805ba90a9 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -812,7 +812,6 @@ p.flushleft-paragraph {text-align:left}
p.flushright-paragraph {text-align:right}
pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-anchor {visibility: visible}
diff --git
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index 2d43510952..7b2e358c73 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 6128ba0749..11c7f51efc 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 1ff82ad960..de40c5548a 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -814,7 +814,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 1307dd2c01..30bc30021f 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -813,7 +813,6 @@ p.flushright-paragraph {text-align:right}
pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 3f9f74a8b6..ab59a8f215 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -812,7 +812,6 @@ p.flushleft-paragraph {text-align:left}
p.flushright-paragraph {text-align:right}
pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index af85ea262d..c3721e5ce4 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index e2af7a1ca3..c2f2f3d141 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index de666429dd..1024fc0c58 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -817,7 +817,6 @@ p.flushleft-paragraph {text-align:left}
p.flushright-paragraph {text-align:right}
pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-anchor {visibility: visible}
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index fa88ca78b7..dc0509575d 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -814,7 +814,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index a276c1816e..40dd1595b4 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -813,7 +813,6 @@ p.flushright-paragraph {text-align:right}
pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 55b665b8f4..6b4436d94c 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index fa88ca78b7..dc0509575d 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -814,7 +814,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index a276c1816e..40dd1595b4 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -813,7 +813,6 @@ p.flushright-paragraph {text-align:right}
pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index d58476fc25..72fdac69c2 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index 10eff4bbcf..09dfe89626 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -815,7 +815,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index ae190d5b8d..414ec42e1f 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 04bd34ff0d..40baac6215 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -816,7 +816,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.program-in-footer {font-size: smaller}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index ad2839a4bb..919dc67c5e 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -815,7 +815,6 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
span.r {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-anchor {visibility: visible}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _protect_space): rename nolinebreak class as w-nolinebreak-text. Call html_attribute_class() only if the element will be substituted in the protected text.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, %pre_class_commands) (_preformatted_class): only use command and type names in 'preformatted_classes', and prepend -preformatted systematically for the corresponding pre class name.
- Next by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use command as class for anchors, as if it is a @node the heading has another class name, and for an empty @top, there are two classes as for sectioning commands. Move code around, change variable names, add comments for clarity and add FIXMEs.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, %pre_class_commands) (_preformatted_class): only use command and type names in 'preformatted_classes', and prepend -preformatted systematically for the corresponding pre class name.
- Next by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use command as class for anchors, as if it is a @node the heading has another class name, and for an empty @top, there are two classes as for sectioning commands. Move code around, change variable names, add comments for clarity and add FIXMEs.
- Index(es):