psdparse 0.2.1__tar.gz → 0.2.2__tar.gz

{psdparse-0.2.1 → psdparse-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: psdparse
-Version: 0.2.1
+Version: 0.2.2
 Summary: Fast PSD (Photoshop) reader/writer — C++17 core with pybind11 bindings
 Keywords: psd,photoshop,parser,image,graphics
 Author-Email: wamsoft <wtnbgo@gmail.com>

{psdparse-0.2.1 → psdparse-0.2.2}/psdparse/psddata.h

@@ -414,14 +414,23 @@ namespace psd {
         tracking(0), kerning(0), autoKerning(false), sizeInherited(false) {}
   };
 
+  // 段落単位の情報 (EngineDict/ParagraphRun)。 段落は本文中の改行 (\r) 区切り。
+  struct TextParagraph {
+    int length;          // 段落の文字数 (UTF-16 コードユニット, RunLengthArray)
+    int justification;   // 行揃え 0=左 1=右 2=中央 (3..=両端揃え系)
+
+    TextParagraph() : length(0), justification(0) {}
+  };
+
   // テキストレイヤ情報 (追加レイヤ情報 'TySh' 由来)。
   struct TextLayerData {
     bool        present;         // テキストレイヤとしてパースできたか
     u16str      text;            // 本文全体 (改行は \r)
     double      transform[6];    // アフィン変換 xx,xy,yx,yy,tx,ty
     std::string orientation;     // "horizontal" / "vertical"
-    int         justification;   // 段落の行揃え 0=左 1=右 2=中央 (先頭段落)
+    int         justification;   // 段落の行揃え 0=左 1=右 2=中央 (先頭段落; 後方互換)
     std::vector<TextStyleRun> runs;
+    std::vector<TextParagraph> paragraphs;  // 段落別 (行揃えが段落で変わる box text 用)
 
     TextLayerData()
       : present(false), transform{1,0,0,1,0,0},

{psdparse-0.2.1 → psdparse-0.2.2}/psdparse/psdengine.cpp

@@ -289,12 +289,23 @@ namespace {
         }
       }
 
-      // 行揃え (先頭段落の Justification)
-      Node *paraArr = dget(dget(engine, "ParagraphRun"), "RunArray");
+      // 段落別の行揃え (ParagraphRun)。 out.justification は先頭段落 (後方互換)、
+      // out.paragraphs に全段落分 (length + justification) を格納する。
+      Node *paraRun = dget(engine, "ParagraphRun");
+      Node *paraArr = dget(paraRun, "RunArray");
+      Node *paraLen = dget(paraRun, "RunLengthArray");
       if (paraArr && paraArr->kind == Node::ARRAY && !paraArr->arr.empty()) {
-        Node *props = dget(dget(paraArr->arr[0], "ParagraphSheet"), "Properties");
-        Node *just  = dget(props, "Justification");
-        if (just && just->kind == Node::NUMBER) out.justification = (int)just->num;
+        for (size_t i = 0; i < paraArr->arr.size(); i++) {
+          TextParagraph p;
+          if (paraLen && paraLen->kind == Node::ARRAY && i < paraLen->arr.size() &&
+              paraLen->arr[i]->kind == Node::NUMBER)
+            p.length = (int)paraLen->arr[i]->num;
+          Node *props = dget(dget(paraArr->arr[i], "ParagraphSheet"), "Properties");
+          Node *just  = dget(props, "Justification");
+          if (just && just->kind == Node::NUMBER) p.justification = (int)just->num;
+          out.paragraphs.push_back(p);
+        }
+        out.justification = out.paragraphs[0].justification;  // 後方互換
       }
     }
 

{psdparse-0.2.1 → psdparse-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "psdparse"
-version = "0.2.1"
+version = "0.2.2"
 description = "Fast PSD (Photoshop) reader/writer — C++17 core with pybind11 bindings"
 readme = "README.md"
 requires-python = ">=3.9"

{psdparse-0.2.1 → psdparse-0.2.2}/python/psdparse_module.cpp

@@ -63,6 +63,14 @@ py::object layerText(const psd::LayerInfo &l) {
     runs.append(rd);
   }
   d["runs"] = runs;
+  py::list paras;
+  for (const auto &p : t.paragraphs) {
+    py::dict pd;
+    pd["length"]        = p.length;          // UTF-16 code units
+    pd["justification"] = p.justification;   // 0=left 1=right 2=center
+    paras.append(pd);
+  }
+  d["paragraphs"] = paras;                    // 段落別行揃え (段落=改行区切り)
   return std::move(d);
 }