flutter_package / dart_pdf

Go to a project
Toggle navigation Toggle navigation pinning
Milad akarie
Committed by David PHAM-VAN
c497623d 1 parent cfff8ba6

Apply THE BIDIRECTIONAL ALGORITHM using dart_bidi lib 

Rename some related references
Inline Side-by-side
Showing 8 changed files with 181 additions and 477 deletions
... ... @@ -3,6 +3,7 @@
## 3.8.5
- Improve TTF Writer compatibility
- Apply THE BIDIRECTIONAL ALGORITHM using dart_bidi [Milad akarie]
## 3.8.4
... ...
/*
* Copyright (C) 2017, David PHAM-VAN <dev.nfet.net@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/// Arabic shape substitutions: char code => (isolated, final, initial, medial).
/// Arabic Substition A
const Map<int, dynamic> _arabicSubstitionA = <int, dynamic>{
0x0640: <int>[0x0640, 0x0640, 0x0640, 0x0640], // ARABIC TATWEEL
0x0621: <int>[1569], // ARABIC LETTER HAMZA
0x0622: <int>[1570, 0xFE82], // ARABIC LETTER ALEF WITH MADDA ABOVE
0x0623: <int>[1571, 0xFE84], // ARABIC LETTER ALEF WITH HAMZA ABOVE
0x0624: <int>[1572, 0xFE86], // ARABIC LETTER WAW WITH HAMZA ABOVE
0x0625: <int>[1573, 0xFE88], // ARABIC LETTER ALEF WITH HAMZA BELOW
0x0626: <int>[
1574,
0xFE8A,
0xFE8B,
0xFE8C
], // ARABIC LETTER YEH WITH HAMZA ABOVE
0x0627: <int>[1575, 0xFE8E], // ARABIC LETTER ALEF
0x0628: <int>[1576, 0xFE90, 0xFE91, 0xFE92], // ARABIC LETTER BEH
0x0629: <int>[1577, 0xFE94], // ARABIC LETTER TEH MARBUTA
0x062A: <int>[1578, 0xFE96, 0xFE97, 0xFE98], // ARABIC LETTER TEH
0x062B: <int>[1579, 0xFE9A, 0xFE9B, 0xFE9C], // ARABIC LETTER THEH
0x062C: <int>[1580, 0xFE9E, 0xFE9F, 0xFEA0], // ARABIC LETTER JEEM
0x062D: <int>[1581, 0xFEA2, 0xFEA3, 0xFEA4], // ARABIC LETTER HAH
0x062E: <int>[1582, 0xFEA6, 0xFEA7, 0xFEA8], // ARABIC LETTER KHAH
0x062F: <int>[1583, 0xFEAA], // ARABIC LETTER DAL
0x0630: <int>[1584, 0xFEAC], // ARABIC LETTER THAL
0x0631: <int>[1585, 0xFEAE], // ARABIC LETTER REH
0x0632: <int>[1586, 0xFEB0], // ARABIC LETTER ZAIN
0x0633: <int>[1587, 0xFEB2, 0xFEB3, 0xFEB4], // ARABIC LETTER SEEN
0x0634: <int>[1588, 0xFEB6, 0xFEB7, 0xFEB8], // ARABIC LETTER SHEEN
0x0635: <int>[1589, 0xFEBA, 0xFEBB, 0xFEBC], // ARABIC LETTER SAD
0x0636: <int>[1590, 0xFEBE, 0xFEBF, 0xFEC0], // ARABIC LETTER DAD
0x0637: <int>[1591, 0xFEC2, 0xFEC3, 0xFEC4], // ARABIC LETTER TAH
0x0638: <int>[1592, 0xFEC6, 0xFEC7, 0xFEC8], // ARABIC LETTER ZAH
0x0639: <int>[1593, 0xFECA, 0xFECB, 0xFECC], // ARABIC LETTER AIN
0x063A: <int>[1594, 0xFECE, 0xFECF, 0xFED0], // ARABIC LETTER GHAIN
0x0641: <int>[1601, 0xFED2, 0xFED3, 0xFED4], // ARABIC LETTER FEH
0x0642: <int>[1602, 0xFED6, 0xFED7, 0xFED8], // ARABIC LETTER QAF
0x0643: <int>[1603, 0xFEDA, 0xFEDB, 0xFEDC], // ARABIC LETTER KAF
0x0644: <int>[1604, 0xFEDE, 0xFEDF, 0xFEE0], // ARABIC LETTER LAM
0x0645: <int>[1605, 0xFEE2, 0xFEE3, 0xFEE4], // ARABIC LETTER MEEM
0x0646: <int>[1606, 0xFEE6, 0xFEE7, 0xFEE8], // ARABIC LETTER NOON
0x0647: <int>[1607, 0xFEEA, 0xFEEB, 0xFEEC], // ARABIC LETTER HEH
0x0648: <int>[1608, 0xFEEE], // ARABIC LETTER WAW
0x0649: <int>[1609, 0xFEF0, 64488, 64489], // ARABIC LETTER ALEF MAKSURA
0x064A: <int>[1610, 0xFEF2, 0xFEF3, 0xFEF4], // ARABIC LETTER YEH
0x0671: <int>[0xFB50, 0xFB51], // ARABIC LETTER ALEF WASLA
0x0677: <int>[0xFBDD], // ARABIC LETTER U WITH HAMZA ABOVE
0x0679: <int>[0xFB66, 0xFB67, 0xFB68, 0xFB69], // ARABIC LETTER TTEH
0x067A: <int>[0xFB5E, 0xFB5F, 0xFB60, 0xFB61], // ARABIC LETTER TTEHEH
0x067B: <int>[0xFB52, 0xFB53, 0xFB54, 0xFB55], // ARABIC LETTER BEEH
0x067E: <int>[0xFB56, 0xFB57, 0xFB58, 0xFB59], // ARABIC LETTER PEH
0x067F: <int>[0xFB62, 0xFB63, 0xFB64, 0xFB65], // ARABIC LETTER TEHEH
0x0680: <int>[0xFB5A, 0xFB5B, 0xFB5C, 0xFB5D], // ARABIC LETTER BEHEH
0x0683: <int>[0xFB76, 0xFB77, 0xFB78, 0xFB79], // ARABIC LETTER NYEH
0x0684: <int>[0xFB72, 0xFB73, 0xFB74, 0xFB75], // ARABIC LETTER DYEH
0x0686: <int>[0xFB7A, 0xFB7B, 0xFB7C, 0xFB7D], // ARABIC LETTER TCHEH
0x0687: <int>[0xFB7E, 0xFB7F, 0xFB80, 0xFB81], // ARABIC LETTER TCHEHEH
0x0688: <int>[0xFB88, 0xFB89], // ARABIC LETTER DDAL
0x068C: <int>[0xFB84, 0xFB85], // ARABIC LETTER DAHAL
0x068D: <int>[0xFB82, 0xFB83], // ARABIC LETTER DDAHAL
0x068E: <int>[0xFB86, 0xFB87], // ARABIC LETTER DUL
0x0691: <int>[0xFB8C, 0xFB8D], // ARABIC LETTER RREH
0x0698: <int>[0xFB8A, 0xFB8B], // ARABIC LETTER JEH
0x06A4: <int>[0xFB6A, 0xFB6B, 0xFB6C, 0xFB6D], // ARABIC LETTER VEH
0x06A6: <int>[0xFB6E, 0xFB6F, 0xFB70, 0xFB71], // ARABIC LETTER PEHEH
0x06A9: <int>[0xFB8E, 0xFB8F, 0xFB90, 0xFB91], // ARABIC LETTER KEHEH
0x06AD: <int>[0xFBD3, 0xFBD4, 0xFBD5, 0xFBD6], // ARABIC LETTER NG
0x06AF: <int>[0xFB92, 0xFB93, 0xFB94, 0xFB95], // ARABIC LETTER GAF
0x06B1: <int>[0xFB9A, 0xFB9B, 0xFB9C, 0xFB9D], // ARABIC LETTER NGOEH
0x06B3: <int>[0xFB96, 0xFB97, 0xFB98, 0xFB99], // ARABIC LETTER GUEH
0x06BA: <int>[0xFB9E, 0xFB9F], // ARABIC LETTER NOON GHUNNA
0x06BB: <int>[0xFBA0, 0xFBA1, 0xFBA2, 0xFBA3], // ARABIC LETTER RNOON
0x06BE: <int>[
0xFBAA,
0xFBAB,
0xFBAC,
0xFBAD
], // ARABIC LETTER HEH DOACHASHMEE
0x06C0: <int>[0xFBA4, 0xFBA5], // ARABIC LETTER HEH WITH YEH ABOVE
0x06C1: <int>[0xFBA6, 0xFBA7, 0xFBA8, 0xFBA9], // ARABIC LETTER HEH GOAL
0x06C5: <int>[0xFBE0, 0xFBE1], // ARABIC LETTER KIRGHIZ OE
0x06C6: <int>[0xFBD9, 0xFBDA], // ARABIC LETTER OE
0x06C7: <int>[0xFBD7, 0xFBD8], // ARABIC LETTER U
0x06C8: <int>[0xFBDB, 0xFBDC], // ARABIC LETTER YU
0x06C9: <int>[0xFBE2, 0xFBE3], // ARABIC LETTER KIRGHIZ YU
0x06CB: <int>[0xFBDE, 0xFBDF], // ARABIC LETTER VE
0x06CC: <int>[0xFBFC, 0xFBFD, 0xFBFE, 0xFBFF], // ARABIC LETTER FARSI YEH
0x06D0: <int>[0xFBE4, 0xFBE5, 0xFBE6, 0xFBE7], //ARABIC LETTER E
0x06D2: <int>[0xFBAE, 0xFBAF], // ARABIC LETTER YEH BARREE
0x06D3: <int>[0xFBB0, 0xFBB1], // ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
};
/*
var ligaturesSubstitutionA = {
0xFBEA: []// ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM
};
*/
const Map<int, dynamic> _diacriticLigatures = <int, dynamic>{
0x0651: <int, int>{
0x064C: 0xFC5E, // Shadda + Dammatan
0x064D: 0xFC5F, // Shadda + Kasratan
0x064E: 0xFC60, // Shadda + Fatha
0x064F: 0xFC61, // Shadda + Damma
0x0650: 0xFC62, // Shadda + Kasra
0x0670: 0xFC63, // Shadda + Dagger alif
},
};
const Map<int, dynamic> _ligatures = <int, dynamic>{
0xFEDF: <int, int>{
0xFE82:
0xFEF5, // ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
0xFE84:
0xFEF7, // ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
0xFE88:
0xFEF9, // ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
0xFE8E: 0xFEFB // ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
},
0xFEE0: <int, int>{
0xFE82: 0xFEF6, // ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM
0xFE84: 0xFEF8, // ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM
0xFE88: 0xFEFA, // ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM
0xFE8E: 0xFEFC // ARABIC LIGATURE LAM WITH ALEF FINAL FORM
},
0xFE8D: <int, dynamic>{
0xFEDF: <int, dynamic>{
0xFEE0: <int, int>{0xFEEA: 0xFDF2}
}
}, // ALLAH
};
const List<int> _alfletter = <int>[1570, 1571, 1573, 1575];
const Map<int, int> _arabicDiacritics = <int, int>{
0x064B: 0x064B, // Fathatan
0x064C: 0x064C, // Dammatan
0x064D: 0x064D, // Kasratan
0x064E: 0x064E, // Fatha
0x064F: 0x064F, // Damma
0x0650: 0x0650, // Kasra
0x0651: 0x0651, // Shadda
0x0652: 0x0652, // Sukun
0x0670: 0x0670, // Dagger alif
0xFC5E: 0xFC5E, // Shadda + Dammatan
0xFC5F: 0xFC5F, // Shadda + Kasratan
0xFC60: 0xFC60, // Shadda + Fatha
0xFC61: 0xFC61, // Shadda + Damma
0xFC62: 0xFC62, // Shadda + Kasra
0xFC63: 0xFC63, // Shadda + Dagger alif
// 1548: 1548,
};
const int _noChangeInForm = -1;
const int _isolatedForm = 0;
const int _finalForm = 1;
const int _initialForm = 2;
const int _medialForm = 3;
bool _isInArabicSubstitutionA(int letter) {
return _arabicSubstitionA.containsKey(letter);
}
bool _isArabicLetter(int letter) {
return (letter >= 0x0600 && letter <= 0x06FF) ||
(letter >= 0x0750 && letter <= 0x077F) ||
(letter >= 0x0870 && letter <= 0x089F) ||
(letter >= 0x08A0 && letter <= 0x08FF) ||
(letter >= 0xFB50 && letter <= 0xFDFF) ||
(letter >= 0xFE70 && letter <= 0xFEFF) ||
(letter >= 0x10E60 && letter <= 0x10E7F) ||
(letter >= 0x1EC70 && letter <= 0x1ECBF) ||
(letter >= 0x1ED00 && letter <= 0x1ED4F) ||
(letter >= 0x1EE00 && letter <= 0x1EEFF);
}
bool _isArabicEndLetter(int letter) {
return _isArabicLetter(letter) &&
_isInArabicSubstitutionA(letter) &&
_arabicSubstitionA[letter].length <= 2;
}
bool _isArabicAlfLetter(int letter) {
return _isArabicLetter(letter) && _alfletter.contains(letter);
}
bool _arabicLetterHasFinalForm(int letter) {
return _isArabicLetter(letter) &&
_isInArabicSubstitutionA(letter) &&
(_arabicSubstitionA[letter].length >= 2);
}
bool _arabicLetterHasMedialForm(int letter) {
return _isArabicLetter(letter) &&
_isInArabicSubstitutionA(letter) &&
_arabicSubstitionA[letter].length == 4;
}
bool _isArabicDiacritic(int letter) {
return _arabicDiacritics.containsKey(letter);
}
bool isArabicDiacriticValue(int letter) {
return _arabicDiacritics.containsValue(letter);
}
List<int> _resolveLigatures(List<int> lettersq) {
final result = <int>[];
dynamic tmpLigatures = _ligatures;
dynamic tmpDiacritic = _diacriticLigatures;
final letters = lettersq.reversed.toList();
final effectedLetters = <int>[];
final effectedDiacritics = <int>[];
final finalDiacritics = <int>[];
for (var i = 0; i < letters.length; i++) {
if (isArabicDiacriticValue(letters[i])) {
effectedDiacritics.insert(0, letters[i]);
if (tmpDiacritic.containsKey(letters[i])) {
tmpDiacritic = tmpDiacritic[letters[i]];
if (tmpDiacritic is int) {
finalDiacritics.insert(0, tmpDiacritic);
tmpDiacritic = _diacriticLigatures;
effectedDiacritics.clear();
}
} else {
tmpDiacritic = _diacriticLigatures;
// add all Diacritics if there is no letter Ligatures.
if (effectedLetters.isEmpty) {
result.insertAll(0, finalDiacritics);
result.insertAll(0, effectedDiacritics);
finalDiacritics.clear();
effectedDiacritics.clear();
}
}
} else if (tmpLigatures.containsKey(letters[i])) {
effectedLetters.insert(0, letters[i]);
tmpLigatures = tmpLigatures[letters[i]];
if (tmpLigatures is int) {
result.insert(0, tmpLigatures);
tmpLigatures = _ligatures;
effectedLetters.clear();
}
} else {
tmpLigatures = _ligatures;
// add effected letters if they aren't ligature.
if (effectedLetters.isNotEmpty) {
result.insertAll(0, effectedLetters);
effectedLetters.clear();
}
// add Diacritics after or before letter ligature.
if (effectedLetters.isEmpty && effectedDiacritics.isNotEmpty) {
result.insertAll(0, effectedDiacritics);
effectedDiacritics.clear();
}
result.insert(0, letters[i]);
}
// add Diacritic ligatures.
if (effectedLetters.isEmpty && finalDiacritics.isNotEmpty) {
result.insertAll(0, finalDiacritics);
finalDiacritics.clear();
}
}
return result;
}
int _getCorrectForm(int currentChar, int beforeChar, int nextChar) {
if (_isInArabicSubstitutionA(currentChar) == false) {
return _noChangeInForm;
}
if (!_arabicLetterHasFinalForm(currentChar) ||
(!_isArabicLetter(beforeChar) && !_isArabicLetter(nextChar)) ||
(!_isArabicLetter(nextChar) && _isArabicEndLetter(beforeChar)) ||
(_isArabicEndLetter(currentChar) && !_isArabicLetter(beforeChar)) ||
(_isArabicEndLetter(currentChar) && _isArabicAlfLetter(beforeChar)) ||
(_isArabicEndLetter(currentChar) && _isArabicEndLetter(beforeChar))) {
return _isolatedForm;
}
if (_arabicLetterHasMedialForm(currentChar) &&
_isArabicLetter(beforeChar) &&
!_isArabicEndLetter(beforeChar) &&
_isArabicLetter(nextChar) &&
_arabicLetterHasFinalForm(nextChar)) {
return _medialForm;
}
if (_isArabicEndLetter(currentChar) || (!_isArabicLetter(nextChar))) {
return _finalForm;
}
return _initialForm;
}
Iterable<String> _parse(String text) sync* {
final words = text.split(' ');
final notArabicWords = <List<int>>[];
var first = true;
for (final word in words) {
final newWord = <int>[];
var isNewWordArabic = false;
var prevLetter = 0;
for (var j = 0; j < word.length; j += 1) {
final currentLetter = word.codeUnitAt(j);
if (_isArabicDiacritic(currentLetter)) {
newWord.insert(0, _arabicDiacritics[currentLetter]!);
continue;
}
final nextLetter = word
.split('')
.skip(j + 1)
.map((String e) => e.codeUnitAt(0))
.firstWhere(
(int element) => !_isArabicDiacritic(element),
orElse: () => 0,
);
if (_isArabicLetter(currentLetter)) {
isNewWordArabic = true;
final position = _getCorrectForm(currentLetter, prevLetter, nextLetter);
prevLetter = currentLetter;
if (position != -1) {
newWord.insert(0, _arabicSubstitionA[currentLetter][position]);
} else {
newWord.add(currentLetter);
}
} else {
prevLetter = 0;
if (isNewWordArabic && currentLetter > 32) {
newWord.insert(0, currentLetter);
} else {
newWord.add(currentLetter);
}
}
}
if (!first && isNewWordArabic) {
yield ' ';
}
first = false;
if (isNewWordArabic) {
isNewWordArabic = false;
for (final notArabicNewWord in notArabicWords) {
yield '${String.fromCharCodes(notArabicNewWord)} ';
}
notArabicWords.clear();
yield String.fromCharCodes(_resolveLigatures(newWord));
} else {
notArabicWords.insert(0, newWord);
}
}
// if notArabicWords.length != 0, that means all sentence doesn't contain Arabic.
for (var i = 0; i < notArabicWords.length; i++) {
if (!first) {
yield ' ';
}
yield String.fromCharCodes(notArabicWords[i]);
}
}
/// Apply Arabic shape substitutions
String convert(String input) {
final lines = input.split('\n');
final parsed = <String>[];
for (var i = 0; i < lines.length; i++) {
if (lines[i].isEmpty) {
continue;
}
parsed.addAll([..._parse(lines[i]), if (i != lines.length - 1) '\n']);
}
return parsed.join();
}
import 'package:bidi/bidi.dart' as bidi;
/*
* Copyright (C) 2017, David PHAM-VAN <dev.nfet.net@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
const Map<int, int> _arabicDiacritics = <int, int>{
0x064B: 0x064B, // Fathatan
0x064C: 0x064C, // Dammatan
0x064D: 0x064D, // Kasratan
0x064E: 0x064E, // Fatha
0x064F: 0x064F, // Damma
0x0650: 0x0650, // Kasra
0x0651: 0x0651, // Shadda
0x0652: 0x0652, // Sukun
0x0670: 0x0670, // Dagger alif
0xFC5E: 0xFC5E, // Shadda + Dammatan
0xFC5F: 0xFC5F, // Shadda + Kasratan
0xFC60: 0xFC60, // Shadda + Fatha
0xFC61: 0xFC61, // Shadda + Damma
0xFC62: 0xFC62, // Shadda + Kasra
0xFC63: 0xFC63, // Shadda + Dagger alif
// 1548: 1548,
};
bool isArabicDiacriticValue(int letter) {
return _arabicDiacritics.containsValue(letter);
}
/// Applies THE BIDIRECTIONAL ALGORITHM using (https://pub.dev/packages/bidi)
String logicalToVisual(String input) {
final buffer = StringBuffer();
final paragraphs = bidi.splitStringToParagraphs(input);
for (final paragraph in paragraphs) {
final endsWithNewLine = paragraph.paragraphSeparator == 10;
final endIndex = paragraph.bidiText.length - (endsWithNewLine ? 1 : 0);
final visual = String.fromCharCodes(paragraph.bidiText, 0, endIndex);
buffer.write(visual.split(' ').reversed.join(' '));
if (endsWithNewLine) {
buffer.writeln();
}
}
return buffer.toString();
}
... ...
... ... @@ -19,7 +19,7 @@ import 'dart:typed_data';
import '../data_types.dart';
import '../document.dart';
import '../font/arabic.dart' as arabic;
import '../font/bidi_utils.dart' as bidi;
import '../font/font_metrics.dart';
import '../font/ttf_parser.dart';
import '../font/ttf_writer.dart';
... ... @@ -74,7 +74,7 @@ class PdfTtfFont extends PdfFont {
return PdfFontMetrics.zero;
}
if (arabic.isArabicDiacriticValue(charCode)) {
if (bidi.isArabicDiacriticValue(charCode)) {
final metric = font.glyphInfoMap[g] ?? PdfFontMetrics.zero;
return metric.copyWith(advanceWidth: 0);
}
... ...
... ... @@ -19,7 +19,7 @@ import 'dart:math' as math;
import 'package:meta/meta.dart';
import '../../pdf.dart';
import '../pdf/font/arabic.dart' as arabic;
import '../pdf/font/bidi_utils.dart' as bidi;
import 'annotations.dart';
import 'basic.dart';
import 'document.dart';
... ... @@ -918,7 +918,7 @@ class RichText extends Widget with SpanningWidget {
font.stringMetrics(' ') * (style.fontSize! * textScaleFactor);
final spanLines = (_textDirection == TextDirection.rtl
? arabic.convert(span.text!)
? bidi.logicalToVisual(span.text!)
: span.text)!
.split('\n');
... ...
... ... @@ -11,6 +11,7 @@ environment:
dependencies:
archive: ^3.1.0
barcode: ">=2.2.3 <3.0.0"
bidi: ^2.0.2
crypto: ^3.0.0
image: ">=3.0.1 <4.0.0"
meta: ">=1.3.0 <2.0.0"
... ...
... ... @@ -16,7 +16,7 @@
import 'dart:io';
import 'package:pdf/src/pdf/font/arabic.dart' as arabic;
import 'package:pdf/src/pdf/font/bidi_utils.dart' as bidi;
import 'package:pdf/widgets.dart';
import 'package:test/test.dart';
... ... @@ -46,16 +46,16 @@ void main() {
});
test('Arabic Diacritics', () {
final a = ArabicText('السلام', <int>[1605, 65276, 65204, 65247, 1575]);
final a = ArabicText('السلام', <int>[65249, 65276, 65204, 65247, 65165]);
final b = ArabicText('السَلَاْمٌ',
<int>[1612, 1605, 1618, 1614, 65276, 1614, 65204, 65247, 1575]);
<int>[1612, 65249, 1618, 1614, 65276, 1614, 65204, 65247, 65165]);
expect(
arabic.convert(a.original).codeUnits,
bidi.logicalToVisual(a.original).codeUnits,
equals(a.reshaped),
);
expect(
arabic.convert(b.original).codeUnits,
bidi.logicalToVisual(b.original).codeUnits,
equals(b.reshaped),
);
});
... ... @@ -64,7 +64,7 @@ void main() {
final cases = <ArabicText>[
ArabicText('الـــسَلاْمُ عَلَيْكُمْ', <int>[
1615,
1605,
65249,
1618,
65276,
1614,
... ... @@ -73,7 +73,7 @@ void main() {
1600,
1600,
65247,
1575,
65165,
32,
1618,
65250,
... ... @@ -94,7 +94,7 @@ void main() {
1600,
1600,
65247,
1575,
65165,
32,
65172,
64608,
... ... @@ -105,7 +105,7 @@ void main() {
1600,
65228,
65247,
1575,
65165,
32,
65266,
65259,
... ... @@ -114,15 +114,15 @@ void main() {
65198,
65180,
65243,
1571,
65155,
32,
1616,
1578,
65173,
65166,
65232,
65248,
65247,
1575
65165
]),
ArabicText('تحدُّثاً ونُطقاً ضِمْنَ مَجمُوعَة', <int>[
1611,
... ... @@ -139,7 +139,7 @@ void main() {
65220,
1615,
65255,
1608,
65261,
32,
1614,
65254,
... ... @@ -159,12 +159,12 @@ void main() {
65251
]),
ArabicText('اللغات السامية', <int>[
1578,
65173,
65166,
65232,
65248,
65247,
1575,
65165,
32,
65172,
65268,
... ... @@ -172,7 +172,7 @@ void main() {
65166,
65204,
65247,
1575
65165,
]),
ArabicText('العربية لغةٌ رسميةٌ في', <int>[
65172,
... ... @@ -181,7 +181,7 @@ void main() {
65198,
65228,
65247,
1575,
65165,
32,
1612,
65172,
... ... @@ -193,7 +193,7 @@ void main() {
65268,
65252,
65203,
1585,
65197,
32,
65266,
65235
... ... @@ -204,16 +204,16 @@ void main() {
65243,
32,
1616,
1604,
1608,
1583,
65245,
65261,
65193,
32,
1616,
65254,
65219,
65262,
65247,
1575,
65165,
32,
64610,
65266,
... ... @@ -221,19 +221,19 @@ void main() {
65198,
65228,
65247,
1575
65165
]),
ArabicText('إضافة إلىّٰ كونها لغة؟', <int>[
65172,
65235,
65166,
65215,
1573,
65159,
32,
64611,
65264,
65247,
1573,
65159,
32,
65166,
65260,
... ... @@ -241,22 +241,22 @@ void main() {
65262,
65243,
32,
1567,
65172,
65232,
65247,
1567
]),
ArabicText('رسمية في تشاد وإريتريا', <int>[
65172,
65268,
65252,
65203,
1585,
65197,
32,
65266,
65235,
32,
1583,
65193,
65166,
65208,
65175,
... ... @@ -266,36 +266,36 @@ void main() {
65198,
65176,
65267,
1585,
1573,
1608
65197,
65159,
65261
]),
ArabicText('وإسرائيل. وهي إحدى اللغات', <int>[
46,
65246,
65268,
65163,
1575,
65165,
65198,
65203,
1573,
1608,
65159,
65261,
32,
65266,
65259,
1608,
65261,
32,
1609,
65263,
65194,
65187,
1573,
65159,
32,
1578,
65173,
65166,
65232,
65248,
65247,
1575
65165
]),
ArabicText('الرسمية الست في منظمة', <int>[
65172,
... ... @@ -304,12 +304,12 @@ void main() {
65203,
65198,
65247,
1575,
65165,
32,
65174,
65204,
65247,
1575,
65165,
32,
65266,
65235,
... ... @@ -324,16 +324,16 @@ void main() {
65250,
65251,
65271,
1575,
65165,
32,
1577,
1548,
65171,
65194,
65188,
65176,
65252,
65247,
1575,
1548,
65165,
32,
65246,
65236,
... ... @@ -341,10 +341,10 @@ void main() {
65188,
1615,
65267,
1608
65261
]),
ArabicText('باليوم العالمي للغة العربية', <int>[
1605,
65249,
65262,
65268,
65247,
... ... @@ -357,7 +357,7 @@ void main() {
65166,
65228,
65247,
1575,
65165,
32,
65172,
65232,
... ... @@ -370,7 +370,7 @@ void main() {
65198,
65228,
65247,
1575
65165
]),
ArabicText('في 18 ديسمبر كذكرى اعتماد', <int>[
65266,
... ... @@ -384,20 +384,20 @@ void main() {
65252,
65204,
65267,
1583,
65193,
32,
1609,
65263,
65198,
65243,
65196,
65243,
32,
1583,
65193,
65166,
65252,
65176,
65227,
1575
65165
]),
ArabicText('العربية بين لغات العمل في', <int>[
65172,
... ... @@ -406,13 +406,13 @@ void main() {
65198,
65228,
65247,
1575,
65165,
32,
65254,
65268,
65169,
32,
1578,
65173,
65166,
65232,
65247,
... ... @@ -421,7 +421,7 @@ void main() {
65252,
65228,
65247,
1575,
65165,
32,
65266,
65235
... ... @@ -430,16 +430,16 @@ void main() {
65250,
65251,
65271,
1575,
65165,
32,
46,
1577,
65171,
65194,
65188,
65176,
65252,
65247,
1575,
65165,
]),
];
... ... @@ -462,7 +462,7 @@ void main() {
for (final item in cases) {
expect(
arabic.convert(item.original).codeUnits,
bidi.logicalToVisual(item.original).codeUnits,
equals(item.reshaped),
);
}
... ... @@ -481,7 +481,7 @@ void main() {
children: const <TextSpan>[
TextSpan(
text:
'القهوة مشروب يعد من بذور الب المحمصة، وينمو في أكثر من 70 لداً. خصوصاً في المناطق الاستوائية في أمريكا الشمالية والجنوبية وجنوب شرق آسيا وشبه القارة الهندية وأفريقيا. ويقال أن البن الأخضر هو ثاني أكثر السلع تداولاً في العالم بعد النفط الخام.',
'القهوة مشروب يعد من بذور الب المحمصة، وينمو في أكثر من 70 بلداً. خصوصاً في المناطق الاستوائية في أمريكا الشمالية والجنوبية وجنوب شرق آسيا وشبه القارة الهندية وأفريقيا. ويقال أن البن الأخضر هو ثاني أكثر السلع تداولاً في العالم بعد النفط الخام.',
style: TextStyle(
fontSize: 20,
),
... ... @@ -506,7 +506,7 @@ void main() {
children: const <TextSpan>[
TextSpan(
text:
'القهوة مشروب يعد من بذور الب المحمصة، وينمو في أكثر من 70 لداً. خصوصاً في المناطق الاستوائية في أمريكا الشمالية والجنوبية وجنوب شرق آسيا وشبه القارة الهندية وأفريقيا. ويقال أن البن الأخضر هو ثاني أكثر السلع تداولاً في العالم بعد النفط الخام.',
'القهوة مشروب يعد من بذور الب المحمصة، وينمو في أكثر من 70 بلداً. خصوصاً في المناطق الاستوائية في أمريكا الشمالية والجنوبية وجنوب شرق آسيا وشبه القارة الهندية وأفريقيا. ويقال أن البن الأخضر هو ثاني أكثر السلع تداولاً في العالم بعد النفط الخام.',
style: TextStyle(
fontSize: 20,
),
... ... @@ -517,8 +517,34 @@ void main() {
));
});
test(
'Text Widgets, Mixed Arabic and Latin words should be rendered in order ',
test('Text Widgets, Arabic Text with Tashkeel', () {
pdf.addPage(Page(
textDirection: TextDirection.rtl,
build: (Context context) => RichText(
text: TextSpan(
text: 'الفَرَاشَةُ\n',
style: TextStyle(
font: arabicFont,
fontSize: 30,
),
children: const <TextSpan>[
if (true)
TextSpan(
text:
'فَرَاشَةٌ مُلَوَّنَةٌ تَطِيْرُ في البُسْتَانِ، حُلْوَةٌ مُهَنْدَمَةٌ تُدْهِشُ الإِنْسَانَ، أَهْدَافُهَا مُحَدَّدَةٌ، حَرَكَاتُها مُرَتَّبَةٌ، تَحُوْمُ بِانْتِظَامٍ،'
' تَحُطُّ فِي نُعُومَةٍ تَنْشُرُ السَّلاَمَ. فَرَاشَةٌ مُلَوَّنَةٌ تَطِيرُ بِلا اُنْقِطَاعٍ، بِالنَّهارِ المُشْرِقِ تَمْلَأُ البِقَاعَ، تُحِبُّ الوَرْدَ '
'المَزْرُوعَ، تَلْثُمُهُ فِي وَقْتِ الجُوعِ، تَمْتَصُّ رَحِيْقَ الأَزْهَارِ، تُحْيي جَنْيَ الأَشْجَارِ، مِنْ وَرْدَةٍ لِوَرْدَةٍ، تَطِيْرُ بِانْتِظَامٍ.',
style: TextStyle(
fontSize: 18,
),
),
],
),
),
));
});
test('Text Widgets, Mixed Arabic and Latin words should be rendered in order',
() {
pdf.addPage(Page(
textDirection: TextDirection.rtl,
... ... @@ -530,11 +556,11 @@ void main() {
fontSize: 30,
),
children: const <TextSpan>[
if (true)
TextSpan(
text: r'''
الكلمات اللاتينية المضافة إلى نص عربي يجب أن توضع في الترتيب الصحيح Right Order مهما كان موضعها في النص.
At the Beginning of the sentence في بداية الجملة
أو في منتصفها In the middle of the sentence حيث يكون بعدها كلام عربي
في منتصفها In the middle of the sentence حيث يكون بعدها كلام عربي
أو في نهاية النص At the end of the sentence
أيضا ترتيب الأرقام والرموز يجب 1 أن 2 يكون 3 صحيحاً$.
ولا ننسى أيضا فواصل السطور Line breakers حيث وجودها في موضعها الصحيح مهم جدا في النصوص ثنائية الاتجاه Bidirectional
... ... @@ -549,6 +575,34 @@ At the Beginning of the sentence في بداية الجملة
));
});
test('Text Widgets Arabic with weak/natural Chars', () {
pdf.addPage(Page(
build: (Context context) => SizedBox.expand(
child: RichText(
textDirection: TextDirection.rtl,
text: TextSpan(
style: TextStyle(
font: arabicFont,
fontSize: 18,
),
children: const <TextSpan>[
TextSpan(
text: '''
اضف العدد (5) إلى العدد (40)
ثم اطرح منه العدد (10)
الناتج = 35
جملة (if) الشرطية:
كلمة عربية (بين قوسين)
حاصل العملية (5 * 2) + (2 - 4) يساوي 12
العدد 9 > 5 والعدد 9 < 10
''',
),
],
),
)),
));
});
tearDownAll(() async {
final file = File('arabic.pdf');
await file.writeAsBytes(await pdf.save());
... ...
No preview for this file type