X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Flilypond-texi2html.init;h=70a86344f15a486b8e1c4f852bccf0ae97e512b1;hb=HEAD;hp=376e201a8cd494564589aaa6977762017dd42ca3;hpb=ad2ea33b190544264f0b7ace43a24fa4e1b80e59;p=lilypond.git

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 376e201a8c..70a86344f1 100644
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -13,7 +13,7 @@
 ### -) All @unnumbered* sections are placed into the same file
 ###    (implemented by split_at_numbered_sections)
 ### -) Use our custom CSS file, with IE-specific fixes in another CSS file,
-###    impelmented by lilypond_css_lines
+###    implemented by lilypond_css_lines
 ### -) TOC (folded, with the current page highlighted) in an overflown <div>
 ###    is added to every page; implemented by:
 ###           lilypond_print_element_header -- building of the TOC
@@ -55,6 +55,8 @@
 ###           makeinfo_like_foot_line_and_ref
 ###           makeinfo_like_foot_lines
 ###           makeinfo_like_paragraph
+### -) In tables, don't wrap <p> around the contents. Implemented in
+###           makeinfo_like_paragraph
 ###
 ###
 ### Useful helper functions:
@@ -63,8 +65,25 @@
 ###    non-standard chars replaced by _xxxx (ascii char code) and forced to
 ###    start with a letter by prepending t_g if necessary)
 
+package main;
+$original_normalise_node = \&normalise_node;
+
+sub t2h_default_normalise_node($)
+{
+    my $text = shift;
+    $original_normalise_node->($text);
+}
+
+*normalise_node = sub($)
+{
+    my $text = shift;
+    return &$Texi2HTML::Config::normalise_node($text);
+};
 
 package Texi2HTML::Config;
+##$normalise_node = \&t2h_default_normalise_node;
+$normalise_node = \&lilypond_normalise_node;
+
 
 use utf8;
 use Encode qw(decode);
@@ -74,14 +93,14 @@ use Encode qw(decode);
 #############################################################################
 
 my $LY_LANGUAGES = {};
-$LY_LANGUAGES->{'fr'} = {
-    'Back to Documentation Index' => 'Retour à l\'accueil de la documentation',
-    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>Remerciements à ${webdev_link} pour l\'hébergement de ${lily_site}.',
+$LY_LANGUAGES->{'ca'} = {
+    'Back to Documentation Index' => 'Torna a l\'índex de la documentació',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>Agraïm a ${webdev_link} l\'allotjament de ${lily_site}.',
 };
 
-$LY_LANGUAGES->{'es'} = {
-    'Back to Documentation Index' => 'Volver al índice de la documentación',
-    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>Agradecemos a ${webdev_link} el alojamiento de ${lily_site}.',
+$LY_LANGUAGES->{'cs'} = {
+    'Back to Documentation Index' => '',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '',
 };
 
 $LY_LANGUAGES->{'de'} = {
@@ -89,22 +108,180 @@ $LY_LANGUAGES->{'de'} = {
     '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '',
 };
 
-$LY_LANGUAGES->{'ja'} = {
-    'Back to Documentation Index' => 'ドキュメント インデックスに戻る',
-    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '',
+$LY_LANGUAGES->{'es'} = {
+    'Back to Documentation Index' => 'Volver al índice de la documentación',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>Agradecemos a ${webdev_link} el alojamiento de ${lily_site}.',
+};
+
+$LY_LANGUAGES->{'fr'} = {
+    'Back to Documentation Index' => 'Retour à l\'accueil de la documentation',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>Remerciements à ${webdev_link} pour l\'hébergement de ${lily_site}.',
 };
 
+
 $LY_LANGUAGES->{'hu'} = {
     'Back to Documentation Index' => 'Vissza a dokumentációk jegyzékéhez',
-    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => 'Köszönet a ${webdev_link} részére a ${lily_site} tárhelyért.',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>Köszönet a ${webdev_link} részére a ${lily_site} tárhelyért.',
 };
 
 $LY_LANGUAGES->{'it'} = {
     'Back to Documentation Index' => 'Torna all\'indice della documentazione',
-    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => 'Grazie a ${webdev_link} per l\'hosting di ${lily_site}.',
+};
+
+$LY_LANGUAGES->{'ja'} = {
+    'Back to Documentation Index' => 'ドキュメント インデックスに戻る',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>${lily_site} をホスティングしてくれている ${webdev_link} に感謝します。',
+};
+
+
+$LY_LANGUAGES->{'nl'} = {
+    'Back to Documentation Index' => 'Terug naar de Documentatieindex',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>Met dank aan ${webdev_link} voor het hosten van ${lily_site}.',
+};
+
+$LY_LANGUAGES->{'zh'} = {
+    'Back to Documentation Index' => '回到文档索引',
+    '<p>Thanks to ${webdev_link} for hosting ${lily_site}.' => '<p>非常感谢 ${webdev_link} 提供 ${lily_site} 的主机空间。',
 };
 
 # FIXME: request the translations below then send them to texi2html/texinfo devs
+
+$LANGUAGES->{'ca'} = {
+                       '  The buttons in the navigation panels have the following meaning:' => '  Els botons als panells de navegació tenen els significats següents:',
+                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '  on l\'@strong{exemple} suposa que la posició actual és a la @strong{ Subsubsecció U-Dos-Tres } d\'un document a l\'estructura següent:',
+                       ' Up ' => ' Amunt ',
+                       '(outside of any element)' => '(fora de qualsevol element)',
+                       '(outside of any node)' => '(fora de qualsevol node)',
+                       '@b{{quotation_arg}:} ' => '@b{{quotation_arg}:} ',
+                       '@cite{{book}}' => '@cite{{book}}',
+                       '@{No value for `{value}\'@}' => '@{Cap valor per a `{value}\'@}',
+                       'About' => 'Quant a',
+                       'About (help)' => 'Quant a (ajuda)',
+                       'About This Document' => 'Quant a aquest document',
+                       'April' => 'Abril',
+                       'August' => 'Agost',
+                       'Back' => 'Enrere',
+                       'Back section in previous file' => 'Secció enrere al fitxer previ',
+                       'Beginning of this chapter or previous chapter' => 'Inici d\'aquest capítol o capítul previ',
+                       'Button' => 'Botó',
+                       'Contents' => 'Continguts',
+                       'Cover (top) of document' => 'Portada (part superior) del document',
+                       'Current' => 'Actual',
+                       'Current Position' => 'Posició actual',
+                       'Current section' => 'Secció actual',
+                       'December' => 'Desembre',
+                       'FastBack' => 'Enrere ràpid',
+                       'FastForward' => 'Endavant ràpid',
+                       'February' => 'Febrer',
+                       'First' => 'Primera',
+                       'First section in reading order' => 'Primera secció en ordre de lectura',
+                       'Following' => 'Següent',
+                       'Following node' => 'Node següent',
+                       'Footnotes' => 'Notes a peu de pàgina',
+                       'Forward' => 'Endavant',
+                       'Forward section in next file' => 'Secció següent al fitxer següent',
+                       'From 1.2.3 go to' => 'De 1.2.3 ves a',
+                       'Go to' => 'Ves a',
+                       'Index' => 'Índex',
+                       'Index Entry' => 'Entrada de l\'índex',
+                       'January' => 'Gener',
+                       'July' => 'Juliol',
+                       'Jump to' => 'Salta a',
+                       'June' => 'June',
+                       'Last' => 'Última',
+                       'Last section in reading order' => 'Última secció en ordre de lectura',
+                       'March' => 'Març',
+                       'May' => 'Maig',
+                       'Menu:' => 'Menú',
+                       'Name' => 'Nom',
+                       'Next' => 'Següent',
+                       'Next chapter' => 'Capítol segúent',
+                       'Next file' => 'Fitxer següent',
+                       'Next node' => 'Node següent',
+                       'Next section in reading order' => 'Secció següent en ordre de lectura',
+                       'Next section on same level' => 'Secció següent al mateix nivell',
+                       'NextFile' => 'Fitxer següent',
+                       'Node following in node reading order' => 'Node següent en ordre de lectura',
+                       'Node up' => 'Node amunt',
+                       'NodeNext' => 'Node següent',
+                       'NodePrev' => 'Node anterior',
+                       'NodeUp' => 'Node superior',
+                       'November' => 'Novembre',
+                       'October' => 'Octubre',
+                       'Overview' => 'Panoràmica',
+                       'Prev' => 'Previ',
+                       'PrevFile' => 'Fitxer previ',
+                       'Previous' => 'Anterior',
+                       'Previous file' => 'Fitxer anterior',
+                       'Previous node' => 'Node anterior',
+                       'Previous section in reading order' => 'Secció anterior en ordre de lectura',
+                       'Previous section on same level' => 'Secció prèvia al mateix nivell',
+                       'Section' => 'Secció',
+                       'Section One' => 'Secció u',
+                       'See ' => 'Vegeu',
+                       'See @cite{{book}}' => 'Vegeu @cite{{book}}',
+                       'See section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => 'Vegeu la secció  `@asis{}`{section_name}\'@asis{}\' a @cite{{book}}',
+                       'See section `{section}\' in @cite{{book}}' => 'Vegeu la secció `{section}\' a @cite{{book}}',
+                       'See section {reference_name}' => 'Vegeu la secció {reference_name}',
+                       'See {node_file_href}' => 'Vegeu {node_file_href}',
+                       'See {node_file_href} @cite{{book}}' => 'Vegeu {node_file_href} @cite{{book}}',
+                       'See {node_file_href} section `{section}\' in @cite{{book}}' => 'Vegeu {node_file_href} a la secció `{section}\' a @cite{{book}}',
+                       'See {reference_name}' => 'Vegeu {reference_name}',
+                       'See {ref}' => 'Vegeu {ref}',
+                       'See {title_ref}' => 'Vegeu {title_ref}',
+                       'September' => 'Setembre',
+                       'Short Table of Contents' => 'Índex brevu',
+                       'Short table of contents' => 'Índex breu',
+                       'Subsection One-Four' => 'Subsecció U-Quatre',
+                       'Subsection One-One' => 'Subsecció U-U',
+                       'Subsection One-Three' => 'Subsecció U-Tres',
+                       'Subsection One-Two' => 'Subsecció U-Dos',
+                       'Subsubsection One-Two-Four' => 'Subsubseció U-Dos-Quatre',
+                       'Subsubsection One-Two-One' => 'Subsubsecció U-Dos-U',
+                       'Subsubsection One-Two-Three' => 'Subsubsecció U-Dos-Tres',
+                       'Subsubsection One-Two-Two' => 'Subsubsecció U-Dos-Dos',
+                       'T2H_today' => '%s, %d %d',
+                       'Table of Contents' => 'Índex',
+                       'Table of contents' => 'Índex',
+                       'The node you are looking for is at {href}.' => 'El node que esteu buscant és {href}',
+                       'This' => 'Aquest',
+                       'This document was generated on @i{{date}} using @uref{{program_homepage}, @i{{program}}}.' => 'Aquest document s\'ha generat el @i{{date}} amb @uref{{program_homepage}, @i{{program}}}.',
+                       'This document was generated using @uref{{program_homepage}, @emph{{program}}}.' => 'Aquest document sha generat amb @uref{{program_homepage}, @emph{{program}}}.',
+                       'Top' => 'Inici',
+                       'Untitled Document' => 'Document sense títol',
+                       'Up' => 'Amunt',
+                       'Up node' => 'Node superior',
+                       'Up section' => 'Secció supeior',
+                       'current' => 'actual',
+                       'on @emph{{date}}' => 'el @emph{{date}}',
+                       'section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => 'secció `@asis{}`{section_name}\'@asis{}\' a @cite{{book}}',
+                       'section `{section}\' in @cite{{book}}' => 'secció `{section}\' a @cite{{book}}',
+                       'see ' => 'vegeu ',
+                       'see @cite{{book}}' => 'vegeu @cite{{book}}',
+                       'see section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => 'vegeu la secció `@asis{}`{section_name}\'@asis{}\' a @cite{{book}}',
+                       'see section `{section}\' in @cite{{book}}' => 'vegeu la secció `{section}\' a @cite{{book}}',
+                       'see section {reference_name}' => 'vegeu la secció {reference_name}',
+                       'see {node_file_href}' => 'vegeu {node_file_href}',
+                       'see {node_file_href} @cite{{book}}' => 'vegeu {node_file_href} @cite{{book}}',
+                       'see {node_file_href} section `{section}\' in @cite{{book}}' => 'vegeu {node_file_href} a la secció `{section}\' a @cite{{book}}',
+                       'see {reference_name}' => 'vegeu {reference_name}',
+                       'see {ref}' => 'vegeu {ref}',
+                       'see {title_ref}' => 'vegeu {title_ref}',
+                       '{acronym_like} ({explanation})' => '{acronym_like} ({explanation})',
+                       '{name} of {class}' => '{name} de {class}',
+                       '{name} on {class}' => '{name} a {class}',
+                       '{node_file_href}' => '{node_file_href}',
+                       '{node_file_href} @cite{{book}}' => '{node_file_href} @cite{{book}}',
+                       '{node_file_href} section `{section}\' in @cite{{book}}' => '{node_file_href} a la secció `{section}\' a @cite{{book}}',
+                       '{reference_name}' => '{reference_name}',
+                       '{ref}' => '{ref}',
+                       '{style} {number}' => '{style} {number}',
+                       '{style}: {caption_first_line}' => '{style}: {caption_first_line}',
+                       '{style}: {shortcaption_first_line}' => '{style}: {shortcaption_first_line}',
+                       '{title_ref}' => '{title_ref}'
+                     };
+
 $LANGUAGES->{'it'} = {
                        '  The buttons in the navigation panels have the following meaning:' => '  I bottoni nei pannelli di navigazione hanno il seguente significato:',
                        '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '  dove @strong{ Esempio } assume che l\'attuale posizione è alla @strong{ Sottosottosezione Uno-Due-Tre } di un documento che ha la seguente struttura:',
@@ -389,45 +566,180 @@ $LANGUAGES->{'ja'} = {
                        'About This Document' => 'このドキュメントについて',
                        'April' => '4 月',
                        'August' => '8 月',
-                       'Back' => 'Back',
-                       'Back section in previous file' => '',
+                       'Back' => '戻る',
+                       'Back section in previous file' => '前のファイルのセクションに戻る',
                        'Beginning of this chapter or previous chapter' => 'この章あるいは前の章の先頭',
                        'Button' => 'ボタン',
                        'Contents' => '目次',
                        'Cover (top) of document' => 'ドキュメントの表紙 (先頭)',
-                       'Current' => '',
+                       'Current' => '現在の',
                        'Current Position' => '現在の位置',
-                       'Current section' => '',
+                       'Current section' => '現在のセクション',
                        'December' => '12 月',
-                       'FastBack' => '',
-                       'FastForward' => '',
+                       'FastBack' => '大きく戻る',
+                       'FastForward' => '大きく進む',
                        'February' => '2 月',
-                       'First' => '',
-                       'First section in reading order' => '',
-                       'Following' => '',
-                       'Following node' => '',
+                       'First' => '最初',
+                       'First section in reading order' => '最初のセクション',
+                       'Following' => '次',
+                       'Following node' => '次のノード',
                        'Footnotes' => '脚注',
-                       'Forward' => '',
-                       'Forward section in next file' => '',
+                       'Forward' => '進む',
+                       'Forward section in next file' => '次のファイルのセクションに進む',
                        'From 1.2.3 go to' => '1.2.3 からの行き先',
                        'Go to' => '行き先',
                        'Index' => 'インデックス',
                        'Index Entry' => 'インデックス エントリ',
                        'January' => '1 月',
                        'July' => '7 月',
-                       'Jump to' => '',
+                       'Jump to' => '行き先',
                        'June' => '6月',
-                       'Last' => '',
-                       'Last section in reading order' => '',
+                       'Last' => '最後',
+                       'Last section in reading order' => '最後のセクション',
                        'March' => '3 月',
                        'May' => '5 月',
                        'Menu:' => 'メニュー',
+                       'Name' => '名前',
+                       'Next' => '次',
+                       'Next chapter' => '次の章',
+                       'Next file' => '次のファイル',
+                       'Next node' => '次のノード',
+                       'Next section in reading order' => '次のセクション',
+                       'Next section on same level' => '次のセクション',
+                       'NextFile' => '次のファイル',
+                       'Node following in node reading order' => '次のノード',
+                       'Node up' => '上のノード',
+                       'NodeNext' => '次のノード',
+                       'NodePrev' => '前のノード',
+                       'NodeUp' => '上のノード',
+                       'November' => '11 月',
+                       'October' => '10 月',
+                       'Overview' => '概要',
+                       'Prev' => '前',
+                       'PrevFile' => '前のファイル',
+                       'Previous' => '前の',
+                       'Previous file' => '前のファイル',
+                       'Previous node' => '前のノード',
+                       'Previous section in reading order' => '前のセクション',
+                       'Previous section on same level' => '前のセクション',
+                       'Section' => 'セクション',
+                       'Section One' => 'セクション 1',
+                       'See ' => '参照',
+                       'See @cite{{book}}' => '@cite{{book}} を参照してください',
+                       'See section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => '@cite{{book}} のセクション `@asis{}`{section_name}\'@asis{}\' を参照してください',
+                       'See section `{section}\' in @cite{{book}}' => '@cite{{book}} のセクション `{section}\' を参照してください',
+                       'See section {reference_name}' => 'セクション {reference_name} を参照してください',
+                       'See {node_file_href}' => '{node_file_href} を参照してください',
+                       'See {node_file_href} @cite{{book}}' => '@cite{{book}} の {node_file_href} を参照してください',
+                       'See {node_file_href} section `{section}\' in @cite{{book}}' => '@cite{{book}} の {node_file_href} セクション `{section}\' を参照してください',
+                       'See {reference_name}' => '{reference_name} を参照してください',
+                       'See {ref}' => '{ref} を参照してください',
+                       'See {title_ref}' => '{title_ref} を参照してください',
+                       'September' => '9 月',
+                       'Short Table of Contents' => '簡単な目次',
+                       'Short table of contents' => '簡単な目次',
+                       'Subsection One-Four' => 'サブセクション 1-4',
+                       'Subsection One-One' => 'サブセクション 1-1',
+                       'Subsection One-Three' => 'サブセクション 1-3',
+                       'Subsection One-Two' => 'サブセクション 1-2',
+                       'Subsubsection One-Two-Four' => 'サブサブセクション 1-2-4',
+                       'Subsubsection One-Two-One' => 'サブサブセクション 1-2-1',
+                       'Subsubsection One-Two-Three' => 'サブサブセクション 1-2-3',
+                       'Subsubsection One-Two-Two' => 'サブサブセクション 1-2-2',
+                       'T2H_today' => '%s, %d %d',
+                       'Table of Contents' => '目次',
+                       'Table of contents' => '目次',
+                       'The node you are looking for is at {href}.' => 'あなたが探しているノードは {href} にあります。',
+                       'This' => 'この',
+                       'This document was generated on @i{{date}} using @uref{{program_homepage}, @i{{program}}}.' => 'このドキュメントは @i{{date}} に、@uref{{program_homepage}, @i{{program}}} を用いて生成されました。',
+                       'This document was generated using @uref{{program_homepage}, @emph{{program}}}.' => 'このドキュメントは @uref{{program_homepage}, @emph{{program}}} を用いて生成されました。',
+                       'Top' => 'トップ',
+                       'Untitled Document' => '無題のドキュメント',
+                       'Up' => '上',
+                       'Up node' => '上のノード',
+                       'Up section' => '上のセクション',
+                       'current' => '現在の',
+                       'on @emph{{date}}' => '@emph{{date}} に',
+                       'section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => '@cite{{book}} のセクション `@asis{}`{section_name}\'@asis{}\'',
+                       'section `{section}\' in @cite{{book}}' => '@cite{{book}} のセクション `{section}\'',
+                       'see ' => '参照',
+                       'see @cite{{book}}' => '@cite{{book}} を参照してください',
+                       'see section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => '@cite{{book}} のセクション `@asis{}`{section_name}\'@asis{}\' を参照してください',
+                       'see section `{section}\' in @cite{{book}}' => '@cite{{book}} のセクション `{section}\' を参照してください',
+                       'see section {reference_name}' => 'セクション {reference_name} を参照してください',
+                       'see {node_file_href}' => '{node_file_href} を参照してください',
+                       'see {node_file_href} @cite{{book}}' => '{node_file_href} @cite{{book}} を参照してください',
+                       'see {node_file_href} section `{section}\' in @cite{{book}}' => '@cite{{book}} の {node_file_href} section `{section}\' を参照してください',
+                       'see {reference_name}' => '{reference_name} を参照してください',
+                       'see {ref}' => '{ref} を参照してくださ',
+                       'see {title_ref}' => '{title_ref} を参照してくださ',
+                       '{acronym_like} ({explanation})' => '{acronym_like} ({explanation})',
+                       '{name} of {class}' => '{class} の {name}',
+                       '{name} on {class}' => '{class} の {name}',
+                       '{node_file_href}' => '{node_file_href}',
+                       '{node_file_href} @cite{{book}}' => '{node_file_href} @cite{{book}}',
+                       '{node_file_href} section `{section}\' in @cite{{book}}' => '@cite{{book}} の {node_file_href} セクション `{section}\'',
+                       '{reference_name}' => '{reference_name}',
+                       '{ref}' => '{ref}',
+                       '{style} {number}' => '{style} {number}',
+                       '{style}: {caption_first_line}' => '{style}: {caption_first_line}',
+                       '{style}: {shortcaption_first_line}' => '{style}: {shortcaption_first_line}',
+                       '{title_ref}' => '{title_ref}'
+                     };
+
+$LANGUAGES->{'cs'} = {
+                       '  The buttons in the navigation panels have the following meaning:' => '',
+                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '',
+                       ' Up ' => '',
+                       '(outside of any element)' => '',
+                       '(outside of any node)' => '',
+                       '@b{{quotation_arg}:} ' => '',
+                       '@cite{{book}}' => '',
+                       '@{No value for `{value}\'@}' => '',
+                       'About' => '',
+                       'About (help)' => '',
+                       'About This Document' => '',
+                       'April' => '',
+                       'August' => '',
+                       'Back' => '',
+                       'Back section in previous file' => '',
+                       'Beginning of this chapter or previous chapter' => '',
+                       'Button' => '',
+                       'Contents' => '',
+                       'Cover (top) of document' => '',
+                       'Current' => '',
+                       'Current Position' => '',
+                       'Current section' => '',
+                       'December' => '',
+                       'FastBack' => '',
+                       'FastForward' => '',
+                       'February' => '',
+                       'First' => '',
+                       'First section in reading order' => '',
+                       'Following' => '',
+                       'Following node' => '',
+                       'Footnotes' => '',
+                       'Forward' => '',
+                       'Forward section in next file' => '',
+                       'From 1.2.3 go to' => '',
+                       'Go to' => '',
+                       'Index' => '',
+                       'Index Entry' => '',
+                       'January' => '',
+                       'July' => '',
+                       'Jump to' => '',
+                       'June' => '',
+                       'Last' => '',
+                       'Last section in reading order' => '',
+                       'March' => '',
+                       'May' => '',
+                       'Menu:' => '',
                        'Name' => '',
                        'Next' => '',
-                       'Next chapter' => '次の章',
+                       'Next chapter' => '',
                        'Next file' => '',
                        'Next node' => '',
-                       'Next section in reading order' => '次のセクション',
+                       'Next section in reading order' => '',
                        'Next section on same level' => '',
                        'NextFile' => '',
                        'Node following in node reading order' => '',
@@ -435,18 +747,18 @@ $LANGUAGES->{'ja'} = {
                        'NodeNext' => '',
                        'NodePrev' => '',
                        'NodeUp' => '',
-                       'November' => '11 月',
-                       'October' => '10 月',
-                       'Overview' => '概要',
+                       'November' => '',
+                       'October' => '',
+                       'Overview' => '',
                        'Prev' => '',
                        'PrevFile' => '',
                        'Previous' => '',
                        'Previous file' => '',
                        'Previous node' => '',
-                       'Previous section in reading order' => '前のセクション',
+                       'Previous section in reading order' => '',
                        'Previous section on same level' => '',
-                       'Section' => 'セクション',
-                       'Section One' => 'セクション 1',
+                       'Section' => '',
+                       'Section One' => '',
                        'See ' => '',
                        'See @cite{{book}}' => '',
                        'See section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => '',
@@ -458,31 +770,31 @@ $LANGUAGES->{'ja'} = {
                        'See {reference_name}' => '',
                        'See {ref}' => '',
                        'See {title_ref}' => '',
-                       'September' => '9 月',
+                       'September' => '',
                        'Short Table of Contents' => '',
                        'Short table of contents' => '',
-                       'Subsection One-Four' => 'サブセクション 1-4',
-                       'Subsection One-One' => 'サブセクション 1-1',
-                       'Subsection One-Three' => 'サブセクション 1-3',
-                       'Subsection One-Two' => 'サブセクション 1-2',
-                       'Subsubsection One-Two-Four' => 'サブサブセクション 1-2-4',
-                       'Subsubsection One-Two-One' => 'サブサブセクション 1-2-1',
-                       'Subsubsection One-Two-Three' => 'サブサブセクション 1-2-3',
-                       'Subsubsection One-Two-Two' => 'サブサブセクション 1-2-2',
-                       'T2H_today' => '%s, %d %d',
-                       'Table of Contents' => '目次',
-                       'Table of contents' => '目次',
+                       'Subsection One-Four' => '',
+                       'Subsection One-One' => '',
+                       'Subsection One-Three' => '',
+                       'Subsection One-Two' => '',
+                       'Subsubsection One-Two-Four' => '',
+                       'Subsubsection One-Two-One' => '',
+                       'Subsubsection One-Two-Three' => '',
+                       'Subsubsection One-Two-Two' => '',
+                       'T2H_today' => '',
+                       'Table of Contents' => '',
+                       'Table of contents' => '',
                        'The node you are looking for is at {href}.' => '',
                        'This' => '',
-                       'This document was generated on @i{{date}} using @uref{{program_homepage}, @i{{program}}}.' => 'このドキュメントは @i{{date}} に、@uref{{program_homepage}, @i{{program}}} を用いて生成されました。',
-                       'This document was generated using @uref{{program_homepage}, @emph{{program}}}.' => 'このドキュメントは @uref{{program_homepage}, @emph{{program}}} を用いて生成されました。',
-                       'Top' => 'トップ',
+                       'This document was generated on @i{{date}} using @uref{{program_homepage}, @i{{program}}}.' => '',
+                       'This document was generated using @uref{{program_homepage}, @emph{{program}}}.' => '',
+                       'Top' => '',
                        'Untitled Document' => '',
-                       'Up' => '上',
+                       'Up' => '',
                        'Up node' => '',
-                       'Up section' => '上のセクション',
+                       'Up section' => '',
                        'current' => '',
-                       'on @emph{{date}}' => '@emph{{date}} に',
+                       'on @emph{{date}}' => '',
                        'section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => '',
                        'section `{section}\' in @cite{{book}}' => '',
                        'see ' => '',
@@ -496,13 +808,283 @@ $LANGUAGES->{'ja'} = {
                        'see {reference_name}' => '',
                        'see {ref}' => '',
                        'see {title_ref}' => '',
-                       '{acronym_like} ({explanation})' => '{acronym_like} ({explanation})',
+                       '{acronym_like} ({explanation})' => '',
                        '{name} of {class}' => '',
                        '{name} on {class}' => '',
                        '{node_file_href}' => '',
                        '{node_file_href} @cite{{book}}' => '',
                        '{node_file_href} section `{section}\' in @cite{{book}}' => '',
                        '{reference_name}' => '',
+                       '{ref}' => '',
+                       '{style} {number}' => '',
+                       '{style}: {caption_first_line}' => '',
+                       '{style}: {shortcaption_first_line}' => '',
+                       '{title_ref}' => '{title_ref}'
+                     };
+
+$LANGUAGES->{'ca'} = {
+                       '  The buttons in the navigation panels have the following meaning:' => '  Els botons dels plafons de navegació tenen els significat següent:',
+                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => '  on l\'@strong{ Exemple } suposa que la posició actual està a @strong{ Subsubsecció U-Dos-tres } d\'un document a l\'estructura següent:',
+                       ' Up ' => ' Amunt ',
+                       '(outside of any element)' => '(fora de qualsevol element)',
+                       '(outside of any node)' => '(fora de qualsevol node)',
+                       '@b{{quotation_arg}:} ' => '@{{quotation_arg}:}',
+                       '@cite{{book}}' => '@cite{{book}}',
+                       '@{No value for `{value}\'@}' => '@{No hi ha cap valor per a `{value}\'@}',
+                       'About' => 'Quant a',
+                       'About (help)' => 'Quant a (ajuda)',
+                       'About This Document' => 'Quant a aquest document',
+                       'April' => 'Abril',
+                       'August' => 'Agost',
+                       'Back' => 'Endarrere',
+                       'Back section in previous file' => 'Endarrere una secció al fitxer previ',
+                       'Beginning of this chapter or previous chapter' => 'Inici d\'aquest capítol o capítol previ',
+                       'Button' => 'Botó',
+                       'Contents' => 'Continguts',
+                       'Cover (top) of document' => 'Portada (inici) del document',
+                       'Current' => 'Actual',
+                       'Current Position' => 'Posició actual',
+                       'Current section' => 'Secció actual',
+                       'December' => 'Desembre',
+                       'FastBack' => 'Endarrere ràpid',
+                       'FastForward' => 'Endavant ràpid',
+                       'February' => 'Febrer',
+                       'First' => 'Primera',
+                       'First section in reading order' => 'Primera secció a l\'orde de lectura',
+                       'Following' => 'Següent',
+                       'Following node' => 'Node següent',
+                       'Footnotes' => 'Notes a peu de pàgina',
+                       'Forward' => 'Endavant',
+                       'Forward section in next file' => 'Endavant una secció al fitxer següent',
+                       'From 1.2.3 go to' => 'De 1.2.3 ves a',
+                       'Go to' => 'Ves a',
+                       'Index' => 'Índex',
+                       'Index Entry' => 'Entrada d\'índex',
+                       'January' => 'Gener',
+                       'July' => 'Juliol',
+                       'Jump to' => 'Salta a',
+                       'June' => 'Juny',
+                       'Last' => 'Últim',
+                       'Last section in reading order' => 'Última secció en ordre de lectura',
+                       'March' => 'Març',
+                       'May' => 'Maig',
+                       'Menu:' => 'Menú',
+                       'Name' => 'Nom',
+                       'Next' => 'Següent',
+                       'Next chapter' => 'Capítol següent',
+                       'Next file' => 'Fitxer següent',
+                       'Next node' => 'Node següent',
+                       'Next section in reading order' => 'Secció següent en ordre de lectura',
+                       'Next section on same level' => 'Secció següent al mateix nivell',
+                       'NextFile' => 'Fitxer següent',
+                       'Node following in node reading order' => 'Node següent en ordre de lectura de nodes',
+                       'Node up' => 'Node amunt',
+                       'NodeNext' => 'Node següent',
+                       'NodePrev' => 'Node previ',
+                       'NodeUp' => 'Node Amunt',
+                       'November' => 'Novembre',
+                       'October' => 'Octobre',
+                       'Overview' => 'Panoràmica',
+                       'Prev' => 'Previ',
+                       'PrevFile' => 'Fitxer previ',
+                       'Previous' => 'Previ',
+                       'Previous file' => 'Fitxer previ',
+                       'Previous node' => 'Node previ',
+                       'Previous section in reading order' => 'Secció prèvia en ordre de lectura',
+                       'Previous section on same level' => 'Secció prèvia al mateix nivell',
+                       'Section' => 'Secció',
+                       'Section One' => 'Secció u',
+                       'See ' => 'Vegeu ',
+                       'See @cite{{book}}' => 'Vegeu @cite{{book}}',
+                       'See section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => 'Vegeu secció @asis{}`{section_name}\'@asis{}\' a @cite{{book}}',
+                       'See section `{section}\' in @cite{{book}}' => 'Vegeu la secció `{section}\' a @cite{{book}}',
+                       'See section {reference_name}' => 'Vegeu la secció {reference_name}',
+                       'See {node_file_href}' => 'Vegeu {node_file_href}',
+                       'See {node_file_href} @cite{{book}}' => 'Vegeu {node_file_href} @cite{{book}}',
+                       'See {node_file_href} section `{section}\' in @cite{{book}}' => 'Vegeu {node_file_href} secció `{secion}\' a @cite{{book}}',
+                       'See {reference_name}' => 'Vegeu {reference_name}',
+                       'See {ref}' => 'Vegeu {ref}',
+                       'See {title_ref}' => 'Vegeu {title_ref}',
+                       'September' => 'Septembre',
+                       'Short Table of Contents' => 'Taula de continguts breu',
+                       'Short table of contents' => 'Taula de continguts breu',
+                       'Subsection One-Four' => 'Subsecció U-Quatre',
+                       'Subsection One-One' => 'Subsecció U-U',
+                       'Subsection One-Three' => 'Subsecció U-Tres',
+                       'Subsection One-Two' => 'Subsecció U-Dos',
+                       'Subsubsection One-Two-Four' => 'Subsubsecció U-Dos-Quatre',
+                       'Subsubsection One-Two-One' => 'Subsubsecció U-Dos-U',
+                       'Subsubsection One-Two-Three' => 'Subsubsecció U-Dos-Tres',
+                       'Subsubsection One-Two-Two' => 'Subsubsecció U-Dos-Dos',
+                       'T2H_today' => 'T2H_today',
+                       'Table of Contents' => 'Taula de contingus',
+                       'Table of contents' => 'Taula de continguts',
+                       'The node you are looking for is at {href}.' => 'El node que esteu buscant està a {href}.',
+                       'This' => 'Aquest',
+                       'This document was generated on @i{{date}} using @uref{{program_homepage}, @i{{program}}}.' => 'Aquest document es va generar a @i{{date}} usant @uref{{program_homepage}, @i{{program}}}',
+                       'This document was generated using @uref{{program_homepage}, @emph{{program}}}.' => 'Aquest document es va generar usant @uref{{program_homepage}, @empf{{program}}}.',
+                       'Top' => 'Part superior',
+                       'Untitled Document' => 'Document sense títol',
+                       'Up' => 'Amunt',
+                       'Up node' => 'Amunt node',
+                       'Up section' => 'Amunt secció',
+                       'current' => 'actual',
+                       'on @emph{{date}}' => 'el @empf{{date}}',
+                       'section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => 'secció `@asis{}`{secion_name}\'@asis{}\' a @cite{{book}}',
+                       'section `{section}\' in @cite{{book}}' => 'secció `{section}\' a @cite{{book}}',
+                       'see ' => 'vegeu ',
+                       'see @cite{{book}}' => 'vegeu @cite{{book}}',
+                       'see section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => 'vegeu secció `@asis{}`{secion_name}\'@asis{}\' a @cite{{book}}',
+                       'see section `{section}\' in @cite{{book}}' => 'vegeu secció `{section}\' a @cite{{book}}',
+                       'see section {reference_name}' => 'vegeu secció {reference_name}',
+                       'see {node_file_href}' => 'vegeu {node_file_href}',
+                       'see {node_file_href} @cite{{book}}' => 'vegeu {node_file_href} @cite{{book}}',
+                       'see {node_file_href} section `{section}\' in @cite{{book}}' => 'vegeu {node_file_href} secció `{seciont}\' a @cite{{book}}',
+                       'see {reference_name}' => 'vegeu {reference_name}',
+                       'see {ref}' => 'vegeu {ref}',
+                       'see {title_ref}' => 'vegeu {title_ref}',
+                       '{acronym_like} ({explanation})' => '{acronym_lie} ({explanation})',
+                       '{name} of {class}' => '{name} de {class}',
+                       '{name} on {class}' => '{name} a {class}',
+                       '{node_file_href}' => '{node_file_href}',
+                       '{node_file_href} @cite{{book}}' => '{node_file_href} @cite{{book}}',
+                       '{node_file_href} section `{section}\' in @cite{{book}}' => '{node_file_href} secció `{secció}\' a @cite{{book}}',
+                       '{reference_name}' => '{reference_name}',
+                       '{ref}' => '{ref}',
+                       '{style} {number}' => '{style} {number}',
+                       '{style}: {caption_first_line}' => '{style}: {caption_first_line}',
+                       '{style}: {shortcaption_first_line}' => '{style}: {shortcaption_first_line}',
+                       '{title_ref}' => '{title_ref}'
+                     };
+
+$LANGUAGES->{'zh'} = {
+                       '  The buttons in the navigation panels have the following meaning:' => '  在导航面板上按钮有以下含意：',
+                       '  where the @strong{ Example } assumes that the current position is at @strong{ Subsubsection One-Two-Three } of a document of the following structure:' => ' 这里的@strong{ 例子 } 假设当前的位置是在紧接着的结构的文档中的 @strong{ 小分段 1-2-3 }：',
+                       ' Up ' => ' 上 ',
+                       '(outside of any element)' => '(任何元素外面)',
+                       '(outside of any node)' => '(任何节点外面)',
+                       '@b{{quotation_arg}:} ' => '@b{{quotation_arg}:} ',
+                       '@cite{{book}}' => '@cite{{book}}',
+                       '@{No value for `{value}\'@}' => '@{没有值 `{value}\'@}',
+                       'About' => '关于',
+                       'About (help)' => '关于 (帮助)',
+                       'About This Document' => '关于本文档',
+                       'April' => '4 月',
+                       'August' => '8 月',
+                       'Back' => '返回',
+                       'Back section in previous file' => '返回到前一个文件',
+                       'Beginning of this chapter or previous chapter' => '本章开头或前一章',
+                       'Button' => '按钮',
+                       'Contents' => '目录',
+                       'Cover (top) of document' => '文档的封面(首页)',
+                       'Current' => '当前',
+                       'Current Position' => '当前的位置',
+                       'Current section' => '当前的段',
+                       'December' => '12 月',
+                       'FastBack' => '快速返回',
+                       'FastForward' => '快速向前',
+                       'February' => '2 月',
+                       'First' => '第一个',
+                       'First section in reading order' => '看的第一段',
+                       'Following' => '紧接着的',
+                       'Following node' => '紧接着的节点',
+                       'Footnotes' => '脚注',
+                       'Forward' => '向前',
+                       'Forward section in next file' => '向前到下一个文件的段',
+                       'From 1.2.3 go to' => '从1.2.3 到',
+                       'Go to' => '到',
+                       'Index' => '索引',
+                       'Index Entry' => '索引条目',
+                       'January' => '1 月',
+                       'July' => '7 月',
+                       'Jump to' => '跳转到',
+                       'June' => '6 月',
+                       'Last' => '最后',
+                       'Last section in reading order' => '看的最后一段',
+                       'March' => '3 月',
+                       'May' => '5 月',
+                       'Menu:' => '菜单',
+                       'Name' => '名字',
+                       'Next' => '下一个',
+                       'Next chapter' => '下一章',
+                       'Next file' => '下一个文件',
+                       'Next node' => '下一个节点',
+                       'Next section in reading order' => '看的下一段',
+                       'Next section on same level' => '同级的下一段',
+                       'NextFile' => '下一个文件',
+                       'Node following in node reading order' => '看的下一个节点',
+                       'Node up' => '向上一个节点',
+                       'NodeNext' => '下一个节点',
+                       'NodePrev' => '前一个节点',
+                       'NodeUp' => '向上一个节点',
+                       'November' => '11 月',
+                       'October' => '10 月',
+                       'Overview' => '综述',
+                       'Prev' => '前一个',
+                       'PrevFile' => '前一个文件',
+                       'Previous' => '前一个',
+                       'Previous file' => '前一个文件',
+                       'Previous node' => '前一个节点',
+                       'Previous section in reading order' => '看的前一段',
+                       'Previous section on same level' => '同级的前一段',
+                       'Section' => '段',
+                       'Section One' => '段 1',
+                       'See ' => '见',
+                       'See @cite{{book}}' => '见 @cite{{book}}',
+                       'See section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => '',
+                       'See section `{section}\' in @cite{{book}}' => '',
+                       'See section {reference_name}' => '见段 {reference_name}',
+                       'See {node_file_href}' => '见 {node_file_href}',
+                       'See {node_file_href} @cite{{book}}' => '见 {node_file_href} @cite{{book}}',
+                       'See {node_file_href} section `{section}\' in @cite{{book}}' => '见在@cite{{book}} 中的 {node_file_href} 段 `{section}\' ',
+                       'See {reference_name}' => '见 {reference_name}',
+                       'See {ref}' => '见 {ref}',
+                       'See {title_ref}' => '见 {title_ref}',
+                       'September' => '9 月',
+                       'Short Table of Contents' => '短目录',
+                       'Short table of contents' => '短目录',
+                       'Subsection One-Four' => '分段 1-4',
+                       'Subsection One-One' => '分段 1-1',
+                       'Subsection One-Three' => '分段 1-3',
+                       'Subsection One-Two' => '分段 1-2',
+                       'Subsubsection One-Two-Four' => '小分段 1-2-4',
+                       'Subsubsection One-Two-One' => '小分段 1-2-1',
+                       'Subsubsection One-Two-Three' => '小分段 1-2-3',
+                       'Subsubsection One-Two-Two' => '小分段 1-2-2',
+                       'T2H_today' => '',
+                       'Table of Contents' => '目录',
+                       'Table of contents' => '目录',
+                       'The node you are looking for is at {href}.' => '你查找的节点在{href}。',
+                       'This' => '这个',
+                       'This document was generated on @i{{date}} using @uref{{program_homepage}, @i{{program}}}.' => '本文档在 @i{{date}} 上用 @uref{{program_homepage}, @i{{program}}} 生成的。',
+                       'This document was generated using @uref{{program_homepage}, @emph{{program}}}.' => '本文档用 @uref{{program_homepage}, @emph{{program}}} 生成的。',
+                       'Top' => '首页',
+                       'Untitled Document' => '没有标题的文档',
+                       'Up' => '上',
+                       'Up node' => '上一节点',
+                       'Up section' => '上一段',
+                       'current' => '目前',
+                       'on @emph{{date}}' => '@emph{{date}} 上',
+                       'section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => '',
+                       'section `{section}\' in @cite{{book}}' => '',
+                       'see ' => '见',
+                       'see @cite{{book}}' => '见 @cite{{book}}',
+                       'see section `@asis{}`{section_name}\'@asis{}\' in @cite{{book}}' => '见在@cite{{book}}里的段`@asis{}`{section_name}\'@asis{}\'',
+                       'see section `{section}\' in @cite{{book}}' => '见在@cite{{book}}里的段`{section}\'',
+                       'see section {reference_name}' => '见段 {reference_name}',
+                       'see {node_file_href}' => '见 {node_file_href}',
+                       'see {node_file_href} @cite{{book}}' => '见 {node_file_href} @cite{{book}}',
+                       'see {node_file_href} section `{section}\' in @cite{{book}}' => '见在@cite{{book}}里的{node_file_href} 段`{section}\'',
+                       'see {reference_name}' => '见 {reference_name}',
+                       'see {ref}' => '见 {ref}',
+                       'see {title_ref}' => '见 {title_ref}',
+                       '{acronym_like} ({explanation})' => '{acronym_like} ({explanation})',
+                       '{name} of {class}' => '{class} 的 {name}',
+                       '{name} on {class}' => '在{class} 上的 {name}',
+                       '{node_file_href}' => '',
+                       '{node_file_href} @cite{{book}}' => '',
+                       '{node_file_href} section `{section}\' in @cite{{book}}' => '{node_file_href} 段 `{section}\' 在 @cite{{book}}里',
+                       '{reference_name}' => '',
                        '{ref}' => '{ref}',
                        '{style} {number}' => '{style} {number}',
                        '{style}: {caption_first_line}' => '{style}: {caption_first_line}',
@@ -536,22 +1118,18 @@ our $web_manual;
 $Texi2HTML::Config::DOCTYPE = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
 
 @Texi2HTML::Config::CSS_REFS = (
-    {FILENAME => "lilypond-mccarty.css", TITLE => "Default style"}
+    {FILENAME => "lilypond-manuals.css", TITLE => "Default style"}
     );
 @Texi2HTML::Config::ALT_CSS_REFS      = (
-    {FILENAME => "lilypond.css", TITLE => "Andrew Hawryluk's design" },
-    {FILENAME => "lilypond-blue.css", TITLE => "Kurt Kroon's blue design" },
-);
+    );
 
 sub web_settings() {
-  print STDERR "Initializing settings for web site\n";
+  print STDERR "Processing web site: [$Texi2HTML::THISDOC{current_lang}]\n";
   $Texi2HTML::Config::BODYTEXT = "";
   @Texi2HTML::Config::CSS_REFS      = (
-      {FILENAME => "lilypond-web.css", TITLE => "Patrick McCarty's design"}
+      {FILENAME => "lilypond-website.css", TITLE => "Default style"}
       );
   @Texi2HTML::Config::ALT_CSS_REFS      = (
-      {FILENAME => "lilypond-web-alt1.css", TITLE => "Alternate style 1"},
-      {FILENAME => "lilypond-web-alt2.css", TITLE => "Alternate style 2"},
       );
 }
 
@@ -561,11 +1139,17 @@ $Texi2HTML::Config::USE_REL_REV   = 1;
 $Texi2HTML::Config::SPLIT_INDEX   = 0;
 $Texi2HTML::Config::SEPARATED_FOOTNOTES = 0; # Print footnotes on same page, not separated
 
+my $bigpage = 0;
+my $have_index_entries = 0;
 if ($Texi2HTML::Config::SPLIT eq 'section' or
     $Texi2HTML::Config::SPLIT eq 'node') {
   $Texi2HTML::Config::element_file_name    = \&lilypond_element_file_name;
+  $bigpage = 0;
+} else {
+  $bigpage = 1;
 }
 
+$Texi2HTML::Config::anchor  = \&lilypond_anchor;
 $Texi2HTML::Config::element_target_name  = \&lilypond_element_target_name;
 $default_print_element_header = $Texi2HTML::Config::print_element_header;
 $Texi2HTML::Config::print_element_header = \&lilypond_print_element_header;
@@ -635,10 +1219,13 @@ sub lc_last($)
 {
   my $href = shift;
   my @hrefsplit = split('/', $href);
-  # change the last portion (the filename), if it exists
-  if ($#array > 0) {
-    @hrefsplit[$#array] = lc( @hrefsplit[$#array] );
+  # change the last portion (the filename), if it exists;
+  # if it is a plain filename with no path, change the string as a whole
+  if ($#hrefsplit > 0) {
+    @hrefsplit[$#hrefsplit] = lc( @hrefsplit[$#hrefsplit] );
     $href = join("/", @hrefsplit);
+  } else {
+    $href = lc($href);
   }
   return $href;
 }
@@ -740,7 +1327,7 @@ sub split_texi_filename ($)
 #############################################################################
 
 # Include our standard CSS file, not hard-coded CSS code directly in the HTML!
-# For IE, conditionally include the lilypond-ie-fixes.css style sheet
+# For IE, add a second conditionally included CSS file.
 sub lilypond_css_lines ($$)
 {
   my $import_lines = shift;
@@ -756,17 +1343,54 @@ sub lilypond_css_lines ($$)
   foreach my $ref (@CSS_REFS)
   {
     $Texi2HTML::THISDOC{'CSS_LINES'} .=
-	"<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"$ref->{FILENAME}\">\n";
+	"<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"css/$ref->{FILENAME}\">\n";
   }
   foreach my $ref (@Texi2HTML::Config::ALT_CSS_REFS)
   {
     $Texi2HTML::THISDOC{'CSS_LINES'} .=
-	"<link rel=\"alternate stylesheet\" type=\"text/css\" href=\"$ref->{FILENAME}\" title=\"$ref->{TITLE}\">\n";
+	"<link rel=\"alternate stylesheet\" type=\"text/css\" href=\"css/$ref->{FILENAME}\" title=\"$ref->{TITLE}\">\n";
   }
-  # FIXME: the website doesn't use ie7-specific fixes; do the
-  # docs still need this?  -gp
-  $Texi2HTML::THISDOC{'CSS_LINES'} .=
-      "<!--[if lte IE 7]>\n<link href=\"lilypond-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
+
+  # Add a conditionally included CSS file for IE, for either the docs or the website
+  if ($web_manual) {
+    $Texi2HTML::THISDOC{'CSS_LINES'} .=
+	"<!--[if lte IE 9]>\n<link href=\"css/lilypond-website-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
+  } else {
+    $Texi2HTML::THISDOC{'CSS_LINES'} .=
+	"<!--[if lte IE 7]>\n<link href=\"css/lilypond-manuals-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
+  }
+
+  if ($ENV{'AJAX_SEARCH'} == 1) {
+    # Add the JavaScript file only if we have an index.
+    # Unfortunately, init_out is called after css_lines, so as a workaround
+    # here we have to check again for the existence of an index...
+    my $ix = main::get_index ("cp");
+    $have_index_entries = (scalar $ix > 0);
+    my $reldir = "";
+    $reldir = "../" unless $bigpage;
+    if ($have_index_entries) {
+      $Texi2HTML::THISDOC{'CSS_LINES'} .= "<script language=\"JavaScript\" type=\"text/javascript\" src=\"${reldir}lily_search.js\"></script>\n";
+    }
+  }
+
+  ## This section makes the manual name visible to CSS through the body tag
+  ## so that styles can be applied per manual. It will add the manual
+  ## directory name (e.g., 'notation' or 'learning') as a CSS class, as well
+  ## as a development status.
+
+  # Parse the input file name to determine the manual we're dealing with.
+  my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
+
+  # Hard-coded value to indicate if this is a development version
+  # ('devStatus') or stable version ('stableStatus')
+  # TODO: Figure out how to automatically set this value based on the even/odd minor revision number or some other mechanism.
+  $documentstatus = 'devStatus';
+
+  # Create the extra information for the <body> tag.
+  # For example, the development Notation reference in English
+  # will output in HTML as <body lang='en' class='notation devStatus'>
+  $Texi2HTML::Config::BODYTEXT = 'lang="' . $Texi2HTML::THISDOC{current_lang} . '" class="' . $docu_name . ' ' . $documentstatus . '"';
+
 }
 
 
@@ -780,6 +1404,7 @@ sub lilypond_css_lines ($$)
 my $lastfilename;
 my $docnr = 0;
 my $node_to_filename_map = ();
+$source_to_translationof_map = ();
 
 
 # This function makes sure that files are only generated for numbered sections,
@@ -831,7 +1456,7 @@ sub lilypond_element_file_name($$$)
       $$element{doc_nr} = $docnr;
       $lastfilename = $filename;
     }
-    print STDERR "Output file name: $filename\n";
+    #print STDERR "Output file name: $filename\n";
     $filename = lc_last($filename);
     return $filename;
 
@@ -869,6 +1494,51 @@ sub lilypond_element_file_name($$$)
   return;
 }
 
+sub lilypond_normalise_node($)
+{
+    my $text = shift;
+    my $norm = main::t2h_default_normalise_node($text);
+    if (exists ($source_to_translationof_map->{$text})) {
+	my $original = $source_to_translationof_map->{$text};
+	$norm = main::t2h_default_normalise_node($original);
+    }
+
+    return $norm;
+}
+
+# This function produces an anchor.
+#
+# arguments:
+# $name           :   anchor name
+# $href           :   anchor href
+# text            :   text displayed
+# extra_attribs   :   added to anchor attributes list
+sub lilypond_anchor($;$$$)
+{
+    my $name = shift;
+    my $href = shift;
+    my $text = shift;
+    my $attributes = shift;
+    $href = remove_unneeded_anchor($href);
+    if (!defined($attributes) or ($attributes !~ /\S/))
+    {
+        $attributes = '';
+    }
+    else
+    {
+        $attributes = ' ' . $attributes;
+    }
+    $name = '' if (!defined($name) or ($name !~ /\S/));
+    $href = '' if (!defined($href) or ($href !~ /\S/));
+    $text = '' if (!defined($text));
+    return $text if (($name eq '') and ($href eq ''));
+    $name = "name=\"$name\"" if ($name ne '');
+    $href = "href=\"$href\"" if ($href ne '');
+    $href = ' ' . $href if (($name ne '') and ($href ne ''));
+    return "<a ${name}${href}${attributes}>$text</a>";
+}
+
+
 sub lilypond_element_target_name($$$)
 {
   my $element = shift;
@@ -896,12 +1566,9 @@ sub lilypond_element_target_name($$$)
   #       the sections, change this back to ($id, $target)
   # I don't understand this comment, so I'm reluctant to delete it -gp
   $target = lc_last($target);
-  if ($target eq lc_last($id)) {
-    $id = "";
-  } else {
-    $id = substr($id, 0, - 2); # remove the "-1"
-  }
-  return ($id, $target);
+  $id = lc($target);
+# $id =~ s/-1$//i; # remove any trailing "-1"
+  return ($target, $id);
 }
 
 
@@ -914,7 +1581,7 @@ sub lilypond_init_map ()
     my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
     my $map_filename = main::locate_include_file ("${docu_name}.$Texi2HTML::THISDOC{current_lang}.xref-map")
 	|| main::locate_include_file ("${docu_name}.xref-map");
-    print STDERR "Map filename is: $map_filename\nDocu name is $docu_name\n";
+    #print STDERR "Map filename is: $map_filename\nDocu name is $docu_name\n";
     if ($docu_name eq 'web') {
 	$web_manual = 1;
 	web_settings();
@@ -991,7 +1658,13 @@ sub lilypond_unknown($$$$$)
     # python script messed up ;-)
     if ($pass == 1 and $macro eq "translationof") {
       if (ref($state->{'element'}) eq 'HASH') {
-        $state->{'element'}->{'translationof'} = main::normalise_space($line);
+	  $state->{'element'}->{'translationof'} = main::normalise_space($line);
+	  my $source = main::normalise_space ($line);
+	  if (ref($state->{'node_ref'}) eq 'HASH') {
+	      my $translationof = $state->{'node_ref'}->{'texi'};
+	      our %source_to_translationof_map;
+	      $source_to_translationof_map->{$source} = $translationof;
+	  }
       }
       return ('', 1, undef, undef);
     } else {
@@ -1012,7 +1685,7 @@ sub lilypond_external_href($$$)
 {
   my $node = shift;
   my $node_id = shift;
-  my $node_hxmlt_id = shift;
+  my $node_xhtml_id = shift;
   my $file = shift;
 
   # 1) Keep a hash of book->section_map
@@ -1038,42 +1711,41 @@ sub lilypond_external_href($$$)
     my $section_name_map = $translated_books{$map_name};
     my $node_text = main::remove_texi($node);
     if (defined($section_name_map->{$node_text})) {
-      ($node_id, $node_hxmlt_id) = @{$section_name_map->{$node_text}};
+      ($node_id, $node_xhtml_id) = @{$section_name_map->{$node_text}};
     } else {
       print STDERR "WARNING: Unable to find node '$node_text' in book $map_name.\n";
     }
   }
 
   if (defined $file) {
-    $href = &$default_external_href($node, $node_id, $node_hxmlt_id, lc_last($file));
-    remove_unneeded_anchor($href);
+    $href = &$default_external_href($node, $node_id, $node_xhtml_id, lc_last($file));
+    $href = remove_unneeded_anchor($href);
 
-    # TODO: very yucky, but will be fixed in issue 1004
     if ($web_manual) {
-      my $only_web = $ENV{ONLY_WEB};
-      if ($only_web) {
-        $href = "../../doc/v2.13/Documentation/web/".$href;
+      my $only_web_version = $ENV{ONLY_WEB_VERSION};
+      if ($only_web_version) {
+        $href = "../../doc/".$only_web_version."/Documentation/web/".$href;
       }
     }
 
     return $href;
   } else {
-    $href = &$default_external_href($node, $node_id, $node_hxmlt_id);
-    remove_unneeded_anchor($href);
+    $href = &$default_external_href($node, $node_id, $node_xhtml_id);
+    $href = remove_unneeded_anchor($href);
     return $href;
   }
 }
 
 sub remove_unneeded_anchor($)
 {
-  my $ref = shift;
+  my $href = shift;
   my @hrefsplit = split("/", $href);
   for ($i = 0; $i < @hrefsplit; $i++) {
     $item = @hrefsplit[$i];
     if ($item =~ /#/) {
-      @splitted = split("#", $item);
-      if (@splitted[0] == @splitted[1]) {
-        @hrefsplit[$i] = @splitted[0]
+      @split = split(".html#", $item);
+      if (@split[0] eq @split[1]) {
+        @hrefsplit[$i] = @split[0] . ".html";
       }
     }
   }
@@ -1131,22 +1803,6 @@ sub generate_ly_toc_entries($$$$$)
   my $is_parent_of_current = $element->{'id'} && $element_path->{$element->{'id'}};
   my $ind = '  ' x $level;
   my $this_css_class = " class=\"";
-  # color indices for the second navigation bar on the website
-  if ($web_manual) {
-      my %color_maps = (
-	  'introduction' => [2, 2, 2, 2, 3, 3, 4, 4],
-	  'download' => [2, 2, 2, 3, 3, 4],
-	  'manuals' => [1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4],
-	  'community' => [1, 1, 1, 2, 2, 2, 3, 3],
-	  );
-      my $addColor = "colorDefault";
-      while (($top_section, $color_indices) = each %color_maps) {
-	  if (index ($element->{'sectionup'}->{'file'}, $top_section) >= 0) {
-	      $addColor = "color" . $color_indices->[$child_count];
-	  }
-      }
-      $this_css_class .= $addColor;
-  }
   $this_css_class .= $is_parent_of_current ? ' toc_current"' : '"';
   my $entry = "$ind<li$this_css_class>" .
       &$anchor ($element->{'tocid'},
@@ -1219,10 +1875,10 @@ sub lilypond_generate_page_toc_body($)
         # FIXME: add link to main page, really hackily.
         if ($element->{'sectionup'}) {
             # it's not the top element
-            push (@toc_entries, "<li><a href=\"index.html\">Main</a></li>\n");
+            push (@toc_entries, "<li><a href=\"index.html\"><span>LilyPond</span></a></li>\n");
         } else {
             push (@toc_entries,
-		  "<li class=\"toc_current\"><a href=\"index.html\">Main</a></li>\n");
+		  "<li class=\"toc_current\"><a href=\"index.html\"><span>LilyPond</span></a></li>\n");
         }
     } else {
         push (@toc_entries, "<div class=\"contents\">\n");
@@ -1233,16 +1889,19 @@ sub lilypond_generate_page_toc_body($)
       push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth, 0, $element));
     }
     # search box
-    local $/=undef;
-    my $name = "search-box";
-    $lang = $Texi2HTML::THISDOC{current_lang};
-    open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$lang/$name.ihtml" or
+    #  I'm assuming that we wouldn't keep the google search box? -gp
+    if (!($ENV{AJAX_SEARCH} == 1)) {
+      local $/=undef;
+      my $name = "search-box";
+      $lang = $Texi2HTML::THISDOC{current_lang};
+      open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$lang/$name.ihtml" or
 	open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$name.ihtml"  or
 	die "no such file: $name.ihtml: $!";
-    my $search_string = decode ('UTF-8', <FILE>);
-    $search_string = "<li>\n" . $search_string . "</li>\n";
-    push (@toc_entries, $search_string);
-    close FILE;
+      my $search_string = decode ('UTF-8', <FILE>);
+      $search_string = "<li>\n" . $search_string . "</li>\n";
+      push (@toc_entries, $search_string);
+      close FILE;
+    }
 
     push (@toc_entries, "</ul>\n");
     if ($web_manual) {
@@ -1276,7 +1935,15 @@ sub lilypond_print_toc_div ($$)
       $lang = "";
     }
     my $reldir = $ENV{DEPTH};
-    my $uplink = $reldir."/Documentation/web/manuals.${lang}html";
+    # strip one depth level for translations
+    if ($lang and $lang ne "en" and substr ($reldir, 0, 3) eq '../') {
+	$reldir = substr ($reldir, 3);
+    }
+    # add a / at the end if there isn't one.
+    if (substr ($reldir, -1) ne '/') {
+        $reldir .= '/';
+    }
+    my $uplink = $reldir."Documentation/web/manuals.${lang}html";
 
     if (not $web_manual) {
       print $fh "<p class=\"toc_uplink\"><a href=\"$uplink\"
@@ -1284,9 +1951,19 @@ sub lilypond_print_toc_div ($$)
 	 &ly_get_string ('Back to Documentation Index') .
 	 "</a></p>\n";
 
+      # AJAX search box, written in JavaScript
+      if ($ENV{'AJAX_SEARCH'} == 1) {
+        if ($have_index_entries) {
+          my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
+          print $fh '<script language="JavaScript">print_search_field ("' .
+             $Texi2HTML::THISDOC{current_lang} . '", "' .
+             $docu_name . "\", " . $bigpage . ")</script>\n";
+        }
+      }
+
       print $fh '<h4 class="toc_header"> ' . &$anchor('',
                                     $Texi2HTML::HREF{'Top'},
-                                    $topname,
+                                    $topname . " <!-- Sidebar Version Tag  --> ",
                                     'title="Start of the manual"'
                                    ) . "</h4>\n";
     }
@@ -1675,6 +2352,13 @@ sub makeinfo_like_paragraph ($$$$$$$$$$$$$)
          return $text  if (($format eq 'itemize' or $format eq 'enumerate') and
             ($$paragraph_number == 1));
     }
+    # The cells of a table should not be wrapped in a <p> tag, so just return the text
+    if (defined($command_stack_at_begin->[0]) and $command_stack_at_begin->[0] eq 'multitable')
+    {
+        return $text;
+    }
+
+    # Adjust all footnotes so that they look like good old makeinfo
     my $open = '<p';
     if ($align)
     {
@@ -1706,6 +2390,65 @@ sub makeinfo_like_paragraph ($$$$$$$$$$$$$)
 }
 
 
+#############################################################################
+###  WRITING OUT THE INDEX FOR THE AJAX SEARCH FIELD
+#############################################################################
+
+$Texi2HTML::Config::IDX_SUMMARY   = 1;
+$Texi2HTML::Config::init_out                  = \&lilypond_init_out;
+$Texi2HTML::Config::finish_out                = \&lilypond_finish_out;
+$Texi2HTML::Config::index_summary_file_entry  = \&lilypond_index_summary_file_entry;
+
+my @index_entries;
+
+sub lilypond_init_out ()
+{
+  t2h_default_init_out ();
+  # Check whether we have an index at all! If not -> don't print out a search box!
+  my $ix = main::get_index ("cp");
+  $have_index_entries = (scalar $ix > 0);
+}
+
+sub lilypond_index_summary_file_entry ($$$$$$$$$)
+{
+  my $index_name = shift;
+  my $entry_text = shift;
+  my $entry_reference = shift;
+  my $formatted_entry = shift;
+  my $texi_entry = shift;
+  my $entry_element_reference = shift;
+  my $entry_element_header = shift;
+  my $is_printed = shift;
+  my $manual_name = shift;
+
+  if ($ENV{'AJAX_SEARCH'}==1) {
+    if ($index_name eq "cp")
+    {
+      # The entries in the index file have the form:
+      # SearchText \t FormattedText \t EntryURL \t SectionText \t SectionURL
+      push @index_entries, "$entry_text\t$formatted_entry\t$entry_reference\t$entry_element_header\t$entry_element_reference\n";
+    }
+  }
+}
+
+sub lilypond_finish_out ()
+{
+  if ($ENV{'AJAX_SEARCH'}==1) {
+    if (((scalar @index_entries) > 0) and $have_index_entries) {
+      my $lang = $Texi2HTML::THISDOC{current_lang};
+      my $big = "";
+      $big = "-big-page" if $bigpage;
+      my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
+      my $idx_file = "$docu_dir/$docu_name$big.$lang.idx";
+      open IDXOUTFILE, ">:utf8", $idx_file;
+      print IDXOUTFILE @index_entries;
+      close IDXOUTFILE;
+    }
+  }
+}
+
+
+
 #############################################################################
 ###  OTHER SETTINGS
 #############################################################################