X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fbidirectional-support.h;h=1ca4eca317ac850cdcce8d824c4d0c82e03dab04;hp=95f438aed1299aef1abd52052e262f967ccae38c;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=56d412791a44c2a79135d2293c13fddb135c9d54 diff --git a/dali-toolkit/internal/text/bidirectional-support.h b/dali-toolkit/internal/text/bidirectional-support.h old mode 100644 new mode 100755 index 95f438a..1ca4eca --- a/dali-toolkit/internal/text/bidirectional-support.h +++ b/dali-toolkit/internal/text/bidirectional-support.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__ -#define __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__ +#ifndef DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H +#define DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include @@ -36,89 +37,66 @@ namespace Toolkit namespace Text { -class LogicalModel; -class VisualModel; - /** * Sets the bidirectional info into the logical model. * * @param[in] text Vector of UTF-32 characters. * @param[in] scripts Vector containing the script runs for the whole text. * @param[in] lineBreakInfo The line break info. + * @param[in] startIndex The character from where the bidirectional info is set. + * @param[in] numberOfCharacters The number of characters. * @param[out] bidirectionalInfo Vector with the bidirectional infor for each paragraph. + * @param[in] matchSystemLanguageDirection Whether match for system language direction or not. + * @param[in] layoutDirection The direction of the system language. */ void SetBidirectionalInfo( const Vector& text, const Vector& scripts, const Vector& lineBreakInfo, - Vector& bidirectionalInfo ); - -/** - * Replaces the bidirectional info from the logical model. - * - * @pre The @p model needs to have a text set. - * @pre The @p model needs to have the line break info set. - * - * If the @p numberOfCharactersToRemove is zero, this operation is like an insert. - * If the @p numberOfCharactersToInsert is zero, this operation is like a remove. - * - * @param[in,out] model The text's logical model. - * @param[in] characterIndex Index to the first character. - * @param[in] numberOfCharactersToRemove The number of characters removed from the text. - * @param[in] numberOfCharactersToInsert The number of characters inserted in the text. - */ -void ReplaceBidirectionalInfo( LogicalModel& model, - CharacterIndex characterIndex, - Length numberOfCharactersToRemove, - Length numberOfCharactersToInsert ); + CharacterIndex startIndex, + Length numberOfCharacters, + Vector& bidirectionalInfo, + bool matchSystemLanguageDirection = false, + Dali::LayoutDirection::Type layoutDirection = LayoutDirection::LEFT_TO_RIGHT ); /** * Sets the visual to logical map tables. * * Any map tables previously set are removed. + * It sets the paragraph's direction to each line. * * @pre The @p logicalModel needs to have a text set. * @pre The @p logicalModel needs to have the bidirectional info indices for each paragraph set. * @pre The @p visualModel needs to have the laid-out lines info set. * * @param[in] bidirectionalInfo Vector with the bidirectional infor for each paragraph. - * @param[in] lineRuns The line runs converted to characters. + * @param[in] startIndex The character from where the bidirectional info is set. + * @param[in] numberOfCharacters The number of characters. + * @param[in,out] lineRuns The line runs converted to characters. * @param[out] lineInfoRuns line runs with the visual to logical conversion maps. */ void ReorderLines( const Vector& bidirectionalInfo, - const Vector& lineRuns, + CharacterIndex startIndex, + Length numberOfCharacters, + Vector& lineRuns, Vector& lineInfoRuns ); /** - * Replaces the visual to logical and logical to visual map tables. - * - * @pre The @p logicalModel needs to have a text set. - * @pre The @p logicalModel needs to have the line break info set. - * @pre The @p visualModel needs to have the laid-out lines info set. - * - * If the @p numberOfCharactersToRemove is zero, this operation is like an insert. - * If the @p numberOfCharactersToInsert is zero, this operation is like a remove. - * - * @param[in,out] logicalModel The text's logical model. - * @param[in] visualModel The text's visual model. - * @param[in] characterIndex Index to the first character. - * @param[in] numberOfCharactersToRemove The number of characters removed from the text. - * @param[in] numberOfCharactersToInsert The number of characters inserted in the text. - */ -void ReorderLines( LogicalModel& logicalModel, - const VisualModel& visualModel, - CharacterIndex characterIndex, - Length numberOfCharactersToRemove, - Length numberOfCharactersToInsert ); - -/** - * @brief Replaces any character which could be mirrored. + * @brief Replaces any character in the right to left paragraphs which could be mirrored. * * @param[in] text The text. - * @param[in] mirroredText The mirroredText. + * @param[in] directions Vector with the direction of each paragraph. + * @param[in] bidirectionalInfo Vector with the bidirectional infor for each paragraph. + * @param[in] startIndex The character from where the text is mirrored. + * @param[in] numberOfCharacters The number of characters. + * @param[out] mirroredText The mirroredText. * * @return @e true if a character has been replaced. */ bool GetMirroredText( const Vector& text, + const Vector& directions, + const Vector& bidirectionalInfo, + CharacterIndex startIndex, + Length numberOfCharacters, Vector& mirroredText ); /** @@ -128,9 +106,15 @@ bool GetMirroredText( const Vector& text, * @pre The @p logicalModel needs to have the bidirectional info indices for each paragraph set. * * @param[in] bidirectionalInfo Vector with the bidirectional infor for each paragraph. + * @param[in] totalNumberOfCharacters The number of characters of the whole text. + * @param[in] startIndex The character from where the direction info is set. + * @param[in] numberOfCharacters The number of characters. * @param[out] directions The direction, @e false is left to right and @e true is right to left, of each character of the paragraph. */ void GetCharactersDirection( const Vector& bidirectionalInfo, + Length totalNumberOfCharacters, + CharacterIndex startIndex, + Length numberOfCharacters, Vector& directions ); } // namespace Text @@ -139,4 +123,4 @@ void GetCharactersDirection( const Vector& bidire } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__ +#endif // DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H