Remove all html generated files (from the 1st edition) and automate org -> markdown generation

548469b4 · Arnaud Legrand · a5fc7359 · 548469b4 · 548469b4 · 548469b4
Commit 548469b4 authored Feb 19, 2019 by Arnaud Legrand
18 changed files
--- a/Makefile
+++ b/Makefile
+ressources-md:
+	for i in module1/ressources module2/ressources module3/ressources \
+	    module4/ressources; do \
+	     make -C $$i; \
+	done
--- a/Makefile.ressources
+++ b/Makefile.ressources
+%.md: %.org
+	pandoc -f org -t markdown_github -o $@ $^
+# %.html: %.org
+# 	emacs -batch $^  --funcall org-html-export-to-html
+# 	sed -i -e 's/<pre /<pre style="padding-left: 30px; background-color: #f6f8fa;" /g' \
+# 	       -e 's/<li>/<li style="margin-bottom:0;">/g' \
+# 	       -e 's/<ul>/<ul style="margin:0 0;">/g' $@
+# 	mv $@ $@.bak
+# 	html_png_inliner.pl < $@.bak | grep -A $(NLINES) -e '<body>' | grep -B $(NLINES) -e '<div id="postamble" class="status">' | grep -v -e '<body>' -e '<div id="postamble" class="status">' > $@
+# 	rm $@.bak
+clean:
+	rm -f *~
--- a/module2/ressources/html_png_inliner.pl
+++ b/module2/ressources/html_png_inliner.pl
--- a/module1/ressources/Makefile
+++ b/module1/ressources/Makefile
-all: introduction_to_markdown.html
+all: introduction_to_markdown.md
+include ../../Makefile.ressources
-NLINES=10000000
-%.html: %.org
-	emacs -batch $^  --funcall org-html-export-to-html
-	sed -i -e 's/<pre /<pre style="padding-left: 30px; background-color: #f6f8fa;" /g' \
-	       -e 's/<li>/<li style="margin-bottom:0;">/g' \
-	       -e 's/<ul>/<ul style="margin:0 0;">/g' $@
-	mv $@ $@.bak
-	cat $@.bak | grep -A $(NLINES) -e '<body>' | grep -B $(NLINES) -e '<div id="postamble" class="status">' | grep -v -e '<body>' -e '<div id="postamble" class="status">' > $@
-	rm $@.bak
--- a/module1/ressources/introduction_to_markdown.html
+++ b/module1/ressources/introduction_to_markdown.html
--- a/module2/ressources/Makefile
+++ b/module2/ressources/Makefile
-all: gitlab.html emacs_orgmode.html  jupyter.html  rstudio.html maintaining_a_journal.html
+all: emacs_orgmode.md jupyter.md  maintaining_a_journal.md  gitlab.md gitlab_fr.md rstudio.md rstudio_fr.md video_examples/README.md
-NLINES=10000000
+include ../../Makefile.ressources
-%.html: %.org
-	emacs -batch $^  --funcall org-html-export-to-html
-	sed -i -e 's/<pre /<pre style="padding-left: 30px; background-color: #f6f8fa;" /g' \
-	       -e 's/<li>/<li style="margin-bottom:0;">/g' \
-	       -e 's/<ul>/<ul style="margin:0 0;">/g' $@
-	mv $@ $@.bak
-	html_png_inliner.pl < $@.bak | grep -A $(NLINES) -e '<body>' | grep -B $(NLINES) -e '<div id="postamble" class="status">' | grep -v -e '<body>' -e '<div id="postamble" class="status">' > $@
-	rm $@.bak
-clean:
-	rm -f *~
--- a/module2/ressources/emacs_orgmode.html
+++ b/module2/ressources/emacs_orgmode.html
--- a/module2/ressources/gitlab.html
+++ b/module2/ressources/gitlab.html
--- a/module2/ressources/jupyter.html
+++ b/module2/ressources/jupyter.html
--- a/module2/ressources/maintaining_a_journal.html
+++ b/module2/ressources/maintaining_a_journal.html
--- a/module2/ressources/rstudio.html
+++ b/module2/ressources/rstudio.html
--- a/module3/ressources/Makefile
+++ b/module3/ressources/Makefile
+all:
+include ../../Makefile.ressources
--- a/module4/ressources/Makefile
+++ b/module4/ressources/Makefile
-all: resources_refs.html resources_environment.html exo1.html exo2.html exo3.html
+all: resources_refs.md resources_environment.md resources_refs_fr.md resources_environment_fr.md # exo1.html exo2.html exo3.html
-NLINES=10000000
+include ../../Makefile.ressources
-%.html: %.org
-	emacs -batch $^  --funcall org-html-export-to-html
-	sed -i -e 's/<pre /<pre style="padding-left: 30px; background-color: #f6f8fa;" /g' \
-	       -e 's/<li>/<li style="margin-bottom:0;">/g' \
-	       -e 's/<ul>/<ul style="margin:0 0;">/g' $@
-	mv $@ $@.bak
-	html_png_inliner.pl < $@.bak | grep -A $(NLINES) -e '<body>' | grep -B $(NLINES) -e '<div id="postamble" class="status">' | grep -v -e '<body>' -e '<div id="postamble" class="status">' > $@
-	rm $@.bak
-clean:
-	rm -f *~
--- a/module4/ressources/html_png_inliner.pl
+++ b/module4/ressources/html_png_inliner.pl
-#!/usr/bin/perl -w
-use strict;
-my($line);
-while(defined($line=<STDIN>)) {
-     if($line =~ /^(.*)<img *src="([^"]*)"(.*)$/g) {
-        my($pre,$image,$post) = ($1,$2,$3);
-	$image =~ s|file://||;
-#        print "$image\n";
-        my $base64=`base64 -w 0 $image`;
-        my $format=$image;
-        $format =~ s/.*\.//g;
-        print $pre."<img src=\"data:image/$format;base64,".$base64.'"'.$post;
-     } else {
-        print $line;
-     }
-}
--- a/module4/ressources/resources_environment.html
+++ b/module4/ressources/resources_environment.html
--- a/module4/ressources/resources_environment.org
+++ b/module4/ressources/resources_environment.org
@@ -6,6 +6,19 @@
 #+OPTIONS: num:nil toc:t
 #+PROPERTY: header-args :eval never-export
+* Table of Contents                                                     :TOC:
+- [[#getting-information-about-your-git-repository][Getting information about your Git repository]]
+- [[#getting-information-about-python3-libraries][Getting information about Python(3) libraries]]
+  - [[#getting-information-about-your-system][Getting information about your system]]
+  - [[#getting-the-list-of-installed-packages-and-their-version][Getting the list of installed packages and their version]]
+  - [[#how-to-list-imported-modules][How to list imported modules?]]
+  - [[#saving-and-restoring-an-environment-with-pip][Saving and restoring an environment with pip]]
+  - [[#installing-a-new-package-or-a-specific-version][Installing a new package or a specific version]]
+- [[#getting-information-about-r-libraries][Getting information about R libraries]]
+  - [[#getting-the-list-imported-modules-and-their-version][Getting the list imported modules and their version]]
+  - [[#getting-the-list-of-installed-packages-and-their-version-1][Getting the list of installed packages and their version]]
+  - [[#installing-a-new-package-or-a-specific-version-1][Installing a new package or a specific version]]
 * Getting information about your Git repository
 When taking notes, it may be difficult to remember which version of
 the code or of a file was used. This is what version control is useful

--- a/module4/ressources/resources_environment_fr.org
+++ b/module4/ressources/resources_environment_fr.org
@@ -6,10 +6,18 @@
 #+OPTIONS: num:nil toc:t
 #+PROPERTY: header-args :eval never-export
-* Table des matières
+* Table des matières                                                    :TOC:
- Obtenir des informations sur votre dépôt Git
+- [[#obtenir-des-informations-sur-votre-dépôt-git][Obtenir des informations sur votre dépôt Git]]
- Obtenir des informations sur les librairies Python 3
+- [[#obtenir-des-informations-sur-les-librairies-python-3][Obtenir des informations sur les librairies Python 3]]
- Obtenir des informations sur les packages R
+  - [[#obtenir-des-informations-sur-votre-système][Obtenir des informations sur votre système]]
+  - [[#lister-les-packages-installés-et-leur-version][Lister les packages installés et leur version]]
+  - [[#lister-les-packages-importés-chargés-dans-une-session-python-et-leur-version][Lister les packages importés (chargés dans une session Python) et leur version]]
+  - [[#sauvegarder-et-restaurer-un-environnement-avec-pip][Sauvegarder et restaurer un environnement avec pip]]
+  - [[#installer-un-nouveau-package-ou-une-version-spécifique][Installer un nouveau package ou une version spécifique]]
+- [[#obtenir-des-informations-sur-les-packages-r][Obtenir des informations sur les packages R]]
+  - [[#lister-les-packages-installés-et-leur-version-1][Lister les packages installés et leur version]]
+  - [[#lister-les-packages-importés-chargés-dans-une-session-r-et-leur-version][Lister les packages importés (chargés dans une session R) et leur version]]
+  - [[#installer-un-nouveau-package-ou-une-version-spécifique-1][Installer un nouveau package ou une version spécifique]]
 * Obtenir des informations sur votre dépôt Git
 Lorsqu'on prend des notes, il peut être difficile de se rappeler

--- a/module4/ressources/resources_refs.html
+++ b/module4/ressources/resources_refs.html