OSDN > Trouver un logiciel > wp2latex > SCM > hg > wp2latex > Commit

wp2latex
Fork

wp2latex: Commit

WP2LaTeX sources.

Commit MetaInfo

Révision	d67f654189c0e0af17ff4b9a18407295da2687f3 (tree)
l'heure	2022-06-05 19:41:42
Auteur	Fojtik
Commiter	Fojtik

Message de Log

Fix text positioning in EXTTEXTOUTW.

Change Summary

modified: trunk/sources.cc/pass1wmf.cc (diff)
modified: trunk/sources.cc/wp2latex.h (diff)

Modification

diff -r 2940b2d119f3 -r d67f654189c0 trunk/sources.cc/pass1wmf.cc

--- a/trunk/sources.cc/pass1wmf.cc Fri Jun 03 09:28:25 2022 +0200

+++ b/trunk/sources.cc/pass1wmf.cc Sun Jun 05 12:41:42 2022 +0200

		@@ -2884,7 +2884,7 @@
2884	2884	const float Scale = GetScale2PSU((TMapMode)MapMode);
2885	2885	TextContainer *pTextCont = new TextContainer;
2886	2886	pTextCont->PosX = Scale*x_pos;
2887		- pTextCont->PosY = Scale*y_pos;
	2887	+ pTextCont->PosY = Scale*y_pos + mm2PSu(PSS.FontSize); // Fix text position.
2888	2888	pTextCont->TextAllign = PSS.TextAllign;
2889	2889	pTextCont->FontOrientation = PSS.FontOrientation10 / 10.0f;
2890	2890

		@@ -2915,6 +2915,14 @@
2915	2915	{
2916	2916	pTextCont->Transform(WorldTx);
2917	2917	VectList.AddObject(pTextCont);
	2918	+#ifdef _DEBUG
	2919	+/*
	2920	+ const float sz = mm2PSu(PSS.FontSize)/2;
	2921	+ VectorRectangle pVectRec = new VectorRectangle(Scaley_pos, Scale*y_pos+sz, pTextCont->PosX, pTextCont->PosX+sz);
	2922	+ pVectRec->AttribFromPSS(PSS);
	2923	+ VectList.AddObject(pVectRec);
	2924	+*/
	2925	+#endif
2918	2926	}
2919	2927	pTextCont = NULL;
2920	2928

		@@ -3887,9 +3895,6 @@
3887	3895	if(LoadEMFHeader(wpd,EmfHead)!=80) return -3;
3888	3896	if(EmfHead.Signature!=0x464D4520) return -4;
3889	3897
3890		- if(err != NULL)
3891		- fprintf(err, _("\nWarning: EMF parser is still experimental."));
3892		-
3893	3898	ConvertUnicode = GetTranslator("unicodeTOinternal");
3894	3899	fseek(wpd, EmfRec.ParamFilePos+EmfRec.Size, SEEK_SET);
3895	3900

		@@ -3898,88 +3903,88 @@
3898	3903	{
3899	3904	switch(EmfRec.Type)
3900	3905	{
3901		- case EMR_HEADER: strcpy(ObjType,"!HEADER"); break; // 0x00000001
3902		- case EMR_POLYBEZIER: strcpy(ObjType,"!POLYBEZIER"); PleaseReport("POLYBEZIER"); break; // 0x00000002
3903		- case EMR_POLYGON: strcpy(ObjType,"!POLYGON"); PleaseReport("POLYGON"); break; // 0x00000003
3904		- case EMR_POLYLINE: strcpy(ObjType,"!POLYLINE"); PleaseReport("POLYLINE"); break; // 0x00000004
3905		- case EMR_POLYBEZIERTO: strcpy(ObjType,"!POLYBEZIERTO"); PleaseReport("POLYBEZIERTO"); break; // 0x00000005
3906		- case EMR_POLYLINETO: strcpy(ObjType,"!POLYLINETO"); PleaseReport("POLYLINETO"); break; // 0x00000006
3907		- case EMR_POLYPOLYLINE: strcpy(ObjType,"!POLYPOLYLINE"); PleaseReport("POLYPOLYLINE"); break; // 0x00000007
3908		- case EMR_POLYPOLYGON: strcpy(ObjType,"!POLYPOLYGON"); PleaseReport("POLYPOLYGON"); break; // 0x00000008
3909		- case EMR_SETWINDOWEXTEX: strcpy(ObjType,"!SETWINDOWEXTEX"); break; // 0x00000009
3910		- case EMR_SETWINDOWORGEX: strcpy(ObjType,"!SETWINDOWORGEX"); break; // 0x0000000A
3911		- case EMR_SETVIEWPORTEXTEX: strcpy(ObjType,"!SETVIEWPORTEXTEX"); break; // 0x0000000B
3912		- case EMR_SETVIEWPORTORGEX: strcpy(ObjType,"!SETVIEWPORTORGEX"); break; // 0x0000000C
3913		- case EMR_SETBRUSHORGEX: strcpy(ObjType,"!SETBRUSHORGEX"); break; // 0x0000000D
	3906	+ case EMR_HEADER: strcpy(ObjType,"!HEADER"); break; // 0x00000001
	3907	+ case EMR_POLYBEZIER: strcpy(ObjType,"!POLYBEZIER"); PleaseReport("POLYBEZIER"); break; // 0x00000002
	3908	+ case EMR_POLYGON: strcpy(ObjType,"!POLYGON"); PleaseReport("POLYGON"); break; // 0x00000003
	3909	+ case EMR_POLYLINE: strcpy(ObjType,"!POLYLINE"); PleaseReport("POLYLINE"); break; // 0x00000004
	3910	+ case EMR_POLYBEZIERTO: strcpy(ObjType,"!POLYBEZIERTO"); PleaseReport("POLYBEZIERTO"); break; // 0x00000005
	3911	+ case EMR_POLYLINETO: strcpy(ObjType,"!POLYLINETO"); PleaseReport("POLYLINETO"); break; // 0x00000006
	3912	+ case EMR_POLYPOLYLINE: strcpy(ObjType,"!POLYPOLYLINE"); PleaseReport("POLYPOLYLINE"); break; // 0x00000007
	3913	+ case EMR_POLYPOLYGON: strcpy(ObjType,"!POLYPOLYGON"); PleaseReport("POLYPOLYGON"); break; // 0x00000008
	3914	+ case EMR_SETWINDOWEXTEX: strcpy(ObjType,"!SETWINDOWEXTEX"); break; // 0x00000009
	3915	+ case EMR_SETWINDOWORGEX: strcpy(ObjType,"!SETWINDOWORGEX"); break; // 0x0000000A
	3916	+ case EMR_SETVIEWPORTEXTEX:strcpy(ObjType,"!SETVIEWPORTEXTEX"); break; // 0x0000000B
	3917	+ case EMR_SETVIEWPORTORGEX:strcpy(ObjType,"!SETVIEWPORTORGEX"); break; // 0x0000000C
	3918	+ case EMR_SETBRUSHORGEX: strcpy(ObjType,"!SETBRUSHORGEX"); break; // 0x0000000D
3914	3919	case EMR_EOF: strcpy(ObjType,"!EOF"); break; // 0x0000000E
3915		- case EMR_SETPIXELV: parse_SetPixel(VectList); break; // 0x0000000F
3916		- case EMR_SETMAPPERFLAGS: strcpy(ObjType,"!SETMAPPERFLAGS"); break; // 0x00000010
3917		- case EMR_SETMAPMODE: strcpy(ObjType,"!SETMAPMODE"); break; // 0x00000011
	3920	+ case EMR_SETPIXELV: parse_SetPixel(VectList); break; // 0x0000000F
	3921	+ case EMR_SETMAPPERFLAGS: strcpy(ObjType,"!SETMAPPERFLAGS"); break; // 0x00000010
	3922	+ case EMR_SETMAPMODE: strcpy(ObjType,"!SETMAPMODE"); break; // 0x00000011
3918	3923	case EMR_SETBKMODE: parse_SetBkMode(); break; // 0x00000012
3919	3924	case EMR_SETPOLYFILLMODE: parse_SetPolyFillMode(); break; // 0x00000013
3920	3925	case EMR_SETROP2: strcpy(ObjType,"!SETROP2"); break; // 0x00000014
3921	3926	case EMR_SETSTRETCHBLTMODE: strcpy(ObjType,"!SETSTRETCHBLTMODE"); break; // 0x00000015
3922		- case EMR_SETTEXTALIGN: parse_SetTextAlign(); break; // 0x00000016
	3927	+ case EMR_SETTEXTALIGN: parse_SetTextAlign(); break; // 0x00000016
3923	3928	case EMR_SETCOLORADJUSTMENT: strcpy(ObjType,"!SETCOLORADJUSTMENT"); break; // 0x00000017
3924		- case EMR_SETTEXTCOLOR: parse_SetTextColor(); break; // 0x00000018
3925		- case EMR_SETBKCOLOR: parse_SetBkColor(); break; // 0x00000019
3926		- case EMR_OFFSETCLIPRGN: strcpy(ObjType,"!OFFSETCLIPRGN"); break; // 0x0000001A
3927		- case EMR_MOVETOEX: parse_MoveToEX(); break; // 0x0000001B
	3929	+ case EMR_SETTEXTCOLOR: parse_SetTextColor(); break; // 0x00000018
	3930	+ case EMR_SETBKCOLOR: parse_SetBkColor(); break; // 0x00000019
	3931	+ case EMR_OFFSETCLIPRGN: strcpy(ObjType,"!OFFSETCLIPRGN"); break; // 0x0000001A
	3932	+ case EMR_MOVETOEX: parse_MoveToEX(); break; // 0x0000001B
3928	3933	case EMR_SETMETARGN: strcpy(ObjType,"!SETMETARGN"); break; // 0x0000001C
3929	3934	case EMR_EXCLUDECLIPRECT: strcpy(ObjType,"!EXCLUDECLIPRECT"); break; // 0x0000001D
3930	3935	case EMR_INTERSECTCLIPRECT: strcpy(ObjType,"!INTERSECTCLIPRECT"); break; // 0x0000001E
3931	3936	case EMR_SCALEVIEWPORTEXTEX: strcpy(ObjType,"!SCALEVIEWPORTEXTEX"); break; // 0x0000001F
3932	3937	case EMR_SCALEWINDOWEXTEX: strcpy(ObjType,"!SCALEWINDOWEXTEX"); break; // 0x00000020
3933		- case EMR_SAVEDC: strcpy(ObjType,"!SAVEDC"); break; // 0x00000021
3934		- case EMR_RESTOREDC: strcpy(ObjType,"!RESTOREDC"); break; // 0x00000022
	3938	+ case EMR_SAVEDC: strcpy(ObjType,"!SAVEDC"); break; // 0x00000021
	3939	+ case EMR_RESTOREDC: strcpy(ObjType,"!RESTOREDC"); break; // 0x00000022
3935	3940	case EMR_SETWORLDTRANSFORM: parse_SetWorldTransform(); break; // 0x00000023
3936	3941	case EMR_MODIFYWORLDTRANSFORM: parse_ModifyWorldTransform(); break; // 0x00000024
3937	3942	case EMR_SELECTOBJECT: parse_SelectObject(); break; // 0x00000025
3938	3943	case EMR_CREATEPEN: parse_CreatePen(); break; // 0x00000026
3939	3944	case EMR_CREATEBRUSHINDIRECT: parse_CreateBrushIndirect(); break; // 0x00000027
3940	3945	case EMR_DELETEOBJECT: parse_DeleteObject(); break; // 0x00000028
3941		- case EMR_ANGLEARC: strcpy(ObjType,"!ANGLEARC"); break; // 0x00000029
	3946	+ case EMR_ANGLEARC: strcpy(ObjType,"!ANGLEARC"); PleaseReport("ANGLEARC"); break; // 0x00000029
3942	3947	case EMR_ELLIPSE: parse_Ellipse(VectList); break; // 0x0000002A
3943	3948	case EMR_RECTANGLE: parse_Rectangle(VectList); break; // 0x0000002B
3944	3949	case EMR_ROUNDRECT: strcpy(ObjType,"!ROUNDRECT"); PleaseReport("ROUNDRECT"); break; // 0x0000002C
3945	3950	case EMR_ARC: strcpy(ObjType,"!ARC"); PleaseReport("ARC"); break; // 0x0000002D
3946	3951	case EMR_CHORD: strcpy(ObjType,"!CHORD"); PleaseReport("CHORD"); break; // 0x0000002E
3947		- case EMR_PIE: strcpy(ObjType,"!PIE"); break; // 0x0000002F
	3952	+ case EMR_PIE: strcpy(ObjType,"!PIE"); PleaseReport("PIE"); break; // 0x0000002F
3948	3953	case EMR_SELECTPALETTE: parse_SelectPalette(); break; // 0x00000030
3949	3954	case EMR_CREATEPALETTE: parse_CreatePalette(); break; // 0x00000031
3950	3955	case EMR_SETPALETTEENTRIES: strcpy(ObjType,"!SETPALETTEENTRIES"); break; // 0x00000032
3951		- case EMR_RESIZEPALETTE: strcpy(ObjType,"!RESIZEPALETTE"); break; // 0x00000033
3952		- case EMR_REALIZEPALETTE: strcpy(ObjType,"!REALIZEPALETTE"); break; // 0x00000034
3953		- case EMR_EXTFLOODFILL: strcpy(ObjType,"!EXTFLOODFILL"); break; // 0x00000035
	3956	+ case EMR_RESIZEPALETTE: strcpy(ObjType,"!RESIZEPALETTE"); break; // 0x00000033
	3957	+ case EMR_REALIZEPALETTE: strcpy(ObjType,"!REALIZEPALETTE"); break; // 0x00000034
	3958	+ case EMR_EXTFLOODFILL: strcpy(ObjType,"!EXTFLOODFILL"); break; // 0x00000035
3954	3959	case EMR_LINETO: parse_LineTo(VectList); break; // 0x00000036
3955		- case EMR_ARCTO: strcpy(ObjType,"!ARCTO"); break; // 0x00000037
3956		- case EMR_POLYDRAW: strcpy(ObjType,"!POLYDRAW"); break; // 0x00000038
	3960	+ case EMR_ARCTO: strcpy(ObjType,"!ARCTO"); PleaseReport("ARCTO"); break; // 0x00000037
	3961	+ case EMR_POLYDRAW: strcpy(ObjType,"!POLYDRAW"); PleaseReport("POLYDRAW"); break; // 0x00000038
3957	3962	case EMR_SETARCDIRECTION: strcpy(ObjType,"!SETARCDIRECTION"); break; // 0x00000039
3958		- case EMR_SETMITERLIMIT: strcpy(ObjType,"!SETMITERLIMIT"); break; // 0x0000003A
3959		- case EMR_BEGINPATH: strcpy(ObjType,"!BEGINPATH"); break; // 0x0000003B
3960		- case EMR_ENDPATH: strcpy(ObjType,"!ENDPATH"); break; // 0x0000003C
3961		- case EMR_CLOSEFIGURE: strcpy(ObjType,"!CLOSEFIGURE"); break; // 0x0000003D
3962		- case EMR_FILLPATH: strcpy(ObjType,"!FILLPATH"); break; // 0x0000003E
3963		- case EMR_STROKEANDFILLPATH: strcpy(ObjType,"!STROKEANDFILLPATH"); break; // 0x0000003F
3964		- case EMR_STROKEPATH: strcpy(ObjType,"!STROKEPATH"); break; // 0x00000040
3965		- case EMR_FLATTENPATH: strcpy(ObjType,"!FLATTENPATH"); break; // 0x00000041
3966		- case EMR_WIDENPATH: strcpy(ObjType,"!WIDENPATH"); break; // 0x00000042
3967		- case EMR_SELECTCLIPPATH: strcpy(ObjType,"!SELECTCLIPPATH"); break; // 0x00000043
3968		- case EMR_ABORTPATH: strcpy(ObjType,"!ABORTPATH"); break; // 0x00000044
3969		- case EMR_COMMENT: strcpy(ObjType,"!COMMENT"); break; // 0x00000046
3970		- case EMR_FILLRGN: strcpy(ObjType,"!FILLRGN"); break; // 0x00000047
3971		- case EMR_FRAMERGN: strcpy(ObjType,"!FRAMERGN"); break; // 0x00000048
3972		- case EMR_INVERTRGN: strcpy(ObjType,"!INVERTRGN"); break; // 0x00000049
3973		- case EMR_PAINTRGN: strcpy(ObjType,"!PAINTRGN"); break; // 0x0000004A
3974		- case EMR_EXTSELECTCLIPRGN: strcpy(ObjType,"!EXTSELECTCLIPRGN"); break; // 0x0000004B
3975		- case EMR_BITBLT: strcpy(ObjType,"!BITBLT"); break; // 0x0000004C
3976		- case EMR_STRETCHBLT: strcpy(ObjType,"!STRETCHBLT"); break; // 0x0000004D
3977		- case EMR_MASKBLT: strcpy(ObjType,"!MASKBLT"); break; // 0x0000004E
3978		- case EMR_PLGBLT: strcpy(ObjType,"!PLGBLT"); break; // 0x0000004F
3979		- case EMR_SETDIBITSTODEVICE: strcpy(ObjType,"!SETDIBITSTODEVICE"); break; // 0x00000050
	3963	+ case EMR_SETMITERLIMIT: strcpy(ObjType,"!SETMITERLIMIT"); break; // 0x0000003A
	3964	+ case EMR_BEGINPATH: strcpy(ObjType,"!BEGINPATH"); break; // 0x0000003B
	3965	+ case EMR_ENDPATH: strcpy(ObjType,"!ENDPATH"); break; // 0x0000003C
	3966	+ case EMR_CLOSEFIGURE: strcpy(ObjType,"!CLOSEFIGURE"); break; // 0x0000003D
	3967	+ case EMR_FILLPATH: strcpy(ObjType,"!FILLPATH"); break; // 0x0000003E
	3968	+ case EMR_STROKEANDFILLPATH:strcpy(ObjType,"!STROKEANDFILLPATH"); break; // 0x0000003F
	3969	+ case EMR_STROKEPATH: strcpy(ObjType,"!STROKEPATH"); break; // 0x00000040
	3970	+ case EMR_FLATTENPATH: strcpy(ObjType,"!FLATTENPATH"); break; // 0x00000041
	3971	+ case EMR_WIDENPATH: strcpy(ObjType,"!WIDENPATH"); break; // 0x00000042
	3972	+ case EMR_SELECTCLIPPATH: strcpy(ObjType,"!SELECTCLIPPATH"); break; // 0x00000043
	3973	+ case EMR_ABORTPATH: strcpy(ObjType,"!ABORTPATH"); break; // 0x00000044
	3974	+ case EMR_COMMENT: strcpy(ObjType,"!COMMENT"); break; // 0x00000046
	3975	+ case EMR_FILLRGN: strcpy(ObjType,"!FILLRGN"); break; // 0x00000047
	3976	+ case EMR_FRAMERGN: strcpy(ObjType,"!FRAMERGN"); break; // 0x00000048
	3977	+ case EMR_INVERTRGN: strcpy(ObjType,"!INVERTRGN"); break; // 0x00000049
	3978	+ case EMR_PAINTRGN: strcpy(ObjType,"!PAINTRGN"); break; // 0x0000004A
	3979	+ case EMR_EXTSELECTCLIPRGN:strcpy(ObjType,"!EXTSELECTCLIPRGN"); break; // 0x0000004B
	3980	+ case EMR_BITBLT: strcpy(ObjType,"!BITBLT"); break; // 0x0000004C
	3981	+ case EMR_STRETCHBLT: strcpy(ObjType,"!STRETCHBLT"); break; // 0x0000004D
	3982	+ case EMR_MASKBLT: strcpy(ObjType,"!MASKBLT"); break; // 0x0000004E
	3983	+ case EMR_PLGBLT: strcpy(ObjType,"!PLGBLT"); break; // 0x0000004F
	3984	+ case EMR_SETDIBITSTODEVICE:strcpy(ObjType,"!SETDIBITSTODEVICE"); break; // 0x00000050
3980	3985	case EMR_STRETCHDIBITS: parse_StretchDIBits(VectList); break; // 0x00000051
3981		- case EMR_EXTCREATEFONTINDIRECTW: parse_ExtCreateFontIndirectW(); break; // 0x00000052
3982		- case EMR_EXTTEXTOUTA: strcpy(ObjType,"!EXTTEXTOUTA"); PleaseReport("EXTTEXTOUTA"); break; // 0x00000053
	3986	+ case EMR_EXTCREATEFONTINDIRECTW: parse_ExtCreateFontIndirectW(); break; // 0x00000052
	3987	+ case EMR_EXTTEXTOUTA: strcpy(ObjType,"!EXTTEXTOUTA"); PleaseReport("EXTTEXTOUTA"); break; // 0x00000053
3983	3988	case EMR_EXTTEXTOUTW: parse_ExtTextOutW(VectList); break; // 0x00000054
3984	3989	case EMR_POLYBEZIER16: parse_PolyBezier16(VectList); break; // 0x00000055
3985	3990	case EMR_POLYGON16: parse_Polygon16(VectList); break; // 0x00000056

		@@ -3992,28 +3997,28 @@
3992	3997	case EMR_CREATEMONOBRUSH: strcpy(ObjType,"!CREATEMONOBRUSH"); break; // 0x0000005D
3993	3998	case EMR_CREATEDIBPATTERNBRUSHPT: strcpy(ObjType,"!CREATEDIBPATTERNBRUSHPT"); break; // 0x0000005E
3994	3999	case EMR_EXTCREATEPEN: parse_ExtCreatePen(); break; // 0x0000005F
3995		- case EMR_POLYTEXTOUTA: strcpy(ObjType,"!POLYTEXTOUTA"); PleaseReport("POLYTEXTOUTA"); break; // 0x00000060
3996		- case EMR_POLYTEXTOUTW: strcpy(ObjType,"!POLYTEXTOUTW"); PleaseReport("POLYTEXTOUTW"); break; // 0x00000061
3997		- case EMR_SETICMMODE: strcpy(ObjType,"!SETICMMODE"); break; // 0x00000062
	4000	+ case EMR_POLYTEXTOUTA: strcpy(ObjType,"!POLYTEXTOUTA"); PleaseReport("POLYTEXTOUTA"); break; // 0x00000060
	4001	+ case EMR_POLYTEXTOUTW: strcpy(ObjType,"!POLYTEXTOUTW"); PleaseReport("POLYTEXTOUTW"); break; // 0x00000061
	4002	+ case EMR_SETICMMODE: strcpy(ObjType,"!SETICMMODE"); break; // 0x00000062
3998	4003	case EMR_CREATECOLORSPACE: strcpy(ObjType,"!CREATECOLORSPACE"); break; // 0x00000063
3999		- case EMR_SETCOLORSPACE: strcpy(ObjType,"!SETCOLORSPACE"); break; // 0x00000064
	4004	+ case EMR_SETCOLORSPACE: strcpy(ObjType,"!SETCOLORSPACE"); break; // 0x00000064
4000	4005	case EMR_DELETECOLORSPACE: strcpy(ObjType,"!DELETECOLORSPACE"); break; // 0x00000065
4001	4006	case EMR_GLSRECORD: strcpy(ObjType,"!GLSRECORD"); break; // 0x00000066
4002	4007	case EMR_GLSBOUNDEDRECORD: strcpy(ObjType,"!GLSBOUNDEDRECORD"); break; // 0x00000067
4003		- case EMR_PIXELFORMAT: strcpy(ObjType,"!PIXELFORMAT"); break; // 0x00000068
4004		- case EMR_DRAWESCAPE: strcpy(ObjType,"!DRAWESCAPE"); break; // 0x00000069
4005		- case EMR_EXTESCAPE: strcpy(ObjType,"!EXTESCAPE"); break; // 0x0000006A
4006		- case EMR_SMALLTEXTOUT: strcpy(ObjType,"!SMALLTEXTOUT"); break; // 0x0000006C
	4008	+ case EMR_PIXELFORMAT: strcpy(ObjType,"!PIXELFORMAT"); break; // 0x00000068
	4009	+ case EMR_DRAWESCAPE: strcpy(ObjType,"!DRAWESCAPE"); break; // 0x00000069
	4010	+ case EMR_EXTESCAPE: strcpy(ObjType,"!EXTESCAPE"); break; // 0x0000006A
	4011	+ case EMR_SMALLTEXTOUT: strcpy(ObjType,"!SMALLTEXTOUT"); break; // 0x0000006C
4007	4012	case EMR_FORCEUFIMAPPING: strcpy(ObjType,"!FORCEUFIMAPPING"); break; // 0x0000006D
4008		- case EMR_NAMEDESCAPE: strcpy(ObjType,"!NAMEDESCAPE"); break; // 0x0000006E
	4013	+ case EMR_NAMEDESCAPE: strcpy(ObjType,"!NAMEDESCAPE"); break; // 0x0000006E
4009	4014	case EMR_COLORCORRECTPALETTE: strcpy(ObjType,"!COLORCORRECTPALETTE"); break; // 0x0000006F
4010		- case EMR_SETICMPROFILEA: strcpy(ObjType,"!SETICMPROFILEA"); break; // 0x00000070
4011		- case EMR_SETICMPROFILEW: strcpy(ObjType,"!SETICMPROFILEW"); break; // 0x00000071
4012		- case EMR_ALPHABLEND: strcpy(ObjType,"!ALPHABLEND"); break; // 0x00000072
4013		- case EMR_SETLAYOUT: strcpy(ObjType,"!SETLAYOUT"); break; // 0x00000073
4014		- case EMR_TRANSPARENTBLT: strcpy(ObjType,"!TRANSPARENTBLT"); break; // 0x00000074
4015		- case EMR_GRADIENTFILL: strcpy(ObjType,"!GRADIENTFILL"); break; // 0x00000076
4016		- case EMR_SETLINKEDUFIS: strcpy(ObjType,"!SETLINKEDUFIS"); break; // 0x00000077
	4015	+ case EMR_SETICMPROFILEA: strcpy(ObjType,"!SETICMPROFILEA"); break; // 0x00000070
	4016	+ case EMR_SETICMPROFILEW: strcpy(ObjType,"!SETICMPROFILEW"); break; // 0x00000071
	4017	+ case EMR_ALPHABLEND: strcpy(ObjType,"!ALPHABLEND"); break; // 0x00000072
	4018	+ case EMR_SETLAYOUT: strcpy(ObjType,"!SETLAYOUT"); break; // 0x00000073
	4019	+ case EMR_TRANSPARENTBLT: strcpy(ObjType,"!TRANSPARENTBLT"); break; // 0x00000074
	4020	+ case EMR_GRADIENTFILL: strcpy(ObjType,"!GRADIENTFILL"); break; // 0x00000076
	4021	+ case EMR_SETLINKEDUFIS: strcpy(ObjType,"!SETLINKEDUFIS"); break; // 0x00000077
4017	4022	case EMR_SETTEXTJUSTIFICATION: strcpy(ObjType,"!SETTEXTJUSTIFICATION"); break; // 0x00000078
4018	4023	case EMR_COLORMATCHTOTARGETW: strcpy(ObjType,"!COLORMATCHTOTARGETW"); break; // 0x00000079
4019	4024	case EMR_CREATECOLORSPACEW: strcpy(ObjType,"!CREATECOLORSPACEW"); break; // 0x0000007A

diff -r 2940b2d119f3 -r d67f654189c0 trunk/sources.cc/wp2latex.h

--- a/trunk/sources.cc/wp2latex.h Fri Jun 03 09:28:25 2022 +0200

+++ b/trunk/sources.cc/wp2latex.h Sun Jun 05 12:41:42 2022 +0200

		@@ -18,7 +18,7 @@
18	18	#define LineLength 80 /* Split lines after more than LineLength charcters */
19	19
20	20	#define VersionWP2L "3.pre108"
21		-#define VersionDate "3 Jun 2022" /* day (space) month (space) full year */
	21	+#define VersionDate "6 Jun 2022" /* day (space) month (space) full year */
22	22
23	23
24	24	/* Constants for a flag InputPS */

Afficher sur ancien navigateur de dépôt.