Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 23b4ce7dca into 59258ca7cf

Browse source
This commit is contained in:
Henry Hsiao 2026-02-14 21:56:17 -05:00 • committed by GitHub
commit 4a6fddd07a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
evennia/utils/utils.py
View file

@ -292,8 +292,8 @@ def justify(text, width=None, align="l", indent=0, fillchar=" "):
# absolute mode - just crop or fill to width
abs_lines = []
for line in text.split("\n"):
nlen = m_len(line)
if m_len(line) < width:
nlen = m_len(line, True)
if m_len(line, True) < width:
line += sp * (width - nlen)
else:
line = crop(line, width=width, suffix="")
@ -308,7 +308,7 @@ def justify(text, width=None, align="l", indent=0, fillchar=" "):
for ip, paragraph in enumerate(paragraphs):
if ip > 0:
words.append(("\n", 0))
words.extend((word, m_len(word)) for word in paragraph.split())
words.extend((word, m_len(word, True)) for word in paragraph.split())
if not words:
# Just whitespace!
@ -2309,7 +2309,7 @@ def calledby(callerdepth=1):
return "\n".join(out[::-1])
def m_len(target):
def m_len(target, use_display_len=False):
"""
Provides length checking for strings with MXP patterns, and falls
back to normal len for other objects.
@ -2317,6 +2317,9 @@ def m_len(target):
Args:
target (str): A string with potential MXP components
to search.
use_display_len (bool, optional): If `True`, use display_len
instead of len. Default is `False`, use `True` if target
contain east asian characters.
Returns:
length (int): The length of `target`, ignoring MXP components.
@ -2326,8 +2329,8 @@ def m_len(target):
from evennia.utils.ansi import ANSI_PARSER
if inherits_from(target, str) and "|lt" in target:
return len(ANSI_PARSER.strip_mxp(target))
return len(target)
return display_len(ANSI_PARSER.strip_mxp(target)) if use_display_len else len(ANSI_PARSER.strip_mxp(target))
return display_len(target) if use_display_len else len(target)
def display_len(target):