Web: contact us macro for review/papers/etc (1207)

diff --git a/Documentation/css/lilypond-web.css b/Documentation/css/lilypond-web.css
index 0ed563b4d1215ad4025ec82d3337f65ae5c21804..a6f6f9b669fa127dd8d6db336924d6f18a6c35fd 100644 (file)
--- a/Documentation/css/lilypond-web.css
+++ b/Documentation/css/lilypond-web.css
@@ -919,6 +919,21 @@ div.color4 h3 {
   margin: 0;
 }
 
+.contactBox {
+  float: left;
+  background: #eef;
+  text-align: left;
+  border: 1px solid green;
+  padding: 0;
+  margin: 1em;
+}
+
+.contactBox p {
+  padding: 0.5em;
+  margin: 0;
+}
+
+
 .hide {
   position: relative;
   text-indent: -999em;

diff --git a/Documentation/web.texi b/Documentation/web.texi
index ac7db3cca9148fbad6a231a98e89493032fa2750..b56b4643035ce7f2a944194a1dc863fadc4619d6 100644 (file)
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -277,11 +277,32 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @end macro
 
 
-@macro contactUs{}
+@ifhtml
+@macro contactUsAbout{topic}
 
+@divClass{heading-center}
+@divClass{contactBox}
+If you are aware of any other \topic\ which could be listed here,
+please let us know by following the instructions on
+@ref{Bug reports}.
 
+@divEnd
+@divEnd
+
+@end macro
+@end ifhtml
+
+@ifnothtml
+@macro contactUsAbout{topic}
+@cartouche
+If you are aware of any other \topic\ which could be listed here,
+please let us know by following the instructions on
+@ref{Bug reports}.
+
+@end cartouche
 
 @end macro
+@end ifnothtml
 
 @include web/introduction.itexi
 @include web/download.itexi

diff --git a/Documentation/web/community.itexi b/Documentation/web/community.itexi
index 88f4eadd1747ccb6a968b67b4464120ac33f0a3c..d8157d403b6dfccc0d924519c31f71bea4a727fd 100644 (file)
--- a/Documentation/web/community.itexi
+++ b/Documentation/web/community.itexi
@@ -805,7 +805,6 @@ manuals can be found at @url{http://lilypond.org}}
 @divEnd
 @divEnd
 
-
 @divClass{column-center-bottom}
 
 @subheading What people did with LilyPond
@@ -818,6 +817,8 @@ manuals can be found at @url{http://lilypond.org}}
 @divEnd
 @divEnd
 
+@contactUsAbout{academic papers}
+
 
 @node Old news
 @unnumberedsec Old news

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index 69dcce78d26d47725cb2c853cbc42d90da061705..a15224c24513f553f27f4d994c206625ecd4e905 100644 (file)
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -560,6 +560,7 @@ lovers.
 
 @divEnd
 
+@contactUsAbout{concerts or sheet music}
 
 @divClass{column-center-bottom}
 @subheading Where now?
@@ -850,6 +851,8 @@ I want on the page, especially when it isn't "standard" practice.}
 
 @divEnd
 
+@contactUsAbout{news articles or testimonals}
+
 @divClass{column-center-bottom}
 @subheading Where now?