[de] Implement DoNotHyphenateCaps parameter

ONLYOFFICE · Aug 11, 2023 · 4a56e0a · 4a56e0a
1 parent 861bd43
commit 4a56e0a
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 16 deletions.
diff --git a/tests/word/document-calculation/textHyphenator/hyphenationService.js b/tests/word/document-calculation/textHyphenator/hyphenationService.js
@@ -41,7 +41,7 @@
 	{
 		BUFFER_STRING += String.fromCodePoint(codePoint);
 	};
-	AscHyphenation.HyphenateBuffer = function()
+	AscHyphenation.Hyphenate = function()
 	{
 		let checkString = BUFFER_STRING.toLowerCase();
 
@@ -58,11 +58,9 @@
 
 		return [];
 	};
-	AscHyphenation.Hyphenate = function()
+	AscHyphenation.Clear = function()
 	{
-		let result = AscHyphenation.HyphenateBuffer();
 		BUFFER_STRING = "";
-		return result;
 	};
 
 })(window);
diff --git a/tests/word/document-calculation/textHyphenator/textHyphenator.js b/tests/word/document-calculation/textHyphenator/textHyphenator.js
@@ -64,7 +64,7 @@ $(function ()
 	{
 		return autoHyphenation;
 	};
-	AscWord.CParagraph.prototype.IsHyphenateCaps = function()
+	AscWord.CTextHyphenator.prototype.IsHyphenateCaps = function()
 	{
 		return hyphenateCaps;
 	};
@@ -139,17 +139,17 @@ $(function ()
 	{
 		SetText("abcde AAABBB aaabbb");
 
-		CheckLines(assert, false, charWidth * 10.5, ["abcde ", "AAABBB ", "aaabbb"]);
+		CheckLines(assert, false, charWidth * 11.5, ["abcde ", "AAABBB ", "aaabbb"]);
 		CheckAutoHyphenAfter(assert, 8, false);
 		CheckAutoHyphenAfter(assert, 15, false);
 
 		SetHyphenateCaps(true);
-		CheckLines(assert, true, charWidth * 10.5, ["abcde AAA", "BBB aaabbb"]);
+		CheckLines(assert, true, charWidth * 11.5, ["abcde AAA", "BBB aaabbb"]);
 		CheckAutoHyphenAfter(assert, 8, true);
 		CheckAutoHyphenAfter(assert, 15, false);
 
 		SetHyphenateCaps(false);
-		CheckLines(assert, true, charWidth * 10.5, ["abcde ", "AAABBB aaa", "bbb"]);
+		CheckLines(assert, true, charWidth * 11.5, ["abcde ", "AAABBB aaa", "bbb"]);
 		CheckAutoHyphenAfter(assert, 8, false);
 		CheckAutoHyphenAfter(assert, 15, true);
 

diff --git a/word/Editor/Paragraph/TextHyphenator.js b/word/Editor/Paragraph/TextHyphenator.js
@@ -42,7 +42,7 @@ var AscHyphenation = AscHyphenation || {};
 	{
 		BUFFER_STRING += String.fromCodePoint(codePoint);
 	};
-	AscHyphenation.HyphenateBuffer = function()
+	AscHyphenation.Hyphenate = function()
 	{
 		if ("reenter" === BUFFER_STRING)
 			return [1];
@@ -55,11 +55,9 @@ var AscHyphenation = AscHyphenation || {};
 
 		return [];
 	};
-	AscHyphenation.Hyphenate = function()
+	AscHyphenation.Clear = function()
 	{
-		let result = AscHyphenation.HyphenateBuffer();
 		BUFFER_STRING = "";
-		return result;
 	};
 })();
 
@@ -77,9 +75,13 @@ var AscHyphenation = AscHyphenation || {};
 		this.FontSlot = fontslot_Unknown;
 		this.Lang     = lcid_enUS;
 		this.Buffer   = [];
+
+		this.HyphenateCaps = true;
 	}
 	CTextHyphenator.prototype.Hyphenate = function(paragraph)
 	{
+		this.CheckHyphenateCaps(paragraph);
+
 		let self = this;
 		paragraph.CheckRunContent(function(run, startPos, endPos)
 		{
@@ -112,6 +114,14 @@ var AscHyphenation = AscHyphenation || {};
 			}
 		}
 	};
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// Private area
+	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	CTextHyphenator.prototype.ResetBuffer = function()
+	{
+		this.Buffer.length = 0;
+		AscHyphenation.Clear();
+	};
 	CTextHyphenator.prototype.GetLang = function(run, fontSlot)
 	{
 		let textPr = run.Get_CompiledPr(false);
@@ -152,19 +162,45 @@ var AscHyphenation = AscHyphenation || {};
 		if (!this.Word)
 			return;
 
+		this.Word = false;
+
+		if (!this.IsHyphenateCaps() && this.IsAllCaps())
+			return this.ResetBuffer();
+
 		let result = AscHyphenation.Hyphenate();
 		for (let i = 0, len = result.length; i < len; ++i)
 		{
 			this.Buffer[result[i]].SetHyphenAfter(true);
 		}
 
-		this.Buffer.length = 0;
-		this.Word = false;
+		this.ResetBuffer();
+	};
+	CTextHyphenator.prototype.IsAllCaps = function()
+	{
+		for (let i = 0, len = this.Buffer.length; i < len; ++i)
+		{
+			let char = String.fromCodePoint(this.Buffer[i].GetCodePoint());
+			if (char.toUpperCase() !== char)
+				return false;
+		}
+
+		return true;
+	};
+	CTextHyphenator.prototype.CheckHyphenateCaps = function(paragraph)
+	{
+		this.HyphenateCaps = true;
+
+		let logicDocument = paragraph.GetLogicDocument();
+		if (logicDocument && logicDocument.IsDocumentEditor())
+			this.HyphenateCaps = logicDocument.GetDocumentSettings().IsHyphenateCaps();
+	};
+	CTextHyphenator.prototype.IsHyphenateCaps = function()
+	{
+		return this.HyphenateCaps;
 	};
-
 	//--------------------------------------------------------export----------------------------------------------------
 	window['AscWord'].CTextHyphenator = CTextHyphenator;
-	window['AscWord'].TextHyphenator  = new  CTextHyphenator();
+	window['AscWord'].TextHyphenator  = new CTextHyphenator();
 
 })(window);