texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Patrice Dumas
Date: Tue, 8 Nov 2022 03:29:27 -0500 (EST)

branch: master
commit 75907266e7e7c9859b9c19f139eaa96bbeecd6d9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 4 09:35:42 2022 +0100

    Add an entry with too many subentries to subentries sorting
---
 tp/t/09indices.t                          |   2 +
 tp/t/results/indices/sorted_subentries.pl | 324 ++++++++++++++++++++++++++----
 2 files changed, 285 insertions(+), 41 deletions(-)

diff --git a/tp/t/09indices.t b/tp/t/09indices.t
index c97caf6ae3..110d431974 100644
--- a/tp/t/09indices.t
+++ b/tp/t/09indices.t
@@ -578,6 +578,7 @@ in a reuglar para @sortas{foo}. @code{inside another 
@sortas{command}}.
 @cindex hhh @subentry k
 @cindex hhh @subentry 
 @cindex hhh 
+@cindex hhh @subentry jjj @subentry lll @subentry ppp
 
 @node chapter second
 @chapter second
@@ -587,6 +588,7 @@ in a reuglar para @sortas{foo}. @code{inside another 
@sortas{command}}.
 @cindex @kbd{hhh} @subentry @sc{jjj} @subentry @email{jjj,mymail}
 @cindex @subentry aa
 @cindex hhh @subentry jjj @subentry lll @sortas{A}
+@cindex hhh @subentry k @subentry nnn
 
 @printindex cp
 '],
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index eb5b452370..2843e06a24 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -495,6 +495,122 @@ $result_trees{'sorted_subentries'} = {
           },
           'type' => 'index_entry_command'
         },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => 'hhh'
+                }
+              ],
+              'extra' => {
+                'spaces_after_argument' => ' '
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'cindex',
+          'extra' => {
+            'index_entry' => {
+              'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
+              'in_code' => 0,
+              'index_at_command' => 'cindex',
+              'index_ignore_chars' => {},
+              'index_name' => 'cp',
+              'index_type_command' => 'cindex'
+            },
+            'spaces_before_argument' => ' ',
+            'subentry' => {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'jjj'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => ' '
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'subentry',
+              'extra' => {
+                'level' => 1,
+                'spaces_before_argument' => ' ',
+                'subentry' => {
+                  'args' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'lll'
+                        }
+                      ],
+                      'extra' => {
+                        'spaces_after_argument' => ' '
+                      },
+                      'type' => 'line_arg'
+                    }
+                  ],
+                  'cmdname' => 'subentry',
+                  'extra' => {
+                    'level' => 2,
+                    'spaces_before_argument' => ' ',
+                    'subentry' => {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'text' => 'ppp'
+                            }
+                          ],
+                          'extra' => {
+                            'spaces_after_argument' => '
+'
+                          },
+                          'type' => 'line_arg'
+                        }
+                      ],
+                      'cmdname' => 'subentry',
+                      'extra' => {
+                        'level' => 3,
+                        'spaces_before_argument' => ' '
+                      },
+                      'source_info' => {
+                        'file_name' => '',
+                        'line_nr' => 14,
+                        'macro' => ''
+                      }
+                    }
+                  },
+                  'source_info' => {
+                    'file_name' => '',
+                    'line_nr' => 14,
+                    'macro' => ''
+                  }
+                }
+              },
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 14,
+                'macro' => ''
+              }
+            }
+          },
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 14,
+            'macro' => ''
+          },
+          'type' => 'index_entry_command'
+        },
+        {},
+        {},
+        {},
         {
           'text' => '
 ',
@@ -544,7 +660,7 @@ $result_trees{'sorted_subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 15,
+        'line_nr' => 16,
         'macro' => ''
       }
     },
@@ -586,7 +702,7 @@ $result_trees{'sorted_subentries'} = {
               'entry_content' => [],
               'entry_element' => {},
               'entry_node' => {},
-              'entry_number' => 7,
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
@@ -634,21 +750,21 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 17,
+                    'line_nr' => 18,
                     'macro' => ''
                   }
                 }
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 17,
+                'line_nr' => 18,
                 'macro' => ''
               }
             }
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 17,
+            'line_nr' => 18,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -677,7 +793,7 @@ $result_trees{'sorted_subentries'} = {
               'entry_content' => [],
               'entry_element' => {},
               'entry_node' => {},
-              'entry_number' => 8,
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
@@ -688,7 +804,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 18,
+            'line_nr' => 19,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -711,7 +827,7 @@ $result_trees{'sorted_subentries'} = {
                   'cmdname' => 'samp',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 19,
+                    'line_nr' => 20,
                     'macro' => ''
                   }
                 }
@@ -729,7 +845,7 @@ $result_trees{'sorted_subentries'} = {
               'entry_content' => [],
               'entry_element' => {},
               'entry_node' => {},
-              'entry_number' => 9,
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
@@ -759,14 +875,14 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 19,
+                'line_nr' => 20,
                 'macro' => ''
               }
             }
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 19,
+            'line_nr' => 20,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -790,7 +906,7 @@ $result_trees{'sorted_subentries'} = {
                   'cmdname' => 'kbd',
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
+                    'line_nr' => 21,
                     'macro' => ''
                   }
                 }
@@ -808,7 +924,7 @@ $result_trees{'sorted_subentries'} = {
               'entry_content' => [],
               'entry_element' => {},
               'entry_node' => {},
-              'entry_number' => 10,
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
@@ -834,7 +950,7 @@ $result_trees{'sorted_subentries'} = {
                       'cmdname' => 'sc',
                       'source_info' => {
                         'file_name' => '',
-                        'line_nr' => 20,
+                        'line_nr' => 21,
                         'macro' => ''
                       }
                     }
@@ -875,7 +991,7 @@ $result_trees{'sorted_subentries'} = {
                           'cmdname' => 'email',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 20,
+                            'line_nr' => 21,
                             'macro' => ''
                           }
                         }
@@ -894,21 +1010,21 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 20,
+                    'line_nr' => 21,
                     'macro' => ''
                   }
                 }
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 20,
+                'line_nr' => 21,
                 'macro' => ''
               }
             }
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 20,
+            'line_nr' => 21,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -947,14 +1063,14 @@ $result_trees{'sorted_subentries'} = {
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 21,
+                'line_nr' => 22,
                 'macro' => ''
               }
             }
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 21,
+            'line_nr' => 22,
             'macro' => ''
           }
         },
@@ -980,7 +1096,7 @@ $result_trees{'sorted_subentries'} = {
               'entry_content' => [],
               'entry_element' => {},
               'entry_node' => {},
-              'entry_number' => 11,
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
@@ -1031,7 +1147,7 @@ $result_trees{'sorted_subentries'} = {
                           'cmdname' => 'sortas',
                           'source_info' => {
                             'file_name' => '',
-                            'line_nr' => 22,
+                            'line_nr' => 23,
                             'macro' => ''
                           }
                         }
@@ -1051,21 +1167,111 @@ $result_trees{'sorted_subentries'} = {
                   },
                   'source_info' => {
                     'file_name' => '',
-                    'line_nr' => 22,
+                    'line_nr' => 23,
                     'macro' => ''
                   }
                 }
               },
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 22,
+                'line_nr' => 23,
                 'macro' => ''
               }
             }
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 22,
+            'line_nr' => 23,
+            'macro' => ''
+          },
+          'type' => 'index_entry_command'
+        },
+        {},
+        {},
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'text' => 'hhh'
+                }
+              ],
+              'extra' => {
+                'spaces_after_argument' => ' '
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'cmdname' => 'cindex',
+          'extra' => {
+            'index_entry' => {
+              'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
+              'in_code' => 0,
+              'index_at_command' => 'cindex',
+              'index_ignore_chars' => {},
+              'index_name' => 'cp',
+              'index_type_command' => 'cindex'
+            },
+            'spaces_before_argument' => ' ',
+            'subentry' => {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'k'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => ' '
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'subentry',
+              'extra' => {
+                'level' => 1,
+                'spaces_before_argument' => ' ',
+                'subentry' => {
+                  'args' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'nnn'
+                        }
+                      ],
+                      'extra' => {
+                        'spaces_after_argument' => '
+'
+                      },
+                      'type' => 'line_arg'
+                    }
+                  ],
+                  'cmdname' => 'subentry',
+                  'extra' => {
+                    'level' => 2,
+                    'spaces_before_argument' => ' '
+                  },
+                  'source_info' => {
+                    'file_name' => '',
+                    'line_nr' => 24,
+                    'macro' => ''
+                  }
+                }
+              },
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 24,
+                'macro' => ''
+              }
+            }
+          },
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 24,
             'macro' => ''
           },
           'type' => 'index_entry_command'
@@ -1101,7 +1307,7 @@ $result_trees{'sorted_subentries'} = {
           },
           'source_info' => {
             'file_name' => '',
-            'line_nr' => 24,
+            'line_nr' => 26,
             'macro' => ''
           }
         }
@@ -1111,7 +1317,7 @@ $result_trees{'sorted_subentries'} = {
       },
       'source_info' => {
         'file_name' => '',
-        'line_nr' => 16,
+        'line_nr' => 17,
         'macro' => ''
       }
     }
@@ -1151,6 +1357,13 @@ 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'inde
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[14] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[15] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'sorted_subentries'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sorted_subentries'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'};
@@ -1181,6 +1394,12 @@ 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'inde
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[13] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[16] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'}{'extra'}{'subentry'};
 
 $result_texis{'sorted_subentries'} = '@node Top
 @top
@@ -1195,6 +1414,7 @@ $result_texis{'sorted_subentries'} = '@node Top
 @cindex hhh @subentry k
 @cindex hhh @subentry 
 @cindex hhh 
+@cindex hhh @subentry jjj @subentry lll @subentry ppp
 
 @node chapter second
 @chapter second
@@ -1204,6 +1424,7 @@ $result_texis{'sorted_subentries'} = '@node Top
 @cindex @kbd{hhh} @subentry @sc{jjj} @subentry @email{jjj,mymail}
 @cindex @subentry aa
 @cindex hhh @subentry jjj @subentry lll @sortas{A}
+@cindex hhh @subentry k @subentry nnn
 
 @printindex cp
 ';
@@ -1365,11 +1586,20 @@ $result_errors{'sorted_subentries'} = [
     'text' => '@subentry missing argument',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'no more than two levels of index subentry are allowed
+',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => '',
+    'text' => 'no more than two levels of index subentry are allowed',
+    'type' => 'error'
+  },
   {
     'error_line' => 'warning: @cindex missing argument
 ',
     'file_name' => '',
-    'line_nr' => 21,
+    'line_nr' => 22,
     'macro' => '',
     'text' => '@cindex missing argument',
     'type' => 'warning'
@@ -1399,8 +1629,10 @@ $result_indices_sort_strings{'sorted_subentries'} = {
     'hhh, jjj, A',
     'hhh, jjj, lll',
     'hhh, jjj, lll',
+    'hhh, jjj, lll, ppp',
     'hhh, JJJ, mymail',
     'hhh, k',
+    'hhh, k, nnn',
     'hhh jjj'
   ]
 };
@@ -1432,7 +1664,7 @@ File: ,  Node: chapter second,  Prev: chapter one,  Up: 
Top
 [index]
 * Menu:
 
-* hhh:                                   chapter one.           (line 5)
+* hhh:                                   chapter one.           (line 6)
 * hhh <1>:                               chapter second.        (line 6)
 * hhh, :                                 chapter one.           (line 6)
 * hhh, jjj:                              chapter one.           (line 6)
@@ -1440,8 +1672,10 @@ File: ,  Node: chapter second,  Prev: chapter one,  Up: 
Top
 * hhh, jjj, lll:                         chapter second.        (line 6)
 * hhh, jjj, lll <1>:                     chapter one.           (line 6)
 * hhh, jjj, lll <2>:                     chapter second.        (line 6)
+* hhh, jjj, lll, ppp:                    chapter one.           (line 6)
 * hhh, JJJ, mymail <jjj>:                chapter second.        (line 6)
 * hhh, k:                                chapter one.           (line 6)
+* hhh, k, nnn:                           chapter second.        (line 6)
 * hhh jjj:                               chapter one.           (line 6)
 
 
@@ -1481,7 +1715,7 @@ $result_converted{'plaintext'}->{'sorted_subentries'} = 
'1 one
 
 * Menu:
 
-* hhh:                                   chapter one.           (line 2)
+* hhh:                                   chapter one.           (line 3)
 * hhh <1>:                               chapter second.        (line 6)
 * hhh, :                                 chapter one.           (line 3)
 * hhh, jjj:                              chapter one.           (line 3)
@@ -1489,8 +1723,10 @@ $result_converted{'plaintext'}->{'sorted_subentries'} = 
'1 one
 * hhh, jjj, lll:                         chapter second.        (line 6)
 * hhh, jjj, lll <1>:                     chapter one.           (line 3)
 * hhh, jjj, lll <2>:                     chapter second.        (line 6)
+* hhh, jjj, lll, ppp:                    chapter one.           (line 3)
 * hhh, JJJ, mymail <jjj>:                chapter second.        (line 6)
 * hhh, k:                                chapter one.           (line 3)
+* hhh, k, nnn:                           chapter second.        (line 6)
 * hhh jjj:                               chapter one.           (line 3)
 
 ';
@@ -1534,6 +1770,7 @@ $result_converted{'html_text'}->{'sorted_subentries'} = 
'<div class="top-level-e
 <a class="index-entry-id" id="index-hhh-2"></a>
 <a class="index-entry-id" id="index-hhh-3"></a>
 <a class="index-entry-id" id="index-hhh-4"></a>
+<a class="index-entry-id" id="index-hhh-5"></a>
 
 <hr>
 </div>
@@ -1543,11 +1780,12 @@ $result_converted{'html_text'}->{'sorted_subentries'} = 
'<div class="top-level-e
  &nbsp; [<a href="#chapter-second" title="Index" rel="index">Index</a>]</p>
 </div>
 <h2 class="chapter" id="second">2 second</h2>
-<a class="index-entry-id" id="index-hhh-5"></a>
 <a class="index-entry-id" id="index-hhh-6"></a>
 <a class="index-entry-id" id="index-hhh-7"></a>
 <a class="index-entry-id" id="index-hhh-8"></a>
 <a class="index-entry-id" id="index-hhh-9"></a>
+<a class="index-entry-id" id="index-hhh-10"></a>
+<a class="index-entry-id" id="index-hhh-11"></a>
 
 <div class="printindex cp-printindex">
 <table class="cp-entries-printindex" border="0">
@@ -1555,15 +1793,17 @@ $result_converted{'html_text'}->{'sorted_subentries'} = 
'<div class="top-level-e
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="t_i_cp_letter-H">H</th><td></td><td></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a 
href="#index-hhh-4">hhh</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#chapter-one">chapter 
one</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-hhh-6">hhh</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#chapter-second">chapter 
second</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-hhh-7">hhh</a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#chapter-second">chapter 
second</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-3">hhh, 
</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-one">chapter one</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-1">hhh, 
jjj</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-one">chapter one</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a 
href="#index-hhh-7">&lsquo;<samp class="samp">hhh</samp>&rsquo;, 
jjj</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-second">chapter second</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-9">hhh, 
jjj, lll</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-second">chapter second</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a 
href="#index-hhh-8">&lsquo;<samp class="samp">hhh</samp>&rsquo;, 
jjj</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-second">chapter second</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-10">hhh, 
jjj, lll</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-second">chapter second</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hhh">hhh, jjj, 
lll</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-one">chapter one</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-5">hhh, 
jjj, lll</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-second">chapter second</a></td></tr>
-<tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-8"><kbd 
class="kbd">hhh</kbd>, <small class="sc">JJJ</small>, <a class="email" 
href="mailto:jjj";>mymail</a></a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#chapter-second">chapter 
second</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-6">hhh, 
jjj, lll</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-second">chapter second</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-5">hhh, 
jjj, lll, ppp</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-one">chapter one</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-9"><kbd 
class="kbd">hhh</kbd>, <small class="sc">JJJ</small>, <a class="email" 
href="mailto:jjj";>mymail</a></a>:</td><td>&nbsp;</td><td 
class="printindex-index-section"><a href="#chapter-second">chapter 
second</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-2">hhh, 
k</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-one">chapter one</a></td></tr>
+<tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-11">hhh, 
k, nnn</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-second">chapter second</a></td></tr>
 <tr><td></td><td class="printindex-index-entry"><a href="#index-hhh-jjj">hhh 
jjj</a>:</td><td>&nbsp;</td><td class="printindex-index-section"><a 
href="#chapter-one">chapter one</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 </table>
@@ -1600,16 +1840,18 @@ $result_converted{'xml'}->{'sorted_subentries'} = 
'<node name="Top" spaces=" "><
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="4">hhh</indexterm></cindex> <subentry spaces=" ">k</subentry>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="5">hhh</indexterm></cindex> <subentry> </subentry>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="6">hhh</indexterm></cindex> 
+<cindex index="cp" spaces=" "><indexterm index="cp" 
number="7">hhh</indexterm></cindex> <subentry spaces=" ">jjj 
</subentry><subentry spaces=" ">lll </subentry><subentry spaces=" 
">ppp</subentry>
 
 </chapter>
 <node name="chapter-second" spaces=" "><nodename>chapter 
second</nodename><nodeprev automatic="on">chapter one</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>second</sectiontitle>
-<cindex index="cp" spaces=" "><indexterm index="cp" 
number="7">hhh</indexterm></cindex> <subentry spaces=" ">jjj 
</subentry><subentry spaces=" ">lll</subentry>
-<cindex index="cp" spaces=" "><indexterm index="cp" 
number="8">hhh</indexterm></cindex> 
-<cindex index="cp" spaces=" "><indexterm index="cp" 
number="9"><samp>hhh</samp></indexterm></cindex> <subentry spaces=" 
">jjj</subentry>
-<cindex index="cp" spaces=" "><indexterm index="cp" 
number="10"><kbd>hhh</kbd></indexterm></cindex> <subentry spaces=" 
"><sc>jjj</sc> </subentry><subentry spaces=" 
"><email><emailaddress>jjj</emailaddress><emailname>mymail</emailname></email></subentry>
+<cindex index="cp" spaces=" "><indexterm index="cp" 
number="8">hhh</indexterm></cindex> <subentry spaces=" ">jjj 
</subentry><subentry spaces=" ">lll</subentry>
+<cindex index="cp" spaces=" "><indexterm index="cp" 
number="9">hhh</indexterm></cindex> 
+<cindex index="cp" spaces=" "><indexterm index="cp" 
number="10"><samp>hhh</samp></indexterm></cindex> <subentry spaces=" 
">jjj</subentry>
+<cindex index="cp" spaces=" "><indexterm index="cp" 
number="11"><kbd>hhh</kbd></indexterm></cindex> <subentry spaces=" 
"><sc>jjj</sc> </subentry><subentry spaces=" 
"><email><emailaddress>jjj</emailaddress><emailname>mymail</emailname></email></subentry>
 <cindex spaces=" "></cindex><subentry spaces=" ">aa</subentry>
-<cindex index="cp" spaces=" "><indexterm index="cp" 
number="11">hhh</indexterm></cindex> <subentry spaces=" ">jjj 
</subentry><subentry spaces=" ">lll <sortas>A</sortas></subentry>
+<cindex index="cp" spaces=" "><indexterm index="cp" 
number="12">hhh</indexterm></cindex> <subentry spaces=" ">jjj 
</subentry><subentry spaces=" ">lll <sortas>A</sortas></subentry>
+<cindex index="cp" spaces=" "><indexterm index="cp" 
number="13">hhh</indexterm></cindex> <subentry spaces=" ">k 
</subentry><subentry spaces=" ">nnn</subentry>
 
 <printindex spaces=" " value="cp" line="cp"></printindex>
 </chapter>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]