2016-11-12 23:09 GMT+01:00 David Kastrup <d...@gnu.org>: > Thomas Morley <thomasmorle...@gmail.com> writes: > >> 2016-11-12 15:50 GMT+01:00 Thomas Morley <thomasmorle...@gmail.com>: >>> 2016-11-12 15:42 GMT+01:00 David Kastrup <d...@gnu.org>: >>>> Thomas Morley <thomasmorle...@gmail.com> writes: >>>> >>>>>> The main problem I remember was a coding problem. It did not like >>>>>> working with UTF-8 characters. >>>>> >>>>> >>>>> Do you mean the encoding-problem is responsible for the failed >>>>> markup-cyclic-reference.ly? >>>> >>>> Very unlikely. >>>> >>>>> Or for the stuck while doc-building? >>>> >>>> Possibly but also unlikely. I remembered straightforward errors when >>>> using files with UTF-8 characters in them (and there were a number). >>>> And the file for demonstrating &oe; and similar HTML characters turned >>>> out wrong. No error I think, just wrong. >>>> >>>> -- >>>> David Kastrup >>> >>> Just seen Antonio continued his work: >>> https://ao2.it/tmp/lilypond-guile2/ >>> >>> Here what he did: >>> https://ao2.it/tmp/lilypond-guile2/NOTES_2016-11-10.txt >>> >>> He claims to get a successful >>> make doc >>> >>> Will look into it more thoroughly later the day. >>> >>> Cheers, >>> Harm >> >> Well, I tried to do the same as Antonio, but it didn't work out for me >> and I don't have a clue why. >> >> So I tried to go back several steps: >> i.e. check out remotes/origin/dev/guilev21, derive a local branch from >> it, rebase it against current master and then do make -j5 >> >> It fails with the error: >> /home/hermann/lilypond-git/lily/source-file.cc: In member function >> 'void Source_file::init_port()': >> /home/hermann/lilypond-git/lily/source-file.cc:163:71: error: >> 'ly_lily_module_constant' was not declared in this scope >> scm_dynwind_fluid (ly_lily_module_constant >> ("%default-port-encoding"), SCM_BOOL_F); >> >> The relevant patch in remotes/origin/dev/guilev21 is: >> >> commit 9eaf40c79f064b0d303df6d47edcdf124d84dec9 >> Author: David Kastrup <d...@gnu.org> >> Date: Sun Sep 21 18:40:06 2014 +0200 >> >> Source_file::init_port: Keep GUILEv2 from redecoding string input >> >> diff --git a/lily/guile-init.cc b/lily/guile-init.cc >> index 4270aa0..c1bbf7e 100644 >> --- a/lily/guile-init.cc >> +++ b/lily/guile-init.cc >> @@ -56,6 +56,14 @@ ly_init_ly_module () >> for (vsize i = scm_init_funcs_->size (); i--;) >> (scm_init_funcs_->at (i)) (); >> >> +#if GUILEV2 >> + // We need binary ports for any of our standard input operations, >> + // and the precompiled API calls for those crash inexplicably if we >> + // have not explicitly loaded the module anyway. >> + // Cf <URL:http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20209>. >> + (void) scm_c_resolve_module ("ice-9 binary-ports"); >> +#endif >> + >> if (is_loglevel (LOG_DEBUG)) >> { >> debug_output ("[", true); >> diff --git a/lily/source-file.cc b/lily/source-file.cc >> index 14fdf2b..eaa5ee0 100644 >> --- a/lily/source-file.cc >> +++ b/lily/source-file.cc >> @@ -151,8 +151,22 @@ Source_file::init_port () >> // This is somewhat icky: the string will in general be in utf8, but >> // we do our own utf8 encoding and verification in the parser, so we >> // use the no-conversion equivalent of latin1 >> +#if GUILEV2 >> + SCM str = scm_c_make_bytevector (length () - 1); >> + memcpy (SCM_BYTEVECTOR_CONTENTS (str), c_str (), length () - 1); >> + // Setting %default-port-encoding to binary before calling >> + // open-bytevector-input-port appears quite unnecessary regarding >> + // the documented semantics, but at least GUILE 2.0.11 is not >> + // particularly interested in sticking to its documentation. >> + // <URL:http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20200> >> + scm_dynwind_begin ((scm_t_dynwind_flags)0); >> + scm_dynwind_fluid (ly_lily_module_constant >> ("%default-port-encoding"), SCM_BOOL_F); >> + str_port_ = scm_open_bytevector_input_port (str, SCM_UNDEFINED); >> + scm_dynwind_end (); >> +#else >> SCM str = scm_from_latin1_string (c_str ()); >> str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, >> __FUNCTION__); >> +#endif >> scm_set_port_filename_x (str_port_, ly_string2scm (name_)); >> } >> >> >> >> I don't understand whats wrong. >> >> Hints? > > I saw a patch for this in his notes or branches or whatever. > ly_lily_module_constant no longer exists; this is done using the > lily/lily-imports.cc and lily/include/lily-imports.hh files now. If you > cannot figure this out, I can try to upgrade/rebase the old branch, > assuming that its operation is indeed necessary. > > -- > David Kastrup
I think his third patch deals with it. So I tried (some unrelated commands omitted) to apply the first four patches from https://ao2.it/tmp/lilypond-guile2/ 2200 git checkout master 2201 git fetch 2202 git pull -r 2206 git checkout -b dev/master-my-guile21 2208 git apply 0001-Initialize-locale-in-GUILEv2.patch 2209 git apply 0002-Source_file-init_port-Keep-GUILEv2-from-redecoding-s.patch 2210 git apply 0003-Update-changes-from-commit-122525f-Keep-GUILEv2-from.patch 2215 git apply 0004-Fix-the-GUILE-autoconf-variable-substitution-with-gu.patch 2216 sh autogen.sh --noconfigure 2217 mkdir -p build/ 2218 cd build/ 2219 ../configure --enable-guile2 2220 make -j5 2224 history 100 Going for a build-directory is not _exactly_ Antonios method, but _should_ work of course. Though, I got an error in declarations-init.ly. From the log: /home/hermann/lilypond-git/build/out/share/lilypond/current/ly/declarations-init.ly:1:5: error: undefined character or shorthand: ( %%%% This file is part of LilyPond, the GNU music typesetter. Which is bullshit. Complete log attached. Continuing to curse, Harm
Log level set to 287 Relocation: is absolute: argv0=/home/hermann/lilypond-git/build/out/bin/lilypond PATH=/home/hermann/lilypond-git/build/out/bin (prepend) Setting PATH to /home/hermann/lilypond-git/build/out/bin:/home/hermann/lilypond-git/build/lily/out:/home/hermann/lilypond-git/build/scripts/build/out:/home/hermann/lilypond-git/build/scripts/out:/home/hermann/lilypond-git/build/lily/out:/home/hermann/lilypond-git/build/scripts/build/out:/home/hermann/lilypond-git/build/scripts/out:/home/hermann/git-cl:/home/hermann/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:: Relocation: compile datadir=, new datadir=/home/hermann/lilypond-git/build/out/share/lilypond//current Relocation: framework_prefix=/home/hermann/lilypond-git/build/out/bin/.. Setting INSTALLER_PREFIX to /home/hermann/lilypond-git/build/out/bin/.. PATH=/home/hermann/lilypond-git/build/out/bin/../bin (prepend) Setting PATH to /home/hermann/lilypond-git/build/out/bin/../bin:/home/hermann/lilypond-git/build/out/bin:/home/hermann/lilypond-git/build/lily/out:/home/hermann/lilypond-git/build/scripts/build/out:/home/hermann/lilypond-git/build/scripts/out:/home/hermann/lilypond-git/build/lily/out:/home/hermann/lilypond-git/build/scripts/build/out:/home/hermann/lilypond-git/build/scripts/out:/home/hermann/git-cl:/home/hermann/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:: Setting GUILE_MIN_YIELD_1 to 65 Setting GUILE_MIN_YIELD_2 to 65 Setting GUILE_MIN_YIELD_MALLOC to 65 Setting GUILE_INIT_SEGMENT_SIZE_1 to 10485760 Setting GUILE_MAX_SEGMENT_SIZE to 104857600 Setting GUILE_AUTO_COMPILE to 0 Setting GUILE_WARN_DEPRECATED to detailed Setting XDG_CACHE_HOME to /home/hermann/lilypond-git/build/out/share/lilypond/current LILYPOND_DATADIR="/usr/local/share/lilypond/2.19.51" LOCALEDIR="/usr/local/share/locale" Effective prefix: "/home/hermann/lilypond-git/build/out/share/lilypond/current" PATH="/home/hermann/lilypond-git/build/out/bin/../bin:/home/hermann/lilypond-git/build/out/bin:/home/hermann/lilypond-git/build/lily/out:/home/hermann/lilypond-git/build/scripts/build/out:/home/hermann/lilypond-git/build/scripts/out:/home/hermann/lilypond-git/build/lily/out:/home/hermann/lilypond-git/build/scripts/build/out:/home/hermann/lilypond-git/build/scripts/out:/home/hermann/git-cl:/home/hermann/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin::" [] Using (ice-9 curried-definitions) module [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/lily-library.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/output-lib.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/markup-macros.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/parser-ly-from-scheme.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/file-cache.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-event-classes.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-music-callbacks.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-music-types.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-note-names.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/c++.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/chord-entry.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/skyline.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/markup.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-markup-commands.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/stencil.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/modal-transforms.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/chord-generic-names.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/chord-ignatzek-names.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/music-functions.scm [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-music-display-methods.scm] ] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/part-combiner.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/autochange.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-music-properties.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/time-signature.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/time-signature-settings.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/auto-beam.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/chord-name.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/bezier-tools.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-context-properties.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/translation-functions.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/script.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/midi.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/layout-beam.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/parser-clef.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/layout-slur.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/font.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/encoding.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/bar-line.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/flag-styles.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/fret-diagrams.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/tablature.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/harp-pedals.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-woodwind-diagrams.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/display-woodwind-diagrams.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/predefined-fretboards.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-grob-properties.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-grobs.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-grob-interfaces.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/define-stencil-commands.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/scheme-engravers.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/titling.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/text.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/paper.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/backend-library.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/x11-color.scm] [/home/hermann/lilypond-git/build/out/share/lilypond/current/scm/safe-lily.scm] Initializing FontConfig... Adding fontconfig configuration file: /home/hermann/lilypond-git/build/out/share/lilypond/current/fonts/00-lilypond-fonts.conf Adding fontconfig configuration file: /etc/fonts/fonts.conf Adding fontconfig configuration file: /home/hermann/lilypond-git/build/out/share/lilypond/current/fonts/99-lilypond-fonts.conf Adding font directory: /home/hermann/lilypond-git/build/out/share/lilypond/current/fonts/otf Building font database... Processing `/home/hermann/lilypond-git/ly/generate-documentation.ly' Parsing... [/home/hermann/lilypond-git/ly/init.ly [<string> [/home/hermann/lilypond-git/build/out/share/lilypond/current/ly/declarations-init.ly /home/hermann/lilypond-git/build/out/share/lilypond/current/ly/declarations-init.ly:1:5: error: undefined character or shorthand: ( %%%% This file is part of LilyPond, the GNU music typesetter. /home/hermann/lilypond-git/build/out/share/lilypond/current/ly/declarations-init.ly:1:6: error: syntax error, unexpected STRING, expecting '.' or '=' or ',' %%%% This file is part of LilyPond, the GNU music typesetter. /home/hermann/lilypond-git/build/out/share/lilypond/current/ly/declarations-init.ly:1:27: error: undefined character or shorthand: ) %%%% This file is part of LilyPond, the GNU music typesetter. /home/hermann/lilypond-git/build/out/share/lilypond/current/scm/lily.scmBacktrace: In ice-9/boot-9.scm: 157: 9 [catch #t #<catch-closure 2d51600> ...] In unknown file: ?: 8 [apply-smob/1 #<catch-closure 2d51600>] In ice-9/eval.scm: 411: 7 [eval # #] 432: 6 [eval # #] In srfi/srfi-1.scm: 619: 5 [for-each #<procedure 3d1cde0 at ice-9/eval.scm:416:20 (a)> #] In ice-9/eval.scm: 432: 4 [eval # #] In ice-9/boot-9.scm: 157: 3 [catch ly-file-failed #<procedure 3d1cd50 at ice-9/eval.scm:416:20 ()> ...] In unknown file: ?: 2 [ly:parse-file "/home/hermann/lilypond-git/ly/generate-documentation"] In ice-9/eval.scm: 432: 1 [eval # #] In unknown file: ?: 0 [ly:parser-parse-string # "\\include \"declarations-init.ly\""] ERROR: In procedure ly:parser-parse-string: ERROR: In procedure bip_seek: Value out of range: 37
_______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel