[elpa] externals/eev e9a277a 17/20: Rewrote the beginning of `(find-videos-intro)'.

[Stefan Monnier]

branch: externals/eev
commit e9a277a0b94cdabcd2fdf345f6515e78dbc073b5
Author: Eduardo Ochs <eduardoochs@gmail.com>
Commit: Eduardo Ochs <eduardoochs@gmail.com>

    Rewrote the beginning of `(find-videos-intro)'.
---
 ChangeLog     |  8 +++++++
 VERSION       |  4 ++--
 eev-intro.el  | 72 +++++++++++++++++++++++++++++++++++++++++++++--------------
 eev-tlinks.el | 23 ++++++++++++++-----
 4 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16a7498..8bdb019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-01-02  Eduardo Ochs  <eduardoochs@gmail.com>
+
+       * eev-intro.el (find-videos-intro): rewrote the beginning.
+
+2021-01-01  Eduardo Ochs  <eduardoochs@gmail.com>
+
+       * eev-tlinks.el (ee-psnevideo-links): cosmetic changes.
+
 2020-12-31  Eduardo Ochs  <eduardoochs@gmail.com>
 
        * eev-hlinks.el (ee-epackage-re-27): new variable.
diff --git a/VERSION b/VERSION
index a65ec60..9a95afe 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Fri Jan  1 02:36:32 GMT 2021
-Thu Dec 31 23:36:32 -03 2020
+Sat Jan  2 03:24:08 GMT 2021
+Sat Jan  2 00:24:08 -03 2021
diff --git a/eev-intro.el b/eev-intro.el
index 991e928..9b90dff 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author:     Eduardo Ochs <eduardoochs@gmail.com>
 ;; Maintainer: Eduardo Ochs <eduardoochs@gmail.com>
-;; Version:    2020dec31
+;; Version:    2021jan02
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: <http://angg.twu.net/eev-current/eev-intro.el>
@@ -7948,7 +7948,7 @@ uses eev I record the video, upload it to
 http://angg.twu.net/eev-videos/ - not to youtube - and send to
 the person a pair of sexps like these:
 
-  (code-eevvideo \"eevnav\" \"M-x-list-packages-eev-nav\")
+  (code-eevvideo \"eevnav\" \"M-x-list-packages-eev-nav\" \"kxBjiUo88_U\")
   (find-eevnavvideo \"0:00\")
 
 
@@ -9729,35 +9729,73 @@ This intro is being rewritten.
 Prerequisites:
   (find-psne-intro)
   (find-audiovideo-intro)
+  (find-audiovideo-intro \"4. Short hyperlinks to audio and video files\")
   (find-audiovideo-intro \"7. `code-psnevideo'\")
   (find-audiovideo-intro \"7.1. `code-eevvideo'\")
 
 
 
-At this moment I have these two videos about eev that I consider
-really good,
 
-  http://angg.twu.net/emacsconf2019.html
-  http://angg.twu.net/emacsconf2020.html
 
-and these three that I think that are decent:
+At this moment I have these five videos about eev (not counting
+the ones that I consider obsolete):
+
+  \"How to record executable notes with eev - and how to play them back\":
+    http://angg.twu.net/emacsconf2019.html
+    http://angg.twu.net/emacsconf2019.html#code-video
+    http://angg.twu.net/eev-videos/emacsconf2019.mp4
+    http://www.youtube.com/watch?v=86yiRG8YJD0
+
+  \"On why most of the best features in eev look like 5-minute hacks\":
+    http://angg.twu.net/emacsconf2020.html
+    http://angg.twu.net/emacsconf2020.html#code-video
+    http://angg.twu.net/eev-videos/emacsconf2020.mp4
+    http://www.youtube.com/watch?v=hOAqBc42Gg8
+
+  \"How to install eev with M-x list-packages and how to navigate its 
tutorials\":
+    http://angg.twu.net/2020-list-packages-eev-nav.html
+    http://angg.twu.net/2020-list-packages-eev-nav.html#code-video
+    http://angg.twu.net/eev-videos/M-x-list-packages-eev-nav.mp4
+    http://www.youtube.com/watch?v=kxBjiUo88_U
+
+  \"Some template-based functions of eev that are not five-minute hacks\":
+    http://angg.twu.net/2020-some-template-based.html
+    http://angg.twu.net/2020-some-template-based.html#code-video
+    http://angg.twu.net/eev-videos/2020_some_template-based_functions.mp4
+    http://www.youtube.com/watch?v=91-9YfRPsuk
+
+  \"How to create hyperlinks to \"here\" with `find-here-links'\":
+    http://angg.twu.net/2020-find-here-links.html
+    http://angg.twu.net/2020-find-here-links.html#code-video
+    http://angg.twu.net/eev-videos/2020-find-here-links.mp4
+    http://www.youtube.com/watch?v=8jtiBlaDor4
+
+The ones that I prepared for the two EmacsConfs are very
+well-rehearsed, the other ones are not.
+
+The best way to watch them is by downloading local copies of
+their .mp4s and then using the short hyperlinks of
+
+  (find-audiovideo-intro \"4. Short hyperlinks to audio and video files\")
+
+to jump to positions in them. You can do this with these sexps:
 
-  http://angg.twu.net/2020-list-packages-eev-nav.html (very basic)
-  http://angg.twu.net/2020-find-here-links.html       (intermediate)
-  http://angg.twu.net/2020-some-template-based.html   (advanced)
+  (find-eevvideo-links \"eev2019\" \"emacsconf2019\" \"86yiRG8YJD0\")
+  (find-eevvideo-links \"eev2020\" \"emacsconf2020\" \"hOAqBc42Gg8\")
+  (find-eevvideo-links \"eevnav\" \"2020-list-packages-eev-nav\" 
\"kxBjiUo88_U\")
+  (find-eevvideo-links \"2020sometbf\" \"2020-some-template-based\" 
\"91-9YfRPsuk\")
+  (find-eevvideo-links \"2020findherelinks\" \"2020-find-here-links\" 
\"8jtiBlaDor4\")
 
-Their pages at http://angg.twu.net/ have links to:
+The links with #code-video, like
 
-  1. The .mp4 file of each video (small and very good quality),
+  http://angg.twu.net/emacsconf2019.html#code-video
 
-  2. The youtube page of the video (worse quality: the videos
-     there are blurry at some points),
+point to indexes of the videos made with sexp hyperlinks.
 
-  3. How to download the .mp4 and play it with eev, including
-     an \"index\" of each video made with sexps.
 
 
-TO DO: REWRITE THIS INTRO!
+TO DO: 1) make a video about `find-eevvideo-links' and friends,
+2) rewrite most of this intro!
 Everything below this point is very old.
 
 
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 1441dde..49c517c 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -1465,20 +1465,29 @@ echo     
'http://angg.twu.net/eev-videos/{anggstem}.mp4' >> ~/.psne.log
          (dir (file-name-directory fname))
         (youtubeurl (format "http://www.youtube.com/watch?v=%s"; youtubeid))
         (youtubetime (or (ee-time-to-youtube-time time) ""))
+        (argtime (if (ee-time-to-youtube-time time)
+                     (format " \"%s\"" time)
+                   ""))
         )
     (concat
      (ee-template0 "\
-# (find-video \"{fname}\" \"{time}\")
-# (find-video \"{fname}\")
+# (find-video \"{fname}\"{argtime})
 
+# (find-audiovideo-intro \"7. `code-psnevideo'\" \"second line\")
+# (find-audiovideo-intro \"7. `code-psnevideo'\" \"redefine\")
 # (code-video \"{c}video\" \"{fname}\")
-# (find-{c}video \"{time}\")
+# (find-{c}video{argtime})
 
-# {url}
+# URL, local file, and a link to the directory of the local file:
+#               {url}
+#              {fname}
 # (find-fline \"{dir}\")
 
+# Youtube:
 # (kill-new \"{youtubeurl}{youtubetime}\")
-# {youtubeurl}{youtubetime}
+#            {youtubeurl}{youtubetime}
+
+# (find-audiovideo-intro \"7. `code-psnevideo'\" \"last part\")
 
 ") (ee-psnevideo-download-if-needed url))))
 
@@ -1583,7 +1592,9 @@ echo     '{url}' >> ~/.psne.log
   (ee-template0 "\
 ;; (find-code-eevvideo \"{c}\" \"{stem}\" \"{youtubeid}\")
 ;;      (code-eevvideo \"{c}\" \"{stem}\" \"{youtubeid}\")
-;;                 (find-{c}video \"0:00\")
+;;                (find-{c}video \"0:00\")
+;;
+;; See: (find-audiovideo-intro \"7.1. `code-eevvideo'\")
 
 (defun find-{c}video (&optional time &rest rest)
   (find-eevvideo-links \"{c}\" \"{stem}\" \"{youtubeid}\" time))