CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/05/02 12:39:29
Modified files:
po : nl.po
lily/include : lily-guile.hh font-metric.hh
lily : source-file.cc open-type-font.cc main.cc
lily-guile.cc general-scheme.cc
flower/include : libc-extension.hh international.hh
flower : string.cc libc-extension.cc
cygwin : mknetrel
. : configure.in config.hh.in ChangeLog
Log message:
* flower/include/international.hh: Bugfix: include "string.hh".
* flower/include/libc-extension.hh (memrev): Rename from strrev.
* configure.in: Search for mingw wcrtomb library.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/po/nl.po.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-guile.hh.diff?tr1=1.158&tr2=1.159&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/font-metric.hh.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/source-file.cc.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/open-type-font.cc.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.243&tr2=1.244&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-guile.cc.diff?tr1=1.211&tr2=1.212&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/general-scheme.cc.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/libc-extension.hh.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/international.hh.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/string.cc.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/libc-extension.cc.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/mknetrel.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/configure.in.diff?tr1=1.148&tr2=1.149&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/config.hh.in.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3524&tr2=1.3525&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3524 lilypond/ChangeLog:1.3525
--- lilypond/ChangeLog:1.3524 Mon May 2 10:34:18 2005
+++ lilypond/ChangeLog Mon May 2 12:39:28 2005
@@ -1,3 +1,13 @@
+2005-05-02 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * flower/include/international.hh: Bugfix: include "string.hh".
+
+ * lily/include/mingw-compatibility.hh: New file.
+
+ * flower/include/libc-extension.hh (memrev): Rename from strrev.
+
+ * configure.in: Search for mingw wcrtomb library.
+
2005-05-02 Mats Bengtsson <[EMAIL PROTECTED]>
* scripts/convert-ly.py: Bug fix
Index: lilypond/config.hh.in
diff -u lilypond/config.hh.in:1.42 lilypond/config.hh.in:1.43
--- lilypond/config.hh.in:1.42 Sun Apr 17 21:09:45 2005
+++ lilypond/config.hh.in Mon May 2 12:39:28 2005
@@ -10,6 +10,9 @@
/* default lilypond locale dir */
#define LOCALEDIR "@LOCALEDIR@"
+/* define if you have chroot */
+#define HAVE_CHROOT 0
+
/* define if you have fopencookie */
#define HAVE_FOPENCOOKIE 0
@@ -19,27 +22,36 @@
/* define if you have gettext */
#define HAVE_GETTEXT 0
+/* define if you have isinf */
+#define HAVE_ISINF 0
+
+/* define if you have lrint */
+#define HAVE_LRINT 0
+
/* define if you have memmem */
#define HAVE_MEMMEM 0
+/* define if you have mbrtowc */
+#define HAVE_MBRTOWC 0
+
/* define if you have snprintf */
#define HAVE_SNPRINTF 0
/* define if you have vsnprintf */
#define HAVE_VSNPRINTF 0
+/* define if you have wcrtomb */
+#define HAVE_WCRTOMB 0
+
/* define if you have yyFlexLexer.yy_current_buffer */
#undef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
-/* define if you have isinf */
-#define HAVE_ISINF 0
-
-/* define if you have lrint */
-#define HAVE_LRINT 0
-
/* define if you want KPATHSEA */
#define KPATHSEA @KPATHSEA@
+/* define if you have grp header */
+#define HAVE_GRP_H 0
+
/* define if you have kpatsea header */
#define HAVE_KPATHSEA_KPATHSEA_H 0
@@ -49,6 +61,9 @@
/* define if you have kpse_find_tfm */
#define HAVE_KPSE_FIND_TFM 0
+/* define if you have pwd header */
+#define HAVE_PWD_H 0
+
/* define if you have Python.h header */
#define HAVE_PYTHON_H 0
Index: lilypond/configure.in
diff -u lilypond/configure.in:1.148 lilypond/configure.in:1.149
--- lilypond/configure.in:1.148 Wed Apr 20 08:16:45 2005
+++ lilypond/configure.in Mon May 2 12:39:28 2005
@@ -32,7 +32,7 @@
STEPMAKE_KPATHSEA
-STEPMAKE_PYTHON(REQUIRED,2.1)
+STEPMAKE_PYTHON(REQUIRED, 2.1)
STEPMAKE_GCC(REQUIRED, 2.8)
STEPMAKE_CXX(REQUIRED)
STEPMAKE_GXX(REQUIRED, 3.0.5)
@@ -59,15 +59,16 @@
STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1)
STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
-AC_CHECK_HEADERS([assert.h libio.h sys/stat.h])
+AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS([sstream])
AC_LANG_POP(C++)
AC_HEADER_STAT
AC_FUNC_MEMCMP
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([fopencookie funopen gettext isinf memmem snprintf vsnprintf])
+AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf mbrtowc memmem
snprintf vsnprintf wcrtomb])
AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
+AC_SEARCH_LIBS(wcrtomb, [mingwex msvcp60])
STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
if test "$gui_b" = "yes"; then
Index: lilypond/cygwin/mknetrel
diff -u lilypond/cygwin/mknetrel:1.41 lilypond/cygwin/mknetrel:1.42
--- lilypond/cygwin/mknetrel:1.41 Mon Apr 25 19:35:00 2005
+++ lilypond/cygwin/mknetrel Mon May 2 12:39:28 2005
@@ -104,10 +104,11 @@
EOF
chmod 755 i686-cygwin-guile-config
PATH=$(pwd):$PATH
- export PKG_CONFIG_PATH=$cygwin_root/usr/lib/pkgconfig
+ export PKG_CONFIG_PATH=$cygwin_prefix/lib/pkgconfig
export PKG_CONFIG="pkg-config \
---define-variable prefix=$cygwin_root \
---define-variable includedir=$cygwin_root/usr/include"
+--define-variable prefix=$cygwin_prefix \
+--define-variable includedir=$cygwin_prefix/include \
+--define-variable libdir=$cygwin_prefix/lib"
fi
export CFLAGS="-DKPSE_DLL"
}
Index: lilypond/flower/include/international.hh
diff -u lilypond/flower/include/international.hh:1.11
lilypond/flower/include/international.hh:1.12
--- lilypond/flower/include/international.hh:1.11 Thu Mar 10 14:36:16 2005
+++ lilypond/flower/include/international.hh Mon May 2 12:39:28 2005
@@ -9,6 +9,8 @@
#ifndef INTERNATIONAL_HH
#define INTERNATIONAL_HH
+#include "string.hh"
+
/**
Internationalisation: _i ("to be translated") gets an entry in the POT file
gettext () must be invoked explicitely to do the actual "translation".
Index: lilypond/flower/include/libc-extension.hh
diff -u lilypond/flower/include/libc-extension.hh:1.30
lilypond/flower/include/libc-extension.hh:1.31
--- lilypond/flower/include/libc-extension.hh:1.30 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/libc-extension.hh Mon May 2 12:39:28 2005
@@ -107,8 +107,13 @@
} /* extern "C" */
#endif
+#if ! HAVE_MEMRCHR
unsigned char *memrchr (unsigned char const *p, int n, char c);
-unsigned char *strrev (unsigned char *byte, int length_i);
+#endif
+
+#if ! HAVE_MEMREV
+unsigned char *memrev (unsigned char *byte, int length_i);
+#endif
double my_round (double);
Index: lilypond/flower/libc-extension.cc
diff -u lilypond/flower/libc-extension.cc:1.33
lilypond/flower/libc-extension.cc:1.34
--- lilypond/flower/libc-extension.cc:1.33 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/libc-extension.cc Mon May 2 12:39:28 2005
@@ -121,7 +121,7 @@
}
unsigned char *
-strrev (unsigned char *byte, int length)
+memrev (unsigned char *byte, int length)
{
unsigned char tmp_byte;
unsigned char *left = byte;
Index: lilypond/flower/string.cc
diff -u lilypond/flower/string.cc:1.48 lilypond/flower/string.cc:1.49
--- lilypond/flower/string.cc:1.48 Sat Apr 30 23:43:03 2005
+++ lilypond/flower/string.cc Mon May 2 12:39:28 2005
@@ -348,7 +348,7 @@
void
String::reverse ()
{
- strrev (get_bytes (), length ());
+ memrev (get_bytes (), length ());
}
int
Index: lilypond/lily/general-scheme.cc
diff -u lilypond/lily/general-scheme.cc:1.17
lilypond/lily/general-scheme.cc:1.18
--- lilypond/lily/general-scheme.cc:1.17 Wed Apr 27 09:12:33 2005
+++ lilypond/lily/general-scheme.cc Mon May 2 12:39:28 2005
@@ -9,7 +9,6 @@
#include "config.hh"
-#include <libintl.h> /* gettext on MacOS X */
#include <math.h> /* isinf */
#include <stdio.h>
#include <string.h> /* memset */
@@ -19,6 +18,7 @@
#include <wchar.h> /* wcrtomb */
#endif
+#include "international.hh"
#include "libc-extension.hh"
#include "lily-guile.hh"
#include "string.hh"
Index: lilypond/lily/include/font-metric.hh
diff -u lilypond/lily/include/font-metric.hh:1.38
lilypond/lily/include/font-metric.hh:1.39
--- lilypond/lily/include/font-metric.hh:1.38 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/font-metric.hh Mon May 2 12:39:28 2005
@@ -10,8 +10,8 @@
#define FONT_METRIC_HH
#include "box.hh"
-#include "smobs.hh"
#include "lily-proto.hh"
+#include "smobs.hh"
class Font_metric
{
Index: lilypond/lily/include/lily-guile.hh
diff -u lilypond/lily/include/lily-guile.hh:1.158
lilypond/lily/include/lily-guile.hh:1.159
--- lilypond/lily/include/lily-guile.hh:1.158 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/lily-guile.hh Mon May 2 12:39:28 2005
@@ -9,10 +9,14 @@
#ifndef LILY_GUILE_HH
#define LILY_GUILE_HH
+#if __MINGW32__
+#include "mingw-compatibility.hh"
+#endif
+
#include <libguile.h>
-#include "interval.hh"
#include "guile-compatibility.hh"
+#include "interval.hh"
#include "lily-guile-macros.hh"
#include "ly-module.hh"
Index: lilypond/lily/lily-guile.cc
diff -u lilypond/lily/lily-guile.cc:1.211 lilypond/lily/lily-guile.cc:1.212
--- lilypond/lily/lily-guile.cc:1.211 Wed Apr 27 09:12:33 2005
+++ lilypond/lily/lily-guile.cc Mon May 2 12:39:28 2005
@@ -7,25 +7,27 @@
Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
+#include "lily-guile.hh"
+
#include <cstdio>
#include <cstdlib>
#include <cstring> /* strdup, strchr */
#include <cctype>
-#include <libintl.h> // gettext on macos x
#include "config.hh"
-#include "version.hh"
-#include "lily-guile.hh"
+
+#include "dimensions.hh"
+#include "direction.hh"
+#include "file-path.hh"
+#include "international.hh"
#include "libc-extension.hh"
#include "main.hh"
-#include "file-path.hh"
-#include "warn.hh"
-#include "direction.hh"
+#include "misc.hh"
#include "offset.hh"
#include "pitch.hh"
-#include "dimensions.hh"
#include "source-file.hh"
-#include "misc.hh"
+#include "version.hh"
+#include "warn.hh"
// #define TEST_GC
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.243 lilypond/lily/main.cc:1.244
--- lilypond/lily/main.cc:1.243 Wed Apr 27 13:00:50 2005
+++ lilypond/lily/main.cc Mon May 2 12:39:28 2005
@@ -13,13 +13,17 @@
#include <cstring>
#include <unistd.h>
#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "config.hh"
+#if HAVE_GRP_H
+#include <grp.h>
+#endif
+#if HAVE_PWD_H
+#include <pwd.h>
+#endif
#if HAVE_GETTEXT
#include <libintl.h>
#endif
@@ -152,7 +156,9 @@
{_i ("DIR"), "include", 'I', _i ("add DIR to search path")},
{_i ("FILE"), "init", 'i', _i ("use FILE as init file")},
{_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be
added)")},
+#if HAVE_CHROOT
{_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become
USER:GROUP\n and cd into DIR")},
+#endif
{0, "no-print", 0, _i ("do not generate printed output")},
{0, "preview", 'p', _i ("generate a preview of the first system")},
{0, "safe-mode", 's', _i ("run in safe mode")},
@@ -284,6 +290,7 @@
void init_global_tweak_registry ();
void init_fontconfig ();
+#if HAVE_CHROOT
static void
do_chroot_jail ()
{
@@ -366,6 +373,7 @@
exit (3);
}
}
+#endif
void test_pango ();
@@ -440,8 +448,10 @@
exit (2);
}
+#if HAVE_CHROOT
if (! jail_spec.is_empty ())
do_chroot_jail ();
+#endif
SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files);
(void) result;
Index: lilypond/lily/open-type-font.cc
diff -u lilypond/lily/open-type-font.cc:1.34
lilypond/lily/open-type-font.cc:1.35
--- lilypond/lily/open-type-font.cc:1.34 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/open-type-font.cc Mon May 2 12:39:28 2005
@@ -6,15 +6,14 @@
(c) 2004--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
*/
-#include <map>
-#include <stdio.h>
+#include "open-type-font.hh"
#include <freetype/tttables.h>
+#include <stdio.h>
-#include "warn.hh"
-#include "open-type-font.hh"
#include "dimensions.hh"
#include "modified-font-metric.hh"
+#include "warn.hh"
FT_Byte *
load_table (char const *tag_str, FT_Face face, FT_ULong *length)
Index: lilypond/lily/source-file.cc
diff -u lilypond/lily/source-file.cc:1.27 lilypond/lily/source-file.cc:1.28
--- lilypond/lily/source-file.cc:1.27 Tue Apr 12 23:38:49 2005
+++ lilypond/lily/source-file.cc Mon May 2 12:39:28 2005
@@ -12,9 +12,9 @@
#include "config.hh"
#if HAVE_UTF8_WCHAR_H
-#include <utf8/wchar.h> /* wcrtomb */
+#include <utf8/wchar.h> /* mbrtowc */
#else
-#include <wchar.h> /* wcrtomb */
+#include <wchar.h> /* mbrtowc */
#endif
#include <cstdio>
Index: lilypond/po/nl.po
diff -u lilypond/po/nl.po:1.67 lilypond/po/nl.po:1.68
--- lilypond/po/nl.po:1.67 Tue Apr 19 21:33:20 2005
+++ lilypond/po/nl.po Mon May 2 12:39:28 2005
@@ -12,7 +12,7 @@
"Project-Id-Version: lilypond 2.2.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-04-19 22:41+0200\n"
-"PO-Revision-Date: 2005-04-19 23:28+0200\n"
+"PO-Revision-Date: 2005-04-25 21:59+0200\n"
"Last-Translator: Jan Nieuwenhuizen <[EMAIL PROTECTED]>\n"
"Language-Team: Dutch <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
@@ -1242,7 +1242,7 @@
#: main.cc:150
msgid "USER,GROUP,JAIL,DIR"
-msgstr "GEBRU,GROUP,GEVANG,DIR"
+msgstr "GEBR,GROEP,GEVANG,DIR"
#: main.cc:150
msgid ""
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
