pyhtml2md 1.6.4__tar.gz → 1.6.6__tar.gz

{pyhtml2md-1.6.4 → pyhtml2md-1.6.6}/.github/workflows/wheels.yml

@@ -23,9 +23,9 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
+        name: dist-sdist
         path: dist/*.tar.gz
 
-
   build_wheels:
     name: Wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -51,9 +51,8 @@ jobs:
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
+        name: dist-${{ matrix.os }}
         path: wheelhouse/*.whl
-        name: ${{ matrix.os }}
-
 
   upload_all:
     name: Upload wheels
@@ -63,8 +62,9 @@ jobs:
     steps:
     - uses: actions/download-artifact@v4
       with:
-        name: artifact
         path: dist
+        pattern: dist-*
+        merge-multiple: true
 
     - uses: pypa/gh-action-pypi-publish@v1.9.0
       with:

pyhtml2md-1.6.6/.gitignore

@@ -0,0 +1,21 @@
+*.user*
+build-linux/
+build-windows/
+build-wasm/
+doc/
+tests/error.log
+conan/
+build/
+dist/
+pyhtml2md.egg-info/
+*.whl
+wheelhouse/
+tests/__pycache__/
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

{pyhtml2md-1.6.4 → pyhtml2md-1.6.6}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 [TOC]
 
+## 1.6.6
+- Python: Fix wheels not uploaded
+
+## 1.6.5
+- Fix handling of `<br>` tags
+
 ## 1.6.4
 - Fix handling of `<br>` tags outside of paragraphs (`<p>`)
 

{pyhtml2md-1.6.4 → pyhtml2md-1.6.6}/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.8)
-project(html2md VERSION 1.6.4 LANGUAGES CXX)
+project(html2md VERSION 1.6.6 LANGUAGES CXX)
 
 set(PROJECT_HOMEPAGE_URL "https://tim-gromeyer.github.io/html2md/")
 set(html2md_HOMEPAGE_URL "${PROJECT_HOMEPAGE_URL}")

{pyhtml2md-1.6.4 → pyhtml2md-1.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhtml2md
-Version: 1.6.4
+Version: 1.6.6
 Summary: Transform your HTML into clean, easy-to-read markdown with pyhtml2md.
 Keywords: html,markdown,html-to-markdown,python3,cpp17,cpp-library,html2markdown,html2md
 Author-Email: Tim Gromeyer <sakul8826@gmail.com>

pyhtml2md-1.6.6/Package.swift

@@ -0,0 +1,40 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "html2md",
+    products: [
+        .library(name: "html2md", targets: ["html2md"]),
+    ],
+    targets: [
+        .target(
+            name: "html2md",
+            dependencies: ["html2md_cpp"],
+            path: ".",
+            sources: [
+                "objc/html2md_objc.mm",
+            ],
+            publicHeadersPath: "objc/include",
+            cxxSettings: [
+                // header is inherited from html2md_cpp
+                // we should compile this objc file with c++11
+                .unsafeFlags(["-std=c++11"]),
+            ]
+        ),
+        .target(
+            name: "html2md_cpp",
+            path: ".",
+            sources: [
+                "src/html2md.cpp",
+                "src/table.cpp",
+            ],
+            publicHeadersPath: "include",
+            cxxSettings: [
+                .unsafeFlags(["-std=c++11"]),
+                .unsafeFlags(["-Wno-parentheses", "-Wno-conversion"]),
+            ]
+        ),
+    ]
+)

{pyhtml2md-1.6.4 → pyhtml2md-1.6.6}/include/html2md.h

@@ -357,8 +357,8 @@ private:
 
   // tags that are not printed (nav, script, noscript, ...)
   struct TagIgnored : Tag {
-    void OnHasLeftOpeningTag(Converter *c) override{};
-    void OnHasLeftClosingTag(Converter *c) override{};
+    void OnHasLeftOpeningTag(Converter *c) override {};
+    void OnHasLeftClosingTag(Converter *c) override {};
   };
 
   struct TagAnchor : Tag {

pyhtml2md-1.6.6/objc/html2md_objc.mm

@@ -0,0 +1,24 @@
+//
+//  html2md.m
+//  html2md
+//
+//  Created by 秋星桥 on 2/17/25.
+//
+
+#import <Foundation/Foundation.h>
+
+#include "html2md.h"
+#include "include/html2md_objc.h"
+
+#include <string>
+
+@implementation HTML2MD
+
++ (NSString *)convertHTMLToMarkdown:(NSString *)html {
+    const char *htmlStr = [html UTF8String];
+    std::string outputMarkdown = html2md::Convert(htmlStr);
+    NSString *markdownStr = [NSString stringWithUTF8String:outputMarkdown.c_str()];
+    return markdownStr;
+}
+
+@end

pyhtml2md-1.6.6/objc/include/html2md_objc.h

@@ -0,0 +1,19 @@
+//
+//  Header.h
+//  html2md
+//
+//  Created by 秋星桥 on 2/17/25.
+//
+
+#ifndef html2md_objc_h
+#define html2md_objc_h
+
+#include <Foundation/Foundation.h>
+
+@interface HTML2MD : NSObject
+
++ (NSString *)convertHTMLToMarkdown:(NSString *)html;
+
+@end
+
+#endif /* html2md_objc_h */

{pyhtml2md-1.6.4 → pyhtml2md-1.6.6}/pyproject.toml

@@ -11,7 +11,7 @@ description = "Transform your HTML into clean, easy-to-read markdown with pyhtml
 readme = "python/README.md"
 requires-python = ">=3.7"
 license = { text = "MIT" }
-version = "1.6.4"
+version = "1.6.6"
 classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",

{pyhtml2md-1.6.4 → pyhtml2md-1.6.6}/src/html2md.cpp

@@ -186,8 +186,7 @@ Converter *Converter::appendToMd(char ch) {
   return this;
 }
 
-Converter *Converter::appendToMd(const char *str)
-{
+Converter *Converter::appendToMd(const char *str) {
   if (IsInIgnoredTag())
     return this;
 
@@ -442,7 +441,11 @@ bool Converter::OnHasLeftTag() {
     if (TagContainsAttributesToHide(&current_tag_))
       return true;
 
-  current_tag_ = Split(current_tag_, ' ')[0];
+  auto cut_tags = Split(current_tag_, ' ');
+  if (cut_tags.empty())
+    return true;
+
+  current_tag_ = cut_tags[0];
 
   auto tag = tags_[current_tag_];
 
@@ -620,9 +623,7 @@ void Converter::TagBreak::OnHasLeftOpeningTag(Converter *c) {
     c->appendToMd(Repeat("  ", c->index_li));
   } else if (c->is_in_table_) {
     c->appendToMd("<br>");
-  } else if (!c->is_in_p_ && !c->prev_tag_.empty()) {
-    c->appendToMd("\n<br>\n\n");
-  } else if (c->md_.length() > 0)
+  } else if (!c->md_.empty())
     c->appendToMd("  \n");
 }
 

{pyhtml2md-1.6.4 → pyhtml2md-1.6.6}/src/table.cpp

@@ -67,6 +67,10 @@ string formatMarkdownTable(const string &inputTable) {
     }
   }
 
+  if (tableData.empty()) { 
+    return ""; 
+  }
+
   // Determine maximum width of each column
   vector<size_t> columnWidths(tableData[0].size(), 0);
   for (const auto &row : tableData) {

pyhtml2md-1.6.4/.gitignore

@@ -1,13 +0,0 @@
-*.user*
-build-linux/
-build-windows/
-build-wasm/
-doc/
-tests/error.log
-conan/
-build/
-dist/
-pyhtml2md.egg-info/
-*.whl
-wheelhouse/
-tests/__pycache__/