Changeset 21408 in webkit

Timestamp:

May 11, 2007, 9:25:25 AM (18 years ago)

Author:

bdash

Message:

2007-05-11 Mitz Pettel <​mitz@webkit.org>

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=13572 Arabic characters are not correctly joined when using Arial

No tests added because standard fonts do not use the character-based shaping
code path.

Added shapeArabic(), a private version of u_shapeArabic() from ICU,
patched to shape Arabic characters used in Persian, Urdu, Sindhi, etc.
(whose contextual forms belong to the Arabic Presentation Forms-A block).

• WebCore.xcodeproj/project.pbxproj: Added ShapeArabic.{c,h}.
• platform/mac/FontMac.mm: (WebCore::shapeArabic): Changed to call shapeArabic() instead of u_shapeArabic().
• platform/mac/ShapeArabic.c: Added. Based on ushape.c from ICU, with additional shaping data and logic for Arabic Presentation Forms-A. Removed many options that are not used in WebKit and code that malloc()ed a temporary buffer and reversed the string. (changeLamAlef): (specialChar): (getLink): (isTashkeelChar): (shapeUnicode): (shapeArabic):
• platform/mac/ShapeArabic.h: Added.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• platform/mac/FontMac.mm (modified) (2 diffs)
• platform/mac/ShapeArabic.c (added)
• platform/mac/ShapeArabic.h (added)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-11  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=13572
+          Arabic characters are not correctly joined when using Arial
+
+        No tests added because standard fonts do not use the character-based shaping
+        code path.
+
+        Added shapeArabic(), a private version of u_shapeArabic() from ICU,
+        patched to shape Arabic characters used in Persian, Urdu, Sindhi, etc.
+        (whose contextual forms belong to the Arabic Presentation Forms-A block).
+
+        * WebCore.xcodeproj/project.pbxproj: Added ShapeArabic.{c,h}.
+        * platform/mac/FontMac.mm:
+        (WebCore::shapeArabic): Changed to call shapeArabic() instead of u_shapeArabic().
+        * platform/mac/ShapeArabic.c: Added. Based on ushape.c from ICU, with
+        additional shaping data and logic for Arabic Presentation Forms-A. Removed
+        many options that are not used in WebKit and code that malloc()ed a temporary
+        buffer and reversed the string.
+        (changeLamAlef):
+        (specialChar):
+        (getLink):
+        (isTashkeelChar):
+        (shapeUnicode):
+        (shapeArabic):
+        * platform/mac/ShapeArabic.h: Added.
+
 2007-05-11  Darin Adler  <darin@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -273 +273 @@
                 2D9066060BE141D400956998 /* LayoutState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9066040BE141D400956998 /* LayoutState.cpp */; };
                 2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; };
+                37919C190BF375DD00956998 /* ShapeArabic.c in Sources */ = {isa = PBXBuildFile; fileRef = 37919C180BF375DD00956998 /* ShapeArabic.c */; };
+                37919C1D0BF3762800956998 /* ShapeArabic.h in Headers */ = {isa = PBXBuildFile; fileRef = 37919C1C0BF3762800956998 /* ShapeArabic.h */; };
                 37919C230B7D188600A56998 /* PositionIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37919C210B7D188600A56998 /* PositionIterator.cpp */; };
                 37919C240B7D188600A56998 /* PositionIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 37919C220B7D188600A56998 /* PositionIterator.h */; settings = {ATTRIBUTES = (); }; };
@@ -3391 +3393 @@
                 2D90660B0665D937006B6F1A /* ClipboardMac.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ClipboardMac.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 2D90660C0665D937006B6F1A /* ClipboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipboardMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+                37919C180BF375DD00956998 /* ShapeArabic.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ShapeArabic.c; sourceTree = "<group>"; };
+                37919C1C0BF3762800956998 /* ShapeArabic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeArabic.h; sourceTree = "<group>"; };
                 37919C210B7D188600A56998 /* PositionIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PositionIterator.cpp; sourceTree = "<group>"; };
                 37919C220B7D188600A56998 /* PositionIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PositionIterator.h; sourceTree = "<group>"; };
@@ -6938 +6942 @@
                                 9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */,
                                 AB71709F0B31193B0017123E /* SearchPopupMenuMac.mm */,
+                                37919C1C0BF3762800956998 /* ShapeArabic.h */,
+                                37919C180BF375DD00956998 /* ShapeArabic.c */,
                                 1A4A95510B4EDCFF002D8C3C /* SharedBufferMac.mm */,
                                 93309E9F099EB78C0056E581 /* SharedTimerMac.cpp */,
@@ -11265 +11271 @@
                                 14C9A29A0BF04DB600D734A8 /* WebScriptObjectPendingPublic.h in Headers */,
                                 93799EF90BF2743600D0F230 /* RenderWordBreak.h in Headers */,
+                                37919C1D0BF3762800956998 /* ShapeArabic.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -12638 +12645 @@
                                 AACF144D0BEC1EF000827982 /* TextBreakIteratorInternalICUMac.mm in Sources */,
                                 93799EF80BF2743600D0F230 /* RenderWordBreak.cpp in Sources */,
+                                37919C190BF375DD00956998 /* ShapeArabic.c in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/platform/mac/FontMac.mm

@@ -39 +39 @@
 #import "WebCoreSystemInterface.h"
 #import "WebCoreTextRenderer.h"
-
-#import <unicode/ushape.h>
+#import "ShapeArabic.h"
 
 #define SYNTHETIC_OBLIQUE_ANGLE 14
@@ -285 +284 @@
 
         UErrorCode shapingError = U_ZERO_ERROR;
-        unsigned charsWritten = u_shapeArabic(source + shapingStart, shapingEnd - shapingStart, dest + shapingStart, shapingEnd - shapingStart, U_SHAPE_LETTERS_SHAPE | U_SHAPE_LENGTH_FIXED_SPACES_NEAR, &shapingError);
+        unsigned charsWritten = shapeArabic(source + shapingStart, shapingEnd - shapingStart, dest + shapingStart, shapingEnd - shapingStart, U_SHAPE_LETTERS_SHAPE | U_SHAPE_LENGTH_FIXED_SPACES_NEAR, &shapingError);
 
         if (U_SUCCESS(shapingError) && charsWritten == shapingEnd - shapingStart) {