]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'lilypond/translation' into dev/jmandereau
authorJohn Mandereau <john.mandereau@gmail.com>
Wed, 27 Feb 2008 12:25:24 +0000 (13:25 +0100)
committerJohn Mandereau <john.mandereau@gmail.com>
Wed, 27 Feb 2008 12:25:24 +0000 (13:25 +0100)
* lilypond/translation:
  Clean up translated docs makefiles

14 files changed:
Documentation/translations.html.in [new file with mode: 0644]
Documentation/user/README.txt
Documentation/user/fundamental.itely
Documentation/user/lilypond-book.itely
Documentation/user/lilypond-learning.tely
Documentation/user/lilypond-program.tely
Documentation/user/lilypond.tely
Documentation/user/macros.itexi
Documentation/user/tutorial.itely
Documentation/user/working.itely
Documentation/user/writing-texinfo.txt
buildscripts/translations-status.py
stepmake/stepmake/texinfo-vars.make
tex/texinfo.tex

diff --git a/Documentation/translations.html.in b/Documentation/translations.html.in
new file mode 100644 (file)
index 0000000..f85c4e5
--- /dev/null
@@ -0,0 +1,702 @@
+<html>
+<!-- This page is automatically generated by translation-status.py from
+translations.template.html; DO NOT EDIT !-->
+<!--
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+!-->
+<head>
+  <title>LilyPond documentation translations status</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+<p><a href="index.html">Up to documentation index</a></p>
+
+<h1>Documentation translations status</h1>
+
+<p>This is an overview of which parts of LilyPond @TOPLEVEL_VERSION@
+  documentation are translated; for each documentation section, you
+  can read the word count in parentheses, who translated and verified
+  it (translation checkers are printed with a smaller font size), how
+  much of the original section in English has been translation, how
+  up-to-date is the translation, and whether the translation has
+  already been updated after Grand Documentation Project (GDP) was
+  started.
+</p>
+
+<p>Please note that GDP makes a lot of changes to documentation in
+  English, therefore translated documentation is mostly not
+  up-to-date; however, this does not mean translated documentation is
+  inaccurate regarding current LilyPond version, it only means that
+  translated docmentation is not synced with documentation in English.
+  We do our best to keep translated documentation consistent with
+  current LilyPond syntax and features, and will update it per
+  section, when GDP processing of the corresponding section in English
+  is finished.
+</p>
+
+ <p><i>Last updated Tue Feb 26 15:43:29 UTC 2008
+</i></p>
+<table align="center" border="2">
+ <tr align="center">
+  <th>GNU LilyPond --- learning manual</th>  <th>fr</th>
+  <th>de</th>
+  <th>es</th>
+ </tr>
+ <tr align="left">
+  <td>Section titles<br>(406)</td>
+  <td>John Mandereau<br>
+   Jean-Charles Malahieude<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #4efe25">partially up-to-date (93 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>Preface<br>(411)</td>
+  <td>Valentin Villenave<br>
+   <small>Ludovic Sardain</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1 Introduction<br>(3198)</td>
+  <td>Ludovic Sardain<br>
+   John Mandereau<br>
+   <small>Jean-Charles Malahieude<br>
+   Jean-Yves Baudais</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #39ff22">partially up-to-date (96 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #39ff22">partially up-to-date (96 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #d587ff"></span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2 Tutorial<br>(5593)</td>
+  <td>Nicolas Grandclaude<br>
+   Ludovic Sardain<br>
+   Gauvain Pocentek<br>
+   <small>Jean-Charles Malahieude<br>
+   Valentin Villenave<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ff8f50">partially up-to-date (23 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #40fe23">partially up-to-date (95 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>3 Fundamental concepts<br>(8626)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #dfef77">partially translated (39 %)</span><br>
+   <span style="background-color: #a5ff31">partially up-to-date (80 %)</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>4 Tweaking output<br>(11862)</td>
+  <td>Valentin Villenave<br>
+   Nicolas Klutchnikoff<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #dfef77">partially translated (16 %)</span><br>
+   <span style="background-color: #ff6f57">partially up-to-date (9 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (16 %)</span><br>
+   <span style="background-color: #ff6f57">partially up-to-date (9 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (16 %)</span><br>
+   <span style="background-color: #d587ff"></span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>5 Working on LilyPond projects<br>(2985)</td>
+  <td>Ludovic Sardain<br>
+   <small>Jean-Yves Baudais<br>
+   Valentin Villenave<br>
+   John Mandereau<br>
+   Jean-Charles Malahieude</small><br>
+   <span style="background-color: #dfef77">partially translated (79 %)</span><br>
+   <span style="background-color: #7dff2b">partially up-to-date (86 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (79 %)</span><br>
+   <span style="background-color: #7dff2b">partially up-to-date (86 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (79 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>A Templates<br>(297)</td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ff9150">partially up-to-date (24 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #d587ff"></span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>B Scheme tutorial<br>(960)</td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (91 %)</span><br>
+   <span style="background-color: #83fe2c">partially up-to-date (85 %)</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+ </tr>
+</table>
+<p></p>
+
+<table align="center" border="2">
+ <tr align="center">
+  <th>GNU LilyPond --- program usage</th>  <th>fr</th>
+  <th>de</th>
+  <th>es</th>
+ </tr>
+ <tr align="left">
+  <td>Section titles<br>(384)</td>
+  <td>John Mandereau<br>
+   Jean-Charles Malahieude<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #4efe25">partially up-to-date (93 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1 Install<br>(1477)</td>
+  <td>John Mandereau<br>
+   Jean-Charles Malahieude<br>
+   <span style="background-color: #dfef77">partially translated (11 %)</span><br>
+   <span style="background-color: #39ff22">partially up-to-date (96 %)</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (11 %)</span><br>
+   <span style="background-color: #6fff29">partially up-to-date (88 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2 Setup<br>(947)</td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #39ff22">partially up-to-date (96 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #d587ff"></span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>3 Running LilyPond<br>(2860)</td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>4 @command{lilypond-book}: Integrating text and music<br>(2840)</td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>5 Converting from other formats<br>(975)</td>
+  <td>Jean-Charles Malahieude<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+ </tr>
+</table>
+<p></p>
+
+<table align="center" border="2">
+ <tr align="center">
+  <th>GNU LilyPond --- The music typesetter</th>  <th>fr</th>
+  <th>de</th>
+  <th>es</th>
+ </tr>
+ <tr align="left">
+  <td>Section titles<br>(549)</td>
+  <td>John Mandereau<br>
+   Jean-Charles Malahieude<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #7dff2b">partially up-to-date (86 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #7dff2b">partially up-to-date (86 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #39ff22">partially up-to-date (96 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1 Musical notation<br>(91)</td>
+  <td>John Mandereau<br>
+   Jean-Charles Malahieude<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #acff31">partially up-to-date (79 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #acff31">partially up-to-date (79 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1.1 Pitches<br>(2808)</td>
+  <td>Frédéric Chiasson<br>
+   <small>Valentin Villenave<br>
+   Jean-Charles Malahieude</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ff7855">partially up-to-date (13 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ff7855">partially up-to-date (13 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1.2 Rhythms<br>(7056)</td>
+  <td>Frédéric Chiasson<br>
+   <small>Valentin Villenave<br>
+   Jean-Charles Malahieude</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ff9c4e">partially up-to-date (29 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (82 %)</span><br>
+   <span style="background-color: #ff9c4e">partially up-to-date (29 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (87 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1.3 Expressive marks<br>(1602)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ff9c4e">partially up-to-date (29 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ff9c4e">partially up-to-date (29 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #91ff2e">partially up-to-date (83 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1.4 Repeats<br>(717)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ffb549">partially up-to-date (39 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ffb549">partially up-to-date (39 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1.5 Simultaneous notes<br>(916)</td>
+  <td>Frédéric Chiasson<br>
+   Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ffb549">partially up-to-date (39 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (58 %)</span><br>
+   <span style="background-color: #ffb549">partially up-to-date (39 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (58 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1.6 Staff notation<br>(1637)</td>
+  <td>Valentin Villenave<br>
+   Jean-Charles Malahieude<br>
+   <small>John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ffba48">partially up-to-date (41 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (49 %)</span><br>
+   <span style="background-color: #ffba48">partially up-to-date (41 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1.7 Editorial annotations<br>(866)</td>
+  <td>Jean-Charles Malahieude<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ff6f57">partially up-to-date (9 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (38 %)</span><br>
+   <span style="background-color: #ff6f57">partially up-to-date (9 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (95 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>1.8 Text<br>(2329)</td>
+  <td>Jean-Charles Malahieude<br>
+   <small>Valentin Villenave<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ffb549">partially up-to-date (39 %)</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2 Specialist notation<br>(54)</td>
+  <td>John Mandereau<br>
+   Jean-Charles Malahieude<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #f6fe3b">partially up-to-date (68 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #f6fe3b">partially up-to-date (68 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2.1 Vocal music<br>(2630)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude</small><br>
+   <span style="background-color: #dfef77">partially translated (89 %)</span><br>
+   <span style="background-color: #68ff28">partially up-to-date (89 %)</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (89 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2.2 Chords<br>(1275)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #dfef77">partially translated (56 %)</span><br>
+   <span style="background-color: #76fe2a">partially up-to-date (87 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (56 %)</span><br>
+   <span style="background-color: #76fe2a">partially up-to-date (87 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (56 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2.3 Piano music<br>(702)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #68ff28">partially up-to-date (89 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #68ff28">partially up-to-date (89 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2.4 Percussion<br>(481)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #54ff26">partially up-to-date (92 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #54ff26">partially up-to-date (92 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2.5 Guitar<br>(826)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #5bff27">partially up-to-date (91 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #5bff27">partially up-to-date (91 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2.6 Orchestral strings<br>(66)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ffef3f">partially up-to-date (61 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ffef3f">partially up-to-date (61 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #ffef3f">partially up-to-date (61 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2.7 Bagpipes<br>(242)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #a5ff31">partially up-to-date (80 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (94 %)</span><br>
+   <span style="background-color: #a5ff31">partially up-to-date (80 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #a5ff31">partially up-to-date (80 %)</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>2.8 Ancient notation<br>(4289)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude<br>
+   John Mandereau</small><br>
+   <span style="background-color: #dfef77">partially translated (88 %)</span><br>
+   <span style="background-color: #47ff24">partially up-to-date (94 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (88 %)</span><br>
+   <span style="background-color: #47ff24">partially up-to-date (94 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (88 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>3 Input syntax<br>(2448)</td>
+  <td>Jean-Charles Malahieude<br>
+   <span style="background-color: #dfef77">partially translated (7 %)</span><br>
+   <span style="background-color: #25fe1f">partially up-to-date (99 %)</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>4 Non-musical notation<br>(2164)</td>
+  <td>Valentin Villenave<br>
+   <small>Jean-Charles Malahieude</small><br>
+   <span style="background-color: #dfef77">partially translated (4 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (3 %)</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>5 Spacing issues<br>(8399)</td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>6 Changing defaults<br>(5105)</td>
+  <td>Valentin Villenave<br>
+   <small>Gilles Thibault</small><br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #b9ff33">partially up-to-date (77 %)</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>7 Interfaces for programmers<br>(4547)</td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>A Literature list<br>(299)</td>
+  <td>   <span style="background-color: #d0f0f8">not translated</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>B Notation manual tables<br>(935)</td>
+  <td>Frédéric Chiasson<br>
+   Jean-Charles Malahieude<br>
+   <span style="background-color: #dfef77">partially translated (13 %)</span><br>
+   <span style="background-color: #4efe25">partially up-to-date (93 %)</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #dfef77">partially translated (84 %)</span><br>
+   <span style="background-color: #62ff28">partially up-to-date (90 %)</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #dfef77">partially translated (97 %)</span><br>
+   <span style="background-color: #d587ff"></span><br>
+  </td>
+ </tr>
+ <tr align="left">
+  <td>C Cheat sheet<br>(250)</td>
+  <td>Valentin Villenave<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Till Rettig<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #1fff1f">up to date</span><br>
+  </td>
+  <td>Francisco Vila<br>
+   <span style="background-color: #1fff1f">translated</span><br>
+   <span style="background-color: #d587ff"></span><br>
+  </td>
+ </tr>
+</table>
+<p></p>
+
+</body>
+</html>
index 6b39a974a348dcfb67b4ca6d2bc0b1cb5019015d..ae345e03d089d67c16ce0a3eb5c8025a119731f0 100644 (file)
@@ -11,7 +11,7 @@ General policy: policy.txt
 convert-ly -e --from=... --to=... --no-version *.itely
 
 % to find the current version number,
-grep "version \"" tutorial.itely
+grep "version \"" fundamental.itely
 
 Please don't forget updating translated docs (in LANGS/user) too!
 
index 1e56b0e4f250f3d2d11292d75891b65d8fdbf93f..1ccf9bcf02ccd731e9e2289c91e7dd478cec2d01 100644 (file)
@@ -40,7 +40,7 @@ description of the input format, see @ruser{File structure}.
 A basic example of a lilypond input file is
 
 @example
-\version "2.11.38"
+\version @w{"@version{}"}
 \score @{
   @var{...compound music expression...}  % all the music goes here!
   \header @{ @}
@@ -1739,7 +1739,7 @@ cello.  In this case, we would start with @q{Notes and lyrics} (for the
 soprano part).
 
 @example
-\version "2.11.38"
+\version @w{"@version{}"}
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -1767,7 +1767,7 @@ text = \lyricmode @{
 Now we want to add a cello part.  Let's look at the @q{Notes only} example:
 
 @example
-\version "2.11.38"
+\version @w{"@version{}"}
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -1804,7 +1804,7 @@ celli normally use bass clef.  We'll also give the cello some
 different notes.
 
 @example
-\version "2.11.38"
+\version @w{"@version{}"}
 sopranoMusic = \relative c' @{
   \clef treble
   \key c \major
@@ -1873,7 +1873,7 @@ This looks a bit messy; the indentation is messed up now.  That is
 easily fixed.  Here's the complete soprano and cello template.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.11.37"
+\version "2.11.38"
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major
@@ -1921,7 +1921,6 @@ from Handel's Messiah:
 
 @c The following should appear as music without code
 @lilypond[quote,ragged-right]
-\version "2.11.38"
 global = { \key d \major \time 4/4 }
 sopMusic = \relative c'' {
   \clef "treble"
@@ -2193,7 +2192,7 @@ music definitions and one to define the time signature
 and key:
 
 @example
-\version "2.11.38"
+\version @w{"@version{}"}
 \header @{
   title = "Jesu, meine Freude"
   composer = "J S Bach"
index 86b274f9cfd3ef85640f15cd52d039869c3dc56d..f0af1fcf1706209bb3712cefe55c24152ec9504a 100644 (file)
@@ -105,9 +105,10 @@ directory as this file.)
 Save the code above to a file called @file{lilybook.lytex}, then in a
 terminal run
 
+@c keep space after @version{} so TeX doesn't choke
 @example
 lilypond-book --output=out --pdf lilybook.lytex
-@emph{lilypond-book (GNU LilyPond) 2.11.37}
+@emph{lilypond-book (GNU LilyPond) @version{} }
 @emph{Reading lilybook.lytex...}
 @emph{..lots of stuff deleted..}
 @emph{Compiling lilybook.tex...}
index c1e811970a73750e823db5657674879a4d2586ed..fac164092e8d9d05d83d0151a6edb38f0b9afda8 100644 (file)
@@ -10,6 +10,8 @@
 @documentencoding UTF-8
 @documentlanguage en
 
+@include macros.itexi
+
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -64,21 +66,7 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-  \context Lyrics {
-    \override Score.RehearsalMark #'self-alignment-X = #LEFT
-    \override Score.RehearsalMark #'font-size = #-2
-    \mark #(ly:export (string-append
-      "(For LilyPond version " (lilypond-version) ")"))
-    s2
-  }
-  \layout {
-    indent = 0.0\pt
-  }
-}
-@end lilypond
-
+For LilyPond version @version{}
 @end titlepage
 
 @copying
@@ -114,10 +102,7 @@ Free Documentation License''.
 @top GNU LilyPond --- learning manual
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the learning manual for GNU LilyPond 2.11.x series.
-@ifhtml
-(See the bottom of this page for the exact version number).
-@end ifhtml
+This is the learning manual for GNU LilyPond version @version{}.
 
 @cindex web site
 @cindex URL
@@ -147,8 +132,6 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
 @include preface.itely
 @include introduction.itely
 @include tutorial.itely
index 6fa9f3900be20626275a638c169fc08baee68217..18ced37734a1374eb602b478a56c6bfcf53fb6bb 100644 (file)
@@ -10,6 +10,8 @@
 @documentencoding UTF-8
 @documentlanguage en
 
+@include macros.itexi
+
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -64,21 +66,7 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-  \context Lyrics {
-    \override Score.RehearsalMark #'self-alignment-X = #LEFT
-    \override Score.RehearsalMark #'font-size = #-2
-    \mark #(ly:export (string-append
-      "(For LilyPond version " (lilypond-version) ")"))
-    s2
-  }
-  \layout {
-    indent = 0.0\pt
-  }
-}
-@end lilypond
-
+For LilyPond version @version{}
 @end titlepage
 
 @copying
@@ -114,10 +102,7 @@ Free Documentation License''.
 @top GNU LilyPond --- program usage
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the program usage manual for GNU LilyPond 2.11.x series.
-@ifhtml
-(See the bottom of this page for the exact version number).
-@end ifhtml
+This is the program usage manual for GNU LilyPond version @version{}.
 
 @cindex web site
 @cindex URL
@@ -143,8 +128,6 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
 @include install.itely
 @include setup.itely
 @include running.itely
index 0631951f5ae237ab2a5e22c3f9c1008e4eea1073..7c203800d781e15f849a179d8784cb13fa1dda17 100644 (file)
@@ -10,6 +10,8 @@
 @documentencoding UTF-8
 @documentlanguage en
 
+@include macros.itexi
+
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -98,21 +100,7 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-  \context Lyrics {
-    \override Score.RehearsalMark #'self-alignment-X = #LEFT
-    \override Score.RehearsalMark #'font-size = #-2
-    \mark #(ly:export (string-append
-      "(For LilyPond version " (lilypond-version) ")"))
-    s2
-  }
-  \layout {
-    indent = 0.0\pt
-  }
-}
-@end lilypond
-
+For LilyPond version @version{}
 @end titlepage
 
 @copying
@@ -148,10 +136,7 @@ Free Documentation License''.
 @top GNU LilyPond --- The music typesetter
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the user manual for GNU LilyPond 2.11.x series.
-@ifhtml
-(See the bottom of this page for the exact version number).
-@end ifhtml
+This is the user manual for GNU LilyPond version @version{}.
 
 @cindex web site
 @cindex URL
@@ -187,8 +172,6 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
 @include notation.itely
 @include specialist.itely
 
index b0dafefd956fec1f0b9e23fb6598f69758ddaf93..40905c233310e60ea0179bc7fa7425bb3b19bbd0 100644 (file)
@@ -7,8 +7,7 @@
 @end ignore
 
 @macro version
-@c @value{version}
-2.11.41
+@value{version}
 @end macro
 
 @c   ***** Displaying text *****
index c4681c27cc11961f7b24fb9ca2618a6d5a735962..7373f6222cfddb35ed4ea5ee89b6daf96b1c6f13 100644 (file)
@@ -1585,7 +1585,7 @@ The @code{\version} statement records the version of LilyPond that
 was used to write the file:
 
 @example
-\version "2.11.38"
+\version @w{"@version{}"}
 @end example
 
 @noindent
@@ -1607,7 +1607,7 @@ main music expression; the @code{\header} block is usually placed
 underneath the @ref{Version number}.
 
 @example
-\version "2.11.38"
+\version @w{"@version{}"}
 \header @{
   title = "Symphony"
   composer = "Me"
index 4f8820da016d072f01a86d28713f352daecd4baa..216f577e89535a0f2f4d71a3b9322acfc564fc56 100644 (file)
@@ -73,7 +73,7 @@ templates contain @code{\version} information.  We
 highly recommend that you always include the @code{\version}, no matter
 how small your file is.  Speaking from personal experience, it's
 quite frustrating to try to remember which version of LilyPond you were
-using a few years ago.  @code{convert-ly} requires you to declare
+using a few years ago.  @command{convert-ly} requires you to declare
 which version of LilyPond you used.
 
 @item @strong{Include checks}: @ruser{Bar and barnumber checks},
@@ -536,7 +536,7 @@ file with @code{\include "../global.ly"}, which contains
 
 @example
 %%%   global.ly
-\version "2.11.38"
+\version @w{"@version{}"}
 #(ly:set-option 'point-and-click #f)
 \include "../init/init-defs.ly"
 \include "../init/init-layout.ly"
index 4c988f754eb83724971cff8d21f78d3121d2771f..7913ed0ad76407f366f13ed43d7e14c82b462021 100644 (file)
@@ -161,6 +161,19 @@ commands.
 
   Do not use @itemize @bullet.
 
+* To get LilyPond version, use @version{} (this does not work inside
+  LilyPond snippets).  If you write "@version{}" (enclosed with
+  quotes), or generally if @version{} is not followed by a space,
+  enclose it with
+
+  @w{ ... }
+
+  e.g.
+
+  @w{"@version{}"}
+
+  to prevent an ugly line break in PDF output.
+
 
 %%%%% SYNTAX SURVEY
 
index 494b59b881330529dbd39a9b2e2ec732f19e0ad4..38030385031f285e45525bd122fb6bb3ddbb9a8e 100644 (file)
@@ -17,6 +17,7 @@ import re
 import string
 import os
 import gettext
+import subprocess
 
 def progress (str):
     sys.stderr.write (str + '\n')
@@ -38,11 +39,17 @@ for l in langdefs.LANGUAGES:
         translation[l.code] = gettext.translation('lilypond-doc', localedir, [l.code]).gettext
 
 def read_pipe (command):
-    pipe = os.popen (command)
-    output = pipe.read ()
-    if pipe.close ():
+    child = subprocess.Popen (command,
+                              stdout = subprocess.PIPE,
+                              stderr = subprocess.PIPE,
+                              shell = True)
+    (output, error) = child.communicate ()
+    code = str (child.wait ())
+    if not child.stdout or child.stdout.close ():
         print "pipe failed: %(command)s" % locals ()
-    return output
+    if code != '0':
+        error = code + ' ' + error
+    return (output, error)
 
 comments_re = re.compile (r'^@ignore\n(.|\n)*?\n@end ignore$|@c .*?$', re.M)
 space_re = re.compile (r'\s+', re.M)
@@ -68,6 +75,7 @@ format_table = {
     'fully translated': {'color':'1fff1f', 'short':_doc ('yes'), 'long': _doc ('translated')},
     'up to date': {'short':_doc ('yes'), 'long':_doc ('up to date')},
     'outdated': {'short':_doc ('partially (%(p)d %%)'), 'long':_doc ('partially up-to-date (%(p)d %%)')},
+    'N/A': {'short':_doc ('N/A'), 'long':'', 'color':'d587ff' },
     'pre-GDP':_doc ('pre-GDP'),
     'post-GDP':_doc ('post-GDP')
 }
@@ -88,40 +96,37 @@ appendix_number_trans = string.maketrans ('@ABCDEFGHIJKLMNOPQRSTUVWXY','ABCDEFGH
 
 class SectionNumber (object):
     def __init__ (self):
-        self.__current_number = [0]
-        self.__type = 'n'
+        self.__data = [[0,'u']]
 
     def __increase_last_index (self):
-        if isinstance (self.__current_number[-1], str):
-            self.__current_number[-1] = self.__current_number[-1].translate (appendix_number_trans)
-        else:
-            self.__current_number[-1] += 1
+        type = self.__data[-1][1]
+        if type == 'l':
+            self.__data[-1][0] = self.__data[-1][0].translate (appendix_number_trans)
+        elif type == 'n':
+            self.__data[-1][0] += 1
 
-    # ugh, current implementation is too naive:
-    # unnumbered stuff is really printed without number for @top only
     def format (self):
-        if self.__current_number == [0] or self.__type == 'u':
+        if self.__data[-1][1] == 'u':
             return ''
-        return '.'.join ([str (i) for i in self.__current_number[1:]]) + ' '
+        return '.'.join ([str (i[0]) for i in self.__data if i[1] != 'u']) + ' '
 
     def increase (self, (type, level)):
         if level == 0:
-            self.__current_number = [0]
-        while level + 1 < len (self.__current_number):
-            del self.__current_number[-1]
-        if level + 1 > len (self.__current_number):
-            self.__type = type
+            self.__data = [[0,'u']]
+        while level + 1 < len (self.__data):
+            del self.__data[-1]
+        if level + 1 > len (self.__data):
+            self.__data.append ([0, type])
             if type == 'l':
-                self.__current_number.append ('@')
-            else:
-                self.__current_number.append (0)
-
-        if type == self.__type:
+                self.__data[-1][0] = '@'
+        if type == self.__data[-1][1]:
             self.__increase_last_index ()
-        elif type == 'l' and level == 1:
-            self.__current_number[-1] = 'A'
         else:
-            self.__current_number[-1] = 1
+            self.__data[-1] = ([0, type])
+            if type == 'l':
+                self.__data[-1][0] = 'A'
+            elif type == 'n':
+                self.__data[-1][0] = 1
         return self.format ()
 
 
@@ -135,12 +140,6 @@ def percentage_color (percent):
         c = [hex (int ((3 * p - 2) * b + 3 * (1 - p) * a))[2:] for (a, b) in [(0xff, 0x1f), (0xff, 0xff), (0x3d, 0x1f)]]
     return ''.join (c)
 
-def line_word_count (tely_line):
-    if tely_line.startswith ('@'):
-        return 0
-    tely_line = comments_re.sub ('', tely_line)
-    return len (space_re.split (tely_line))
-
 def tely_word_count (tely_doc):
     '''
     Calculate word count of a Texinfo document node by node.
@@ -223,21 +222,26 @@ class TranslatedTelyDocument (TelyDocument):
                                   'the whole file against the original in English, then ' + \
                                   'fill in HEAD committish in the header.\n')
             sys.exit (1)
-        diff = read_pipe (diff_cmd % {'committish':m.group (1), 'original':masterdocument.filename}).splitlines ()
-        insertions = sum ([line_word_count (l[1:]) for l in diff if l.startswith ('+') and not l.startswith ('+++')])
-        deletions = sum ([line_word_count (l[1:]) for l in diff if l.startswith ('-') and not l.startswith ('---')])
-        outdateness_percentage = 50.0 * (deletions + insertions) / (master_total_word_count + 0.5 * (deletions - insertions))
-        self.uptodate_percentage = 100 - int (outdateness_percentage)
-        if self.uptodate_percentage > 100:
-            alternative = 50
-            progress ("%s: strange uptodateness percentage %d %%, setting to %d %%" \
-                          % (self.filename, self.uptodate_percentage, alternative))
-            self.uptodate_percentage = alternative
-        elif self.uptodate_percentage < 1:
-            alternative = 1
-            progress ("%s: strange uptodateness percentage %d %%, setting to %d %%" \
-                          % (self.filename, self.uptodate_percentage, alternative))
-            self.uptodate_percentage = alternative
+        (diff_string, error) = read_pipe (diff_cmd % {'committish':m.group (1), 'original':masterdocument.filename})
+        if error:
+            sys.stderr.write ('warning: %s: %s' % (self.filename, error))
+            self.uptodate_percentage = None
+        else:
+            diff = diff_string.splitlines ()
+            insertions = sum ([len (l) - 1 for l in diff if l.startswith ('+') and not l.startswith ('+++')])
+            deletions = sum ([len (l) - 1 for l in diff if l.startswith ('-') and not l.startswith ('---')])
+            outdateness_percentage = 50.0 * (deletions + insertions) / (masterdocument.size + 0.5 * (deletions - insertions))
+            self.uptodate_percentage = 100 - int (outdateness_percentage)
+            if self.uptodate_percentage > 100:
+                alternative = 50
+                progress ("%s: strange uptodateness percentage %d %%, setting to %d %%" \
+                              % (self.filename, self.uptodate_percentage, alternative))
+                self.uptodate_percentage = alternative
+            elif self.uptodate_percentage < 1:
+                alternative = 1
+                progress ("%s: strange uptodateness percentage %d %%, setting to %d %%" \
+                              % (self.filename, self.uptodate_percentage, alternative))
+                self.uptodate_percentage = alternative
 
     def completeness (self, formats=['long']):
         if isinstance (formats, str):
@@ -255,13 +259,15 @@ class TranslatedTelyDocument (TelyDocument):
         if isinstance (formats, str):
             formats = [formats]
         p = self.uptodate_percentage
-        if p == 100:
+        if p == None:
+            status = 'N/A'
+        elif p == 100:
             status = 'up to date'
         else:
             status = 'outdated'
         l = {}
         for f in formats:
-            if f == 'color':
+            if f == 'color' and p != None:
                 l['color'] = percentage_color (p)
             else:
                 l[f] = format_table[status][f] % locals ()
@@ -298,6 +304,7 @@ class MasterTelyDocument (TelyDocument):
     def __init__ (self, filename, parent_translations=dict ([(lang, None) for lang in langdefs.LANGDICT.keys()])):
         #print "init MasterTelyDocument %s" % filename
         TelyDocument.__init__ (self, filename)
+        self.size = len (self.contents)
         self.word_count = tely_word_count (self.contents)
         translations = dict ([(lang, os.path.join (lang, filename)) for lang in langdefs.LANGDICT.keys()])
         #print translations
@@ -338,8 +345,8 @@ class MasterTelyDocument (TelyDocument):
 
 progress ("Reading documents...")
 
-tely_files = read_pipe ("find -maxdepth 2 -name '*.tely'").splitlines ()
-master_docs = [MasterTelyDocument (filename) for filename in tely_files]
+tely_files = read_pipe ("find -maxdepth 2 -name '*.tely'")[0].splitlines ()
+master_docs = [MasterTelyDocument (os.path.normpath (filename)) for filename in tely_files]
 master_docs = [doc for doc in master_docs if doc.translations]
 
 main_status_page = open ('translations.template.html').read ()
@@ -351,7 +358,7 @@ main_status_page = open ('translations.template.html').read ()
 
 progress ("Generating status pages...")
 
-main_status_html = ' <p><i>Last updated %s</i></p>\n' % read_pipe ('LANG= date -u')
+main_status_html = ' <p><i>Last updated %s</i></p>\n' % read_pipe ('LANG= date -u')[0]
 main_status_html += '\n'.join ([doc.html_status () for doc in master_docs])
 
 html_re = re.compile ('<html>', re.I)
index d36ff83b81db972664de69f49987e9341cab6a6c..4ee7cefa474dac6762da3b9d4aef10579c0fde2e 100644 (file)
@@ -9,9 +9,10 @@ OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
 GENERATE_OMF = $(PYTHON) $(buildscript-dir)/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
+TEXI2PDF_FLAGS += --command '@set version $(TOPLEVEL_VERSION)'
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 
-MAKEINFO_FLAGS = --enable-encoding
+MAKEINFO_FLAGS = --enable-encoding -D 'version $(TOPLEVEL_VERSION)'
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
 
index c49e670b02db360f171da3efcfb64ee430086c0a..da91e69acdd0f13d6edb4c3dbecaea95c55d1ffa 100644 (file)
@@ -3,11 +3,11 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2007-09-03.05}
+\def\texinfoversion{2008-02-15.11}
 %
-% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007 Free Software Foundation, Inc.
+% 2007, 2008 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -97,6 +97,7 @@
 \let\ptexslash=\/
 \let\ptexstar=\*
 \let\ptext=\t
+\let\ptextop=\top
 
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
@@ -924,9 +925,8 @@ where each line of input produces a line of output.}
   \def\thisfile{#1}%
   {%
     \makevalueexpandable
-    \def\temp{\input #1 }%
-    \expandafter
-  }\temp
+    \input #1
+  }%
   \popthisfilestack
 }
 \def\filenamecatcodes{%
@@ -1642,11 +1642,17 @@ output) for that.)}
   }%
 }
 
-%
 % PDF CMaps.  See also LaTeX's t1.cmap.
 %
-% \cmapOT1
-\ifpdf
+% do nothing with this by default.
+\expandafter\let\csname cmapOT1\endcsname\gobble
+\expandafter\let\csname cmapOT1IT\endcsname\gobble
+\expandafter\let\csname cmapOT1TT\endcsname\gobble
+
+% if we are producing pdf, and we have \pdffontattr, then define cmaps.
+% (\pdffontattr was introduced many years ago, but people still run
+% older pdftex's; it's easy to conditionalize, so we do.)
+\ifpdf \ifx\pdffontattr\undefined \else
   \begingroup
     \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
     \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
@@ -1894,11 +1900,7 @@ end
   \expandafter\edef\csname cmapOT1TT\endcsname#1{%
     \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
   }%
-\else
-  \expandafter\let\csname cmapOT1\endcsname\gobble
-  \expandafter\let\csname cmapOT1IT\endcsname\gobble
-  \expandafter\let\csname cmapOT1TT\endcsname\gobble
-\fi
+\fi\fi
 
 
 % Set the font macro #1 to the font named #2, adding on the
@@ -1912,7 +1914,7 @@ end
 }
 % This is what gets called when #5 of \setfont is empty.
 \let\cmap\gobble
-
+% emacs-page end of cmaps
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
@@ -2558,6 +2560,13 @@ end
 \let\env=\code
 \let\command=\code
 
+% @clicksequence{File @click{} Open ...}
+\def\clicksequence#1{\begingroup #1\endgroup}
+
+% @clickstyle @arrow   (by default)
+\parseargdef\clickstyle{\def\click{#1}}
+\def\click{\arrow}
+
 % @uref (abbreviation for `urlref') takes an optional (comma-separated)
 % second argument specifying the text to display and an optional third
 % arg as text to display instead of (rather than in addition to) the url
@@ -2765,6 +2774,7 @@ end
 \chardef\quoteleft=`\`
 \chardef\quoteright=`\'
 
+
 \message{page headings,}
 
 \newskip\titlepagetopglue \titlepagetopglue = 1.5in
@@ -5649,14 +5659,15 @@ end
 
 % @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 %
-% Since these characters are used in examples, it should be an even number of
+% Since these characters are used in examples, they should be an even number of
 % \tt widths. Each \tt character is 1en, so two makes it 1em.
 %
 \def\point{$\star$}
-\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
-\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
+\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
+\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
+\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
 \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
-\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
+\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
 
 % The @error{} command.
 % Adapted from the TeXbook's \boxit.
@@ -5714,6 +5725,7 @@ end
   \let\/=\ptexslash
   \let\*=\ptexstar
   \let\t=\ptext
+  \expandafter \let\csname top\endcsname=\ptextop  % outer
   \let\frenchspacing=\plainfrenchspacing
   %
   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%