[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5892] uppercase arg to @sc in Docbook output, as with HTML
|
From: |
karl |
|
Subject: |
[5892] uppercase arg to @sc in Docbook output, as with HTML |
|
Date: |
Sun, 26 Oct 2014 18:19:53 +0000 |
Revision: 5892
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5892
Author: karl
Date: 2014-10-26 18:19:52 +0000 (Sun, 26 Oct 2014)
Log Message:
-----------
uppercase arg to @sc in Docbook output, as with HTML
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/TODO
trunk/tp/Texinfo/Convert/DocBook.pm
trunk/tp/Texinfo/Convert/HTML.pm
trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-10-26 18:16:44 UTC (rev 5891)
+++ trunk/ChangeLog 2014-10-26 18:19:52 UTC (rev 5892)
@@ -1,5 +1,13 @@
2014-10-26 Karl Berry <address@hidden>
+ * Texinfo/Convert/DocBook.pm (upper_case_style_commands),
+ (_convert): uppercase @sc argument. Suggestion from Arnold Robbins,
+ 11 Sep 2014 19:48:14.
+ * TODO,
+ * tests/layout/res_parser/formatting_docbook/formatting.xml:
+ update accordingly.
+ * Texinfo/Convert/HTML.pm: doc tweak.
+
* tp/maintain/template.pod,
* tp/maintain/regenerate_cmd_tests.sh,
* tp/maintain/regenerate_docstr.sh,
Modified: trunk/tp/TODO
===================================================================
--- trunk/tp/TODO 2014-10-26 18:16:44 UTC (rev 5891)
+++ trunk/tp/TODO 2014-10-26 18:19:52 UTC (rev 5892)
@@ -226,8 +226,6 @@
put <title> in <articleinfo>?
- how to handle @sc in docbook?
-
* in docbook, when there is only one section <article> should be better
than book. Maybe the best way to do that would be passing the
information that there is only one section to the functions formatting
Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2014-10-26 18:16:44 UTC (rev 5891)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2014-10-26 18:19:52 UTC (rev 5892)
@@ -1,6 +1,6 @@
# DocBook.pm: output tree as DocBook.
#
-# Copyright 2011, 2012 Free Software Foundation, Inc.
+# Copyright 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -113,6 +113,11 @@
'samp' => 1,
);
+# FIXME allow customization? (as in HTML)
+my %upper_case_style_commands = (
+ 'sc' => 1,
+);
+
my @inline_elements = ('emphasis', 'abbrev', 'acronym', 'link',
'inlinemediaobject', 'firstterm', 'footnote', 'replaceable', 'wordasword');
my %inline_elements;
@@ -166,6 +171,8 @@
}
if ($quoted_style_commands{$command}) {
$style_commands_formatting{$command}->{'quote'} = 1;
+ } elsif ($upper_case_style_commands{$command}) {
+ $style_commands_formatting{$command}->{'upper_case'} = 1;
}
}
@@ -746,6 +753,8 @@
if (defined($formatting->{'quote'})) {
$result = $self->get_conf('OPEN_QUOTE_SYMBOL') . $result
. $self->get_conf('CLOSE_QUOTE_SYMBOL');
+ } elsif (defined($formatting->{'upper_case'})) {
+ $result = uc($result);
}
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
if (defined($in_monospace_not_normal));
Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm 2014-10-26 18:16:44 UTC (rev 5891)
+++ trunk/tp/Texinfo/Convert/HTML.pm 2014-10-26 18:19:52 UTC (rev 5892)
@@ -101,7 +101,7 @@
my %pre_class_types;
-# FIXME allow customization?
+# FIXME allow customization? (also in DocBook)
my %upper_case_commands = ( 'sc' => 1 );
sub in_math($)
Modified: trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
2014-10-26 18:16:44 UTC (rev 5891)
+++ trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
2014-10-26 18:19:52 UTC (rev 5892)
@@ -160,7 +160,7 @@
<literal>@option{--a}</literal> <option>--a</option>
<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
-<literal>@sc{--a}</literal> –a
+<literal>@sc{--a}</literal> –A
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
<literal>@t{--a}</literal> <literal>--a</literal>
<literal>@sansserif{--a}</literal> –a
@@ -657,7 +657,7 @@
<literal>@option{--a}</literal> <option>--a</option>
<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
-<literal>@sc{--a}</literal> –a
+<literal>@sc{--a}</literal> –A
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
<literal>@t{--a}</literal> <literal>--a</literal>
<literal>@sansserif{--a}</literal> –a
@@ -1155,7 +1155,7 @@
<literal>@option{--a}</literal> <option>--a</option>
<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
-<literal>@sc{--a}</literal> –a
+<literal>@sc{--a}</literal> –A
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
<literal>@t{--a}</literal> <literal>--a</literal>
<literal>@sansserif{--a}</literal> –a
@@ -1654,7 +1654,7 @@
<literal>@option{--a}</literal> <option>--a</option>
<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
-<literal>@sc{--a}</literal> –a
+<literal>@sc{--a}</literal> –A
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
<literal>@t{--a}</literal> <literal>--a</literal>
<literal>@sansserif{--a}</literal> –a
@@ -2152,7 +2152,7 @@
<literal>@option{--a}</literal> <option>--a</option>
<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
-<literal>@sc{--a}</literal> –a
+<literal>@sc{--a}</literal> –A
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
<literal>@t{--a}</literal> <literal>--a</literal>
<literal>@sansserif{--a}</literal> –a
@@ -2645,7 +2645,7 @@
<literal>@option{--a}</literal> <option>--a</option>
<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
-<literal>@sc{--a}</literal> --a
+<literal>@sc{--a}</literal> --A
<literal>@strong{--a}</literal> <emphasis role="bold">--a</emphasis>
<literal>@t{--a}</literal> <literal>--a</literal>
<literal>@sansserif{--a}</literal> –a
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5892] uppercase arg to @sc in Docbook output, as with HTML,
karl <=