emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/hyperbole 93a36a6e28 2/7: Update Markdown to HTML conve


From: ELPA Syncer
Subject: [elpa] externals/hyperbole 93a36a6e28 2/7: Update Markdown to HTML converter used in Makefile
Date: Sun, 13 Mar 2022 11:57:36 -0400 (EDT)

branch: externals/hyperbole
commit 93a36a6e28d22bf209d9d495f2a65ef3b36fb8dc
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Update Markdown to HTML converter used in Makefile
---
 ChangeLog           | 22 ++++++++++++++++++++++
 Makefile            | 17 +++++++++++++----
 hypb-maintenance.el |  6 ++++--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a688ececb..ead11db835 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
+2022-03-12  Bob Weiner  <rsw@gnu.org>
+
+* man/hyperbole.texi (Implicit Button Types): In org-mode description, use 
@smallexample instead
+    of @group which was showing the markup in the Info file.
+
 2022-02-27  Bob Weiner  <rsw@gnu.org>
 
+* hyrolo.el (hyrolo-map-level-1): Remove unused parameters and rename to 
'hyrolo-map-single-subtree'.
+
+* hpath.el (hpath:at-p): If find a PATH variable value, call hpath:is-p on the 
path
+    selected (normalizes it) before returning.  Ensures parameters 'type' and 
'non-exist'
+    are respected in this case.  Also, test if individual path exists without 
requiring
+    three or more separated directories prior to doing this test.
+  test/hmouse-drv-tests.el 
(hbut-pathname-path-variable-with-two-colons-is-one-file-test):
+    Change to 'hbut-pathname-path-variable-with-two-colons-a-path-test'
+    and make 'should' instead of 'should not'.
+  test/hpath-tests.el (hpath:path-at-point-in-path-variable-test): Fix to call
+    'hpath:at-p' with non-exist flag true.
+
+* Makefile (README.md.html): Switch to use 'md2html' instead of 
'github-markdown' due
+    to problems with local link ids not being generated properly.  Also, this 
simplifies
+    from an npm library with many dependencies to a quick Python program.  Add 
GNU sed
+    calls to fix case-sensitivity and URL encode char problems in anchor IDs.
+
 * FAST-DEMO:
   hycontrol.el (hycontrol-windows-grid-marked-items): Add.
                (hycontrol-make-windows-grid): Use above function so can 
automatically
diff --git a/Makefile b/Makefile
index b4ffe0e59c..e1db4aca7f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:     19-Feb-22 at 10:43:51 by Mats Lidell
+# Last-Mod:     27-Feb-22 at 12:51:17 by Bob Weiner
 #
 # Copyright (C) 1994-2021  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -343,10 +343,19 @@ pdf: $(man_dir)/hyperbole.pdf
 $(man_dir)/hyperbole.pdf: $(TEXINFO_SRC)
        cd $(man_dir) && $(TEXI2PDF) hyperbole.texi
 
-# github-markdown is an npm, installed with: npm install markdown-to-html -g
-#   Documentation is here: https://www.npmjs.com/package/markdown-to-html
+# md2html is a Python package that comes from the md2html-phuker repo on 
github.
+#   Documentation is here: https://github.com/Phuker/md2html
+#   Need the GNU sed call below because md2html generates ids with the wrong 
case and leaves URL encoded chars in ids.
+#   To test links in the generated html:
+#     Run a Python directory web browser in this directory: python -m 
http.server 8000
+#     Open the page in a web browser:                       
http://localhost:8000/README.md.html
+#
+# Used to use github-markdown is an npm, installed with: npm install 
markdown-to-html -g
+#   But then it's links broke.  Documentation is here: 
https://www.npmjs.com/package/markdown-to-html
+#      github-markdown README.md > README.md.html
 README.md.html: README.md
-       github-markdown README.md > README.md.html
+       md2html README.md -f -o - | sed - -e 
's/\(id="[^%]*\)\(%[A-Z0-9][A-Z0-9]\)/\1/g' -e 's/\(id="[^"]*"\)/\L\1/g' > 
README.md.html
+       md2html README.md -f -o README.md.html
 
 # Generate a Hyperbole package suitable for distribution via the Emacs package 
manager.
 pkg: package
diff --git a/hypb-maintenance.el b/hypb-maintenance.el
index 43a6cd093f..6eecec78c5 100644
--- a/hypb-maintenance.el
+++ b/hypb-maintenance.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    31-Mar-21 at 21:11:00
-;; Last-Mod:     12-Feb-22 at 14:09:43 by Bob Weiner
+;; Last-Mod:     27-Feb-22 at 10:14:34 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -85,7 +85,9 @@ Point `hypb:web-repo-location' to where the web repo is 
located."
   (kexport:html "kotl/EXAMPLE.kotl" (concat hypb:web-repo-location 
"koutline-example.html") nil)
  
   ;; HY-WHY.html
-  (kexport:html "HY-WHY.kotl" (concat hypb:web-repo-location "HY-WHY.html") 
nil))
+  (kexport:html "HY-WHY.kotl" (concat hypb:web-repo-location "HY-WHY.html") 
nil)
+
+  (message "Local copy of Hyperbole webside updated successfully."))
 
 (provide 'hypb-maintenance)
 ;;; hypb-maintenance.el ends here



reply via email to

[Prev in Thread] Current Thread [Next in Thread]