my $section_counter = 0;
foreach my $section ( $chapter->findnodes('section') ) {
++$section_counter;
+ $section->setAttribute( 'sectprefix', $section_counter );
my $section_id = $section->getAttribute('id');
unless ($section_id) { # synthesise missing id
section_id => $section_counter,
section_title => $section_title
};
+
+ # 2022/07/07 jgh: added loop for sections under sections, which are resulting from the .subsection macro
+ # Add a "level" attribute to these nodes
+ ## Iterate over each subsection
+ my $subsec_counter = 0;
+ foreach my $subsection ( $section->findnodes('section') ) {
+ ++$subsec_counter;
+
+ $subsection->setAttribute( 'level', "2" );
+ $subsection->setAttribute( 'sectprefix', sprintf("%d.%d", $section_counter, $subsec_counter) );
+
+ my $subsec_id = $subsection->getAttribute('id');
+ unless ($subsec_id) { # synthesise missing id
+ $subsec_id = sprintf( 'section_noid_%04d_%04d_%04d', $chapter_counter, $section_counter, $subsec_counter );
+ $subsection->setAttribute( 'id', $subsec_id );
+ }
+ my $subsec_title = $subsection->findvalue('title');
+
+ $index{$subsec_id} = {
+ chapter_id => $chapter_counter,
+ chapter_title => $chapter_title,
+ section_id => $subsec_counter,
+ section_title => $subsec_title
+ };
+ }
}
}
## Build indexes as new chapters
## Replace all of the xrefs in the XML
foreach my $xref ( $xml->findnodes('//xref') ) {
my $linkend = $xref->getAttribute('linkend');
+
if ( exists $index{$linkend} ) {
- $xref->setAttribute( 'chapter_id', $index{$linkend}{'chapter_id'} );
+ $xref->setAttribute( 'chapter_id', $index{$linkend}{'chapter_id'} ) if ( $index{$linkend}{'chapter_id'} );
$xref->setAttribute( 'chapter_title', $index{$linkend}{'chapter_title'} );
- $xref->setAttribute( 'section_id', $index{$linkend}{'section_id'} ) if ( $index{$linkend}{'section_id'} );
+ $xref->setAttribute( 'section_id', $index{$linkend}{'section_id'} ) if ( $index{$linkend}{'section_id'} );
$xref->setAttribute( 'section_title', $index{$linkend}{'section_title'} )
if ( $index{$linkend}{'section_title'} );
$xref->setAttribute( 'url',
my ( $xml, $prepend_chapter, $xref ) = @_;
my $index_hash = {};
+ my $seealso_hash = {};
my $current_id;
- foreach my $node ( $xml->findnodes('//section | //chapter | //indexterm') ) {
+ my $verterm_counter = 0;
+
+ foreach my $node ( $xml->findnodes('//section | //chapter | //varlistentry | //indexterm') ) {
if ( $node->nodeName eq 'indexterm' ) {
my $role = $node->getAttribute('role') || 'concept';
my $primary = $node->findvalue('child::primary');
next unless ( $primary || $secondary ); # skip blank entries for now...
- if ( $see ) {
- # not perfect; the whole line ends up bold
- if ( $secondary ) {
- $secondary .= ' see ' . $see;
- } else {
- $primary .= ' see ' . $see;
- }
- } elsif ( $see_also ) {
- if ( $secondary ) {
- $secondary .= ' see also ' . $see_also;
- } else {
- $primary .= ' see also ' . $see_also;
- }
+ $index_hash->{$role}{$first}{$primary}{$secondary} ||= [];
+ if ( $see || $see_also ) {
+ # The scalar value being written here assumes only one seealso on an indeed term
+ # It would be nice to have the $see displayed in bold rather than in quotes
+ $seealso_hash->{$role}{$first}{$primary}{$secondary} = 'see "' . $see .'"' if ($see);
+ $seealso_hash->{$role}{$first}{$primary}{$secondary} = 'see also "' . $see_also .'"' if ($see_also);
}
- $index_hash->{$role}{$first}{$primary}{$secondary} ||= [];
- next if ( $see || $see_also );
+ else {
+ push @{ $index_hash->{$role}{$first}{$primary}{$secondary} }, $current_id;
+ }
+ }
+ elsif ( $node->nodeName eq 'varlistentry' ) {
-# JGH 2022/07/01
-# The $current_id being pushed here is presumably the section, given where the
-# hyperlink end up pointing to. For bug 2889 we'd like to have something more
-# precise; tha presumably requires an anchor at the indexed point?
+ foreach my $vitem ( $node->findnodes('listitem') ) {
- push @{ $index_hash->{$role}{$first}{$primary}{$secondary} }, $current_id;
- }
+ # Add an anchorname xml attribute.
+ # chapter.xsl spots this and places a "<a id="{@anchorname}"> </a>"
+
+ my $anchorname = sprintf("vi%d", $verterm_counter++);
+ $vitem->setAttribute( 'anchorname', $anchorname );
+ $current_id = $anchorname;
+
+ # Set the latest indexable id to be picked up by the next indexterm,
+ # which should be in the content of the listitem
+
+ my ($chapter_title, $sec_id, $sec_title);
+
+ foreach my $chap ( $node->findnodes('ancestor::chapter') ) {
+ $chapter_title = $chap->findvalue('title');
+ }
+ next unless ($chapter_title);
+
+ # Search upward to find a subsection or section id & title
+ foreach my $ssec ( $node->findnodes("ancestor::section[\@level='2']") ) {
+ $sec_id = $ssec->getAttribute('id');
+ $sec_title = $ssec->findvalue('title');
+ last;
+ }
+ if (!defined($sec_id)) {
+ foreach my $sec ( $node->findnodes('ancestor::section') ) {
+ $sec_id = $sec->getAttribute('id');
+ $sec_title = $sec->findvalue('title');
+ last;
+ }
+ }
+
+ $xref->{$anchorname}{'chapter_title'} = $chapter_title;
+ $xref->{$anchorname}{'section_id'} = $anchorname;
+ $xref->{$anchorname}{'section_title'} = $sec_title if ($sec_title);
+ }
+ }
else {
$current_id = $node->getAttribute('id');
}
$slist->appendChild($sentry)->appendTextChild( 'term', $secondary );
$sentry->appendChild($sitem)->appendChild($para);
}
+
+ my $seealso = $seealso_hash->{$role}{$first}{$primary}{$secondary};
+ $para->appendText($seealso) if ($seealso);
+
my $count = 0;
foreach my $ref ( @{ $index_hash->{$role}{$first}{$primary}{$secondary} } ) {
$para->appendText(', ')
git://git.exim.org / exim-website.git / blobdiff