branch: externals/eev
commit a9b89db6e37a43f320f5abcb611dee2b7e4b1a0a
Author: Eduardo Ochs <eduardoo...@gmail.com>
Commit: Eduardo Ochs <eduardoo...@gmail.com>
Added docs for eepitch-vterm.
---
ChangeLog | 7 +++++++
VERSION | 4 ++--
eepitch.el | 18 +++++++++++++++++-
eev-intro.el | 31 +++++++++++++++++++++++++------
eev-rstdoc.el | 17 +++++++++++++----
5 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5e18d93a9b..11786b31bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-08-25 Eduardo Ochs <eduardoo...@gmail.com>
+
+ * eev-intro.el (find-eepitch-intro): added the section "2.6.
+ `find-vtermprocess'".
+
+ * eepitch.el (eepitch-isympy): new function.
+
2022-08-20 Eduardo Ochs <eduardoo...@gmail.com>
* eev-intro.el (find-video-links-intro): rewrote the section "5.1.
diff --git a/VERSION b/VERSION
index 3b6c983bd7..ee4bfab44e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sat Aug 20 05:37:56 GMT 2022
-Sat Aug 20 02:37:56 -03 2022
+Fri Aug 26 08:42:36 GMT 2022
+Fri Aug 26 05:42:36 -03 2022
diff --git a/eepitch.el b/eepitch.el
index 288b794a28..79e5b5fa14 100644
--- a/eepitch.el
+++ b/eepitch.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20220801
+;; Version: 20220825
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eepitch.el>
@@ -51,6 +51,7 @@
;; «.eepitch-sly» (to "eepitch-sly")
;;
;; «.eepitch-langs» (to "eepitch-langs")
+;; «.eepitch-langs-vterm» (to "eepitch-langs-vterm")
;;; Commentary:
@@ -1057,6 +1058,21 @@ The arguments are explained here:
(defun eepitch-pacmd () (interactive) (eepitch-comint "pacmd" "pacmd"))
+;; «eepitch-langs-vterm» (to ".eepitch-langs-vterm")
+;; See: (find-eepitch-intro "2.6. `find-vtermprocess'")
+;;
+(defun eepitch-isympy () (interactive) (eepitch-vterm "isympy3" "isympy3"))
+;;
+;; If you want to redefine the `eepitch-<lang>'s below to make them
+;; use vterm instead of comint, then copy the block below to your
+;; ~/.emacs, deleting the initial ";;"s:
+;;
+;; ;; See: (find-eev "eepitch.el" "eepitch-langs-vterm")
+;; (defun eepitch-shell () (interactive) (eepitch-vterm nil "shell"))
+;; (defun eepitch-shell2 () (interactive) (eepitch-vterm nil "shell 2"))
+;; (defun eepitch-shell3 () (interactive) (eepitch-vterm nil "shell 3"))
+;; (defun eepitch-julia () (interactive) (eepitch-vterm "julia" "julia"))
+;; (defun eepitch-nodejs () (interactive) (eepitch-vterm "nodejs" "nodejs"))
diff --git a/eev-intro.el b/eev-intro.el
index 3f2252211a..7ca953b8ab 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20220820
+;; Version: 20220825
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-intro.el>
@@ -954,7 +954,8 @@ print(open(\"/tmp/o\").read())
It is possible to display all the targets at the same time,
using advanced features that are explained here:
- (find-multiwindow-intro \"find-3EE\")
+ (find-multiwindow-intro \"4. Several eepitch targets\")
+ (find-multiwindow-intro \"7. Eepitch blocks for two targets\")
Here is a demo:
@@ -6118,7 +6119,9 @@ The sexp
switches to a buffer called \"*buffer name*\" and if that buffer
does not have an associated process then it runs \"program and
-args\" there in comint mode.
+args\" there in comint mode. Comint is explained here:
+
+ (find-enode \"Shell Mode\")
The sexp
@@ -6137,6 +6140,25 @@ Most `eepitch-<lang>' functions are defined using
+2.6. `find-vtermprocess'
+------------------------
+Some programs don't run well inside comint buffers, but run well
+inside other terminal emulators that are harder to set up but
+that handle more escape sequences, like vterm:
+
+ https://github.com/akermu/emacs-libvterm
+
+Most `eepitch-<lang>' functions are defined using
+`eepitch-comint' and `find-comintprocess'; the `eepitch-<lang>'
+functions that need vterm are defined using `eepitch-vterm' and
+`find-vtermprocess'. See:
+
+ (find-eev \"eepitch.el\" \"other-terms\")
+ (find-eev \"eepitch.el\" \"eepitch-langs-vterm\")
+
+
+
+
3. Test blocks
==============
@@ -11532,9 +11554,6 @@ The local copy will be played with Mpv, with:
5.1. Subtitles
--------------
-[NOTE: The support for subtitles was added
-in may/2022, and it's a work in progress]
-
Some of the videos in
http://angg.twu.net/eev-videos/
diff --git a/eev-rstdoc.el b/eev-rstdoc.el
index 3d3f3740a2..9a2cceabc8 100644
--- a/eev-rstdoc.el
+++ b/eev-rstdoc.el
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs <eduardoo...@gmail.com>
;; Maintainer: Eduardo Ochs <eduardoo...@gmail.com>
-;; Version: 20220818
+;; Version: 20220826
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-rstdoc.el>
@@ -249,6 +249,7 @@
(find-html :initarg :find-html)
(find-rst :initarg :find-rst)
(find-web :initarg :find-web)
+ (c :initarg :c)
(kill :initarg :kill)
))
@@ -304,6 +305,8 @@
(find-html (slot-value rd 'find-html))
(find-web (slot-value rd 'find-web))
(find-rst (slot-value rd 'find-rst))
+ (base-rst (slot-value rd 'base-rst))
+ (c (slot-value rd 'c))
(kill (slot-value rd 'kill))
)
(ee-template0 "\
@@ -325,6 +328,8 @@ This function uses {name} to transform STR.\"
This function uses {name} to transform STR.\"
(apply 'find-fline (ee-rstdoc-rst {name} str) rest))
+(code-c-d \"{c}r\" \"{base-rst}\")
+
(defun {kill} ()
\"Put on the kill ring a sexp hyperlink to the rstdoc at point.
This function uses {name} to shrink the rstdoc at point
@@ -338,7 +343,7 @@ and to convert it into a sexp.\"
(setq ee-rstdoc-python
(ee-rstdoc
:name 'ee-rstdoc-python
- :res '("#.*$" "\\?.*$" ".html$" ".rst.txt$" "^file://"
+ :res '("#.*$" "\\?.*$" ".html$" ".txt$" ".rst$" "^file://"
"^https://docs.python.org/3/";
"^/usr/share/doc/python[0-9.]*-doc/html/"
"^/usr/share/doc/python3-doc/html/"
@@ -349,14 +354,16 @@ and to convert it into a sexp.\"
:find-html 'find-pydoc
:find-rst 'find-pydocr
:find-web 'find-pydocw
+ :c "pydoc"
:kill 'pdk
))
(setq ee-rstdoc-sympy
(ee-rstdoc
:name 'ee-rstdoc-sympy
- :res '("#.*$" "\\?.*$" ".html$" ".rst.txt$" "^file://"
+ :res '("#.*$" "\\?.*$" ".html$" ".txt$" ".rst$" "^file://"
"^https?:/"
"^/usr/share/doc/python-sympy-doc/html/"
+ "^/docs.sympy.org/[0-9.]+/"
"^/docs.sympy.org/latest/")
:base-html "file:///usr/share/doc/python-sympy-doc/html/"
:base-rst "/usr/share/doc/python-sympy-doc/html/_sources/"
@@ -364,13 +371,14 @@ and to convert it into a sexp.\"
:find-html 'find-sympydoc
:find-rst 'find-sympydocr
:find-web 'find-sympydocw
+ :c "sympydoc"
:kill 'sdk
))
(setq ee-rstdoc-matplotlib
(ee-rstdoc
:name 'ee-rstdoc-matplotlib
- :res '("#.*$" "\\?.*$" ".html$" ".rst.txt$" "^file://"
+ :res '("#.*$" "\\?.*$" ".html$" ".txt$" ".rst$" "^file://"
"^/usr/share/doc/python-matplotlib-doc/html/"
"^/docs.matplotlib.org/latest/")
:base-html "file:///usr/share/doc/python-matplotlib-doc/html/"
@@ -379,6 +387,7 @@ and to convert it into a sexp.\"
:find-html 'find-mpldoc
:find-rst 'find-mpldocr
:find-web 'find-mpldocw
+ :c "rstdoc"
:kill 'mdk
))
