[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Common.pm (@variable_string_settable
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Common.pm (@variable_string_settables), tp/Texinfo/Convert/Converter.pm (_format_numeric_entities_accent) (xml_accent, _xml_named_entities_numeric_fallback_accent) (xml_accents), tp/Texinfo/Convert/DocBook.pm (%defaults) (cmdname), doc/texinfo.texi (Other Customization Variables): re-add USE_NUMERIC_ENTITY with the meaning of using numeric entities in priority. In DocBook, use Texinfo::Convert::Converter xml_accents and set USE_NUMERIC_ENTITY, remove docbook_accent(). |
|
Date: |
Sun, 19 Dec 2021 07:25:04 -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 c926153 * tp/Texinfo/Common.pm (@variable_string_settables),
tp/Texinfo/Convert/Converter.pm (_format_numeric_entities_accent) (xml_accent,
_xml_named_entities_numeric_fallback_accent) (xml_accents),
tp/Texinfo/Convert/DocBook.pm (%defaults) (cmdname), doc/texinfo.texi (Other
Customization Variables): re-add USE_NUMERIC_ENTITY with the meaning of using
numeric entities in priority. In DocBook, use Texinfo::Convert::Converter
xml_accents and set USE_NUMERIC_ENTITY, remove docboo [...]
c926153 is described below
commit c9261534d31250c735db51ed3b4a44dec9757d28
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 19 13:24:54 2021 +0100
* tp/Texinfo/Common.pm (@variable_string_settables),
tp/Texinfo/Convert/Converter.pm (_format_numeric_entities_accent)
(xml_accent, _xml_named_entities_numeric_fallback_accent)
(xml_accents), tp/Texinfo/Convert/DocBook.pm (%defaults)
(cmdname), doc/texinfo.texi (Other Customization Variables):
re-add USE_NUMERIC_ENTITY with the meaning of using numeric
entities in priority. In DocBook, use Texinfo::Convert::Converter
xml_accents and set USE_NUMERIC_ENTITY, remove docbook_accent().
---
ChangeLog | 11 +
NEWS | 2 +
doc/texinfo.texi | 13 +-
tp/Texinfo/Common.pm | 1 +
tp/Texinfo/Convert/Converter.pm | 88 ++++---
tp/Texinfo/Convert/DocBook.pm | 26 +-
tp/t/results/converters_tests/accent_with_text.pl | 2 +-
tp/t/results/converters_tests/empty_accent.pl | 2 +-
.../some_at_commands_in_ref_nodes.pl | 2 +-
tp/t/results/coverage/accent_and_dash.pl | 2 +-
tp/t/results/coverage/at_after_accent_command.pl | 2 +-
tp/t/results/coverage/commands_in_math.pl | 6 +-
tp/t/results/coverage/unknown_accents.pl | 14 +-
tp/t/results/coverage_braces/nested_in_sc.pl | 2 +-
tp/t/results/formats_encodings/accent.pl | 14 +-
tp/t/results/formats_encodings/accentenc.pl | 14 +-
.../formats_encodings/at_commands_in_refs.pl | 12 +-
tp/t/results/formats_encodings/weird_accents.pl | 10 +-
.../weird_accents_disable_encoding.pl | 10 +-
.../res_parser/formatting_docbook/formatting.xml | 264 ++++++++++-----------
20 files changed, 263 insertions(+), 234 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 556191c..2fa51d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2021-12-19 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Common.pm (@variable_string_settables),
+ tp/Texinfo/Convert/Converter.pm (_format_numeric_entities_accent)
+ (xml_accent, _xml_named_entities_numeric_fallback_accent)
+ (xml_accents), tp/Texinfo/Convert/DocBook.pm (%defaults)
+ (cmdname), doc/texinfo.texi (Other Customization Variables):
+ re-add USE_NUMERIC_ENTITY with the meaning of using numeric
+ entities in priority. In DocBook, use Texinfo::Convert::Converter
+ xml_accents and set USE_NUMERIC_ENTITY, remove docbook_accent().
+
2021-12-19 Gavin Smith <gavinsmith0123@gmail.com>
Attempt to make texi2any relocatable
diff --git a/NEWS b/NEWS
index 639abd6..5c803b6 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ See the manual for detailed information.
6.X
* texi2any
. L2H customization variable removed. Replaced by HTML_MATH set to l2h.
+ . Meaning of USE_NUMERIC_ENTITY changed to be using numeric entities in
+ priority. Former meaning obtained with FALLBACK_TO_NUMERIC_ENTITY.
6.8 (3 July 2021)
* Language
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index bbcd66b..0d4596b 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16581,6 +16581,12 @@ Xref Configuration}.
The extension added to the output file name. The default is different
for each output format.
+@item FALLBACK_TO_NUMERIC_ENTITY
+@c actually also for DocBook, but it is not interesting to document it
+For HTML and XML@. If set, use numeric entities instead of ASCII
+characters when there is no named entity. By default, set to true for
+HTML.
+
@item FORMAT_MENU
@opindex --no-headers
If set to @samp{menu}, output Texinfo menus. This is the default for
@@ -16794,10 +16800,9 @@ Preferentially use nodes to decide where elements are
separated. If
set to false, preferentially use sectioning to decide where elements
are separated. The default is true.
-@item FALLBACK_TO_NUMERIC_ENTITY
-For HTML and XML@. If set, use numeric entities instead of ASCII
-characters when there is no named entity. By default, set to true for
-HTML.
+@item USE_NUMERIC_ENTITY
+For HTML, XML and DocBook@. If set, use numeric entities instead of named
+entities. By default, set to true for DocBook output.
@item USE_UP_NODE_FOR_ELEMENT_UP
Fill in up sectioning direction with node direction when there is no
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 9f9fbe4..f08f4f3 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -348,6 +348,7 @@ my @variable_string_settables = (
'USE_LINKS',
'USE_NODES',
'USE_NODE_DIRECTIONS',
+'USE_NUMERIC_ENTITY',
'USE_REL_REV',
'USE_SETFILENAME_EXTENSION',
'USE_TITLEPAGE_FOR_TITLE',
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index a947f3a..1a31e73 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1485,32 +1485,17 @@ my %xml_accent_text_with_entities = (
# 'ogonek' => 'aeiuAEIU',
);
-
-sub xml_accent($$$;$$)
+sub _format_numeric_entities_accent($$)
{
- my $self = shift;
+ my $accent = shift;
my $text = shift;
- my $command = shift;
- my $in_upper_case = shift;
- my $use_numeric_entities = shift;
- my $accent = $command->{'cmdname'};
-
- if ($in_upper_case and $text =~ /^\w$/) {
- $text = uc ($text);
- }
-
- return "&${text}$xml_accent_entities{$accent};"
- if (defined($xml_accent_entities{$accent})
- and defined($xml_accent_text_with_entities{$accent})
- and ($text =~ /^[$xml_accent_text_with_entities{$accent}]$/));
- if ($use_numeric_entities
- and
exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent})
+
+ if (exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent})
and
exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}->{$text}))
{
return '&#' .
hex($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}->{$text}).
';';
}
- if ($use_numeric_entities
- and exists($Texinfo::Convert::Unicode::unicode_diacritics{$accent})) {
+ if (exists($Texinfo::Convert::Unicode::unicode_diacritics{$accent})) {
my $diacritics_entity = '&#'
.hex($Texinfo::Convert::Unicode::unicode_diacritics{$accent}). ';';
if ($accent ne 'tieaccent') {
@@ -1527,6 +1512,40 @@ sub xml_accent($$$;$$)
}
}
}
+ return undef;
+}
+
+sub xml_accent($$$;$$$)
+{
+ my $self = shift;
+ my $text = shift;
+ my $command = shift;
+ my $in_upper_case = shift;
+ my $fallback_to_numeric_entities = shift;
+ my $use_numeric_entities = shift;
+ my $accent = $command->{'cmdname'};
+
+ if ($in_upper_case and $text =~ /^\w$/) {
+ $text = uc ($text);
+ }
+
+ if ($use_numeric_entities) {
+ my $formatted_accent = _format_numeric_entities_accent($accent, $text);
+ if (defined($formatted_accent)) {
+ return $formatted_accent;
+ }
+ } else {
+ return "&${text}$xml_accent_entities{$accent};"
+ if (defined($xml_accent_entities{$accent})
+ and defined($xml_accent_text_with_entities{$accent})
+ and ($text =~ /^[$xml_accent_text_with_entities{$accent}]$/));
+ if ($fallback_to_numeric_entities) {
+ my $formatted_accent = _format_numeric_entities_accent($accent, $text);
+ if (defined($formatted_accent)) {
+ return $formatted_accent;
+ }
+ }
+ }
return $text . '<' if ($accent eq 'v');
# FIXME it is not possible to call xml_protect_text since what is in $text
@@ -1535,7 +1554,7 @@ sub xml_accent($$$;$$)
return Texinfo::Convert::Text::ascii_accent($text, $command);
}
-sub _xml_accent_numeric_entities($$;$)
+sub _xml_named_entities_numeric_fallback_accent($$;$)
{
my $self = shift;
my $text = shift;
@@ -1544,6 +1563,16 @@ sub _xml_accent_numeric_entities($$;$)
return $self->xml_accent($text, $command, $in_upper_case, 1);
}
+sub _xml_numeric_entities_accent($$$;$)
+{
+ my $self = shift;
+ my $text = shift;
+ my $command = shift;
+ my $in_upper_case = shift;
+
+ return xml_accent($self, $text, $command, $in_upper_case, undef, 1);
+}
+
sub xml_accents($$;$)
{
my $self = shift;
@@ -1551,8 +1580,10 @@ sub xml_accents($$;$)
my $in_upper_case = shift;
my $format_accents;
- if ($self->get_conf('FALLBACK_TO_NUMERIC_ENTITY')) {
- $format_accents = \&_xml_accent_numeric_entities;
+ if ($self->get_conf('USE_NUMERIC_ENTITY')) {
+ $format_accents = \&_xml_numeric_entities_accent;
+ } elsif ($self->get_conf('FALLBACK_TO_NUMERIC_ENTITY')) {
+ $format_accents = \&_xml_named_entities_numeric_fallback_accent;
} else {
$format_accents = \&xml_accent;
}
@@ -1812,17 +1843,18 @@ Protect special XML characters (&, E<lt>, E<gt>, ") of
I<$text>.
Returns an XML comment for I<$text>.
-=item $result = xml_accent($text, $accent_command, $in_upper_case,
$use_numeric_entities)
+=item $result = xml_accent($text, $accent_command, $in_upper_case,
$fallback_to_numeric_entities, $use_numeric_entities)
I<$text> is the text appearing within an accent command. I<$accent_command>
should be a Texinfo tree element corresponding to an accent command taking
an argument. I<$in_upper_case> is optional, and, if set, the text is put
-in upper case. The function returns the accented letter as XML entity
-if possible. I<$use_numeric_entities> is also optional, and, if set, and
+in upper case. The function returns the accented letter as XML named entity
+if possible. I<$fallback_to_numeric_entities> is also optional, and, if set,
and
there is no XML entity, the numerical entity corresponding to Unicode
-points is preferred to an ASCII transliteration. If I<$use_numeric_entities>
+points is preferred to an ASCII transliteration. If
I<$fallback_to_numeric_entities>
is set numerical entities are also used for diacritics instead of ASCII
-characters.
+characters. I<$use_numeric_entities> is optional. If set, numerical entities
+are used instead of named entities if possible.
=item $result = $converter->xml_accents($accent_command, $in_upper_case)
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 08e466b..8b9f613 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -62,6 +62,7 @@ my %defaults = (
'documentlanguage' => undef,
'OPEN_QUOTE_SYMBOL' => $lsquo,
'CLOSE_QUOTE_SYMBOL' => $rsquo,
+ 'USE_NUMERIC_ENTITY' => 1,
);
my @docbook_image_extensions
@@ -456,29 +457,6 @@ sub _index_entry($$)
return '';
}
-sub docbook_accent($$$;$)
-{
- my $self = shift;
- my $text = shift;
- my $command = shift;
- my $in_upper_case = shift;
- my $accent = $command->{'cmdname'};
-
- if ($in_upper_case and $text =~ /^\w$/) {
- $text = uc ($text);
- }
- if (exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent})
- and
exists($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}->{$text}))
{
- return '&#' .
-
hex($Texinfo::Convert::Unicode::unicode_accented_letters{$accent}->{$text}).
';';
- }
- # FIXME it is not possible to call xml_protect_text since what is in $text
- # may already be xml. But this means that each time ascii_accent changes
- # it should be changed here too.
- return $text . '<' if ($accent eq 'v');
- return Texinfo::Convert::Text::ascii_accent($text, $command);
-}
-
sub _parse_attribute($)
{
my $element = shift;
@@ -585,7 +563,7 @@ sub _convert($$;$)
} elsif ($element->{'cmdname'} eq 'today') {
return $self->_convert(Texinfo::Convert::Utils::expand_today($self));
} elsif ($Texinfo::Common::accent_commands{$element->{'cmdname'}}) {
- return $self->convert_accents($element, \&docbook_accent,
+ return $self->xml_accents($element,
$self->{'document_context'}->[-1]->{'upper_case'}->[-1]);
} elsif ($element->{'cmdname'} eq 'item' or $element->{'cmdname'} eq
'itemx'
or $element->{'cmdname'} eq 'headitem' or $element->{'cmdname'}
eq 'tab') {
diff --git a/tp/t/results/converters_tests/accent_with_text.pl
b/tp/t/results/converters_tests/accent_with_text.pl
index 120b064..3364642 100644
--- a/tp/t/results/converters_tests/accent_with_text.pl
+++ b/tp/t/results/converters_tests/accent_with_text.pl
@@ -255,7 +255,7 @@ $result_converted{'xml'}->{'accent_with_text'} =
'<para><accent type="breve">&te
</para>';
-$result_converted{'docbook'}->{'accent_with_text'} = '<para>–a( –b
î ĵ –a^
+$result_converted{'docbook'}->{'accent_with_text'} = '<para>–ă
–b î ĵ –â
</para>';
1;
diff --git a/tp/t/results/converters_tests/empty_accent.pl
b/tp/t/results/converters_tests/empty_accent.pl
index a9aed62..9fdda38 100644
--- a/tp/t/results/converters_tests/empty_accent.pl
+++ b/tp/t/results/converters_tests/empty_accent.pl
@@ -69,7 +69,7 @@ $result_converted{'xml'}->{'empty_accent'} = '<para><accent
type="grave"></accen
</para>';
-$result_converted{'docbook'}->{'empty_accent'} = '<para>`
+$result_converted{'docbook'}->{'empty_accent'} = '<para>̀
</para>';
1;
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index e87c574..9e82532 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -1876,7 +1876,7 @@
$result_converted{'docbook'}->{'some_at_commands_in_ref_nodes'} = '
</chapter>
<chapter label="1"
id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">
-<title>A SC node ï ï Ē` ł Ć, ¡</title>
+<title>A SC node ï ï Ḕ ł Ḉ ¡</title>
<para>see .
</para></chapter>
diff --git a/tp/t/results/coverage/accent_and_dash.pl
b/tp/t/results/coverage/accent_and_dash.pl
index 4dd20bf..4118c49 100644
--- a/tp/t/results/coverage/accent_and_dash.pl
+++ b/tp/t/results/coverage/accent_and_dash.pl
@@ -65,6 +65,6 @@ $result_converted{'html_text'}->{'accent_and_dash'} =
'<p>a–̂</p>';
$result_converted{'xml'}->{'accent_and_dash'} = '<para><accent
type="circ">a&textndash;</accent></para>';
-$result_converted{'docbook'}->{'accent_and_dash'} = '<para>a–^</para>';
+$result_converted{'docbook'}->{'accent_and_dash'} =
'<para>a–̂</para>';
1;
diff --git a/tp/t/results/coverage/at_after_accent_command.pl
b/tp/t/results/coverage/at_after_accent_command.pl
index 51038e6..3bf6e5c 100644
--- a/tp/t/results/coverage/at_after_accent_command.pl
+++ b/tp/t/results/coverage/at_after_accent_command.pl
@@ -109,7 +109,7 @@ $result_converted{'xml'}->{'at_after_accent_command'} =
'<para><accent type="rin
</para>';
-$result_converted{'docbook'}->{'at_after_accent_command'} = '<para>*@. ^@.
+$result_converted{'docbook'}->{'at_after_accent_command'} = '<para>̊@.
̂@.
</para>';
1;
diff --git a/tp/t/results/coverage/commands_in_math.pl
b/tp/t/results/coverage/commands_in_math.pl
index 77a2ccc..0bc0fa0 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -2891,9 +2891,9 @@ $result_converted{'docbook'}->{'commands_in_math'} = '
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----\'<!-- /@w -->\'
</mathphrase></informalequation>
-<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ē`
-ł Ć, Ć, ç a\'\' ȧ å a[
-ă a_ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
+<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ḕ
+ł Ḉ Ḉ ç a̋ ȧ å a͡
+ă a̲ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
     ! ? . @ } {
a sunny day
diff --git a/tp/t/results/coverage/unknown_accents.pl
b/tp/t/results/coverage/unknown_accents.pl
index efc68c2..2e64464 100644
--- a/tp/t/results/coverage/unknown_accents.pl
+++ b/tp/t/results/coverage/unknown_accents.pl
@@ -930,19 +930,19 @@ $result_converted{'xml'}->{'unknown_accents'} =
'<para><accent type="uml" bracke
</para>';
-$result_converted{'docbook'}->{'unknown_accents'} = '<para>Ẍ ẍ Q"
Ÿ
+$result_converted{'docbook'}->{'unknown_accents'} = '<para>Ẍ ẍ
Q̈ Ÿ
</para>
-<para>Ɗ q\' ŕ
-Ź Q\' Ŕ
+<para>Ɗ q́ ŕ
+Ź Q́ Ŕ
</para>
<para>Ḩ ḩ
</para>
-<para>ẑ r^ t^ k^
-Ẑ R^ T^ K^
+<para>ẑ r̂ t̂ k̂
+Ẑ R̂ T̂ K̂
</para>
-<para>z` m` p`
+<para>z̀ m̀ p̀
</para>
-<para>Z~ s~
+<para>Z̃ s̃
</para>';
1;
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl
b/tp/t/results/coverage_braces/nested_in_sc.pl
index a74bc77..8f6fe79 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -319,7 +319,7 @@ $result_floats{'nested_in_sc'} = {};
-$result_converted{'docbook'}->{'nested_in_sc'} = '<para>AAA Ñ Å
&tex; Å~ <footnote><para>In footnote</para></footnote>,
<abbrev>ABR</abbrev> (EXPL),
+$result_converted{'docbook'}->{'nested_in_sc'} = '<para>AAA Ñ Å
&tex; Å̃ <footnote><para>In footnote</para></footnote>,
<abbrev>ABR</abbrev> (EXPL),
<literal>IN VERB</literal>
</para>';
diff --git a/tp/t/results/formats_encodings/accent.pl
b/tp/t/results/formats_encodings/accent.pl
index 8e2bf2e..78891c9 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -3437,17 +3437,17 @@ $result_converted{'docbook'}->{'accent'} = '<chapter
label="" id="Top-node">
</para>
<para>should be e=: ē ē
</para>
-<para>should be e’<!-- /@w -->’: e\'\' e\'\'
+<para>should be e’<!-- /@w -->’: e̋ e̋
</para>
<para>should be e.: ė ė
</para>
-<para>should be e*: e* e*
+<para>should be e*: e̊ e̊
</para>
-<para>should be ee[: ee[
+<para>should be ee[: e͡e
</para>
<para>should be e(: ĕ ĕ
</para>
-<para>should be e_: e_ e_
+<para>should be e_: e̲ e̲
</para>
<para>should be .e: ẹ ẹ
</para>
@@ -3483,13 +3483,13 @@ $result_converted{'docbook'}->{'accent'} = '<chapter
label="" id="Top-node">
<para>should be dotless i": ï
</para>
<!-- arg is command - @dotless{j} -->
-<para>should be dotless j‘: j`
+<para>should be dotless j‘: j̀
</para>
-<para>should be dotless j’: j\'
+<para>should be dotless j’: j́
</para>
<para>should be dotless j^: ĵ
</para>
-<para>should be dotless j": j"
+<para>should be dotless j": j̈
</para></chapter>
';
diff --git a/tp/t/results/formats_encodings/accentenc.pl
b/tp/t/results/formats_encodings/accentenc.pl
index f51aaba..cd2f50a 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -3486,17 +3486,17 @@ $result_converted{'docbook'}->{'accentenc'} = '
</para>
<para>should be e=: ē ē
</para>
-<para>should be e’<!-- /@w -->’: e\'\' e\'\'
+<para>should be e’<!-- /@w -->’: e̋ e̋
</para>
<para>should be e.: ė ė
</para>
-<para>should be e*: e* e*
+<para>should be e*: e̊ e̊
</para>
-<para>should be ee[: ee[
+<para>should be ee[: e͡e
</para>
<para>should be e(: ĕ ĕ
</para>
-<para>should be e_: e_ e_
+<para>should be e_: e̲ e̲
</para>
<para>should be .e: ẹ ẹ
</para>
@@ -3532,13 +3532,13 @@ $result_converted{'docbook'}->{'accentenc'} = '
<para>should be dotless i": ï
</para>
<!-- arg is command - @dotless{j} -->
-<para>should be dotless j‘: j`
+<para>should be dotless j‘: j̀
</para>
-<para>should be dotless j’: j\'
+<para>should be dotless j’: j́
</para>
<para>should be dotless j^: ĵ
</para>
-<para>should be dotless j": j"
+<para>should be dotless j": j̈
</para></chapter>
';
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 be1192b..8154fa5 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -23521,15 +23521,15 @@ $result_converted{'docbook'}->{'at_commands_in_refs'}
= '<chapter label="" id="T
</chapter>
<chapter label="10"
id="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
-<title>ä ẽ î â à é ç ē e* e\'\'
ę</title>
+<title>ä ẽ î â à é ç ē e̊
e̋ ę</title>
</chapter>
<chapter label="11" id="_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
-<title>ė ĕ e_ ẹ ě j ee[</title>
+<title>ė ĕ e̲ ẹ ě j e͡e</title>
</chapter>
<chapter label="12" id="_0131-_1e14-_1e08">
-<title>i Ē` Ć,</title>
+<title>i Ḕ Ḉ</title>
</chapter>
<chapter label="13" id="_201c-_201d-_2018-_2019-_201e-_201a">
@@ -23610,11 +23610,11 @@ $result_converted{'docbook'}->{'at_commands_in_refs'}
= '<chapter label="" id="T
</para>
<para><link
linkend="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">Å
æ œ Æ Œ ø Ø ß ł Ł Ð ð
Þ þ</link>
</para>
-<para><link
linkend="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">ä
ẽ î â à é ç ē e* e\'\' ę</link>
+<para><link
linkend="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">ä
ẽ î â à é ç ē e̊ e̋ ę</link>
</para>
-<para><link linkend="_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">ė ĕ
e_ ẹ ě j ee[</link>
+<para><link linkend="_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">ė ĕ
e̲ ẹ ě j e͡e</link>
</para>
-<para><link linkend="_0131-_1e14-_1e08">i Ē` Ć,</link>
+<para><link linkend="_0131-_1e14-_1e08">i Ḕ Ḉ</link>
</para>
<para><link linkend="_201c-_201d-_2018-_2019-_201e-_201a">“ ”
‘ ’ „ ‚</link>
</para>
diff --git a/tp/t/results/formats_encodings/weird_accents.pl
b/tp/t/results/formats_encodings/weird_accents.pl
index 03aab55..36d4750 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -682,15 +682,15 @@ $result_converted{'docbook'}->{'weird_accents'} = '
<chapter label="" id="Top">
<title>top</title>
-<para>ĩ=
+<para>ĩ̄
</para>
-<para>ñ,=
+<para>ņ̃̄
</para>
-<para>a_=
+<para>ā̲
</para>
-<para>.r`^
+<para>ṛ̀̂
</para>
-<para>r`\'=
+<para>r̀́̄
</para></chapter>
';
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index 9840745..6f1689c 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -682,15 +682,15 @@
$result_converted{'docbook'}->{'weird_accents_disable_encoding'} = '
<chapter label="" id="Top">
<title>top</title>
-<para>ĩ=
+<para>ĩ̄
</para>
-<para>ñ,=
+<para>ņ̃̄
</para>
-<para>a_=
+<para>ā̲
</para>
-<para>.r`^
+<para>ṛ̀̂
</para>
-<para>r`\'=
+<para>r̀́̄
</para></chapter>
';
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 6abb27b..cb7c885 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -47,9 +47,9 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@’{@dotless{i}} í
@dotless{i} i
@dotless{j} j
-@‘{@=E} Ē`
+@‘{@=E} Ḕ
@l{} ł
-@,{@’C} Ć,
+@,{@’C} Ḉ
@,c ç
@,c@"u çü
@@ -182,26 +182,26 @@ but , ,
<literal>@verb{:--a:}</literal> <literal>--a</literal>
<literal>@verb{:a < & @ % " -- b:}</literal> <literal>a <
& @ % " -- b</literal>
<literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a a<!-- /@w -->
-<literal>@H{a}</literal> a''
-<literal>@H{--a}</literal> –a''
+<literal>@H{a}</literal> a̋
+<literal>@H{--a}</literal> –a̋
<literal>@dotaccent{a}</literal> ȧ
-<literal>@dotaccent{--a}</literal> –a.
+<literal>@dotaccent{--a}</literal> –ȧ
<literal>@ringaccent{a}</literal> å
-<literal>@ringaccent{--a}</literal> –a*
-<literal>@tieaccent{a}</literal> a[
-<literal>@tieaccent{--a}</literal> –a[
+<literal>@ringaccent{--a}</literal> –å
+<literal>@tieaccent{a}</literal> a͡
+<literal>@tieaccent{--a}</literal> –a͡
<literal>@u{a}</literal> ă
-<literal>@u{--a}</literal> –a(
-<literal>@ubaraccent{a}</literal> a_
-<literal>@ubaraccent{--a}</literal> –a_
+<literal>@u{--a}</literal> –ă
+<literal>@ubaraccent{a}</literal> a̲
+<literal>@ubaraccent{--a}</literal> –a̲
<literal>@udotaccent{a}</literal> ạ
-<literal>@udotaccent{--a}</literal> .–a
+<literal>@udotaccent{--a}</literal> –ạ
<literal>@v{a}</literal> ǎ
-<literal>@v{--a}</literal> –a<
+<literal>@v{--a}</literal> –ǎ
<literal>@,{c}</literal> ç
-<literal>@,{--c}</literal> –c,
+<literal>@,{--c}</literal> –ç
<literal>@ogonek{a}</literal> ą
-<literal>@ogonek{--a}</literal> –a;
+<literal>@ogonek{--a}</literal> –ą
<literal>a@sup{h}@sub{l}</literal>
a<superscript>h</superscript><subscript>l</subscript>
<literal>@footnote{in footnote}</literal> <footnote><para>in
footnote</para></footnote>
<literal>@footnote{in footnote2}</literal> <footnote><para>in
footnote2</para></footnote>
@@ -237,9 +237,9 @@ After clickstyle ⇒
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
</mathphrase></informalequation>
-<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ē`
-ł Ć, Ć, ç a'' ȧ å a[
-ă a_ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
+<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ḕ
+ł Ḉ Ḉ ç a̋ ȧ å a͡
+ă a̲ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
     ! ? . @ } {
a sunny day
@@ -686,17 +686,17 @@ aaa</literallayout></textobject></inlinemediaobject>
<para>Somehow invalid use of @,:
-@, ,
+@, ̧
-@,@"u ,ü
+@,@"u ̧ü
</para>
<para>Invalid use of @’:
-@’ '
+@’ ́
-@’@"u 'ü
+@’@"u ́ü
</para>
<!-- only i or j as arg -->
<para>@dotless{truc} truc
@@ -840,9 +840,9 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@’{@dotless{i}} í
@dotless{i} i
@dotless{j} j
-@‘{@=E} Ē`
+@‘{@=E} Ḕ
@l{} ł
-@,{@’C} Ć,
+@,{@’C} Ḉ
@,c ç
@,c@"u çü
@@ -975,26 +975,26 @@ but , ,
<literal>@verb{:--a:}</literal> <literal>--a</literal>
<literal>@verb{:a < & @ % " -- b:}</literal> <literal>a <
& @ % " -- b</literal>
<literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a a<!-- /@w -->
-<literal>@H{a}</literal> a''
-<literal>@H{--a}</literal> –a''
+<literal>@H{a}</literal> a̋
+<literal>@H{--a}</literal> –a̋
<literal>@dotaccent{a}</literal> ȧ
-<literal>@dotaccent{--a}</literal> –a.
+<literal>@dotaccent{--a}</literal> –ȧ
<literal>@ringaccent{a}</literal> å
-<literal>@ringaccent{--a}</literal> –a*
-<literal>@tieaccent{a}</literal> a[
-<literal>@tieaccent{--a}</literal> –a[
+<literal>@ringaccent{--a}</literal> –å
+<literal>@tieaccent{a}</literal> a͡
+<literal>@tieaccent{--a}</literal> –a͡
<literal>@u{a}</literal> ă
-<literal>@u{--a}</literal> –a(
-<literal>@ubaraccent{a}</literal> a_
-<literal>@ubaraccent{--a}</literal> –a_
+<literal>@u{--a}</literal> –ă
+<literal>@ubaraccent{a}</literal> a̲
+<literal>@ubaraccent{--a}</literal> –a̲
<literal>@udotaccent{a}</literal> ạ
-<literal>@udotaccent{--a}</literal> .–a
+<literal>@udotaccent{--a}</literal> –ạ
<literal>@v{a}</literal> ǎ
-<literal>@v{--a}</literal> –a<
+<literal>@v{--a}</literal> –ǎ
<literal>@,{c}</literal> ç
-<literal>@,{--c}</literal> –c,
+<literal>@,{--c}</literal> –ç
<literal>@ogonek{a}</literal> ą
-<literal>@ogonek{--a}</literal> –a;
+<literal>@ogonek{--a}</literal> –ą
<literal>a@sup{h}@sub{l}</literal>
a<superscript>h</superscript><subscript>l</subscript>
<literal>@footnote{in footnote}</literal> <footnote><para>in
footnote</para></footnote>
<literal>@footnote{in footnote2}</literal> <footnote><para>in
footnote2</para></footnote>
@@ -1030,9 +1030,9 @@ After clickstyle ⇒
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
</mathphrase></informalequation>
-<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ē`
-ł Ć, Ć, ç a'' ȧ å a[
-ă a_ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
+<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ḕ
+ł Ḉ Ḉ ç a̋ ȧ å a͡
+ă a̲ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
     ! ? . @ } {
a sunny day
@@ -1479,17 +1479,17 @@ aaa</literallayout></textobject></inlinemediaobject>
<para>Somehow invalid use of @,:
-@, ,
+@, ̧
-@,@"u ,ü
+@,@"u ̧ü
</para>
<para>Invalid use of @’:
-@’ '
+@’ ́
-@’@"u 'ü
+@’@"u ́ü
</para>
<!-- only i or j as arg -->
<para>@dotless{truc} truc
@@ -1634,9 +1634,9 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@’{@dotless{i}} í
@dotless{i} i
@dotless{j} j
-@‘{@=E} Ē`
+@‘{@=E} Ḕ
@l{} ł
-@,{@’C} Ć,
+@,{@’C} Ḉ
@,c ç
@,c@"u çü
@@ -1769,26 +1769,26 @@ but , ,
<literal>@verb{:--a:}</literal> <literal>--a</literal>
<literal>@verb{:a < & @ % " -- b:}</literal> <literal>a <
& @ % " -- b</literal>
<literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a a<!-- /@w -->
-<literal>@H{a}</literal> a''
-<literal>@H{--a}</literal> –a''
+<literal>@H{a}</literal> a̋
+<literal>@H{--a}</literal> –a̋
<literal>@dotaccent{a}</literal> ȧ
-<literal>@dotaccent{--a}</literal> –a.
+<literal>@dotaccent{--a}</literal> –ȧ
<literal>@ringaccent{a}</literal> å
-<literal>@ringaccent{--a}</literal> –a*
-<literal>@tieaccent{a}</literal> a[
-<literal>@tieaccent{--a}</literal> –a[
+<literal>@ringaccent{--a}</literal> –å
+<literal>@tieaccent{a}</literal> a͡
+<literal>@tieaccent{--a}</literal> –a͡
<literal>@u{a}</literal> ă
-<literal>@u{--a}</literal> –a(
-<literal>@ubaraccent{a}</literal> a_
-<literal>@ubaraccent{--a}</literal> –a_
+<literal>@u{--a}</literal> –ă
+<literal>@ubaraccent{a}</literal> a̲
+<literal>@ubaraccent{--a}</literal> –a̲
<literal>@udotaccent{a}</literal> ạ
-<literal>@udotaccent{--a}</literal> .–a
+<literal>@udotaccent{--a}</literal> –ạ
<literal>@v{a}</literal> ǎ
-<literal>@v{--a}</literal> –a<
+<literal>@v{--a}</literal> –ǎ
<literal>@,{c}</literal> ç
-<literal>@,{--c}</literal> –c,
+<literal>@,{--c}</literal> –ç
<literal>@ogonek{a}</literal> ą
-<literal>@ogonek{--a}</literal> –a;
+<literal>@ogonek{--a}</literal> –ą
<literal>a@sup{h}@sub{l}</literal>
a<superscript>h</superscript><subscript>l</subscript>
<literal>@footnote{in footnote}</literal> <footnote><para>in
footnote</para></footnote>
<literal>@footnote{in footnote2}</literal> <footnote><para>in
footnote2</para></footnote>
@@ -1824,9 +1824,9 @@ After clickstyle ⇒
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
</mathphrase></informalequation>
-<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ē`
-ł Ć, Ć, ç a'' ȧ å a[
-ă a_ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
+<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ḕ
+ł Ḉ Ḉ ç a̋ ȧ å a͡
+ă a̲ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
     ! ? . @ } {
a sunny day
@@ -2273,17 +2273,17 @@ aaa</literallayout></textobject></inlinemediaobject>
<para>Somehow invalid use of @,:
-@, ,
+@, ̧
-@,@"u ,ü
+@,@"u ̧ü
</para>
<para>Invalid use of @’:
-@’ '
+@’ ́
-@’@"u 'ü
+@’@"u ́ü
</para>
<!-- only i or j as arg -->
<para>@dotless{truc} truc
@@ -2446,9 +2446,9 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@’{@dotless{i}} í
@dotless{i} i
@dotless{j} j
-@‘{@=E} Ē`
+@‘{@=E} Ḕ
@l{} ł
-@,{@’C} Ć,
+@,{@’C} Ḉ
@,c ç
@,c@"u çü
@@ -2581,26 +2581,26 @@ but , ,
<literal>@verb{:--a:}</literal> <literal>--a</literal>
<literal>@verb{:a < & @ % " -- b:}</literal> <literal>a <
& @ % " -- b</literal>
<literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a a<!-- /@w -->
-<literal>@H{a}</literal> a''
-<literal>@H{--a}</literal> –a''
+<literal>@H{a}</literal> a̋
+<literal>@H{--a}</literal> –a̋
<literal>@dotaccent{a}</literal> ȧ
-<literal>@dotaccent{--a}</literal> –a.
+<literal>@dotaccent{--a}</literal> –ȧ
<literal>@ringaccent{a}</literal> å
-<literal>@ringaccent{--a}</literal> –a*
-<literal>@tieaccent{a}</literal> a[
-<literal>@tieaccent{--a}</literal> –a[
+<literal>@ringaccent{--a}</literal> –å
+<literal>@tieaccent{a}</literal> a͡
+<literal>@tieaccent{--a}</literal> –a͡
<literal>@u{a}</literal> ă
-<literal>@u{--a}</literal> –a(
-<literal>@ubaraccent{a}</literal> a_
-<literal>@ubaraccent{--a}</literal> –a_
+<literal>@u{--a}</literal> –ă
+<literal>@ubaraccent{a}</literal> a̲
+<literal>@ubaraccent{--a}</literal> –a̲
<literal>@udotaccent{a}</literal> ạ
-<literal>@udotaccent{--a}</literal> .–a
+<literal>@udotaccent{--a}</literal> –ạ
<literal>@v{a}</literal> ǎ
-<literal>@v{--a}</literal> –a<
+<literal>@v{--a}</literal> –ǎ
<literal>@,{c}</literal> ç
-<literal>@,{--c}</literal> –c,
+<literal>@,{--c}</literal> –ç
<literal>@ogonek{a}</literal> ą
-<literal>@ogonek{--a}</literal> –a;
+<literal>@ogonek{--a}</literal> –ą
<literal>a@sup{h}@sub{l}</literal>
a<superscript>h</superscript><subscript>l</subscript>
<literal>@footnote{in footnote}</literal> <footnote><para>in
footnote</para></footnote>
<literal>@footnote{in footnote2}</literal> <footnote><para>in
footnote2</para></footnote>
@@ -2636,9 +2636,9 @@ After clickstyle ⇒
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
</mathphrase></informalequation>
-<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ē`
-ł Ć, Ć, ç a'' ȧ å a[
-ă a_ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
+<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ḕ
+ł Ḉ Ḉ ç a̋ ȧ å a͡
+ă a̲ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
     ! ? . @ } {
a sunny day
@@ -3085,17 +3085,17 @@ aaa</literallayout></textobject></inlinemediaobject>
<para>Somehow invalid use of @,:
-@, ,
+@, ̧
-@,@"u ,ü
+@,@"u ̧ü
</para>
<para>Invalid use of @’:
-@’ '
+@’ ́
-@’@"u 'ü
+@’@"u ́ü
</para>
<!-- only i or j as arg -->
<para>@dotless{truc} truc
@@ -3239,9 +3239,9 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@’{@dotless{i}} í
@dotless{i} i
@dotless{j} j
-@‘{@=E} Ē`
+@‘{@=E} Ḕ
@l{} ł
-@,{@’C} Ć,
+@,{@’C} Ḉ
@,c ç
@,c@"u çü
@@ -3374,26 +3374,26 @@ but , ,
<literal>@verb{:--a:}</literal> <literal>--a</literal>
<literal>@verb{:a < & @ % " -- b:}</literal> <literal>a <
& @ % " -- b</literal>
<literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a a<!-- /@w -->
-<literal>@H{a}</literal> a''
-<literal>@H{--a}</literal> –a''
+<literal>@H{a}</literal> a̋
+<literal>@H{--a}</literal> –a̋
<literal>@dotaccent{a}</literal> ȧ
-<literal>@dotaccent{--a}</literal> –a.
+<literal>@dotaccent{--a}</literal> –ȧ
<literal>@ringaccent{a}</literal> å
-<literal>@ringaccent{--a}</literal> –a*
-<literal>@tieaccent{a}</literal> a[
-<literal>@tieaccent{--a}</literal> –a[
+<literal>@ringaccent{--a}</literal> –å
+<literal>@tieaccent{a}</literal> a͡
+<literal>@tieaccent{--a}</literal> –a͡
<literal>@u{a}</literal> ă
-<literal>@u{--a}</literal> –a(
-<literal>@ubaraccent{a}</literal> a_
-<literal>@ubaraccent{--a}</literal> –a_
+<literal>@u{--a}</literal> –ă
+<literal>@ubaraccent{a}</literal> a̲
+<literal>@ubaraccent{--a}</literal> –a̲
<literal>@udotaccent{a}</literal> ạ
-<literal>@udotaccent{--a}</literal> .–a
+<literal>@udotaccent{--a}</literal> –ạ
<literal>@v{a}</literal> ǎ
-<literal>@v{--a}</literal> –a<
+<literal>@v{--a}</literal> –ǎ
<literal>@,{c}</literal> ç
-<literal>@,{--c}</literal> –c,
+<literal>@,{--c}</literal> –ç
<literal>@ogonek{a}</literal> ą
-<literal>@ogonek{--a}</literal> –a;
+<literal>@ogonek{--a}</literal> –ą
<literal>a@sup{h}@sub{l}</literal>
a<superscript>h</superscript><subscript>l</subscript>
<literal>@footnote{in footnote}</literal> <footnote><para>in
footnote</para></footnote>
<literal>@footnote{in footnote2}</literal> <footnote><para>in
footnote2</para></footnote>
@@ -3429,9 +3429,9 @@ After clickstyle ⇒
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
</mathphrase></informalequation>
-<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ē`
-ł Ć, Ć, ç a'' ȧ å a[
-ă a_ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
+<informalequation><mathphrase>ü Ü ñ â é ō ì
é i j Ḕ
+ł Ḉ Ḉ ç a̋ ȧ å a͡
+ă a̲ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
     ! ? . @ } {
a sunny day
@@ -3878,17 +3878,17 @@ aaa</literallayout></textobject></inlinemediaobject>
<para>Somehow invalid use of @,:
-@, ,
+@, ̧
-@,@"u ,ü
+@,@"u ̧ü
</para>
<para>Invalid use of @’:
-@’ '
+@’ ́
-@’@"u 'ü
+@’@"u ́ü
</para>
<!-- only i or j as arg -->
<para>@dotless{truc} truc
@@ -4028,9 +4028,9 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
@'{@dotless{i}} í
@dotless{i} i
@dotless{j} j
-@`{@=E} Ē`
+@`{@=E} Ḕ
@l{} ł
-@,{@'C} Ć,
+@,{@'C} Ḉ
@,c ç
@,c@"u çü
@@ -4163,26 +4163,26 @@ but , ,
<literal>@verb{:--a:}</literal> <literal>--a</literal>
<literal>@verb{:a < & @ % " -- b:}</literal> <literal>a <
& @ % " -- b</literal>
<literal>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}</literal> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a a<!-- /@w -->
-<literal>@H{a}</literal> a''
-<literal>@H{--a}</literal> --a''
+<literal>@H{a}</literal> a̋
+<literal>@H{--a}</literal> --a̋
<literal>@dotaccent{a}</literal> ȧ
-<literal>@dotaccent{--a}</literal> --a.
+<literal>@dotaccent{--a}</literal> --ȧ
<literal>@ringaccent{a}</literal> å
-<literal>@ringaccent{--a}</literal> --a*
-<literal>@tieaccent{a}</literal> a[
-<literal>@tieaccent{--a}</literal> --a[
+<literal>@ringaccent{--a}</literal> --å
+<literal>@tieaccent{a}</literal> a͡
+<literal>@tieaccent{--a}</literal> --a͡
<literal>@u{a}</literal> ă
-<literal>@u{--a}</literal> --a(
-<literal>@ubaraccent{a}</literal> a_
-<literal>@ubaraccent{--a}</literal> --a_
+<literal>@u{--a}</literal> --ă
+<literal>@ubaraccent{a}</literal> a̲
+<literal>@ubaraccent{--a}</literal> --a̲
<literal>@udotaccent{a}</literal> ạ
-<literal>@udotaccent{--a}</literal> .--a
+<literal>@udotaccent{--a}</literal> --ạ
<literal>@v{a}</literal> ǎ
-<literal>@v{--a}</literal> --a<
+<literal>@v{--a}</literal> --ǎ
<literal>@,{c}</literal> ç
-<literal>@,{--c}</literal> --c,
+<literal>@,{--c}</literal> --ç
<literal>@ogonek{a}</literal> ą
-<literal>@ogonek{--a}</literal> --a;
+<literal>@ogonek{--a}</literal> --ą
<literal>a@sup{h}@sub{l}</literal>
a<superscript>h</superscript><subscript>l</subscript>
<literal>@footnote{in footnote}</literal> <footnote><para>in
footnote</para></footnote>
<literal>@footnote{in footnote2}</literal> <footnote><para>in
footnote2</para></footnote>
@@ -4218,9 +4218,9 @@ After clickstyle ⇒
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
</mathphrase></informalequation><screen>
-</screen><informalequation><mathphrase>ü Ü ñ â é
ō ì é i j Ē`
-ł Ć, Ć, ç a'' ȧ å a[
-ă a_ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
+</screen><informalequation><mathphrase>ü Ü ñ â é
ō ì é i j Ḕ
+ł Ḉ Ḉ ç a̋ ȧ å a͡
+ă a̲ ạ ǎ ą
a<superscript>h</superscript><subscript>l</subscript>
     ! ? . @ } {
a sunny day
@@ -4663,17 +4663,17 @@ aaa</literallayout></textobject></inlinemediaobject>
Somehow invalid use of @,:
-@, ,
+@, ̧
-@,@"u ,ü
+@,@"u ̧ü
Invalid use of @':
-@' '
+@' ́
-@'@"u 'ü
+@'@"u ́ü
<!-- only i or j as arg -->
@dotless{truc} truc
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Common.pm (@variable_string_settables), tp/Texinfo/Convert/Converter.pm (_format_numeric_entities_accent) (xml_accent, _xml_named_entities_numeric_fallback_accent) (xml_accents), tp/Texinfo/Convert/DocBook.pm (%defaults) (cmdname), doc/texinfo.texi (Other Customization Variables): re-add USE_NUMERIC_ENTITY with the meaning of using numeric entities in priority. In DocBook, use Texinfo::Convert::Converter xml_accents and set USE_NUMERIC_ENTITY, remove docbook_accent().,
Patrice Dumas <=