updated flash.text.engine package

doc/CHANGES.txt

@@ -25,6 +25,7 @@
 	fixed as3 flash.Vector generation
 	fixed haxe.io.BytesOutput for flash9 : set default to little-endian
 	some flash9 fixes related to extern enums
+	updated flash.text.engine package with haxe enums
 
 2008-10-04: 2.01
 	fixed php.Sys

std/flash9/text/engine/BreakOpportunity.hx

@@ -1,9 +1,8 @@
 package flash.text.engine;
 
-extern class BreakOpportunity {
-	function new() : Void;
-	static var ALL : String;
-	static var ANY : String;
-	static var AUTO : String;
-	static var NONE : String;
+extern enum BreakOpportunity {
+	ALL;
+	ANY;
+	AUTO;
+	NONE;
 }

std/flash9/text/engine/CFFHinting.hx

@@ -0,0 +1,6 @@
+package flash.text.engine;
+
+extern enum CFFHinting {
+	HORIZONTAL_STEM;
+	NONE;
+}

std/flash9/text/engine/ContentElement.hx

@@ -1,7 +1,7 @@
 package flash.text.engine;
 
 extern class ContentElement {
-	function new(?elementFormat : flash.text.engine.ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : String) : Void;
+	function new(?elementFormat : flash.text.engine.ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : TextRotation) : Void;
 	var elementFormat : flash.text.engine.ElementFormat;
 	var eventMirror : flash.events.EventDispatcher;
 	var groupElement(default,null) : flash.text.engine.GroupElement;
@@ -9,7 +9,7 @@ extern class ContentElement {
 	var text(default,null) : String;
 	var textBlock(default,null) : flash.text.engine.TextBlock;
 	var textBlockBeginIndex(default,null) : Int;
-	var textRotation : String;
+	var textRotation : TextRotation;
 	var userData : Dynamic;
 	static var GRAPHIC_ELEMENT : UInt;
 }

std/flash9/text/engine/DigitCase.hx

@@ -1,8 +1,7 @@
 package flash.text.engine;
 
-extern class DigitCase {
-	function new() : Void;
-	static var DEFAULT : String;
-	static var LINING : String;
-	static var OLD_STYLE : String;
+extern enum DigitCase {
+	DEFAULT;
+	LINING;
+	OLD_STYLE;
 }

std/flash9/text/engine/DigitWidth.hx

@@ -1,8 +1,7 @@
 package flash.text.engine;
 
-extern class DigitWidth {
-	function new() : Void;
-	static var DEFAULT : String;
-	static var PROPORTIONAL : String;
-	static var TABULAR : String;
+extern enum DigitWidth {
+	DEFAULT;
+	PROPORTIONAL;
+	TABULAR;
 }

std/flash9/text/engine/EastAsianJustifier.hx

@@ -1,6 +1,6 @@
 package flash.text.engine;
 
 extern class EastAsianJustifier extends flash.text.engine.TextJustifier {
-	function new(?locale : String, ?lineJustification : String, ?justificationStyle : String) : Void;
-	var justificationStyle : String;
+	function new(?locale : String, ?lineJustification : flash.text.engine.LineJustification, ?justificationStyle : flash.text.engine.JustificationStyle) : Void;
+	var justificationStyle : flash.text.engine.JustificationStyle;
 }

std/flash9/text/engine/ElementFormat.hx

@@ -1,22 +1,25 @@
 package flash.text.engine;
 
 extern class ElementFormat {
-	function new(?fontDescription : flash.text.engine.FontDescription, ?fontSize : Float, ?color : UInt, ?alpha : Float, ?textRotation : String, ?dominantBaseline : String, ?alignmentBaseline : String, ?baselineShift : Float, ?kerning : String, ?tracking : Float, ?locale : String, ?breakOpportunity : String, ?digitCase : String, ?digitWidth : String, ?ligatureLevel : String, ?typographicCase : String) : Void;
-	var alignmentBaseline : String;
+	function new(?fontDescription : flash.text.engine.FontDescription, ?fontSize : Float, ?color : UInt, ?alpha : Float, ?textRotation : flash.text.engine.TextRotation, ?dominantBaseline : flash.text.engine.TextBaseline, ?alignmentBaseline : flash.text.engine.TextBaseline, ?baselineShift : Float, ?kerning : flash.text.engine.Kerning, ?trackingRight : Float, ?trackingLeft : Float, ?locale : String, ?breakOpportunity : flash.text.engine.BreakOpportunity, ?digitCase : flash.text.engine.DigitCase, ?digitWidth : flash.text.engine.DigitWidth, ?ligatureLevel : flash.text.engine.LigatureLevel, ?typographicCase : flash.text.engine.TypographicCase) : Void;
+	var alignmentBaseline : flash.text.engine.TextBaseline;
 	var alpha : Float;
 	var baselineShift : Float;
-	var breakOpportunity : String;
+	var breakOpportunity : flash.text.engine.BreakOpportunity;
+	function clone() : flash.text.engine.ElementFormat;
 	var color : UInt;
-	var digitCase : String;
-	var digitWidth : String;
-	var dominantBaseline : String;
+	var digitCase : flash.text.engine.DigitCase;
+	var digitWidth : flash.text.engine.DigitWidth;
+	var dominantBaseline : flash.text.engine.TextBaseline;
 	var fontDescription : flash.text.engine.FontDescription;
 	var fontSize : Float;
 	function getFontMetrics() : flash.text.engine.FontMetrics;
-	var kerning : String;
-	var ligatureLevel : String;
+	var kerning : flash.text.engine.Kerning;
+	var ligatureLevel : flash.text.engine.LigatureLevel;
 	var locale : String;
-	var textRotation : String;
-	var tracking : Float;
-	var typographicCase : String;
+	var locked : Bool;
+	var textRotation : flash.text.engine.TextRotation;
+	var trackingLeft : Float;
+	var trackingRight : Float;
+	var typographicCase : flash.text.engine.TypographicCase;
 }

std/flash9/text/engine/FontDescription.hx

@@ -1,13 +1,14 @@
 package flash.text.engine;
 
 extern class FontDescription {
-	function new(?fontName : String, ?fontWeight : String, ?fontPosture : String, ?fontLookup : String, ?antiAliasType : String, ?gridFitType : String, ?sharpness : Float, ?thickness : Float) : Void;
-	var antiAliasType : String;
-	var fontLookup : String;
+	function new(?fontName : String, ?fontWeight : flash.text.engine.FontWeight, ?fontPosture : flash.text.engine.FontPosture, ?fontLookup : flash.text.engine.FontLookup, ?renderingMode : flash.text.engine.RenderingMode, ?cffHinting : flash.text.engine.CFFHinting) : Void;
+	var cffHinting : flash.text.engine.CFFHinting;
+	function clone() : flash.text.engine.FontDescription;
+	var fontLookup : flash.text.engine.FontLookup;
 	var fontName : String;
-	var fontPosture : String;
-	var fontWeight : String;
-	var gridFitType : String;
-	var sharpness : Float;
-	var thickness : Float;
+	var fontPosture : flash.text.engine.FontPosture;
+	var fontWeight : flash.text.engine.FontWeight;
+	function isFontCompatible(fontName : String, fontWeight : flash.text.engine.FontWeight, fontPosture : flash.text.engine.FontPosture) : Bool;
+	var locked : Bool;
+	var renderingMode : flash.text.engine.RenderingMode;
 }

std/flash9/text/engine/FontLookup.hx

@@ -1,7 +1,6 @@
 package flash.text.engine;
 
-extern class FontLookup {
-	function new() : Void;
-	static var DEVICE : String;
-	static var EMBEDDED : String;
+extern enum FontLookup {
+	DEVICE;
+	EMBEDDED_CFF;
 }

std/flash9/text/engine/FontMetrics.hx

@@ -1,12 +1,14 @@
 package flash.text.engine;
 
 extern class FontMetrics {
-	function new(emBox : flash.geom.Rectangle, strikethroughPosition : Float, strikethroughThickness : Float, underlinePosition : Float, underlineThickness : Float, subscriptScale : Float, superscriptScale : Float) : Void;
+	function new(emBox : flash.geom.Rectangle, strikethroughOffset : Float, strikethroughThickness : Float, underlineOffset : Float, underlineThickness : Float, subscriptOffset : Float, subscriptScale : Float, superscriptOffset : Float, superscriptScale : Float) : Void;
 	var emBox : flash.geom.Rectangle;
-	var strikethroughPosition : Float;
+	var strikethroughOffset : Float;
 	var strikethroughThickness : Float;
+	var subscriptOffset : Float;
 	var subscriptScale : Float;
+	var superscriptOffset : Float;
 	var superscriptScale : Float;
-	var underlinePosition : Float;
+	var underlineOffset : Float;
 	var underlineThickness : Float;
 }

std/flash9/text/engine/FontPosture.hx

@@ -1,7 +1,6 @@
 package flash.text.engine;
 
-extern class FontPosture {
-	function new() : Void;
-	static var ITALIC : String;
-	static var NORMAL : String;
+extern enum FontPosture {
+	ITALIC;
+	NORMAL;
 }

std/flash9/text/engine/FontWeight.hx

@@ -1,7 +1,6 @@
 package flash.text.engine;
 
-extern class FontWeight {
-	function new() : Void;
-	static var BOLD : String;
-	static var NORMAL : String;
+extern enum FontWeight {
+	BOLD;
+	NORMAL;
 }

std/flash9/text/engine/GlyphRotation.hx

@@ -1,7 +0,0 @@
-package flash.text.engine;
-
-extern class GlyphRotation {
-	function new() : Void;
-	static var FULL_AND_WIDE : String;
-	static var NONE : String;
-}

std/flash9/text/engine/GraphicElement.hx

@@ -1,7 +1,7 @@
 package flash.text.engine;
 
 extern class GraphicElement extends flash.text.engine.ContentElement {
-	function new(?graphic : flash.display.DisplayObject, ?elementWidth : Float, ?elementHeight : Float, ?elementFormat : flash.text.engine.ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : String) : Void;
+	function new(?graphic : flash.display.DisplayObject, ?elementWidth : Float, ?elementHeight : Float, ?elementFormat : flash.text.engine.ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : flash.text.engine.TextRotation) : Void;
 	var elementHeight : Float;
 	var elementWidth : Float;
 	var graphic : flash.display.DisplayObject;

std/flash9/text/engine/GroupElement.hx

@@ -1,7 +1,7 @@
 package flash.text.engine;
 
 extern class GroupElement extends flash.text.engine.ContentElement {
-	function new(?elements : flash.Vector<flash.text.engine.ContentElement>, ?elementFormat : flash.text.engine.ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : String) : Void;
+	function new(?elements : flash.Vector<flash.text.engine.ContentElement>, ?elementFormat : flash.text.engine.ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : flash.text.engine.TextRotation) : Void;
 	var elementCount(default,null) : Int;
 	function getElementAt(index : Int) : flash.text.engine.ContentElement;
 	function getElementAtCharIndex(charIndex : Int) : flash.text.engine.ContentElement;

std/flash9/text/engine/JustificationStyle.hx

@@ -1,8 +1,7 @@
 package flash.text.engine;
 
-extern class JustificationStyle {
-	function new() : Void;
-	static var PRIORITIZE_LEAST_ADJUSTMENT : String;
-	static var PUSH_IN_KINSOKU : String;
-	static var PUSH_OUT_ONLY : String;
+extern enum JustificationStyle {
+	PRIORITIZE_LEAST_ADJUSTMENT;
+	PUSH_IN_KINSOKU;
+	PUSH_OUT_ONLY;
 }

std/flash9/text/engine/Kerning.hx

@@ -1,8 +1,7 @@
 package flash.text.engine;
 
-extern class Kerning {
-	function new() : Void;
-	static var AUTO : String;
-	static var OFF : String;
-	static var ON : String;
+extern enum Kerning {
+	AUTO;
+	OFF;
+	ON;
 }

std/flash9/text/engine/LigatureLevel.hx

@@ -1,10 +1,9 @@
 package flash.text.engine;
 
-extern class LigatureLevel {
-	function new() : Void;
-	static var COMMON : String;
-	static var EXOTIC : String;
-	static var MINIMUM : String;
-	static var NONE : String;
-	static var UNCOMMON : String;
+extern enum LigatureLevel {
+	COMMON;
+	EXOTIC;
+	MINIMUM;
+	NONE;
+	UNCOMMON;
 }

std/flash9/text/engine/LineJustification.hx

@@ -1,8 +1,7 @@
 package flash.text.engine;
 
-extern class LineJustification {
-	function new() : Void;
-	static var ALL_BUT_LAST : String;
-	static var ALL_INCLUDING_LAST : String;
-	static var UNJUSTIFIED : String;
+extern enum LineJustification {
+	ALL_BUT_LAST;
+	ALL_INCLUDING_LAST;
+	UNJUSTIFIED;
 }

std/flash9/text/engine/RenderingMode.hx

@@ -0,0 +1,6 @@
+package flash.text.engine;
+
+extern enum RenderingMode {
+	CFF;
+	NORMAL;
+}

std/flash9/text/engine/SpaceJustifier.hx

@@ -1,6 +1,6 @@
 package flash.text.engine;
 
 extern class SpaceJustifier extends flash.text.engine.TextJustifier {
-	function new(?locale : String, ?lineJustification : String, ?letterSpacing : Bool) : Void;
+	function new(?locale : String, ?lineJustification : flash.text.engine.LineJustification, ?letterSpacing : Bool) : Void;
 	var letterSpacing : Bool;
 }

std/flash9/text/engine/TabAlignment.hx

@@ -1,9 +1,8 @@
 package flash.text.engine;
 
-extern class TabAlignment {
-	function new() : Void;
-	static var CENTER : String;
-	static var DECIMAL : String;
-	static var END : String;
-	static var START : String;
+extern enum TabAlignment {
+	CENTER;
+	DECIMAL;
+	END;
+	START;
 }

std/flash9/text/engine/TabStop.hx

@@ -1,8 +1,8 @@
 package flash.text.engine;
 
 extern class TabStop {
-	function new(?alignment : String, ?position : Float, ?decimalAlignmentToken : String) : Void;
-	var alignment : String;
+	function new(?alignment : flash.text.engine.TabAlignment, ?position : Float, ?decimalAlignmentToken : String) : Void;
+	var alignment : flash.text.engine.TabAlignment;
 	var decimalAlignmentToken : String;
 	var position : Float;
 }

std/flash9/text/engine/TextBaseline.hx

@@ -1,14 +1,13 @@
 package flash.text.engine;
 
-extern class TextBaseline {
-	function new() : Void;
-	static var ASCENT : String;
-	static var DESCENT : String;
-	static var IDEOGRAPHIC_BOTTOM : String;
-	static var IDEOGRAPHIC_CENTER : String;
-	static var IDEOGRAPHIC_TOP : String;
-	static var ROMAN : String;
-	static var SUBSCRIPT : String;
-	static var SUPERSCRIPT : String;
-	static var USE_DOMINANT_BASELINE : String;
+extern enum TextBaseline {
+	ASCENT;
+	DESCENT;
+	IDEOGRAPHIC_BOTTOM;
+	IDEOGRAPHIC_CENTER;
+	IDEOGRAPHIC_TOP;
+	ROMAN;
+	//SUBSCRIPT;
+	//SUPERSCRIPT;
+	USE_DOMINANT_BASELINE;
 }

std/flash9/text/engine/TextBlock.hx

@@ -1,11 +1,11 @@
 package flash.text.engine;
 
 extern class TextBlock {
-	function new(?content : flash.text.engine.ContentElement, ?tabStops : flash.Vector<flash.text.engine.TabStop>, ?textJustifier : flash.text.engine.TextJustifier, ?glyphRotation : String, ?lineRotation : String, ?baselineZero : String, ?bidiLevel : Int, ?applyNonLinearFontScaling : Bool, ?baselineFontDescription : flash.text.engine.FontDescription, ?baselineFontSize : Float) : Void;
+	function new(?content : flash.text.engine.ContentElement, ?tabStops : flash.Vector<flash.text.engine.TabStop>, ?textJustifier : flash.text.engine.TextJustifier, ?lineRotation : flash.text.engine.TextRotation, ?baselineZero : flash.text.engine.TextBaseline, ?bidiLevel : Int, ?applyNonLinearFontScaling : Bool, ?baselineFontDescription : flash.text.engine.FontDescription, ?baselineFontSize : Float) : Void;
 	var applyNonLinearFontScaling : Bool;
 	var baselineFontDescription : flash.text.engine.FontDescription;
 	var baselineFontSize : Float;
-	var baselineZero : String;
+	var baselineZero : flash.text.engine.TextBaseline;
 	var bidiLevel : Int;
 	var content : flash.text.engine.ContentElement;
 	function createTextLine(?previousLine : flash.text.engine.TextLine, ?width : Float, ?lineOffset : Float, ?fitSomething : Bool) : flash.text.engine.TextLine;
@@ -17,13 +17,13 @@ extern class TextBlock {
 	var firstInvalidLine(default,null) : flash.text.engine.TextLine;
 	var firstLine(default,null) : flash.text.engine.TextLine;
 	function getTextLineAtCharIndex(charIndex : Int) : flash.text.engine.TextLine;
-	var glyphRotation : String;
+	//var glyphRotation : GlyphRotation;
 	var lastLine(default,null) : flash.text.engine.TextLine;
-	var lineRotation : String;
-	function releaseLines(firstLine : flash.text.engine.TextLine, lastLine : flash.text.engine.TextLine) : Dynamic;
+	var lineRotation : flash.text.engine.TextRotation;
+	function releaseLines(firstLine : flash.text.engine.TextLine, lastLine : flash.text.engine.TextLine) : Void;
 	var tabStops : flash.Vector<flash.text.engine.TabStop>;
 	var textJustifier : flash.text.engine.TextJustifier;
-	var textLineCreationResult(default,null) : String;
+	var textLineCreationResult(default,null) : flash.text.engine.TextLineCreationResult;
 	var userData : Dynamic;
 	//private function DoCreateTextLine(previousLine : flash.text.engine.TextLine, width : Float, ?lineOffset : Float, ?fitSomething : Bool) : flash.text.engine.TextLine;
 }

std/flash9/text/engine/TextElement.hx

@@ -1,7 +1,7 @@
 package flash.text.engine;
 
 extern class TextElement extends flash.text.engine.ContentElement {
-	function new(?text : String, ?elementFormat : flash.text.engine.ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : String) : Void;
+	function new(?text : String, ?elementFormat : flash.text.engine.ElementFormat, ?eventMirror : flash.events.EventDispatcher, ?textRotation : flash.text.engine.TextRotation) : Void;
 	function replaceText(beginIndex : Int, endIndex : Int, newText : String) : Void;
 	//var text(null,default) : Void;
 }

std/flash9/text/engine/TextJustifier.hx

@@ -1,8 +1,9 @@
 package flash.text.engine;
 
 extern class TextJustifier {
-	function new(locale : String, lineJustification : String) : Void;
-	var lineJustification : String;
+	function new(locale : String, lineJustification : flash.text.engine.LineJustification) : Void;
+	function clone() : flash.text.engine.TextJustifier;
+	var lineJustification : flash.text.engine.LineJustification;
 	var locale(default,null) : String;
 	//private function setLocale(value : String) : Void;
 	static function getJustifierForLocale(locale : String) : flash.text.engine.TextJustifier;

std/flash9/text/engine/TextLine.hx

@@ -15,9 +15,9 @@ extern class TextLine extends flash.display.DisplayObjectContainer {
 	function getAtomIndexAtPoint(stageX : Float, stageY : Float) : Int;
 	function getAtomTextBlockBeginIndex(atomIndex : Int) : Int;
 	function getAtomTextBlockEndIndex(atomIndex : Int) : Int;
-	function getAtomTextRotation(atomIndex : Int) : String;
+	function getAtomTextRotation(atomIndex : Int) : flash.text.engine.TextRotation;
 	function getAtomWordBoundaryOnLeft(atomIndex : Int) : Bool;
-	function getBaselinePosition(baseline : String) : Float;
+	function getBaselinePosition(baseline : flash.text.engine.TextBaseline) : Float;
 	function getMirrorRegion(mirror : flash.events.EventDispatcher) : flash.text.engine.TextLineMirrorRegion;
 	var hasGraphicElement(default,null) : Bool;
 	var mirrorRegions(default,null) : flash.Vector<flash.text.engine.TextLineMirrorRegion>;
@@ -31,7 +31,7 @@ extern class TextLine extends flash.display.DisplayObjectContainer {
 	var textWidth(default,null) : Float;
 	var unjustifiedTextWidth(default,null) : Float;
 	var userData : Dynamic;
-	var validity : String;
+	var validity : flash.text.engine.TextLineValidity;
 	//private function doGetAtomIndexAtPoint(x : Float, y : Float) : Int;
 	static var MAX_LINE_WIDTH : Int;
 }

std/flash9/text/engine/TextLineCreationResult.hx

@@ -1,9 +1,8 @@
 package flash.text.engine;
 
-extern class TextLineCreationResult {
-	function new() : Void;
-	static var COMPLETE : String;
-	static var EMERGENCY : String;
-	static var INSUFFICIENT_WIDTH : String;
-	static var SUCCESS : String;
+extern enum TextLineCreationResult {
+	COMPLETE;
+	EMERGENCY;
+	INSUFFICIENT_WIDTH;
+	SUCCESS;
 }

std/flash9/text/engine/TextLineValidity.hx

@@ -1,9 +1,8 @@
 package flash.text.engine;
 
-extern class TextLineValidity {
-	function new() : Void;
-	static var INVALID : String;
-	static var POSSIBLY_INVALID : String;
-	static var STATIC : String;
-	static var VALID : String;
+extern enum TextLineValidity {
+	INVALID;
+	POSSIBLY_INVALID;
+	STATIC;
+	VALID;
 }

std/flash9/text/engine/TextRotation.hx

@@ -1,9 +1,9 @@
 package flash.text.engine;
 
-extern class TextRotation {
-	function new() : Void;
-	static var ROTATE_0 : String;
-	static var ROTATE_180 : String;
-	static var ROTATE_270 : String;
-	static var ROTATE_90 : String;
+extern enum TextRotation {
+	AUTO;
+	ROTATE_0;
+	ROTATE_180;
+	ROTATE_270;
+	ROTATE_90;
 }

std/flash9/text/engine/TypographicCase.hx

@@ -1,12 +1,11 @@
 package flash.text.engine;
 
-extern class TypographicCase {
-	function new() : Void;
-	static var CAPS : String;
-	static var CAPS_AND_SMALL_CAPS : String;
-	static var DEFAULT : String;
-	static var LOWERCASE : String;
-	static var SMALL_CAPS : String;
-	static var TITLE : String;
-	static var UPPERCASE : String;
+extern enum TypographicCase {
+	CAPS;
+	CAPS_AND_SMALL_CAPS;
+	DEFAULT;
+	LOWERCASE;
+	SMALL_CAPS;
+	TITLE;
+	UPPERCASE;
 }

std/haxe/ImportAll.hx

@@ -508,7 +508,6 @@ import flash.text.engine.TypographicCase;
 import flash.text.engine.TabAlignment;
 import flash.text.engine.TabStop;
 import flash.text.engine.FontDescription;
-import flash.text.engine.GlyphRotation;
 import flash.text.engine.FontMetrics;
 import flash.text.engine.FontWeight;
 import flash.text.engine.GraphicElement;
@@ -531,6 +530,8 @@ import flash.text.engine.TextLineValidity;
 import flash.text.engine.TextBaseline;
 import flash.text.engine.TextLine;
 import flash.text.engine.DigitWidth;
+import flash.text.engine.CFFHinting;
+import flash.text.engine.RenderingMode;
 
 import flash.ui.ContextMenuClipboardItems;
 import flash.ui.MouseCursor;