[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5896] * Texinfo/Convert/DocBook.pm: also upper-case accented co
From: |
Patrice Dumas |
Subject: |
[5896] * Texinfo/Convert/DocBook.pm: also upper-case accented commands |
Date: |
Tue, 28 Oct 2014 08:32:29 +0000 |
Revision: 5896
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5896
Author: pertusus
Date: 2014-10-28 08:32:28 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
* Texinfo/Convert/DocBook.pm: also upper-case accented commands
when in the 'upper_case' context.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/DocBook.pm
trunk/tp/t/results/coverage_braces/nested_in_sc.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-10-27 08:43:39 UTC (rev 5895)
+++ trunk/ChangeLog 2014-10-28 08:32:28 UTC (rev 5896)
@@ -1,3 +1,8 @@
+2014-10-28 Patrice Dumas <address@hidden>
+
+ * Texinfo/Convert/DocBook.pm: also upper-case accented commands
+ when in the 'upper_case' context.
+
2014-10-27 Patrice Dumas <address@hidden>
* Texinfo/Convert/DocBook.pm (upper_case_style_commands): use
Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2014-10-27 08:43:39 UTC (rev 5895)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2014-10-28 08:32:28 UTC (rev 5896)
@@ -515,6 +515,10 @@
and $root->{'extra'}
and defined($root->{'extra'}->{'clickstyle'})) {
$command = $root->{'extra'}->{'clickstyle'};
+ } elsif ($self->{'document_context'}->[-1]->{'upper_case'}->[-1]
+ and $Texinfo::Common::letter_no_arg_commands{$root->{'cmdname'}}
+ and
$Texinfo::Common::letter_no_arg_commands{uc($root->{'cmdname'})}) {
+ $command = uc($root->{'cmdname'})
} else {
$command = $root->{'cmdname'};
}
@@ -527,7 +531,8 @@
} elsif ($root->{'cmdname'} eq 'today') {
return $self->_convert(Texinfo::Common::expand_today($self));
} elsif ($Texinfo::Common::accent_commands{$root->{'cmdname'}}) {
- return $self->convert_accents($root, \&docbook_accent);
+ return $self->convert_accents($root, \&docbook_accent,
+ $self->{'document_context'}->[-1]->{'upper_case'}->[-1]);
} elsif ($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx'
or $root->{'cmdname'} eq 'headitem' or $root->{'cmdname'} eq
'tab') {
if ($root->{'cmdname'} eq 'item'
Modified: trunk/tp/t/results/coverage_braces/nested_in_sc.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/nested_in_sc.pl 2014-10-27 08:43:39 UTC
(rev 5895)
+++ trunk/tp/t/results/coverage_braces/nested_in_sc.pl 2014-10-28 08:32:28 UTC
(rev 5896)
@@ -307,7 +307,7 @@
-$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>';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5896] * Texinfo/Convert/DocBook.pm: also upper-case accented commands,
Patrice Dumas <=