Merge pull request #96 from digao-dalpiaz/rtl-text

Rtl text

Author: digao-dalpiaz

CompInstall.ini

@@ -3,7 +3,7 @@ IniVersion=2
 
 [General]
 Name=Digao Dalpiaz - DzHTMLText component
-Version=6.7
+Version=6.8
 DelphiVersions=XE3;XE4;XE5;XE6;XE7;XE8;10;10.1;10.2;10.3;10.4;11;12
 Packages=DzHTMLText_VCL;DzHTMLText_FMX;DzHTMLTextDesign_VCL;DzHTMLTextDesign_FMX
 AddLibrary=1

README.md

@@ -13,6 +13,7 @@
 ![VCL and FMX](https://img.shields.io/badge/-VCL%20and%20FMX-lightgrey.svg)
 ![Lazarus support](https://img.shields.io/badge/-Lazarus%20support-green.svg)
 ![CJK line break](https://img.shields.io/badge/-Chinese+Japanese+Korean%20line%20break%20support-yellowgreen.svg)
+![RTL notation](https://img.shields.io/badge/-RTL%20notation-purple.svg)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/C0C53LVFN)
 
@@ -38,13 +39,18 @@
 
 ## What's New
 
-- 01/26/2025 (Version 6.7)
+- 03/15/2025 (Version 6.8)
 
-   - Fixed Lazarus compiling (GDI+ units)
+   - Right-to-left (RTL) text supporting.
+   - When using a Div without "keep properties" (default), now Horizontal Text Alignment get the same value as component pre-defined Horizontal Alignment.
 
 <details>
   <summary>Click here to view the entire changelog</summary>
 
+- 01/26/2025 (Version 6.7)
+
+   - Fixed Lazarus compiling (GDI+ units)
+
 - 11/14/2024 (Version 6.6)
 
    - Use GDI painting from Windows API when using VCL + Windows to draw rounded div
@@ -559,6 +565,8 @@ If you are using AutoWidth, the text never wraps to a new line unless a line bre
 
 `ParagraphSpacing: TPixels` = Specify the default paragraph spacing in overall text. The paragraph spacing is added to original line spacing. You can use `<LS>` tag to determine paragraph spacing at specific lines.
 
+`RightToLeftText: Boolean` = Enables Right-to-left text notation.
+
 `StyleLinkNormal: TDHStyleLinkProp` = Properties to format a link when is not selected by mouse.
 
 `StyleLinkHover: TDHStyleLinkProp` = Properties to format a link when is selected by mouse.

Source/Vcl.DHCommon.pas

@@ -40,6 +40,7 @@   TDHCharUtils = class
   private
     class function IsCJKChar(const C: Char): Boolean; inline;
   public
+    class function IsPunctuationChar(const C: Char): Boolean;
     class function FindNextWordBreakChar(const A: string; From: Integer): Integer; inline;
   end;
 
@@ -130,13 +131,29 @@ class function TDHCharUtils.FindNextWordBreakChar(const A: string; From: Integer
   begin
     C := A[I];
 
-    if CharInSet(C, [STR_SPACE,'<','>','/','\',#13,#10]) or IsCJKChar(C) then
+    if CharInSet(C, [STR_SPACE,'<','>','/','\',#13,#10]) or IsPunctuationChar(C) or IsCJKChar(C) then
       Exit(I);
   end;
 
   Result := 0;
 end;
 
+class function TDHCharUtils.IsPunctuationChar(const C: Char): Boolean;
+
+  function IsArabic: Boolean;
+  begin
+    Result := False;
+    case Integer(C) of
+      $060C, //comma
+      $061B //semicolon
+        : Result := True;
+    end;
+  end;
+
+begin
+  Result := CharInSet(C, ['?','.',':',',',';','!']) or IsArabic;
+end;
+
 class function TDHCharUtils.IsCJKChar(const C: Char): Boolean; //return if char is Chinese-Japanese-Korean
 begin
 //East Asian languages break lines in all chars, so each char must be considered as a full word.

Source/Vcl.DHTokenEngine.pas

@@ -480,6 +480,7 @@   TDHBuilder = class
     procedure ProcessSpecificObjects(List: TDHPreVisualItemList);
 
     procedure CheckMissingClosingTags;
+    function GetDefaultHorzTextAlign: TDHHorzAlign;
   public
     constructor Create(Lb: TDzHTMLText; Canvas: TCanvas;
       VisualItems: TDHVisualItemList; ProcBoundsAndLines: TDHProcBoundsAndLines);
@@ -1422,7 +1423,7 @@ procedure TDHToken_Div.Process;
     Props.Offset.Top := 0;
     Props.Offset.Bottom := 0;
     Props.BackColor := clNone;
-    Props.HorzAlign := haLeft;
+    Props.HorzAlign := Builder.GetDefaultHorzTextAlign;
     Props.VertAlign := vaTop;
     Props.LineSpace := 0;
     Props.ParagraphSpace := 0;
@@ -1677,7 +1678,7 @@ constructor TDHBuilder.Create(Lb: TDzHTMLText; Canvas: TCanvas;
   Props.Offset.Bottom := Lb.CalcScale(Lb.Offset.Bottom);
 
   Props.VertAlign := Lb.LineVertAlign;
-  Props.HorzAlign := Lb.LineHorzAlign;
+  Props.HorzAlign := GetDefaultHorzTextAlign;
 
   Props.LineSpace := Lb.CalcScale(Lb.LineSpacing);
   Props.ParagraphSpace := Lb.CalcScale(Lb.ParagraphSpacing);
@@ -1753,6 +1754,12 @@ procedure TDHBuilder.CheckMissingClosingTags;
   end;
 end;
 
+function TDHBuilder.GetDefaultHorzTextAlign: TDHHorzAlign;
+begin
+  Result := Lb.LineHorzAlign;
+  if Lb.RightToLeftText and (Result = haLeft) then Result := haRight;
+end;
+
 procedure TDHBuilder.AddInvalidToken(Position: Integer; const ErrorDescription: string);
 var
   Token: TDHToken_Word;
@@ -1829,7 +1836,7 @@ procedure TDHBuilder.ReadTokens;
       with AddToken<TDHToken_Word> do
       begin
         Word := TDzHTMLText.UnescapeHTMLToText(Copy(Text, CurPos, I-CurPos));
-        Breakable := BreakableChar;
+        Breakable := BreakableChar and not TDHCharUtils.IsPunctuationChar(CharIni);
       end;
 
       CurPos := I;
@@ -2282,6 +2289,9 @@   TFuncAlignResult = record
   end;
 
 begin
+  if Lb.RightToLeftText then
+    Item.Position.X := Line.TextSize.Width - (Item.Position.X + Item.Size.Width);
+
   Check(0, True, Item.HorzAlign);
   Check(1, False, Item.VertAlign);
 

Source/Vcl.DzHTMLText.pas

@@ -377,6 +377,8 @@   TDzHTMLText = class(
 
     FCursor: TCursor;
 
+    FRightToLeftText: Boolean;
+
     UpdatingSemaphore: Integer;
     InternalResizing: Boolean;
 
@@ -435,6 +437,8 @@   TDzHTMLText = class(
     procedure SetParagraphIndent(const Value: TPixels);
     procedure SetCustomStyles(const Value: TDHCustomStyles);
 
+    procedure SetRightToLeftText(const Value: Boolean);
+
     {$IFDEF USE_IMGLST}
     procedure SetImages(const Value: TCustomImageList);
     {$ENDIF}
@@ -644,6 +648,8 @@   TDzHTMLText = class(
     property ParagraphSpacing: TPixels read FParagraphSpacing write SetParagraphSpacing {$IFDEF VCL}default 0{$ENDIF};
     property ParagraphIndent: TPixels read FParagraphIndent write SetParagraphIndent {$IFDEF VCL}default 0{$ENDIF};
 
+    property RightToLeftText: Boolean read FRightToLeftText write SetRightToLeftText default False;
+
     property About: string read FAbout;
   end;
 
@@ -685,7 +691,7 @@ implementation
   , Winapi.GDIPOBJ, Winapi.GDIPAPI
 {$ENDIF};
 
-const STR_VERSION = '6.7';
+const STR_VERSION = '6.8';
 
 const DEFAULT_PPI = 96;
 
@@ -1089,6 +1095,16 @@ procedure TDzHTMLText.SetParagraphIndent(const Value: TPixels);
   end;
 end;
 
+procedure TDzHTMLText.SetRightToLeftText(const Value: Boolean);
+begin
+  if Value<>FRightToLeftText then
+  begin
+    FRightToLeftText := Value;
+
+    BuildAndPaint;
+  end;
+end;
+
 procedure TDzHTMLText.SetListLevelPadding(const Value: TPixels);
 begin
   if Value<>FListLevelPadding then