texinfo util/texinfo.dtd tp/Texinfo/Convert/XML...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/12/15 18:19:17

Modified files:
        util           : texinfo.dtd 
        tp/Texinfo/Convert: XML.pm 
        tp/t/results/converters_tests: 
                                       printindex_merged_indices_code_style.pl 

Log message:
        Add merged indices information in index entries in XML.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texinfo.dtd?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: util/texinfo.dtd
===================================================================
RCS file: /sources/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- util/texinfo.dtd    10 Sep 2012 19:32:52 -0000      1.33
+++ util/texinfo.dtd    15 Dec 2012 18:19:16 -0000      1.34
@@ -1,4 +1,4 @@
-<!-- $Id: texinfo.dtd,v 1.33 2012/09/10 19:32:52 pertusus Exp $
+<!-- $Id: texinfo.dtd,v 1.34 2012/12/15 18:19:16 pertusus Exp $
   Document Type Definition for Texinfo XML output (the '-'-xml option).
 
   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@@ -173,6 +173,7 @@
 <!ENTITY % onoff "on|off">
 <!ENTITY % spacetype "spc|tab|nl">
 <!ENTITY % topbottom "top|bottom">
+<!ENTITY % zeroone "0|1">
 
 <!-- ubiquitous attribute -->
 <!ENTITY % spacesattr
@@ -1154,7 +1155,9 @@
           to        NMTOKEN #REQUIRED>
 <!ELEMENT indexterm (#PCDATA | %Inline.line;)*>
 <!ATTLIST indexterm
-          index CDATA #IMPLIED>
+          index         CDATA #IMPLIED
+          mergedindex   CDATA #IMPLIED
+          incode    (%zeroone;) #IMPLIED>
 <!ELEMENT indexcommand (indexterm)>
 <!ATTLIST indexcommand
           %indexcmdattr;

Index: tp/Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- tp/Texinfo/Convert/XML.pm   15 Dec 2012 17:12:57 -0000      1.89
+++ tp/Texinfo/Convert/XML.pm   15 Dec 2012 18:19:17 -0000      1.90
@@ -335,6 +335,9 @@
           or $in_code != 
$Texinfo::Common::index_names{$index_entry->{'index_name'}}->{'in_code'}) {
         $attribute .= " incode=\"$in_code\"";
       }
+      if 
($self->{'index_names'}->{$index_entry->{'index_name'}}->{'merged_in'}) {
+        $attribute .= " 
mergedindex=\"$self->{'index_names'}->{$index_entry->{'index_name'}}->{'merged_in'}\"";
+      }
     }
     my $result = "<indexterm 
index=\"$index_entry->{'index_name'}\"${attribute}>";
     push @{$self->{'document_context'}}, {'monospace' => [0]};

Index: tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/converters_tests/printindex_merged_indices_code_style.pl       
15 Dec 2012 17:12:57 -0000      1.1
+++ tp/t/results/converters_tests/printindex_merged_indices_code_style.pl       
15 Dec 2012 18:19:17 -0000      1.2
@@ -1090,9 +1090,9 @@
 
 <synindex from="vr" to="fn" line=" vr fn"></synindex>
 
-<cindex index="cp" spaces=" "><indexterm 
index="cp">c&textldquo;b</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" 
mergedindex="fn">c&textldquo;b</indexterm></cindex>
 
-<vindex index="vr" spaces=" "><indexterm index="vr" 
incode="0">v&textldquo;j</indexterm></vindex>
+<vindex index="vr" spaces=" "><indexterm index="vr" incode="0" 
mergedindex="fn">v&textldquo;j</indexterm></vindex>
 
 <findex index="fn" spaces=" "><indexterm index="fn">f``g</indexterm></findex>
 
@@ -1100,13 +1100,13 @@
 
 <synindex from="cdi" to="fn" line=" cdi fn"></synindex>
 
-<indexcommand command="cdiindex" index="cdi" spaces=" "><indexterm index="cdi" 
incode="0">cdi&textldquo;h</indexterm></indexcommand>
+<indexcommand command="cdiindex" index="cdi" spaces=" "><indexterm index="cdi" 
incode="0" mergedindex="fn">cdi&textldquo;h</indexterm></indexcommand>
 
 <defindex value="ddi" line=" ddi"></defindex>
 
 <syncodeindex from="ddi" to="cp" line=" ddi cp"></syncodeindex>
 
-<indexcommand command="ddiindex" index="ddi" spaces=" "><indexterm index="ddi" 
incode="1">ddi``g</indexterm></indexcommand>
+<indexcommand command="ddiindex" index="ddi" spaces=" "><indexterm index="ddi" 
incode="1" mergedindex="fn">ddi``g</indexterm></indexcommand>
 
 <printindex value="fn" line=" fn"></printindex>
 ';