texi2html-cvs
[Top][All Lists]
Advanced

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

[Texi2html-cvs] texi2html ChangeLog texi2html.pl formats/info.i...


From: Patrice Dumas
Subject: [Texi2html-cvs] texi2html ChangeLog texi2html.pl formats/info.i...
Date: Wed, 20 Jan 2010 16:16:41 +0000

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        10/01/20 16:16:41

Modified files:
        .              : ChangeLog texi2html.pl 
        formats        : info.init 
        po_document    : de.us-ascii.po es.us-ascii.po fr.us-ascii.po 
                         hu.po it.po ja.po nl.us-ascii.po no.us-ascii.po 
                         pt.us-ascii.po pt_BR.us-ascii.po 
        test/encodings/res_info/japanese: lilypond-learning.info 
        test/encodings/res_info/japanese_shift_jis: 
                                                    lilypond-learning.info 
        test/encodings/res_info/sample_utf8: sample_utf8.info 

Log message:
                * texi2html.pl, formats/info.init: use string width when
                necessary, not character number.
                Fix http://savannah.gnu.org/bugs/?28359.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.475&r2=1.476
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.369&r2=1.370
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/info.init?cvsroot=texi2html&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/de.us-ascii.po?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/es.us-ascii.po?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/fr.us-ascii.po?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/hu.po?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/it.po?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/ja.po?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/nl.us-ascii.po?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/no.us-ascii.po?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/pt.us-ascii.po?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/po_document/pt_BR.us-ascii.po?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/japanese/lilypond-learning.info?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/japanese_shift_jis/lilypond-learning.info?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/sample_utf8/sample_utf8.info?cvsroot=texi2html&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -b -r1.475 -r1.476
--- ChangeLog   20 Jan 2010 00:36:01 -0000      1.475
+++ ChangeLog   20 Jan 2010 16:16:40 -0000      1.476
@@ -1,5 +1,8 @@
 2009-01-20   Patrice Dumas  <address@hidden>
 
+       * texi2html.pl, formats/info.init: use string width when
+       necessary, not character number. 
+       Fix http://savannah.gnu.org/bugs/?28359.
        * texi2html.init: use Unicode::EastAsianWidth to determine string 
        width. Use it for section titles, fixing the original issue in
        http://savannah.gnu.org/bugs/?28359.

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -b -r1.369 -r1.370
--- texi2html.pl        20 Jan 2010 00:36:01 -0000      1.369
+++ texi2html.pl        20 Jan 2010 16:16:40 -0000      1.370
@@ -90,7 +90,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.369 2010/01/20 00:36:01 pertusus Exp $
+# $Id: texi2html.pl,v 1.370 2010/01/20 16:16:40 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -10861,7 +10861,7 @@
                 foreach my $prototype (@$prototype_row)
                 { 
                    $prototype_nr++;
-                   push @prototype_lengths, 
2+length(substitute_line($prototype, sprintf(__("address@hidden (argument nr 
%d)"), $prototype_nr), prepare_state_multiple_pass('columnfractions', 
$state))); 
+                   push @prototype_lengths, 
2+Texi2HTML::Config::t2h_default_string_width(substitute_line($prototype, 
sprintf(__("address@hidden (argument nr %d)"), $prototype_nr), 
prepare_state_multiple_pass('columnfractions', $state))); 
                 }
             }
             $format = { 'format' => $macro, 'text' => '', 'max_columns' => 
$max_columns, 'columnfractions' => $fractions, 'prototype_row' => 
$prototype_row, 'prototype_lengths' => address@hidden, 'cell' => 1 };

Index: formats/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/info.init,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- formats/info.init   19 Jan 2010 23:31:23 -0000      1.47
+++ formats/info.init   20 Jan 2010 16:16:41 -0000      1.48
@@ -619,24 +619,24 @@
 sub info_default_process_line_text($$$)
 {
    my $text = shift;
-   my $line_char_counter = shift;
+   my $line_width_counter = shift;
    my $indent_length = shift;
    $indent_length = 0 if (!defined($indent_length));
 
    my $line_passed = 0;
    my $chomped_text = $text;
    chomp($chomped_text);
-   if ($indent_length > $line_char_counter and $chomped_text ne '')
+   if ($indent_length > $line_width_counter and $chomped_text ne '')
    {
-      $text = ' ' x ($indent_length - $line_char_counter) . $text;
+      $text = ' ' x ($indent_length - $line_width_counter) . $text;
    }
-   $line_char_counter += length($text);
+   $line_width_counter += t2h_default_string_width($text);
    if (chomp($chomped_text))
    {
       $line_passed = 1;
-      $line_char_counter = 0;
+      $line_width_counter = 0;
    }
-   return ($line_char_counter, $line_passed, $text);
+   return ($line_width_counter, $line_passed, $text);
 }
 
 # Beware that there is a pending word if the text doesn't end with
@@ -679,12 +679,12 @@
           }
           if (defined($pending_word))
           {
-             if ($indent_length > $line_char_counter + length($pending_spaces))
+             if ($indent_length > $line_char_counter + 
t2h_default_string_width($pending_spaces))
              {
                  $pending_spaces = ' ' x ($indent_length - $line_char_counter) 
. $pending_spaces;
              }
              $result .= $pending_spaces . $pending_word;
-             $line_char_counter += 
length($pending_spaces)+length($pending_word);
+             $line_char_counter += 
t2h_default_string_width($pending_spaces)+t2h_default_string_width($pending_word);
              $pending_spaces = $new_spaces;
              $pending_word = undef;
          }
@@ -702,7 +702,7 @@
              #$pending_spaces = $new_spaces;
              $pending_spaces = '';
          }
-         if (length($pending_spaces) +  $line_char_counter > $max_column)
+         if (t2h_default_string_width($pending_spaces) +  $line_char_counter > 
$max_column)
          {
              $pending_spaces = '';
              $result .= "\n";
@@ -719,7 +719,7 @@
          # The $line_char_counter != 0 is here to cope with the case of a 
          # word longer than $line_char_counter followed by more letters:
          # a line would be passed each time some text is appended.
-         if ((length($pending_spaces)+length($pending_word) + 
$line_char_counter > $max_column) and $line_char_counter != 0)
+         if 
((t2h_default_string_width($pending_spaces)+t2h_default_string_width($pending_word)
 + $line_char_counter > $max_column) and $line_char_counter != 0)
          {
              $pending_spaces = '';
              $result .= "\n";
@@ -805,7 +805,7 @@
       $result = $indent_text . $result;
    }
 
-   $line_char_counter += length($result);
+   $line_char_counter += t2h_default_string_width($result);
    return ($line_char_counter, $pending_spaces, $pending_word, $result);
 }
 
@@ -959,7 +959,7 @@
               $pending_spaces = '';
               $in_para = 0;
               $info_state->{'indent_para'} = undef;
-              $text_added .= "\n" unless (($line_char_counter + 
length($text_added)) == 0);
+              $text_added .= "\n" unless (($line_char_counter + 
t2h_default_string_width($text_added)) == 0);
           }
           elsif ($content->{'command'} eq 'preformatted')
           {
@@ -1094,7 +1094,7 @@
                               $line = ' ' x $indent_len;
                           }
                           $line .= $cell_text;
-                          $line_width += length($cell_text);
+                          $line_width += t2h_default_string_width($cell_text);
                           $line_bytes += info_default_byte_count($cell_text);
                       }
                       if ($cell_idx+1 < $last_cell)
@@ -1106,7 +1106,7 @@
                                   $line = ' ' x $indent_len;
                               }
                               my $spaces = ' ' x ($indent_len + 
$multitable->{'cells'}->[$cell_idx+1]->{'beginning'} - $line_width);
-                              $line_width += length($spaces);
+                              $line_width += t2h_default_string_width($spaces);
                               $line_bytes += info_default_byte_count($spaces);
                               $line .= $spaces;
                               #print STDERR "   Csp($line_width) `$spaces'";
@@ -1122,7 +1122,7 @@
                           {
                               my $spaces = ' ' x ($anchor_position - 
$line_width);
                               $line .= $spaces;
-                              $line_width += length($spaces);
+                              $line_width += t2h_default_string_width($spaces);
                               $line_bytes += info_default_byte_count($spaces);
                           }
                           $anchor->{'info_offset'} = $line_bytes + $row_length 
+ $multitable->{'length'};
@@ -1131,7 +1131,7 @@
                       }
                   }
                   $line .= "\n";
-                  $row_length += length($line);
+                  $row_length += info_default_byte_count($line);
                   #print STDERR "  ($line_width,".length($line).") $line";
                   $row .= $line;
                   $previous_last_cell = $last_cell;
@@ -1147,7 +1147,7 @@
                   # the cell following the end of the table -> full width
                   my $line = ' ' x $indent_len . '-' x $cell_beginning . "\n";
                   $row .= $line;
-                  $row_length += length($line);
+                  $row_length += info_default_byte_count($line);
               }
               #print STDERR "ROW_LENGTH $row_length\n";
               $multitable->{'result'} .= $row;
@@ -1176,7 +1176,7 @@
                     # FIXME this is wrong if an end of line was passed.
                     # in that case line_char_counter has been increased and 
                     # $pending ends with an end of line
-                      $pending_added_length += length($pending);
+                      $pending_added_length += 
t2h_default_string_width($pending);
                       $pending_added_bytes += 
info_default_byte_count($pending);
                       $text_added .= $pending;
                   }
@@ -1228,8 +1228,8 @@
                   }
                   #print STDERR "index in a blank_line 
$content->{'index_command'} `$content->{'texi_entry'}'\n" if 
($info_state->{'blank_line'});
                   my $index_name = 
$content->{'index_entry_reference'}->{'index_name'};
-                  $info_default_index_line_string_length{$index_name} = 
length($index_line_nr) 
-                      if 
(!defined($info_default_index_line_string_length{$index_name}) or 
$info_default_index_line_string_length{$index_name} < length($index_line_nr));
+                  $info_default_index_line_string_length{$index_name} = 
t2h_default_string_width($index_line_nr) 
+                      if 
(!defined($info_default_index_line_string_length{$index_name}) or 
$info_default_index_line_string_length{$index_name} < 
t2h_default_string_width($index_line_nr));
                   #print STDERR 
"RRRRRRRRRRRRR($content->{'index_entry_reference'}) 
$content->{'index_entry_reference'}->{'texi'}   name: $index_name line: 
$index_line_nr max: $info_default_index_line_string_length{$index_name}\n";
                   my $index_ref = { 'index_entry_reference' => 
$content->{'index_entry_reference'}, 'line_nr' => $index_line_nr };
 #print STDERR "INDEX($index_name) line $index_line_nr\n";
@@ -1262,7 +1262,7 @@
                  info_default_skip_spaces($current, $index, $close);
                  # this isn't done otherwise, though, here it is not important
                  # since this end the line
-                 $line_char_counter += length($content->{'text'});
+                 $line_char_counter += 
t2h_default_string_width($content->{'text'});
                  goto new_text;
               }
               elsif ($content->{'command'} eq 'paragraph' and 
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal')
@@ -1677,7 +1677,7 @@
       }
       else
       {
-          $line_char_counter += length($text_added);
+          $line_char_counter += t2h_default_string_width($text_added);
       }
     new_text:
       if ($text_added ne '')
@@ -1729,7 +1729,7 @@
          if ($line_passed)
          {# in that case we added more than one line, the $line_char_counter
           # is reset to the last line length.
-            $line_char_counter = length($last_line);
+            $line_char_counter = t2h_default_string_width($last_line);
             $in_exdent = 0;
             $indent_length = $indent_level * $info_default_indent_length;
             if ($last_line !~ /\S/)
@@ -1764,24 +1764,25 @@
                 $line =~ s/^\s*//;
                 $line =~ s/\s*$//;
                 
-                if (length($line) eq 0)
+                if (t2h_default_string_width($line) eq 0)
                 {
                     $spaces_prepended = 0;
                     $text_indented .= "\n";
                 }
                 else
                 {
-                    if (length($line) > $max_column)
+                    my $line_width = t2h_default_string_width($line);
+                    if ($line_width > $max_column)
                     {
                         $spaces_prepended = 0;
                     }
                     elsif ($info_state->{'align_stack'}->[-1]->{'command'} eq 
'center')
                     {
-                        $spaces_prepended = (($max_column -1 - length($line)) 
/2);
+                        $spaces_prepended = (($max_column -1 - $line_width) 
/2);
                     }
                     else
                     {
-                         $spaces_prepended = ($max_column -1 - length($line));
+                         $spaces_prepended = ($max_column -1 - $line_width);
                     }
                     $text_indented .= ' ' x$spaces_prepended . $line ."\n";
                 }
@@ -3039,9 +3040,9 @@
     }
 
     my $result = "* $entry${entry_nr}: ";
-    if (length($result) < $info_default_index_length_to_node)
+    if (t2h_default_string_width($result) < $info_default_index_length_to_node)
     {
-       $result .= ' ' x($info_default_index_length_to_node - length($result));
+       $result .= ' ' x($info_default_index_length_to_node - 
t2h_default_string_width($result));
     }
 
     #print STDERR "DDDDDDDDDDD $index_entry_ref 
`$index_entry_ref->{'texi'}'\n";
@@ -3069,17 +3070,17 @@
     }
     $result .= $real_element_text . '.';
     my $max_len = 
$info_default_index_line_string_length{$index_entry_ref->{'index_name'}};
-    $max_len = length($line_nr) if (!defined($max_len));
+    $max_len = t2h_default_string_width($line_nr) if (!defined($max_len));
     my $line_nr_spaces = sprintf("%${max_len}d", $line_nr);
     my $line_part = "(line ${line_nr_spaces})";
     #print STDERR "GGGGGGGGGG name: $index_entry_ref->{'index_name'} max: 
${max_len} line_nr: `$line_nr' line_nr_spaces `$line_nr_spaces' $line_part \n";
-    if (length($result)+length($line_part) +1 >  get_conf('fillcolumn'))
+    if (t2h_default_string_width($result)+t2h_default_string_width($line_part) 
+1 >  get_conf('fillcolumn'))
     {
-        $result .= "\n" . ' ' x (get_conf('fillcolumn') - length($line_part)) ;
+        $result .= "\n" . ' ' x (get_conf('fillcolumn') - 
t2h_default_string_width($line_part)) ;
     }
     else
     {
-        $result .= ' ' x (get_conf('fillcolumn') - length($line_part) - 
length($result));
+        $result .= ' ' x (get_conf('fillcolumn') - 
t2h_default_string_width($line_part) - t2h_default_string_width($result));
     }
     $result .= "$line_part\n";
 
@@ -3503,7 +3504,7 @@
     my $result = '';
     #$caption .= ':' if ($caption ne '');
     my $caption_entry = "* $float_style: $float->{'text'}.";
-    if (length($caption_entry) > 
$info_default_listoffloat_caption_entry_length)
+    if (t2h_default_string_width($caption_entry) > 
$info_default_listoffloat_caption_entry_length)
     {
         $caption_entry .= "\n" . ' ' x 
$info_default_listoffloat_caption_entry_length;
     }
@@ -3515,7 +3516,7 @@
     while ($caption =~ s/^(\S+\s*)//)
     { 
         my $new_word = $1;
-        if ((length($new_word) + $width) > get_conf('fillcolumn') - 3)
+        if ((t2h_default_string_width($new_word) + $width) > 
get_conf('fillcolumn') - 3)
         {
             $caption_entry .= $info_default_listoffloat_append;
             last;
@@ -3523,7 +3524,7 @@
         else
         {
            $caption_entry .= $new_word; 
-           $width += length($new_word);
+           $width += t2h_default_string_width($new_word);
         }
     }
     return $caption_entry. "\n";

Index: po_document/de.us-ascii.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/de.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/de.us-ascii.po  20 Jan 2010 00:36:02 -0000      1.21
+++ po_document/de.us-ascii.po  20 Jan 2010 16:16:41 -0000      1.22
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2008-03-19\n"
 "Last-Translator: Reinhold Kainhofer <address@hidden>\n"
 "Language-Team: Unknown\n"
@@ -575,7 +575,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr "Der Knoten, den Sie sehen, befindet sich bei {href}"
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -592,7 +592,7 @@
 msgid "Jump to"
 msgstr "Springe zu"
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr ""
 

Index: po_document/es.us-ascii.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/es.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/es.us-ascii.po  20 Jan 2010 00:36:02 -0000      1.21
+++ po_document/es.us-ascii.po  20 Jan 2010 16:16:41 -0000      1.22
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2008-08-28\n"
 "Last-Translator: Francisco Vila <address@hidden>\n"
 "Language-Team: Unknown\n"
@@ -575,7 +575,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr "El nodo que busca se encuentra en {href}."
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -592,7 +592,7 @@
 msgid "Jump to"
 msgstr "Saltar a"
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr ""
 

Index: po_document/fr.us-ascii.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/fr.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/fr.us-ascii.po  20 Jan 2010 00:36:02 -0000      1.21
+++ po_document/fr.us-ascii.po  20 Jan 2010 16:16:41 -0000      1.22
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2008-07-20\n"
 "Last-Translator: Jean-Charles Malahieude <address@hidden>\n"
 "Language-Team: Unknown\n"
@@ -574,7 +574,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr "Le address@hidden que vous recherchez est ici@ : {href}."
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -591,7 +591,7 @@
 msgid "Jump to"
 msgstr "Aller @`a"
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr ""
 

Index: po_document/hu.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/hu.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po_document/hu.po   20 Jan 2010 00:36:02 -0000      1.6
+++ po_document/hu.po   20 Jan 2010 16:16:41 -0000      1.7
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2009-12-27 22:02+0100\n"
 "Last-Translator: Harmath Dénes <address@hidden>\n"
 "Language-Team: Unknown\n"
@@ -576,7 +576,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr "A keresett csomópont itt található: {href}."
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -593,7 +593,7 @@
 msgid "Jump to"
 msgstr "Ugorj ide"
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr "(bármelyik csomóponton kívül)"
 

Index: po_document/it.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/it.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po_document/it.po   20 Jan 2010 00:36:02 -0000      1.6
+++ po_document/it.po   20 Jan 2010 16:16:41 -0000      1.7
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2009-12-27 22:02+0100\n"
 "Last-Translator: Federico Bruni <address@hidden>\n"
 "Language-Team: Unknown\n"
@@ -575,7 +575,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr "Il nodo che stai cercando è {href}"
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -592,7 +592,7 @@
 msgid "Jump to"
 msgstr "Salta a"
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr "(fuori da qualsiasi nodo)"
 

Index: po_document/ja.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/ja.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po_document/ja.po   20 Jan 2010 00:36:02 -0000      1.6
+++ po_document/ja.po   20 Jan 2010 16:16:41 -0000      1.7
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2007-02-05\n"
 "Last-Translator: Unknown\n"
 "Language-Team: Unknown\n"
@@ -573,7 +573,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr ""
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -590,7 +590,7 @@
 msgid "Jump to"
 msgstr "移動"
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr ""
 

Index: po_document/nl.us-ascii.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/nl.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/nl.us-ascii.po  20 Jan 2010 00:36:02 -0000      1.21
+++ po_document/nl.us-ascii.po  20 Jan 2010 16:16:41 -0000      1.22
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2001-01-01\n"
 "Last-Translator: Unknown\n"
 "Language-Team: Unknown\n"
@@ -568,7 +568,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr ""
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -585,7 +585,7 @@
 msgid "Jump to"
 msgstr ""
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr ""
 

Index: po_document/no.us-ascii.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/no.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/no.us-ascii.po  20 Jan 2010 00:36:02 -0000      1.21
+++ po_document/no.us-ascii.po  20 Jan 2010 16:16:41 -0000      1.22
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2001-01-01\n"
 "Last-Translator: Unknown\n"
 "Language-Team: Unknown\n"
@@ -568,7 +568,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr ""
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -585,7 +585,7 @@
 msgid "Jump to"
 msgstr ""
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr ""
 

Index: po_document/pt.us-ascii.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/pt.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/pt.us-ascii.po  20 Jan 2010 00:36:02 -0000      1.21
+++ po_document/pt.us-ascii.po  20 Jan 2010 16:16:41 -0000      1.22
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2006-01-09\n"
 "Last-Translator: Jorge Barros de Abreu <address@hidden>\n"
 "Language-Team: Unknown\n"
@@ -576,7 +576,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr "O nodo que address@hidden est@'a olhando est@'a em {href}."
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -593,7 +593,7 @@
 msgid "Jump to"
 msgstr "Pular para"
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr ""
 

Index: po_document/pt_BR.us-ascii.po
===================================================================
RCS file: /cvsroot/texi2html/texi2html/po_document/pt_BR.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/pt_BR.us-ascii.po       20 Jan 2010 00:36:02 -0000      1.21
+++ po_document/pt_BR.us-ascii.po       20 Jan 2010 16:16:41 -0000      1.22
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texi2html 1.83\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-20 00:38+0100\n"
+"POT-Creation-Date: 2010-01-20 15:14+0100\n"
 "PO-Revision-Date: 2006-01-09\n"
 "Last-Translator: Jorge Barros de Abreu <address@hidden>\n"
 "Language-Team: Unknown\n"
@@ -576,7 +576,7 @@
 msgid "The node you are looking for is at {href}."
 msgstr "O nodo que address@hidden est@'a olhando est@'a em {href}."
 
-#: formats/html.init:2704 formats/info.init:2741
+#: formats/html.init:2704 formats/info.init:2742
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
@@ -593,7 +593,7 @@
 msgid "Jump to"
 msgstr "Pular para"
 
-#: formats/info.init:3058
+#: formats/info.init:3059
 msgid "(outside of any node)"
 msgstr ""
 

Index: test/encodings/res_info/japanese/lilypond-learning.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/japanese/lilypond-learning.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res_info/japanese/lilypond-learning.info     20 Jan 2010 
00:36:02 -0000      1.4
+++ test/encodings/res_info/japanese/lilypond-learning.info     20 Jan 2010 
16:16:41 -0000      1.5
@@ -7,7 +7,8 @@
 courtesy to non-English speakers, but only the notice in English legally
 counts._
 
-   _以下は英語を話さない人々
のための著作権についての注意書きです。しかしながら、 
英語で書かれた注意書きだけが法的に有効です。_
+   _以下は英語を話さない人々
のための著作権についての注意書きです。しかしながら、
+英語で書かれた注意書きだけが法的に有効です。_
 
 
 File: lilypond-learning.info,  Node: Top,  Next: Preface,  Up: (dir)
@@ -28,11 +29,13 @@
 1 Preface
 *********
 
-それは 1995 年のある日の EJE (Eindhoven Youth Orchestra) 
のリハーサル中のできごとでした −
+それは 1995 年のある日の EJE (Eindhoven Youth Orchestra)
+のリハーサル中のできごとでした −
 ある変わり者のバイオリン奏者
であるジャンは同じく変わり者のフレンチホルン奏者
のハン-ウェンに彼がかかわっている新しい大きなプロジェクトのことを話しました。それは音楽を出版するための自動化されたシステãƒ
 ã§ã™
 (正確には、それは MPP − MusiXTeX
 
のプリプロセッサです)。それを聞いてハン-ウェンはすぐに楽譜からいくつかの部分をプリントアウトしたいと思い、彼はそのためのソフトウェアを探し始め、すぐにその虜になってしまいました。それが
-MPP 
の終わりを決定付けました。多くの哲学的考察を含み白熱した
 email の交換の後、ハン-ウェンは 1996 年に LilyPond
+MPP 
の終わりを決定付けました。多くの哲学的考察を含み白熱した
 email
+の交換の後、ハン-ウェンは 1996 年に LilyPond
 
の製作を開始しました。この時、ジャンはハン-ウェンの新しいプロジェクトに引きずり込まれました。
 
 

Index: test/encodings/res_info/japanese_shift_jis/lilypond-learning.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/japanese_shift_jis/lilypond-learning.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res_info/japanese_shift_jis/lilypond-learning.info   20 Jan 
2010 00:36:02 -0000      1.3
+++ test/encodings/res_info/japanese_shift_jis/lilypond-learning.info   20 Jan 
2010 16:16:41 -0000      1.4
@@ -7,7 +7,8 @@
 courtesy to non-English speakers, but only the notice in English legally
 counts._
 
-   _ˆÈ‰º‚͉pŒê‚ð˜b‚³‚È‚¢lX‚Ì‚½‚ß‚Ì’˜ìŒ 
‚ɂ‚¢‚Ä‚Ì’ˆÓ‘‚«‚Å‚·B‚µ‚©‚µ‚È‚ª‚çA address@hidden
+   _ˆÈ‰º‚͉pŒê‚ð˜b‚³‚È‚¢lX‚Ì‚½‚ß‚Ì’˜ìŒ 
‚ɂ‚¢‚Ä‚Ì’ˆÓ‘‚«‚Å‚·B‚µ‚©‚µ‚È‚ª‚çA
address@hidden
 
 
 File: lilypond-learning.info,  Node: Top,  Next: Preface,  Up: (dir)
@@ -28,11 +29,13 @@
 1 Preface
 *********
 
-‚»‚ê‚Í 1995 ”N‚Ì‚ ‚é“ú‚Ì EJE (Eindhoven Youth Orchestra) 
‚̃Šƒn[ƒTƒ‹’†‚Ì‚Å‚«‚²‚Æ‚Å‚µ‚½ |
+‚»‚ê‚Í 1995 ”N‚Ì‚ ‚é“ú‚Ì EJE (Eindhoven Youth Orchestra)
+‚̃Šƒn[ƒTƒ‹’†‚Ì‚Å‚«‚²‚Æ‚Å‚µ‚½ |
 ‚ ‚é•Ï‚í‚èŽÒ‚̃oƒCƒIƒŠƒ“‘tŽÒ‚Å‚ 
‚éƒWƒƒƒ“‚Í“¯‚¶‚­•Ï‚í‚èŽÒ‚̃tƒŒƒ“ƒ`ƒzƒ‹ƒ“‘tŽÒ‚̃nƒ“-ƒEƒFƒ“‚ɔނª‚©‚©‚í‚Á‚Ä‚¢‚éV‚µ‚¢‘å‚«‚ȃvƒƒWƒFƒNƒg‚Ì‚±‚Æ‚ð˜b‚µ‚Ü‚µ‚½B‚»‚ê‚͉¹Šy‚ðo”Å‚·‚邽‚ß‚ÌŽ©“®‰»‚³‚ꂽƒVƒXƒeƒ€‚Å‚·
 (³Šm‚ɂ́A‚»‚ê‚Í MPP | MusiXTeX
 
‚̃vƒŠƒvƒƒZƒbƒT‚Å‚·)B‚»‚ê‚ð•·‚¢‚ănƒ“-ƒEƒFƒ“‚Í‚·‚®‚ÉŠy•ˆ‚©‚ç‚¢‚­‚‚©‚Ì•”•ª‚ðƒvƒŠƒ“ƒgƒAƒEƒg‚µ‚½‚¢‚ÆŽv‚¢A”Þ‚Í‚»‚Ì‚½‚߂̃\ƒtƒgƒEƒFƒA‚ð’T‚µŽn‚߁A‚·‚®‚É‚»‚Ì—¸‚É‚È‚Á‚Ä‚µ‚Ü‚¢‚Ü‚µ‚½B‚»‚ꂪ
-MPP address@hidden email ‚ÌŒðŠ·‚ÌŒãAƒnƒ“-ƒEƒFƒ“‚Í 1996 ”N‚É LilyPond
+MPP address@hidden email
+‚ÌŒðŠ·‚ÌŒãAƒnƒ“-ƒEƒFƒ“‚Í 1996 ”N‚É LilyPond
 
‚̐»ì‚ðŠJŽn‚µ‚Ü‚µ‚½B‚±‚ÌŽžAƒWƒƒƒ“‚̓nƒ“-ƒEƒFƒ“‚̐V‚µ‚¢ƒvƒƒWƒFƒNƒg‚Ɉø‚«‚¸‚荞‚Ü‚ê‚Ü‚µ‚½B
 
 

Index: test/encodings/res_info/sample_utf8/sample_utf8.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/sample_utf8/sample_utf8.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Binary files /tmp/cvsHUwtOO and /tmp/cvsodMuux differ




reply via email to

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