easyrip 4.8.1__tar.gz → 4.9.0__tar.gz

{easyrip-4.8.1 → easyrip-4.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyrip
-Version: 4.8.1
+Version: 4.9.0
 Author: op200
 License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/op200/EasyRip

{easyrip-4.8.1 → easyrip-4.9.0}/easyrip/easyrip_mlang/lang_zh_Hans_CN.py

@@ -329,6 +329,7 @@ LANG_MAP: dict[str, str] = {
     "Subset faild, cancel mux": "子集化失败, 取消混流",
     "FFmpeg report: {}": "FFmpeg 报告: {}",
     "{} not found. Skip it": "没找到 {}。默认跳过",
+    "{} not found. Skip it. Perhaps you want the {}": "没找到 {}。默认跳过。或许你想要的是 {}",
     'The font "{}" does not contain these characters: {}': '字体 "{}" 不包含字符: {}',
     "The style '{}' not in Styles. Defaulting to the style '{}'": "样式 '{}' 不在 Styles 中。默认使用样式 '{}'",
     "The style '{}' and the style 'Default' not in Styles. Defaulting to no font": "样式 '{}' 和样式 'Default' 都不在 Styles 中。默认不使用字体",

{easyrip-4.8.1 → easyrip-4.9.0}/easyrip/global_val.py

@@ -3,7 +3,7 @@ import sys
 from pathlib import Path
 
 PROJECT_NAME = "Easy Rip"
-PROJECT_VERSION = "4.8.1"
+PROJECT_VERSION = "4.9.0"
 PROJECT_TITLE = f"{PROJECT_NAME} v{PROJECT_VERSION}"
 PROJECT_URL = "https://github.com/op200/EasyRip"
 PROJECT_RELEASE_API = "https://api.github.com/repos/op200/EasyRip/releases/latest"

{easyrip-4.8.1 → easyrip-4.9.0}/easyrip/ripper/sub_and_font/font.py

@@ -190,17 +190,8 @@ def subset_font(font: Font, subset_str: str, affix: str) -> tuple[TTFont, bool]:
 
     # 创建子集化选项
     options = subset.Options()
-    options.drop_tables = ["DSIG", "PCLT", "EBDT", "EBSC"]  # 不移除任何可能有用的表
     options.hinting = True  # 保留 hinting
     options.name_IDs = []  # 不保留 name 表记录
-    options.no_subset_tables = subset.Options._no_subset_tables_default + [
-        "BASE",
-        "mort",
-    ]
-    # options.drop_tables = []
-    options.name_legacy = True
-    # options.retain_gids = True
-    options.layout_features = ["*"]
 
     # 创建子集化器
     subsetter = subset.Subsetter(options=options)

{easyrip-4.8.1 → easyrip-4.9.0}/easyrip/ripper/sub_and_font/subset.py

@@ -133,6 +133,7 @@ def subset(
             current_font_sign: tuple[str, Font_type] = default_font_sign
             for is_tag, text in Event_data.parse_text(event.Text, use_libass_spec):
                 if is_tag:
+                    tag_fn_org: str | None = None
                     tag_fn: str | None = None
                     tag_bold: str | None = None
                     tag_italic: str | None = None
@@ -151,7 +152,7 @@ def subset(
 
                         match tag:
                             case "fn":
-                                tag_fn = proc_value
+                                tag_fn_org, tag_fn = value, proc_value
                             case "b":
                                 tag_bold = proc_value
                             case "i":
@@ -183,7 +184,7 @@ def subset(
 
                                 # 修改
                                 text = text.replace(
-                                    f"\\fn{tag_fn}",
+                                    f"\\fn{tag_fn_org}",
                                     f"\\fn{'@' if _is_vertical else ''}{get_font_new_name(new_fontname)}",
                                 )
 
@@ -287,10 +288,11 @@ def subset(
         fonts.extend(load_windows_fonts(strict=strict))
 
     font_sign__font: dict[tuple[str, Font_type], Font] = {}
+    family_lower__family = {}  # 存储小写 family 用于判断 ASS 的大小写不敏感语法
     for _font in fonts:
         for family in _font.familys:
-            if family not in font_sign__font:
-                font_sign__font[(family, _font.font_type)] = _font
+            family_lower__family[family.lower()] = family
+            font_sign__font[(family, _font.font_type)] = _font
 
     # 子集化映射
     font__subset_str: dict[Font, dict[str, str]] = {}
@@ -308,38 +310,51 @@ def subset(
                 case Font_type.Regular:
                     if (
                         (_k := (key[0], Font_type.Bold)) in font_sign__font
-                        or (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
                         or (_k := (key[0], Font_type.Italic)) in font_sign__font
+                        or (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
                     ):
                         _font = font_sign__font[_k]
 
                 case Font_type.Bold:
                     if (
-                        (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
-                        or (_k := (key[0], Font_type.Regular)) in font_sign__font
+                        (_k := (key[0], Font_type.Regular)) in font_sign__font
+                        or (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
                         or (_k := (key[0], Font_type.Italic)) in font_sign__font
                     ):
                         _font = font_sign__font[_k]
 
                 case Font_type.Italic:
-                    if (_k := (key[0], Font_type.Regular)) in font_sign__font or (
-                        _k := (key[0], Font_type.Bold)
-                    ) in font_sign__font:
+                    if (
+                        (_k := (key[0], Font_type.Regular)) in font_sign__font
+                        or (_k := (key[0], Font_type.Bold_Italic)) in font_sign__font
+                        or (_k := (key[0], Font_type.Bold)) in font_sign__font
+                    ):
                         _font = font_sign__font[_k]
 
                 case Font_type.Bold_Italic:
-                    if (_k := (key[0], Font_type.Bold)) in font_sign__font or (
-                        _k := (key[0], Font_type.Regular)
-                    ) in font_sign__font:
+                    if (
+                        (_k := (key[0], Font_type.Bold)) in font_sign__font
+                        or (_k := (key[0], Font_type.Italic)) in font_sign__font
+                        or (_k := (key[0], Font_type.Regular)) in font_sign__font
+                    ):
                         _font = font_sign__font[_k]
 
             # 模糊字重也找不到字体
             if _font is None:
-                log.error(
-                    "{} not found. Skip it",
-                    f"( {key[0]} / {key[1].name} )",
-                    deep=strict,
-                )
+                _want_font_sign_str = f"( {key[0]} / {key[1].name} )"
+                if (_f_low := key[0].lower()) in family_lower__family:
+                    log.error(
+                        "{} not found. Skip it. Perhaps you want the {}",
+                        _want_font_sign_str,
+                        f"'{family_lower__family[_f_low]}'",
+                        deep=strict,
+                    )
+                else:
+                    log.error(
+                        "{} not found. Skip it",
+                        _want_font_sign_str,
+                        deep=strict,
+                    )
                 return_res = False
                 continue
 

{easyrip-4.8.1 → easyrip-4.9.0}/easyrip.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyrip
-Version: 4.8.1
+Version: 4.9.0
 Author: op200
 License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/op200/EasyRip