Issue 4962: Web: home page: add example image, reduce news to headlines

The example image is the excerpt from Bach BWV 861 from the essay.
Anchor links are used to link to specific examples on the examples
page.  The news entries on the home page are reduced to just a list
of headlines that link to specific entries on the 'Old News' page
(under 'Community').  And that page is renamed to just 'News'.

diff --git a/Documentation/ca/macros.itexi b/Documentation/ca/macros.itexi
index 6e14cb3b0b84998e0191ff1e2bb116540136a002..2fe43ab603d58d0ce26fc7015e89021aff37be12 100644 (file)
--- a/Documentation/ca/macros.itexi
+++ b/Documentation/ca/macros.itexi
@@ -747,7 +747,7 @@ Per a la versió del LilyPond @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/ca/web/community.itexi b/Documentation/ca/web/community.itexi
index c8eba165de0035dc2483376631c2510a8a37300c..43507271a514aca662e277d753ecec22310a7d86 100644 (file)
--- a/Documentation/ca/web/community.itexi
+++ b/Documentation/ca/web/community.itexi
@@ -1196,7 +1196,7 @@ que introduís més advertiments dels que hi ha actualment.
 
 @node Notícies antigues
 @unnumberedsec Notícies antigues
-@translationof Old news
+@translationof News
 
 @divClass{heading-center}
 @warning{Hi ha molts anuncis i registres de canvi antics a les

diff --git a/Documentation/cs/macros.itexi b/Documentation/cs/macros.itexi
index 14c7dd9770ff18c3c94cd7f50776bf971da41976..85be1a1404e8eb14897eee3edc2d3b55b4234006 100644 (file)
--- a/Documentation/cs/macros.itexi
+++ b/Documentation/cs/macros.itexi
@@ -707,7 +707,7 @@ Pro LilyPond ve verzi @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/cs/web.texi b/Documentation/cs/web.texi
index 255ade40320740d81dc37c70f32b24f0e5273305..1c3680ff1310967f03954077ed3afc54c6457f32 100644 (file)
--- a/Documentation/cs/web.texi
+++ b/Documentation/cs/web.texi
@@ -138,7 +138,7 @@ Více se dočtete v @ref{Úvod,,úvodu}!
 @include web/news-front.itexi
 
 @divClass{float-right}
-(@ref{Old news,,,,Starší novinky})
+(@ref{News,,,,Starší novinky})
 @divEnd
 
 @divEnd

diff --git a/Documentation/cs/web/community.itexi b/Documentation/cs/web/community.itexi
index cdf319690a2cc69a0ea7316263adde98b08b3e72..55829684f157bae6d3f0a270b2873f2ff8156a3e 100644 (file)
--- a/Documentation/cs/web/community.itexi
+++ b/Documentation/cs/web/community.itexi
@@ -848,7 +848,7 @@ příručky se nacházejí na @url{http://lilypond.org}.}
 
 @node Starší novinky
 @unnumberedsec Starší novinky
-@translationof Old news
+@translationof News
 
 @include web/news-front.itexi
 

diff --git a/Documentation/css/lilypond-website.css b/Documentation/css/lilypond-website.css
index 46723fa47f48969c8b60e45cc2b1d683ba4e9b44..e018b49774186c5467fccb989b8f7df228e31c90 100644 (file)
--- a/Documentation/css/lilypond-website.css
+++ b/Documentation/css/lilypond-website.css
@@ -340,11 +340,23 @@ div#quickSummary {
   margin: 0;
 }
 
-div#news {
+#homepage-main {
   padding: 0;
   margin: 0 14em 1em 0;
 }
 
+#homepage-example-image-wrapper {
+  padding: 3em 0em 1.5em;
+}
+
+.example-image-wrapper {
+  padding: 2em 0em 0.5em;
+}
+
+.example-image-wrapper img {
+  padding: 0em 0em 1em;
+}
+
 /* .news-item is styled below with columns */
 
 .testimonial-item {
@@ -367,35 +379,31 @@ div#news {
   padding: 0 0.5em;
 }
 
-div#homePageSideBar {
+#homepage-sidebar {
   position: absolute;
   top: 0;
   right: 0;
   width: 12em;
   text-align: left;
+  /* negate the top-margin of the first .subheading */
+  margin-top: -0.5em;
 }
 
-#homePageSideBar .subheading {
+#homepage-sidebar .subheading {
   font-size: 15.2px;
   background: #5b7f64;
   color: #fff;
-  padding: 0.2em 0.5em 0em 0.7em;
-  margin: 0;
+  padding: 0.2em 0.5em 0.1em 0.7em;
+  margin: 0.5em 0 0.7em;
   border-radius: 5px;
 }
 
-#homePageSideBar p,
+#homepage-sidebar p,
 #pondingsText {
-  padding: 0.7em 0.5em;
+  padding: 0em 0.5em 0.5em;
   margin: 0;
 }
 
-/* for better spacing between "download" and "manuals" links */
-#homePageSideBar p:nth-of-type(2n) {
-  padding-top: 0;
-  margin-top: -3px;
-}
-
 div#footer {
   clear: both;
   width: 100%;
@@ -512,12 +520,15 @@ img.float-right {
 }
 
 div.float-left a.clickable,
-div.float-center a.clickable,
 div.float-right a.clickable {
   text-decoration: overline;
   margin-left: 1em;
 }
 
+div.float-center a.clickable {
+  text-decoration: overline;
+}
+
 .clear-both {
   clear: both;
 }

diff --git a/Documentation/de/macros.itexi b/Documentation/de/macros.itexi
index 1a41265bd47625be465e22e9a4cd5318da099c47..df1a8c3f1c42074cd36daeee08cb7da3197474d3 100644 (file)
--- a/Documentation/de/macros.itexi
+++ b/Documentation/de/macros.itexi
@@ -740,7 +740,7 @@ Für LilyPond Version @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/de/web/community.itexi b/Documentation/de/web/community.itexi
index de6578eec86abfb082532a160e104ba0de2dbc4f..9b3c480191fef0362b3fa49a3231ce75a3cdd6cd 100644 (file)
--- a/Documentation/de/web/community.itexi
+++ b/Documentation/de/web/community.itexi
@@ -1203,7 +1203,7 @@ automatisiert Patches, die zusätzliche Warnungen erzeugen, abzulehnen.
 
 @node Ältere Neuigkeiten
 @unnumberedsec Ältere Neuigkeiten
-@translationof Old news
+@translationof News
 
 @divClass{heading-center}
 @warning{Viele alte Ankündigungen und Listen der Änderungen finden sich in der

diff --git a/Documentation/es/macros.itexi b/Documentation/es/macros.itexi
index 58c40c19b84adcfdb64b09454cd58636ce27d8a4..eeba20876c565c8133921edddbf5ff4bd098d97f 100644 (file)
--- a/Documentation/es/macros.itexi
+++ b/Documentation/es/macros.itexi
@@ -746,7 +746,7 @@ Para la versión de LilyPond @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/es/web/community.itexi b/Documentation/es/web/community.itexi
index cdbf9c870dfb1973e884fa8fee694c7139338fa2..173b0790973b3853b7c29c218ac9386674e17f95 100644 (file)
--- a/Documentation/es/web/community.itexi
+++ b/Documentation/es/web/community.itexi
@@ -1312,7 +1312,7 @@ ellos disponible para el GSoC 2016)
 
 @node Noticias antiguas
 @unnumberedsec Noticias antiguas
-@translationof Old news
+@translationof News
 
 @divClass{heading-center}
 @warning{Hay muchos anuncios y registros de cambio antiguos en el

diff --git a/Documentation/fr/macros.itexi b/Documentation/fr/macros.itexi
index 698fe2084526d9d3bf9cdd04e7c83fe3ac6e5069..52f0e005b4c003c45fa5ec6a60b8949416c95752 100644 (file)
--- a/Documentation/fr/macros.itexi
+++ b/Documentation/fr/macros.itexi
@@ -770,7 +770,7 @@ Pour LilyPond version @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/fr/web.texi b/Documentation/fr/web.texi
index 6268bd6e899c856ca52c873927c145e422687b7f..db1fb7fba069df06290e6c99bc4968632a13471c 100644 (file)
--- a/Documentation/fr/web.texi
+++ b/Documentation/fr/web.texi
@@ -143,7 +143,7 @@ Plus sur LilyPond dans notre @ref{Introduction} !
 @include web/news-front.itexi
 
 @divClass{float-right}
-(@ref{Archives}) @c (@ref{Old news,,,,Actualités passées})
+(@ref{Archives}) @c (@ref{News,,,,Actualités passées})
 @divEnd
 
 @divEnd

diff --git a/Documentation/fr/web/community.itexi b/Documentation/fr/web/community.itexi
index 4ad3c3db92ded85586a5e0ba57ac39c0791adb08..4e3cf58db6f1eb018d65afa3853988978a365cf7 100644 (file)
--- a/Documentation/fr/web/community.itexi
+++ b/Documentation/fr/web/community.itexi
@@ -1348,7 +1348,7 @@ indisponibles pour le GSoc 2016)
 
 @node Archives
 @unnumberedsec Archives
-@translationof Old news
+@translationof News
 
 @divClass{heading-center}
 @warning{Les vieilles annonces et informations de version sont rangées au

diff --git a/Documentation/hu/macros.itexi b/Documentation/hu/macros.itexi
index 78cf9a3fa70f6c53292483e79982112dc74d889f..44c61911bd9f09351f2cceb84530e8a2fed928e5 100644 (file)
--- a/Documentation/hu/macros.itexi
+++ b/Documentation/hu/macros.itexi
@@ -697,7 +697,7 @@ A LilyPond @version{} verziójához
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/it/macros.itexi b/Documentation/it/macros.itexi
index 5847b695e2191150f301042e89cfb4eefd49da88..66b327ae2b052c9271db4af59a9714e35877373b 100644 (file)
--- a/Documentation/it/macros.itexi
+++ b/Documentation/it/macros.itexi
@@ -746,7 +746,7 @@ Per la versione di LilyPond @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/it/web/community.itexi b/Documentation/it/web/community.itexi
index a7d974919a333f8f18aa65a8111b82ce1e221e37..2e39f5c19520109fb38fc45ba5522ea5ef298442 100644 (file)
--- a/Documentation/it/web/community.itexi
+++ b/Documentation/it/web/community.itexi
@@ -1274,7 +1274,7 @@ per GSoC 2016)
 
 @node Notizie vecchie
 @unnumberedsec Notizie vecchie
-@translationof Old news
+@translationof News
 
 @divClass{heading-center}
 @warning{Molti dei vecchi annunci e changelog si possono trovare

diff --git a/Documentation/ja/macros.itexi b/Documentation/ja/macros.itexi
index 2530ab362a328c6f5a617166182d7ffe2387b952..4f11299db59ea0212aa482b3279955e2f6a6fbe3 100644 (file)
--- a/Documentation/ja/macros.itexi
+++ b/Documentation/ja/macros.itexi
@@ -722,7 +722,7 @@ LilyPond バージョン @version{} 用
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/ja/web/community.itexi b/Documentation/ja/web/community.itexi
index 8be2657353efa65c9e4f7781e702c3eb6e625f59..7ff19e5ba23b2a5a482b1897b2e5bf29161af654 100644 (file)
--- a/Documentation/ja/web/community.itexi
+++ b/Documentation/ja/web/community.itexi
@@ -1269,7 +1269,7 @@ GSoC 2016)
 
 @node 古いニュース
 @unnumberedsec 古いニュース
-@translationof Old news
+@translationof News
 
 @divClass{heading-center}
 @warning{多くの古いアナウンスと変更履歴が @ref{物置} で見つかります。}

diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index cc09619dccbfdc4f3fe6a3838c5fb3f639e8df98..3558d0c811f82dc0e1539b15ac3e190b4b42916d 100644 (file)
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -733,7 +733,7 @@ For LilyPond version @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/nl/macros.itexi b/Documentation/nl/macros.itexi
index 2f82070f2ccf878460793425420a9a0cdc2eabf1..4de99bb1d4cadf514ce7d67f9a67d68e74973cbe 100644 (file)
--- a/Documentation/nl/macros.itexi
+++ b/Documentation/nl/macros.itexi
@@ -754,7 +754,7 @@ Voor LilyPond versie @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/nl/web.texi b/Documentation/nl/web.texi
index e977208b102677555fc1ce7915373ac102188993..783e26a3484a260bd86f23dd2bb379af1ca50938 100644 (file)
--- a/Documentation/nl/web.texi
+++ b/Documentation/nl/web.texi
@@ -140,7 +140,7 @@ Lees meer in onze @ref{Inleiding}!
 @include web/news-front.itexi
 
 @divClass{float-right}
-(@ref{Old news}) @c (@ref{Old news,,,,Oud nieuws})
+(@ref{News}) @c (@ref{News,,,,Oud nieuws})
 @divEnd
 
 @divEnd

diff --git a/Documentation/pictures/bwv861-lilypond-large.ly b/Documentation/pictures/bwv861-lilypond-large.ly
new file mode 100644 (file)
index 0000000..b14f093
--- /dev/null
+++ b/Documentation/pictures/bwv861-lilypond-large.ly
@@ -0,0 +1,105 @@
+\version "2.19.48"
+
+% Engrave to png with these options to create
+% the large version of image for home page:
+% -dno-point-and-click --png -dresolution=300
+
+% The small version you see on the home page
+% itself is simply the image from the essay manual,
+% downloaded from the website version of the
+% essay manual.
+
+\layout {
+  line-width = 15.9 \cm
+}
+
+\paper {
+  indent = 0
+  paper-height = 8 \cm
+  paper-width = 18 \cm
+}
+
+\header {
+  tagline = ##f
+}
+
+#(set-global-staff-size 14.3)
+
+
+global = { \key g \minor }
+
+partI = \relative {
+  \voiceOne
+  fis'8 d' ees g, fis4 g
+  r8 a16 bes c8 bes16 a d8 r r4
+  r2 r8 d16 ees f8 ees16 d
+  ees4 ~ 16 d c bes a4 r8 ees'16 d
+  c8 d16 ees d8 e16 fis g8 fis16 g a4 ~
+  8 d, g f ees d c bes
+  a2 g \fermata \bar "|."
+}
+
+partII = \relative {
+  \voiceTwo
+  d'4 r4 r8 d'16 c bes8 c16 d
+  ees8 d c ees a, r r4
+  r8 fis16 g a8 g16 fis g2 ~
+  2 r8 d' ees g,
+  fis4 g r8 a16 bes c8 bes16 a
+  bes4. <g b>8 <a c> r <d, g> r
+  <ees g>4 <d fis> d2
+}
+
+partIII = \relative {
+  \voiceOne
+  r2 r8 d' ees g, fis4 g r8 a16 bes c8 bes16 a
+  bes2 ~ 8 b16 a g8 a16 b
+  c4 r r2
+  R1
+  r8 d ees g, fis4 g
+  r8 a16 bes c8 bes16 a b2
+}
+
+partIV = \relative {
+  \voiceTwo
+  d4 r r2
+  r8 d ees g, fis4 a
+  d,8 d'16 c bes8 c16 d ees2 ~
+  8 ees16 d c8 d16 ees fis,8 a16 g fis8 g16 a
+  d,8 d'16 c bes8 c16 d ees8 c a fis'
+  g f ees d c bes a g
+  c a d d, g2 \fermata
+}
+
+\score {
+  <<
+    % \set Score.barNumberVisibility = #all-bar-numbers-visible
+    % required in 2.13
+    \set Score.currentBarNumber = #28
+    \bar ""
+    \new PianoStaff <<
+      \new Staff = "RH" <<
+        \global
+        \new Voice = "voiceI" { \partI }
+        \new Voice = "voiceII" { \partII }
+      >>
+
+      \new Staff = "LH" <<
+        \clef "bass"
+        \global
+        \new Voice = "voiceIII" { \partIII }
+        \new Voice = "voiceIV" { \partIV }
+      >>
+    >>
+  >>
+  \layout {
+    \context {
+      \Staff
+      \remove "Time_signature_engraver"
+    }
+    \context {
+      \PianoStaff
+      \override StaffGrouper.staff-staff-spacing.padding = #1
+    }
+  }
+}

diff --git a/Documentation/pictures/bwv861-lilypond-large.png b/Documentation/pictures/bwv861-lilypond-large.png
new file mode 100644 (file)
index 0000000..099fe3d
Binary files /dev/null and b/Documentation/pictures/bwv861-lilypond-large.png differ

diff --git a/Documentation/pictures/bwv861-lilypond.png b/Documentation/pictures/bwv861-lilypond.png
new file mode 100644 (file)
index 0000000..b3a7e31
Binary files /dev/null and b/Documentation/pictures/bwv861-lilypond.png differ

diff --git a/Documentation/web.texi b/Documentation/web.texi
index 935f8e8b78f61045e74586cee8ff791653e5b229..15e568c52e1e191b1e552fe3641419fe61623769 100644 (file)
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -133,13 +133,62 @@ Read more in our @ref{Introduction}!
 @divEnd
 
 
-@divId{news}
+@divId{homepage-main}
+
+@divClass{column-center-top}
+
+@subheading Beautiful Sheet Music
+
+@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 is a powerful and flexible tool for engraving tasks of
+all kinds, for example classical music (like the example above by J.S.
+Bach), complex notation, early music, modern music, tablature,
+vocal music, lead sheets, educational materials, large
+orchestral projects, customized output, and even Schenker graphs.
+
+@end ifclear
+@ifset web_version
+  @c anchor links, link to individual examples by their <a> tag
+
+LilyPond is a powerful and flexible tool for engraving tasks of
+all kinds, for example
+@uref{http://lilypond.org/examples.html#Classical-Music, classical music}
+(like the example above by J.S. Bach),
+@uref{examples.html#Complex-Notation, complex notation},
+@uref{examples.html#Early-Music, early music},
+@uref{examples.html#Modern-Music, modern music},
+@uref{examples.html#Tablature, tablature},
+@uref{examples.html#Vocal-Music, vocal music},
+@uref{examples.html#Lead-Sheets, lead sheets},
+@uref{examples.html#Educational-Applications, educational materials},
+@uref{examples.html#Large-Projects, large orchestral projects},
+@uref{examples.html#Customized-Output, customized output},
+and even
+@uref{examples.html#Schenker-Graphs, Schenker graphs}.
+
+@end ifset
+
+Browse our gallery of @ref{Examples} and be inspired!
+
+@divEnd
+
+@divClass{column-center-middle-color2}
+@subheading News
 
 @c TODO: generate this automatically, including RSS feed.
-@include web/news-front.itexi
+@include web/news-headlines.itexi
+
+@ref{News, More news...}
 
-@divClass{float-right}
-(@ref{Old news})
 @divEnd
 
 @divEnd
@@ -150,7 +199,7 @@ Read more in our @ref{Introduction}!
 @end ifclear
 @ifset web_version
   @c make the side bar:
-@divId{homePageSideBar}
+@divId{homepage-sidebar}
 @subheading Stable Release
 
 @c TODO: javascript to detect OS and suggest download?

diff --git a/Documentation/web/community.itexi b/Documentation/web/community.itexi
index 31b400fa893909c31ff9e907bce19cc34c8f651a..0cad92d7155fb12fe885442a45d2ff46303c5f47 100644 (file)
--- a/Documentation/web/community.itexi
+++ b/Documentation/web/community.itexi
@@ -69,7 +69,7 @@ discussing LilyPond.
 @ref{Publications}: what we wrote, and have had written about us.
 
 @item
-@ref{Old news}: an archive.
+@ref{News}: news from the LilyPond project.
 
 @item
 @ref{Attic}: announcements and changelogs from past versions.
@@ -91,7 +91,7 @@ discussing LilyPond.
 * Authors::
 * Acknowledgements::
 * Publications::
-* Old news::
+* News::
 * Attic::
 @end menu
 @divEnd
@@ -1253,8 +1253,8 @@ GSoC 2016)
 @contactUsAbout{academic papers}
 
 
-@node Old news
-@unnumberedsec Old news
+@node News
+@unnumberedsec News
 
 @divClass{heading-center}
 @warning{Many old announcements and changelogs can be found in

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index 2ea2085ab9ef85d467223b315269e601b9bd0063..a3bde1bf941c20acda44a2edf049ab14c27f001b 100644 (file)
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -303,7 +303,7 @@ already decided to try LilyPond, first read about our
 
 @divClass{column-center-top}
 
-@subheading Beautiful examples
+@subheading Beautiful Examples
 
 LilyPond is a powerful and flexible tool for engraving tasks of
 all kinds.  Please browse our gallery of examples and be inspired!
@@ -420,9 +420,9 @@ Here is an example of a simple counterpoint exercise.
 @divEnd
 
 @divClass{column-center-middle-color2}
-@subheading Popular Music
+@subheading Lead Sheets
 
-It is simple to create pop lead sheets with melody, lyrics,
+It is simple to create lead sheets with melody, lyrics,
 chord names, and fretboards.  In this example you see some of the
 predefined fretboard diagrams, but these can be heavily customized
 to suit nearly any situation.

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index d9a715518bac1898db74ce6cad20bbf566a486ec..38df72c557877241932d7b62c08013e22be7ed56 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -1,12 +1,12 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-web.texi and community.itexi
+@c This file is part of community.itexi
 
 @c when you add a new item, consider moving the lowest item(s)
 @c into news.itexi.
 
 @c keep two blank lines between news entries
 
-@c used for news about the upcoming release; see CG 10.2
+@c used for news about the upcoming release; see CG on Release Work
 
 @newsItem
 @subheading LilyPond 2.19.48 released  @emph{September 13, 2016}

diff --git a/Documentation/web/news-headlines.itexi b/Documentation/web/news-headlines.itexi
new file mode 100644 (file)
index 0000000..e5154c6
--- /dev/null
+++ b/Documentation/web/news-headlines.itexi
@@ -0,0 +1,38 @@
+@c -*- coding: utf-8; mode: texinfo; -*-
+@c This file is used in the web.texi file.
+
+@c when you add a new item, consider removing the lowest item(s)
+
+@c used for news about the upcoming release; see CG on Release Work
+
+@c We use @uref for the actual website to link to individual news items
+@c by their <a> tags.  We use @ref for other output formats.
+
+@ifclear web_version
+  @c no anchor links, just link to News page
+
+@ref{News, LilyPond 2.19.47 released - @emph{August 13, 2016}}
+
+@ref{News, Two LilyPond projects in Google Summer of Code 2016 - @emph{April 23, 2016}}
+
+@ref{News, LilyPond 2.18.2 released! - @emph{March 23, 2014}}
+
+@ref{News, LilyPond 2.18.0 released! - @emph{December 29, 2013}}
+
+@end ifclear
+@ifset web_version
+  @c anchor links, link to individual news items by their <a> tag
+
+@uref{news.html#LilyPond-2_002e19_002e47-released-August-13_002c-2016,
+  LilyPond 2.19.47 released - @emph{August 13, 2016}}
+
+@uref{news.html#Two-LilyPond-projects-in-Google-Summer-of-Code-2016-April-23_002c-2016,
+  Two LilyPond projects in Google Summer of Code 2016 - @emph{April 23, 2016}}
+
+@uref{news.html#LilyPond-2_002e18_002e2-released_0021-March-23_002c-2014,
+  LilyPond 2.18.2 released! - @emph{March 23, 2014}}
+
+@uref{news.html#LilyPond-2_002e18_002e0-released_0021-December-29_002c-2013,
+  LilyPond 2.18.0 released! - @emph{December 29, 2013}}
+
+@end ifset

diff --git a/Documentation/zh/macros.itexi b/Documentation/zh/macros.itexi
index 5289304b1380a291c213c59fba7c1bd657db6493..69fc85ec77c346f1ca6fb5c142333fa08e2b3f47 100644 (file)
--- a/Documentation/zh/macros.itexi
+++ b/Documentation/zh/macros.itexi
@@ -732,7 +732,7 @@ LilyPond 版本 @version{}
 
 @macro exampleImage{IMAGE-FILE}
 @html
-<div class="float-center">
+<div class="float-center example-image-wrapper">
   <a class="clickable" href="ly-examples/\IMAGE-FILE\.png">
     <img src="ly-examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>

diff --git a/Documentation/zh/web/community.itexi b/Documentation/zh/web/community.itexi
index 5e3efa38cab44aa5dc1e06db618bf49d6bf1bfc3..78208bae211ae7bd7ea645f269b8bae3c96209cf 100644 (file)
--- a/Documentation/zh/web/community.itexi
+++ b/Documentation/zh/web/community.itexi
@@ -68,7 +68,7 @@ discussing LilyPond.
 @ref{Publications}: what we wrote, and have had written about us.
 
 @item
-@ref{Old news}: an archive.
+@ref{News}: an archive.
 
 @item
 @ref{Attic}: announcements and changelogs from past versions.
@@ -1152,7 +1152,7 @@ any patch which introduced extra warnings.
 
 @node 旧闻
 @unnumberedsec 旧闻
-@translationof Old news
+@translationof News
 
 @divClass{heading-center}
 @warning{Many old announcements and changelogs can be found in