From e7b0972c44522875f9b31bb1d62eec3f687a3978 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 6 Feb 2001 15:17:11 +0000 Subject: [PATCH] HP-UX compile fix, thai keymap git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1448 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 10 ++++ INSTALL | 5 +- acconfig.h | 6 +++ configure.in | 8 +++- lib/ChangeLog | 5 ++ lib/kbd/thai-kedmanee.kmap | 97 ++++++++++++++++++++++++++++++++++++++ src/ChangeLog | 7 +++ src/LaTeX.h | 2 +- src/Variables.C | 2 +- src/Variables.h | 2 +- src/support/ChangeLog | 5 ++ src/support/fmt.C | 2 +- src/support/snprintf.h | 7 ++- 13 files changed, 148 insertions(+), 10 deletions(-) create mode 100644 lib/kbd/thai-kedmanee.kmap diff --git a/ChangeLog b/ChangeLog index c5fbf356c6..289e2856e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-02-06 albert chin + + * acconfig.h: + * configure.in: check declarations of snprintf and vsnprintf. + +2001-02-06 Jean-Marc Lasgouttes + + * INSTALL: update description of command line to use with compaq + cxx. + 2001-01-30 John Levon * INSTALL: mention build problem with older xforms diff --git a/INSTALL b/INSTALL index 3247d8d825..c7d3e35358 100644 --- a/INSTALL +++ b/INSTALL @@ -325,8 +325,9 @@ notify us. o It is possible to compile lyx with Tru64 Unix cxx compiler version 6.2, provided one uses - CXX=cxx - CXXFLAGS='-ptr /tmp/lyx_cxx_repository -std strict_ansi -g -O' + CXX='cxx -std strict_ansi' + CXXFLAGS='-ptr /tmp/lyx_cxx_repository -g' + CC=cc Note that this will not work when compiling directly from the cvs repository, due to the tricks used by automake for dependencies. Ask diff --git a/acconfig.h b/acconfig.h index 5232eee018..dd219f8bee 100644 --- a/acconfig.h +++ b/acconfig.h @@ -47,6 +47,12 @@ /* Define as 1 if the MKSTEMP function is declared */ #undef HAVE_DECL_MKSTEMP +/* Define if you have the function prototype for snprintf(). */ +#undef HAVE_DECL_SNPRINTF + +/* Define if you have the function prototype for vsnprintf(). */ +#undef HAVE_DECL_VSNPRINTF + @BOTTOM@ /************************************************************ diff --git a/configure.in b/configure.in index f991f483f7..a531153ce6 100644 --- a/configure.in +++ b/configure.in @@ -261,8 +261,12 @@ if test "x$lyx_broken_headers" = "xyes"; then AC_DEFINE(BROKEN_HEADERS, 1, [Define on SunOS 4 and SCO, were some functions are missing from the headers]) fi -AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo snprintf vsnprintf) -AC_CHECK_FUNCS(mkstemp mktemp) +AC_CHECK_FUNCS(snprintf vsnprintf) +LYX_CHECK_DECL(snprintf, stdio.h) +LYX_CHECK_DECL(vsnprintf, stdio.h) + +AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo \ + mkstemp mktemp) dnl Until this is fixed in autoconf we provide our own version LYX_FUNC_SELECT_ARGTYPES diff --git a/lib/ChangeLog b/lib/ChangeLog index 573ab5eaef..90fb51b3c2 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2001-02-05 Jean-Marc Lasgouttes + + * kbd/thai-kedmanee.kmap: new Thai keymap, contributed by Chanop + Silpa-Anan. + 2001-02-03 Dekel Tsur * ui/default.ui: Add Edit->Math menu. diff --git a/lib/kbd/thai-kedmanee.kmap b/lib/kbd/thai-kedmanee.kmap new file mode 100644 index 0000000000..24901f5bba --- /dev/null +++ b/lib/kbd/thai-kedmanee.kmap @@ -0,0 +1,97 @@ +# +# Thai Kedmanee Keyboard for Lyx. +# +# By Chanop Silpa-Anan , February 6, 2001. +# +# If you find any bug, please report to me or Lyx team. +# +\kmap q æ +\kmap Q ð +\kmap w ä +\kmap W \" +\kmap e Ó +\kmap E ® +\kmap r ¾ +\kmap R ± +\kmap t Ð +\kmap T ¸ +\kmap y Ñ +\kmap Y í +\kmap u Õ +\kmap U ê +\kmap i à +\kmap I ³ +\kmap o ¹ +\kmap O Ï +\kmap p  +\kmap P ­ +\kmap [ º +\kmap { ° +\kmap ] Å +\kmap } "," +\kmap a ¿ +\kmap A Ä +\kmap s Ë +\kmap S ¦ +\kmap d ¡ +\kmap D ¯ +\kmap f ´ +\kmap F â +\kmap g à +\kmap G ¬ +\kmap h é +\kmap H ç +\kmap j è +\kmap J ë +\kmap k Ò +\kmap K É +\kmap l Ê +\kmap L È +\kmap ; Ç +\kmap : « +\kmap ' § +\kmap \" . +\kmap z ¼ +\kmap Z ( +\kmap x » +\kmap X ) +\kmap c á +\kmap C © +\kmap v Í +\kmap V Î +\kmap b Ô +\kmap B Ú +\kmap n × +\kmap N ì +\kmap m · +\kmap M ? +\kmap "," Á +\kmap < ² +\kmap . ã +\kmap > Ì +\kmap / ½ +\kmap ? Æ +\kmap 1 å +\kmap ! + +\kmap 2 / +\kmap @ ñ +\kmap 3 - +\kmap \# ò +\kmap 4 À +\kmap $ ó +\kmap 5 ¶ +\kmap % ô +\kmap 6 Ø +\kmap ^ Ù +\kmap 7 Ö +\kmap & ß +\kmap 8 ¤ +\kmap * õ +\kmap 9 µ +\kmap \( ö +\kmap 0 ¨ +\kmap \) ÷ +\kmap - ¢ +\kmap _ ø +\kmap = ª +\kmap + ù diff --git a/src/ChangeLog b/src/ChangeLog index 8344598e9a..0af7f8205b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2001-02-06 Jean-Marc Lasgouttes + + * LaTeX.h: yet another std:: that Allan forgot. + + * Variables.C (set): renamed from isset(), because this clashes + with some HP-UX macros (grr). + 2001-02-06 Allan Rae * LaTeX.h: Another bug fix. Missing std:: this time. diff --git a/src/LaTeX.h b/src/LaTeX.h index dfa5937ddb..84fad139a7 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -182,7 +182,7 @@ protected: std::vector const &); /// - bool runBibTeX(vector const &); + bool runBibTeX(std::vector const &); /// void deleteFilesOnError() const; diff --git a/src/Variables.C b/src/Variables.C index f2dc8ddc2f..698647a1e6 100644 --- a/src/Variables.C +++ b/src/Variables.C @@ -38,7 +38,7 @@ string const Variables::get(string const & var) const } -bool Variables::isset(string const & var) const +bool Variables::set(string const & var) const { Vars::const_iterator cit = vars_.find(var); return (cit != vars_.end()); diff --git a/src/Variables.h b/src/Variables.h index 1b71983911..754e0b6e7f 100644 --- a/src/Variables.h +++ b/src/Variables.h @@ -28,7 +28,7 @@ public: /// string const get(string const &) const; /// - bool isset(string const & var) const; + bool set(string const & var) const; /// string const expand(string const &) const; private: diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 6d918d0858..c23da96427 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2001-02-06 albert chin + + * snprintf.h: + * fmt.C: use HAVE_DECL_SNPRINTF + 2001-01-26 Dekel Tsur * lyxstring.C: Fix some assertions. diff --git a/src/support/fmt.C b/src/support/fmt.C index c364068100..dcd2b88e43 100644 --- a/src/support/fmt.C +++ b/src/support/fmt.C @@ -2,7 +2,7 @@ #include #include -#ifndef HAVE_VSNPRINTF +#ifndef HAVE_DECL_VSNPRINTF #include "support/snprintf.h" #endif diff --git a/src/support/snprintf.h b/src/support/snprintf.h index 6ab2dcc8ea..03cf914b3d 100644 --- a/src/support/snprintf.h +++ b/src/support/snprintf.h @@ -8,10 +8,13 @@ extern "C" { #endif -#ifdef HAVE_SNPRINTF +#if defined(HAVE_DECL_SNPRINTF) || defined(HAVE_DECL_VSNPRINTF) #include -#else +#endif +#ifndef HAVE_DECL_SNPRINTF int snprintf(char *, size_t, const char *, /*args*/ ...); +#endif +#ifndef HAVE_DECL_VSNPRINTF int vsnprintf(char *, size_t, const char *, va_list); #endif