Trigger Bidi processing also for non-displayable control characters (RLM, RLE, RLO, etc.) Bug 177148, r+sr=roc, a=asa
This commit is contained in:
smontagu%smontagu.org
Родитель
d6b16cb14a
Коммит
3083cdcef3
|
|
@ -360,7 +360,7 @@ nsTextFragment::SetBidiFlag()
|
||||||
PRUnichar ch2 = *cp++;
|
PRUnichar ch2 = *cp++;
|
||||||
utf32Char = SURROGATE_TO_UCS4(ch1, ch2);
|
utf32Char = SURROGATE_TO_UCS4(ch1, ch2);
|
||||||
}
|
}
|
||||||
if (UTF32_CHAR_IS_BIDI(utf32Char) ) {
|
if (UTF32_CHAR_IS_BIDI(utf32Char) || IS_BIDI_CONTROL_CHAR(utf32Char)) {
|
||||||
mState.mIsBidi = PR_TRUE;
|
mState.mIsBidi = PR_TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,243 +0,0 @@
|
||||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
||||||
*
|
|
||||||
* The contents of this file are subject to the Mozilla Public License Version
|
|
||||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
* http://www.mozilla.org/MPL/
|
|
||||||
*
|
|
||||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
|
||||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
||||||
* for the specific language governing rights and limitations under the
|
|
||||||
* License.
|
|
||||||
*
|
|
||||||
* The Original Code is mozilla.org code.
|
|
||||||
*
|
|
||||||
* The Initial Developer of the Original Code is
|
|
||||||
* IBM Corporation.
|
|
||||||
* Portions created by the Initial Developer are Copyright (C) 2000
|
|
||||||
* the Initial Developer. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Contributor(s):
|
|
||||||
* Maha Abou El Rous <mahar@eg.ibm.com>
|
|
||||||
* Lina Kemmel <lkemmel@il.ibm.com>
|
|
||||||
* Simon Montagu <smontagu@netscape.com>
|
|
||||||
*
|
|
||||||
* Alternatively, the contents of this file may be used under the terms of
|
|
||||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
|
||||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
||||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
|
||||||
* of those above. If you wish to allow use of your version of this file only
|
|
||||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
|
||||||
* use your version of this file under the terms of the MPL, indicate your
|
|
||||||
* decision by deleting the provisions above and replace them with the notice
|
|
||||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
|
||||||
* the provisions above, a recipient may use your version of this file under
|
|
||||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
|
||||||
*
|
|
||||||
* ***** END LICENSE BLOCK ***** */
|
|
||||||
|
|
||||||
#ifndef nsBidiUtils_h__
|
|
||||||
#define nsBidiUtils_h__
|
|
||||||
|
|
||||||
#include "nsCOMPtr.h"
|
|
||||||
#include "nsString.h"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform Arabic shaping on a Unichar string
|
|
||||||
* @param aString is the input string
|
|
||||||
* @param aLen is the length of aStrong
|
|
||||||
* @param aBuf receives the shaped output
|
|
||||||
* @param aBuflen receives the length of aBuf
|
|
||||||
* @param aInputLogical indicates that the input is in logical order
|
|
||||||
* @param aOutputLogical indicates that the output should be in logical order
|
|
||||||
*/
|
|
||||||
nsresult ArabicShaping(const PRUnichar* aString, PRUint32 aLen,
|
|
||||||
PRUnichar* aBuf, PRUint32* aBufLen,
|
|
||||||
PRBool aInputLogical, PRBool aOutputLogical);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scan an nsString, converting characters in the FExx range (Arabic presentation forms) to the equivalent characters in the 06xx
|
|
||||||
* range
|
|
||||||
* @param aSrc is the input string
|
|
||||||
* @param aDst is the output string
|
|
||||||
*/
|
|
||||||
nsresult Conv_FE_06(const nsString& aSrc, nsString& aDst);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scan an nsString, converting characters in the FExx range (Arabic presentation forms) to the equivalent characters in the 06xx
|
|
||||||
* range, and also reverse the string
|
|
||||||
* @param aSrc is the input string
|
|
||||||
* @param aDst is the output string
|
|
||||||
*/
|
|
||||||
nsresult Conv_FE_06_WithReverse(const nsString& aSrc, nsString& aDst);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scan an nsString, converting characters in the 06xx range to the equivalent characters in the 0Fxx range (Arabic presentation
|
|
||||||
* forms), with the option to reverse the string
|
|
||||||
* @param aSrc is the input string
|
|
||||||
* @param aDst is the output string
|
|
||||||
* @param aDir indicates whether the string should be reversed
|
|
||||||
* IBMBIDI_TEXTDIRECTION_LTR: do not reverse the string
|
|
||||||
* IBMBIDI_TEXTDIRECTION_RTL: reverse the string
|
|
||||||
*/
|
|
||||||
nsresult Conv_06_FE_WithReverse(const nsString& aSrc, nsString& aDst, PRUint32 aDir);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scan a Unichar string, converting numbers to Arabic or Hindi forms in place
|
|
||||||
* @param aBuffer is the string
|
|
||||||
* @param aSize is the size of aBuffer
|
|
||||||
* @param aNumFlag specifies the conversion to perform:
|
|
||||||
* IBMBIDI_NUMERAL_NOMINAL: don't do any conversion
|
|
||||||
* IBMBIDI_NUMERAL_HINDI: convert to Hindi forms (Unicode 0660-0669)
|
|
||||||
* IBMBIDI_NUMERAL_ARABIC: convert to Arabic forms (Unicode 0030-0039)
|
|
||||||
* IBMBIDI_NUMERAL_HINDICONTEXT: convert numbers in Arabic text to Hindi, otherwise to Arabic
|
|
||||||
*/
|
|
||||||
nsresult HandleNumbers(PRUnichar* aBuffer, PRUint32 aSize, PRUint32 aNumFlag);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scan an nsString, converting numerals to Arabic or Hindi forms
|
|
||||||
* @param aSrc is the input string
|
|
||||||
* @param aDst is the output string
|
|
||||||
*/
|
|
||||||
nsresult HandleNumbers(const nsString& aSrc, nsString& aDst);
|
|
||||||
|
|
||||||
// --------------------------------------------------
|
|
||||||
// IBMBIDI
|
|
||||||
// --------------------------------------------------
|
|
||||||
//
|
|
||||||
// These values are shared with Preferences dialog
|
|
||||||
// ------------------
|
|
||||||
// If Pref values are to be changed
|
|
||||||
// in the XUL file of Prefs. the values
|
|
||||||
// Must be changed here too..
|
|
||||||
// ------------------
|
|
||||||
//
|
|
||||||
#define IBMBIDI_TEXTDIRECTION_STR "bidi.direction"
|
|
||||||
#define IBMBIDI_TEXTTYPE_STR "bidi.texttype"
|
|
||||||
#define IBMBIDI_CONTROLSTEXTMODE_STR "bidi.controlstextmode"
|
|
||||||
#define IBMBIDI_NUMERAL_STR "bidi.numeral"
|
|
||||||
#define IBMBIDI_SUPPORTMODE_STR "bidi.support"
|
|
||||||
#define IBMBIDI_CHARSET_STR "bidi.characterset"
|
|
||||||
|
|
||||||
#define IBMBIDI_TEXTDIRECTION 1
|
|
||||||
#define IBMBIDI_TEXTTYPE 2
|
|
||||||
#define IBMBIDI_CONTROLSTEXTMODE 3
|
|
||||||
#define IBMBIDI_NUMERAL 4
|
|
||||||
#define IBMBIDI_SUPPORTMODE 5
|
|
||||||
#define IBMBIDI_CHARSET 6
|
|
||||||
|
|
||||||
// ------------------
|
|
||||||
// Text Direction
|
|
||||||
// ------------------
|
|
||||||
// bidi.direction
|
|
||||||
#define IBMBIDI_TEXTDIRECTION_LTR 1 // 1 = directionLTRBidi *
|
|
||||||
#define IBMBIDI_TEXTDIRECTION_RTL 2 // 2 = directionRTLBidi
|
|
||||||
// ------------------
|
|
||||||
// Text Type
|
|
||||||
// ------------------
|
|
||||||
// bidi.texttype
|
|
||||||
#define IBMBIDI_TEXTTYPE_CHARSET 1 // 1 = charsettexttypeBidi *
|
|
||||||
#define IBMBIDI_TEXTTYPE_LOGICAL 2 // 2 = logicaltexttypeBidi
|
|
||||||
#define IBMBIDI_TEXTTYPE_VISUAL 3 // 3 = visualtexttypeBidi
|
|
||||||
// ------------------
|
|
||||||
// Controls Text Mode
|
|
||||||
// ------------------
|
|
||||||
// bidi.controlstextmode
|
|
||||||
#define IBMBIDI_CONTROLSTEXTMODE_LOGICAL 1 // 1 = logicalcontrolstextmodeBidiCmd *
|
|
||||||
#define IBMBIDI_CONTROLSTEXTMODE_VISUAL 2 // 2 = visualcontrolstextmodeBidi
|
|
||||||
#define IBMBIDI_CONTROLSTEXTMODE_CONTAINER 3 // 3 = containercontrolstextmodeBidi
|
|
||||||
// ------------------
|
|
||||||
// Numeral Style
|
|
||||||
// ------------------
|
|
||||||
// bidi.numeral
|
|
||||||
#define IBMBIDI_NUMERAL_NOMINAL 0 // 0 = nominalnumeralBidi *
|
|
||||||
#define IBMBIDI_NUMERAL_REGULAR 1 // 1 = regularcontextnumeralBidi
|
|
||||||
#define IBMBIDI_NUMERAL_HINDICONTEXT 2 // 2 = hindicontextnumeralBidi
|
|
||||||
#define IBMBIDI_NUMERAL_ARABIC 3 // 3 = arabicnumeralBidi
|
|
||||||
#define IBMBIDI_NUMERAL_HINDI 4 // 4 = hindinumeralBidi
|
|
||||||
// ------------------
|
|
||||||
// Support Mode
|
|
||||||
// ------------------
|
|
||||||
// bidi.support
|
|
||||||
#define IBMBIDI_SUPPORTMODE_MOZILLA 1 // 1 = mozillaBidisupport *
|
|
||||||
#define IBMBIDI_SUPPORTMODE_OSBIDI 2 // 2 = OsBidisupport
|
|
||||||
#define IBMBIDI_SUPPORTMODE_DISABLE 3 // 3 = disableBidisupport
|
|
||||||
// ------------------
|
|
||||||
// Charset Mode
|
|
||||||
// ------------------
|
|
||||||
// bidi.characterset
|
|
||||||
#define IBMBIDI_CHARSET_BIDI 1 // 1 = doccharactersetBidi *
|
|
||||||
#define IBMBIDI_CHARSET_DEFAULT 2 // 2 = defaultcharactersetBidi
|
|
||||||
|
|
||||||
#define IBMBIDI_DEFAULT_BIDI_OPTIONS \
|
|
||||||
((IBMBIDI_TEXTDIRECTION_LTR<<0) | \
|
|
||||||
(IBMBIDI_TEXTTYPE_CHARSET<<4) | \
|
|
||||||
(IBMBIDI_CONTROLSTEXTMODE_LOGICAL<<8) | \
|
|
||||||
(IBMBIDI_NUMERAL_NOMINAL<<12) | \
|
|
||||||
(IBMBIDI_SUPPORTMODE_MOZILLA<<16) | \
|
|
||||||
(IBMBIDI_CHARSET_BIDI<<20))
|
|
||||||
|
|
||||||
|
|
||||||
#define GET_BIDI_OPTION_DIRECTION(bo) (((bo)>>0) & 0x0000000F) /* 4 bits for DIRECTION */
|
|
||||||
#define GET_BIDI_OPTION_TEXTTYPE(bo) (((bo)>>4) & 0x0000000F) /* 4 bits for TEXTTYPE */
|
|
||||||
#define GET_BIDI_OPTION_CONTROLSTEXTMODE(bo) (((bo)>>8) & 0x0000000F) /* 4 bits for CONTROLTEXTMODE */
|
|
||||||
#define GET_BIDI_OPTION_NUMERAL(bo) (((bo)>>12) & 0x0000000F) /* 4 bits for NUMERAL */
|
|
||||||
#define GET_BIDI_OPTION_SUPPORT(bo) (((bo)>>16) & 0x0000000F) /* 4 bits for SUPPORT */
|
|
||||||
#define GET_BIDI_OPTION_CHARACTERSET(bo) (((bo)>>20) & 0x0000000F) /* 4 bits for CHARACTERSET */
|
|
||||||
|
|
||||||
#define SET_BIDI_OPTION_DIRECTION(bo, dir) {(bo)=((bo) & 0xFFFFFFF0)|(((dir)& 0x0000000F)<<0);}
|
|
||||||
#define SET_BIDI_OPTION_TEXTTYPE(bo, tt) {(bo)=((bo) & 0xFFFFFF0F)|(((tt)& 0x0000000F)<<4);}
|
|
||||||
#define SET_BIDI_OPTION_CONTROLSTEXTMODE(bo, cotm) {(bo)=((bo) & 0xFFFFF0FF)|(((cotm)& 0x0000000F)<<8);}
|
|
||||||
#define SET_BIDI_OPTION_NUMERAL(bo, num) {(bo)=((bo) & 0xFFFF0FFF)|(((num)& 0x0000000F)<<12);}
|
|
||||||
#define SET_BIDI_OPTION_SUPPORT(bo, sup) {(bo)=((bo) & 0xFFF0FFFF)|(((sup)& 0x0000000F)<<16);}
|
|
||||||
#define SET_BIDI_OPTION_CHARACTERSET(bo, cs) {(bo)=((bo) & 0xFF0FFFFF)|(((cs)& 0x0000000F)<<20);}
|
|
||||||
|
|
||||||
/* Constants related to the position of numerics in the codepage */
|
|
||||||
#define START_HINDI_DIGITS 0x0660
|
|
||||||
#define END_HINDI_DIGITS 0x0669
|
|
||||||
#define START_ARABIC_DIGITS 0x0030
|
|
||||||
#define END_ARABIC_DIGITS 0x0039
|
|
||||||
#define START_FARSI_DIGITS 0x06f0
|
|
||||||
#define END_FARSI_DIGITS 0x06f9
|
|
||||||
#define IS_HINDI_DIGIT(u) ( ( (u) >= START_HINDI_DIGITS ) && ( (u) <= END_HINDI_DIGITS ) )
|
|
||||||
#define IS_ARABIC_DIGIT(u) ( ( (u) >= START_ARABIC_DIGITS ) && ( (u) <= END_ARABIC_DIGITS ) )
|
|
||||||
#define IS_FARSI_DIGIT(u) ( ( (u) >= START_FARSI_DIGITS ) && ( (u) <= END_FARSI_DIGITS ) )
|
|
||||||
#define IS_ARABIC_SEPARATOR(u) ( ( (u) == 0x066A ) || ( (u) == 0x066B ) || ( (u) == 0x066C ) )
|
|
||||||
|
|
||||||
#define IS_BIDI_DIACRITIC(u) ( \
|
|
||||||
( (u) >= 0x0591 && (u) <= 0x05A1) || ( (u) >= 0x05A3 && (u) <= 0x05B9) \
|
|
||||||
|| ( (u) >= 0x05BB && (u) <= 0x05BD) || ( (u) == 0x05BF) || ( (u) == 0x05C1) \
|
|
||||||
|| ( (u) == 0x05C2) || ( (u) == 0x05C4) \
|
|
||||||
|| ( (u) >= 0x064B && (u) <= 0x0652) || ( (u) == 0x0670) \
|
|
||||||
|| ( (u) >= 0x06D7 && (u) <= 0x06E4) || ( (u) == 0x06E7) || ( (u) == 0x06E8) \
|
|
||||||
|| ( (u) >= 0x06EA && (u) <= 0x06ED) )
|
|
||||||
|
|
||||||
#define IS_HEBREW_CHAR(c) (((0x0590 <= (c)) && ((c)<= 0x05FF)) || (((c) >= 0xfb1d) && ((c) <= 0xfb4f)))
|
|
||||||
#define IS_06_CHAR(c) ((0x0600 <= (c)) && ((c)<= 0x06FF))
|
|
||||||
#define IS_FE_CHAR(c) (((0xfb50 <= (c)) && ((c)<= 0xfbFF)) \
|
|
||||||
|| ((0xfe70 <= (c)) && ((c)<= 0xfeFC)))
|
|
||||||
#define IS_ARABIC_CHAR(c) ((0x0600 <= (c)) && ((c)<= 0x06FF))
|
|
||||||
#define IS_ARABIC_ALPHABETIC(c) (IS_ARABIC_CHAR(c) && \
|
|
||||||
!(IS_HINDI_DIGIT(c) || IS_FARSI_DIGIT(c) || IS_ARABIC_SEPARATOR(c)))
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The codepoint ranges in the following macros are based on the blocks
|
|
||||||
* allocated, or planned to be allocated, to right-to-left characters in the
|
|
||||||
* BMP (Basic Multilingual Plane) and SMP (Supplementary Multilingual Plane)
|
|
||||||
* according to
|
|
||||||
* http://unicode.org/Public/UNIDATA/extracted/DerivedBidiClass.txt and
|
|
||||||
* http://www.unicode.org/roadmaps/
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define IS_IN_BMP_RTL_BLOCK(c) ((0x590 <= (c)) && ((c) <= 0x8ff))
|
|
||||||
#define IS_RTL_PRESENTATION_FORM(c) (((0xfb1d <= (c)) && ((c) <= 0xfdff)) || \
|
|
||||||
((0xfe70 <= (c)) && ((c) <= 0xfefc)))
|
|
||||||
#define IS_IN_SMP_RTL_BLOCK(c) ((0x10800 <= (c)) && ((c) <= 0x10fff))
|
|
||||||
#define UCS2_CHAR_IS_BIDI(c) ((IS_IN_BMP_RTL_BLOCK(c)) || \
|
|
||||||
(IS_RTL_PRESENTATION_FORM(c)))
|
|
||||||
#define UTF32_CHAR_IS_BIDI(c) ((IS_IN_BMP_RTL_BLOCK(c)) || \
|
|
||||||
(IS_RTL_PRESENTATION_FORM(c)) || \
|
|
||||||
(IS_IN_SMP_RTL_BLOCK(c)))
|
|
||||||
#endif /* nsBidiUtils_h__ */
|
|
||||||
Загрузка…
Ссылка в новой задаче