AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-10989 fixup apidoc tags on deprecated layout engine. Also DO

Browse Source 
build it by default still for this release. Add a note on
ParagraphLayout as well.

X-SVN-Rev: 36368
This commit is contained in:
Steven R. Loomis 2014-09-05 22:09:11 +00:00
parent e2382d5a3b
commit 2ceea1aada
37 changed files with 213 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icu4c/readme.html
View File

@ -243,8 +243,9 @@
<p>The LayoutEngine is now deprecated. Please
see <a href='http://userguide.icu-project.org/layoutengine'>the
User's Guide</a> for more details and migration recommendations.
Passing "<tt>--enable-layout</tt>" to configure is now required to
enable the layout engine, as it is not built by default.</p>
In the future, passing "<tt>--enable-layout</tt>" to configure
will be required to
enable the layout engine.</p>
<h3>Deprecation: Collation Short Strings</h3>
<p>The collation short naming scheme and its API functions are deprecated.

4
icu4c/source/configure.ac
View File

@ -1063,13 +1063,13 @@ ICU_CONDITIONAL(ICUIO, test "$icuio" = true)
# Enable/disable layout
AC_ARG_ENABLE(layout,
[ --enable-layout build ICU's layout library [default=no]],
[ --enable-layout build ICU's DEPRECATED layout library [default=yes]],
[case "${enableval}" in
yes) layout=true ;;
no) layout=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-layout) ;;
esac],
layout=false)
layout=true)
ICU_CONDITIONAL(LAYOUT, test "$layout" = true)
# Enable/disable tools

4
icu4c/source/layout/ArabicLayoutEngine.h
View File

@ -79,14 +79,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/ContextualGlyphInsertionProc2.h
View File

@ -39,14 +39,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/ContextualGlyphSubstProc.h
View File

@ -37,14 +37,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/ContextualGlyphSubstProc2.h
View File

@ -37,14 +37,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/GXLayoutEngine.h
View File

@ -61,14 +61,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/GXLayoutEngine2.h
View File

@ -60,14 +60,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/HanLayoutEngine.h
View File

@ -61,14 +61,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/HangulLayoutEngine.h
View File

@ -84,14 +84,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/IndicLayoutEngine.h
View File

@ -85,14 +85,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/IndicRearrangementProcessor.h
View File

@ -39,14 +39,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/IndicRearrangementProcessor2.h
View File

@ -39,14 +39,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/KhmerLayoutEngine.h
View File

@ -87,14 +87,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

70
icu4c/source/layout/LEFontInstance.h
View File

@ -23,14 +23,14 @@ U_NAMESPACE_BEGIN
* and character mirroring - replacing a character which has both a left and a right
* hand form with the opposite form.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
class LECharMapper /* not : public UObject because this is an interface/mixin class */
{
public:
/**
* Destructor.
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual ~LECharMapper();
@ -41,7 +41,7 @@ public:
*
* @return the adjusted character
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual LEUnicode32 mapChar(LEUnicode32 ch) const = 0;
};
@ -50,7 +50,7 @@ public:
* This is a forward reference to the class which holds the per-glyph
* storage.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
class LEGlyphStorage;
@ -76,7 +76,7 @@ class LEGlyphStorage;
* methods with some default behavior such as returning constant values, or using the
* values from the first subfont.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
class U_LAYOUT_API LEFontInstance : public UObject
{
@ -86,7 +86,7 @@ public:
* This virtual destructor is here so that the subclass
* destructors can be invoked through the base class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual ~LEFontInstance();
@ -139,7 +139,7 @@ public:
*
* @see LEScripts.h
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual const LEFontInstance *getSubFont(const LEUnicode chars[], le_int32 *offset, le_int32 limit, le_int32 script, LEErrorCode &success) const;
@ -165,7 +165,7 @@ public:
* @return the address of the table in memory, or <code>NULL</code>
* if the table doesn't exist.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual const void *getFontTable(LETag tableTag) const = 0;
@ -204,7 +204,7 @@ public:
*
* @return <code>TRUE</code> if the font can render ch.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_bool canDisplay(LEUnicode32 ch) const;
@ -214,7 +214,7 @@ public:
*
* @return the number of design units pre EM.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_int32 getUnitsPerEM() const = 0;
@ -239,7 +239,7 @@ public:
*
* @see LECharMapper
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual void mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse, const LECharMapper *mapper, le_bool filterZeroWidth, LEGlyphStorage &glyphStorage) const;
@ -256,7 +256,7 @@ public:
*
* @see LECharMapper
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual LEGlyphID mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const;
@ -272,7 +272,7 @@ public:
*
* @see LECharMapper
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual LEGlyphID mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const;
@ -286,7 +286,7 @@ public:
*
* @return the glyph index
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual LEGlyphID mapCharToGlyph(LEUnicode32 ch) const = 0;
@ -300,7 +300,7 @@ public:
* @param glyph - the glyph index
* @param advance - the X and Y pixel values will be stored here
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const = 0;
@ -314,7 +314,7 @@ public:
*
* @return <code>TRUE</code> if the point coordinates could be stored.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_bool getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const = 0;
@ -324,7 +324,7 @@ public:
*
* @return the pixel width of the EM square
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual float getXPixelsPerEm() const = 0;
@ -334,7 +334,7 @@ public:
*
* @return the pixel height of the EM square
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual float getYPixelsPerEm() const = 0;
@ -346,7 +346,7 @@ public:
*
* @return points in the X direction
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual float xUnitsToPoints(float xUnits) const;
@ -358,7 +358,7 @@ public:
*
* @return points in the Y direction
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual float yUnitsToPoints(float yUnits) const;
@ -368,7 +368,7 @@ public:
* @param units - X and Y design units
* @param points - set to X and Y points
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual void unitsToPoints(LEPoint &units, LEPoint &points) const;
@ -380,7 +380,7 @@ public:
*
* @return font design units in the X direction
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual float xPixelsToUnits(float xPixels) const;
@ -392,7 +392,7 @@ public:
*
* @return font design units in the Y direction
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual float yPixelsToUnits(float yPixels) const;
@ -402,7 +402,7 @@ public:
* @param pixels - X and Y pixel
* @param units - set to X and Y font design units
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual void pixelsToUnits(LEPoint &pixels, LEPoint &units) const;
@ -415,7 +415,7 @@ public:
*
* @see transformFunits
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual float getScaleFactorX() const = 0;
@ -427,7 +427,7 @@ public:
*
* @see transformFunits
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual float getScaleFactorY() const = 0;
@ -444,7 +444,7 @@ public:
* @see getScaleFactorX
* @see getScaleFactorY
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual void transformFunits(float xFunits, float yFunits, LEPoint &pixels) const;
@ -456,7 +456,7 @@ public:
*
* @return the floating point value
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static inline float fixedToFloat(le_int32 fixed);
@ -468,7 +468,7 @@ public:
*
* @return the fixed point value
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static inline le_int32 floatToFixed(float theFloat);
@ -484,7 +484,7 @@ public:
* @return the font's ascent, in points. This value
* will always be positive.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_int32 getAscent() const = 0;
@ -494,7 +494,7 @@ public:
* @return the font's descent, in points. This value
* will always be positive.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_int32 getDescent() const = 0;
@ -504,7 +504,7 @@ public:
* @return the font's leading, in points. This value
* will always be positive.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_int32 getLeading() const = 0;
@ -516,21 +516,21 @@ public:
* @return the line height, in points. This vaule will
* always be positive.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_int32 getLineHeight() const;
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

74
icu4c/source/layout/LEGlyphStorage.h
View File

@ -29,7 +29,7 @@ U_NAMESPACE_BEGIN
*
* @see LEInsertionList.h
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
class U_LAYOUT_API LEGlyphStorage : public UObject, protected LEInsertionCallback
{
@ -105,7 +105,7 @@ protected:
*
* @see LEInsertionList.h
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_bool applyInsertion(le_int32 atPosition, le_int32 count, LEGlyphID newGlyphs[]);
@ -116,14 +116,14 @@ public:
* <code>allocateGlyphArray, allocatePositions and allocateAuxData</code>
* to allocate the data.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
LEGlyphStorage();
/**
* The destructor. This will deallocate all of the arrays.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
~LEGlyphStorage();
@ -132,7 +132,7 @@ public:
*
* @return the number of glyphs in the glyph array
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
inline le_int32 getGlyphCount() const;
@ -144,7 +144,7 @@ public:
* @param glyphs - the destiniation glyph array
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getGlyphs(LEGlyphID glyphs[], LEErrorCode &success) const;
@ -158,7 +158,7 @@ public:
* @param extraBits - this value will be ORed with each glyph index
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getGlyphs(le_uint32 glyphs[], le_uint32 extraBits, LEErrorCode &success) const;
@ -170,7 +170,7 @@ public:
* @param charIndices - the destiniation character index array
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getCharIndices(le_int32 charIndices[], LEErrorCode &success) const;
@ -183,7 +183,7 @@ public:
* @param indexBase - an offset which will be added to each index
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getCharIndices(le_int32 charIndices[], le_int32 indexBase, LEErrorCode &success) const;
@ -196,7 +196,7 @@ public:
* @param positions - the destiniation position array
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getGlyphPositions(float positions[], LEErrorCode &success) const;
@ -212,7 +212,7 @@ public:
* @param y - the glyph's Y position
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getGlyphPosition(le_int32 glyphIndex, float &x, float &y, LEErrorCode &success) const;
@ -226,7 +226,7 @@ public:
* @param success set to an error code if the storage cannot be allocated of if the initial
* glyph count is not positive.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void allocateGlyphArray(le_int32 initialGlyphCount, le_bool rightToLeft, LEErrorCode &success);
@ -238,7 +238,7 @@ public:
*
* @return the number of X, Y position pairs allocated.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
le_int32 allocatePositions(LEErrorCode &success);
@ -249,7 +249,7 @@ public:
*
* @return the size of the auxillary data array.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
le_int32 allocateAuxData(LEErrorCode &success);
@ -259,7 +259,7 @@ public:
* @param auxData the auxillary data array will be copied to this address
* @param success set to an error code if the data cannot be copied
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getAuxData(le_uint32 auxData[], LEErrorCode &success) const;
@ -271,7 +271,7 @@ public:
*
* @return the glyph ID
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
LEGlyphID getGlyphID(le_int32 glyphIndex, LEErrorCode &success) const;
@ -283,7 +283,7 @@ public:
*
* @return the character index
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
le_int32 getCharIndex(le_int32 glyphIndex, LEErrorCode &success) const;
@ -296,7 +296,7 @@ public:
*
* @return the auxillary data
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
le_uint32 getAuxData(le_int32 glyphIndex, LEErrorCode &success) const;
@ -308,7 +308,7 @@ public:
*
* @return a reference to the given location in the glyph array
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
inline LEGlyphID &operator[](le_int32 glyphIndex) const;
@ -327,7 +327,7 @@ public:
*
* @see LEInsertionList.h
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
LEGlyphID *insertGlyphs(le_int32 atIndex, le_int32 insertCount, LEErrorCode& success);
@ -347,7 +347,7 @@ public:
*
* @see LEInsertionList.h
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
LEGlyphID *insertGlyphs(le_int32 atIndex, le_int32 insertCount);
@ -362,7 +362,7 @@ public:
* @param toPosition - target position of the glyph
* @param marker marker bit
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void moveGlyph(le_int32 fromPosition, le_int32 toPosition, le_uint32 marker);
@ -376,7 +376,7 @@ public:
*
* @see LEInsertionList.h
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
le_int32 applyInsertions();
@ -387,7 +387,7 @@ public:
* @param glyphID the new glyph ID
* @param success will be set to an error code if the glyph ID cannot be set.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void setGlyphID(le_int32 glyphIndex, LEGlyphID glyphID, LEErrorCode &success);
@ -398,7 +398,7 @@ public:
* @param charIndex the new char index
* @param success will be set to an error code if the char index cannot be set.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void setCharIndex(le_int32 glyphIndex, le_int32 charIndex, LEErrorCode &success);
@ -410,7 +410,7 @@ public:
* @param y the new Y position
* @param success will be set to an error code if the position cannot be set.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void setPosition(le_int32 glyphIndex, float x, float y, LEErrorCode &success);
@ -422,7 +422,7 @@ public:
* @param yAdjust the adjustment to the glyph's Y position
* @param success will be set to an error code if the glyph's position cannot be adjusted.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void adjustPosition(le_int32 glyphIndex, float xAdjust, float yAdjust, LEErrorCode &success);
@ -433,7 +433,7 @@ public:
* @param auxData the new auxillary data
* @param success will be set to an error code if the auxillary data cannot be set.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void setAuxData(le_int32 glyphIndex, le_uint32 auxData, LEErrorCode &success);
@ -445,7 +445,7 @@ public:
* @param from the <code>LEGlyphStorage</code> object from which
* to get the new glyph array.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void adoptGlyphArray(LEGlyphStorage &from);
@ -457,7 +457,7 @@ public:
* @param from the <code>LEGlyphStorage</code> object from which
* to get the new char indices array.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void adoptCharIndicesArray(LEGlyphStorage &from);
@ -469,7 +469,7 @@ public:
* @param from the <code>LEGlyphStorage</code> object from which
* to get the new position array.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void adoptPositionArray(LEGlyphStorage &from);
@ -481,7 +481,7 @@ public:
* @param from the <code>LEGlyphStorage</code> object from which
* to get the new auxillary data array.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void adoptAuxDataArray(LEGlyphStorage &from);
@ -492,7 +492,7 @@ public:
* @param from the <code>LEGlyphStorage</code> object from which
* to get the new glyph count.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void adoptGlyphCount(LEGlyphStorage &from);
@ -501,7 +501,7 @@ public:
*
* @param newGlyphCount the new glyph count.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void adoptGlyphCount(le_int32 newGlyphCount);
@ -511,21 +511,21 @@ public:
* to layout a different characer array. (This method is also called
* by the destructor)
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void reset();
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();
};

4
icu4c/source/layout/LEInsertionList.h
View File

@ -126,14 +126,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/LELanguages.h
View File

@ -25,7 +25,7 @@ U_NAMESPACE_BEGIN
* this is just a list of languages which the LayoutEngine
* supports.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
enum LanguageCodes {
@ -60,7 +60,7 @@ enum LanguageCodes {
zhsLanguageCode = 28,
zhtLanguageCode = 29,
/** New language codes added 03/13/2008 @deprecated ICU 54. See {@link LayoutEngine}
/** New language codes added 03/13/2008 @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
afkLanguageCode = 30,
belLanguageCode = 31,

32
icu4c/source/layout/LEScripts.h
View File

@ -24,7 +24,7 @@ U_NAMESPACE_BEGIN
* Constants for Unicode script values, generated using
* ICU4J's <code>UScript</code> class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
enum ScriptCodes {
@ -70,12 +70,12 @@ enum ScriptCodes {
thaiScriptCode = 38,
tibtScriptCode = 39,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
cansScriptCode = 40,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
yiiiScriptCode = 41,
@ -84,7 +84,7 @@ enum ScriptCodes {
buhdScriptCode = 44,
tagbScriptCode = 45,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
braiScriptCode = 46,
@ -96,12 +96,12 @@ enum ScriptCodes {
taleScriptCode = 52,
ugarScriptCode = 53,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
hrktScriptCode = 54,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
bugiScriptCode = 55,
@ -112,7 +112,7 @@ enum ScriptCodes {
tfngScriptCode = 60,
xpeoScriptCode = 61,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
baliScriptCode = 62,
@ -158,7 +158,7 @@ enum ScriptCodes {
zxxxScriptCode = 102,
zzzzScriptCode = 103,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
cariScriptCode = 104,
@ -174,7 +174,7 @@ enum ScriptCodes {
moonScriptCode = 114,
mteiScriptCode = 115,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
armiScriptCode = 116,
@ -192,7 +192,7 @@ enum ScriptCodes {
zmthScriptCode = 128,
zsymScriptCode = 129,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
bamuScriptCode = 130,
@ -200,7 +200,7 @@ enum ScriptCodes {
nkgbScriptCode = 132,
sarbScriptCode = 133,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
bassScriptCode = 134,
@ -217,7 +217,7 @@ enum ScriptCodes {
sindScriptCode = 145,
waraScriptCode = 146,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
afakScriptCode = 147,
@ -230,20 +230,20 @@ enum ScriptCodes {
tangScriptCode = 154,
woleScriptCode = 155,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
hluwScriptCode = 156,
khojScriptCode = 157,
tirhScriptCode = 158,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
aghbScriptCode = 159,
mahjScriptCode = 160,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
ahomScriptCode = 161,
@ -254,7 +254,7 @@ enum ScriptCodes {
siddScriptCode = 166,
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
scriptCodeCount
};

10
icu4c/source/layout/LESwaps.h
View File

@ -20,7 +20,7 @@ U_NAMESPACE_BEGIN
* A convenience macro which invokes the swapWord member function
* from a concise call.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define SWAPW(value) LESwaps::swapWord((le_uint16)(value))
@ -28,7 +28,7 @@ U_NAMESPACE_BEGIN
* A convenience macro which invokes the swapLong member function
* from a concise call.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define SWAPL(value) LESwaps::swapLong((le_uint32)(value))
@ -39,7 +39,7 @@ U_NAMESPACE_BEGIN
* All methods are static and inline in an attempt to induce the compiler
* to do most of the calculations at compile time.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
class U_LAYOUT_API LESwaps /* not : public UObject because all methods are static */ {
public:
@ -52,7 +52,7 @@ public:
*
* @return the byte swapped word
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static le_uint16 swapWord(le_uint16 value)
{
@ -76,7 +76,7 @@ public:
*
* @return the byte swapped long
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static le_uint32 swapLong(le_uint32 value)
{

74
icu4c/source/layout/LETypes.h
View File

@ -29,42 +29,42 @@
/**
* A type used for signed, 32-bit integers.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef int32_t le_int32;
/**
* A type used for unsigned, 32-bit integers.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef uint32_t le_uint32;
/**
* A type used for signed, 16-bit integers.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef int16_t le_int16;
/**
* A type used for unsigned, 16-bit integers.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef uint16_t le_uint16;
/**
* A type used for signed, 8-bit integers.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef int8_t le_int8;
/**
* A type used for unsigned, 8-bit integers.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef uint8_t le_uint8;
@ -72,7 +72,7 @@ typedef uint8_t le_uint8;
/**
* A type used for boolean values.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef UBool le_bool;
@ -80,7 +80,7 @@ typedef UBool le_bool;
/**
* Used to represent empty pointers.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define NULL 0
#endif
@ -88,7 +88,7 @@ typedef UBool le_bool;
/**
* Used for four character tags.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef le_uint32 LETag;
@ -96,7 +96,7 @@ typedef le_uint32 LETag;
* Used for 16-bit glyph indices as they're represented
* in TrueType font tables.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef le_uint16 TTGlyphID;
@ -107,7 +107,7 @@ typedef le_uint16 TTGlyphID;
* order 8 bits are client defined. The LayoutEngine
* will never change or look at the client defined bits.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef le_uint32 LEGlyphID;
@ -115,7 +115,7 @@ typedef le_uint32 LEGlyphID;
* Used to mask off the glyph ID part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_GLYPH_MASK 0x0000FFFF
@ -124,7 +124,7 @@ typedef le_uint32 LEGlyphID;
* into the low-order bits.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_GLYPH_SHIFT 0
@ -133,7 +133,7 @@ typedef le_uint32 LEGlyphID;
* Used to mask off the sub-font ID part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_SUB_FONT_MASK 0x00FF0000
@ -142,7 +142,7 @@ typedef le_uint32 LEGlyphID;
* into the low-order bits.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_SUB_FONT_SHIFT 16
@ -151,7 +151,7 @@ typedef le_uint32 LEGlyphID;
* Used to mask off the client-defined part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_CLIENT_MASK 0xFF000000
@ -160,7 +160,7 @@ typedef le_uint32 LEGlyphID;
* into the low-order bits.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_CLIENT_SHIFT 24
@ -169,7 +169,7 @@ typedef le_uint32 LEGlyphID;
* A convenience macro to get the Glyph ID part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_GET_GLYPH(gid) ((gid & LE_GLYPH_MASK) >> LE_GLYPH_SHIFT)
@ -177,7 +177,7 @@ typedef le_uint32 LEGlyphID;
* A convenience macro to get the sub-font ID part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_GET_SUB_FONT(gid) ((gid & LE_SUB_FONT_MASK) >> LE_SUB_FONT_SHIFT)
@ -185,7 +185,7 @@ typedef le_uint32 LEGlyphID;
* A convenience macro to get the client-defined part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_GET_CLIENT(gid) ((gid & LE_CLIENT_MASK) >> LE_CLIENT_SHIFT)
@ -194,7 +194,7 @@ typedef le_uint32 LEGlyphID;
* A convenience macro to set the Glyph ID part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_SET_GLYPH(gid, glyph) ((gid & ~LE_GLYPH_MASK) | ((glyph << LE_GLYPH_SHIFT) & LE_GLYPH_MASK))
@ -202,7 +202,7 @@ typedef le_uint32 LEGlyphID;
* A convenience macro to set the sub-font ID part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_SET_SUB_FONT(gid, font) ((gid & ~LE_SUB_FONT_MASK) | ((font << LE_SUB_FONT_SHIFT) & LE_SUB_FONT_MASK))
@ -210,7 +210,7 @@ typedef le_uint32 LEGlyphID;
* A convenience macro to set the client-defined part of an LEGlyphID.
*
* @see LEGlyphID
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_SET_CLIENT(gid, client) ((gid & ~LE_CLIENT_MASK) | ((client << LE_CLIENT_SHIFT) & LE_CLIENT_MASK))
@ -218,14 +218,14 @@ typedef le_uint32 LEGlyphID;
/**
* Used to represent 16-bit Unicode code points.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef UChar LEUnicode16;
/**
* Used to represent 32-bit Unicode code points.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef UChar32 LEUnicode32;
@ -233,7 +233,7 @@ typedef UChar32 LEUnicode32;
/**
* Used to represent 16-bit Unicode code points.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef UChar LEUnicode;
#endif /* U_HIDE_DEPRECATED_API */
@ -241,21 +241,21 @@ typedef UChar LEUnicode;
/**
* Used to hold a pair of (x, y) values which represent a point.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
struct LEPoint
{
/**
* The x coordinate of the point.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
float fX;
/**
* The y coordinate of the point.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
float fY;
};
@ -264,7 +264,7 @@ struct LEPoint
/**
* Used to hold a pair of (x, y) values which represent a point.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef struct LEPoint LEPoint;
#endif
@ -406,7 +406,7 @@ typedef struct LEPoint LEPoint;
* WARNING: THIS MACRO WILL ONLY WORK CORRECTLY IF
* THE ARGUMENT CHARACTERS ARE ASCII.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_MAKE_TAG(a, b, c, d) \
(((le_uint32)(a) << 24) | \
@ -418,7 +418,7 @@ typedef struct LEPoint LEPoint;
* This enumeration defines constants for the standard
* TrueType, OpenType and AAT table tags.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
enum LETableTags {
LE_ACNT_TABLE_TAG = 0x61636E74UL, /**< 'acnt' */
@ -480,7 +480,7 @@ enum LETableTags {
* This enumeration defines constants for all
* the common OpenType feature tags.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
enum LEFeatureTags {
LE_AALT_FEATURE_TAG = 0x61616C74UL, /**< 'aalt' */
@ -682,7 +682,7 @@ enum LEFeatureENUMs {
/**
* Error codes returned by the LayoutEngine.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
enum LEErrorCode {
/* informational */
@ -705,7 +705,7 @@ enum LEErrorCode {
/**
* Error codes returned by the LayoutEngine.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
typedef enum LEErrorCode LEErrorCode;
#endif
@ -713,14 +713,14 @@ typedef enum LEErrorCode LEErrorCode;
/**
* A convenience macro to test for the success of a LayoutEngine call.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_SUCCESS(code) (U_SUCCESS((UErrorCode)code))
/**
* A convenience macro to test for the failure of a LayoutEngine call.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
#define LE_FAILURE(code) (U_FAILURE((UErrorCode)code))

32
icu4c/source/layout/LayoutEngine.h
View File

@ -63,7 +63,7 @@ class LEGlyphStorage;
* @see LEFontInstance
* @see ScriptAndLanguageTags.h
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
* Instead, please use HarfBuzz.
* see http://www.freedesktop.org/wiki/Software/HarfBuzz/
* and http://userguide.icu-project.org/layoutengine
@ -268,7 +268,7 @@ protected:
virtual const void *getFontTable(LETag tableTag, size_t &length) const;
/**
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual const void *getFontTable(LETag tableTag) const { size_t ignored; return getFontTable(tableTag, ignored); }
@ -343,7 +343,7 @@ public:
* method. It is declared virtual so that it will be invoked by the
* subclass destructors.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual ~LayoutEngine();
@ -370,7 +370,7 @@ public:
* method first to free the glyph, character index and position arrays
* allocated by the previous call.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual le_int32 layoutChars(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool rightToLeft, float x, float y, LEErrorCode &success);
@ -381,7 +381,7 @@ public:
*
* @return the number of glyphs in the glyph array
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
le_int32 getGlyphCount() const;
@ -393,7 +393,7 @@ public:
* @param glyphs - the destiniation glyph array
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getGlyphs(LEGlyphID glyphs[], LEErrorCode &success) const;
@ -407,7 +407,7 @@ public:
* @param extraBits - this value will be ORed with each glyph index
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual void getGlyphs(le_uint32 glyphs[], le_uint32 extraBits, LEErrorCode &success) const;
@ -419,7 +419,7 @@ public:
* @param charIndices - the destiniation character index array
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getCharIndices(le_int32 charIndices[], LEErrorCode &success) const;
@ -432,7 +432,7 @@ public:
* @param indexBase - an offset which will be added to each index
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getCharIndices(le_int32 charIndices[], le_int32 indexBase, LEErrorCode &success) const;
@ -445,7 +445,7 @@ public:
* @param positions - the destiniation position array
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getGlyphPositions(float positions[], LEErrorCode &success) const;
@ -461,7 +461,7 @@ public:
* @param y - the glyph's Y position
* @param success - set to an error code if the operation fails
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
void getGlyphPosition(le_int32 glyphIndex, float &x, float &y, LEErrorCode &success) const;
@ -470,7 +470,7 @@ public:
* so that the LayoutEngine can be reused to layout a different
* characer array. (This method is also called by the destructor)
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual void reset();
@ -488,27 +488,27 @@ public:
*
* @see LEFontInstance
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static LayoutEngine *layoutEngineFactory(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, LEErrorCode &success);
/**
* Override of existing call that provides flags to control typography.
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static LayoutEngine *layoutEngineFactory(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, le_int32 typo_flags, LEErrorCode &success);
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/LigatureSubstProc.h
View File

@ -39,14 +39,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/LigatureSubstProc2.h
View File

@ -40,14 +40,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/OpenTypeLayoutEngine.h
View File

@ -129,14 +129,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/SegmentArrayProcessor.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/SegmentArrayProcessor2.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/SegmentSingleProcessor.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/SegmentSingleProcessor2.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/SimpleArrayProcessor.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/SimpleArrayProcessor2.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/SingleTableProcessor.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/SingleTableProcessor2.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/ThaiLayoutEngine.h
View File

@ -56,14 +56,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/TrimmedArrayProcessor.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

4
icu4c/source/layout/TrimmedArrayProcessor2.h
View File

@ -34,14 +34,14 @@ public:
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
virtual UClassID getDynamicClassID() const;
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
*
* @deprecated ICU 54. See {@link LayoutEngine}
* @deprecated ICU 54. See {@link icu::LayoutEngine}
*/
static UClassID getStaticClassID();

8
icu4c/source/layoutex/layout/ParagraphLayout.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2002-2011, International Business Machines
* Copyright (C) 2002-2014, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -38,8 +38,12 @@ U_NAMESPACE_BEGIN
* same font, script and direction, and will create a <code>LayoutEngine</code> object for each run.
* The <code>LayoutEngine</code> will transform the characters into glyph codes in visual order.
*
* Clients can use this to break a paragraph into lines, and to display the glyphs in each line.
* Clients can use this to break a paragraph into lines, and to display the glyphs in each line.
*
* Note that {@link icu::LayoutEngine} is deprecated, but this class is not.
* You may use this class with the HarfBuzz icu-le-hb wrapper,
* see http://www.freedesktop.org/wiki/Software/HarfBuzz/
* @see icu::LayoutEngine
*/
class U_LAYOUTEX_API ParagraphLayout : public UObject
{