CVSROOT: /cvsroot/lilypond
Module name: newweb
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/15 12:58:39
Modified files:
. : ChangeLog GNUmakefile
po : fr.po newweb.pot nl.po
site/graphics : annotate-example-parts.svg
Log message:
* site/graphics/annotate-example-parts.svg: clean up text placement.
* GNUmakefile: use --export-area-drawing iso. convert -crop.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/newweb/ChangeLog.diff?tr1=1.245&tr2=1.246&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/newweb/GNUmakefile.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/newweb/po/fr.po.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/newweb/po/newweb.pot.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/newweb/po/nl.po.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/newweb/site/graphics/annotate-example-parts.svg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: newweb/ChangeLog
diff -u newweb/ChangeLog:1.245 newweb/ChangeLog:1.246
--- newweb/ChangeLog:1.245 Wed Jun 15 12:26:17 2005
+++ newweb/ChangeLog Wed Jun 15 12:58:39 2005
@@ -1,5 +1,9 @@
2005-06-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * site/graphics/annotate-example-parts.svg: clean up text placement.
+
+ * GNUmakefile: use --export-area-drawing iso. convert -crop.
+
* site/install/devel.ihtml: add 2.5.31-2 for MOS-X
2005-06-14 Han-Wen Nienhuys <[EMAIL PROTECTED]>
Index: newweb/GNUmakefile
diff -u newweb/GNUmakefile:1.73 newweb/GNUmakefile:1.74
--- newweb/GNUmakefile:1.73 Tue Jun 14 10:53:32 2005
+++ newweb/GNUmakefile Wed Jun 15 12:58:39 2005
@@ -41,8 +41,7 @@
INKSCAPE = inkscape
%.png: %.svg GNUmakefile
- -$(INKSCAPE) [EMAIL PROTECTED] --export-background-opacity=0 $<
- -convert -crop 0x0 [EMAIL PROTECTED] $@ && rm [EMAIL PROTECTED]
+ -$(INKSCAPE) --export-area-drawing --export-png=$@
--export-background-opacity=0 $<
out/site/%.$(LANG).png: $(LANG)/%.png
-cp $< $@
Index: newweb/po/fr.po
diff -u newweb/po/fr.po:1.1 newweb/po/fr.po:1.2
--- newweb/po/fr.po:1.1 Tue Jun 14 11:01:15 2005
+++ newweb/po/fr.po Wed Jun 15 12:58:39 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-14 12:54+0200\n"
+"POT-Creation-Date: 2005-06-15 14:59+0200\n"
"PO-Revision-Date: 2005-06-12 19:39+0200\n"
"Last-Translator: Jean-Charles Malahieude <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -223,10 +223,12 @@
msgstr "Combiner la mélodie et les paroles"
#: site/graphics/annotate-example-parts.svg:165
+#: site/graphics/annotate-example-parts.svg:163
msgid "Enter multi-rest"
msgstr "Entrer des mesures à compter"
#: site/graphics/annotate-example-parts.svg:178
+#: site/graphics/annotate-example-parts.svg:175
msgid "Store notes in variable"
msgstr "Stocker des notes sous forme de variable"
Index: newweb/po/newweb.pot
diff -u newweb/po/newweb.pot:1.29 newweb/po/newweb.pot:1.30
--- newweb/po/newweb.pot:1.29 Wed Jun 15 10:50:11 2005
+++ newweb/po/newweb.pot Wed Jun 15 12:58:39 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-15 07:47-0300\n"
+"POT-Creation-Date: 2005-06-15 15:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -223,10 +223,12 @@
msgstr ""
#: site/graphics/annotate-example-parts.svg:165
+#: site/graphics/annotate-example-parts.svg:163
msgid "Enter multi-rest"
msgstr ""
#: site/graphics/annotate-example-parts.svg:178
+#: site/graphics/annotate-example-parts.svg:175
msgid "Store notes in variable"
msgstr ""
@@ -284,11 +286,13 @@
#: site/graphics/annotate-example-parts.svg:44
#: site/graphics/annotate-example-score.svg:50
+#: site/graphics/annotate-example-parts.svg:42
msgid "hornNotes"
msgstr ""
#: site/graphics/annotate-example-parts.svg:72
#: site/graphics/annotate-example-score.svg:54
+#: site/graphics/annotate-example-parts.svg:70
msgid "bassoonNotes"
msgstr ""
Index: newweb/po/nl.po
diff -u newweb/po/nl.po:1.26 newweb/po/nl.po:1.27
--- newweb/po/nl.po:1.26 Tue Jun 14 10:53:33 2005
+++ newweb/po/nl.po Wed Jun 15 12:58:39 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-14 12:54+0200\n"
+"POT-Creation-Date: 2005-06-15 15:01+0200\n"
"PO-Revision-Date: 2005-05-30 19:59+0200\n"
"Last-Translator: Tineke de Munnik <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -223,10 +223,12 @@
msgstr "Combineer melodie en liedtekst"
#: site/graphics/annotate-example-parts.svg:165
+#: site/graphics/annotate-example-parts.svg:163
msgid "Enter multi-rest"
msgstr "Voer meermaatse rust in"
#: site/graphics/annotate-example-parts.svg:178
+#: site/graphics/annotate-example-parts.svg:175
msgid "Store notes in variable"
msgstr "Bewaar noten in variabele"
@@ -284,11 +286,13 @@
#: site/graphics/annotate-example-parts.svg:44
#: site/graphics/annotate-example-score.svg:50
+#: site/graphics/annotate-example-parts.svg:42
msgid "hornNotes"
msgstr "hoornNoten"
#: site/graphics/annotate-example-parts.svg:72
#: site/graphics/annotate-example-score.svg:54
+#: site/graphics/annotate-example-parts.svg:70
msgid "bassoonNotes"
msgstr "fagotNoten"
Index: newweb/site/graphics/annotate-example-parts.svg
diff -u newweb/site/graphics/annotate-example-parts.svg:1.3
newweb/site/graphics/annotate-example-parts.svg:1.4
--- newweb/site/graphics/annotate-example-parts.svg:1.3 Thu May 26 20:42:23 2005
+++ newweb/site/graphics/annotate-example-parts.svg Wed Jun 15 12:58:39 2005
@@ -1,195 +1,192 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";>
<!-- Created with Sodipodi ("http://www.sodipodi.com/";) -->
<svg
- xml:space="preserve"
- id="svg548"
- sodipodi:version="0.32"
- width="210mm"
- height="297mm"
- sodipodi:docname="example-parts.svg"
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
xmlns:xml="http://www.w3.org/XML/1998/namespace";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- xmlns:xlink="http://www.w3.org/1999/xlink";
- inkscape:version="0.39"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:cc="http://web.resource.org/cc/";
xmlns:dc="http://purl.org/dc/elements/1.1/";
- sodipodi:docbase="/home/hanwen/usr/src/savannah/lily/newweb/site/switch">
+ xmlns:cc="http://web.resource.org/cc/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ sodipodi:docbase="/home/hanwen/vc/savannah/lily/newweb/site/graphics"
+ inkscape:version="0.41+cvs"
+ sodipodi:docname="annotate-example-parts.svg"
+ height="297mm"
+ width="210mm"
+ sodipodi:version="0.32"
+ id="svg548"
+ xml:space="preserve">
<defs
id="defs550" />
<sodipodi:namedview
- id="base"
- inkscape:zoom="1.7341938"
- inkscape:cx="297.63779"
- inkscape:cy="420.94487"
- inkscape:window-width="1399"
- inkscape:window-height="1183"
+ inkscape:window-y="40"
inkscape:window-x="24"
- inkscape:window-y="40" />
+ inkscape:window-height="1183"
+ inkscape:window-width="1399"
+ inkscape:cy="420.94487"
+ inkscape:cx="297.63779"
+ inkscape:zoom="1.7341938"
+ id="base" />
<text
- style="fill:black;stroke:none;font-family:Luxi
Mono;font-style:normal;font-weight:bold;font-size:28.000000;fill-opacity:1;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:start;writing-mode:lr;font-stretch:normal;font-variant:normal;"
- x="63.5809479"
- y="283.503632"
+ sodipodi:linespacing="100%"
id="text555"
- sodipodi:linespacing="100%"><tspan
- x="63.580948"
+ y="283.503632"
+ x="63.5809479"
+ style="fill:black;stroke:none;font-family:Luxi
Mono;font-style:normal;font-weight:bold;font-size:28.000000;fill-opacity:1;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:start;writing-mode:lr;font-stretch:normal;font-variant:normal;"><tspan
+ id="tspan1190"
+ sodipodi:role="line"
y="283.50363"
+ x="63.580948">_("hornNotes") =</tspan><tspan
+ id="tspan1192"
sodipodi:role="line"
- id="tspan1190">_("hornNotes") =</tspan><tspan
- x="63.580948"
y="311.50363"
+ x="63.580948">\relative c {</tspan><tspan
+ id="tspan1194"
sodipodi:role="line"
- id="tspan1192">\relative c {</tspan><tspan
- x="63.580948"
y="339.50363"
+ x="63.580948"> \time 2/4</tspan><tspan
+ id="tspan1196"
sodipodi:role="line"
- id="tspan1194"> \time 2/4</tspan><tspan
- x="63.580948"
y="367.50363"
+ x="63.580948"> R2*3</tspan><tspan
+ id="tspan1198"
sodipodi:role="line"
- id="tspan1196"> R2*3</tspan><tspan
- x="63.580948"
y="395.50363"
+ x="63.580948"> r4 f8 a cis4 f e d</tspan><tspan
+ id="tspan1200"
sodipodi:role="line"
- id="tspan1198"> r4 f8 a cis4 f e d</tspan><tspan
- x="63.580948"
y="423.50363"
+ x="63.580948">}</tspan><tspan
+ id="tspan1202"
sodipodi:role="line"
- id="tspan1200">}</tspan><tspan
- x="63.580948"
y="451.50363"
+ x="63.580948" /><tspan
+ id="tspan1204"
sodipodi:role="line"
- id="tspan1202"></tspan><tspan
- x="63.580948"
y="479.50363"
+ x="63.580948">_("bassoonNotes") =</tspan><tspan
+ id="tspan1206"
sodipodi:role="line"
- id="tspan1204">_("bassoonNotes") =</tspan><tspan
- x="63.580948"
y="507.50363"
+ x="63.580948">\relative c {</tspan><tspan
+ id="tspan1208"
sodipodi:role="line"
- id="tspan1206">\relative c {</tspan><tspan
- x="63.580948"
y="535.50363"
+ x="63.580948"> \clef bass</tspan><tspan
+ id="tspan1210"
sodipodi:role="line"
- id="tspan1208"> \clef bass</tspan><tspan
- x="63.580948"
y="563.50363"
+ x="63.580948"> r4 d,8 f gis4 c b bes</tspan><tspan
+ id="tspan1212"
sodipodi:role="line"
- id="tspan1210"> r4 d,8 f gis4 c b bes</tspan><tspan
- x="63.580948"
y="591.50363"
+ x="63.580948"> a8 e f4 g d gis f</tspan><tspan
+ id="tspan1214"
sodipodi:role="line"
- id="tspan1212"> a8 e f4 g d gis f</tspan><tspan
- x="63.580948"
y="619.50363"
+ x="63.580948">}</tspan><tspan
+ id="tspan1216"
sodipodi:role="line"
- id="tspan1214">}</tspan><tspan
- x="63.580948"
y="647.50363"
+ x="63.580948" /><tspan
+ id="tspan1218"
sodipodi:role="line"
- id="tspan1216"></tspan><tspan
- x="63.580948"
y="675.50363"
+ x="63.580948"> </tspan><tspan
+ id="tspan1220"
sodipodi:role="line"
- id="tspan1218"> </tspan><tspan
- x="63.580948"
y="703.50363"
+ x="63.580948" /><tspan
+ id="tspan1222"
sodipodi:role="line"
- id="tspan1220"></tspan><tspan
- x="63.580948"
y="731.50363"
+ x="63.580948" /><tspan
+ id="tspan1224"
sodipodi:role="line"
- id="tspan1222"></tspan><tspan
- x="63.580948"
y="759.50363"
+ x="63.580948" /><tspan
+ id="tspan1226"
sodipodi:role="line"
- id="tspan1224"></tspan><tspan
- x="63.580948"
y="787.50363"
- sodipodi:role="line"
- id="tspan1226"> </tspan></text>
+ x="63.580948"> </tspan></text>
+
<rect
-
style="font-size:12;fill:#01b500;fill-opacity:0.562044;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-opacity:1;"
- id="rect662"
- width="72.4331894"
- height="25.8095703"
+ y="343.849060"
x="93.6635971"
- y="343.849060" />
+ height="25.8095703"
+ width="72.4331894"
+ id="rect662"
+
style="font-size:12;fill:#01b500;fill-opacity:0.562044;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-opacity:1;"
/>
<rect
-
style="font-size:12;fill:#af3738;fill-opacity:0.565217;fill-rule:evenodd;stroke-width:1pt;"
- id="rect663"
- width="203.978513"
- height="31.637497"
+ y="254.764572"
x="55.781881"
- y="254.764572" />
+ height="31.637497"
+ width="203.978513"
+ id="rect663"
+
style="font-size:12;fill:#af3738;fill-opacity:0.565217;fill-rule:evenodd;stroke-width:1pt;"
/>
<rect
-
style="font-size:12;fill:#af3738;fill-opacity:0.565217;fill-rule:evenodd;stroke-width:1pt;"
- id="rect664"
- width="246.439331"
- height="25.8095398"
+ y="456.245392"
x="60.3609848"
- y="456.245392" />
+ height="25.8095398"
+ width="246.439331"
+ id="rect664"
+
style="font-size:12;fill:#af3738;fill-opacity:0.565217;fill-rule:evenodd;stroke-width:1pt;"
/>
<path
-
style="fill:none;fill-rule:evenodd;stroke:#00ad00;stroke-opacity:1;stroke-width:1.875;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
- d="M 166.606 360.625 C 239.606 360.625 356.171 337.076 445.655 338.254 "
+ transform="translate(0.000000,-3.051758e-5)"
id="path665"
- transform="translate(0.000000,-3.051758e-5)" />
+ d="M 166.606 360.625 C 239.606 360.625 356.171 337.076 445.655 338.254 "
+
style="fill:none;fill-rule:evenodd;stroke:#00ad00;stroke-opacity:1;stroke-width:1.875;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
/>
<path
-
style="fill:none;fill-rule:evenodd;stroke:#b10000;stroke-opacity:1;stroke-width:1.875;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
- d="M 306.131 476.601 C 363.824 449.52 492.753 491.908 495.107 454.23 "
- id="path666"
+ transform="translate(0.000000,-3.051758e-5)"
sodipodi:nodetypes="cc"
- transform="translate(0.000000,-3.051758e-5)" />
+ id="path666"
+ d="M 306.131 476.601 C 363.824 449.52 492.753 491.908 495.107 454.23 "
+
style="fill:none;fill-rule:evenodd;stroke:#b10000;stroke-opacity:1;stroke-width:1.875;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
/>
<text
-
style="font-size:26.000000;font-style:normal;font-weight:normal;fill:#00ad00;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream
Charter;text-anchor:start;writing-mode:lr;"
- x="459.18481"
- y="321.10385"
- id="text667">
- <tspan
- x="459.18481"
- y="347.10385"
- sodipodi:role="line"
- id="tspan672">
-_("Enter multi-rest")</tspan>
- </text>
+ sodipodi:linespacing="100%"
+ id="text667"
+ y="346.47586"
+ x="455.14835"
+
style="line-height:100%;font-variant:normal;font-stretch:normal;font-family:Bitstream
Charter;stroke-opacity:1.0000000;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:1.0000000pt;stroke:none;fill-opacity:1.0000000;fill:#00ad00;text-anchor:start;writing-mode:lr;font-weight:normal;font-style:normal;font-size:26.000000"><tspan
+ y="346.47586"
+ x="455.14835"
+ id="tspan1315"
+ sodipodi:role="line"> _("Enter multi-rest") </tspan></text>
+
<text
-
style="font-size:26.000000;font-style:normal;font-weight:normal;fill:#b10000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream
Charter;text-anchor:start;writing-mode:lr;"
- x="366.66870"
- y="410.56613"
- id="text674">
- <tspan
- x="366.66870"
- y="436.56613"
- sodipodi:role="line"
- id="tspan680">
-_("Store notes in variable")</tspan>
- </text>
+ sodipodi:linespacing="100%"
+ id="text674"
+ y="444.58768"
+ x="429.52213"
+
style="line-height:100%;font-variant:normal;font-stretch:normal;font-family:Bitstream
Charter;stroke-opacity:1.0000000;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:1.0000000pt;stroke:none;fill-opacity:1.0000000;fill:#b10000;text-anchor:start;writing-mode:lr;font-weight:normal;font-style:normal;font-size:26.000000"><tspan
+ y="444.58768"
+ x="429.52213"
+ id="tspan1317"
+ sodipodi:role="line"> _("Store notes in variable") </tspan></text>
+
<metadata
id="metadata1054">
<rdf:RDF
- id="RDF1055">
+ id="RDF1055">
<cc:Work
- rdf:about=""
- id="Work1056">
+ id="Work1056"
+ rdf:about="">
<dc:format
- id="format1057">image/svg+xml</dc:format>
+ id="format1057">image/svg+xml</dc:format>
<dc:type
- id="type1059"
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
+ id="type1059" />
</cc:Work>
</rdf:RDF>
</metadata>
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
