Reviewers: Graham Percival,
Message:
On 2012/01/01 23:14:05, Graham Percival wrote:
LGTM, but I had to add issue 2166 to track this.
Sorry, didn't understand what you mean by "add issue 2166 to track this"
Anything I can do to help this to get live?
Description:
Patch related to http://codereview.appspot.com/5500069/.
There is a git pull request on github to put pdf files in
lilypond-extra.
These patches copy the files to the correct place, and rewrite links.
I did some changes on the contribution documentation page as well, given
that is misses some details. Also not that the wbesite page is not
up-to-date to the latest git repository version.
Please review this at http://codereview.appspot.com/5507046/
Affected files:
M Documentation/contributor/programming-work.itexi
M Documentation/contributor/website-work.itexi
M Documentation/cs/web/introduction.itexi
M Documentation/de/web/introduction.itexi
M Documentation/es/web/introduction.itexi
M Documentation/fr/web/community.itexi
M Documentation/fr/web/introduction.itexi
M Documentation/hu/web/community.itexi
M Documentation/it/web/introduction.itexi
M Documentation/ja/web/introduction.itexi
M Documentation/nl/web/introduction.itexi
M Documentation/web/introduction.itexi
M Documentation/web/we-wrote.bib
M make/website.make
Index: Documentation/contributor/programming-work.itexi
diff --git a/Documentation/contributor/programming-work.itexi
b/Documentation/contributor/programming-work.itexi
index
e6aa1f0d9961e9522715159e94ff8066c808088c..1ff0247a731a2fd725ae08507a12fca73fa9a3cd
100644
--- a/Documentation/contributor/programming-work.itexi
+++ b/Documentation/contributor/programming-work.itexi
@@ -29,7 +29,7 @@ number of stages. This process, along with the types of
routines that
accomplish the various stages of the process, is described in this
section. A
more complete description of the LilyPond architecture and internal program
execution is found in Erik Sandberg's
-@uref{http://lilypond.org/web/images/thesis-erik-sandberg.pdf, master's
+@uref{http://lilypond.org/website/pdf/thesis-erik-sandberg.pdf, master's
thesis}.
The first stage of LilyPond processing is @emph{parsing}. In the parsing
Index: Documentation/contributor/website-work.itexi
diff --git a/Documentation/contributor/website-work.itexi
b/Documentation/contributor/website-work.itexi
index
49bf3db6f5a6f1f9196cd9ffd723c8aa37da264e..aaced80cff446d2845649a332f49209d3d8c9839
100644
--- a/Documentation/contributor/website-work.itexi
+++ b/Documentation/contributor/website-work.itexi
@@ -65,9 +65,9 @@ Initial setup:
Create directories:
@example
-$HOME/lilypond/
-$HOME/lilypond/media/
-$HOME/lilypond/trusted-scripts/
+mkdir $HOME/lilypond/
+mkdir $HOME/lilypond/media/
+mkdir $HOME/lilypond/trusted-scripts/
@end example
To reduce the CPU burden on the shared host (as well as some
@@ -114,6 +114,17 @@ cp $GIT/Documentation/web/server/lilypond.org.htaccess
$DEST/lilypond.org.htacce
cp $GIT/Documentation/web/server/website-dir.htaccess
$DEST/website-dir.htaccess
@end smallexample
+For a complete build you will need a copy of @code{lilypond-extra} git
repository.
+You can checkout a fresh copy easily:
+
+@example
+export LILYPOND_WEB_MEDIA_GIT=$HOME/lilypond-extra
+git clone git://github.com/gperciva/lilypond-extra.git
$LILYPOND_WEB_MEDIA_GIT
+@end example
+
+Just note that the example above expects a bash environment. If you are
using another shell
+you might need to use a different keyword, other than @code{export}.
+
Delete your build directory (or maybe just rename your build
directory to build-old).
Index: Documentation/cs/web/introduction.itexi
diff --git a/Documentation/cs/web/introduction.itexi
b/Documentation/cs/web/introduction.itexi
index
e1290089a155e42b6f589ddb796b9298e9064d5d..b1096adb499c05700a092105120448fae7c1bbeb
100644
--- a/Documentation/cs/web/introduction.itexi
+++ b/Documentation/cs/web/introduction.itexi
@@ -687,7 +687,7 @@ Francouzský článek o LilyPondu ve verzi 2.6 se objevuje
na
Vydavatelé holandského časopisu Computer!Totaal,
který se věnuje počítačům,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
popisují LilyPond} ve vydání z října 2004 jako: @qq{báječný
svobodný (Open Source) program [...] Noty vytvořené LilyPondem
jsou bez výjimky nádherné [...] Jde o velmi silný systém, který
Index: Documentation/de/web/introduction.itexi
diff --git a/Documentation/de/web/introduction.itexi
b/Documentation/de/web/introduction.itexi
index
ba8fc7497481dd82f077998a034549e4cf22a1e4..e9f52b22851c4428575d36c5f436d226fb4c52e4
100644
--- a/Documentation/de/web/introduction.itexi
+++ b/Documentation/de/web/introduction.itexi
@@ -722,7 +722,7 @@ Oktober 2004
Die Editoren von Computer!Totaal, einer holländischen
Computerzeitschrift,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
beschreiben LilyPond} in der Ausgabe Oktober 2004 als: @qq{Wunderbare
freie (Open Source) Software [..] Die Partituren von LilyPond
sind ausnahmslos schön [..] ein sehr mächtiges System das fast alles
Index: Documentation/es/web/introduction.itexi
diff --git a/Documentation/es/web/introduction.itexi
b/Documentation/es/web/introduction.itexi
index
dc324714ab243890d7c9a2ce3368709d6bb6ca58..980aeb4bab9fc1aa1caf0bd21efd1ee63fc02d94
100644
--- a/Documentation/es/web/introduction.itexi
+++ b/Documentation/es/web/introduction.itexi
@@ -707,7 +707,7 @@ en @uref{http://linuxfr.org/2005/06/27/19210.html,
linuxfr.org}.
Octubre de 2004
Los editores de Computer!Totaal, una revista holandesa de informática,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg, describen a
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg, describen a
LilyPond} en la edición de octubre de 2004 como: @qq{Maravilloso
software libre (de código abierto) (...) Las partituras producidas por
LilyPond son excepcionalmente bonitas (...) un sistema muy potente que
Index: Documentation/fr/web/community.itexi
diff --git a/Documentation/fr/web/community.itexi
b/Documentation/fr/web/community.itexi
index
e97d04ead6ab8e841c6e01116e18190c626e0110..9bf0d6c99e8cad16b202372ea62b64d97f15079f
100644
--- a/Documentation/fr/web/community.itexi
+++ b/Documentation/fr/web/community.itexi
@@ -913,7 +913,7 @@ dernière mouture est consultable sur
@url{http://lilypond.org}}
@item
Han-Wen Nienhuys, @emph{LilyPond, Automated music formatting and
the Art of Shipping}. Forum international du logiciel libre 2006
-(FISL7.0) (@uref{http://lilypond.org/web/images/FISL7-slides.pdf,
+(FISL7.0) (@uref{http://lilypond.org/website/pdf/FISL7-slides.pdf,
PDF 1095k})
@item
@@ -921,14 +921,14 @@ Erik Sandberg, @emph{Séparer le langage source et le
système de
formatage dans GNU LilyPond (Separating input language and formatter in
GNU LilyPond)}. Thèse de master, université d'Uppsala, Département des
technologies de l'information, mars@tie{}2006.
-(@uref{http://lilypond.org/web/images/thesis-erik-sandberg.pdf,
+(@uref{http://lilypond.org/website/pdf/thesis-erik-sandberg.pdf,
PDF 750k})
@item
Han-Wen Nienhuys et Jan Nieuwenhuizen, @emph{LilyPond, un système de
gravure musicale automatisée}. Actes du 14e Colloque d'informatique
musicale (XIV CIM 2003), Florence, Itale, mai@tie{}2003.
-(@uref{ http://lilypond.org/web/images/xivcim.pdf, PDF 95k})
+(@uref{ http://lilypond.org/website/pdf/xivcim.pdf, PDF 95k})
@end itemize
Index: Documentation/fr/web/introduction.itexi
diff --git a/Documentation/fr/web/introduction.itexi
b/Documentation/fr/web/introduction.itexi
index
cc9e64ab377c378e69b63f29a0d1467312aaf976..014c1738e568d2eefddad85f789b21ed562ea9c4
100644
--- a/Documentation/fr/web/introduction.itexi
+++ b/Documentation/fr/web/introduction.itexi
@@ -724,7 +724,7 @@ Un article français sur LilyPond 2.6 est paru sur
Octobre 2004
Les éditeurs de @emph{Computer!Totaal}, magazine informatique
-hollandais, @uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+hollandais, @uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
décrivent LilyPond} dans leur numéro d'octobre 2004 comme@tie{}: @qq{un
merveilleux logiciel libre [@dots{}] Les partitions qu'il génère sont
extrêmement belles [@dots{}] Un système très puissant permettant
Index: Documentation/hu/web/community.itexi
diff --git a/Documentation/hu/web/community.itexi
b/Documentation/hu/web/community.itexi
index
f3c1cbbb17b051867b34b13ce6bde9e05e6fc1b8..17be33814744f4db40bd33ae815c66ea545ddd19
100644
--- a/Documentation/hu/web/community.itexi
+++ b/Documentation/hu/web/community.itexi
@@ -857,21 +857,21 @@ Archívum}
@item
Han-Wen Nienhuys: @emph{LilyPond, automatikus kottaformázás és a
szoftvertermék kiadásának művészete}. A szabad szoftver nemzetközi fóruma
2006
-(FISL7.0) (@uref{http://lilypond.org/web/images/FISL7-slides.pdf,
+(FISL7.0) (@uref{http://lilypond.org/website/pdf/FISL7-slides.pdf,
PDF 1095k})
@item
Erik Sandberg: @emph{A bemeneti nyelv és a formázó szétválasztása a
GNU Lilypondban}. Diplomaterv, Uppsalai Egyetem, Információtechnológiai
Tanszék, 2006. március
-(@uref{http://lilypond.org/web/images/thesis-erik-sandberg.pdf,
+(@uref{http://lilypond.org/website/pdf/thesis-erik-sandberg.pdf,
PDF 750k})
@item
Han-Wen Nienhuys, Jan Nieuwenhuizen: @emph{LilyPond, egy automatizált
kottaszedő rendszer}. Jegyzőkönyv a XIV. zenei informatikai kollokviumról
(XIV CIM 2003), Firenze, Olaszország, 2003. május
-(@uref{http://lilypond.org/web/images/xivcim.pdf, PDF 95k})
+(@uref{http://lilypond.org/website/pdf/xivcim.pdf, PDF 95k})
@end itemize
@@ -937,7 +937,7 @@ A LilyPond 2.6-os verziójának kiadásáról megjelenik egy
francia cikk a
2004. október
A @emph{Computer!Totaal} holland informatikai magazin szerkesztői
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg, azt írják a
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg, azt írják a
LilyPondról} a 2004. októberi számban: @qq{A LilyPond egy csodálatos szabad
(nyílt forrású) szoftver! [...] A LilyPonddal szedett kotta kivételesen
szép.
[...] Egy sokrétű rendszerrel állunk szemben, ami szinte mindenre képes!}
Index: Documentation/it/web/introduction.itexi
diff --git a/Documentation/it/web/introduction.itexi
b/Documentation/it/web/introduction.itexi
index
1432d42b1f3888807d208923e8a677fe64716bf8..9541546de319a92b9828e1e3c431e43781ebf1d5
100644
--- a/Documentation/it/web/introduction.itexi
+++ b/Documentation/it/web/introduction.itexi
@@ -673,7 +673,7 @@ Ottobre 2004
Gli editor di Computer!Totaal, una rivista olandese di computer,
nel numero di Ottobre 2004
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
descrivono LilyPond} come: @qq{Meraviglioso software
libero (open source) [..] Gli spartiti prodotti da
LilyPond sono incredibilmente belli [..] un sistema molto potente che
Index: Documentation/ja/web/introduction.itexi
diff --git a/Documentation/ja/web/introduction.itexi
b/Documentation/ja/web/introduction.itexi
index
8de77992dd203033358723051336e4c003de863e..414573b181c2968374e923711f4ff0b45d7bf26b
100644
--- a/Documentation/ja/web/introduction.itexi
+++ b/Documentation/ja/web/introduction.itexi
@@ -711,7 +711,7 @@ A French article on the LilyPond 2.6 release appeared on
October 2004
The editors of Computer!Totaal, a Dutch computer magazine,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
describe LilyPond} in the October 2004 issue as: @qq{Wonderful
free (open source) software [..] The sheet music produced by
LilyPond is exceptionally pretty [..] a very powerful system that
Index: Documentation/nl/web/introduction.itexi
diff --git a/Documentation/nl/web/introduction.itexi
b/Documentation/nl/web/introduction.itexi
index
4785f0c9b4e526f855355b687c9b57a53025cc0e..6560cc9f8fb3f12795f9bee3ba28d7ad7e60fcfc
100644
--- a/Documentation/nl/web/introduction.itexi
+++ b/Documentation/nl/web/introduction.itexi
@@ -734,7 +734,7 @@ oktober 2004
De redacteurs van of Computer!Totaal, een Nederlands
computerblad,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
beschrijven LilyPond} in het oktober 2004-nummer als:
@qq{Prachtige gratis (open source) software [..] De
bladmuziek die LilyPond oplevert is inderdaad bijzonder
Index: Documentation/web/introduction.itexi
diff --git a/Documentation/web/introduction.itexi
b/Documentation/web/introduction.itexi
index
f92a0a090ce2030877cbf15962088d7af0223128..7a27ce1a91a04c8b7053a6e7b4ff0610e82cf1ca
100644
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -679,7 +679,7 @@ A French article on the LilyPond 2.6 release appeared on
October 2004
The editors of Computer!Totaal, a Dutch computer magazine,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
describe LilyPond} in the October 2004 issue as: @qq{Wonderful
free (open source) software [..] The sheet music produced by
LilyPond is exceptionally pretty [..] a very powerful system that
Index: Documentation/web/we-wrote.bib
diff --git a/Documentation/web/we-wrote.bib b/Documentation/web/we-wrote.bib
index
aeae6d4435f25e59cf738d2087c3e21742ee72ce..8515377721119d6a9d86832c366b3d252eeaab79
100644
--- a/Documentation/web/we-wrote.bib
+++ b/Documentation/web/we-wrote.bib
@@ -4,7 +4,7 @@
author = {Han-Wen Nienhuys},
booktitle = {Forum Internacional Software Livre 2006 (FISL7.0)},
year = 2006,
- note = {(@uref{http://lilypond.org/web/images/FISL7-slides.pdf, PDF
1095k})}
+ note = {(@uref{http://lilypond.org/website/pdf/FISL7-slides.pdf, PDF
1095k})}
}
@mastersthesis{sandberg06,
@@ -13,7 +13,7 @@
year = 2006,
month = "March",
school = {Uppsala University, Department of Information Technology},
- note = {(@uref{http://lilypond.org/web/images/thesis-erik-sandberg, PDF
750k})}
+ note = {(@uref{http://lilypond.org/website/pdf/thesis-erik-sandberg, PDF
750k})}
}
@inproceedings{hanwen03,
@@ -23,7 +23,7 @@
year = 2003,
month = "May",
location = {Firenze, Italy},
- note = {(@uref{http://lilypond.org/web/images/xivcim.pdf, PDF 95k})}
+ note = {(@uref{http://lilypond.org/website/pdf/xivcim.pdf, PDF 95k})}
}
Index: make/website.make
diff --git a/make/website.make b/make/website.make
index
18da8feba87f335a12fa6b9220e3782ac9f4be09..4fed1939851c7d962615eb102b9c645fc5a90a51
100644
--- a/make/website.make
+++ b/make/website.make
@@ -73,6 +73,7 @@ WEB_BIBS=python $(script-dir)/bib2texi.py
EXAMPLES=$(LILYPOND_WEB_MEDIA_GIT)/ly-examples
PICTURES=$(LILYPOND_WEB_MEDIA_GIT)/pictures
+PDFS=$(LILYPOND_WEB_MEDIA_GIT)/pdf
SERVER_FILES=$(top-src-dir)/Documentation/web/server
@@ -145,6 +146,9 @@ misc-files = $(OUT)/.htaccess \
picture-src-files := $(notdir $(wildcard $(PICTURES)/*))
picture-files = $(picture-src-files:%=$(OUT)/website/pictures/%)
+pdf-src-files := $(notdir $(wildcard $(PDFS)/*))
+pdf-files = $(pdf-src-files:%=$(OUT)/website/pdf/%)
+
post-files = $(OUT)/website/index.html
texinfo-files = $(OUT)/index.html $(WEB_LANGS:%=$(OUT)/%/index.html)
@@ -159,7 +163,7 @@ xref-files = $(MANUALS_BASE:%=$(OUT)/%.xref-map)
.PHONY: website website-bibs website-css website-examples website-misc \
website-pictures website-post website-test website-texinfo \
- website-version website-xrefs check-setup
+ website-version website-xrefs check-setup website-pdf
check-setup:
ifeq ($(LILYPOND_WEB_MEDIA_GIT),)
@@ -167,7 +171,7 @@ ifeq ($(LILYPOND_WEB_MEDIA_GIT),)
exit 1
endif
-website: check-setup website-post website-examples website-pictures
website-css website-misc
+website: check-setup website-post website-examples website-pictures
website-css website-misc website-pdf
website-bibs: website-version $(OUT) $(bib-files)
@@ -179,6 +183,8 @@ website-misc: $(OUT)/website $(misc-files)
website-pictures: $(OUT)/website/pictures $(OUT)/pictures $(picture-files)
+website-pdf: $(OUT)/website/pdf $(pdf-files)
+
website-post: website-texinfo $(post-files)
website-test:
@@ -195,7 +201,7 @@ website-xrefs: website-version $(OUT) $(xref-files)
### Rules
# Directories
-$(OUT) $(OUT)/website $(OUT)/website/css $(OUT)/website/ly-examples
$(OUT)/website/pictures: %:
+$(OUT) $(OUT)/website $(OUT)/website/css $(OUT)/website/ly-examples
$(OUT)/website/pictures $(OUT)/website/pdf: %:
mkdir -p $@
$(OUT)/pictures: $(OUT)/website/pictures
@@ -265,6 +271,9 @@ $(example-files): $(OUT)/website/ly-examples/%:
$(EXAMPLES)/%
$(picture-files): $(OUT)/website/pictures/%: $(PICTURES)/%
cp $< $@
+$(pdf-files): $(OUT)/website/pdf/%: $(PDFS)/%
+ cp $< $@
+
$(OUT)/website/favicon.ico: $(SERVER_FILES)/favicon.ico
cp $< $@
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel