Re: Download links missing at http://lilypond.org/index.de.html

2016-10-22 Thread Jean-Charles Malahieude

Le 22/10/2016 à 16:26, Simon Albrecht a écrit :

Hi Jean-Charles,

thanks for the effort. Here’s what I’d do in the attachment – though I’m
not sure I dealt with the @uref{}s correctly…



Pushed as 181db07b2627d98fb77564c45fad23a96e7ee54c on the translation 
branch, with your amendments, and merged with staging.


Danke für eure Hilfe!

Cheers,
Jean-Charles


___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


Re: Download links missing at http://lilypond.org/index.de.html

2016-10-22 Thread Werner LEMBERG

> By the way, which is right wording between
> 
>   LP ist ein Werkzeug, dass Notensatz handhaben kann.
> 
> and
> 
>   LP ist ein Werkzeug, das Notensatz handhaben kann.
> 
> 
> My memory about "deutsche Grammatik" (30 years ago…) would lean
> towards "dass".

If you can replace the word `das' with `welches', then you need only
one `s':

  LP ist ein Werkzeug, welches Notensatz handhaben kann.

So it's `das'.


Werner
___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


Re: Download links missing at http://lilypond.org/index.de.html

2016-10-22 Thread Simon Albrecht

On 22.10.2016 16:46, Jean-Charles Malahieude wrote:

Le 22/10/2016 à 16:26, Simon Albrecht a écrit :

Hi Jean-Charles,

thanks for the effort. Here’s what I’d do in the attachment – though I’m
not sure I dealt with the @uref{}s correctly…



Would you like me to change the headings in the examples' page 
according to this?


By the way, which is right wording between

  LP ist ein Werkzeug, dass Notensatz handhaben kann.

and

  LP ist ein Werkzeug, das Notensatz handhaben kann.


My memory about "deutsche Grammatik" (30 years ago…) would lean 
towards "dass".


„das“ is correct here to begin the relative clause. Actually, many 
Germans are also getting it wrong nowadays (inspiring the website 
 to clarify)…
„dass“ would rather correspond to „in order to“ or „that“, depending on 
context. E.g. for indirect speech:

„Ich sage, dass das nicht stimmt“ – „I say that this isn’t correct“

Best, Simon

___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


Re: Download links missing at http://lilypond.org/index.de.html

2016-10-22 Thread Jean-Charles Malahieude

Le 22/10/2016 à 16:26, Simon Albrecht a écrit :

Hi Jean-Charles,

thanks for the effort. Here’s what I’d do in the attachment – though I’m
not sure I dealt with the @uref{}s correctly…



Would you like me to change the headings in the examples' page according 
to this?


By the way, which is right wording between

  LP ist ein Werkzeug, dass Notensatz handhaben kann.

and

  LP ist ein Werkzeug, das Notensatz handhaben kann.


My memory about "deutsche Grammatik" (30 years ago…) would lean towards 
"dass".


Cheers,
Jean-Charles

___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


Re: Download links missing at http://lilypond.org/index.de.html

2016-10-22 Thread Simon Albrecht

Hi Jean-Charles,

thanks for the effort. Here’s what I’d do in the attachment – though I’m 
not sure I dealt with the @uref{}s correctly…


Best, Simon


On 22.10.2016 15:37, Jean-Charles Malahieude wrote:

Le 21/10/2016 à 22:35, Malte Meyn a écrit :

The german version of index.html is missing the right column with
download and manual links.



My German writing is very old, but here is a patch.
If any gentle German would kindly proofread…

Cheers,
Jean-Charles


___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


>From ae0ced1be1617970e9ff8748ae018399e3ab1f46 Mon Sep 17 00:00:00 2001
From: Jean-Charles Malahieude 
Date: Sat, 22 Oct 2016 15:30:20 +0200
Subject: [PATCH] web-de: update the frontpage

---
 Documentation/de/web.texi | 65 ++-
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/Documentation/de/web.texi b/Documentation/de/web.texi
index 262afd8..55fe1fc 100644
--- a/Documentation/de/web.texi
+++ b/Documentation/de/web.texi
@@ -1,6 +1,6 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @ignore
-Translation of GIT committish: 5b6ddab894b3065c35c72ef8048b8c6edbe684ac
+Translation of GIT committish: 901f7ff2acbb996f1e726607f3f8e921c5e1ddd3
 
 When revising a translation, copy the HEAD committish of the
 version that you are working on.  For details, see the Contributors'
@@ -135,13 +135,66 @@ Lesen Sie mehr in der @ref{Einleitung}!
 @divEnd
 
 
-@divId{news}
+@divId{homepage-main}
+
+@divClass{column-center-top}
+
+@subheading Schöner Notensatz
+
+@c This example image is the image from the website version of the essay
+@c manual, downloaded to the pictures directory for use on the home page.
+@c Large version is generated manually from ly file in pictures directory.
+@divId{homepage-example-image-wrapper}
+@imageClickable{bwv861-lilypond,png,,bwv861-lilypond-large,png,center}
+@divEnd
+
+@ifclear web_version
+  @c no anchor links, just text
+
+LilyPond ist ist ein sehr mächtiges und flexibles Werkzeug, das Notensatz
+der unterschiedlichsten Art handhaben kann: zum Beispiel klassische
+Musik (wie in diesem Beispiel von J. S. Bach), komplexe Notation,
+Alte Musik, moderne Musik, Tabulatur, Vokalmusik, Popmusik, Unterrichtsmaterialien,
+große Orchesterpartituren, individuelle Lösungen und sogar
+Schenker-Graphen.
+
+@end ifclear
+@ifset web_version
+  @c anchor links, link to individual examples by their  tag
+  @c Translators should use the localized anchor name
+  @c (e.g. examples.html#Musica-Antica)
+  @c to be found in out-www/web/examples.LL.html
+
+LilyPond ist ist ein sehr mächtiges und flexibles Werkzeug, dass Notensatz
+der unterschiedlichsten Art handhaben kann, wie zum Beispiel
+@uref{examples.html#Klassische-Musik, klassische Musik}
+(wie dieses Orgelpräludium von J. S. Bach),
+@uref{examples.html#Komplexe-Notation, komplexe Notation},
+@uref{examples.html#Alte-Musik, Alte Musik},
+@uref{examples.html#Moderne-Musik, moderne Musik},
+@uref{examples.html#Tablatur, Tablatur},
+@uref{examples.html#Vokalmusik, Vokalmusik},
+@uref{examples.html#Leadsheets, Leadsheets},
+@uref{examples.html#Unterrichtsmaterialien, Unterrichtsmaterialien},
+@uref{examples.html#Grosse-Orchesterpartituren, große Orchesterpartituren},
+@uref{examples.html#Individuelle-Loesungen, individuelle Lösungen},
+und sogar
+@uref{examples.html#Schenker-Graphen, Schenker-Graphen}.
+
+@end ifset
+
+Sehen Sie sich unsere @ref{Beispiele} an und lassen sich inspirieren!
+
+@divEnd
+
+@divClass{column-center-middle-color2}
+@subheading Neuigkeiten
 
 @c TODO: generate this automatically, including RSS feed.
-@include web/news-front.itexi
+@include web/news-headlines.itexi
+
+@ref{News, Weitere Neuigkeiten...}
 
-@divClass{float-right}
-(@ref{Ältere Neuigkeiten})
 @divEnd
 
 @divEnd
@@ -152,7 +205,7 @@ Lesen Sie mehr in der @ref{Einleitung}!
 @end ifclear
 @ifset web_version
   @c make the side bar:
-@divId{homePageSideBar}
+@divId{homepage-sidebar}
 @subheading Stabile Version
 
 @c TODO: javascript to detect OS and suggest download?
-- 
2.10.1

___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


Re: Download links missing at http://lilypond.org/index.de.html

2016-10-22 Thread Simon Albrecht

On 22.10.2016 16:03, Malte Meyn wrote:
line 75: “Sehen sie mehr in Beispiele an!” -> “Sehen Sie mehr unter 
Beispiele!” 
Even better would be with quotes, and I’d prefer a simple full stop over 
the exclamation mark:

Sehen Sie mehr unter „Beispiele“.

Best, Simon

___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


Re: Download links missing at http://lilypond.org/index.de.html

2016-10-22 Thread Jean-Charles Malahieude

Le 21/10/2016 à 22:35, Malte Meyn a écrit :

The german version of index.html is missing the right column with
download and manual links.



My German writing is very old, but here is a patch.
If any gentle German would kindly proofread…

Cheers,
Jean-Charles
>From ae0ced1be1617970e9ff8748ae018399e3ab1f46 Mon Sep 17 00:00:00 2001
From: Jean-Charles Malahieude 
Date: Sat, 22 Oct 2016 15:30:20 +0200
Subject: [PATCH] web-de: update the frontpage

---
 Documentation/de/web.texi | 65 ++-
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/Documentation/de/web.texi b/Documentation/de/web.texi
index 262afd8..55fe1fc 100644
--- a/Documentation/de/web.texi
+++ b/Documentation/de/web.texi
@@ -1,6 +1,6 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
 @ignore
-Translation of GIT committish: 5b6ddab894b3065c35c72ef8048b8c6edbe684ac
+Translation of GIT committish: 901f7ff2acbb996f1e726607f3f8e921c5e1ddd3
 
 When revising a translation, copy the HEAD committish of the
 version that you are working on.  For details, see the Contributors'
@@ -135,13 +135,66 @@ Lesen Sie mehr in der @ref{Einleitung}!
 @divEnd
 
 
-@divId{news}
+@divId{homepage-main}
+
+@divClass{column-center-top}
+
+@subheading Schöner Notensatz
+
+@c This example image is the image from the website version of the essay
+@c manual, downloaded to the pictures directory for use on the home page.
+@c Large version is generated manually from ly file in pictures directory.
+@divId{homepage-example-image-wrapper}
+@imageClickable{bwv861-lilypond,png,,bwv861-lilypond-large,png,center}
+@divEnd
+
+@ifclear web_version
+  @c no anchor links, just text
+
+LilyPond ist ist ein sehr mächtiges und flexibles Werkzeug, dass Notensatz
+der unterschiedlichsten Art handhaben kann, wie zum Beispiel klassische
+Musik (wie dieses Orgelpräludium von J. S. Bach), komplexe Notation,
+alte Musik, moderne Musik, Tabulatur, Vokalmusik, Popmusik, Anwendung in
+der Musikerziehung, große Projekte, individuelle Ausgabe ebenwie
+Schenker Graphen.
+
+@end ifclear
+@ifset web_version
+  @c anchor links, link to individual examples by their  tag
+  @c Translators should use the localized anchor name
+  @c (e.g. examples.html#Musica-Antica)
+  @c to be found in out-www/web/examples.LL.html
+
+LilyPond ist ist ein sehr mächtiges und flexibles Werkzeug, dass Notensatz
+der unterschiedlichsten Art handhaben kann, wie zum Beispiel
+@uref{examples.html#Klassische-Musik, klassische Musik}
+(wie dieses Orgelpräludium von J. S. Bach),
+@uref{examples.html#Komplexe-Notation, komplexe Notation},
+@uref{examples.html#Alte-Musik, alte Musik},
+@uref{examples.html#Moderne-Musik, moderne Musik},
+@uref{examples.html#Tablatur, Tablatur},
+@uref{examples.html#Vokalmusik, Vokalmusik},
+@uref{examples.html#Popmusik, Popmusik},
+@uref{examples.html#Anwendung-in-der-Musikerziehung, Anwendung in der Musikerziehung},
+@uref{examples.html#Grosse-Projekte, große Projekte},
+@uref{examples.html#Individuelle-Ausgabe, individuelle Ausgabe},
+ebenwiwe
+@uref{examples.html#Schenker-Graphen, Schenker Graphen}.
+
+@end ifset
+
+Sehen sie mehr in @ref{Beispiele} an!
+
+@divEnd
+
+@divClass{column-center-middle-color2}
+@subheading Neuigkeiten
 
 @c TODO: generate this automatically, including RSS feed.
-@include web/news-front.itexi
+@include web/news-headlines.itexi
+
+@ref{News, Weitere Neuigkeiten...}
 
-@divClass{float-right}
-(@ref{Ältere Neuigkeiten})
 @divEnd
 
 @divEnd
@@ -152,7 +205,7 @@ Lesen Sie mehr in der @ref{Einleitung}!
 @end ifclear
 @ifset web_version
   @c make the side bar:
-@divId{homePageSideBar}
+@divId{homepage-sidebar}
 @subheading Stabile Version
 
 @c TODO: javascript to detect OS and suggest download?
-- 
2.10.1

___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


Re: Setting rehearsal mark value in non=default context

2016-10-22 Thread Timothy Lanfear

On 22/10/16 11:37, Phil Holmes wrote:

Please see

http://lilypond.1069038.n5.nabble.com/Mark-numbering-incorrect-at-staff-level-td195296.html 



for exactly the same situation.



Thanks for the pointer to the solution.

--
Timothy Lanfear, Bristol, UK.


___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond


Re: Setting rehearsal mark value in non=default context

2016-10-22 Thread Phil Holmes
"Timothy Lanfear"  wrote in message 
news:77070572-ed1b-720d-553d-d6e1fcac8...@lanfear.me...
An integer argument to \mark is not respected if the mark engraver is 
moved from the Score context. The example creates rehearsal marks "A", 
"B", not "A", "C".


\version "2.19.49"

\layout {
  \context {
\Score
\remove "Mark_engraver"
\remove "Staff_collecting_engraver"
  }
  \context {
\Staff
\consists "Mark_engraver"
\consists "Staff_collecting_engraver"
  }
}

<<
  \new Staff { R1 R1 R1 }
  \new Staff { R1 \mark \default R1 \mark #3 R1 }
>>

--

Timothy Lanfear, Bristol, UK.


Please see

http://lilypond.1069038.n5.nabble.com/Mark-numbering-incorrect-at-staff-level-td195296.html

for exactly the same situation.

--
Phil Holmes



___
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond