diff options
| author | ribet | 2007-09-28 13:14:34 +0000 |
|---|---|---|
| committer | ribet | 2007-09-28 13:14:34 +0000 |
| commit | 147b3db27350f5bfeb40bc5f5b9a8a5403781a3f (patch) | |
| tree | cdb081d8a506e8743e83203cdfd03aca2ef80660 | |
| parent | 5bcf044788d820baf098c1e65cc4bd410484c9d7 (diff) | |
| download | mtc-147b3db27350f5bfeb40bc5f5b9a8a5403781a3f.zip mtc-147b3db27350f5bfeb40bc5f5b9a8a5403781a3f.tar.gz mtc-147b3db27350f5bfeb40bc5f5b9a8a5403781a3f.tar.bz2 mtc-147b3db27350f5bfeb40bc5f5b9a8a5403781a3f.tar.xz | |
Ajout de la gestion des fontes XLFD
| -rw-r--r-- | src/SVG/SVG2zinc.pm | 4 | ||||
| -rw-r--r-- | src/SVG/SVG2zinc/Conversions.pm | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/SVG/SVG2zinc.pm b/src/SVG/SVG2zinc.pm index 6c33b6f..22d41bb 100644 --- a/src/SVG/SVG2zinc.pm +++ b/src/SVG/SVG2zinc.pm @@ -1839,10 +1839,10 @@ sub analyze_text_style_hash { ## to be extended to all other fonts definition parameters ## NB: fontWeight is not used yet! - my ($fontKey,$code) = &createNamedFont ($fontFamily, $fontSize, $fontWeight); + my ($fontKey,$fontName,$code) = &createNamedFont ($fontFamily, $fontSize, $fontWeight); &display("\$fonts{\"$fontKey\"} = ") if $code; &display($code) if $code; - $res .= ", -font => \"$fontKey\""; + $res .= ", -font => \"$fontName\""; $current_font_key = $fontKey; } return $res; diff --git a/src/SVG/SVG2zinc/Conversions.pm b/src/SVG/SVG2zinc/Conversions.pm index 516c8d3..24564ea 100644 --- a/src/SVG/SVG2zinc/Conversions.pm +++ b/src/SVG/SVG2zinc/Conversions.pm @@ -142,14 +142,16 @@ sub createNamedFont { } my $fontKey = join "_", ($family, $size, $weight); + my $fontName = $fontKey; + $fontKey =~ s/^-/XLFD-/; if (!defined $fonts{$fontKey}) { $fonts{$fontKey} = $fontKey; - return ($fontKey, "->fontCreate('$fontKey', -family => \"$family\", -size => $size, -weight => \"$weight\") if ! \$fonts {\"$fontKey\"};"); + return ($fontKey, $fontName, "->fontCreate('$fontKey', -family => \"$family\", -size => $size, -weight => \"$weight\") if ! \$fonts {\"$fontKey\"};"); } else { - return ($fontKey,""); + return ($fontKey, $fontName, ""); } } # end of createNamedFont |