r1101 - in packages/libpdf-api2-perl/trunk: . debian examples lib/PDF/API2 lib/PDF/API2/Basic/PDF lib/PDF/API2/Resource lib/PDF/API2/Resource/CIDFont lib/PDF/API2/Resource/Font

Gunnar Wolf gwolf at costa.debian.org
Sun Jul 17 08:09:15 UTC 2005


Author: gwolf
Date: 2005-06-10 14:20:17 +0000 (Fri, 10 Jun 2005)
New Revision: 1101

Added:
   packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/unicolor.txt
   packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/unipaper.txt
Modified:
   packages/libpdf-api2-perl/trunk/CHANGELOG
   packages/libpdf-api2-perl/trunk/MANIFEST
   packages/libpdf-api2-perl/trunk/Makefile.PL
   packages/libpdf-api2-perl/trunk/debian/changelog
   packages/libpdf-api2-perl/trunk/examples/023_cjkfonts
   packages/libpdf-api2-perl/trunk/examples/025_unifonts
   packages/libpdf-api2-perl/trunk/lib/PDF/API2/Basic/PDF/File.pm
   packages/libpdf-api2-perl/trunk/lib/PDF/API2/Content.pm
   packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/CIDFont/CJKFont.pm
   packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/Font/CoreFont.pm
   packages/libpdf-api2-perl/trunk/lib/PDF/API2/Util.pm
   packages/libpdf-api2-perl/trunk/lib/PDF/API2/Version.pm
Log:
New upstream version 0.42


Modified: packages/libpdf-api2-perl/trunk/CHANGELOG
===================================================================
--- packages/libpdf-api2-perl/trunk/CHANGELOG	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/CHANGELOG	2005-06-10 14:20:17 UTC (rev 1101)
@@ -1,3 +1,29 @@
+2005-05-29 11:48  fredo
+
+	* lib/PDF/API2/Content.pm: added conditional textstate2 method
+
+2005-05-29 11:47  fredo
+
+	* lib/PDF/API2/Resource/Font/CoreFont.pm: cosmetic changes
+
+2005-05-28 18:13  fredo
+
+	* MANIFEST: added unicolor/unipaper.txt
+
+2005-05-28 17:58  fredo
+
+	* lib/PDF/API2/Resource/: unicolor.txt, unipaper.txt: genesis
+
+2005-05-28 17:58  fredo
+
+	* lib/PDF/API2/Util.pm: added xmldecl for markup code moved
+	  colors/pagesizes to separate files
+
+2005-03-25 14:30  fredo
+
+	* Makefile.PL: changed release level versioning vs. maintainance
+	  level
+
 2005-03-25 14:19  fredo
 
 	* lib/PDF/API2/Basic/PDF/File.pm: fixed string exhaustion in array
@@ -2621,6 +2647,15 @@
 
 	* lib/PDF/API2/Basic/TTF/Manual.pod: no message
 
+2003-04-09 13:13  fredo
+
+	* lib/PDF/API2/Resource/CIDFont/CJKFont.pm: added/fixed proper
+	  alias/substitutions
+
+2003-04-09 13:12  fredo
+
+	* lib/PDF/API2/Content.pm: documented form-image
+
 2002-10-02 18:47  Administrator
 
 	* lib/PDF/API2/Basic/TTF/Changes: Initial revision

Modified: packages/libpdf-api2-perl/trunk/MANIFEST
===================================================================
--- packages/libpdf-api2-perl/trunk/MANIFEST	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/MANIFEST	2005-06-10 14:20:17 UTC (rev 1101)
@@ -25,7 +25,9 @@
 lib/PDF/API2/Util.pm
 lib/PDF/API2/Win32.pm
 lib/PDF/API2/Version.pm
+lib/PDF/API2/Resource/unicolor.txt
 lib/PDF/API2/Resource/uniglyph.txt
+lib/PDF/API2/Resource/unipaper.txt
 lib/PDF/API2/Resource/BaseFont.pm
 lib/PDF/API2/Resource/CIDFont.pm
 lib/PDF/API2/Resource/ColorSpace.pm

Modified: packages/libpdf-api2-perl/trunk/Makefile.PL
===================================================================
--- packages/libpdf-api2-perl/trunk/Makefile.PL	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/Makefile.PL	2005-06-10 14:20:17 UTC (rev 1101)
@@ -28,7 +28,7 @@
 #   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #   Boston, MA 02111-1307, USA.
 #
-#   $Id: Makefile.PL,v 1.26 2005/03/15 17:29:24 fredo Exp $
+#   $Id: Makefile.PL,v 1.27 2005/03/25 13:30:55 fredo Exp $
 #
 #=======================================================================
 
@@ -68,6 +68,11 @@
     }
     my $triple="$ver.$rev$typ$lev";
     my $ptriple="$ver.$rev$ptyp$lev";
+    if($lev==0 && $ptyp eq '.')
+    {
+        $ptriple="$ver.$rev";
+        $triple="$ver.$rev";
+    }
     my %hash=(
         'vHex'     => sprintf('0x%08X',$hex),
         'vShort'   => "$triple",

Modified: packages/libpdf-api2-perl/trunk/debian/changelog
===================================================================
--- packages/libpdf-api2-perl/trunk/debian/changelog	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/debian/changelog	2005-06-10 14:20:17 UTC (rev 1101)
@@ -1,3 +1,9 @@
+libpdf-api2-perl (0.42-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 10 Jun 2005 09:16:28 -0500
+
 libpdf-api2-perl (0.41.00-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/libpdf-api2-perl/trunk/examples/023_cjkfonts
===================================================================
--- packages/libpdf-api2-perl/trunk/examples/023_cjkfonts	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/examples/023_cjkfonts	2005-06-10 14:20:17 UTC (rev 1101)
@@ -42,8 +42,20 @@
 my $sx=33;
 my $sy=45;
 my $fx=20;
-#japanese2 korean japanese  traditional simplified
-foreach $fn (qw[ simplified ]) {
+#
+# Ming Ming-Bold Ming-Italic Ming-BoldItalic
+# Song Song-Bold Song-Italic Song-BoldItalic
+# MyungJo MyungJo-Bold MyungJo-Italic MyungJo-BoldItalic
+# KozMin KozMin-Bold KozMin-Italic KozMin-BoldItalic
+# KozGo KozGo-Bold KozGo-Italic KozGo-BoldItalic
+#
+foreach $fn (qw[ 
+    Ming Ming-Bold Ming-Italic Ming-BoldItalic
+    Song Song-Bold Song-Italic Song-BoldItalic
+    MyungJo MyungJo-Bold MyungJo-Italic MyungJo-BoldItalic
+    KozMin KozMin-Bold KozMin-Italic KozMin-BoldItalic
+    KozGo KozGo-Bold KozGo-Italic KozGo-BoldItalic
+]) {
 
     $pdf=PDF::API2->new(-file => "$0.$fn.pdf");
 

Modified: packages/libpdf-api2-perl/trunk/examples/025_unifonts
===================================================================
--- packages/libpdf-api2-perl/trunk/examples/025_unifonts	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/examples/025_unifonts	2005-06-10 14:20:17 UTC (rev 1101)
@@ -79,23 +79,35 @@
 $tre2=$api->synfont($treb,-slant=>1.1,-space=>60);
 $georg=$api->corefont('Georgia-Italic',-encode=>'latin1');
 
-$jfs=$api->cjkfont( 'mincho-w7', -encode=>'shiftjis' );
-$jf2=$api->cjkfont( 'gothic-w9', -encode=>'shiftjis' );
+$jfs=$api->cjkfont( 'KozMin', -encode=>'shiftjis' );
+$jf1=$api->cjkfont( 'KozMin-Bold', -encode=>'shiftjis' );
+$jf2=$api->cjkfont( 'KozGo-Italic', -encode=>'shiftjis' );
 
-$uf=$api->unifont($jfs,[$time2,[0]], -encode=>'shiftjis');
+$uf=$api->unifont($jf1,[$time2,[0]], -encode=>'shiftjis');
 $u2=$api->unifont($jf2,[$tre2,[0]], -encode=>'shiftjis');
 $u3=$api->unifont($jf2,{ font=>$georg, blocks=>[0] }, -encode=>'shiftjis');
 
 $start=tell(DATA);
 
+q|    Ming Ming-Bold Ming-Italic Ming-BoldItalic
+    Song Song-Bold Song-Italic Song-BoldItalic
+    MyungJo MyungJo-Bold MyungJo-Italic MyungJo-BoldItalic
+    KozMin KozMin-Bold KozMin-Italic KozMin-BoldItalic
+    KozGo KozGo-Bold KozGo-Italic KozGo-BoldItalic|;
+
 %fonts=(
-'Mincho W7'=>$jfs,
-'Mincho W7 + Times(expanded=1.3)'=>$uf,
-'Gothic W9 + Trebuchet Italic'=>$u2,
-'Gothic W9 + Georgia Italic'=>$u3
+'KozMin'=>$jfs,
+'KozMin-Bold + Times'=>$uf,
+'KozGo-Italic + Trebuchet-Italic'=>$u2,
+'KozGo-Italic + Georgia-Italic'=>$u3
 );
 
-foreach my $fontname ('Mincho W7','Mincho W7 + Times(expanded=1.3)','Gothic W9 + Trebuchet Italic','Gothic W9 + Georgia Italic')
+$y=800;
+
+$page = $api->page;
+$gfx = $page->gfx;
+
+foreach my $fontname ('KozMin','KozMin-Bold + Times','KozGo-Italic + Trebuchet-Italic','KozGo-Italic + Georgia-Italic')
 {
     my $font=$fonts{$fontname};
     $uw->{widthobj}=$font;
@@ -103,47 +115,21 @@
     seek(DATA,$start,0);
     binmode(DATA,':raw');
 
-    $page = $api->page;
-    $gfx = $page->gfx;
     #delete $gfx->{Filter};
     $i=0;
 
-    $gfx->textlabel(50,800,$helv,10,$fontname,-color=>'darkred');
-
-    while(!eof(DATA))
-    {
-        #print STDERR "$i -- ";
-        $line=<DATA>;
-        $line=~s|[\012\015]+$||go;
-        foreach my $textline ($uw->break_lines(decode('shiftjis',$line)))
-        {
-            ## utf8::upgrade($textline);
-            if($i==50)
-            {
-                seek(DATA,0,2);
-                last;
-                $page = $api->page;
-                $gfx = $page->gfx;
-                #delete $gfx->{Filter};
-                $i=0;
-            }
-            $gfx->add("\n");
-            $gfx->textlabel(97,786-$i*15,$helv,7.5,"$i",-right=>1,-color=>'#a00000');
-            $gfx->add("\n");
-            $gfx->textlabel(100,785-$i*15,$font,10,$textline,-hspace=>80);
-            $gfx->add("\n");
-            $i++;
-        }
-    }
+    $gfx->textlabel(100,$y,$helv,10,$fontname,-color=>'darkred');
+    $y-=15;
+    $line=<DATA>;
+    $line=~s|[\012\015]+$||go;
+    $gfx->textlabel(100,$y,$font,10,$line,-hspace=>80);
+    $y-=20;
 }
 
 $api->saveas("$0.pdf");
 $api->end;
 
 __END__
-
-=head1 NAME
-
 PDFJ - “ú–{ŒêPDF¶¬ƒ‚ƒWƒ…[ƒ‹
 
 =head1 SYNOPSIS

Modified: packages/libpdf-api2-perl/trunk/lib/PDF/API2/Basic/PDF/File.pm
===================================================================
--- packages/libpdf-api2-perl/trunk/lib/PDF/API2/Basic/PDF/File.pm	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/lib/PDF/API2/Basic/PDF/File.pm	2005-06-10 14:20:17 UTC (rev 1101)
@@ -23,7 +23,7 @@
 #   This specific module is licensed under the Perl Artistic License.
 #
 #
-#   $Id: File.pm,v 1.18 2005/03/25 13:19:41 fredo Exp $
+#   $Id: File.pm,v 1.19 2005/06/02 12:59:43 fredo Exp $
 #
 #=======================================================================
 package PDF::API2::Basic::PDF::File;
@@ -293,7 +293,7 @@
         $self->{' fname'} = $fname;
     }
     $fh->read($buf, 255);
-    if ($buf !~ m/^\%pdf\-1\.(\d)\s*$cr/moi)
+    if ($buf !~ m/^\%pdf\-1\.(\d)\s*/moi)
     { die "$fname not a PDF file version 1.x"; }
     else
     { $self->{' Version'} = $1; }

Modified: packages/libpdf-api2-perl/trunk/lib/PDF/API2/Content.pm
===================================================================
--- packages/libpdf-api2-perl/trunk/lib/PDF/API2/Content.pm	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/lib/PDF/API2/Content.pm	2005-06-10 14:20:17 UTC (rev 1101)
@@ -27,7 +27,7 @@
 #   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #   Boston, MA 02111-1307, USA.
 #
-#   $Id: Content.pm,v 1.34 2005/03/15 02:20:46 fredo Exp $
+#   $Id: Content.pm,v 1.36 2005/05/29 09:48:46 fredo Exp $
 #
 #=======================================================================
 
@@ -47,7 +47,7 @@
 
     @ISA = qw(PDF::API2::Basic::PDF::Dict);
     
-    ( $VERSION ) = '$Revision: 1.34 $' =~ /Revision: (\S+)\s/; # $Date: 2005/03/15 02:20:46 $
+    ( $VERSION ) = '$Revision: 1.36 $' =~ /Revision: (\S+)\s/; # $Date: 2005/05/29 09:48:46 $
 
 }
 
@@ -1186,7 +1186,7 @@
 
 =item $gfx->formimage $imgobj, $x, $y
 
-B<Please Note:> *TODO*
+Places the X-Object (or XO-Form) at x/y with optional scale.
 
 =cut
 
@@ -1339,6 +1339,50 @@
     return(%state);
 }
 
+sub textstate2 
+{
+    my $self=shift @_;
+    my %state;
+    if(scalar @_) 
+    {
+        %state=@_;
+        foreach my $k (qw[ charspace hspace wordspace lead rise render ]) 
+        {
+            next unless($state{$k});
+            if($self->{" $k"} ne $state{$k})
+            {
+                eval ' $self->'.$k.'($state{$k}); ';
+            }
+        }
+        if($state{font} && $state{fontsize}) 
+        {
+            if($self->{" font"} ne $state{font} || $self->{" fontsize"} ne $state{fontsize})
+            {
+                $self->font($state{font},$state{fontsize});
+            }
+        }
+        if($state{fillcolor}) 
+        {
+            $self->fillcolor(@{$state{fillcolor}});
+        }
+        if($state{strokecolor}) 
+        {
+            $self->strokecolor(@{$state{strokecolor}});
+        }
+        %state=();
+    } 
+    else 
+    {
+        foreach my $k (qw[ font fontsize charspace hspace wordspace lead rise render ]) 
+        {
+            $state{$k}=$self->{" $k"};
+        }
+        $state{fillcolor}=[@{$self->{" fillcolor"}}];
+        $state{strokecolor}=[@{$self->{" strokecolor"}}];
+    }
+    return(%state);
+}
+
 =item ($tx,$ty) = $txt->textpos
 
 Gets the current estimated text position.
@@ -2112,6 +2156,12 @@
 =head1 HISTORY
 
     $Log: Content.pm,v $
+    Revision 1.36  2005/05/29 09:48:46  fredo
+    added conditional textstate2 method
+
+    Revision 1.35  2003/04/09 11:12:13  fredo
+    documented form-image
+
     Revision 1.34  2005/03/15 02:20:46  fredo
     added metadata stubs
 

Modified: packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/CIDFont/CJKFont.pm
===================================================================
--- packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/CIDFont/CJKFont.pm	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/CIDFont/CJKFont.pm	2005-06-10 14:20:17 UTC (rev 1101)
@@ -27,7 +27,7 @@
 #   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #   Boston, MA 02111-1307, USA.
 #
-#   $Id: CJKFont.pm,v 1.14 2005/03/14 22:01:07 fredo Exp $
+#   $Id: CJKFont.pm,v 1.15 2003/04/09 11:13:12 fredo Exp $
 #
 #=======================================================================
 package PDF::API2::Resource::CIDFont::CJKFont;
@@ -50,7 +50,7 @@
 
     @ISA = qw( PDF::API2::Resource::CIDFont );
 
-    ( $VERSION ) = '$Revision: 1.14 $' =~ /Revision: (\S+)\s/; # $Date: 2005/03/14 22:01:07 $
+    ( $VERSION ) = '$Revision: 1.15 $' =~ /Revision: (\S+)\s/; # $Date: 2003/04/09 11:13:12 $
 
     $fonts = { };
     $cmap = { };
@@ -67,6 +67,16 @@
 
 Returns a cjk-font object.
 
+Traditional Chinese: Ming Ming-Bold Ming-Italic Ming-BoldItalic
+
+Simplified Chinese: Song Song-Bold Song-Italic Song-BoldItalic
+
+Korean: MyungJo MyungJo-Bold MyungJo-Italic MyungJo-BoldItalic
+
+Japanese (Mincho): KozMin KozMin-Bold KozMin-Italic KozMin-BoldItalic
+
+Japanese (Gothic): KozGo KozGo-Bold KozGo-Italic KozGo-BoldItalic
+
 Defined Options:
 
     -encode ... specify fonts encoding for non-utf8 text.
@@ -83,7 +93,14 @@
         $data=_look_for_font($subs->{$fname}->{-alias});
         foreach my $k (keys %{$subs->{$fname}}) {
           next if($k=~/^\-/);
-          $data->{$k}=$subs->{$fname}->{$k};
+          if(substr($k,0,1) eq '+')
+          {
+              $data->{substr($k,1)}.=$subs->{$fname}->{$k};
+          }
+          else
+          {
+              $data->{$k}=$subs->{$fname}->{$k};
+          }
         }
         $fonts->{$fname}=$data;
         return({%{$data}})
@@ -266,122 +283,97 @@
 
     $alias={
         'traditional'           => 'adobemingstdlightacro',
+        'traditionalbold'       => 'mingbold',
+        'traditionalitalic'     => 'mingitalic',
+        'traditionalbolditalic' => 'mingbolditalic',
         'ming'                  => 'adobemingstdlightacro',
         
         'simplified'            => 'adobesongstdlightacro',
+        'simplifiedbold'        => 'songbold',
+        'simplifieditalic'      => 'songitalic',
+        'simplifiedbolditalic'  => 'songbolditalic',
         'song'                  => 'adobesongstdlightacro',
 
         'korean'                => 'adobemyungjostdmediumacro',
-        'myungjostdmedium'      => 'adobemyungjostdmediumacro',
-        'hysmyeongjomedium'     => 'adobemyungjostdmediumacro',
+        'koreanbold'            => 'myungjobold',      
+        'koreanitalic'          => 'myungjoitalic',    
+        'koreanbolditalic'      => 'myungjobolditalic',
+        'myungjo'               => 'adobemyungjostdmediumacro',
 
-        'japanese'              => 'kozgopromediumacro',
-        'kozgopromedium'        => 'kozgopromediumacro',
-        'gothicbbbmedium'       => 'kozgopromediumacro',
-        'heiseikakugow5'        => 'kozgopromediumacro',
+        'japanese'              => 'kozminproregularacro',
+        'japanesebold'          => 'kozminbold',
+        'japaneseitalic'        => 'kozminitalic',
+        'japanesebolditalic'    => 'kozminbolditalic',
+        'kozmin'                => 'kozminproregularacro',
+        'kozgo'                 => 'kozgopromediumacro',
 
-        'japanese2'             => 'kozminproregularacro',
-        'kozminproregular'      => 'kozminproregularacro',
-        'ryuminlight'           => 'kozminproregularacro',
-        'heiseiminw3'           => 'kozminproregularacro',
     };
     $subs={
-        'minchow3' => {
-            '-alias'            => 'kozminproregularacro',
-            'fontname'          => 'SerifMincho-W3', 
-            'fontfamily'        => 'SerifMincho',
-            'fontstretch'       => 'Normal',
-            'fontweight'        => '300',
-            'altname'           => 'SerifMinchoW3',
-            'subname'           => 'Regular',
-            'cmap'              => 'japanese',
-            'encode'            => 'euc-jp',
-            'panose'            => "\x01\x05\x02\x0b\x04\x00\x00\x00\x00\x00\x00\x00",
+    # Chinese Traditional (ie. Taiwan) Fonts
+        'mingitalic' => {
+            '-alias'            => 'adobemingstdlightacro',
+            '+fontname'          => ',Italic', 
         },
-        'minchow5' => {
-            '-alias'            => 'kozminproregularacro',
-            'fontname'          => 'SerifMincho-W5', 
-            'fontfamily'        => 'SerifMincho',
-            'fontstretch'       => 'Normal',
-            'fontweight'        => '500',
-            'altname'           => 'SerifMinchoW5',
-            'subname'           => 'Regular',
-            'cmap'              => 'japanese',
-            'encode'            => 'euc-jp',
-            'panose'            => "\x01\x05\x02\x0b\x06\x00\x00\x00\x00\x00\x00\x00",
+        'mingbold' => {
+            '-alias'            => 'adobemingstdlightacro',
+            '+fontname'          => ',Bold', 
         },
-        'minchow7' => {
-            '-alias'            => 'kozminproregularacro',
-            'fontname'          => 'SerifMincho-W7', 
-            'fontfamily'        => 'SerifMincho',
-            'fontstretch'       => 'Normal',
-            'fontweight'        => '700',
-            'altname'           => 'SerifMinchoW7',
-            'subname'           => 'Regular',
-            'cmap'              => 'japanese',
-            'encode'            => 'euc-jp',
-            'panose'            => "\x01\x05\x02\x0b\x08\x00\x00\x00\x00\x00\x00\x00",
+        'mingbolditalic' => {
+            '-alias'            => 'adobemingstdlightacro',
+            '+fontname'          => ',BoldItalic', 
         },
-        'minchow9' => {
-            '-alias'            => 'kozminproregularacro',
-            'fontname'          => 'SerifMincho-W9', 
-            'fontfamily'        => 'SerifMincho',
-            'fontstretch'       => 'Normal',
-            'fontweight'        => '900',
-            'altname'           => 'SerifMinchoW9',
-            'subname'           => 'Regular',
-            'cmap'              => 'japanese',
-            'encode'            => 'euc-jp',
-            'panose'            => "\x01\x05\x02\x0b\x0a\x00\x00\x00\x00\x00\x00\x00",
+    # Chinese Simplified (ie. Mainland China) Fonts
+        'songitalic' => {
+            '-alias'            => 'adobesongstdlightacro',
+            '+fontname'          => ',Italic', 
         },
-        'gothicw3' => {
-            '-alias'            => 'kozgopromediumacro',
-            'fontname'          => 'SansGothic-W3', 
-            'fontfamily'        => 'SansGothic',
-            'fontstretch'       => 'Normal',
-            'fontweight'        => '300',
-            'altname'           => 'SansGothicW3',
-            'subname'           => 'Regular',
-            'cmap'              => 'japanese',
-            'encode'            => 'euc-jp',
-            'panose'            => "\x08\x01\x02\x0b\x03\x00\x00\x00\x00\x00\x00\x00",
+        'songbold' => {
+            '-alias'            => 'adobesongstdlightacro',
+            '+fontname'          => ',Bold', 
         },
-        'gothicw5' => {
+        'songbolditalic' => {
+            '-alias'            => 'adobesongstdlightacro',
+            '+fontname'          => ',BoldItalic', 
+        },
+    # Japanese Gothic (ie. sans) Fonts
+        'kozgoitalic' => {
             '-alias'            => 'kozgopromediumacro',
-            'fontname'          => 'SansGothic-W5', 
-            'fontfamily'        => 'SansGothic',
-            'fontstretch'       => 'Normal',
-            'fontweight'        => '500',
-            'altname'           => 'SansGothicW5',
-            'subname'           => 'Regular',
-            'cmap'              => 'japanese',
-            'encode'            => 'euc-jp',
-            'panose'            => "\x08\x01\x02\x0b\x05\x00\x00\x00\x00\x00\x00\x00",
+            '+fontname'          => ',Italic', 
         },
-        'gothicw7' => {
+        'kozgobold' => {
             '-alias'            => 'kozgopromediumacro',
-            'fontname'          => 'SansGothic-W7', 
-            'fontfamily'        => 'SansGothic',
-            'fontstretch'       => 'Normal',
-            'fontweight'        => '700',
-            'altname'           => 'SansGothicW7',
-            'subname'           => 'Regular',
-            'cmap'              => 'japanese',
-            'encode'            => 'euc-jp',
-            'panose'            => "\x08\x01\x02\x0b\x07\x00\x00\x00\x00\x00\x00\x00",
+            '+fontname'          => ',Bold', 
         },
-        'gothicw9' => {
+        'kozgobolditalic' => {
             '-alias'            => 'kozgopromediumacro',
-            'fontname'          => 'SansGothic-W9', 
-            'fontfamily'        => 'SansGothic',
-            'fontstretch'       => 'Normal',
-            'fontweight'        => '900',
-            'altname'           => 'SansGothicW9',
-            'subname'           => 'Regular',
-            'cmap'              => 'japanese',
-            'encode'            => 'euc-jp',
-            'panose'            => "\x08\x01\x02\x0b\x09\x00\x00\x00\x00\x00\x00\x00",
+            '+fontname'          => ',BoldItalic', 
         },
+    # Japanese Mincho (ie. serif) Fonts
+        'kozminitalic' => {
+            '-alias'            => 'kozminproregularacro',
+            '+fontname'          => ',Italic', 
+        },
+        'kozminbold' => {
+            '-alias'            => 'kozminproregularacro',
+            '+fontname'          => ',Bold', 
+        },
+        'kozminbolditalic' => {
+            '-alias'            => 'kozminproregularacro',
+            '+fontname'          => ',BoldItalic', 
+        },
+    # Korean Fonts
+        'myungjoitalic' => {
+            '-alias'            => 'adobemyungjostdmediumacro',
+            '+fontname'          => ',Italic', 
+        },
+        'myungjobold' => {
+            '-alias'            => 'adobemyungjostdmediumacro',
+            '+fontname'          => ',Bold', 
+        },
+        'myungjobolditalic' => {
+            '-alias'            => 'adobemyungjostdmediumacro',
+            '+fontname'          => ',BoldItalic', 
+        },
     };
 
 }
@@ -396,6 +388,9 @@
 =head1 HISTORY
 
     $Log: CJKFont.pm,v $
+    Revision 1.15  2003/04/09 11:13:12  fredo
+    added/fixed proper alias/substitutions
+
     Revision 1.14  2005/03/14 22:01:07  fredo
     upd 2005
 

Modified: packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/Font/CoreFont.pm
===================================================================
--- packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/Font/CoreFont.pm	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/Font/CoreFont.pm	2005-06-10 14:20:17 UTC (rev 1101)
@@ -38,7 +38,7 @@
 #   FREE SOFTWARE FOUNDATION, INC., 59 TEMPLE PLACE - SUITE 330,
 #   BOSTON, MA 02111-1307, USA.
 #
-#   $Id: CoreFont.pm,v 1.10 2005/03/14 22:01:27 fredo Exp $
+#   $Id: CoreFont.pm,v 1.11 2005/05/29 09:47:38 fredo Exp $
 #
 #=======================================================================
 package PDF::API2::Resource::Font::CoreFont;
@@ -76,7 +76,7 @@
 
     @ISA=qw(PDF::API2::Resource::Font);
 
-    ( $VERSION ) = '$Revision: 1.10 $' =~ /Revision: (\S+)\s/; # $Date: 2005/03/14 22:01:27 $
+    ( $VERSION ) = '$Revision: 1.11 $' =~ /Revision: (\S+)\s/; # $Date: 2005/05/29 09:47:38 $
 
 }
 no warnings qw[ deprecated recursion uninitialized ];
@@ -101,37 +101,46 @@
 
 =cut
 
-sub _look_for_font ($) {
-  my $fname=shift;
-  return(%{$fonts->{$fname}}) if(defined $fonts->{$fname});
-  eval "require PDF::API2::Resource::Font::CoreFont::$fname; ";
-  unless($@){
-    $fonts->{$fname}->{uni}||=[];
-    foreach my $n (0..255) {
-        $fonts->{$fname}->{uni}->[$n]=uniByName($fonts->{$fname}->{char}->[$n]) unless(defined $fonts->{$fname}->{uni}->[$n]);
+sub _look_for_font ($) 
+{
+    my $fname=shift;
+    ## return(%{$fonts->{$fname}}) if(defined $fonts->{$fname});
+    eval "require PDF::API2::Resource::Font::CoreFont::$fname; ";
+    unless($@)
+    {
+        $fonts->{$fname}->{uni}||=[];
+        foreach my $n (0..255) 
+        {
+            $fonts->{$fname}->{uni}->[$n]=uniByName($fonts->{$fname}->{char}->[$n]) unless(defined $fonts->{$fname}->{uni}->[$n]);
+        }
+        return(%{$fonts->{$fname}});
+    } 
+    else 
+    {
+        die "requested font '$fname' not installed ";
     }
-    return(%{$fonts->{$fname}});
-  } else {
-    die "requested font '$fname' not installed ";
-  }
 }
 
-sub _look_for_fontfile ($) {
-  my $fname=shift;
-  my $fpath;
-  foreach my $dir (@INC) {
-    $fpath="$dir/PDF/API2/Resource/Font/CoreFont/$fname";
-    last if(-f $fpath);
-    $fpath=undef;
-  }
-  return($fpath);
+sub _look_for_fontfile ($) 
+{
+    my $fname=shift;
+    my $fpath;
+    foreach my $dir (@INC) 
+    {
+        $fpath="$dir/PDF/API2/Resource/Font/CoreFont/$fname";
+        last if(-f $fpath);
+        $fpath=undef;
+    }
+    return($fpath);
 }
 
-sub new {
+sub new 
+{
     my ($class,$pdf,$name, at opts) = @_;
     my ($self,$data);
     my %opts=();
-    if(-f $name) {
+    if(-f $name) 
+    {
         eval "require '$name'; ";
         $name=basename($name,'.pm');
     }
@@ -142,16 +151,23 @@
 
     $lookname = defined($alias->{$lookname}) ? $alias->{$lookname} : $lookname ;
 
-    if(defined $subs->{$lookname}) {
+    if(defined $subs->{$lookname}) 
+    {
         $data={_look_for_font($subs->{$lookname}->{-alias})};
-        foreach my $k (keys %{$subs->{$lookname}}) {
-          next if($k=~/^\-/);
-          $data->{$k}=$subs->{$lookname}->{$k};
+        foreach my $k (keys %{$subs->{$lookname}}) 
+        {
+            next if($k=~/^\-/);
+            $data->{$k}=$subs->{$lookname}->{$k};
         }
-    } else {
-        unless(defined $opts{-metrics}) {
+    } 
+    else 
+    {
+        unless(defined $opts{-metrics}) 
+        {
           $data={_look_for_font($lookname)};
-        } else {
+        } 
+        else 
+        {
           $data={%{$opts{-metrics}}};
         }
     }
@@ -184,11 +200,13 @@
     $self->{'Subtype'} = PDFName($self->data->{type});
     $self->{'BaseFont'} = PDFName($self->fontname);
 
-    if($opts{-pdfname}) {
+    if($opts{-pdfname}) 
+    {
         $self->name($opts{-pdfname});
     }
 
-    unless($self->data->{iscore}) {
+    unless($self->data->{iscore}) 
+    {
         $self->{'FontDescriptor'}=$self->descrByData();
     }
 
@@ -204,17 +222,18 @@
 
 =cut
 
-sub new_api {
-  my ($class,$api, at opts)=@_;
+sub new_api 
+{
+    my ($class,$api, at opts)=@_;
 
-  my $obj=$class->new($api->{pdf}, at opts);
+    my $obj=$class->new($api->{pdf}, at opts);
 
-  $api->{pdf}->new_obj($obj) unless($obj->is_obj($api->{pdf}));
+    $api->{pdf}->new_obj($obj) unless($obj->is_obj($api->{pdf}));
 
-#  $api->resource('Font',$obj->name,$obj);
+##  $api->resource('Font',$obj->name,$obj);
 
-  $api->{pdf}->out_obj($api->{pages});
-  return($obj);
+    $api->{pdf}->out_obj($api->{pages});
+    return($obj);
 }
 
 =item PDF::API2::Resource::Font::CoreFont->loadallfonts()
@@ -223,35 +242,22 @@
 
 =cut
 
-sub loadallfonts {
-  foreach my $f (qw(
-    courier
-    courierbold
-    courierboldoblique
-    courieroblique
-    georgia
-    georgiabold
-    georgiabolditalic
-    georgiaitalic
-    helveticaboldoblique
-    helveticaoblique
-    helveticabold
-    helvetica
-    symbol
-    timesbolditalic
-    timesitalic
-    timesroman
-    timesbold
-    verdana
-    verdanabold
-    verdanabolditalic
-    verdanaitalic
-    webdings
-    wingdings
-    zapfdingbats
-  )){
-    _look_for_font($f);
-  }
+sub loadallfonts 
+{
+    foreach my $f (qw[ 
+        courier courierbold courierboldoblique courieroblique
+        georgia georgiabold georgiabolditalic georgiaitalic
+        helveticaboldoblique helveticaoblique helveticabold helvetica
+        symbol
+        timesbolditalic timesitalic timesroman timesbold
+        verdana verdanabold verdanabolditalic verdanaitalic
+        webdings
+        wingdings
+        zapfdingbats
+    ])
+    {
+        _look_for_font($f);
+    }
 }
 
 #    andalemono
@@ -264,50 +270,49 @@
 #    trebuchetbolditalic
 #    trebuchetitalic
 
-BEGIN {
+BEGIN 
+{
 
-  $alias = {
-    ## Windows Fonts with Type1 equivalence
+    $alias = {
+        ## Windows Fonts with Type1 equivalence
+        'arial'                     => 'helvetica',
+        'arialitalic'               => 'helveticaoblique',
+        'arialbold'                 => 'helveticabold',
+        'arialbolditalic'           => 'helveticaboldoblique',
 
-    'arial'  =>  'helvetica',
-    'arialitalic' => 'helveticaoblique',
-    'arialbold' => 'helveticabold',
-    'arialbolditalic' => 'helveticaboldoblique',
+        'times'                     => 'timesroman',
+        'timesnewromanbolditalic'   => 'timesbolditalic',
+        'timesnewromanbold'         => 'timesbold',
+        'timesnewromanitalic'       => 'timesitalic',
+        'timesnewroman'             => 'timesroman',
 
-    'times'       => 'timesroman',
-    'timesnewromanbolditalic' => 'timesbolditalic',
-    'timesnewromanbold'   => 'timesbold',
-    'timesnewromanitalic'   => 'timesitalic',
-    'timesnewroman'     => 'timesroman',
+        'couriernewbolditalic'      => 'courierboldoblique',
+        'couriernewbold'            => 'courierbold',
+        'couriernewitalic'          => 'courieroblique',
+        'couriernew'                => 'courier',
+    };
 
-    'couriernewbolditalic'    => 'courierboldoblique',
-    'couriernewbold'    => 'courierbold',
-    'couriernewitalic'    => 'courieroblique',
-    'couriernew'      => 'courier',
-
-
-    #     ## unix/TeX-ish aliases
-    #
-    #     'typewriterbolditalic'    => 'courierboldoblique',
-    #     'typewriterbold'    => 'courierbold',
-    #     'typewriteritalic'    => 'courieroblique',
-    #     'typewriter'      => 'courier',
-    #
-    #     'sansbolditalic'    => 'helveticaboldoblique',
-    #     'sansbold'      => 'helveticabold',
-    #     'sansitalic'      => 'helveticaoblique',
-    #     'sans'        => 'helvetica',
-    #
-    #     'serifbolditalic'   => 'timesbolditalic',
-    #     'serifbold'     => 'timesbold',
-    #     'serifitalic'     => 'timesitalic',
-    #     'serif'       => 'timesroman',
-    #
-    #     'greek'       => 'symbol',
-    #     'bats'        => 'zapfdingbats',
-  };
-
     $subs = {
+        #'bankgothicbold' => {
+        #    'apiname'       => 'Bg2',
+        #    '-alias'        => 'bankgothic',
+        #    'fontname'      => 'BankGothicMediumBT,Bold',
+        #    'flags'         => 32+262144,
+        #},
+        #'bankgothicbolditalic' => {
+        #    'apiname'       => 'Bg3',
+        #    '-alias'        => 'bankgothic',
+        #    'fontname'      => 'BankGothicMediumBT,BoldItalic',
+        #    'italicangle'   => -15,
+        #    'flags'         => 96+262144,
+        #},
+        #'bankgothicitalic' => {
+        #    'apiname'       => 'Bg4',
+        #    '-alias'        => 'bankgothic',
+        #    'fontname'      => 'BankGothicMediumBT,Italic',
+        #    'italicangle'   => -15,
+        #    'flags'         => 96,
+        #},
         #  'impactitalic'      => {
         #            'apiname' => 'Imp2',
         #            '-alias'  => 'impact',
@@ -362,26 +367,6 @@
         #            'fontname'  => 'Arial,Bold',
         #            'flags' => 32+262144,
         #          },
-        #  'bankgothicbold'  => {
-        #            'apiname' => 'Bg2',
-        #            '-alias'  => 'bankgothic',
-        #            'fontname'  => 'BankGothicMediumBT,Bold',
-        #            'flags' => 32+262144,
-        #          },
-        #  'bankgothicbolditalic'  => {
-        #            'apiname' => 'Bg3',
-        #            '-alias'  => 'bankgothic',
-        #            'fontname'  => 'BankGothicMediumBT,BoldItalic',
-        #            'italicangle' => -15,
-        #            'flags' => 96+262144,
-        #          },
-        #  'bankgothicitalic'  => {
-        #            'apiname' => 'Bg4',
-        #            '-alias'  => 'bankgothic',
-        #            'fontname'  => 'BankGothicMediumBT,Italic',
-        #            'italicangle' => -15,
-        #            'flags' => 96,
-        #          },
     };
 
     $fonts = { };
@@ -433,6 +418,9 @@
 =head1 HISTORY
 
     $Log: CoreFont.pm,v $
+    Revision 1.11  2005/05/29 09:47:38  fredo
+    cosmetic changes
+
     Revision 1.10  2005/03/14 22:01:27  fredo
     upd 2005
 

Copied: packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/unicolor.txt (from rev 1100, packages/libpdf-api2-perl/branches/upstream/current/lib/PDF/API2/Resource/unicolor.txt)

Copied: packages/libpdf-api2-perl/trunk/lib/PDF/API2/Resource/unipaper.txt (from rev 1100, packages/libpdf-api2-perl/branches/upstream/current/lib/PDF/API2/Resource/unipaper.txt)

Modified: packages/libpdf-api2-perl/trunk/lib/PDF/API2/Util.pm
===================================================================
--- packages/libpdf-api2-perl/trunk/lib/PDF/API2/Util.pm	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/lib/PDF/API2/Util.pm	2005-06-10 14:20:17 UTC (rev 1101)
@@ -27,7 +27,7 @@
 #   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #   Boston, MA 02111-1307, USA.
 #
-#   $Id: Util.pm,v 1.20 2005/03/15 00:59:43 fredo Exp $
+#   $Id: Util.pm,v 1.21 2005/05/28 15:58:15 fredo Exp $
 #
 #=======================================================================
 package PDF::API2::Util;
@@ -91,37 +91,27 @@
     );
 
 
-    %PaperSizes=(
-        '4a'        =>  [ 4760  , 6716  ],
-        '2a'        =>  [ 3368  , 4760  ],
-        'a0'        =>  [ 2380  , 3368  ],
-        'a1'        =>  [ 1684  , 2380  ],
-        'a2'        =>  [ 1190  , 1684  ],
-        'a3'        =>  [ 842   , 1190  ],
-        'a4'        =>  [ 595   , 842   ],
-        'a5'        =>  [ 421   , 595   ],
-        'a6'        =>  [ 297   , 421   ],
-        '4b'        =>  [ 5656  , 8000  ],
-        '2b'        =>  [ 4000  , 5656  ],
-        'b0'        =>  [ 2828  , 4000  ],
-        'b1'        =>  [ 2000  , 2828  ],
-        'b2'        =>  [ 1414  , 2000  ],
-        'b3'        =>  [ 1000  , 1414  ],
-        'b4'        =>  [ 707   , 1000  ],
-        'b5'        =>  [ 500   , 707   ],
-        'b6'        =>  [ 353   , 500   ],
-        'letter'    =>  [ 612   , 792   ],
-        'broadsheet'    =>  [ 1296  , 1584  ],
-        'ledger'    =>  [ 1224  , 792   ],
-        'tabloid'   =>  [ 792   , 1224  ],
-        'legal'     =>  [ 612   , 1008  ],
-        'executive' =>  [ 522   , 756   ],
-        '36x36'     =>  [ 2592  , 2592  ],
-    );
+    %PaperSizes=();
+    foreach my $dir (@INC) {
+        if(-f "$dir/PDF/API2/Resource/unipaper.txt")
+        {
+            my ($fh,$line);
+            open($fh,"$dir/PDF/API2/Resource/unipaper.txt");
+            while($line=<$fh>)
+            {
+                next if($line=~m|^#|);
+                chomp($line);
+                my ($name,$x,$y)=split(/\s+;\s+/,$line);
+                $PaperSizes{lc $name}=[$x,$y];
+            }
+            close($fh);
+            last;
+        }
+    }
 
     no warnings qw[ recursion uninitialized ];
 
-    ( $VERSION ) = '$Revision: 1.20 $' =~ /Revision: (\S+)\s/; # $Date: 2005/03/15 00:59:43 $
+    ( $VERSION ) = '$Revision: 1.21 $' =~ /Revision: (\S+)\s/; # $Date: 2005/05/28 15:58:15 $
 
     $key_var='CBA';
     $key_var2=0;
@@ -167,690 +157,23 @@
     %u2n=%u2n_o;
     %n2u=%n2u_o;
 
-    %colors=(
-        'aliceblue'                => '#EFF7FF',   #
-        'antiquewhite'             => '#F9EAD7',   #
-        'antiquewhite1'            => '#FFEEDB',   #
-        'antiquewhite2'            => '#EDDFCC',   #
-        'antiquewhite3'            => '#CDBFB0',   #
-        'antiquewhite4'            => '#8A8278',   #
-        'aqua'                     => '#00FFFF',   #
-        'aquamarine'               => '#7FFFD4',   #
-        'aquamarine1'              => '#7FFFD4',   #
-        'aquamarine2'              => '#76EDC5',   #
-        'aquamarine3'              => '#66CDAA',   #
-        'aquamarine4'              => '#458A74',   #
-        'azure'                    => '#EFFFFF',   #
-        'azure1'                   => '#EFFFFF',   #
-        'azure2'                   => '#E0EDED',   #
-        'azure3'                   => '#C0CDCD',   #
-        'azure4'                   => '#828A8A',   #
-        'beige'                    => '#F4F4DC',   #
-        'bisque'                   => '#FFE4C3',   #
-        'bisque1'                  => '#FFE4C3',   #
-        'bisque2'                  => '#EDD5B6',   #
-        'bisque3'                  => '#CDB69E',   #
-        'bisque4'                  => '#8A7D6B',   #
-        'black'                    => '#000000',   #
-        'blanchedalmond'           => '#FFEACD',   #
-        'blue'                     => '#0000FF',   #
-        'blue1'                    => '#0000FF',   #
-        'blue2'                    => '#0000ED',   #
-        'blue3'                    => '#0000CD',   #
-        'blue4'                    => '#00008A',   #
-        'blueviolet'               => '#9F5E9F',   #
-        'brass'                    => '#B4A642',   #
-        'brightgold'               => '#D9D918',   #
-        'bronze'                   => '#8B7852',   #
-        'bronzeii'                 => '#A67D3D',   #
-        'brown'                    => '#A52929',   #
-        'brown1'                   => '#FF4040',   #
-        'brown2'                   => '#ED3B3B',   #
-        'brown3'                   => '#CD3333',   #
-        'brown4'                   => '#8A2222',   #
-        'burlywood'                => '#DEB786',   #
-        'burlywood1'               => '#FFD39B',   #
-        'burlywood2'               => '#EDC490',   #
-        'burlywood3'               => '#CDAA7D',   #
-        'burlywood4'               => '#8A7354',   #
-        'cadetblue'                => '#5E9EA0',   #
-        'cadetblue1'               => '#98F4FF',   #
-        'cadetblue2'               => '#8DE5ED',   #
-        'cadetblue3'               => '#7AC4CD',   #
-        'cadetblue4'               => '#52858A',   #
-        'chartreuse'               => '#7FFF00',   #
-        'chartreuse1'              => '#7FFF00',   #
-        'chartreuse2'              => '#76ED00',   #
-        'chartreuse3'              => '#66CD00',   #
-        'chartreuse4'              => '#458A00',   #
-        'chocolate'                => '#D2691D',   #
-        'chocolate1'               => '#FF7F23',   #
-        'chocolate2'               => '#ED7620',   #
-        'chocolate3'               => '#CD661C',   #
-        'chocolate4'               => '#8A4512',   #
-        'coolcopper'               => '#D98618',   #
-        'coral'                    => '#FF7F4F',   #
-        'coral1'                   => '#FF7255',   #
-        'coral2'                   => '#ED6A4F',   #
-        'coral3'                   => '#CD5A45',   #
-        'coral4'                   => '#8A3E2E',   #
-        'cornflowerblue'           => '#6394EC',   #
-        'cornsilk'                 => '#FFF7DC',   #
-        'cornsilk1'                => '#FFF7DC',   #
-        'cornsilk2'                => '#EDE7CD',   #
-        'cornsilk3'                => '#CDC7B1',   #
-        'cornsilk4'                => '#8A8778',   #
-        'crimson'                  => '#DC143C',   #
-        'cyan'                     => '#00FFFF',   #
-        'cyan1'                    => '#00FFFF',   #
-        'cyan2'                    => '#00EDED',   #
-        'cyan3'                    => '#00CDCD',   #
-        'cyan4'                    => '#008A8A',   #
-        'darkblue'                 => '#00008A',   #
-        'darkcyan'                 => '#008A8A',   #
-        'darkgoldenrod'            => '#B7850B',   #
-        'darkgoldenrod1'           => '#FFB80E',   #
-        'darkgoldenrod2'           => '#EDAD0D',   #
-        'darkgoldenrod3'           => '#CD940C',   #
-        'darkgoldenrod4'           => '#8A6507',   #
-        'darkgray'                 => '#A9A9A9',   #
-        'darkgreen'                => '#006300',   #
-        'darkgrey'                 => '#A9A9A9',   #
-        'darkkhaki'                => '#BCB66B',   #
-        'darkmagenta'              => '#8A008A',   #
-        'darkolivegreen'           => '#546B2E',   #
-        'darkolivegreen1'          => '#CAFF70',   #
-        'darkolivegreen2'          => '#BBED68',   #
-        'darkolivegreen3'          => '#A2CD59',   #
-        'darkolivegreen4'          => '#6E8A3D',   #
-        'darkorange'               => '#FF8B00',   #
-        'darkorange1'              => '#FF7F00',   #
-        'darkorange2'              => '#ED7600',   #
-        'darkorange3'              => '#CD6600',   #
-        'darkorange4'              => '#8A4500',   #
-        'darkorchid'               => '#9931CC',   #
-        'darkorchid1'              => '#BE3EFF',   #
-        'darkorchid2'              => '#B13AED',   #
-        'darkorchid3'              => '#9A31CD',   #
-        'darkorchid4'              => '#68218A',   #
-        'darkred'                  => '#8A0000',   #
-        'darksalmon'               => '#E8957A',   #
-        'darkseagreen'             => '#8EBB8E',   #
-        'darkseagreen1'            => '#C0FFC0',   #
-        'darkseagreen2'            => '#B4EDB4',   #
-        'darkseagreen3'            => '#9BCD9B',   #
-        'darkseagreen4'            => '#698A69',   #
-        'darkslateblue'            => '#483D8A',   #
-        'darkslategray'            => '#2E4E4E',   #
-        'darkslategray1'           => '#97FFFF',   #
-        'darkslategray2'           => '#8CEDED',   #
-        'darkslategray3'           => '#79CDCD',   #
-        'darkslategray4'           => '#518A8A',   #
-        'darkslategrey'            => '#2E4E4E',   #
-        'darkturquoise'            => '#00CED1',   #
-        'darkviolet'               => '#9300D3',   #
-        'darkwood'                 => '#845D42',   #
-        'deeppink'                 => '#FF1492',   #
-        'deeppink1'                => '#FF1492',   #
-        'deeppink2'                => '#ED1188',   #
-        'deeppink3'                => '#CD1076',   #
-        'deeppink4'                => '#8A0A4F',   #
-        'deepskyblue'              => '#00BEFF',   #
-        'deepskyblue1'             => '#00BEFF',   #
-        'deepskyblue2'             => '#00B1ED',   #
-        'deepskyblue3'             => '#009ACD',   #
-        'deepskyblue4'             => '#00688A',   #
-        'dimgray'                  => '#696969',   #
-        'dimgrey'                  => '#696969',   #
-        'dodgerblue'               => '#1D8FFF',   #
-        'dodgerblue1'              => '#1D8FFF',   #
-        'dodgerblue2'              => '#1B85ED',   #
-        'dodgerblue3'              => '#1774CD',   #
-        'dodgerblue4'              => '#104D8A',   #
-        'dustyrose'                => '#846262',   #
-        'feldspar'                 => '#D19175',   #
-        'firebrick'                => '#B12121',   #
-        'firebrick1'               => '#FF2F2F',   #
-        'firebrick2'               => '#ED2B2B',   #
-        'firebrick3'               => '#CD2525',   #
-        'firebrick4'               => '#8A1919',   #
-        'flesh'                    => '#F4CCB0',   #
-        'floralwhite'              => '#FFF9EF',   #
-        'forestgreen'              => '#218A21',   #
-        'fuchsia'                  => '#FF00FF',   #
-        'gainsboro'                => '#DCDCDC',   #
-        'ghostwhite'               => '#F7F7FF',   #
-        'gold'                     => '#FFD700',   #
-        'gold1'                    => '#FFD700',   #
-        'gold2'                    => '#EDC900',   #
-        'gold3'                    => '#CDAD00',   #
-        'gold4'                    => '#8A7500',   #
-        'goldenrod'                => '#DAA51F',   #
-        'goldenrod1'               => '#FFC024',   #
-        'goldenrod2'               => '#EDB421',   #
-        'goldenrod3'               => '#CD9B1C',   #
-        'goldenrod4'               => '#8A6914',   #
-        'gray'                     => '#7F7F7F',   #
-        'gray0'                    => '#000000',   #
-        'gray1'                    => '#020202',   #
-        'gray10'                   => '#191919',   #
-        'gray100'                  => '#FFFFFF',   #
-        'gray11'                   => '#1B1B1B',   #
-        'gray12'                   => '#1E1E1E',   #
-        'gray13'                   => '#202020',   #
-        'gray14'                   => '#232323',   #
-        'gray15'                   => '#252525',   #
-        'gray16'                   => '#282828',   #
-        'gray17'                   => '#2A2A2A',   #
-        'gray18'                   => '#2D2D2D',   #
-        'gray19'                   => '#2F2F2F',   #
-        'gray2'                    => '#050505',   #
-        'gray20'                   => '#333333',   #
-        'gray21'                   => '#363636',   #
-        'gray22'                   => '#383838',   #
-        'gray23'                   => '#3B3B3B',   #
-        'gray24'                   => '#3D3D3D',   #
-        'gray25'                   => '#404040',   #
-        'gray26'                   => '#424242',   #
-        'gray27'                   => '#454545',   #
-        'gray28'                   => '#474747',   #
-        'gray29'                   => '#4A4A4A',   #
-        'gray3'                    => '#070707',   #
-        'gray30'                   => '#4C4C4C',   #
-        'gray31'                   => '#4E4E4E',   #
-        'gray32'                   => '#515151',   #
-        'gray33'                   => '#535353',   #
-        'gray34'                   => '#565656',   #
-        'gray35'                   => '#585858',   #
-        'gray36'                   => '#5B5B5B',   #
-        'gray37'                   => '#5D5D5D',   #
-        'gray38'                   => '#606060',   #
-        'gray39'                   => '#626262',   #
-        'gray4'                    => '#0A0A0A',   #
-        'gray40'                   => '#666666',   #
-        'gray41'                   => '#696969',   #
-        'gray42'                   => '#6B6B6B',   #
-        'gray43'                   => '#6E6E6E',   #
-        'gray44'                   => '#707070',   #
-        'gray45'                   => '#737373',   #
-        'gray46'                   => '#757575',   #
-        'gray47'                   => '#787878',   #
-        'gray48'                   => '#7A7A7A',   #
-        'gray49'                   => '#7D7D7D',   #
-        'gray5'                    => '#0C0C0C',   #
-        'gray50'                   => '#7F7F7F',   #
-        'gray51'                   => '#818181',   #
-        'gray52'                   => '#848484',   #
-        'gray53'                   => '#868686',   #
-        'gray54'                   => '#898989',   #
-        'gray55'                   => '#8B8B8B',   #
-        'gray56'                   => '#8E8E8E',   #
-        'gray57'                   => '#909090',   #
-        'gray58'                   => '#939393',   #
-        'gray59'                   => '#959595',   #
-        'gray6'                    => '#0E0E0E',   #
-        'gray60'                   => '#999999',   #
-        'gray61'                   => '#9C9C9C',   #
-        'gray62'                   => '#9E9E9E',   #
-        'gray63'                   => '#A1A1A1',   #
-        'gray64'                   => '#A3A3A3',   #
-        'gray65'                   => '#A6A6A6',   #
-        'gray66'                   => '#A8A8A8',   #
-        'gray67'                   => '#ABABAB',   #
-        'gray68'                   => '#ADADAD',   #
-        'gray69'                   => '#B0B0B0',   #
-        'gray7'                    => '#111111',   #
-        'gray70'                   => '#B2B2B2',   #
-        'gray71'                   => '#B4B4B4',   #
-        'gray72'                   => '#B7B7B7',   #
-        'gray73'                   => '#B9B9B9',   #
-        'gray74'                   => '#BCBCBC',   #
-        'gray75'                   => '#BEBEBE',   #
-        'gray76'                   => '#C1C1C1',   #
-        'gray77'                   => '#C3C3C3',   #
-        'gray78'                   => '#C6C6C6',   #
-        'gray79'                   => '#C9C9C9',   #
-        'gray8'                    => '#141414',   #
-        'gray80'                   => '#CCCCCC',   #
-        'gray81'                   => '#CFCFCF',   #
-        'gray82'                   => '#D1D1D1',   #
-        'gray83'                   => '#D4D4D4',   #
-        'gray84'                   => '#D6D6D6',   #
-        'gray85'                   => '#D9D9D9',   #
-        'gray86'                   => '#DBDBDB',   #
-        'gray87'                   => '#DEDEDE',   #
-        'gray88'                   => '#E0E0E0',   #
-        'gray89'                   => '#E2E2E2',   #
-        'gray9'                    => '#161616',   #
-        'gray90'                   => '#E5E5E5',   #
-        'gray91'                   => '#E7E7E7',   #
-        'gray92'                   => '#EAEAEA',   #
-        'gray93'                   => '#ECECEC',   #
-        'gray94'                   => '#EFEFEF',   #
-        'gray95'                   => '#F1F1F1',   #
-        'gray96'                   => '#F4F4F4',   #
-        'gray97'                   => '#F6F6F6',   #
-        'gray98'                   => '#F9F9F9',   #
-        'gray99'                   => '#FBFBFB',   #
-        'green'                    => '#007F00',   #
-        'green1'                   => '#00FF00',   #
-        'green2'                   => '#00ED00',   #
-        'green3'                   => '#00CD00',   #
-        'green4'                   => '#008A00',   #
-        'greencopper'              => '#846262',   #
-        'greenyellow'              => '#D19175',   #
-        'grey'                     => '#BDBDBD',   #
-        'grey0'                    => '#000000',   #
-        'grey1'                    => '#020202',   #
-        'grey10'                   => '#191919',   #
-        'grey100'                  => '#FFFFFF',   #
-        'grey11'                   => '#1B1B1B',   #
-        'grey12'                   => '#1E1E1E',   #
-        'grey13'                   => '#202020',   #
-        'grey14'                   => '#232323',   #
-        'grey15'                   => '#252525',   #
-        'grey16'                   => '#282828',   #
-        'grey17'                   => '#2A2A2A',   #
-        'grey18'                   => '#2D2D2D',   #
-        'grey19'                   => '#2F2F2F',   #
-        'grey2'                    => '#050505',   #
-        'grey20'                   => '#333333',   #
-        'grey21'                   => '#363636',   #
-        'grey22'                   => '#383838',   #
-        'grey23'                   => '#3B3B3B',   #
-        'grey24'                   => '#3D3D3D',   #
-        'grey25'                   => '#404040',   #
-        'grey26'                   => '#424242',   #
-        'grey27'                   => '#454545',   #
-        'grey28'                   => '#474747',   #
-        'grey29'                   => '#4A4A4A',   #
-        'grey3'                    => '#070707',   #
-        'grey30'                   => '#4C4C4C',   #
-        'grey31'                   => '#4E4E4E',   #
-        'grey32'                   => '#515151',   #
-        'grey33'                   => '#535353',   #
-        'grey34'                   => '#565656',   #
-        'grey35'                   => '#585858',   #
-        'grey36'                   => '#5B5B5B',   #
-        'grey37'                   => '#5D5D5D',   #
-        'grey38'                   => '#606060',   #
-        'grey39'                   => '#626262',   #
-        'grey4'                    => '#0A0A0A',   #
-        'grey40'                   => '#666666',   #
-        'grey41'                   => '#696969',   #
-        'grey42'                   => '#6B6B6B',   #
-        'grey43'                   => '#6E6E6E',   #
-        'grey44'                   => '#707070',   #
-        'grey45'                   => '#737373',   #
-        'grey46'                   => '#757575',   #
-        'grey47'                   => '#787878',   #
-        'grey48'                   => '#7A7A7A',   #
-        'grey49'                   => '#7D7D7D',   #
-        'grey5'                    => '#0C0C0C',   #
-        'grey50'                   => '#7F7F7F',   #
-        'grey51'                   => '#818181',   #
-        'grey52'                   => '#848484',   #
-        'grey53'                   => '#868686',   #
-        'grey54'                   => '#898989',   #
-        'grey55'                   => '#8B8B8B',   #
-        'grey56'                   => '#8E8E8E',   #
-        'grey57'                   => '#909090',   #
-        'grey58'                   => '#939393',   #
-        'grey59'                   => '#959595',   #
-        'grey6'                    => '#0E0E0E',   #
-        'grey60'                   => '#999999',   #
-        'grey61'                   => '#9C9C9C',   #
-        'grey62'                   => '#9E9E9E',   #
-        'grey63'                   => '#A1A1A1',   #
-        'grey64'                   => '#A3A3A3',   #
-        'grey65'                   => '#A6A6A6',   #
-        'grey66'                   => '#A8A8A8',   #
-        'grey67'                   => '#ABABAB',   #
-        'grey68'                   => '#ADADAD',   #
-        'grey69'                   => '#B0B0B0',   #
-        'grey7'                    => '#111111',   #
-        'grey70'                   => '#B2B2B2',   #
-        'grey71'                   => '#B4B4B4',   #
-        'grey72'                   => '#B7B7B7',   #
-        'grey73'                   => '#B9B9B9',   #
-        'grey74'                   => '#BCBCBC',   #
-        'grey75'                   => '#BEBEBE',   #
-        'grey76'                   => '#C1C1C1',   #
-        'grey77'                   => '#C3C3C3',   #
-        'grey78'                   => '#C6C6C6',   #
-        'grey79'                   => '#C9C9C9',   #
-        'grey8'                    => '#141414',   #
-        'grey80'                   => '#CCCCCC',   #
-        'grey81'                   => '#CFCFCF',   #
-        'grey82'                   => '#D1D1D1',   #
-        'grey83'                   => '#D4D4D4',   #
-        'grey84'                   => '#D6D6D6',   #
-        'grey85'                   => '#D9D9D9',   #
-        'grey86'                   => '#DBDBDB',   #
-        'grey87'                   => '#DEDEDE',   #
-        'grey88'                   => '#E0E0E0',   #
-        'grey89'                   => '#E2E2E2',   #
-        'grey9'                    => '#161616',   #
-        'grey90'                   => '#E5E5E5',   #
-        'grey91'                   => '#E7E7E7',   #
-        'grey92'                   => '#EAEAEA',   #
-        'grey93'                   => '#ECECEC',   #
-        'grey94'                   => '#EFEFEF',   #
-        'grey95'                   => '#F1F1F1',   #
-        'grey96'                   => '#F4F4F4',   #
-        'grey97'                   => '#F6F6F6',   #
-        'grey98'                   => '#F9F9F9',   #
-        'grey99'                   => '#FBFBFB',   #
-        'honeydew'                 => '#EFFFEF',   #
-        'honeydew1'                => '#EFFFEF',   #
-        'honeydew2'                => '#E0EDE0',   #
-        'honeydew3'                => '#C0CDC0',   #
-        'honeydew4'                => '#828A82',   #
-        'hotpink'                  => '#FF69B4',   #
-        'hotpink1'                 => '#FF6EB4',   #
-        'hotpink2'                 => '#ED6AA7',   #
-        'hotpink3'                 => '#CD5F8F',   #
-        'hotpink4'                 => '#8A3A61',   #
-        'indianred'                => '#F4CCB0',   #
-        'indianred1'               => '#FF6A6A',   #
-        'indianred2'               => '#ED6262',   #
-        'indianred3'               => '#CD5454',   #
-        'indianred4'               => '#8A3A3A',   #
-        'indigo'                   => '#4B0081',   #
-        'ivory'                    => '#FFFFEF',   #
-        'ivory1'                   => '#FFFFEF',   #
-        'ivory2'                   => '#EDEDE0',   #
-        'ivory3'                   => '#CDCDC0',   #
-        'ivory4'                   => '#8A8A82',   #
-        'khaki'                    => '#EFE68B',   #
-        'khaki1'                   => '#FFF58E',   #
-        'khaki2'                   => '#EDE684',   #
-        'khaki3'                   => '#CDC573',   #
-        'khaki4'                   => '#8A854D',   #
-        'lavender'                 => '#E6E6F9',   #
-        'lavenderblush'            => '#FFEFF4',   #
-        'lavenderblush1'           => '#FFEFF4',   #
-        'lavenderblush2'           => '#EDE0E5',   #
-        'lavenderblush3'           => '#CDC0C4',   #
-        'lavenderblush4'           => '#8A8285',   #
-        'lawngreen'                => '#7CFB00',   #
-        'lemonchiffon'             => '#FFF9CD',   #
-        'lemonchiffon1'            => '#FFF9CD',   #
-        'lemonchiffon2'            => '#EDE8BE',   #
-        'lemonchiffon3'            => '#CDC9A5',   #
-        'lemonchiffon4'            => '#8A8870',   #
-        'lightblue'                => '#ADD8E6',   #
-        'lightblue1'               => '#BEEEFF',   #
-        'lightblue2'               => '#B1DFED',   #
-        'lightblue3'               => '#9ABFCD',   #
-        'lightblue4'               => '#68828A',   #
-        'lightcoral'               => '#EF7F7F',   #
-        'lightcyan'                => '#E0FFFF',   #
-        'lightcyan1'               => '#E0FFFF',   #
-        'lightcyan2'               => '#D1EDED',   #
-        'lightcyan3'               => '#B4CDCD',   #
-        'lightcyan4'               => '#7A8A8A',   #
-        'lightgoldenrod'           => '#EDDD81',   #
-        'lightgoldenrod1'          => '#FFEB8A',   #
-        'lightgoldenrod2'          => '#EDDC81',   #
-        'lightgoldenrod3'          => '#CDBD70',   #
-        'lightgoldenrod4'          => '#8A804C',   #
-        'lightgoldenrodyellow'     => '#F9F9D2',   #
-        'lightgray'                => '#D3D3D3',   #
-        'lightgreen'               => '#8FED8F',   #
-        'lightgrey'                => '#D3D3D3',   #
-        'lightpink'                => '#FFB5C0',   #
-        'lightpink1'               => '#FFAEB8',   #
-        'lightpink2'               => '#EDA2AD',   #
-        'lightpink3'               => '#CD8B94',   #
-        'lightpink4'               => '#8A5E65',   #
-        'lightsalmon'              => '#FFA07A',   #
-        'lightsalmon1'             => '#FFA07A',   #
-        'lightsalmon2'             => '#ED9472',   #
-        'lightsalmon3'             => '#CD8061',   #
-        'lightsalmon4'             => '#8A5642',   #
-        'lightseagreen'            => '#1FB1AA',   #
-        'lightskyblue'             => '#86CEF9',   #
-        'lightskyblue1'            => '#B0E2FF',   #
-        'lightskyblue2'            => '#A4D3ED',   #
-        'lightskyblue3'            => '#8CB5CD',   #
-        'lightskyblue4'            => '#5F7B8A',   #
-        'lightslateblue'           => '#8370FF',   #
-        'lightslategray'           => '#778799',   #
-        'lightslategrey'           => '#778799',   #
-        'lightsteelblue'           => '#B0C3DE',   #
-        'lightsteelblue1'          => '#CAE1FF',   #
-        'lightsteelblue2'          => '#BBD2ED',   #
-        'lightsteelblue3'          => '#A2B4CD',   #
-        'lightsteelblue4'          => '#6E7B8A',   #
-        'lightyellow'              => '#FFFFE0',   #
-        'lightyellow1'             => '#FFFFE0',   #
-        'lightyellow2'             => '#EDEDD1',   #
-        'lightyellow3'             => '#CDCDB4',   #
-        'lightyellow4'             => '#8A8A7A',   #
-        'lime'                     => '#00FF00',   #
-        'limegreen'                => '#31CD31',   #
-        'linen'                    => '#F9EFE6',   #
-        'magenta'                  => '#FF00FF',   #
-        'magenta1'                 => '#FF00FF',   #
-        'magenta2'                 => '#ED00ED',   #
-        'magenta3'                 => '#CD00CD',   #
-        'magenta4'                 => '#8A008A',   #
-        'mandarianorange'          => '#8D2222',   #
-        'maroon'                   => '#7F0000',   #
-        'maroon1'                  => '#FF34B2',   #
-        'maroon2'                  => '#ED2FA7',   #
-        'maroon3'                  => '#CD288F',   #
-        'maroon4'                  => '#8A1B61',   #
-        'mediumaquamarine'         => '#66CDAA',   #
-        'mediumblue'               => '#0000CD',   #
-        'mediumorchid'             => '#B954D3',   #
-        'mediumorchid1'            => '#E066FF',   #
-        'mediumorchid2'            => '#D15EED',   #
-        'mediumorchid3'            => '#B451CD',   #
-        'mediumorchid4'            => '#7A378A',   #
-        'mediumpurple'             => '#9270DB',   #
-        'mediumpurple1'            => '#AB81FF',   #
-        'mediumpurple2'            => '#9F79ED',   #
-        'mediumpurple3'            => '#8868CD',   #
-        'mediumpurple4'            => '#5C478A',   #
-        'mediumseagreen'           => '#3CB271',   #
-        'mediumslateblue'          => '#7B68ED',   #
-        'mediumspringgreen'        => '#00F99A',   #
-        'mediumturquoise'          => '#48D1CC',   #
-        'mediumvioletred'          => '#C61584',   #
-        'midnightblue'             => '#2E2E4E',   #
-        'mintcream'                => '#F4FFF9',   #
-        'mistyrose'                => '#FFE4E1',   #
-        'mistyrose1'               => '#FFE4E1',   #
-        'mistyrose2'               => '#EDD5D2',   #
-        'mistyrose3'               => '#CDB6B4',   #
-        'mistyrose4'               => '#8A7D7B',   #
-        'moccasin'                 => '#FFE4B4',   #
-        'navajowhite'              => '#FFDEAD',   #
-        'navajowhite1'             => '#FFDEAD',   #
-        'navajowhite2'             => '#EDCFA1',   #
-        'navajowhite3'             => '#CDB28A',   #
-        'navajowhite4'             => '#8A795D',   #
-        'navy'                     => '#00007F',   #
-        'navyblue'                 => '#00007F',   #
-        'neonblue'                 => '#4C4CFF',   #
-        'neonpink'                 => '#FF6EC6',   #
-        'none'                     => '#000000',   #
-        'oldlace'                  => '#FCF4E6',   #
-        'olive'                    => '#7F7F00',   #
-        'olivedrab'                => '#6B8D22',   #
-        'olivedrab1'               => '#BFFF3E',   #
-        'olivedrab2'               => '#B2ED3A',   #
-        'olivedrab3'               => '#9ACD31',   #
-        'olivedrab4'               => '#698A21',   #
-        'orange'                   => '#FFA500',   #
-        'orange1'                  => '#FFA500',   #
-        'orange2'                  => '#ED9A00',   #
-        'orange3'                  => '#CD8400',   #
-        'orange4'                  => '#8A5900',   #
-        'orangered'                => '#FF4500',   #
-        'orangered1'               => '#FF4500',   #
-        'orangered2'               => '#ED4000',   #
-        'orangered3'               => '#CD3700',   #
-        'orangered4'               => '#8A2400',   #
-        'orchid'                   => '#DA70D6',   #
-        'orchid1'                  => '#FF82F9',   #
-        'orchid2'                  => '#ED7AE8',   #
-        'orchid3'                  => '#CD69C9',   #
-        'orchid4'                  => '#8A4788',   #
-        'palegoldenrod'            => '#EDE7AA',   #
-        'palegreen'                => '#98FB98',   #
-        'palegreen1'               => '#9AFF9A',   #
-        'palegreen2'               => '#8FED8F',   #
-        'palegreen3'               => '#7CCD7C',   #
-        'palegreen4'               => '#538A53',   #
-        'paleturquoise'            => '#AFEDED',   #
-        'paleturquoise1'           => '#BAFFFF',   #
-        'paleturquoise2'           => '#AEEDED',   #
-        'paleturquoise3'           => '#95CDCD',   #
-        'paleturquoise4'           => '#668A8A',   #
-        'palevioletred'            => '#DB7092',   #
-        'palevioletred1'           => '#FF81AB',   #
-        'palevioletred2'           => '#ED799F',   #
-        'palevioletred3'           => '#CD6888',   #
-        'palevioletred4'           => '#8A475C',   #
-        'papayawhip'               => '#FFEED5',   #
-        'peachpuff'                => '#FFDAB8',   #
-        'peachpuff1'               => '#FFDAB8',   #
-        'peachpuff2'               => '#EDCBAD',   #
-        'peachpuff3'               => '#CDAF94',   #
-        'peachpuff4'               => '#8A7765',   #
-        'peru'                     => '#CD843F',   #
-        'pink'                     => '#FFBFCB',   #
-        'pink1'                    => '#FFB4C4',   #
-        'pink2'                    => '#EDA9B7',   #
-        'pink3'                    => '#CD909E',   #
-        'pink4'                    => '#8A626C',   #
-        'plum'                     => '#DDA0DD',   #
-        'plum1'                    => '#FFBAFF',   #
-        'plum2'                    => '#EDAEED',   #
-        'plum3'                    => '#CD95CD',   #
-        'plum4'                    => '#8A668A',   #
-        'powderblue'               => '#B0E0E6',   #
-        'purple'                   => '#7F007F',   #
-        'purple1'                  => '#9B2FFF',   #
-        'purple2'                  => '#902BED',   #
-        'purple3'                  => '#7D25CD',   #
-        'purple4'                  => '#54198A',   #
-        'quartz'                   => '#D9D9F2',   #
-        'red'                      => '#FF0000',   #
-        'red1'                     => '#FF0000',   #
-        'red2'                     => '#ED0000',   #
-        'red3'                     => '#CD0000',   #
-        'red4'                     => '#8A0000',   #
-        'richblue'                 => '#5858AB',   #
-        'rosybrown'                => '#BB8E8E',   #
-        'rosybrown1'               => '#FFC0C0',   #
-        'rosybrown2'               => '#EDB4B4',   #
-        'rosybrown3'               => '#CD9B9B',   #
-        'rosybrown4'               => '#8A6969',   #
-        'royalblue'                => '#4169E1',   #
-        'royalblue1'               => '#4876FF',   #
-        'royalblue2'               => '#436EED',   #
-        'royalblue3'               => '#3A5ECD',   #
-        'royalblue4'               => '#26408A',   #
-        'saddlebrown'              => '#8A4512',   #
-        'salmon'                   => '#F97F72',   #
-        'salmon1'                  => '#FF8B69',   #
-        'salmon2'                  => '#ED8161',   #
-        'salmon3'                  => '#CD7053',   #
-        'salmon4'                  => '#8A4C39',   #
-        'sandybrown'               => '#F3A45F',   #
-        'seagreen'                 => '#2D8A56',   #
-        'seagreen1'                => '#53FF9F',   #
-        'seagreen2'                => '#4DED93',   #
-        'seagreen3'                => '#43CD7F',   #
-        'seagreen4'                => '#2D8A56',   #
-        'seashell'                 => '#FFF4ED',   #
-        'seashell1'                => '#FFF4ED',   #
-        'seashell2'                => '#EDE5DE',   #
-        'seashell3'                => '#CDC4BE',   #
-        'seashell4'                => '#8A8581',   #
-        'sienna'                   => '#A0512C',   #
-        'sienna1'                  => '#FF8147',   #
-        'sienna2'                  => '#ED7942',   #
-        'sienna3'                  => '#CD6839',   #
-        'sienna4'                  => '#8A4725',   #
-        'silver'                   => '#BFBFBF',   #
-        'skyblue'                  => '#86CEEA',   #
-        'skyblue1'                 => '#86CEFF',   #
-        'skyblue2'                 => '#7EBFED',   #
-        'skyblue3'                 => '#6CA6CD',   #
-        'skyblue4'                 => '#4A708A',   #
-        'slateblue'                => '#6A59CD',   #
-        'slateblue1'               => '#826FFF',   #
-        'slateblue2'               => '#7A67ED',   #
-        'slateblue3'               => '#6958CD',   #
-        'slateblue4'               => '#473C8A',   #
-        'slategray'                => '#707F8F',   #
-        'slategray1'               => '#C5E2FF',   #
-        'slategray2'               => '#B8D3ED',   #
-        'slategray3'               => '#9FB5CD',   #
-        'slategray4'               => '#6C7B8A',   #
-        'slategrey'                => '#707F8F',   #
-        'snow'                     => '#FFF9F9',   #
-        'snow1'                    => '#FFF9F9',   #
-        'snow2'                    => '#EDE8E8',   #
-        'snow3'                    => '#CDC9C9',   #
-        'snow4'                    => '#8A8888',   #
-        'springgreen'              => '#00FF7F',   #
-        'springgreen1'             => '#00FF7F',   #
-        'springgreen2'             => '#00ED76',   #
-        'springgreen3'             => '#00CD66',   #
-        'springgreen4'             => '#008A45',   #
-        'steelblue'                => '#4681B4',   #
-        'steelblue1'               => '#62B7FF',   #
-        'steelblue2'               => '#5BACED',   #
-        'steelblue3'               => '#4E93CD',   #
-        'steelblue4'               => '#36638A',   #
-        'summersky'                => '#38B0DE',   #
-        'tan'                      => '#D2B48B',   #
-        'tan1'                     => '#FFA54E',   #
-        'tan2'                     => '#ED9A49',   #
-        'tan3'                     => '#CD843F',   #
-        'tan4'                     => '#8A592A',   #
-        'teal'                     => '#007F7F',   #
-        'thistle'                  => '#D8BED8',   #
-        'thistle1'                 => '#FFE1FF',   #
-        'thistle2'                 => '#EDD2ED',   #
-        'thistle3'                 => '#CDB4CD',   #
-        'thistle4'                 => '#8A7B8A',   #
-        'tomato'                   => '#FF6247',   #
-        'tomato1'                  => '#FF6247',   #
-        'tomato2'                  => '#ED5B42',   #
-        'tomato3'                  => '#CD4E39',   #
-        'tomato4'                  => '#8A3625',   #
-        'turquoise'                => '#40E0D0',   #
-        'turquoise1'               => '#00F4FF',   #
-        'turquoise2'               => '#00E5ED',   #
-        'turquoise3'               => '#00C4CD',   #
-        'turquoise4'               => '#00858A',   #
-        'violet'                   => '#ED81ED',   #
-        'violetred'                => '#D01F8F',   #
-        'violetred1'               => '#FF3E95',   #
-        'violetred2'               => '#ED3A8B',   #
-        'violetred3'               => '#CD3178',   #
-        'violetred4'               => '#8A2151',   #
-        'wheat'                    => '#F4DEB2',   #
-        'wheat1'                   => '#FFE6B9',   #
-        'wheat2'                   => '#EDD8AE',   #
-        'wheat3'                   => '#CDB995',   #
-        'wheat4'                   => '#8A7E66',   #
-        'white'                    => '#FFFFFF',   #
-        'whitesmoke'               => '#F4F4F4',   #
-        'yellow'                   => '#FFFF00',   #
-        'yellow1'                  => '#FFFF00',   #
-        'yellow2'                  => '#EDED00',   #
-        'yellow3'                  => '#CDCD00',   #
-        'yellow4'                  => '#8A8A00',   #
-        'yellowgreen'              => '#99CC31',   #
-    );
+    %colors=();
+    foreach my $dir (@INC) {
+        if(-f "$dir/PDF/API2/Resource/unicolor.txt")
+        {
+            my ($fh,$line);
+            open($fh,"$dir/PDF/API2/Resource/unicolor.txt");
+            while($line=<$fh>)
+            {
+                next if($line=~m|^#|);
+                chomp($line);
+                my ($name,$val)=split(/\s+;\s+/,$line);
+                $colors{lc $name}=$val;
+            }
+            close($fh);
+            last;
+        }
+    }
 }
 
 sub pdfkey {
@@ -1430,10 +753,30 @@
     return(%h);
 }
 
+sub xmlMarkupDecl
+{
+    my $xml=<<EOT;
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!DOCTYPE p [
+EOT
+    foreach my $n (sort {lc($a) cmp lc($b)} keys %n2u)
+    {
+        next if($n eq 'apos');
+        next if($n eq 'amp');
+        next if($n eq 'quot');
+        next if($n eq 'gt');
+        next if($n eq 'lt');
+        next if($n eq '.notdef');
+        next if($n2u{$n}<32);
+        $xml.=sprintf('<!ENTITY %s "&#x%04X;">',$n,$n2u{$n})."\n";
+    }
+    $xml.="\n]>\n";
+    return($xml);
+}
 
+
 1;
 
-
 __END__
 
 function xRGBhex_to_aRGBhex ( $hstring, $lightness = 1.0 ) {
@@ -1514,7 +857,7 @@
 
 PDF::API2::Util - utility package for often use methods across the package.
 
-=head1 PREDEFINED COLORS
+=head1 PREDEFINED PAPERSIZES
 
 =over 4
 
@@ -1555,74 +898,14 @@
 
 =head1 PREDEFINED COLORS
 
-aliceblue antiquewhite antiquewhite1 antiquewhite2 antiquewhite3 antiquewhite4 aqua aquamarine
-aquamarine1 aquamarine2 aquamarine3 aquamarine4 azure azure1 azure2 azure3 azure4 beige bisque bisque1
-bisque2 bisque3 bisque4 black blanchedalmond blue blue1 blue2 blue3 blue4 blueviolet brass brightgold
-bronze bronzeii brown brown1 brown2 brown3 brown4 burlywood burlywood1 burlywood2 burlywood3 burlywood4
-cadetblue cadetblue1 cadetblue2 cadetblue3 cadetblue4 chartreuse chartreuse1 chartreuse2 chartreuse3
-chartreuse4 chocolate chocolate1 chocolate2 chocolate3 chocolate4 coolcopper coral coral1 coral2 coral3
-coral4 cornflowerblue cornsilk cornsilk1 cornsilk2 cornsilk3 cornsilk4 crimson cyan cyan1 cyan2 cyan3
-cyan4 darkblue darkcyan darkgoldenrod darkgoldenrod1 darkgoldenrod2 darkgoldenrod3 darkgoldenrod4
-darkgray darkgreen darkgrey darkkhaki darkmagenta darkolivegreen darkolivegreen1 darkolivegreen2
-darkolivegreen3 darkolivegreen4 darkorange darkorange1 darkorange2 darkorange3 darkorange4 darkorchid
-darkorchid1 darkorchid2 darkorchid3 darkorchid4 darkred darksalmon darkseagreen darkseagreen1
-darkseagreen2 darkseagreen3 darkseagreen4 darkslateblue darkslategray darkslategray1 darkslategray2
-darkslategray3 darkslategray4 darkslategrey darkturquoise darkviolet darkwood deeppink deeppink1
-deeppink2 deeppink3 deeppink4 deepskyblue deepskyblue1 deepskyblue2 deepskyblue3 deepskyblue4 dimgray
-dimgrey dodgerblue dodgerblue1 dodgerblue2 dodgerblue3 dodgerblue4 dustyrose feldspar firebrick
-firebrick1 firebrick2 firebrick3 firebrick4 flesh floralwhite forestgreen fuchsia gainsboro ghostwhite
-gold gold1 gold2 gold3 gold4 goldenrod goldenrod1 goldenrod2 goldenrod3 goldenrod4 gray gray0 gray1
-gray10 gray100 gray11 gray12 gray13 gray14 gray15 gray16 gray17 gray18 gray19 gray2 gray20 gray21
-gray22 gray23 gray24 gray25 gray26 gray27 gray28 gray29 gray3 gray30 gray31 gray32 gray33 gray34 gray35
-gray36 gray37 gray38 gray39 gray4 gray40 gray41 gray42 gray43 gray44 gray45 gray46 gray47 gray48 gray49
-gray5 gray50 gray51 gray52 gray53 gray54 gray55 gray56 gray57 gray58 gray59 gray6 gray60 gray61 gray62
-gray63 gray64 gray65 gray66 gray67 gray68 gray69 gray7 gray70 gray71 gray72 gray73 gray74 gray75 gray76
-gray77 gray78 gray79 gray8 gray80 gray81 gray82 gray83 gray84 gray85 gray86 gray87 gray88 gray89 gray9
-gray90 gray91 gray92 gray93 gray94 gray95 gray96 gray97 gray98 gray99 green green1 green2 green3 green4
-greencopper greenyellow grey grey0 grey1 grey10 grey100 grey11 grey12 grey13 grey14 grey15 grey16
-grey17 grey18 grey19 grey2 grey20 grey21 grey22 grey23 grey24 grey25 grey26 grey27 grey28 grey29 grey3
-grey30 grey31 grey32 grey33 grey34 grey35 grey36 grey37 grey38 grey39 grey4 grey40 grey41 grey42 grey43
-grey44 grey45 grey46 grey47 grey48 grey49 grey5 grey50 grey51 grey52 grey53 grey54 grey55 grey56 grey57
-grey58 grey59 grey6 grey60 grey61 grey62 grey63 grey64 grey65 grey66 grey67 grey68 grey69 grey7 grey70
-grey71 grey72 grey73 grey74 grey75 grey76 grey77 grey78 grey79 grey8 grey80 grey81 grey82 grey83 grey84
-grey85 grey86 grey87 grey88 grey89 grey9 grey90 grey91 grey92 grey93 grey94 grey95 grey96 grey97 grey98
-grey99 honeydew honeydew1 honeydew2 honeydew3 honeydew4 hotpink hotpink1 hotpink2 hotpink3 hotpink4
-indianred indianred1 indianred2 indianred3 indianred4 indigo ivory ivory1 ivory2 ivory3 ivory4 khaki
-khaki1 khaki2 khaki3 khaki4 lavender lavenderblush lavenderblush1 lavenderblush2 lavenderblush3
-lavenderblush4 lawngreen lemonchiffon lemonchiffon1 lemonchiffon2 lemonchiffon3 lemonchiffon4 lightblue
-lightblue1 lightblue2 lightblue3 lightblue4 lightcoral lightcyan lightcyan1 lightcyan2 lightcyan3
-lightcyan4 lightgoldenrod lightgoldenrod1 lightgoldenrod2 lightgoldenrod3 lightgoldenrod4
-lightgoldenrodyellow lightgray lightgreen lightgrey lightpink lightpink1 lightpink2 lightpink3
-lightpink4 lightsalmon lightsalmon1 lightsalmon2 lightsalmon3 lightsalmon4 lightseagreen lightskyblue
-lightskyblue1 lightskyblue2 lightskyblue3 lightskyblue4 lightslateblue lightslategray lightslategrey
-lightsteelblue lightsteelblue1 lightsteelblue2 lightsteelblue3 lightsteelblue4 lightyellow lightyellow1
-lightyellow2 lightyellow3 lightyellow4 lime limegreen linen magenta magenta1 magenta2 magenta3 magenta4
-mandarianorange maroon maroon1 maroon2 maroon3 maroon4 mediumaquamarine mediumblue mediumorchid
-mediumorchid1 mediumorchid2 mediumorchid3 mediumorchid4 mediumpurple mediumpurple1 mediumpurple2
-mediumpurple3 mediumpurple4 mediumseagreen mediumslateblue mediumspringgreen mediumturquoise
-mediumvioletred midnightblue mintcream mistyrose mistyrose1 mistyrose2 mistyrose3 mistyrose4 moccasin
-navajowhite navajowhite1 navajowhite2 navajowhite3 navajowhite4 navy navyblue neonblue neonpink none
-oldlace olive olivedrab olivedrab1 olivedrab2 olivedrab3 olivedrab4 orange orange1 orange2 orange3
-orange4 orangered orangered1 orangered2 orangered3 orangered4 orchid orchid1 orchid2 orchid3 orchid4
-palegoldenrod palegreen palegreen1 palegreen2 palegreen3 palegreen4 paleturquoise paleturquoise1
-paleturquoise2 paleturquoise3 paleturquoise4 palevioletred palevioletred1 palevioletred2 palevioletred3
-palevioletred4 papayawhip peachpuff peachpuff1 peachpuff2 peachpuff3 peachpuff4 peru pink pink1 pink2
-pink3 pink4 plum plum1 plum2 plum3 plum4 powderblue purple purple1 purple2 purple3 purple4 quartz red
-red1 red2 red3 red4 richblue rosybrown rosybrown1 rosybrown2 rosybrown3 rosybrown4 royalblue royalblue1
-royalblue2 royalblue3 royalblue4 saddlebrown salmon salmon1 salmon2 salmon3 salmon4 sandybrown seagreen
-seagreen1 seagreen2 seagreen3 seagreen4 seashell seashell1 seashell2 seashell3 seashell4 sienna sienna1
-sienna2 sienna3 sienna4 silver skyblue skyblue1 skyblue2 skyblue3 skyblue4 slateblue slateblue1
-slateblue2 slateblue3 slateblue4 slategray slategray1 slategray2 slategray3 slategray4 slategrey snow
-snow1 snow2 snow3 snow4 springgreen springgreen1 springgreen2 springgreen3 springgreen4 steelblue
-steelblue1 steelblue2 steelblue3 steelblue4 summersky tan tan1 tan2 tan3 tan4 teal thistle thistle1
-thistle2 thistle3 thistle4 tomato tomato1 tomato2 tomato3 tomato4 turquoise turquoise1 turquoise2
-turquoise3 turquoise4 violet violetred violetred1 violetred2 violetred3 violetred4 wheat wheat1 wheat2
-wheat3 wheat4 white whitesmoke yellow yellow1 yellow2 yellow3 yellow4 yellowgreen
+See the file C<unicolor.txt> for a complete list.
 
 B<Please Note:> This is an amalgamation of the X11, SGML and (X)HTML specification sets.
 
 =head1 PREDEFINED GLYPH-NAMES
 
+See the file C<uniglyph.txt> for a complete list.
+
 a a1 a10 a100 a101 a102 a103 a104 a105 a106 a107 a108 a11 a117 a118 a119 a12 a120 a121 a122 a123 a124
 a125 a126 a127 a128 a129 a13 a130 a131 a132 a133 a134 a135 a136 a137 a138 a139 a14 a140 a141 a142 a143
 a144 a145 a146 a147 a148 a149 a15 a150 a151 a152 a153 a154 a155 a156 a157 a158 a159 a16 a160 a162 a165
@@ -1774,6 +1057,10 @@
 =head1 HISTORY
 
     $Log: Util.pm,v $
+    Revision 1.21  2005/05/28 15:58:15  fredo
+    added xmldecl for markup code
+    moved colors/pagesizes to separate files
+
     Revision 1.20  2005/03/15 00:59:43  fredo
     cleanup
 

Modified: packages/libpdf-api2-perl/trunk/lib/PDF/API2/Version.pm
===================================================================
--- packages/libpdf-api2-perl/trunk/lib/PDF/API2/Version.pm	2005-06-10 14:16:39 UTC (rev 1100)
+++ packages/libpdf-api2-perl/trunk/lib/PDF/API2/Version.pm	2005-06-10 14:20:17 UTC (rev 1101)
@@ -9,18 +9,18 @@
 package PDF::API2::Version;
 BEGIN {
     use vars qw( $VERSION %CVersion );
-    $VERSION = '0.41.00';
+    $VERSION = '0.42';
     %CVersion = (
-        'vFredo' => 'PDF::API2 0.41.00 (stable-3328 / 2005-03-25)',
-        'vGNU' => 'PDF::API2 0.41.00 (2005-03-25 14:20:46)',
-        'vHex' => '0x00029D00',
-        'vLong' => '0.41.00 (2005-03-25 14:20:46)',
-        'vPerl' => '0.41.00',
-        'vShort' => '0.41.00',
-        'vSquid' => '0.41-stable-3328',
-        'vTeX' => 'This is PDF::API2, Version 0.41.00 (2005-03-25 14:20:46)',
-        'vWeb' => 'PDF::API2/0.41.00',
-        'vWin' => '0.41 build 3328',
+        'vFredo' => 'PDF::API2 0.42 (stable-3328 / 2005-05-29)',
+        'vGNU' => 'PDF::API2 0.42 (2005-05-29 22:18:24)',
+        'vHex' => '0x0002AD00',
+        'vLong' => '0.42 (2005-05-29 22:18:24)',
+        'vPerl' => '0.42',
+        'vShort' => '0.42',
+        'vSquid' => '0.42-stable-3328',
+        'vTeX' => 'This is PDF::API2, Version 0.42 (2005-05-29 22:18:24)',
+        'vWeb' => 'PDF::API2/0.42',
+        'vWin' => '0.42 build 3328',
     );
 }
 1;
@@ -36,16 +36,16 @@
 
 =head1 VERSION
 
-  vFredo: PDF::API2 0.41.00 (stable-3328 / 2005-03-25) 
-    vGNU: PDF::API2 0.41.00 (2005-03-25 14:20:46) 
-    vHex: 0x00029D00 
-   vLong: 0.41.00 (2005-03-25 14:20:46) 
-   vPerl: 0.41.00 
-  vShort: 0.41.00 
-  vSquid: 0.41-stable-3328 
-    vTeX: This is PDF::API2, Version 0.41.00 (2005-03-25 14:20:46) 
-    vWeb: PDF::API2/0.41.00 
-    vWin: 0.41 build 3328 
+  vFredo: PDF::API2 0.42 (stable-3328 / 2005-05-29) 
+    vGNU: PDF::API2 0.42 (2005-05-29 22:18:24) 
+    vHex: 0x0002AD00 
+   vLong: 0.42 (2005-05-29 22:18:24) 
+   vPerl: 0.42 
+  vShort: 0.42 
+  vSquid: 0.42-stable-3328 
+    vTeX: This is PDF::API2, Version 0.42 (2005-05-29 22:18:24) 
+    vWeb: PDF::API2/0.42 
+    vWin: 0.42 build 3328 
 
 =cut
 




More information about the Pkg-perl-cvs-commits mailing list