Commit 85c5649c authored by Arnaud Legrand's avatar Arnaud Legrand

Typos and adapt to the recent video tutorials

parent 9db582b7
...@@ -4,71 +4,66 @@ ...@@ -4,71 +4,66 @@
<h2>Table of Contents</h2> <h2>Table of Contents</h2>
<div id="text-table-of-contents"> <div id="text-table-of-contents">
<ul style="margin:0 0;"> <ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#org409eed0">Installing emacs, org-mode, ess, and auctex.</a> <li style="margin-bottom:0;"><a href="#org8e60217">Installing emacs, org-mode, ess, and auctex.</a>
<ul style="margin:0 0;"> <ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#orgc77d6b9">OS-specific installation procedure</a> <li style="margin-bottom:0;"><a href="#org90ba83d">Linux (Debian, Ubuntu)</a></li>
<ul style="margin:0 0;"> <li style="margin-bottom:0;"><a href="#orgc1dd1e3">Mac OS X</a></li>
<li style="margin-bottom:0;"><a href="#orgc1fd040">Linux (Debian, Ubuntu)</a></li> <li style="margin-bottom:0;"><a href="#org62cb87b">Windows</a></li>
<li style="margin-bottom:0;"><a href="#orgb09ebaf">Mac OS X</a></li>
<li style="margin-bottom:0;"><a href="#org988b23d">Windows</a></li>
</ul> </ul>
</li> </li>
<li style="margin-bottom:0;"><a href="#orgd2fefe4"><span class="todo TODO">TODO</span> A simple "<i>reproducible research</i>" emacs configuration</a> <li style="margin-bottom:0;"><a href="#org71d5afd">A simple "<i>reproducible research</i>" emacs configuration</a>
<ul style="margin:0 0;"> <ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#orgd0d6712">Step 0: Backup and download our configuration</a></li> <li style="margin-bottom:0;"><a href="#org8c38e5f">Step 0: Backup and download our configuration</a></li>
<li style="margin-bottom:0;"><a href="#org96068ca">Step 1: Prepare your journal</a></li> <li style="margin-bottom:0;"><a href="#org5d0c52b">Step 1: Prepare your journal</a></li>
<li style="margin-bottom:0;"><a href="#orgdb3ee66">Step 2: Set up Emacs configuration</a></li> <li style="margin-bottom:0;"><a href="#org04abd1a">Step 2: Set up Emacs configuration</a></li>
<li style="margin-bottom:0;"><a href="#org5873b8e">Step 3: Check whether the installation is working or not</a></li> <li style="margin-bottom:0;"><a href="#org2ac8291">Step 3: Check whether the installation is working or not</a></li>
<li style="margin-bottom:0;"><a href="#org3914954">Step 4: Open and play with your journal:</a></li> <li style="margin-bottom:0;"><a href="#orgc0e8300">Step 4: Open and play with your journal:</a></li>
</ul>
</li>
<li style="margin-bottom:0;"><a href="#org25d2b3b"><span class="todo TODO">TODO</span> A stub of replicable article</a></li>
</ul> </ul>
</li> </li>
<li style="margin-bottom:0;"><a href="#org18244de">Emacs Tips and tricks</a> <li style="margin-bottom:0;"><a href="#orgec2f0d0">A stub of replicable article</a></li>
<li style="margin-bottom:0;"><a href="#orge37f27c">Emacs Tips and tricks</a>
<ul style="margin:0 0;"> <ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#org42e3c12">Cheat-sheets</a> <li style="margin-bottom:0;"><a href="#org3c808db">Cheat-sheets</a>
<ul style="margin:0 0;"> <ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#org4c20ffc">Emacs</a></li> <li style="margin-bottom:0;"><a href="#orgbbb0dee">Emacs</a></li>
<li style="margin-bottom:0;"><a href="#org1f247fa">Org-mode</a></li> <li style="margin-bottom:0;"><a href="#org35b96e8">Org-mode</a></li>
</ul> </ul>
</li> </li>
<li style="margin-bottom:0;"><a href="#orga987581">Video tutorials</a></li> <li style="margin-bottom:0;"><a href="#orgebb57d1">Video tutorials</a></li>
<li style="margin-bottom:0;"><a href="#org88591d9">Additional useful emacs packages</a> <li style="margin-bottom:0;"><a href="#org538c45f">Additional useful emacs packages</a>
<ul style="margin:0 0;"> <ul style="margin:0 0;">
<li style="margin-bottom:0;"><a href="#orgdbba0c2">Company-mode</a></li> <li style="margin-bottom:0;"><a href="#orga430a9e">Company-mode</a></li>
<li style="margin-bottom:0;"><a href="#orgdfa2dbe">Magit</a></li> <li style="margin-bottom:0;"><a href="#orga2a61a4">Magit</a></li>
</ul> </ul>
</li> </li>
<li style="margin-bottom:0;"><a href="#org1917d59">Other resources</a></li> <li style="margin-bottom:0;"><a href="#org7097ad4">Other resources</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<p> <p>
<b>Disclaimer:</b> The two sections <span class="underline">A simple "<i>reproducible research</i>" <b>Disclaimer:</b> The two sections <span class="underline">A simple "<i>reproducible research</i>" emacs
emacs configuration</span> and <span class="underline">A stub of replicable article</span> explain how to configuration</span> and <span class="underline">A stub of replicable article</span> explain how to set up
set up org-mode for this MOOC. <b>You really should follow them org-mode for this MOOC. <b>I have prepared two video tutorials (here and
carefully or you may have trouble doing the exercices later on</b>. here) for each, which you really should follow carefully</b>. <b>Otherwise,
you may have trouble doing the exercises later on</b>. Likewise, I
strongly encourage you to watch the "emacs and git" video tutorial.
</p> </p>
<p> <p>
The next sections provide information on how to install emacs. Before The next sections provide information on how to install emacs. Before
proceeding, make sure you have read the "Git and GitLab" instructions. proceeding, make sure you have read the "Git and GitLab" instructions
(tutorial and resources from the 4th sequence of the 2nd module).
</p> </p>
<div id="outline-container-org409eed0" class="outline-2"> <div id="outline-container-org8e60217" class="outline-2">
<h2 id="org409eed0">Installing emacs, org-mode, ess, and auctex.</h2> <h2 id="org8e60217">Installing emacs, org-mode, ess, and auctex.</h2>
<div class="outline-text-2" id="text-org409eed0"> <div class="outline-text-2" id="text-org8e60217">
</div>
<div id="outline-container-orgc77d6b9" class="outline-3">
<h3 id="orgc77d6b9">OS-specific installation procedure</h3>
<div class="outline-text-3" id="text-orgc77d6b9">
</div> </div>
<div id="outline-container-orgc1fd040" class="outline-4"> <div id="outline-container-org90ba83d" class="outline-3">
<h4 id="orgc1fd040">Linux (Debian, Ubuntu)</h4> <h3 id="org90ba83d">Linux (Debian, Ubuntu)</h3>
<div class="outline-text-4" id="text-orgc1fd040"> <div class="outline-text-3" id="text-org90ba83d">
<p> <p>
We provide here only instructions for debian-based distributions. Feel We provide here only instructions for debian-based distributions. Feel
free to contribute to this document to provide up-to-date information free to contribute to this document to provide up-to-date information
...@@ -130,9 +125,9 @@ which is now deprecated. ...@@ -130,9 +125,9 @@ which is now deprecated.
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-orgb09ebaf" class="outline-4"> <div id="outline-container-orgc1dd1e3" class="outline-3">
<h4 id="orgb09ebaf">Mac OS X</h4> <h3 id="orgc1dd1e3">Mac OS X</h3>
<div class="outline-text-4" id="text-orgb09ebaf"> <div class="outline-text-3" id="text-orgc1dd1e3">
<ul class="org-ul"> <ul class="org-ul">
<li style="margin-bottom:0;"><p> <li style="margin-bottom:0;"><p>
<b>Option 1</b>: Install the <code>.dmg</code> file from <a href="http://vgoulet.act.ulaval.ca/">Vincent Goulet</a>: <b>Option 1</b>: Install the <code>.dmg</code> file from <a href="http://vgoulet.act.ulaval.ca/">Vincent Goulet</a>:
...@@ -165,9 +160,9 @@ brew install wget ...@@ -165,9 +160,9 @@ brew install wget
</ul> </ul>
</div> </div>
</div> </div>
<div id="outline-container-org988b23d" class="outline-4"> <div id="outline-container-org62cb87b" class="outline-3">
<h4 id="org988b23d">Windows</h4> <h3 id="org62cb87b">Windows</h3>
<div class="outline-text-4" id="text-org988b23d"> <div class="outline-text-3" id="text-org62cb87b">
<p> <p>
Install the <code>.exe</code> file from <a href="http://vgoulet.act.ulaval.ca/">Vincent Goulet</a>: Install the <code>.exe</code> file from <a href="http://vgoulet.act.ulaval.ca/">Vincent Goulet</a>:
<a href="https://vigou3.github.io/emacs-modified-windows/">https://vigou3.github.io/emacs-modified-windows/</a>. It ships with recent <a href="https://vigou3.github.io/emacs-modified-windows/">https://vigou3.github.io/emacs-modified-windows/</a>. It ships with recent
...@@ -181,14 +176,13 @@ versions: ...@@ -181,14 +176,13 @@ versions:
</div> </div>
</div> </div>
</div> </div>
<div id="outline-container-orgd2fefe4" class="outline-3"> <div id="outline-container-org71d5afd" class="outline-2">
<h3 id="orgd2fefe4"><span class="todo TODO">TODO</span> A simple "<i>reproducible research</i>" emacs configuration</h3> <h2 id="org71d5afd">A simple "<i>reproducible research</i>" emacs configuration</h2>
<div class="outline-text-3" id="text-orgd2fefe4"> <div class="outline-text-2" id="text-org71d5afd">
<blockquote>
<p> <p>
There will be a mini video illustrating these steps at some point This section is illustrated in a video tutorial (in French). Watching
it before following the instructions given in this section may help.
</p> </p>
</blockquote>
<p> <p>
Emacs comes with very basic default configuration and it appears like Emacs comes with very basic default configuration and it appears like
...@@ -197,14 +191,14 @@ default Emacs configurations that reflect the preferences of their ...@@ -197,14 +191,14 @@ default Emacs configurations that reflect the preferences of their
creators. Likewise the configuration of Org-Mode is incredibly creators. Likewise the configuration of Org-Mode is incredibly
flexible (see for example <a href="https://orgmode.org/worg/org-configs/index.html">the org-mode website</a> for more flexible (see for example <a href="https://orgmode.org/worg/org-configs/index.html">the org-mode website</a> for more
references). In the context of this MOOC, we propose you a relatively references). In the context of this MOOC, we propose you a relatively
minimalistic one that is rather "<i>reproducible research</i>" oriented by minimalist one that is rather "<i>reproducible research</i>" oriented by
adding a few org-mode specific configurations. adding a few org-mode specific configurations.
</p> </p>
</div> </div>
<div id="outline-container-orgd0d6712" class="outline-4"> <div id="outline-container-org8c38e5f" class="outline-3">
<h4 id="orgd0d6712">Step 0: Backup and download our configuration</h4> <h3 id="org8c38e5f">Step 0: Backup and download our configuration</h3>
<div class="outline-text-4" id="text-orgd0d6712"> <div class="outline-text-3" id="text-org8c38e5f">
<p> <p>
The procedure we propose will wipe your already existing custom emacs The procedure we propose will wipe your already existing custom emacs
configuration if you already have one. <b>You should thus beforehand make configuration if you already have one. <b>You should thus beforehand make
...@@ -225,9 +219,9 @@ rr_org/journal.org ...@@ -225,9 +219,9 @@ rr_org/journal.org
</div> </div>
</div> </div>
<div id="outline-container-org96068ca" class="outline-4"> <div id="outline-container-org5d0c52b" class="outline-3">
<h4 id="org96068ca">Step 1: Prepare your journal</h4> <h3 id="org5d0c52b">Step 1: Prepare your journal</h3>
<div class="outline-text-4" id="text-org96068ca"> <div class="outline-text-3" id="text-org5d0c52b">
<p> <p>
Create an <code>org/</code> directory in the top of your home: Create an <code>org/</code> directory in the top of your home:
</p> </p>
...@@ -244,9 +238,9 @@ should give a try. ...@@ -244,9 +238,9 @@ should give a try.
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-orgdb3ee66" class="outline-4"> <div id="outline-container-org04abd1a" class="outline-3">
<h4 id="orgdb3ee66">Step 2: Set up Emacs configuration</h4> <h3 id="org04abd1a">Step 2: Set up Emacs configuration</h3>
<div class="outline-text-4" id="text-orgdb3ee66"> <div class="outline-text-3" id="text-org04abd1a">
<p> <p>
Copy <code>rr_org/init.el</code> in your <code>~/.emacs.d/</code> directory. Copy <code>rr_org/init.el</code> in your <code>~/.emacs.d/</code> directory.
</p> </p>
...@@ -258,9 +252,9 @@ configuration with the following command: <code>emacs -q -l rr_org/init.el</code ...@@ -258,9 +252,9 @@ configuration with the following command: <code>emacs -q -l rr_org/init.el</code
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-org5873b8e" class="outline-4"> <div id="outline-container-org2ac8291" class="outline-3">
<h4 id="org5873b8e">Step 3: Check whether the installation is working or not</h4> <h3 id="org2ac8291">Step 3: Check whether the installation is working or not</h3>
<div class="outline-text-4" id="text-org5873b8e"> <div class="outline-text-3" id="text-org2ac8291">
<p> <p>
Open a new instance of Emacs and open a <code>foo.org</code> file. Copy the Open a new instance of Emacs and open a <code>foo.org</code> file. Copy the
following lines in this file: following lines in this file:
...@@ -291,9 +285,9 @@ is demonstrated in the <a href="https://app-learninglab.inria.fr/gitlab/learning ...@@ -291,9 +285,9 @@ is demonstrated in the <a href="https://app-learninglab.inria.fr/gitlab/learning
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-org3914954" class="outline-4"> <div id="outline-container-orgc0e8300" class="outline-3">
<h4 id="org3914954">Step 4: Open and play with your journal:</h4> <h3 id="orgc0e8300">Step 4: Open and play with your journal:</h3>
<div class="outline-text-4" id="text-org3914954"> <div class="outline-text-3" id="text-orgc0e8300">
<p> <p>
In step 1, you were told to create an journal in In step 1, you were told to create an journal in
<code>~org/journal.org</code>. First you probably want to make sure this file is <code>~org/journal.org</code>. First you probably want to make sure this file is
...@@ -304,14 +298,13 @@ forums. ...@@ -304,14 +298,13 @@ forums.
</div> </div>
</div> </div>
</div> </div>
<div id="outline-container-org25d2b3b" class="outline-3"> <div id="outline-container-orgec2f0d0" class="outline-2">
<h3 id="org25d2b3b"><span class="todo TODO">TODO</span> A stub of replicable article</h3> <h2 id="orgec2f0d0">A stub of replicable article</h2>
<div class="outline-text-3" id="text-org25d2b3b"> <div class="outline-text-2" id="text-orgec2f0d0">
<blockquote>
<p> <p>
There will be a mini video illustrating these steps at some point This section is illustrated in a video tutorial (in French). Watching
it before following the instructions given in this section may help.
</p> </p>
</blockquote>
<p> <p>
Remember, you need a working LaTeX and R environment. If you can't Remember, you need a working LaTeX and R environment. If you can't
...@@ -323,7 +316,7 @@ source (<a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-re ...@@ -323,7 +316,7 @@ source (<a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-re
</p> </p>
<p> <p>
Download the following <a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/raw/master/module2/ressources/replicable_article/replicable_article.tgz">archive</a>, untar it and simply <code>make</code> to generate the Download the following <a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/raw/master/module2/ressources/replicable_article/replicable_article.tgz">archive</a>, uncompress it and simply <code>make</code> to generate the
article. You should then be able to open the <a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/replicable_article/article.pdf">resulting article</a>. This article. You should then be able to open the <a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/replicable_article/article.pdf">resulting article</a>. This
is summarized in the following command: is summarized in the following command:
</p> </p>
...@@ -356,7 +349,7 @@ command line to load your personal emacs configuration.</li> ...@@ -356,7 +349,7 @@ command line to load your personal emacs configuration.</li>
</ul> </ul>
<p> <p>
Finally, when you'll be tired of always reexecuting all the source Finally, when you'll be tired of always re-executing all the source
code when exporting, just look for the following line in <a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/replicable_article/article.org">article.org</a>: code when exporting, just look for the following line in <a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/replicable_article/article.org">article.org</a>:
</p> </p>
<pre style="padding-left: 30px; background-color: #f6f8fa;" class="example"> <pre style="padding-left: 30px; background-color: #f6f8fa;" class="example">
...@@ -369,24 +362,23 @@ chunk of code when exporting. ...@@ -369,24 +362,23 @@ chunk of code when exporting.
</p> </p>
</div> </div>
</div> </div>
</div>
<div id="outline-container-org18244de" class="outline-2"> <div id="outline-container-orge37f27c" class="outline-2">
<h2 id="org18244de">Emacs Tips and tricks</h2> <h2 id="orge37f27c">Emacs Tips and tricks</h2>
<div class="outline-text-2" id="text-org18244de"> <div class="outline-text-2" id="text-orge37f27c">
</div> </div>
<div id="outline-container-org42e3c12" class="outline-3"> <div id="outline-container-org3c808db" class="outline-3">
<h3 id="org42e3c12">Cheat-sheets</h3> <h3 id="org3c808db">Cheat-sheets</h3>
<div class="outline-text-3" id="text-org42e3c12"> <div class="outline-text-3" id="text-org3c808db">
<p> <p>
Learning emacs and org-mode can be difficult as there is an inordinate Learning emacs and org-mode can be difficult as there is an inordinate
amount of shortcuts. Many people have thus come up with amount of shortcuts. Many people have thus come up with
cheat-sheats. Here is a selection in case it helps: cheat-sheats. Here is a selection in case it helps:
</p> </p>
</div> </div>
<div id="outline-container-org4c20ffc" class="outline-4"> <div id="outline-container-orgbbb0dee" class="outline-4">
<h4 id="org4c20ffc">Emacs</h4> <h4 id="orgbbb0dee">Emacs</h4>
<div class="outline-text-4" id="text-org4c20ffc"> <div class="outline-text-4" id="text-orgbbb0dee">
<ul class="org-ul"> <ul class="org-ul">
<li style="margin-bottom:0;"><a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/rr_org/journal.org">Common and step-by-step emacs shortcuts for our <i>reproducible research</i> configuration</a></li> <li style="margin-bottom:0;"><a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/rr_org/journal.org">Common and step-by-step emacs shortcuts for our <i>reproducible research</i> configuration</a></li>
<li style="margin-bottom:0;"><a href="https://www.gnu.org/software/emacs/refcards/pdf/refcard.pdf">The official GNU emacs refcard</a></li> <li style="margin-bottom:0;"><a href="https://www.gnu.org/software/emacs/refcards/pdf/refcard.pdf">The official GNU emacs refcard</a></li>
...@@ -395,9 +387,9 @@ cheat-sheats. Here is a selection in case it helps: ...@@ -395,9 +387,9 @@ cheat-sheats. Here is a selection in case it helps:
</ul> </ul>
</div> </div>
</div> </div>
<div id="outline-container-org1f247fa" class="outline-4"> <div id="outline-container-org35b96e8" class="outline-4">
<h4 id="org1f247fa">Org-mode</h4> <h4 id="org35b96e8">Org-mode</h4>
<div class="outline-text-4" id="text-org1f247fa"> <div class="outline-text-4" id="text-org35b96e8">
<ul class="org-ul"> <ul class="org-ul">
<li style="margin-bottom:0;"><a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/rr_org/journal.org">Common and step-by-step org-mode shortcuts for our <i>reproducible research</i> configuration</a></li> <li style="margin-bottom:0;"><a href="https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/rr_org/journal.org">Common and step-by-step org-mode shortcuts for our <i>reproducible research</i> configuration</a></li>
<li style="margin-bottom:0;"><a href="https://orgmode.org/worg/orgcard.html">The official org-mode refcard</a></li> <li style="margin-bottom:0;"><a href="https://orgmode.org/worg/orgcard.html">The official org-mode refcard</a></li>
...@@ -406,35 +398,40 @@ cheat-sheats. Here is a selection in case it helps: ...@@ -406,35 +398,40 @@ cheat-sheats. Here is a selection in case it helps:
</div> </div>
</div> </div>
</div> </div>
<div id="outline-container-orga987581" class="outline-3"> <div id="outline-container-orgebb57d1" class="outline-3">
<h3 id="orga987581">Video tutorials</h3> <h3 id="orgebb57d1">Video tutorials</h3>
<div class="outline-text-3" id="text-orga987581"> <div class="outline-text-3" id="text-orgebb57d1">
<p> <p>
For those of you who prefer video explanations, here is a <a href="https://www.youtube.com/playlist?list=PL9KxKa8NpFxIcNQa9js7dQQIHc81b0-Xg">Youtube For those of you who prefer video explanations, here is a <a href="https://www.youtube.com/playlist?list=PL9KxKa8NpFxIcNQa9js7dQQIHc81b0-Xg">Youtube
channel with many step by step emacs tutorials</a>. channel with many step by step emacs tutorials</a>.
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-org88591d9" class="outline-3"> <div id="outline-container-org538c45f" class="outline-3">
<h3 id="org88591d9">Additional useful emacs packages</h3> <h3 id="org538c45f">Additional useful emacs packages</h3>
<div class="outline-text-3" id="text-org88591d9"> <div class="outline-text-3" id="text-org538c45f">
</div> </div>
<div id="outline-container-orgdbba0c2" class="outline-4"> <div id="outline-container-orga430a9e" class="outline-4">
<h4 id="orgdbba0c2">Company-mode</h4> <h4 id="orga430a9e">Company-mode</h4>
<div class="outline-text-4" id="text-orgdbba0c2"> <div class="outline-text-4" id="text-orga430a9e">
<p> <p>
<a href="http://company-mode.github.io/">Company-mode</a> is a text completion framework for Emacs. It allows to <a href="http://company-mode.github.io/">Company-mode</a> is a text completion framework for Emacs. It allows to
have smart completion in emacs for the most common languages. If you have smart completion in emacs for the most common languages. If you
feel this is needed, you should follow the instructions from the feel this is needed, you should follow the instructions from the
official webpage: <a href="http://company-mode.github.io/">http://company-mode.github.io/</a> official Web page: <a href="http://company-mode.github.io/">http://company-mode.github.io/</a>
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-orgdfa2dbe" class="outline-4"> <div id="outline-container-orga2a61a4" class="outline-4">
<h4 id="orgdfa2dbe">Magit</h4> <h4 id="orga2a61a4">Magit</h4>
<div class="outline-text-4" id="text-orgdfa2dbe"> <div class="outline-text-4" id="text-orga2a61a4">
<p>
Magit]] is an emacs interface for Git. It is briefly illustrated in a
video tutorial.
</p>
<p> <p>
<a href="https://magit.vc/">Magit</a> is an emacs interface for Git. It is very powerfull and we use It is very powerful and we use
it on a daily basis but you should definitely understand what git does it on a daily basis but you should definitely understand what git does
behind the scene beforehand. If you feel this would be useful for you, behind the scene beforehand. If you feel this would be useful for you,
you should follow the instructions from here: you should follow the instructions from here:
...@@ -445,9 +442,9 @@ magit by using <code>C-x g</code>. ...@@ -445,9 +442,9 @@ magit by using <code>C-x g</code>.
</div> </div>
</div> </div>
</div> </div>
<div id="outline-container-org1917d59" class="outline-3"> <div id="outline-container-org7097ad4" class="outline-3">
<h3 id="org1917d59">Other resources</h3> <h3 id="org7097ad4">Other resources</h3>
<div class="outline-text-3" id="text-org1917d59"> <div class="outline-text-3" id="text-org7097ad4">
<ul class="org-ul"> <ul class="org-ul">
<li style="margin-bottom:0;"><a href="https://orgmode.org/orgguide.pdf">The compact Org-mode Guide</a></li> <li style="margin-bottom:0;"><a href="https://orgmode.org/orgguide.pdf">The compact Org-mode Guide</a></li>
<li style="margin-bottom:0;"><a href="https://github.com/dfeich/org-babel-examples">Many examples illustrating the use of different languages in org-mode</a></li> <li style="margin-bottom:0;"><a href="https://github.com/dfeich/org-babel-examples">Many examples illustrating the use of different languages in org-mode</a></li>
......
...@@ -6,17 +6,19 @@ ...@@ -6,17 +6,19 @@
#+OPTIONS: num:nil toc:t #+OPTIONS: num:nil toc:t
#+PROPERTY: header-args :eval never-export #+PROPERTY: header-args :eval never-export
*Disclaimer:* The two sections _A simple "/reproducible research/" *Disclaimer:* The two sections _A simple "/reproducible research/" emacs
emacs configuration_ and _A stub of replicable article_ explain how to configuration_ and _A stub of replicable article_ explain how to set up
set up org-mode for this MOOC. *You really should follow them org-mode for this MOOC. *I have prepared two video tutorials (here and
carefully or you may have trouble doing the exercices later on*. here) for each, which you really should follow carefully*. *Otherwise,
you may have trouble doing the exercises later on*. Likewise, I
strongly encourage you to watch the "emacs and git" video tutorial.
The next sections provide information on how to install emacs. Before The next sections provide information on how to install emacs. Before
proceeding, make sure you have read the "Git and GitLab" instructions. proceeding, make sure you have read the "Git and GitLab" instructions
(tutorial and resources from the 4th sequence of the 2nd module).
* Installing emacs, org-mode, ess, and auctex. * Installing emacs, org-mode, ess, and auctex.
** OS-specific installation procedure ** Linux (Debian, Ubuntu)
*** Linux (Debian, Ubuntu)
We provide here only instructions for debian-based distributions. Feel We provide here only instructions for debian-based distributions. Feel
free to contribute to this document to provide up-to-date information free to contribute to this document to provide up-to-date information
for other distributions (e.g.n redhat, fedora). for other distributions (e.g.n redhat, fedora).
...@@ -53,7 +55,7 @@ emacs -batch --funcall "org-version" 2>&1 | grep version ...@@ -53,7 +55,7 @@ emacs -batch --funcall "org-version" 2>&1 | grep version
The version numbers you get will depend on the distribution you are The version numbers you get will depend on the distribution you are
running. _You really want to make sure you do not rely on org-mode 8_, running. _You really want to make sure you do not rely on org-mode 8_,
which is now deprecated. which is now deprecated.
*** Mac OS X ** Mac OS X
- *Option 1*: Install the =.dmg= file from [[http://vgoulet.act.ulaval.ca/][Vincent Goulet]]: - *Option 1*: Install the =.dmg= file from [[http://vgoulet.act.ulaval.ca/][Vincent Goulet]]:
https://vigou3.github.io/emacs-modified-macos/. It ships with recent https://vigou3.github.io/emacs-modified-macos/. It ships with recent
versions: versions:
...@@ -73,17 +75,16 @@ which is now deprecated. ...@@ -73,17 +75,16 @@ which is now deprecated.
brew install auctex # The name may be slightly more complicated here brew install auctex # The name may be slightly more complicated here
brew install wget brew install wget
#+end_src #+end_src
*** Windows ** Windows
Install the =.exe= file from [[http://vgoulet.act.ulaval.ca/][Vincent Goulet]]: Install the =.exe= file from [[http://vgoulet.act.ulaval.ca/][Vincent Goulet]]:
https://vigou3.github.io/emacs-modified-windows/. It ships with recent https://vigou3.github.io/emacs-modified-windows/. It ships with recent
versions: versions:
- Emacs 26.1 - Emacs 26.1
- Org-mode 9.1.13 - Org-mode 9.1.13
- ESS 17.11 - ESS 17.11
** TODO A simple "/reproducible research/" emacs configuration * A simple "/reproducible research/" emacs configuration
#+BEGIN_QUOTE This section is illustrated in a video tutorial (in French). Watching
There will be a mini video illustrating these steps at some point it before following the instructions given in this section may help.
#+END_QUOTE
Emacs comes with very basic default configuration and it appears like Emacs comes with very basic default configuration and it appears like
everyone has its own taste. You will for example find [[https://www.emacswiki.org/emacs/StarterKits][here]] several everyone has its own taste. You will for example find [[https://www.emacswiki.org/emacs/StarterKits][here]] several
...@@ -91,10 +92,10 @@ default Emacs configurations that reflect the preferences of their ...@@ -91,10 +92,10 @@ default Emacs configurations that reflect the preferences of their
creators. Likewise the configuration of Org-Mode is incredibly creators. Likewise the configuration of Org-Mode is incredibly
flexible (see for example [[https://orgmode.org/worg/org-configs/index.html][the org-mode website]] for more flexible (see for example [[https://orgmode.org/worg/org-configs/index.html][the org-mode website]] for more
references). In the context of this MOOC, we propose you a relatively references). In the context of this MOOC, we propose you a relatively
minimalistic one that is rather "/reproducible research/" oriented by minimalist one that is rather "/reproducible research/" oriented by
adding a few org-mode specific configurations. adding a few org-mode specific configurations.
*** Step 0: Backup and download our configuration ** Step 0: Backup and download our configuration
The procedure we propose will wipe your already existing custom emacs The procedure we propose will wipe your already existing custom emacs
configuration if you already have one. *You should thus beforehand make configuration if you already have one. *You should thus beforehand make
a backup of =~/.emacs= and of =~/.emacs.d/init.el=* (if these file a backup of =~/.emacs= and of =~/.emacs.d/init.el=* (if these file
...@@ -117,7 +118,7 @@ tar tzf rr_org_archive.tgz ...@@ -117,7 +118,7 @@ tar tzf rr_org_archive.tgz
: rr_org/init.el : rr_org/init.el
: rr_org/journal.org : rr_org/journal.org
*** Step 1: Prepare your journal ** Step 1: Prepare your journal
Create an =org/= directory in the top of your home: Create an =org/= directory in the top of your home:
#+begin_src sh :results output :exports both #+begin_src sh :results output :exports both
mkdir -p ~/org/ mkdir -p ~/org/
...@@ -127,13 +128,13 @@ file will be your laboratory notebook and all the notes you will ...@@ -127,13 +128,13 @@ file will be your laboratory notebook and all the notes you will
capture with =C-c c= will go automatically go in this file. The first capture with =C-c c= will go automatically go in this file. The first
entry of this notebook is populated with [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/rr_org/journal.org][many emacs shortcuts]] that you entry of this notebook is populated with [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/rr_org/journal.org][many emacs shortcuts]] that you
should give a try. should give a try.
*** Step 2: Set up Emacs configuration ** Step 2: Set up Emacs configuration
Copy =rr_org/init.el= in your =~/.emacs.d/= directory. Copy =rr_org/init.el= in your =~/.emacs.d/= directory.
Alternatively, if you do not want to mess with your already existing Alternatively, if you do not want to mess with your already existing
emacs configuration, you may launch emacs with this specific emacs configuration, you may launch emacs with this specific
configuration with the following command: =emacs -q -l rr_org/init.el=. configuration with the following command: =emacs -q -l rr_org/init.el=.
*** Step 3: Check whether the installation is working or not ** Step 3: Check whether the installation is working or not
Open a new instance of Emacs and open a =foo.org= file. Copy the Open a new instance of Emacs and open a =foo.org= file. Copy the
following lines in this file: following lines in this file:
: #+begin_src shell :session foo :results output :exports both : #+begin_src shell :session foo :results output :exports both
...@@ -151,16 +152,15 @@ In the video, we already have demonstrated the main features and ...@@ -151,16 +152,15 @@ In the video, we already have demonstrated the main features and
shortcuts of emacs/org-mode that will help you maintain a document and shortcuts of emacs/org-mode that will help you maintain a document and
benefit from literate programming. The list of features and shortcuts benefit from literate programming. The list of features and shortcuts
is demonstrated in the [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/rr_org/journal.org][first entry of your labbook]]. is demonstrated in the [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/rr_org/journal.org][first entry of your labbook]].
*** Step 4: Open and play with your journal: ** Step 4: Open and play with your journal:
In step 1, you were told to create an journal in In step 1, you were told to create an journal in
=~org/journal.org=. First you probably want to make sure this file is =~org/journal.org=. First you probably want to make sure this file is
backed up in a revision control system like git. We leave it up to set backed up in a revision control system like git. We leave it up to set
this up but if you have any trouble, feel free to ask on the FUN this up but if you have any trouble, feel free to ask on the FUN
forums. forums.
** TODO A stub of replicable article * A stub of replicable article
#+BEGIN_QUOTE This section is illustrated in a video tutorial (in French). Watching
There will be a mini video illustrating these steps at some point it before following the instructions given in this section may help.
#+END_QUOTE
Remember, you need a working LaTeX and R environment. If you can't Remember, you need a working LaTeX and R environment. If you can't
open a terminal and run the commands =R=, =pdflatex=, and =python=, you will not be open a terminal and run the commands =R=, =pdflatex=, and =python=, you will not be
...@@ -175,7 +175,7 @@ make -C replicable_article/ all replicable_article.tgz ...@@ -175,7 +175,7 @@ make -C replicable_article/ all replicable_article.tgz
#+RESULTS: #+RESULTS:
Download the following [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/raw/master/module2/ressources/replicable_article/replicable_article.tgz][archive]], untar it and simply =make= to generate the Download the following [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/raw/master/module2/ressources/replicable_article/replicable_article.tgz][archive]], uncompress it and simply =make= to generate the
article. You should then be able to open the [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/replicable_article/article.pdf][resulting article]]. This article. You should then be able to open the [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/replicable_article/article.pdf][resulting article]]. This
is summarized in the following command: is summarized in the following command:
#+begin_src sh :results output :exports both #+begin_src sh :results output :exports both
...@@ -196,7 +196,7 @@ tar zxf replicable.tgz; cd replicable; make ; evince article.pdf ...@@ -196,7 +196,7 @@ tar zxf replicable.tgz; cd replicable; make ; evince article.pdf
system-wide. In that case, try to remove the =-q= in the previous system-wide. In that case, try to remove the =-q= in the previous
command line to load your personal emacs configuration. command line to load your personal emacs configuration.
Finally, when you'll be tired of always reexecuting all the source Finally, when you'll be tired of always re-executing all the source
code when exporting, just look for the following line in [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/replicable_article/article.org][article.org]]: code when exporting, just look for the following line in [[https://app-learninglab.inria.fr/gitlab/learning-lab/mooc-rr-ressources/blob/master/module2/ressources/replicable_article/article.org][article.org]]:
#+BEGIN_EXAMPLE #+BEGIN_EXAMPLE
# #+PROPERTY: header-args :eval never-export # #+PROPERTY: header-args :eval never-export
...@@ -227,9 +227,12 @@ channel with many step by step emacs tutorials]]. ...@@ -227,9 +227,12 @@ channel with many step by step emacs tutorials]].
[[http://company-mode.github.io/][Company-mode]] is a text completion framework for Emacs. It allows to [[http://company-mode.github.io/][Company-mode]] is a text completion framework for Emacs. It allows to
have smart completion in emacs for the most common languages. If you have smart completion in emacs for the most common languages. If you
feel this is needed, you should follow the instructions from the feel this is needed, you should follow the instructions from the
official webpage: http://company-mode.github.io/ official Web page: http://company-mode.github.io/
*** Magit *** Magit
[[https://magit.vc/][Magit]] is an emacs interface for Git. It is very powerfull and we use Magit]] is an emacs interface for Git. It is briefly illustrated in a
video tutorial.
It is very powerful and we use
it on a daily basis but you should definitely understand what git does it on a daily basis but you should definitely understand what git does
behind the scene beforehand. If you feel this would be useful for you, behind the scene beforehand. If you feel this would be useful for you,
you should follow the instructions from here: you should follow the instructions from here:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment