--- fenglin/lib/str_process.inc.php	2025/03/18 07:10:59	1.10
+++ fenglin/lib/str_process.inc.php	2025/10/18 14:15:35	1.21
@@ -1,18 +1,52 @@
-<?
-function split_line($str, $prefix = "", $width = 76, $lines_limit = PHP_INT_MAX)
+<?php
+function str_length(string $str) : int
+{
+	$len = strlen($str);
+	$ret = 0;
+
+	for ($i = 0; $i < $len; $i++)
+	{
+		$c = $str[$i];
+
+		// Process UTF-8 Chinese characters
+		$v1 = ord($c);
+		if ($v1 & 0x80) //head of multi-byte character
+		{
+			$v2 = ($v1 & 0x70) << 1;
+			while ($v2 & 0x80)
+			{
+				$i++;
+				$c .= $str[$i];
+				$v2 = ($v2 & 0x7f) << 1;
+			}
+
+			$ret += 2;
+		}
+		else
+		{
+			$ret++;
+		}
+	}
+
+	return $ret;
+}
+
+function split_line(string $str, string $prefix = "", int $width = 76, int $lines_limit = PHP_INT_MAX, string $end_of_line = "\n") : string
 {
 	if ($width <= 0)
+	{
 		return $str;
-	
+	}
+
 	$result = "";
 	$len = strlen($str);
-	$prefix_len = mb_strlen($prefix, 'UTF-8');
+	$prefix_len = str_length($prefix);
 
 	$lines_count = 0;
 
 	$line = $prefix;
 	$line_len = $prefix_len;
-	for($i = 0; $i < $len && $lines_count < $lines_limit; $i++)
+	for ($i = 0; $i < $len && $lines_count < $lines_limit; $i++)
 	{
 		$c = $str[$i];
 
@@ -21,10 +55,15 @@ function split_line($str, $prefix = "",
 		{
 			continue;
 		}
-				
+
 		if ($c == "\n")
 		{
-			$result .= ($line . "\n");
+			if ($lines_count + 1 >= $lines_limit)
+			{
+				break;
+			}
+
+			$result .= ($line . $end_of_line);
 			$lines_count++;
 			$line = $prefix;
 			$line_len = $prefix_len;
@@ -33,21 +72,25 @@ function split_line($str, $prefix = "",
 
 		// Process UTF-8 Chinese characters
 		$v1 = ord($c);
-		if (($v1 & 0b10000000) == 0b10000000) //head of multi-byte character
+		if ($v1 & 0x80) //head of multi-byte character
 		{
-			$v2 = ($v1 & 0b01111000) << 1;
-			while ($v2 & 0b10000000)
+			$v2 = ($v1 & 0x70) << 1;
+			while ($v2 & 0x80)
 			{
 				$i++;
-				$v3 = $str[$i];
-				$c .= $v3;
-				$v2 = ($v2 & 0b01111111 ) << 1;
+				$c .= $str[$i];
+				$v2 = ($v2 & 0x7f) << 1;
 			}
 
 			// Each UTF-8 CJK character should use two character length for display
 			if ($line_len + 2 > $width)
 			{
-				$result .= ($line . "\n");
+				if ($lines_count + 1 >= $lines_limit)
+				{
+					break;
+				}
+
+				$result .= ($line . $end_of_line);
 				$lines_count++;
 				$line = $prefix;
 				$line_len = $prefix_len;
@@ -59,18 +102,26 @@ function split_line($str, $prefix = "",
 			$line_len++;
 		}
 
-		$line .= $c;
-
-		if ($line_len >= $width)
+		if ($line_len > $width)
 		{
-			$result .= ($line . "\n");
+			if ($lines_count + 1 >= $lines_limit)
+			{
+				break;
+			}
+
+			$result .= ($line . $end_of_line);
 			$lines_count++;
 			$line = $prefix;
-			$line_len = $prefix_len;
+			$line_len = $prefix_len + 1;
 		}
+
+		$line .= $c;
+	}
+
+	if ($lines_count < $lines_limit)
+	{
+		$result .= $line;
 	}
-	$result .= ($line . "\n");
 
 	return $result;
 }
-?>