Changeset 1082

Timestamp:

2000-04-10T10:57:01+12:00 (24 years ago)

Author:

gwp

Message:

First, fixed bug in process_image_width regex (Trailing x is now optional, not required). Second, when making green_title images, read the desired width from the macro file and pass it to gimp/green_title.pl (default = 200)

File:

• trunk/gsdl/bin/script/translate.pl (modified) (2 diffs)

trunk/gsdl/bin/script/translate.pl

@@ -203 +203 @@
     } elsif ($image_type eq "green_title") {
 
-    # generate green title image
+    # read the width if it is specified in $image_macros
+        my ($width) = $image_macros =~ /_width${image_name}x?_\s*[^\{]*\{(\d+)\}/;
+        $width = 200 unless ($width);
+
+        # generate green title image
     my $options = "-text \"$text\" -filename ${image_name}.gif -image_dir $image_dir";
-    $options .= " -width 200 -height 57 -stripe_alignment right -text_alignment right";
+    $options .= " -width $width -height 57 -stripe_alignment right -text_alignment right";
     $options .= " -fontsize 26 -fontweight bold";
     `$ENV{'GSDLHOME'}/bin/script/gimp/title_icon.pl $options`;
 
-    # get width of new images and edit width macro
-    # we'll do this even though title_icon.pl will always create images of the
-    # width specified (200)
-    my $fullfilename = &util::filename_cat ($image_dir, "${image_name}.gif");
-    &process_width_macro ($fullfilename, $image_name, \$image_macros);
+    # get width of resulting image and edit _width..._ macro in $image_macros
+        # (no longer needed since we always resize to the width read from $image_macros.)
+        # my $fullfilename = &util::filename_cat ($image_dir, "${image_name}.gif");
+    # &process_width_macro ($fullfilename, $image_name, \$image_macros);
 
     } elsif ($image_type eq "hand_made") {
@@ -232 +235 @@
 
     my $img_info = &get_img_info ($filename);
-    $$image_macros =~ s/(_width${image_name}x_\s*(?:\[[^\]]*\])?\s*\{)(\d+)(\})/$1$img_info->{'width'}$3/s;
+    $$image_macros =~ s/(_width${image_name}x?_\s*(?:\[[^\]]*\])?\s*\{)(\d+)(\})/$1$img_info->{'width'}$3/s;
 }