Re: Issue 1663 in lilypond: Images missing on web site
Updates: Status: Verified Comment #58 on issue 1663 by philehol...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 (No comment was entered for this change.) ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Status: Fixed Labels: -Patch-push fixed_2_15_17 Comment #57 on issue 1663 by gra...@percival-music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Apparently this was done a month ago ? 0b558a0e72c38ddf620ef11398d3028e2acffc4d ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #56 on issue 1663 by pkx1...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 I'll push this and update the tracker went it's done ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #55 on issue 1663 by percival.music...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Thanks, I've changed Patchy to use git apply instead of patch(1). https://github.com/gperciva/lilypond-extra/commit/d2c3d648ec3b51ef67d84583544f7e837e9b7fdd ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #54 on issue 1663 by julien.r...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 For the record, in reply to Comment 51: Rietvield was not the issue. Rietvield was merely providing the .patch file created by git. Git uses `diff --git' to create patches, which uses a superset of the syntax understood by the `patch' utility. I'm not sure if using `patch' is part of your recommended workflow. If it is you might consider using `git apply filename' as a drop-in replacement for `patch -p1 < filename', or start suggesting to use `git cl patch'. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Labels: -Patch-countdown Patch-push Comment #53 on issue 1663 by colinpkc...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Counted down to 20111023 ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Labels: -Patch-needs_work Patch-review Comment #51 on issue 1663 by percival.music...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 rietveld was being a pain about giving us the patch. It must be applied with this: git cl patch -n 5276054 instead of our usual method for rietveld. Anyway, patch LGTM ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Labels: -Patch-new Patch-needs_work Comment #50 on issue 1663 by pkx1...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Graham, This fails at the basic make stage ../configure ; make -j7 I also re-ran make multiple times to see if it was 'one of those things' but it fails the same. --snip-- make[2]: Leaving directory `/home/jlowe/lilypond-git/build/Documentation/included' make: Entering an unknown directory make: *** ly-examples: No such file or directory. Stop. make: Leaving an unknown directory make[1]: *** [all] Error 2 make[1]: Leaving directory `/home/jlowe/lilypond-git/build/Documentation' make: *** [all] Error 2 jlowe@jlowe-lilybuntu2:~/lilypond-git/build$ --snip-- ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Cc: pkx1...@gmail.com Comment #49 on issue 1663 by percival.music...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 James, could you test this one with a full doc build? Google only gives patchy the first 25 comments, so he's not finding the patch. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Labels: Patch-new Comment #47 on issue 1663 by percival.music...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 (No comment was entered for this change.) ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #46 on issue 1663 by julien.r...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663#c46 Fix the links to music samples in web-big-page (issue 1663). We move all of Documentation/web/ly-examples to Documentation/ly-examples and rework the links for the split manuals. This puts the ly-examples subdir on par with the pictures subdir as a top-level subdir. http://codereview.appspot.com/5276054 ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Status: Labels: -fixed_2_15_13 Comment #45 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Patch reverted since this deletes the images in split web. An email in devel will soon explain why. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Status: Fixed Owner: --- Labels: -Patch-push fixed_2_15_13 Comment #44 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Pushed as e12188443ed992f223f0d7fd45965003de94588f I'm marking this as fixed and have opened Issue 1917 to track a fix for the hyperlinks. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Labels: -Patch-countdown Patch-push Comment #43 on issue 1663 by colinpkc...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 (No comment was entered for this change.) ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Labels: -Patch-new Patch-review Comment #41 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Correct ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #40 on issue 1663 by janek.li...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Shouldn't this be patch-review instead of patch-new? ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Labels: -Patch-needs_work Patch-new Comment #39 on issue 1663 by pkx1...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 PhilEHolmes Updated patch which produces a web-big-page with all images included. Please review. Next step after this will be to fix the links in that page. http://codereview.appspot.com/4963046/ ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #38 on issue 1663 by reinhold...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 IIUC, symlinks are a problem in Windows, that's why we are copying files all over the place... ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #37 on issue 1663 by pkx1...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 graham_percival-music.ca 5 days, 14 hours ago #6 On Mon, Aug 29, 2011 at 05:24:51PM +0100, Phil Holmes wrote: OK. My claim that this is fixed is partly down to the number of copies of web-big-page.html on the system after a build. It's fixed in the wrong one, but not fixed in the right one. To get my head fully around this, I think I need to be able to run lots of full make doc sessions. I need to wait a couple of weeks for my new machine to be delivered. ok. Another option would be to sort out the locations of css/ and pictures/, and/or add some symlinks, instead of modifying the texinfo+html. http://code.google.com/p/lilypond/issues/detail?id=983 But that's also something that should wait until your new computer. :) Cheers, - Graham ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #36 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Latest state is that I'm not working on this, pending delivery of a faster PC to assist make doc. The other news is that web-big-page is in an even worse state than previously realised - all the links to manuals fail, too. I'm starting to think that we need fix-all-links-in-web-big-page.py. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Status: Started Labels: -Priority-High -Patch-review Patch-needs_work Comment #35 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Could we just get a new rietveld issue for this? and I'd like James to run a test on this once it has the new rietveld location. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Labels: Patch-review Comment #34 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 I should have mentioned that this should be fixed by http://codereview.appspot.com/4964041/. Apologies - that review has been confused by my sending 2 different patches to the same review by mistake. It's Patch 1. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #33 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 see also issue 983, which is particular to the "relative directories for pictures/ and css/ " ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #32 on issue 1663 by reinhold...@gmail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Exactly. The problem is that the background is specified in CSS as something like: body{ background: url("../pictures/background-image.png") no-repeat scroll 0 0 #FF; ... } Now, all URLs in the CSS are relative to the CSS file, not to the main lilypond file! So the real problem is that web-big-page.html and web/index.html are NOT using the same css files, but each of them is using its own copy: http://lilypond.org/doc/v2.15/Documentation/lilypond-website.css http://lilypond.org/doc/v2.15/Documentation/web/lilypond-website.css The proper fix would be to handle the css just like all other included files (i.e.images) and adjust the CSS path together with the images. In particular that would mean that we only have one css file, and web-big-file.html and web/index.html have different relative pathes to the same CSS file. That way we also get rid of css file duplications on the server. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #31 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Following this up, and the problem is less tractable than I thought. If you go to http://lilypond.org/doc/v2.15/Documentation/web-big-page.html you'll see that not only are all the example images missing, so are the images that are supposed to be on the menu bar at the top - so it's not obvious that you can click on the left hand edge of the bar to get back to the index, for example. The problem is that these image locations aren't specified in the source file, but rather in the style sheet. Fixing this would (AFAICS) mean making specific styles just for the web-big-page as opposed to web-normal, which would be a nightmare for maintenance. Fixing this properly would probably involve rethinking the directory structure of the web html files. If they were all in Documentation\web\filename.html rather than lots od subdirectories plus the root for big, it would make more sense. Don't know whether this is not justified investigating further, though. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #30 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 I'm not certain what change you're proposing to macros.itexi. Could I get a diff? The regex in postprocess-html.py sounds reasonable. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #29 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 OK. This is the same sort of problem with the ../pictures problem above, except these images are in the ly-examples directory. big-page and the split-page files have the same relative link to these images, but big-page is in /Documentation, and split pages are in /Documentation/web. The links therefore need to be fixed up in the same way that the /pictures ones are, in postprocess-html.py. It will require 2 changes: 1 to macros.itexi: @macro exampleImage{IMAGE-FILE} @html (click to enlarge) @end html I believe we will need to change ly-examples to ../ly-examples, but would need to check and test this. We would also need a regex search-and-replace for ../ly-examples in postprocess-html.py, similar to the one for pictures. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Status: Accepted Owner: philehol...@googlemail.com Labels: -fixed_2_15_7 Comment #28 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Bad news. Go to http://lilypond.org/doc/v2.15/Documentation/web-big-page.html and scroll down. We're still missing the images of the music (which we always were, so this is no worse, just bad.) Will look into this later. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #27 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Agreed on closing this issue. Sorry for not noticing the "2.13". The files cannot simply be copied from source. Some pictures might be ok, some might not (I'd need to check the rules of Documentation/pictures/GNUmakefile), but the ly-examples definitely need to be compiled. But we can't build lilypond on the webserver. So those ly-examples need to be compiled somewhere else and uploaded. I'd like to have a separate git repo for "lilypond media", mostly for the website, namely the images, compiled examples, pdfs of Erik's thesis, etc. But that has to wait until GOP-PROP 9, which won't be completed until 2011-aug-24 at the earliest. At the moment I'd just like to documentation for the existing website build system, warts and all. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #26 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Just checked the make source, and the copies you've shown are copied from build - so they're only there after make doc. It should really copy from source. You want a patch for this? ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Status: Fixed Labels: fixed_2_15_7 Comment #25 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Um. Following a link to a page that shouldn't even be there - one from 2.13 - isn't really a test. Try looking at the latest page that should have this image: http://lilypond.org/doc/v2.15/Documentation/web-big-page.html. I can see pictures. So this issue is fixed. I strongly believe we should close this issue and potentially open another to fix the problems with "make website" - but agree what this make option should _actually do_. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #24 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 first: when I follow the link in comment 1, I do not see pictures. I think that's the final test of whether this is done or not? second: I took a longer look at 6.2, and it is much less clear than I thought it was. My apologies. Relative to your choices in comment 19, I would say to use option 2a: the build system already copies the pictures and css, but in a relatively fragile manner (which was never intended to work for the big-html website anyway). The hints on this page: http://lilypond.org/doc/v2.15/Documentation/contributor/uploading-and-security are: """ Upload latest pictures/ and ly-examples/ (local script): Note: You may need to change a number of items in the below script. ... rsync -a $PICS gra...@lilypond.org:lilypond/media/pictures rsync -a $EXAMPLES gra...@lilypond.org:lilypond/media/ly-examples """ (rsync is a command that copies files, generally to a remote system but it can also be used locally. This puts pictures and examples in the $HOME/lilypond/media/.../ directories on lilypond.org, but you could use a similar command to put them in your own home directory) """ Build the website: ... make -f website.make WEBSITE_ONLY_BUILD=1 website """ the official website is not built with: make website alone, but instead with that WEBSITE_ONLY_BUILD=1 option. At the very top of make/website.make you see: # SECURITY -- check these values for lilypond.org # ifeq ($(WEBSITE_ONLY_BUILD),1) ### for lilypond.org ... EXAMPLES=$(HOME)/lilypond/media/ly-examples PICTURES=$(HOME)/lilypond/media/pictures else ### for normal git ... # I assume this is run from top-build-dir EXAMPLES=Documentation/web/ly-examples/out-www PICTURES=Documentation/pictures/out-www endif website.make also contains: website-pictures: mkdir -p $(OUT)/website/pictures if [ -d $(PICTURES) ]; \ then \ cp $(PICTURES)/* $(OUT)/website/pictures ; \ ln -sf website/pictures $(OUT)/pictures ;\ fi website-examples: mkdir -p $(OUT)/website/ly-examples if [ -d $(EXAMPLES) ]; \ then \ cp $(EXAMPLES)/* $(OUT)/website/ly-examples ; \ fi website: website-texinfo website-css website-pictures website-examples web-post in sum, if you create $HOME/lilypond/media/pictures $HOME/lilypond/media/ly-examples directories, copy the relevant files into those, and run make -f ../make/website.make WEBSITE_ONLY_BUILD=1 website then you should see exactly the same thing as you do on lilypond.org I think the next step is to do this to make sure that I haven't forgotten or glossed over any other steps, and then to make sure that this is clear on 6.2. Then you can test future changes to the website with the same mechanism that we use to create lilypond.org. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #23 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 The instructions in 6.2 are _much_ more exhaustive than "run make website". If you look at current lilypond.org, everything is there - pictures, css, the lot. Therefore it surely must be that there's no problem with building the full website. Let's be clear about this. AFAICS "make website" has never made the full website - it's a quick check that you can correctly create HTML. I have a version of lilypond in my old copy of ubuntu that I have not touched since well before I made any changes that affect the website. It has no pictures, css, or anything. I've ploughed through the code of make website - there's absolutely no chance that any of this will ever be created. TBH, the battle to prove that I've done checking is getting hard - please look at comment 19 and select an option - unless you can revert to a version of lily from 2 months ago, run make; make website; and show me a website with pictures. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #22 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 After following the instructions in 6.2, you should have a fully-functional version of the pages on lilypond.org, with the exception of the old website in lilypond.org/web/ and any subdirectories of lilypond.org/doc/ This includes css and images. Anything less than that points to a problem in 6.2. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #21 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 No. I obviously don't build the lilypond.org website, but my assumption is that it has to come from /build/out-www/offline-root/Documentation/web/ which is only created as part of make doc. make website has only ever built a subset of the full website documentation - some html files; no pictures, no css, no manuals. I couldn't claim that I could write all this documentation off the top of my head, but it might make sense to create a new issue: "Improve documentation of make" and use that to explore/document the make xxx types and the options associated with them. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
On Mon, Aug 01, 2011 at 03:43:36PM -0600, Colin Campbell wrote: > I believe the output of make website is *only* complete in > out-www/offline-root/, per the CG 4.6.2, Phil. Please read CG 6. make doc and make website are compltely different. To make matters worse, "make doc" used to be called "make web" -- just imagine the confusion we had back then! Cheers, - Graham ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
On 11-07-31 04:49 AM, lilyp...@googlecode.com wrote: Comment #19 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Belay comment 17. I think I must have been looking at a page built with make docs. An update: The web index is in: file:///home/phil/lilypond-git/build/out-website/index.html Pictures are referenced as: They were: - so we have lost the ../pictures, as expected. On both the versions I'm looking at (one built from a git tree of at least a week ago, and one from yesterday) there are no actual pictures visible in the browser. Actually, that's not surprising. The only instances of "double-lily-modified3.png" are in: lilypond-git/Documentation/pictures (i.e. the source) lilypond-git/build/Documentation/pictures/out-www (the website created by make doc) lilypond-git/build/out-www/offline-root/Documentation/pictures (the final website created by make doc and with the links fixed up) If the make website-built website were to reference these, 1) we would always need to make doc before make website, which rather spoils the point of a slimmed-down make website; 2) we would need to change the links in the website-built html to something like ../Documentation/pictures/out-www, which is rather too specific and out-of-tree. I think we have 3 options (here presented in my order of preference) 1. Document the fact that make website contains no images (it also has no css, etc.) 2. Write a script that copies the relevant pictures to a out-website/pictures directory and ensure the html links are fixed up correctly. 3. Write a script that fixes the links in out-website to point at the Documentation directory and document that you must run make doc before make website. What do you think? I believe the output of make website is *only* complete in out-www/offline-root/, per the CG 4.6.2, Phil. The other paths are explicitly not complete, and I believe the missing .css is covered by that line. When I open out-www/offline-root/index.html in yesterday's build, everything looks as expected, and to Graham's comment, I don't notice any missing images, either locally not on www.lilypond.org. Cheers, Colin -- The human race has one really effective weapon, and that is laughter. -- Mark Twain ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #20 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 wait, what?! I pushed your change a day or two ago, and the website is built hourly. Are you telling me that lilypond.org no longer has images?!? If that's the case, I'd better revert it ASAP. Please read CG 6.2 Uploading and security carefully. http://lilypond.org/doc/v2.15/Documentation/contributor/uploading-and-security try to follow the instructions. When (not if) something is unclear, ask, and between us we'll clarify it. perhaps issue 1635 isn't finished after all? ... or maybe consider adding a new issue for "clarify make website", since I am not confident that you understand how it works, and you've spend at least 10x as much time as anybody else (other than me) looking at "make website". If you're unclear on stuff, then we really must assume that everybody else will be just as lost, and that's not the way to build stable/sustainable software. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #19 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Belay comment 17. I think I must have been looking at a page built with make docs. An update: The web index is in: file:///home/phil/lilypond-git/build/out-website/index.html Pictures are referenced as: They were: - so we have lost the ../pictures, as expected. On both the versions I'm looking at (one built from a git tree of at least a week ago, and one from yesterday) there are no actual pictures visible in the browser. Actually, that's not surprising. The only instances of "double-lily-modified3.png" are in: lilypond-git/Documentation/pictures (i.e. the source) lilypond-git/build/Documentation/pictures/out-www (the website created by make doc) lilypond-git/build/out-www/offline-root/Documentation/pictures (the final website created by make doc and with the links fixed up) If the make website-built website were to reference these, 1) we would always need to make doc before make website, which rather spoils the point of a slimmed-down make website; 2) we would need to change the links in the website-built html to something like ../Documentation/pictures/out-www, which is rather too specific and out-of-tree. I think we have 3 options (here presented in my order of preference) 1. Document the fact that make website contains no images (it also has no css, etc.) 2. Write a script that copies the relevant pictures to a out-website/pictures directory and ensure the html links are fixed up correctly. 3. Write a script that fixes the links in out-website to point at the Documentation directory and document that you must run make doc before make website. What do you think? ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
On 7/30/11 3:07 AM, "Phil Holmes" wrote: > "Colin Campbell" wrote in message > news:4e334502.6070...@shaw.ca... >> >> Will this mean that we won't have to use the separate >> >> scripts/auxiliar/cg-section.sh SECTION as in CG 5.6, Phil? >> >> Colin > > > Almost certainly not. TBH I've not looked into why that's separate, but I'd > be staggered if anything I've done will change that. Phil's answer is correct. The reason we have cg-section.sh different from doc-section.sh is that the CG has a different file layout than the rest of the docs. These *.sh scripts are minimal scripts to process the individual doc sections quickly, and are not compatible with the full doc process. But they do test the texinfo in the relevant section. Thanks, Carl ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
"Colin Campbell" wrote in message news:4e334502.6070...@shaw.ca... On 11-07-29 08:21 AM, lilyp...@googlecode.com wrote: Comment #15 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 My comment above was right, and adding contributor to the list of post-processed files has corrected that as well. A patch is available to fix this bug. ___ Will this mean that we won't have to use the separate scripts/auxiliar/cg-section.sh SECTION as in CG 5.6, Phil? Colin Almost certainly not. TBH I've not looked into why that's separate, but I'd be staggered if anything I've done will change that. -- Phil Holmes Bug Squad ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
On 11-07-29 08:21 AM, lilyp...@googlecode.com wrote: Comment #15 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 My comment above was right, and adding contributor to the list of post-processed files has corrected that as well. A patch is available to fix this bug. ___ Will this mean that we won't have to use the separate scripts/auxiliar/cg-section.sh SECTION as in CG 5.6, Phil? Colin -- The human race has one really effective weapon, and that is laughter. -- Mark Twain ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #18 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 oops, yeah, comment 9. Anyway, if it works for you... maybe I screwed up when I tried to make the change earlier? Let's move ahead with the patch and see if any problems arise. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #17 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Not issue 9, comment 9, I presume. I've just run make website, I have a new set of files in out-website, and all the ones I've looked at have their full quota of images. TBH not sure why, but that's what I get. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #16 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 does your patch address the problem in issue 9? to whit, apply your patch, then run: make website if that breaks, then we cannot accept the patch as it stands. I definitely agree with fixing contributor => post-process first, though! :) ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #15 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 My comment above was right, and adding contributor to the list of post-processed files has corrected that as well. A patch is available to fix this bug. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Updates: Status: Started Comment #14 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Update. After much tracking, I know how to fix the problem with web. As it turns out, my suggestion in comment 5 will fix the problem in both the big and split versions of the web page. The reason for this is that almost all of the website is post-processed (during the "Mirroring" phase): www_post calls postprocess_html.process_html_files and in process_html_files there's a call to hack_urls() which uses the regex "pictures_re = re.compile ('src="(pictures/.*?)"')" to get add the ../ before pictures in split pages. I've tested amending the macro and can confirm it works. I'm not creating a patch yet, because contributor still isn't right - the included pictures are still missing. I believe this is because contributor isn't in the list of post-processed files and will look at fixing this before creating a patch. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #13 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 FWIW, it's not just a problem with web. It seems that any web page where there are included pictures (not included images of lily-produced music) has a similar problem. Browse big-contributor and we see the images; browse split contributor and they're not there: http://lilypond.org/doc/v2.15/Documentation/contributor/overview-of-lilypond-architecture ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #12 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 It's done with make doc. HTML files are in out-www/offline-root/something/Documentation/index.html NB: as always, I make no guarantees that our build system can correctly generate the docs if you have a half-complete build tree. Ideally it *should* be able to do so, of course. That said, I'm not aware of any problems with this particular part of the build system. As long as you do the touch Documentation/*.te?? then I will be very surprised if you get nothing at all in out-www/offline-root/ ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #11 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 Comment 10 was me - other browser, other username. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #10 on issue 1663 by bealings...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 AFAICS, running make; make doc; make website; doesn't create the HTML versions of the manuals - not on my system, anyway. Is there a make command to create these? ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #9 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 After removing all the ../ from ../pictures, "make website" produces a website without pictures. Incidentally, one reason that I wanted you to work on the website first was because it's a much faster compile, but it can still test many texinfo problems. I'll go ahead and start a "make doc" now, but that'll be a while t finish, and I don't expect to see any new info there. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #8 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 you can only run it when you're in the build/ dir and run it as out/bin/lilypond-book ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #7 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 You may be right... (but I'd still be interested in the result). To debug this further I want to be able to run the compile from the command line - the major command line is: LILYPOND_VERSION=2.15.0 /usr/bin/python /home/phil/lilypond-git/scripts/lilypond-book.py [lots of options etc.] If I try this from the command line, I get: File "/home/phil/lilypond-git/scripts/lilypond-book.py", line 62, in import lilylib as ly ImportError: No module named lilylib Any idea how to run lilypond-book from the command line? ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #6 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 I'll try that change at university tonight or tomorrow -- but I'll wager an excessive postage charge that it'll fix the -big-page.html but break the split-page (i.e. normal) website. :) ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #5 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 I have been looking into the build system, and to a first approximation it's the same for web, notation, etc. However, the web files are the ONLY files that use the 2 macros @imageId and @imageFloat. The definitions of these include: @html alt="\IMAGE-FILE\"> @end html and @html @end html See the ../pictures? That's _exactly_ the error above. I think you can compile docs about 100 times faster than me? Delete the ../ from the 2 defs in common-macros.itexi and I'll wager an excess postage charge that the problem will disappear. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #4 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 We have 3 or 4 different places that write filenames including directories, prepend directories with a ../, remove a ../, etc. You cannot conclude anything on the basis of @sourceimage alone -- you need to track what goes into the html file at every step of the processing, and compare that to working examples from other manuals. I'm giving this an ETA: 10 hours. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #3 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 From common-macros.itexi: @macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT} @image{pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} @end macro Think this points towards not using the sourceimage tag as the problem... ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #2 on issue 1663 by percival.music.ca: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 @sourceimage is our own macro, defined in either macros.itexi or common-macros.itexi in the Documentation/ dir. I think the problem here lies on the makefile or lilypond-texi2html.init level. The basic functionality works for other -big-page.html files, right? (please check this, don't just take my word for it) hmm -- check out contributor/programming-work. That has a @sourceimage in it (according to git grep ). If that manual looks fine in -big-html version, then the problem is most likely not with the texinfo, but rather the makefile doing something for contributor that it doesn't do for web. ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Re: Issue 1663 in lilypond: Images missing on web site
Comment #1 on issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 I've been doing some looking at this. It seems that images are inserted into docs like notation using the @sourceimage syntax. Can't find this in the texinfo manual, so don't know what it does. For the web files, the syntax varies a little, but one is @imageId. I'm wondering whether @sourceimage uses a different directory syntax? ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
Issue 1663 in lilypond: Images missing on web site
Status: Accepted Owner: Labels: Type-Build Priority-High New issue 1663 by philehol...@googlemail.com: Images missing on web site http://code.google.com/p/lilypond/issues/detail?id=1663 On: http://lilypond.org/doc/v2.13/Documentation/web-big-page.html the pictures don't display because they are linked using ../pictures/blah.jpg rather than pictures/blah.jpg ___ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond