Done. In message <20141221.144717.503947741463082498.rich...@levitte.org> on Sun, 21 Dec 2014 14:47:17 +0100 (CET), Richard Levitte <rich...@levitte.org> said:
richard> Unfortunately, it wasn't perfect, it missed all the hrefs that had richard> #something at the end. Easily fixed, though. I'll push when done. richard> richard> In message <5496bde8.1070...@tongareva.de> on Sun, 21 Dec 2014 13:32:40 +0100, Ulrich Pegelow <ulrich.pege...@tongareva.de> said: richard> richard> ulrich.pegelow> Dear Richard, richard> ulrich.pegelow> richard> ulrich.pegelow> looks good! Do you want to push the fix? richard> ulrich.pegelow> richard> ulrich.pegelow> Ulrich richard> ulrich.pegelow> richard> ulrich.pegelow> Am 21.12.2014 um 10:14 schrieb Richard Levitte: richard> ulrich.pegelow> > In message <5495cf4c.20...@tongareva.de> on Sat, 20 Dec 2014 20:34:36 richard> ulrich.pegelow> > +0100, Ulrich Pegelow <ulrich.pege...@tongareva.de> said: richard> ulrich.pegelow> > richard> ulrich.pegelow> > ulrich.pegelow> Am 20.12.2014 um 19:44 schrieb Richard Levitte: richard> ulrich.pegelow> > ulrich.pegelow> > An external reference will certainly have a colon, richard> ulrich.pegelow> > so something like richard> ulrich.pegelow> > ulrich.pegelow> > this (assuming they're all surrounded by ")? richard> ulrich.pegelow> > ulrich.pegelow> > richard> ulrich.pegelow> > ulrich.pegelow> > 's|"\([^":]*\.html\)"|"\1.php"|g' richard> ulrich.pegelow> > ulrich.pegelow> > richard> ulrich.pegelow> > ulrich.pegelow> > I haven't really tested much, but it's an idea... richard> ulrich.pegelow> > ulrich.pegelow> richard> ulrich.pegelow> > ulrich.pegelow> OK, looks reasonable. But now come the subtleties: how richard> ulrich.pegelow> > to make this richard> ulrich.pegelow> > ulrich.pegelow> work with the quotations marks? Means: works as a richard> ulrich.pegelow> > CMakeLists.txt, richard> ulrich.pegelow> > ulrich.pegelow> works as a shell command, works as a sed -e expression richard> ulrich.pegelow> > and does what richard> ulrich.pegelow> > ulrich.pegelow> it's supposed to do. Just putting in the suggested richard> ulrich.pegelow> > string already richard> ulrich.pegelow> > ulrich.pegelow> fails at the cmake level :( richard> ulrich.pegelow> > richard> ulrich.pegelow> > Hmmm, it appears cmake does some odd treatment of strings or richard> ulrich.pegelow> > something... I don't quite get it, it seems it copies them verbatim richard> ulrich.pegelow> > (except for doubling $ signs, of course), so I thought my string would richard> ulrich.pegelow> > go through without problems. richard> ulrich.pegelow> > richard> ulrich.pegelow> > Anyhow, the diff I'm attaching goes through and produces a sensible richard> ulrich.pegelow> > build/doc/usermanual/CMakeFiles/darktable-usermanual-wordpress.dir/build.make richard> ulrich.pegelow> > as far as I can tell (*). Please try it out. richard> ulrich.pegelow> > richard> ulrich.pegelow> > (*) I've problems with my saxon/docbook setup, I keep getting this richard> ulrich.pegelow> > when trying to produce a wp manual (running with 'make VERBOSE=1'): richard> ulrich.pegelow> > richard> ulrich.pegelow> > [ 97%] Building php usermanual richard> ulrich.pegelow> > cd /home/levitte/gitwrk/github.com/darktable-swedish/doc/usermanual && /usr/bin/java -cp /etc/xml/resolver:/usr/share/java/saxon.jar:/usr/share/java/saxon.jar com.icl.saxon.StyleSheet /home/levitte/gitwrk/github.com/darktable-swedish/build/doc/usermanual/darktable_single.xml xsl/darktable_html_ext.xsl chunker.output.encoding=UTF-8 base.dir=/home/levitte/gitwrk/github.com/darktable-swedish/build/doc/usermanual/wp/ richard> ulrich.pegelow> > No adjustColumnWidths function available. richard> ulrich.pegelow> > Processing terminated by xsl:message at line 402 richard> ulrich.pegelow> > doc/usermanual/CMakeFiles/darktable-usermanual-wordpress.dir/build.make:51: recipe for target 'doc/usermanual/wp/index.html.php' failed richard> ulrich.pegelow> > make[3]: *** [doc/usermanual/wp/index.html.php] Error 1 richard> ulrich.pegelow> > make[3]: Leaving directory '/home/levitte/gitwrk/github.com/darktable-swedish/build' richard> ulrich.pegelow> > CMakeFiles/Makefile2:7909: recipe for target 'doc/usermanual/CMakeFiles/darktable-usermanual-wordpress.dir/all' failed richard> ulrich.pegelow> > make[2]: *** [doc/usermanual/CMakeFiles/darktable-usermanual-wordpress.dir/all] Error 2 richard> ulrich.pegelow> > make[2]: Leaving directory '/home/levitte/gitwrk/github.com/darktable-swedish/build' richard> ulrich.pegelow> > CMakeFiles/Makefile2:7917: recipe for target 'doc/usermanual/CMakeFiles/darktable-usermanual-wordpress.dir/rule' failed richard> ulrich.pegelow> > make[1]: *** [doc/usermanual/CMakeFiles/darktable-usermanual-wordpress.dir/rule] Error 2 richard> ulrich.pegelow> > make[1]: Leaving directory '/home/levitte/gitwrk/github.com/darktable-swedish/build' richard> ulrich.pegelow> > Makefile:2996: recipe for target 'darktable-usermanual-wordpress' failed richard> ulrich.pegelow> > make: *** [darktable-usermanual-wordpress] Error 2 richard> ulrich.pegelow> > richard> ulrich.pegelow> > Cheers, richard> ulrich.pegelow> > Richard richard> ulrich.pegelow> > richard> ulrich.pegelow> ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ darktable-devel mailing list darktable-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/darktable-devel
