diff --git a/dlls/wineps/data/AvantGarde_Book.c b/dlls/wineps/data/AvantGarde_Book.c index c2c1a3ecc1e49ab5bc097060f3b7050a06223b68..dce1b0582a958a04df64f0a53bf7b75c7a0bb5c0 100644 --- a/dlls/wineps/data/AvantGarde_Book.c +++ b/dlls/wineps/data/AvantGarde_Book.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_AvantGarde_Book[228] = +static const AFMMETRICS met_AvantGarde_Book[228] = { { 32, 0x0020, 277, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_AvantGarde_Book[228] = * Font metrics */ -AFM PSDRV_AvantGarde_Book = +const AFM PSDRV_AvantGarde_Book = { "AvantGarde-Book", /* FontName */ "ITC Avant Garde Gothic Book", /* FullName */ diff --git a/dlls/wineps/data/AvantGarde_BookOblique.c b/dlls/wineps/data/AvantGarde_BookOblique.c index e96acea7fa031f58c0ac6badfc56550d01ca1f2f..d23543f2b625d674bf8b710c2a77cf04826e3fde 100644 --- a/dlls/wineps/data/AvantGarde_BookOblique.c +++ b/dlls/wineps/data/AvantGarde_BookOblique.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_AvantGarde_BookOblique[228] = +static const AFMMETRICS met_AvantGarde_BookOblique[228] = { { 32, 0x0020, 277, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_AvantGarde_BookOblique[228] = * Font metrics */ -AFM PSDRV_AvantGarde_BookOblique = +const AFM PSDRV_AvantGarde_BookOblique = { "AvantGarde-BookOblique", /* FontName */ "ITC Avant Garde Gothic Book Oblique", /* FullName */ diff --git a/dlls/wineps/data/AvantGarde_Demi.c b/dlls/wineps/data/AvantGarde_Demi.c index 7c4983da10669388de2316e006b5fd8cf871b287..2becffd53e26cc654a165f9f6e7f0db840ceed2c 100644 --- a/dlls/wineps/data/AvantGarde_Demi.c +++ b/dlls/wineps/data/AvantGarde_Demi.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_AvantGarde_Demi[228] = +static const AFMMETRICS met_AvantGarde_Demi[228] = { { 32, 0x0020, 280, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_AvantGarde_Demi[228] = * Font metrics */ -AFM PSDRV_AvantGarde_Demi = +const AFM PSDRV_AvantGarde_Demi = { "AvantGarde-Demi", /* FontName */ "ITC Avant Garde Gothic Demi", /* FullName */ diff --git a/dlls/wineps/data/AvantGarde_DemiOblique.c b/dlls/wineps/data/AvantGarde_DemiOblique.c index 5ba6c8a7dc1d33c45ffbe5e4babe4bb3f0b36a22..ce962138995231746f1f0c12b3c0836b3924ec54 100644 --- a/dlls/wineps/data/AvantGarde_DemiOblique.c +++ b/dlls/wineps/data/AvantGarde_DemiOblique.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_AvantGarde_DemiOblique[228] = +static const AFMMETRICS met_AvantGarde_DemiOblique[228] = { { 32, 0x0020, 280, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_AvantGarde_DemiOblique[228] = * Font metrics */ -AFM PSDRV_AvantGarde_DemiOblique = +const AFM PSDRV_AvantGarde_DemiOblique = { "AvantGarde-DemiOblique", /* FontName */ "ITC Avant Garde Gothic Demi Oblique", /* FullName */ diff --git a/dlls/wineps/data/Bookman_Demi.c b/dlls/wineps/data/Bookman_Demi.c index 36a2a4ff2186c69da244ab3ef89fa98a4bc91909..8137d0924fe90e1d5d60383dbe26145d7547fca7 100644 --- a/dlls/wineps/data/Bookman_Demi.c +++ b/dlls/wineps/data/Bookman_Demi.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Bookman_Demi[228] = +static const AFMMETRICS met_Bookman_Demi[228] = { { 32, 0x0020, 340, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Bookman_Demi[228] = * Font metrics */ -AFM PSDRV_Bookman_Demi = +const AFM PSDRV_Bookman_Demi = { "Bookman-Demi", /* FontName */ "ITC Bookman Demi", /* FullName */ diff --git a/dlls/wineps/data/Bookman_DemiItalic.c b/dlls/wineps/data/Bookman_DemiItalic.c index 143a3e26779fd7dbdaf68063cb7219efb738ffb5..96359c696be79321ec2127510e6c79530a861836 100644 --- a/dlls/wineps/data/Bookman_DemiItalic.c +++ b/dlls/wineps/data/Bookman_DemiItalic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Bookman_DemiItalic[228] = +static const AFMMETRICS met_Bookman_DemiItalic[228] = { { 32, 0x0020, 340, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Bookman_DemiItalic[228] = * Font metrics */ -AFM PSDRV_Bookman_DemiItalic = +const AFM PSDRV_Bookman_DemiItalic = { "Bookman-DemiItalic", /* FontName */ "ITC Bookman Demi Italic", /* FullName */ diff --git a/dlls/wineps/data/Bookman_Light.c b/dlls/wineps/data/Bookman_Light.c index 3fabde2c12a0d8117c0eda316fa6bb9d8d3badb5..ae4cbe9eae67251746e115ebf9155c3afdb1edb7 100644 --- a/dlls/wineps/data/Bookman_Light.c +++ b/dlls/wineps/data/Bookman_Light.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Bookman_Light[228] = +static const AFMMETRICS met_Bookman_Light[228] = { { 32, 0x0020, 320, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Bookman_Light[228] = * Font metrics */ -AFM PSDRV_Bookman_Light = +const AFM PSDRV_Bookman_Light = { "Bookman-Light", /* FontName */ "ITC Bookman Light", /* FullName */ diff --git a/dlls/wineps/data/Bookman_LightItalic.c b/dlls/wineps/data/Bookman_LightItalic.c index 1f11cb8b9f17accd81a0b44dd790550ac913bda8..5025d0f9418fecea2f828ff1936023678890366d 100644 --- a/dlls/wineps/data/Bookman_LightItalic.c +++ b/dlls/wineps/data/Bookman_LightItalic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Bookman_LightItalic[228] = +static const AFMMETRICS met_Bookman_LightItalic[228] = { { 32, 0x0020, 300, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Bookman_LightItalic[228] = * Font metrics */ -AFM PSDRV_Bookman_LightItalic = +const AFM PSDRV_Bookman_LightItalic = { "Bookman-LightItalic", /* FontName */ "ITC Bookman Light Italic", /* FullName */ diff --git a/dlls/wineps/data/Courier.c b/dlls/wineps/data/Courier.c index daa50a2911e0660de8ef060d646499dbcd2f02f5..020b1a53beaaa8fdc66305811ffc742934ebef47 100644 --- a/dlls/wineps/data/Courier.c +++ b/dlls/wineps/data/Courier.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Courier[243] = +static const AFMMETRICS met_Courier[243] = { { 32, 0x0020, 600, PSDRV_AGLGlyphNames + 1169, @@ -1004,7 +1004,7 @@ static AFMMETRICS met_Courier[243] = * Font metrics */ -AFM PSDRV_Courier = +const AFM PSDRV_Courier = { "Courier", /* FontName */ "Courier", /* FullName */ diff --git a/dlls/wineps/data/Courier_Bold.c b/dlls/wineps/data/Courier_Bold.c index 59a1c3982c548b08bfe547ab92602f0e3a406a57..e775c382d420cd9216ee443130bc128564e19f97 100644 --- a/dlls/wineps/data/Courier_Bold.c +++ b/dlls/wineps/data/Courier_Bold.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Courier_Bold[243] = +static const AFMMETRICS met_Courier_Bold[243] = { { 32, 0x0020, 600, PSDRV_AGLGlyphNames + 1169, @@ -1004,7 +1004,7 @@ static AFMMETRICS met_Courier_Bold[243] = * Font metrics */ -AFM PSDRV_Courier_Bold = +const AFM PSDRV_Courier_Bold = { "Courier-Bold", /* FontName */ "Courier Bold", /* FullName */ diff --git a/dlls/wineps/data/Courier_BoldOblique.c b/dlls/wineps/data/Courier_BoldOblique.c index bf84a7222b26d101bd5858c463e649403117b564..000f2acbca90427045af607faf5503dfb7dd59f4 100644 --- a/dlls/wineps/data/Courier_BoldOblique.c +++ b/dlls/wineps/data/Courier_BoldOblique.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Courier_BoldOblique[243] = +static const AFMMETRICS met_Courier_BoldOblique[243] = { { 32, 0x0020, 600, PSDRV_AGLGlyphNames + 1169, @@ -1004,7 +1004,7 @@ static AFMMETRICS met_Courier_BoldOblique[243] = * Font metrics */ -AFM PSDRV_Courier_BoldOblique = +const AFM PSDRV_Courier_BoldOblique = { "Courier-BoldOblique", /* FontName */ "Courier Bold Oblique", /* FullName */ diff --git a/dlls/wineps/data/Courier_Oblique.c b/dlls/wineps/data/Courier_Oblique.c index 23c6ed3177aebd2cbe39aabb461dfb054701be11..4fffaca14f2c7e0719a18ad30376e93cfe864e8a 100644 --- a/dlls/wineps/data/Courier_Oblique.c +++ b/dlls/wineps/data/Courier_Oblique.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Courier_Oblique[243] = +static const AFMMETRICS met_Courier_Oblique[243] = { { 32, 0x0020, 600, PSDRV_AGLGlyphNames + 1169, @@ -1004,7 +1004,7 @@ static AFMMETRICS met_Courier_Oblique[243] = * Font metrics */ -AFM PSDRV_Courier_Oblique = +const AFM PSDRV_Courier_Oblique = { "Courier-Oblique", /* FontName */ "Courier Oblique", /* FullName */ diff --git a/dlls/wineps/data/Helvetica.c b/dlls/wineps/data/Helvetica.c index c285db95f28b42722be3cad2114dd29193c2f846..1ff9645ec7481cc9f4bfddcd2dc636148ee09379 100644 --- a/dlls/wineps/data/Helvetica.c +++ b/dlls/wineps/data/Helvetica.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Helvetica[228] = +static const AFMMETRICS met_Helvetica[228] = { { 32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica[228] = * Font metrics */ -AFM PSDRV_Helvetica = +const AFM PSDRV_Helvetica = { "Helvetica", /* FontName */ "Helvetica", /* FullName */ diff --git a/dlls/wineps/data/Helvetica_Bold.c b/dlls/wineps/data/Helvetica_Bold.c index 333a92491aff099fbb8380479897336a69c086fc..0159e22595ce8a4225c5aa012c70f3423fa5752a 100644 --- a/dlls/wineps/data/Helvetica_Bold.c +++ b/dlls/wineps/data/Helvetica_Bold.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Helvetica_Bold[228] = +static const AFMMETRICS met_Helvetica_Bold[228] = { { 32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Bold[228] = * Font metrics */ -AFM PSDRV_Helvetica_Bold = +const AFM PSDRV_Helvetica_Bold = { "Helvetica-Bold", /* FontName */ "Helvetica Bold", /* FullName */ diff --git a/dlls/wineps/data/Helvetica_BoldOblique.c b/dlls/wineps/data/Helvetica_BoldOblique.c index f9512d5f8d8187cbdb1382ac4ae0e07cc00017fe..a4845721113d0ef56929c74142a127902233ff68 100644 --- a/dlls/wineps/data/Helvetica_BoldOblique.c +++ b/dlls/wineps/data/Helvetica_BoldOblique.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Helvetica_BoldOblique[228] = +static const AFMMETRICS met_Helvetica_BoldOblique[228] = { { 32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_BoldOblique[228] = * Font metrics */ -AFM PSDRV_Helvetica_BoldOblique = +const AFM PSDRV_Helvetica_BoldOblique = { "Helvetica-BoldOblique", /* FontName */ "Helvetica Bold Oblique", /* FullName */ diff --git a/dlls/wineps/data/Helvetica_Narrow.c b/dlls/wineps/data/Helvetica_Narrow.c index 104a99b29d7c0359da99210ee41d1aa2db7a90da..75742eb7d35368e64aca5218428456f31e131da9 100644 --- a/dlls/wineps/data/Helvetica_Narrow.c +++ b/dlls/wineps/data/Helvetica_Narrow.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Helvetica_Narrow[228] = +static const AFMMETRICS met_Helvetica_Narrow[228] = { { 32, 0x0020, 228, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Narrow[228] = * Font metrics */ -AFM PSDRV_Helvetica_Narrow = +const AFM PSDRV_Helvetica_Narrow = { "Helvetica-Narrow", /* FontName */ "Helvetica Narrow", /* FullName */ diff --git a/dlls/wineps/data/Helvetica_Narrow_Bold.c b/dlls/wineps/data/Helvetica_Narrow_Bold.c index 8fd1dc4ed469c540f864a0ad5c9e9b0963ad0ec5..a486e2ac5623d1df7972bd0e3d4860409e1613b2 100644 --- a/dlls/wineps/data/Helvetica_Narrow_Bold.c +++ b/dlls/wineps/data/Helvetica_Narrow_Bold.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Helvetica_Narrow_Bold[228] = +static const AFMMETRICS met_Helvetica_Narrow_Bold[228] = { { 32, 0x0020, 228, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Narrow_Bold[228] = * Font metrics */ -AFM PSDRV_Helvetica_Narrow_Bold = +const AFM PSDRV_Helvetica_Narrow_Bold = { "Helvetica-Narrow-Bold", /* FontName */ "Helvetica Narrow Bold", /* FullName */ diff --git a/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c b/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c index 98fc06719507d1aec94fd773f7daf54d887a5286..789485e07ae6b4c898fa960a9a228819c438a173 100644 --- a/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c +++ b/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Helvetica_Narrow_BoldOblique[228] = +static const AFMMETRICS met_Helvetica_Narrow_BoldOblique[228] = { { 32, 0x0020, 228, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Narrow_BoldOblique[228] = * Font metrics */ -AFM PSDRV_Helvetica_Narrow_BoldOblique = +const AFM PSDRV_Helvetica_Narrow_BoldOblique = { "Helvetica-Narrow-BoldOblique", /* FontName */ "Helvetica Narrow Bold Oblique", /* FullName */ diff --git a/dlls/wineps/data/Helvetica_Narrow_Oblique.c b/dlls/wineps/data/Helvetica_Narrow_Oblique.c index e3632772836582907b6b833d8f4ec8640f7cd972..a2296101b0c663743299f17ecd2cfa0be12bc85f 100644 --- a/dlls/wineps/data/Helvetica_Narrow_Oblique.c +++ b/dlls/wineps/data/Helvetica_Narrow_Oblique.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Helvetica_Narrow_Oblique[228] = +static const AFMMETRICS met_Helvetica_Narrow_Oblique[228] = { { 32, 0x0020, 228, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Narrow_Oblique[228] = * Font metrics */ -AFM PSDRV_Helvetica_Narrow_Oblique = +const AFM PSDRV_Helvetica_Narrow_Oblique = { "Helvetica-Narrow-Oblique", /* FontName */ "Helvetica Narrow Oblique", /* FullName */ diff --git a/dlls/wineps/data/Helvetica_Oblique.c b/dlls/wineps/data/Helvetica_Oblique.c index 5d8cc2488b3c4b9c2d3763627e62729240532434..d16d3bce43d729233087fb10108a9ceb5d8df17d 100644 --- a/dlls/wineps/data/Helvetica_Oblique.c +++ b/dlls/wineps/data/Helvetica_Oblique.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Helvetica_Oblique[228] = +static const AFMMETRICS met_Helvetica_Oblique[228] = { { 32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Oblique[228] = * Font metrics */ -AFM PSDRV_Helvetica_Oblique = +const AFM PSDRV_Helvetica_Oblique = { "Helvetica-Oblique", /* FontName */ "Helvetica Oblique", /* FullName */ diff --git a/dlls/wineps/data/NewCenturySchlbk_Bold.c b/dlls/wineps/data/NewCenturySchlbk_Bold.c index f1332ebd01ecac2cd3a8e2f79f5e0d623186eaf4..096f75ff49a618d16a7d6f02dc94072bd487dd21 100644 --- a/dlls/wineps/data/NewCenturySchlbk_Bold.c +++ b/dlls/wineps/data/NewCenturySchlbk_Bold.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_NewCenturySchlbk_Bold[228] = +static const AFMMETRICS met_NewCenturySchlbk_Bold[228] = { { 32, 0x0020, 287, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_NewCenturySchlbk_Bold[228] = * Font metrics */ -AFM PSDRV_NewCenturySchlbk_Bold = +const AFM PSDRV_NewCenturySchlbk_Bold = { "NewCenturySchlbk-Bold", /* FontName */ "New Century Schoolbook Bold", /* FullName */ diff --git a/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c b/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c index b73da01709547844aefde172d25c84e5678968b5..172d023cd6b79790594120b0d7be7b2534f40e42 100644 --- a/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c +++ b/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_NewCenturySchlbk_BoldItalic[228] = +static const AFMMETRICS met_NewCenturySchlbk_BoldItalic[228] = { { 32, 0x0020, 287, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_NewCenturySchlbk_BoldItalic[228] = * Font metrics */ -AFM PSDRV_NewCenturySchlbk_BoldItalic = +const AFM PSDRV_NewCenturySchlbk_BoldItalic = { "NewCenturySchlbk-BoldItalic", /* FontName */ "New Century Schoolbook Bold Italic", /* FullName */ diff --git a/dlls/wineps/data/NewCenturySchlbk_Italic.c b/dlls/wineps/data/NewCenturySchlbk_Italic.c index 95ef83d8026db8eb148dac4848dd99e65072801d..56777d0d9e230ce0ec5697d7ae63c9c2e6673b73 100644 --- a/dlls/wineps/data/NewCenturySchlbk_Italic.c +++ b/dlls/wineps/data/NewCenturySchlbk_Italic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_NewCenturySchlbk_Italic[228] = +static const AFMMETRICS met_NewCenturySchlbk_Italic[228] = { { 32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_NewCenturySchlbk_Italic[228] = * Font metrics */ -AFM PSDRV_NewCenturySchlbk_Italic = +const AFM PSDRV_NewCenturySchlbk_Italic = { "NewCenturySchlbk-Italic", /* FontName */ "New Century Schoolbook Italic", /* FullName */ diff --git a/dlls/wineps/data/NewCenturySchlbk_Roman.c b/dlls/wineps/data/NewCenturySchlbk_Roman.c index 71ac7cd0e6e1b41405365ada91212dbea446510d..2ccfa43a64115824207409ea91f7cf846fa9c5dc 100644 --- a/dlls/wineps/data/NewCenturySchlbk_Roman.c +++ b/dlls/wineps/data/NewCenturySchlbk_Roman.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_NewCenturySchlbk_Roman[228] = +static const AFMMETRICS met_NewCenturySchlbk_Roman[228] = { { 32, 0x0020, 278, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_NewCenturySchlbk_Roman[228] = * Font metrics */ -AFM PSDRV_NewCenturySchlbk_Roman = +const AFM PSDRV_NewCenturySchlbk_Roman = { "NewCenturySchlbk-Roman", /* FontName */ "New Century Schoolbook Roman", /* FullName */ diff --git a/dlls/wineps/data/Palatino_Bold.c b/dlls/wineps/data/Palatino_Bold.c index a3f726f6c10f0bfb63c09b558d89616eeedda78a..e33e508b1f00635a4770847da07cc49e37f14f62 100644 --- a/dlls/wineps/data/Palatino_Bold.c +++ b/dlls/wineps/data/Palatino_Bold.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Palatino_Bold[228] = +static const AFMMETRICS met_Palatino_Bold[228] = { { 32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Palatino_Bold[228] = * Font metrics */ -AFM PSDRV_Palatino_Bold = +const AFM PSDRV_Palatino_Bold = { "Palatino-Bold", /* FontName */ "Palatino Bold", /* FullName */ diff --git a/dlls/wineps/data/Palatino_BoldItalic.c b/dlls/wineps/data/Palatino_BoldItalic.c index 3a8ae3a1493491240aa947f99e6e1e646933b627..ff8efd59194469666c36f8287e74122eccc2d040 100644 --- a/dlls/wineps/data/Palatino_BoldItalic.c +++ b/dlls/wineps/data/Palatino_BoldItalic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Palatino_BoldItalic[228] = +static const AFMMETRICS met_Palatino_BoldItalic[228] = { { 32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Palatino_BoldItalic[228] = * Font metrics */ -AFM PSDRV_Palatino_BoldItalic = +const AFM PSDRV_Palatino_BoldItalic = { "Palatino-BoldItalic", /* FontName */ "Palatino Bold Italic", /* FullName */ diff --git a/dlls/wineps/data/Palatino_Italic.c b/dlls/wineps/data/Palatino_Italic.c index f186120bd2491e1fac30ea7cb8ea872df9cfbcb1..b75fe8afa2ff0e7f3529a1db204034558517e719 100644 --- a/dlls/wineps/data/Palatino_Italic.c +++ b/dlls/wineps/data/Palatino_Italic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Palatino_Italic[228] = +static const AFMMETRICS met_Palatino_Italic[228] = { { 32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Palatino_Italic[228] = * Font metrics */ -AFM PSDRV_Palatino_Italic = +const AFM PSDRV_Palatino_Italic = { "Palatino-Italic", /* FontName */ "Palatino Italic", /* FullName */ diff --git a/dlls/wineps/data/Palatino_Roman.c b/dlls/wineps/data/Palatino_Roman.c index 5c8298f82facb6746f5485cb8b2c6e7836a7c1cc..7a177fc626d3a5be76df0dafc1f6ed52ef0bd594 100644 --- a/dlls/wineps/data/Palatino_Roman.c +++ b/dlls/wineps/data/Palatino_Roman.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Palatino_Roman[228] = +static const AFMMETRICS met_Palatino_Roman[228] = { { 32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Palatino_Roman[228] = * Font metrics */ -AFM PSDRV_Palatino_Roman = +const AFM PSDRV_Palatino_Roman = { "Palatino-Roman", /* FontName */ "Palatino Roman", /* FullName */ diff --git a/dlls/wineps/data/Symbol.c b/dlls/wineps/data/Symbol.c index 8000c9af245f8ffdc04ea3622723b10364cdec5b..26a2832f9059ba40d85bb910f0e0671c404becca 100644 --- a/dlls/wineps/data/Symbol.c +++ b/dlls/wineps/data/Symbol.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Symbol[188] = +static const AFMMETRICS met_Symbol[188] = { { 32, 0xf020, 250, PSDRV_AGLGlyphNames + 1169, @@ -784,7 +784,7 @@ static AFMMETRICS met_Symbol[188] = * Font metrics */ -AFM PSDRV_Symbol = +const AFM PSDRV_Symbol = { "Symbol", /* FontName */ "Symbol", /* FullName */ diff --git a/dlls/wineps/data/Times_Bold.c b/dlls/wineps/data/Times_Bold.c index 0f0f9d8f9e74d384001c525277422d3578e51468..d3f5e5b4b6a112597b0a7c28ea4899a36d1e0fa0 100644 --- a/dlls/wineps/data/Times_Bold.c +++ b/dlls/wineps/data/Times_Bold.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Times_Bold[228] = +static const AFMMETRICS met_Times_Bold[228] = { { 32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Times_Bold[228] = * Font metrics */ -AFM PSDRV_Times_Bold = +const AFM PSDRV_Times_Bold = { "Times-Bold", /* FontName */ "Times Bold", /* FullName */ diff --git a/dlls/wineps/data/Times_BoldItalic.c b/dlls/wineps/data/Times_BoldItalic.c index 6c0d93dc2d91f406230f2e06ce23b9fe135667c8..64f8e0d0e3d2ea6d9c5068e719d89ea26fc02929 100644 --- a/dlls/wineps/data/Times_BoldItalic.c +++ b/dlls/wineps/data/Times_BoldItalic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Times_BoldItalic[228] = +static const AFMMETRICS met_Times_BoldItalic[228] = { { 32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Times_BoldItalic[228] = * Font metrics */ -AFM PSDRV_Times_BoldItalic = +const AFM PSDRV_Times_BoldItalic = { "Times-BoldItalic", /* FontName */ "Times Bold Italic", /* FullName */ diff --git a/dlls/wineps/data/Times_Italic.c b/dlls/wineps/data/Times_Italic.c index ccb6e593ca8183b99ee1f87a1f7bba35cebb94e3..8e819c2be140045eba84babe49d374ae7102928a 100644 --- a/dlls/wineps/data/Times_Italic.c +++ b/dlls/wineps/data/Times_Italic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Times_Italic[228] = +static const AFMMETRICS met_Times_Italic[228] = { { 32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Times_Italic[228] = * Font metrics */ -AFM PSDRV_Times_Italic = +const AFM PSDRV_Times_Italic = { "Times-Italic", /* FontName */ "Times Italic", /* FullName */ diff --git a/dlls/wineps/data/Times_Roman.c b/dlls/wineps/data/Times_Roman.c index 7503bb3032851a563cd552e04637e85df9aa9452..f756ad5ef56d34d20e7cb4cb4ccd210ab90daaab 100644 --- a/dlls/wineps/data/Times_Roman.c +++ b/dlls/wineps/data/Times_Roman.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_Times_Roman[228] = +static const AFMMETRICS met_Times_Roman[228] = { { 32, 0x0020, 250, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_Times_Roman[228] = * Font metrics */ -AFM PSDRV_Times_Roman = +const AFM PSDRV_Times_Roman = { "Times-Roman", /* FontName */ "Times Roman", /* FullName */ diff --git a/dlls/wineps/data/ZapfChancery_MediumItalic.c b/dlls/wineps/data/ZapfChancery_MediumItalic.c index 32d82d0a14cccff720583a8739320cfe45e58829..e863e0eb5e4d0b3dde087a4694d17449438df984 100644 --- a/dlls/wineps/data/ZapfChancery_MediumItalic.c +++ b/dlls/wineps/data/ZapfChancery_MediumItalic.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_ZapfChancery_MediumItalic[228] = +static const AFMMETRICS met_ZapfChancery_MediumItalic[228] = { { 32, 0x0020, 220, PSDRV_AGLGlyphNames + 1169, @@ -944,7 +944,7 @@ static AFMMETRICS met_ZapfChancery_MediumItalic[228] = * Font metrics */ -AFM PSDRV_ZapfChancery_MediumItalic = +const AFM PSDRV_ZapfChancery_MediumItalic = { "ZapfChancery-MediumItalic", /* FontName */ "ITC Zapf Chancery Medium Italic", /* FullName */ diff --git a/dlls/wineps/data/ZapfDingbats.c b/dlls/wineps/data/ZapfDingbats.c index 8a138d7a6a134384af7bc603ff24f525d968707b..db714e199623a1c1f9ffe28b6010e53b8f356d52 100644 --- a/dlls/wineps/data/ZapfDingbats.c +++ b/dlls/wineps/data/ZapfDingbats.c @@ -23,7 +23,7 @@ * Glyph metrics */ -static AFMMETRICS met_ZapfDingbats[188] = +static const AFMMETRICS met_ZapfDingbats[188] = { { 32, 0xf020, 278, PSDRV_AGLGlyphNames + 1169, @@ -784,7 +784,7 @@ static AFMMETRICS met_ZapfDingbats[188] = * Font metrics */ -AFM PSDRV_ZapfDingbats = +const AFM PSDRV_ZapfDingbats = { "ZapfDingbats", /* FontName */ "ITC Zapf Dingbats", /* FullName */ diff --git a/dlls/wineps/data/agl.c b/dlls/wineps/data/agl.c index 8433bbb8d6c8e49afdfb35cf2a369b175189d370..76e8271f69f95f6c55a6a830549676be652684fa 100644 --- a/dlls/wineps/data/agl.c +++ b/dlls/wineps/data/agl.c @@ -25,7 +25,7 @@ * Built-in font metrics */ -AFM *const PSDRV_BuiltinAFMs[] = +const AFM *const PSDRV_BuiltinAFMs[] = { &PSDRV_AvantGarde_Demi, &PSDRV_AvantGarde_DemiOblique, diff --git a/dlls/wineps/data/agl.h b/dlls/wineps/data/agl.h index 49040be91f4577c8d58863159cd59856b4ed7a0d..794ed8e602288c24a3032846d58e0a5ef878a3b1 100644 --- a/dlls/wineps/data/agl.h +++ b/dlls/wineps/data/agl.h @@ -1,38 +1,38 @@ -extern AFM PSDRV_AvantGarde_Demi; -extern AFM PSDRV_AvantGarde_DemiOblique; -extern AFM PSDRV_AvantGarde_Book; -extern AFM PSDRV_AvantGarde_BookOblique; -extern AFM PSDRV_Bookman_Demi; -extern AFM PSDRV_Bookman_DemiItalic; -extern AFM PSDRV_Bookman_Light; -extern AFM PSDRV_Bookman_LightItalic; -extern AFM PSDRV_Courier_Bold; -extern AFM PSDRV_Courier_BoldOblique; -extern AFM PSDRV_Courier; -extern AFM PSDRV_Courier_Oblique; -extern AFM PSDRV_Helvetica; -extern AFM PSDRV_Helvetica_Bold; -extern AFM PSDRV_Helvetica_BoldOblique; -extern AFM PSDRV_Helvetica_Narrow; -extern AFM PSDRV_Helvetica_Narrow_Bold; -extern AFM PSDRV_Helvetica_Narrow_BoldOblique; -extern AFM PSDRV_Helvetica_Narrow_Oblique; -extern AFM PSDRV_Helvetica_Oblique; -extern AFM PSDRV_NewCenturySchlbk_Bold; -extern AFM PSDRV_NewCenturySchlbk_BoldItalic; -extern AFM PSDRV_NewCenturySchlbk_Italic; -extern AFM PSDRV_NewCenturySchlbk_Roman; -extern AFM PSDRV_Palatino_Bold; -extern AFM PSDRV_Palatino_BoldItalic; -extern AFM PSDRV_Palatino_Italic; -extern AFM PSDRV_Palatino_Roman; -extern AFM PSDRV_Symbol; -extern AFM PSDRV_Times_Bold; -extern AFM PSDRV_Times_BoldItalic; -extern AFM PSDRV_Times_Italic; -extern AFM PSDRV_Times_Roman; -extern AFM PSDRV_ZapfChancery_MediumItalic; -extern AFM PSDRV_ZapfDingbats; +extern const AFM PSDRV_AvantGarde_Demi; +extern const AFM PSDRV_AvantGarde_DemiOblique; +extern const AFM PSDRV_AvantGarde_Book; +extern const AFM PSDRV_AvantGarde_BookOblique; +extern const AFM PSDRV_Bookman_Demi; +extern const AFM PSDRV_Bookman_DemiItalic; +extern const AFM PSDRV_Bookman_Light; +extern const AFM PSDRV_Bookman_LightItalic; +extern const AFM PSDRV_Courier_Bold; +extern const AFM PSDRV_Courier_BoldOblique; +extern const AFM PSDRV_Courier; +extern const AFM PSDRV_Courier_Oblique; +extern const AFM PSDRV_Helvetica; +extern const AFM PSDRV_Helvetica_Bold; +extern const AFM PSDRV_Helvetica_BoldOblique; +extern const AFM PSDRV_Helvetica_Narrow; +extern const AFM PSDRV_Helvetica_Narrow_Bold; +extern const AFM PSDRV_Helvetica_Narrow_BoldOblique; +extern const AFM PSDRV_Helvetica_Narrow_Oblique; +extern const AFM PSDRV_Helvetica_Oblique; +extern const AFM PSDRV_NewCenturySchlbk_Bold; +extern const AFM PSDRV_NewCenturySchlbk_BoldItalic; +extern const AFM PSDRV_NewCenturySchlbk_Italic; +extern const AFM PSDRV_NewCenturySchlbk_Roman; +extern const AFM PSDRV_Palatino_Bold; +extern const AFM PSDRV_Palatino_BoldItalic; +extern const AFM PSDRV_Palatino_Italic; +extern const AFM PSDRV_Palatino_Roman; +extern const AFM PSDRV_Symbol; +extern const AFM PSDRV_Times_Bold; +extern const AFM PSDRV_Times_BoldItalic; +extern const AFM PSDRV_Times_Italic; +extern const AFM PSDRV_Times_Roman; +extern const AFM PSDRV_ZapfChancery_MediumItalic; +extern const AFM PSDRV_ZapfDingbats; #define GN_A (PSDRV_AGLGlyphNames + 0) #define GN_AE (PSDRV_AGLGlyphNames + 1) #define GN_AEacute (PSDRV_AGLGlyphNames + 2) diff --git a/dlls/wineps/mkagl.c b/dlls/wineps/mkagl.c index 116c3f962fb6895a4c5303e946b60c25b8a5db9a..cdbe14c9260500c1aefd57ee5374cefb85d42c9b 100644 --- a/dlls/wineps/mkagl.c +++ b/dlls/wineps/mkagl.c @@ -164,7 +164,7 @@ static void read_afms(FILE *f_c, FILE *f_h) " * Built-in font metrics\n" " */\n" "\n" - "AFM *const PSDRV_BuiltinAFMs[] =\n" + "const AFM *const PSDRV_BuiltinAFMs[] =\n" "{\n", f_c); @@ -209,7 +209,7 @@ static void read_afms(FILE *f_c, FILE *f_h) if (font_family[i] == '-') font_family[i] = '_'; - fprintf(f_h, "extern AFM PSDRV_%s;\n", font_family); + fprintf(f_h, "extern const AFM PSDRV_%s;\n", font_family); fprintf(f_c, " &PSDRV_%s,\n", font_family); while (1) diff --git a/dlls/wineps/psdrv.h b/dlls/wineps/psdrv.h index 03cf0a629a043d6d095dc0bfaf8c4a9d7decec99..4d0e39331135180410ddc4d9680958439158e01f 100644 --- a/dlls/wineps/psdrv.h +++ b/dlls/wineps/psdrv.h @@ -93,7 +93,7 @@ typedef struct _tagFONTFAMILY { } FONTFAMILY; extern FONTFAMILY *PSDRV_AFMFontList; -extern AFM *const PSDRV_BuiltinAFMs[]; /* last element is NULL */ +extern const AFM *const PSDRV_BuiltinAFMs[]; /* last element is NULL */ typedef struct _tagFONTNAME { char *Name;