Merge pull request #10 from rpspringuel/master

Some fixes
gregorio-project · Aug 22, 2015 · 68dfb1c · 68dfb1c
2 parents f532d5e + 5fc0ac7
commit 68dfb1c
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 8 deletions.
diff --git a/examples/benedictiones-small.zip b/examples/benedictiones-small.zip
diff --git a/examples/benedictiones.pdf b/examples/benedictiones.pdf
diff --git a/examples/benedictiones.zip b/examples/benedictiones.zip
diff --git a/examples/benedictionessmall.pdf b/examples/benedictionessmall.pdf
diff --git a/examples/complies.pdf b/examples/complies.pdf
diff --git a/examples/complies.zip b/examples/complies.zip
diff --git a/examples/laudes.pdf b/examples/laudes.pdf
diff --git a/examples/laudes.zip b/examples/laudes.zip
diff --git a/gregorio-history.html b/gregorio-history.html
@@ -67,7 +67,7 @@ <h1>History of the Gregorio project</h1>
 
 <h1>The logo</h1>
 
-<p>The icon is part of a picture from a <a href="http://download.gna.org/gregorio/pdf/Graduel_Pr%c3%a9montr%c3%a9s_(1910).pdf" title="">Gradual of the Premonstratensian order</a> dated 1910. It represents  <a href="http://en.wikipedia.org/wiki/David" title="">King David</a>. It is available in PNG (<a href="/illus/logo.png" title="Icon of Gregorio">logo.png</a>) or SVG (<a href="/illus/logo.svg" title="Icon of Gregorio">logo.svg</a>) image format.</p>
+<p>The icon is part of a picture from a <a href="/pdf/Graduel_Pr%c3%a9montr%c3%a9s_(1910).pdf" title="">Gradual of the Premonstratensian order</a> dated 1910. It represents  <a href="http://en.wikipedia.org/wiki/David" title="">King David</a>. It is available in PNG (<a href="/illus/logo.png" title="Icon of Gregorio">logo.png</a>) or SVG (<a href="/illus/logo.svg" title="Icon of Gregorio">logo.svg</a>) image format.</p>
 
 <div style="text-align: center;"><img src="/illus/logo.png" alt="Icon of Gregorio" title="Icon of Gregorio"/></div>
 

diff --git a/gregoriotex/example.html b/gregoriotex/example.html
@@ -63,13 +63,13 @@ <h1>GregorioTeX Examples</h1>
 
 <p>These examples have been produced with non-free fonts, so you probably won't be able to compile the source code: you'll need to adapt it.</p>
 
-<p>The <a href="http://download.gna.org/gregorio/examples/laudes.pdf" title="">first example</a>, the smallest, is a chant sung during Adoration (<a href="http://download.gna.org/gregorio/examples/laudes.zip" title="">sources</a>).</p>
+<p>The <a href="../examples/laudes.pdf" title="">first example</a>, the smallest, is a chant sung during Adoration (<a href="../examples/laudes.zip" title="">sources</a>).</p>
 
-<p>The <a href="http://download.gna.org/gregorio/examples/complies.pdf" title="">second</a> does not contain scores. It is the Benedictine office of Compline in latin, with the French translation (<a href="http://download.gna.org/gregorio/examples/complies.zip" title="">sources</a>).</p>
+<p>The <a href="../examples/complies.pdf" title="">second</a> does not contain scores. It is the Benedictine office of Compline in latin, with the French translation (<a href="../examples/complies.zip" title="">sources</a>).</p>
 
-<p>The <a href="http://download.gna.org/gregorio/examples/benedictionessmall.pdf" title="">third</a> is a small sheet for guests in monasteries to remember the blessings at meals (<a href="http://download.gna.org/gregorio/examples/benedictiones-small.zip" title="">sources</a>).</p>
+<p>The <a href="../examples/benedictionessmall.pdf" title="">third</a> is a small sheet for guests in monasteries to remember the blessings at meals (<a href="../examples/benedictiones-small.zip" title="">sources</a>).</p>
 
-<p>And the <a href="http://download.gna.org/gregorio/examples/benedictiones.pdf" title="">fourth</a> is the entire book of the blessing of meals in the monastery in Norcia, entirely in Latin. It is very complete and contains a lot of scores (<a href="http://download.gna.org/gregorio/examples/benedictiones.zip" title="">sources</a>).</p>
+<p>And the <a href="../examples/benedictiones.pdf" title="">fourth</a> is the entire book of the blessing of meals in the monastery in Norcia, entirely in Latin. It is very complete and contains a lot of scores (<a href="../examples/benedictiones.zip" title="">sources</a>).</p>
 
 <p>As you can see, it is possible to obtain professional results with TeX and GregorioTeX. None of these scores has taken me more than 3 minutes (with the debug) to write, so Gregorio is really a fast software to use.</p>
 

diff --git a/gregoriotex/index.html b/gregoriotex/index.html
@@ -56,7 +56,7 @@
 </script>
 <h1>GregorioTeX</h1>
 
-<p>This page describes quickly the origin and the construction of GregorioTeX. You can also take a look at the <a href="/introduction.html">GregorioTeX introduction page</a> or at the <a href="details.html">GregorioTeX detailed description page</a>. If it is the first time you are dealing with TeX, I advise you to take a look at the <a href="tex.html">TeX page</a>.</p>
+<p>This page describes quickly the origin and the construction of GregorioTeX. You can also take a look at the <a href="introduction.html">GregorioTeX introduction page</a> or at the <a href="details.html">GregorioTeX detailed description page</a>. If it is the first time you are dealing with TeX, I advise you to take a look at the <a href="tex.html">TeX page</a>.</p>
 
 <p>Last but not least, you can see some <a href="example.html">examples</a>.</p>
 

diff --git a/installation-linux.html b/installation-linux.html
@@ -59,6 +59,8 @@ <h2>Getting the sources</h2>
 
 <p>To obtain the sources of the stable version, you just need to download them from the <a href="https://github.com/gregorio-project/gregorio/releases">download page</a>, and decompress the archive.</p>
 
+<p><b>Nota bene:</b> There are two different source code files on the download page: gregorio-x.x.x.tar.bz2 (where x.x.x is the version number) and "Source Code" (in both zip and tar.gz format).  "gregorio-x.x.x.tar.bz2" is a special distribution version of the source which has several files, which do not depend on your particular system's architecture, pre-built for you.  As a result, it requires fewer tools to build, and should be the default choice for most people.  The file named "Source Code" is an image of the repository at the time of the release which is added automatically by GitHub.  As a result, the process for building from this file is identical to the process for building from a clone of the repository itself.</p>
+
 <p>To get the development version, create
 a local copy of the repository of the project, with the command:</p>
 
@@ -75,7 +77,7 @@ <h2>Install dependencies</h2>
 <code>sudo aptitude install autotools-dev flex bison libltdl7-dev texlive-luatex autopoint python-fontforge</code>
 </div>
 
-For gregorio versions &lt;4.0, is you are using <span style="font-family: monospace;">--enable-xml-read</span> then this additional dependency is needed:
+For gregorio versions prior to 4.0, if you are using <span style="font-family: monospace;">--enable-xml-read</span> then this additional dependency is needed:
 
 <div class="commandline">
   <code>libxml2-dev</code>

diff --git a/installation-mac.html b/installation-mac.html
@@ -73,7 +73,8 @@ <h3>Development environment installation</h3>
 <li>under Preferences, click on Downloads and install the Command Line Tools</li>
 <li>download and install <a href="http://www.macports.org/">MacPorts</a> (free)</li>
 <li>once installed, in the TERMINAL, do <code>sudo port selfupdate</code> to get the latest sources packages</li>
-<li>do <code>sudo port install libtool autoconf automake flex bison libxml2</code>.</li>
+<li>do <code>sudo port install libtool autoconf automake flex bison</code>.</li>
+<li>For gregorio versions prior to 4.0, if you are using <span style="font-family: monospace;">--enable-xml-read</span> then this additional dependency is needed: <code>sudo port install libxml2</code>.</li>
 </ol>
 
 <p>Once all this is done, you should be able to compile Gregorio.</p>
@@ -84,6 +85,8 @@ <h3>Source downloading</h3>
 
 <p>You have a choice between versions of Gregorio. To obtain the sources of the stable version, you just need to download the sources from the <a href="https://github.com/gregorio-project/gregorio/releases">download page</a>, and decompress the archive.</p>
 
+<p><b>Nota bene:</b> There are two different source code files on the download page: gregorio-x.x.x.tar.bz2 (where x.x.x is the version number) and "Source Code" (in both zip and tar.gz format).  "gregorio-x.x.x.tar.bz2" is a special distribution version of the source which has several files, which do not depend on your particular system's architecture, pre-built for you.  As a result, it requires fewer tools to build, and should be the default choice for most people.  The file named "Source Code" is an image of the repository at the time of the release which is added automatically by GitHub.  As a result, the process for building from this file is identical to the process for building from a clone of the repository itself.</p>
+
 <p>To get the git version, that is, the version in development (more functionalities, but might contain more bugs), you will have to create a local copy of the git repository of the project, with the command:</p>
 
 <div class="commandline">

diff --git a/pdf/Antiphonaire_Milan_(1935).pdf b/pdf/Antiphonaire_Milan_(1935).pdf
diff --git a/pdf/Antiphonaire_Solesmes_(1897).pdf b/pdf/Antiphonaire_Solesmes_(1897).pdf
diff --git a/pdf/Antiphonaire_Solesmes_(1931).pdf b/pdf/Antiphonaire_Solesmes_(1931).pdf
diff --git a/pdf/Graduel_Dominicains_(1928).pdf b/pdf/Graduel_Dominicains_(1928).pdf
diff --git a/pdf/Graduel_Prémontrés_(1910).pdf b/pdf/Graduel_Prémontrés_(1910).pdf
diff --git a/pdf/Graduel_Solesmes_(1895).pdf b/pdf/Graduel_Solesmes_(1895).pdf
diff --git a/pdf/Graduel_manuscrit(unknown).pdf b/pdf/Graduel_manuscrit(unknown).pdf
diff --git a/pdf/Processionaire_Dominicains_(1707).pdf b/pdf/Processionaire_Dominicains_(1707).pdf