[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Have @r isolate formatting from surrounding text
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Have @r isolate formatting from surrounding text for fonts |
|
Date: |
Thu, 28 Jul 2022 09:33:45 -0400 |
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 a2c7438f7c Have @r isolate formatting from surrounding text for fonts
a2c7438f7c is described below
commit a2c7438f7ca4d576d102165fa11e9f98441c0c7e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jul 28 15:33:33 2022 +0200
Have @r isolate formatting from surrounding text for fonts
* tp/Texinfo/Convert/LaTeX.pm (%LaTeX_style_brace_commands),
tp/Texinfo/Convert/HTML.pm (%css_element_class_styles):
use \textnormal for @r in LaTeX, and add font-style: normal
to @r CSS style in HTML. This allows isolating @r argument
formatting frm surrounding text formatting.
---
ChangeLog | 10 ++++++++++
tp/Texinfo/Convert/HTML.pm | 2 +-
tp/Texinfo/Convert/LaTeX.pm | 2 +-
.../definition_commands/res_html/chapter.html | 2 +-
.../res_latex/definition_commands.tex | 6 +++---
.../results/formats_encodings/at_commands_in_refs.pl | 2 +-
.../res_html/-_0040-_007b_007d-_002e-.html | 2 +-
.../res_html/8_002e27in.html | 2 +-
...ite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html | 2 +-
...nv-code-option-samp-command-file-C_002dx-ESC.html | 2 +-
.../at_commands_in_refs_latin1/res_html/gH-3rd.html | 2 +-
...re_005faaa-url-_002fman_002ecgi_002f1_002fls.html | 2 +-
.../at_commands_in_refs_latin1/res_html/index.html | 2 +-
.../res_html/indicateurl.html | 2 +-
.../res_html/sansserif-slanted.html | 2 +-
.../res_html/-_0040-_007b_007d-_002e-.html | 2 +-
.../res_html/8_002e27in.html | 2 +-
...ite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html | 2 +-
...nv-code-option-samp-command-file-C_002dx-ESC.html | 2 +-
.../at_commands_in_refs_utf8/res_html/gH-3rd.html | 2 +-
...re_005faaa-url-_002fman_002ecgi_002f1_002fls.html | 2 +-
.../at_commands_in_refs_utf8/res_html/index.html | 2 +-
.../res_html/indicateurl.html | 2 +-
.../res_html/sansserif-slanted.html | 2 +-
tp/t/results/latex_tests/indices.pl | 2 +-
.../latex_tests/indices/res_latex/indices.tex | 2 +-
.../layout/res_parser/formatting/formatting.html | 2 +-
.../layout/res_parser/formatting_chm/chapter.html | 2 +-
.../layout/res_parser/formatting_chm/formatting.html | 2 +-
.../formatting_enable_encoding/formatting.html | 2 +-
.../EPUB/xhtml/formatting.xhtml | 2 +-
.../formatting_epub_package/EPUB/xhtml/chapter.xhtml | 2 +-
.../EPUB/xhtml/formatting.xhtml | 2 +-
.../layout/res_parser/formatting_exotic/chapter.html | 2 +-
.../res_parser/formatting_fr_icons/formatting.html | 2 +-
.../res_parser/formatting_html/formatting.html | 2 +-
.../formatting_html_no_texi2html/formatting.html | 2 +-
.../res_parser/formatting_html_nodes/chapter.html | 2 +-
.../res_parser/formatting_html_nodes/index.html | 2 +-
.../res_parser/formatting_inline_css/formatting.html | 20 ++++++++++----------
.../res_parser/formatting_latex/formatting.tex | 10 +++++-----
.../res_parser/formatting_mathjax/formatting.html | 2 +-
.../layout/res_parser/formatting_nodes/chapter.html | 2 +-
.../layout/res_parser/formatting_nodes/index.html | 2 +-
.../formatting_numerical_entities/formatting.html | 2 +-
.../formatting_regions/formatting_regions.html | 2 +-
.../formatting_weird_quotes/formatting.html | 2 +-
.../res_parser/formatting_xhtml/formatting.html | 2 +-
.../res_parser/formatting_singular/chapter.html | 2 +-
49 files changed, 73 insertions(+), 63 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b635ac61cb..3c6bf3c580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-07-28 Patrice Dumas <pertusus@free.fr>
+
+ Have @r isolate formatting from surrounding text for fonts
+
+ * tp/Texinfo/Convert/LaTeX.pm (%LaTeX_style_brace_commands),
+ tp/Texinfo/Convert/HTML.pm (%css_element_class_styles):
+ use \textnormal for @r in LaTeX, and add font-style: normal
+ to @r CSS style in HTML. This allows isolating @r argument
+ formatting frm surrounding text formatting.
+
2022-07-27 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/LaTeX.pm (_latex_header, _convert): protect
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 47408c480b..def080f1a3 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2065,7 +2065,7 @@ my %css_element_class_styles = (
'pre.display-preformatted' => 'font-family: inherit',
'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.r' => 'font-family: initial; font-weight: normal;
font-style: normal',
'span.w-nolinebreak-text' => 'white-space: nowrap',
'kbd.key' => 'font-style: normal',
'kbd.kbd' => 'font-style: oblique',
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index b099ff5a96..5667d96f24 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -612,7 +612,7 @@ my %LaTeX_style_brace_commands = (
'w' => '\\hbox',
'sub' => '\\textsubscript',
'sup' => '\\textsuperscript',
- 'r' => '\\textrm',
+ 'r' => '\\textnormal',
'sc' => '\\textsc',
'sansserif' => '\\textsf',
# slanted in texinfo.tex
diff --git
a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
index f8978665ee..bc170a5779 100644
--- a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
+++ b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
@@ -17,7 +17,7 @@
<style type="text/css">
<!--
a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span:hover a.copiable-link {visibility: visible}
-->
</style>
diff --git
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
index 1ea6329529..a782eb11f8 100644
---
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
+++
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
@@ -79,7 +79,7 @@ deffn no var for \textsl{a---rg1} and \textsl{a--rg2}
\index[fn]{fname@\texttt{fname}}%
deffn explict var for \textsl{a---rg1} and \textsl{a--rg2}
-\noindent\texttt{fname \bgroup{}\normalfont{}\textsl{\textrm{\textsl{a---rg1}}
\textrm{\textsl{a--rg2}}}\egroup{}}\hfill[Func]
+\noindent\texttt{fname
\bgroup{}\normalfont{}\textsl{\textnormal{\textsl{a---rg1}}
\textnormal{\textsl{a--rg2}}}\egroup{}}\hfill[Func]
@@ -99,7 +99,7 @@ deffn r slanted for \textsl{a---rg1} and \textsl{a--rg2}
\index[fn]{foobar@\texttt{foobar}}%
\dots{}\@ with var for \textsl{f---oo} and \textsl{b--ar}
-\noindent\texttt{int foobar \bgroup{}\normalfont{}\textsl{(int
\textrm{\textsl{f---oo}}, float
\textrm{\textsl{b--ar}})}\egroup{}}\hfill[Library Function]
+\noindent\texttt{int foobar \bgroup{}\normalfont{}\textsl{(int
\textnormal{\textsl{f---oo}}, float
\textnormal{\textsl{b--ar}})}\egroup{}}\hfill[Library Function]
@@ -137,7 +137,7 @@ deffn r slanted for \textsl{a---rg1} and \textsl{a--rg2}
\index[fn]{apply@\texttt{apply}}%
\texttt{apply} calls no var \textsl{function} with \textsl{arguments}
-\noindent\texttt{apply \bgroup{}\normalfont{}\textsl{function
\textrm{\textbf{\&rest}} argument}\egroup{}}\hfill[Function]
+\noindent\texttt{apply \bgroup{}\normalfont{}\textsl{function
\textnormal{\textbf{\&rest}} argument}\egroup{}}\hfill[Function]
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 e8ec6862b2..437ac0585a 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -22833,7 +22833,7 @@ $result_converted{'html'}->{'at_commands_in_refs'} =
'<!DOCTYPE html>
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 f7f8bfc17a..a0a7c8ab3b 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,7 @@
<link href="f_002d_002dile1-f_002d_002dile.html" rel="prev" title="f--ile1
f--ile">
<style type="text/css">
<!--
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: 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 f5b79d7f9a..7e06b48678 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 8b4f1e365e..9921b0981d 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: 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 def846508c..e012eb9691 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: 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 79c1ed1987..820ec0ef99 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 3337db77b6..5567c93125 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 8ab1e7afdd..ac78ddba36 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 aca280cad0..67df233b8d 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 662e0aa336..66883be162 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 2698b81f85..df58232970 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,7 @@
<link href="f_002d_002dile1-f_002d_002dile.html" rel="prev" title="f--ile1
f--ile">
<style type="text/css">
<!--
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: 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 9597f556f0..13f65b8fba 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 93260fb410..969008c13e 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: 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 54aaa74cfe..ddd9c17b42 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: 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 317c78e30d..e1dd786c59 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 aab879b6d5..7e0ea044ba 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 4a4bd1c7ca..334caeb52a 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 de9122761c..1e60527b10 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
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 bcd6a308f4..fd6845ac62 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,7 @@
<!--
kbd.kbd {font-style: oblique}
kbd.key {font-style: normal}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
-->
</style>
diff --git a/tp/t/results/latex_tests/indices.pl
b/tp/t/results/latex_tests/indices.pl
index 64668f76d0..13c46d0640 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -1371,7 +1371,7 @@ $result_converted{'latex'}->{'indices'} = '
\\index[cp]{\\textbackslash{}some\\textbackslash{}command for \\texttt{file}}%
-\\index[fn]{the person index aa@\\texttt{the \\textrm{person} index
\\texttt{aa}}}%
+\\index[fn]{the person index aa@\\texttt{the \\textnormal{person} index
\\texttt{aa}}}%
\\printindex[cp]
diff --git a/tp/t/results/latex_tests/indices/res_latex/indices.tex
b/tp/t/results/latex_tests/indices/res_latex/indices.tex
index 1d8c75c086..cef175270f 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++ b/tp/t/results/latex_tests/indices/res_latex/indices.tex
@@ -73,7 +73,7 @@
\index[cp]{\textbackslash{}some\textbackslash{}command for \texttt{file}}%
-\index[fn]{the person index aa@\texttt{the \textrm{person} index \texttt{aa}}}%
+\index[fn]{the person index aa@\texttt{the \textnormal{person} index
\texttt{aa}}}%
\printindex[cp]
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index dcd795b9d0..f875e6096f 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index ecf4b5f2fd..e5c75db291 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -857,7 +857,7 @@ 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.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 45ab65ad98..dafe6dbee7 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -857,7 +857,7 @@ 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.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 cf73c22b98..d1058d058f 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 3a38d6804a..8148f4d081 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
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
ul.mark-bullet {list-style-type: disc}
ul.mark-minus {list-style-type: "\2212"}
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 f14e902735..0208c39dc9 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
@@ -861,7 +861,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
ul.mark-bullet {list-style-type: disc}
ul.mark-minus {list-style-type: "\2212"}
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 1535a67a50..20b7ae4153 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
@@ -859,7 +859,7 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
ul.mark-bullet {list-style-type: disc}
ul.mark-minus {list-style-type: "\2212"}
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 9008a40d92..10e9edefe0 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -858,7 +858,7 @@ p.flushright-paragraph {text-align:right}
pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 af1f6e18c2..e3c971194d 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index dcd795b9d0..f875e6096f 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 b1f1fef991..80aa736345 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
@@ -862,7 +862,7 @@ 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.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 5f042683c8..1ce15efd57 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -861,7 +861,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 fbd60c8da9..9cae88d386 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -859,7 +859,7 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index 008a220b6f..f1a1244dfa 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -998,7 +998,7 @@ but , ,
<code class="code">@key{--a}</code> <kbd class="key" style="font-style:
normal">--a</kbd>
<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em
class="math">--a {\frac{1}{2}} -</em>
<code class="code">@option{--a}</code> <samp class="option">--a</samp>
-<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal">–a</span>
+<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal; font-style: normal">–a</span>
<code class="code">@samp{--a}</code> ‘<samp
class="samp">--a</samp>’
<code class="code">@sc{--a}</code> <small class="sc">–A</small>
<code class="code">@strong{--a}</code> <strong class="strong">–a</strong>
@@ -1084,7 +1084,7 @@ error→ → - -| ⇒
» « » ‹
› € → ≤ ≥
</em></div>
-<div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal">r</span> <small
class="sc">SC</small> <span class="sansserif" style="font-family: sans-serif;
font-weight: normal">sansserif</span> <i class="slanted">slanted</i>
+<div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal; font-style:
normal">r</span> <small class="sc">SC</small> <span class="sansserif"
style="font-family: sans-serif; font-weight: normal">sansserif</span> <i
class="slanted">slanted</i>
</em></div>
<p><kbd class="kbd" style="font-style: oblique">default kbdinputstyle</kbd>
</p><dl class="vtable">
@@ -2076,7 +2076,7 @@ but , ,
<code class="code">@key{--a}</code> <kbd class="key" style="font-style:
normal">--a</kbd>
<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em
class="math">--a {\frac{1}{2}} -</em>
<code class="code">@option{--a}</code> <samp class="option">--a</samp>
-<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal">–a</span>
+<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal; font-style: normal">–a</span>
<code class="code">@samp{--a}</code> ‘<samp
class="samp">--a</samp>’
<code class="code">@sc{--a}</code> <small class="sc">–A</small>
<code class="code">@strong{--a}</code> <strong class="strong">–a</strong>
@@ -2162,7 +2162,7 @@ error→ → - -| ⇒
» « » ‹
› € → ≤ ≥
</em></div>
-<div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal">r</span> <small
class="sc">SC</small> <span class="sansserif" style="font-family: sans-serif;
font-weight: normal">sansserif</span> <i class="slanted">slanted</i>
+<div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal; font-style:
normal">r</span> <small class="sc">SC</small> <span class="sansserif"
style="font-family: sans-serif; font-weight: normal">sansserif</span> <i
class="slanted">slanted</i>
</em></div>
<p><kbd class="kbd" style="font-style: oblique">default kbdinputstyle</kbd>
</p><dl class="vtable">
@@ -3210,7 +3210,7 @@ but , ,
<code class="code">@key{--a}</code> <kbd class="key" style="font-style:
normal">--a</kbd>
<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em
class="math">--a {\frac{1}{2}} -</em>
<code class="code">@option{--a}</code> <samp class="option">--a</samp>
-<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal">–a</span>
+<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal; font-style: normal">–a</span>
<code class="code">@samp{--a}</code> ‘<samp
class="samp">--a</samp>’
<code class="code">@sc{--a}</code> <small class="sc">–A</small>
<code class="code">@strong{--a}</code> <strong class="strong">–a</strong>
@@ -3296,7 +3296,7 @@ error→ → - -| ⇒
» « » ‹
› € → ≤ ≥
</em></div>
-<div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal">r</span> <small
class="sc">SC</small> <span class="sansserif" style="font-family: sans-serif;
font-weight: normal">sansserif</span> <i class="slanted">slanted</i>
+<div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal; font-style:
normal">r</span> <small class="sc">SC</small> <span class="sansserif"
style="font-family: sans-serif; font-weight: normal">sansserif</span> <i
class="slanted">slanted</i>
</em></div>
<p><kbd class="kbd" style="font-style: oblique">default kbdinputstyle</kbd>
</p><dl class="vtable">
@@ -4286,7 +4286,7 @@ but , ,
<code class="code">@key{--a}</code> <kbd class="key" style="font-style:
normal">--a</kbd>
<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em
class="math">--a {\frac{1}{2}} -</em>
<code class="code">@option{--a}</code> <samp class="option">--a</samp>
-<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal">–a</span>
+<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal; font-style: normal">–a</span>
<code class="code">@samp{--a}</code> ‘<samp
class="samp">--a</samp>’
<code class="code">@sc{--a}</code> <small class="sc">–A</small>
<code class="code">@strong{--a}</code> <strong class="strong">–a</strong>
@@ -4372,7 +4372,7 @@ error→ → - -| ⇒
» « » ‹
› € → ≤ ≥
</em></div>
-<div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal">r</span> <small
class="sc">SC</small> <span class="sansserif" style="font-family: sans-serif;
font-weight: normal">sansserif</span> <i class="slanted">slanted</i>
+<div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal; font-style:
normal">r</span> <small class="sc">SC</small> <span class="sansserif"
style="font-family: sans-serif; font-weight: normal">sansserif</span> <i
class="slanted">slanted</i>
</em></div>
<p><kbd class="kbd" style="font-style: oblique">default kbdinputstyle</kbd>
</p><dl class="vtable">
@@ -5368,7 +5368,7 @@ but , ,
<code class="code">@key{--a}</code> <kbd class="key" style="font-style:
normal">--a</kbd>
<code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em
class="math">--a {\frac{1}{2}} -</em>
<code class="code">@option{--a}</code> <samp class="option">--a</samp>
-<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal">–a</span>
+<code class="code">@r{--a}</code> <span class="r" style="font-family: initial;
font-weight: normal; font-style: normal">–a</span>
<code class="code">@samp{--a}</code> ‘<samp
class="samp">--a</samp>’
<code class="code">@sc{--a}</code> <span class="sc">--A</span>
<code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
@@ -5464,7 +5464,7 @@ error→ → - -| ⇒
› € → ≤ ≥
</em></div><pre class="example-preformatted">
-</pre><div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal">r</span> <span
class="sc">SC</span> <span class="sansserif" style="font-family: sans-serif;
font-weight: normal">sansserif</span> <i class="slanted">slanted</i>
+</pre><div class="displaymath"><em><b class="b">b</b> <i class="i">i</i> <span
class="r" style="font-family: initial; font-weight: normal; font-style:
normal">r</span> <span class="sc">SC</span> <span class="sansserif"
style="font-family: sans-serif; font-weight: normal">sansserif</span> <i
class="slanted">slanted</i>
</em></div><pre class="example-preformatted">
<kbd class="kbd" style="font-style: oblique">default kbdinputstyle</kbd>
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index f90c4c0199..fc24c76cc1 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -253,7 +253,7 @@ but , ,\@
\texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\} @minus\{\}\}} $--a
{\frac{1}{2}} -$
\texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@r\{{-}{-}a\}} \textrm{--a}
+\texttt{@r\{{-}{-}a\}} \textnormal{--a}
\texttt{@samp\{{-}{-}a\}} `\texttt{{-}{-}a}'
\texttt{@sc\{{-}{-}a\}} \textsc{--a}
\texttt{@strong\{{-}{-}a\}} \textbf{--a}
@@ -1582,7 +1582,7 @@ but , ,\@
\texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\} @minus\{\}\}} $--a
{\frac{1}{2}} -$
\texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@r\{{-}{-}a\}} \textrm{--a}
+\texttt{@r\{{-}{-}a\}} \textnormal{--a}
\texttt{@samp\{{-}{-}a\}} `\texttt{{-}{-}a}'
\texttt{@sc\{{-}{-}a\}} \textsc{--a}
\texttt{@strong\{{-}{-}a\}} \textbf{--a}
@@ -2929,7 +2929,7 @@ but , ,\@
\texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\} @minus\{\}\}} $--a
{\frac{1}{2}} -$
\texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@r\{{-}{-}a\}} \textrm{--a}
+\texttt{@r\{{-}{-}a\}} \textnormal{--a}
\texttt{@samp\{{-}{-}a\}} `\texttt{{-}{-}a}'
\texttt{@sc\{{-}{-}a\}} \textsc{--a}
\texttt{@strong\{{-}{-}a\}} \textbf{--a}
@@ -4254,7 +4254,7 @@ but , ,\@
\texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\} @minus\{\}\}} $--a
{\frac{1}{2}} -$
\texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@r\{{-}{-}a\}} \textrm{--a}
+\texttt{@r\{{-}{-}a\}} \textnormal{--a}
\texttt{@samp\{{-}{-}a\}} `\texttt{{-}{-}a}'
\texttt{@sc\{{-}{-}a\}} \textsc{--a}
\texttt{@strong\{{-}{-}a\}} \textbf{--a}
@@ -5580,7 +5580,7 @@ but , ,\@
\texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\} @minus\{\}\}} $--a
{\frac{1}{2}} -$
\texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@r\{{-}{-}a\}} \textrm{{-}{-}a}
+\texttt{@r\{{-}{-}a\}} \textnormal{{-}{-}a}
\texttt{@samp\{{-}{-}a\}} `\texttt{{-}{-}a}'
\texttt{@sc\{{-}{-}a\}} \textsc{{-}{-}a}
\texttt{@strong\{{-}{-}a\}} \textbf{{-}{-}a}
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 3e605263c0..a35e40d7f6 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 5f042683c8..1ce15efd57 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -861,7 +861,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index fbd60c8da9..9cae88d386 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -859,7 +859,7 @@ pre.display-preformatted {font-family: inherit}
pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 620d36bb14..97d2df3838 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 35e4315dae..f423ce0021 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -862,7 +862,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 0611af6d73..e50bf93be4 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 599b5450cb..84434acf5a 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -863,7 +863,7 @@ pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
span.program-in-footer {font-size: smaller}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
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 77ca78230c..1d4a911d38 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -861,7 +861,7 @@ pre.format-preformatted {font-family: inherit}
pre.menu-comment-preformatted {font-family: serif}
pre.menu-entry-description-preformatted {font-family: serif; display: inline}
pre.menu-preformatted {font-family: serif}
-span.r {font-family: initial; font-weight: normal}
+span.r {font-family: initial; font-weight: normal; font-style: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
span:hover a.copiable-link {visibility: visible}
ul.mark-bullet {list-style-type: disc}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Have @r isolate formatting from surrounding text for fonts,
Patrice Dumas <=