diff -cr sdf-2.001.org/perllib/sdf/app.pl sdf-2.001/perllib/sdf/app.pl
*** sdf-2.001.org/perllib/sdf/app.pl	Thu May 13 02:19:38 1999
--- sdf-2.001/perllib/sdf/app.pl	Thu Aug 23 14:01:03 2001
***************
*** 43,48 ****
--- 43,55 ----
    require "locale.pm" if $] >= 5.004;
  }
  require "sdf/name.pl";
+ require "jcode.pl";
+ if ($NAME_OS eq 'unix') {
+   $reg_expr = "$jcode're_euc_c|$jcode're_euc_kana|$jcode're_euc_0212";
+ }
+ else{
+   $reg_expr = "$jcode're_sjis_c|$jcode're_sjis_kana";
+ }
  require "sdf/misc.pl";
  require "sdf/table.pl";
  
diff -cr sdf-2.001.org/perllib/sdf/home/stdlib/html.sdn sdf-2.001/perllib/sdf/home/stdlib/html.sdn
*** sdf-2.001.org/perllib/sdf/home/stdlib/html.sdn	Tue May 25 10:56:59 1999
--- sdf-2.001/perllib/sdf/home/stdlib/html.sdn	Thu Aug 23 14:01:03 2001
***************
*** 1,4 ****
! # $Id$
  #
  # >>Title::     HTML Tuning
  #
--- 1,4 ----
! # $Id: html.sdn,v 1.2 2001/01/10 01:48:17 abcichi Exp $
  #
  # >>Title::     HTML Tuning
  #
***************
*** 203,211 ****
          !if DOC_HTML_LOGO
              !default DOC_HTML_LOGO_BASE  $var{'DOC_LOGO_BASE'}
              !import DOC_HTML_LOGO; align=Right; base=$var{'DOC_HTML_LOGO_BASE'}
!             P1[notoc; class='doc-title'] [[DOC_TITLE]]
          !else
!             P1[notoc; class='doc-title'] [[DOC_TITLE]]
          !endif
          !if $var{'OPT_STYLE'} eq 'paper'
              #Sign: [[DOC_STATUS]]
--- 203,225 ----
          !if DOC_HTML_LOGO
              !default DOC_HTML_LOGO_BASE  $var{'DOC_LOGO_BASE'}
              !import DOC_HTML_LOGO; align=Right; base=$var{'DOC_HTML_LOGO_BASE'}
!             !if DOC_NAME
!                 P1[notoc; class='doc-title'] [[DOC_NAME]]
!                 !if DOC_TYPE
!                     P2[notoc; class='doc-title'] [[DOC_TYPE]]
!                 !endif
!             !else
!                 P1[notoc; class='doc-title'] [[DOC_TITLE]]
!             !endif
          !else
!             !if DOC_NAME
!                 P1[notoc; class='doc-title'] [[DOC_NAME]]
!                 !if DOC_TYPE
!                     P2[notoc; class='doc-title'] [[DOC_TYPE]]
!                 !endif
!             !else
!                 P1[notoc; class='doc-title'] [[DOC_TITLE]]
!             !endif
          !endif
          !if $var{'OPT_STYLE'} eq 'paper'
              #Sign: [[DOC_STATUS]]
***************
*** 215,221 ****
              Sign: {{A[class='doc-id'][[DOC_ID]]}}
          !endif
          Sign[class='doc-author'] [[join(", ", grep(/\w/, &Var('DOC_AUTHOR'), &Var('DOC_AUTHOR2'), &Var('DOC_AUTHOR3')))]]
!         Sign[class='doc-modified'] [[DATE:DOC_MODIFIED]]
          !clear
          !enddiv
  
--- 229,236 ----
              Sign: {{A[class='doc-id'][[DOC_ID]]}}
          !endif
          Sign[class='doc-author'] [[join(", ", grep(/\w/, &Var('DOC_AUTHOR'), &Var('DOC_AUTHOR2'), &Var('DOC_AUTHOR3')))]]
! #        Sign[class='doc-modified'] [[DATE:DOC_MODIFIED]]
!         Sign[class='doc-modified'] [[DOC_RCSID]]
          !clear
          !enddiv
  
diff -cr sdf-2.001.org/perllib/sdf/home/stdlib/macros.sdm sdf-2.001/perllib/sdf/home/stdlib/macros.sdm
*** sdf-2.001.org/perllib/sdf/home/stdlib/macros.sdm	Tue May 25 10:54:31 1999
--- sdf-2.001/perllib/sdf/home/stdlib/macros.sdm	Thu Aug 23 14:01:03 2001
***************
*** 1,4 ****
! # $Id$
  #
  # >>Title::     Macros Module
  #
--- 1,4 ----
! # $Id: macros.sdm,v 1.2 2001/01/10 01:48:17 abcichi Exp $
  #
  # >>Title::     Macros Module
  #
***************
*** 63,68 ****
--- 63,70 ----
  !if $var{'DOC_CODE'} ne '' && $var{'DOC_NAME'} eq ''
  !define DOC_NAME $obj_short{'references',&Var('DOC_CODE'),'Document'}
  !endif
+ 
+ !define DOC_RCSID  $var{'DOC_RCSID'}
  
  # Build the document title
  !if DOC_TYPE
diff -cr sdf-2.001.org/perllib/sdf/home/stdlib/stdlib.sdm sdf-2.001/perllib/sdf/home/stdlib/stdlib.sdm
*** sdf-2.001.org/perllib/sdf/home/stdlib/stdlib.sdm	Mon May 24 12:04:22 1999
--- sdf-2.001/perllib/sdf/home/stdlib/stdlib.sdm	Thu Aug 23 14:01:03 2001
***************
*** 1,4 ****
! # $Id$
  #
  # >>Title::     Standard Library
  #
--- 1,4 ----
! # $Id: stdlib.sdm,v 1.2 2001/01/10 01:48:17 abcichi Exp $
  #
  # >>Title::     Standard Library
  #
***************
*** 435,440 ****
--- 435,441 ----
  TWO_SIDES       boolean
  COMPONENT       string
  PAGED           boolean
+ RCSID           string
  !endblock
  
  # Export these for use in generating lists
diff -cr sdf-2.001.org/perllib/sdf/subs.pl sdf-2.001/perllib/sdf/subs.pl
*** sdf-2.001.org/perllib/sdf/subs.pl	Wed May 12 21:39:14 1999
--- sdf-2.001/perllib/sdf/subs.pl	Thu Aug 23 14:01:03 2001
***************
*** 210,215 ****
--- 210,216 ----
          $fullname = &'NameFind($filename, @dirs);
      }
  
+     $fullname =~ s/^$dir\///o;
      # Return results
      &'AppTrace("user", 2, "file '$filename' -> '$fullname'") if
        $fullname ne '';
***************
*** 1125,1134 ****
--- 1126,1145 ----
  #   local();
      local($fullname);
      local($base);
+     local($dir, $name, $ext, $short);
  
      # Search for an image file - the 2nd option switches on searching
      # (and converting) of an extension from a target-derived list
      $fullname = &FindFile($filename, 1);
+     if ($var{'OPT_TARGET'} eq 'html') {
+       local($tfullname);
+       $tfullname = &FindFile("t-$filename", 1);
+       if ($tfullname ne '') {
+         $fullname =~ s/^\.\///;
+         $attr{'jump'} = $fullname;
+         $fullname = $tfullname;
+       }
+     }
  
      # take out any silly ./'s that are added  --tjh
      $fullname =~ s/^\.\///;
***************
*** 1141,1147 ****
      $attr{'fullname'} = $fullname;
  
      # Update the filename
!     $filename = (&'NameSplit($fullname))[3];
  
      # Prepend the base location, if necessary
      $base = $attr{'base'};
--- 1152,1162 ----
      $attr{'fullname'} = $fullname;
  
      # Update the filename
!     ($dir, $name, $ext, $short) = &'NameSplit($fullname);
!     if (&'NameOS eq 'dos'){
!       $dir =~ s#/#\\#g;
!     }
!     $filename = &'NameJoin($dir, $name, $ext);
  
      # Prepend the base location, if necessary
      $base = $attr{'base'};
diff -cr sdf-2.001.org/perllib/sdf/table.pl sdf-2.001/perllib/sdf/table.pl
*** sdf-2.001.org/perllib/sdf/table.pl	Mon Apr 26 23:24:43 1999
--- sdf-2.001/perllib/sdf/table.pl	Thu Aug 23 14:01:03 2001
***************
*** 266,276 ****
      $format =~ s/^\s+//;
  
      # find the field separator
!     ($sep) = $format =~ /(\W)/;
  
      # for custom formats, handling is currently undecided
!     if ($format !~ /^\w/) {
!         &AppMsg("failure", "TableFields() does not support custom formats yet");
      }
  
      # for single column tables, the field is the format
--- 266,277 ----
      $format =~ s/^\s+//;
  
      # find the field separator
!     $format =~ /((\w|$reg_expr)*)(\W)/o;
!     $sep = $3;
  
      # for custom formats, handling is currently undecided
!     if ($format !~ /^(\w|$reg_expr)/o){
!         &AppMsg("failed", "TableFields() does not support custom formats yet");
      }
  
      # for single column tables, the field is the format
***************
*** 806,812 ****
              $leading_indent_size = length($1);
              $format = $_;
              push(@table, $format);
!             ($sep) = $format =~ /(\W)/;
              if ($sep =~ /\s/) {
                  $unpackfmt = &_TablePackStr($format);
              }
--- 807,814 ----
              $leading_indent_size = length($1);
              $format = $_;
              push(@table, $format);
!             $format =~ /((\w|$reg_expr)*)(\W)/o;
!             $sep = $3;
              if ($sep =~ /\s/) {
                  $unpackfmt = &_TablePackStr($format);
              }
***************
*** 915,921 ****
      local($packfmt);
  
      $packfmt = '';
!     while ($format =~ s/\w+\s+//e) {
          $packfmt .= 'A' . length($&);
      }
      $packfmt .= 'A*';
--- 917,923 ----
      local($packfmt);
  
      $packfmt = '';
!     while ($format =~ s/(\w|$reg_expr)+\s+//eo) {
          $packfmt .= 'A' . length($&);
      }
      $packfmt .= 'A*';