mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
some changes that perhaps will help cxx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@330 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
1d7d3cc4af
commit
4866387e32
457
acinclude.m4
457
acinclude.m4
@ -686,143 +686,6 @@ extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func
|
||||
AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5,($ac_cv_func_select_arg5))
|
||||
])
|
||||
|
||||
dnl This is taken from gettext.m4, but a bug has been fixed
|
||||
# Macro to add for using GNU gettext.
|
||||
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
||||
#
|
||||
# This file can be copied and used freely without restrictions. It can
|
||||
# be used in projects which are not available under the GNU Public License
|
||||
# but which still want to provide support for the GNU gettext functionality.
|
||||
# Please note that the actual code is *not* freely available.
|
||||
|
||||
# serial 5
|
||||
|
||||
AC_DEFUN(LYX_GNU_GETTEXT,
|
||||
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
||||
AC_REQUIRE([AC_ISC_POSIX])dnl
|
||||
AC_REQUIRE([AC_HEADER_STDC])dnl
|
||||
AC_REQUIRE([AC_C_CONST])dnl
|
||||
AC_REQUIRE([AC_C_INLINE])dnl
|
||||
AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
||||
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
||||
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
||||
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
||||
|
||||
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
|
||||
unistd.h sys/param.h])
|
||||
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
|
||||
strdup __argz_count __argz_stringify __argz_next])
|
||||
|
||||
if test "${ac_cv_func_stpcpy+set}" != "set"; then
|
||||
AC_CHECK_FUNCS(stpcpy)
|
||||
fi
|
||||
if test "${ac_cv_func_stpcpy}" = "yes"; then
|
||||
AC_DEFINE(HAVE_STPCPY)
|
||||
fi
|
||||
|
||||
AM_LC_MESSAGES
|
||||
AM_WITH_NLS
|
||||
|
||||
if test "x$CATOBJEXT" != "x"; then
|
||||
if test "x$ALL_LINGUAS" = "x"; then
|
||||
LINGUAS=
|
||||
else
|
||||
AC_MSG_CHECKING(for catalogs to be installed)
|
||||
NEW_LINGUAS=
|
||||
dnl =============Fix is here !===============================
|
||||
dnl Some sh do not like substituation in bounds of for loops
|
||||
dnl for lang in ${LINGUAS=$ALL_LINGUAS}; do
|
||||
tmplinguas=${LINGUAS=$ALL_LINGUAS}
|
||||
for lang in ${tmplinguas}; do
|
||||
dnl =========================================================
|
||||
case "$ALL_LINGUAS" in
|
||||
*$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
|
||||
esac
|
||||
done
|
||||
LINGUAS=$NEW_LINGUAS
|
||||
AC_MSG_RESULT($LINGUAS)
|
||||
fi
|
||||
|
||||
dnl Construct list of names of catalog files to be constructed.
|
||||
if test -n "$LINGUAS"; then
|
||||
for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl The reference to <locale.h> in the installed <libintl.h> file
|
||||
dnl must be resolved because we cannot expect the users of this
|
||||
dnl to define HAVE_LOCALE_H.
|
||||
if test $ac_cv_header_locale_h = yes; then
|
||||
INCLUDE_LOCALE_H="#include <locale.h>"
|
||||
else
|
||||
INCLUDE_LOCALE_H="\
|
||||
/* The system does not provide the header <locale.h>. Take care yourself. */"
|
||||
fi
|
||||
AC_SUBST(INCLUDE_LOCALE_H)
|
||||
|
||||
dnl Determine which catalog format we have (if any is needed)
|
||||
dnl For now we know about two different formats:
|
||||
dnl Linux libc-5 and the normal X/Open format
|
||||
test -d intl || mkdir intl
|
||||
if test "$CATOBJEXT" = ".cat"; then
|
||||
AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
|
||||
|
||||
dnl Transform the SED scripts while copying because some dumb SEDs
|
||||
dnl cannot handle comments.
|
||||
sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
|
||||
fi
|
||||
dnl po2tbl.sed is always needed.
|
||||
sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
|
||||
$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
|
||||
|
||||
dnl In the intl/Makefile.in we have a special dependency which makes
|
||||
dnl only sense for gettext. We comment this out for non-gettext
|
||||
dnl packages.
|
||||
if test "$PACKAGE" = "gettext"; then
|
||||
GT_NO="#NO#"
|
||||
GT_YES=
|
||||
else
|
||||
GT_NO=
|
||||
GT_YES="#YES#"
|
||||
fi
|
||||
AC_SUBST(GT_NO)
|
||||
AC_SUBST(GT_YES)
|
||||
|
||||
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
||||
dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
|
||||
dnl Try to locate is.
|
||||
MKINSTALLDIRS=
|
||||
if test -n "$ac_aux_dir"; then
|
||||
MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
||||
fi
|
||||
if test -z "$MKINSTALLDIRS"; then
|
||||
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
||||
fi
|
||||
AC_SUBST(MKINSTALLDIRS)
|
||||
|
||||
dnl *** For now the libtool support in intl/Makefile is not for real.
|
||||
l=
|
||||
AC_SUBST(l)
|
||||
|
||||
dnl Generate list of files to be processed by xgettext which will
|
||||
dnl be included in po/Makefile.
|
||||
test -d po || mkdir po
|
||||
if test "x$srcdir" != "x."; then
|
||||
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
|
||||
posrcprefix="$srcdir/"
|
||||
else
|
||||
posrcprefix="../$srcdir/"
|
||||
fi
|
||||
else
|
||||
posrcprefix="../"
|
||||
fi
|
||||
rm -f po/POTFILES
|
||||
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
|
||||
< $srcdir/po/POTFILES.in > po/POTFILES
|
||||
])
|
||||
|
||||
## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
|
||||
## Copyright (C) 1996-1999 Free Software Foundation, Inc.
|
||||
## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
@ -1255,3 +1118,323 @@ AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
|
||||
|
||||
dnl This is just to silence aclocal about the macro not being used
|
||||
ifelse([AC_DISABLE_FAST_INSTALL])dnl
|
||||
|
||||
# Macro to add for using GNU gettext.
|
||||
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
||||
#
|
||||
# This file can be copied and used freely without restrictions. It can
|
||||
# be used in projects which are not available under the GNU Public License
|
||||
# but which still want to provide support for the GNU gettext functionality.
|
||||
# Please note that the actual code is *not* freely available.
|
||||
|
||||
# serial 5
|
||||
|
||||
AC_DEFUN(AM_WITH_NLS,
|
||||
[AC_MSG_CHECKING([whether NLS is requested])
|
||||
dnl Default is enabled NLS
|
||||
AC_ARG_ENABLE(nls,
|
||||
[ --disable-nls do not use Native Language Support],
|
||||
USE_NLS=$enableval, USE_NLS=yes)
|
||||
AC_MSG_RESULT($USE_NLS)
|
||||
AC_SUBST(USE_NLS)
|
||||
|
||||
USE_INCLUDED_LIBINTL=no
|
||||
|
||||
dnl If we use NLS figure out what method
|
||||
if test "$USE_NLS" = "yes"; then
|
||||
AC_DEFINE(ENABLE_NLS)
|
||||
AC_MSG_CHECKING([whether included gettext is requested])
|
||||
AC_ARG_WITH(included-gettext,
|
||||
[ --with-included-gettext use the GNU gettext library included here],
|
||||
nls_cv_force_use_gnu_gettext=$withval,
|
||||
nls_cv_force_use_gnu_gettext=no)
|
||||
AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
|
||||
|
||||
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
|
||||
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
|
||||
dnl User does not insist on using GNU NLS library. Figure out what
|
||||
dnl to use. If gettext or catgets are available (in this order) we
|
||||
dnl use this. Else we have to fall back to GNU NLS library.
|
||||
dnl catgets is only used if permitted by option --with-catgets.
|
||||
nls_cv_header_intl=
|
||||
nls_cv_header_libgt=
|
||||
CATOBJEXT=NONE
|
||||
|
||||
AC_CHECK_HEADER(libintl.h,
|
||||
[AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
|
||||
[AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
|
||||
gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
|
||||
|
||||
if test "$gt_cv_func_gettext_libc" != "yes"; then
|
||||
AC_CHECK_LIB(intl, bindtextdomain,
|
||||
[AC_CACHE_CHECK([for gettext in libintl],
|
||||
gt_cv_func_gettext_libintl,
|
||||
[AC_CHECK_LIB(intl, gettext,
|
||||
gt_cv_func_gettext_libintl=yes,
|
||||
gt_cv_func_gettext_libintl=no)],
|
||||
gt_cv_func_gettext_libintl=no)])
|
||||
fi
|
||||
|
||||
if test "$gt_cv_func_gettext_libc" = "yes" \
|
||||
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
|
||||
AC_DEFINE(HAVE_GETTEXT)
|
||||
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
|
||||
if test "$MSGFMT" != "no"; then
|
||||
AC_CHECK_FUNCS(dcgettext)
|
||||
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
||||
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
||||
AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
|
||||
return _nl_msg_cat_cntr],
|
||||
[CATOBJEXT=.gmo
|
||||
DATADIRNAME=share],
|
||||
[CATOBJEXT=.mo
|
||||
DATADIRNAME=lib])
|
||||
INSTOBJEXT=.mo
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
if test "$CATOBJEXT" = "NONE"; then
|
||||
AC_MSG_CHECKING([whether catgets can be used])
|
||||
AC_ARG_WITH(catgets,
|
||||
[ --with-catgets use catgets functions if available],
|
||||
nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
|
||||
AC_MSG_RESULT($nls_cv_use_catgets)
|
||||
|
||||
if test "$nls_cv_use_catgets" = "yes"; then
|
||||
dnl No gettext in C library. Try catgets next.
|
||||
AC_CHECK_LIB(i, main)
|
||||
AC_CHECK_FUNC(catgets,
|
||||
[AC_DEFINE(HAVE_CATGETS)
|
||||
INTLOBJS="\$(CATOBJS)"
|
||||
AC_PATH_PROG(GENCAT, gencat, no)dnl
|
||||
if test "$GENCAT" != "no"; then
|
||||
AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
|
||||
if test "$GMSGFMT" = "no"; then
|
||||
AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
|
||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
|
||||
fi
|
||||
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
||||
USE_INCLUDED_LIBINTL=yes
|
||||
CATOBJEXT=.cat
|
||||
INSTOBJEXT=.cat
|
||||
DATADIRNAME=lib
|
||||
INTLDEPS='$(top_builddir)/intl/libintl.a'
|
||||
INTLLIBS=$INTLDEPS
|
||||
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
|
||||
nls_cv_header_intl=intl/libintl.h
|
||||
nls_cv_header_libgt=intl/libgettext.h
|
||||
fi])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$CATOBJEXT" = "NONE"; then
|
||||
dnl Neither gettext nor catgets in included in the C library.
|
||||
dnl Fall back on GNU gettext library.
|
||||
nls_cv_use_gnu_gettext=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$nls_cv_use_gnu_gettext" = "yes"; then
|
||||
dnl Mark actions used to generate GNU NLS library.
|
||||
INTLOBJS="\$(GETTOBJS)"
|
||||
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
|
||||
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
||||
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
||||
AC_SUBST(MSGFMT)
|
||||
USE_INCLUDED_LIBINTL=yes
|
||||
CATOBJEXT=.gmo
|
||||
INSTOBJEXT=.mo
|
||||
DATADIRNAME=share
|
||||
INTLDEPS='$(top_builddir)/intl/libintl.a'
|
||||
INTLLIBS=$INTLDEPS
|
||||
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
|
||||
nls_cv_header_intl=intl/libintl.h
|
||||
nls_cv_header_libgt=intl/libgettext.h
|
||||
fi
|
||||
|
||||
dnl Test whether we really found GNU xgettext.
|
||||
if test "$XGETTEXT" != ":"; then
|
||||
dnl If it is no GNU xgettext we define it as : so that the
|
||||
dnl Makefiles still can work.
|
||||
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
|
||||
: ;
|
||||
else
|
||||
AC_MSG_RESULT(
|
||||
[found xgettext program is not GNU xgettext; ignore it])
|
||||
XGETTEXT=":"
|
||||
fi
|
||||
fi
|
||||
|
||||
# We need to process the po/ directory.
|
||||
POSUB=po
|
||||
else
|
||||
DATADIRNAME=share
|
||||
nls_cv_header_intl=intl/libintl.h
|
||||
nls_cv_header_libgt=intl/libgettext.h
|
||||
fi
|
||||
AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
|
||||
AC_OUTPUT_COMMANDS(
|
||||
[case "$CONFIG_FILES" in *po/Makefile.in*)
|
||||
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
|
||||
esac])
|
||||
|
||||
|
||||
# If this is used in GNU gettext we have to set USE_NLS to `yes'
|
||||
# because some of the sources are only built for this goal.
|
||||
if test "$PACKAGE" = gettext; then
|
||||
USE_NLS=yes
|
||||
USE_INCLUDED_LIBINTL=yes
|
||||
fi
|
||||
|
||||
dnl These rules are solely for the distribution goal. While doing this
|
||||
dnl we only have to keep exactly one list of the available catalogs
|
||||
dnl in configure.in.
|
||||
for lang in $ALL_LINGUAS; do
|
||||
GMOFILES="$GMOFILES $lang.gmo"
|
||||
POFILES="$POFILES $lang.po"
|
||||
done
|
||||
|
||||
dnl Make all variables we use known to autoconf.
|
||||
AC_SUBST(USE_INCLUDED_LIBINTL)
|
||||
AC_SUBST(CATALOGS)
|
||||
AC_SUBST(CATOBJEXT)
|
||||
AC_SUBST(DATADIRNAME)
|
||||
AC_SUBST(GMOFILES)
|
||||
AC_SUBST(INSTOBJEXT)
|
||||
AC_SUBST(INTLDEPS)
|
||||
AC_SUBST(INTLLIBS)
|
||||
AC_SUBST(INTLOBJS)
|
||||
AC_SUBST(POFILES)
|
||||
AC_SUBST(POSUB)
|
||||
])
|
||||
|
||||
AC_DEFUN(AM_GNU_GETTEXT,
|
||||
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
||||
AC_REQUIRE([AC_ISC_POSIX])dnl
|
||||
AC_REQUIRE([AC_HEADER_STDC])dnl
|
||||
AC_REQUIRE([AC_C_CONST])dnl
|
||||
AC_REQUIRE([AC_C_INLINE])dnl
|
||||
AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
||||
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
||||
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
||||
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
||||
|
||||
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
|
||||
unistd.h sys/param.h])
|
||||
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
|
||||
strdup __argz_count __argz_stringify __argz_next])
|
||||
|
||||
if test "${ac_cv_func_stpcpy+set}" != "set"; then
|
||||
AC_CHECK_FUNCS(stpcpy)
|
||||
fi
|
||||
if test "${ac_cv_func_stpcpy}" = "yes"; then
|
||||
AC_DEFINE(HAVE_STPCPY)
|
||||
fi
|
||||
|
||||
AM_LC_MESSAGES
|
||||
AM_WITH_NLS
|
||||
|
||||
if test "x$CATOBJEXT" != "x"; then
|
||||
if test "x$ALL_LINGUAS" = "x"; then
|
||||
LINGUAS=
|
||||
else
|
||||
AC_MSG_CHECKING(for catalogs to be installed)
|
||||
NEW_LINGUAS=
|
||||
dnl ============== Fix is here! =======================
|
||||
dnl Some sh do not like substitution in bounds of for loops
|
||||
dnl for lang in ${LINGUAS=$ALL_LINGUAS}; do
|
||||
tmplinguas=${LINGUAS=$ALL_LINGUAS}
|
||||
for lang in ${tmplinguas}; do
|
||||
case "$ALL_LINGUAS" in
|
||||
*$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
|
||||
esac
|
||||
done
|
||||
LINGUAS=$NEW_LINGUAS
|
||||
AC_MSG_RESULT($LINGUAS)
|
||||
fi
|
||||
|
||||
dnl Construct list of names of catalog files to be constructed.
|
||||
if test -n "$LINGUAS"; then
|
||||
for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl The reference to <locale.h> in the installed <libintl.h> file
|
||||
dnl must be resolved because we cannot expect the users of this
|
||||
dnl to define HAVE_LOCALE_H.
|
||||
if test $ac_cv_header_locale_h = yes; then
|
||||
INCLUDE_LOCALE_H="#include <locale.h>"
|
||||
else
|
||||
INCLUDE_LOCALE_H="\
|
||||
/* The system does not provide the header <locale.h>. Take care yourself. */"
|
||||
fi
|
||||
AC_SUBST(INCLUDE_LOCALE_H)
|
||||
|
||||
dnl Determine which catalog format we have (if any is needed)
|
||||
dnl For now we know about two different formats:
|
||||
dnl Linux libc-5 and the normal X/Open format
|
||||
test -d intl || mkdir intl
|
||||
if test "$CATOBJEXT" = ".cat"; then
|
||||
AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
|
||||
|
||||
dnl Transform the SED scripts while copying because some dumb SEDs
|
||||
dnl cannot handle comments.
|
||||
sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
|
||||
fi
|
||||
dnl po2tbl.sed is always needed.
|
||||
sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
|
||||
$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
|
||||
|
||||
dnl In the intl/Makefile.in we have a special dependency which makes
|
||||
dnl only sense for gettext. We comment this out for non-gettext
|
||||
dnl packages.
|
||||
if test "$PACKAGE" = "gettext"; then
|
||||
GT_NO="#NO#"
|
||||
GT_YES=
|
||||
else
|
||||
GT_NO=
|
||||
GT_YES="#YES#"
|
||||
fi
|
||||
AC_SUBST(GT_NO)
|
||||
AC_SUBST(GT_YES)
|
||||
|
||||
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
||||
dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
|
||||
dnl Try to locate is.
|
||||
MKINSTALLDIRS=
|
||||
if test -n "$ac_aux_dir"; then
|
||||
MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
||||
fi
|
||||
if test -z "$MKINSTALLDIRS"; then
|
||||
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
||||
fi
|
||||
AC_SUBST(MKINSTALLDIRS)
|
||||
|
||||
dnl *** For now the libtool support in intl/Makefile is not for real.
|
||||
l=
|
||||
AC_SUBST(l)
|
||||
|
||||
dnl Generate list of files to be processed by xgettext which will
|
||||
dnl be included in po/Makefile.
|
||||
test -d po || mkdir po
|
||||
if test "x$srcdir" != "x."; then
|
||||
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
|
||||
posrcprefix="$srcdir/"
|
||||
else
|
||||
posrcprefix="../$srcdir/"
|
||||
fi
|
||||
else
|
||||
posrcprefix="../"
|
||||
fi
|
||||
rm -f po/POTFILES
|
||||
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
|
||||
< $srcdir/po/POTFILES.in > po/POTFILES
|
||||
])
|
||||
|
||||
@ -174,6 +174,9 @@ dnl
|
||||
# Search LaTeX2e
|
||||
SEARCH_PROG([for a LaTeX2e program],LATEX,latex latex2e,CHECKLATEX2E,dnl
|
||||
[lyx_check_config=no])
|
||||
if test x$lyx_check_config != x ; then
|
||||
SEARCH_PROG([for the pdflatex program],PDFLATEX,pdflatex,CHECKLATEX2E)
|
||||
fi
|
||||
|
||||
# Search for an installed reLyX or a ready-to-install one
|
||||
save_PATH=${PATH}
|
||||
|
||||
@ -148,7 +148,7 @@ AC_LANG_C
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
# Do the real setup now
|
||||
LYX_GNU_GETTEXT
|
||||
AM_GNU_GETTEXT
|
||||
# a hack for those who try to change LyX, but do not have gettext installed
|
||||
case "${XGETTEXT}" in
|
||||
*:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
|
||||
|
||||
@ -126,7 +126,7 @@ bool InsetLatex::Deletable() const
|
||||
}
|
||||
|
||||
|
||||
Inset * InsetLatex::Clone()
|
||||
InsetLatex * InsetLatex::Clone() const
|
||||
{
|
||||
InsetLatex * result = new InsetLatex(contents);
|
||||
return result;
|
||||
|
||||
@ -55,7 +55,7 @@ public:
|
||||
///
|
||||
bool Deletable() const;
|
||||
///
|
||||
Inset * Clone();
|
||||
InsetLatex * Clone() const;
|
||||
///
|
||||
Inset::Code LyxCode() const;
|
||||
private:
|
||||
|
||||
@ -177,7 +177,7 @@ void InsetFormulaMacro::Draw(LyXFont font, LyXScreen &scr,
|
||||
void InsetFormulaMacro::Edit(int x, int y)
|
||||
{
|
||||
opened = true;
|
||||
par = (MathParInset*)tmacro->Clone();
|
||||
par = static_cast<MathParInset*>(tmacro->Clone());
|
||||
InsetFormula::Edit(x, y);
|
||||
}
|
||||
|
||||
@ -185,7 +185,7 @@ void InsetFormulaMacro::Edit(int x, int y)
|
||||
void InsetFormulaMacro::InsetUnlock()
|
||||
{
|
||||
opened = false;
|
||||
LyxArrayBase *tarray = tmacro->GetData();
|
||||
LyxArrayBase * tarray = tmacro->GetData();
|
||||
MathedIter it(tarray);
|
||||
it.Clear();
|
||||
tmacro->SetData(par->GetData());
|
||||
@ -198,7 +198,7 @@ bool InsetFormulaMacro::LocalDispatch(int action, char const *arg)
|
||||
{
|
||||
if (action == LFUN_MATH_MACROARG) {
|
||||
int i = atoi(arg) - 1;
|
||||
if (i>= 0 && i<tmacro->getNoArgs()) {
|
||||
if (i >= 0 && i < tmacro->getNoArgs()) {
|
||||
mathcursor->Insert(tmacro->getMacroPar(i), LM_TC_INSET);
|
||||
InsetFormula::UpdateLocal();
|
||||
}
|
||||
|
||||
@ -328,7 +328,7 @@ class MathParInset: public MathedInset {
|
||||
///
|
||||
virtual ~MathParInset();
|
||||
///
|
||||
virtual MathedInset * Clone();
|
||||
virtual MathParInset * Clone();
|
||||
|
||||
/// Draw the object on a drawable
|
||||
virtual void Draw(int x, int baseline);
|
||||
@ -482,7 +482,7 @@ class MathMatrixInset: public MathParInset {
|
||||
///
|
||||
MathMatrixInset(MathMatrixInset *);
|
||||
///
|
||||
MathedInset * Clone();
|
||||
MathMatrixInset * Clone();
|
||||
///
|
||||
virtual ~MathMatrixInset();
|
||||
///
|
||||
|
||||
@ -27,14 +27,14 @@
|
||||
|
||||
|
||||
inline
|
||||
char *strnew(char const* s)
|
||||
char * strnew(char const * s)
|
||||
{
|
||||
char *s1 = new char[strlen(s)+1];
|
||||
char * s1 = new char[strlen(s)+1];
|
||||
return strcpy(s1, s);
|
||||
}
|
||||
|
||||
|
||||
MathedInset::MathedInset(MathedInset* inset)
|
||||
MathedInset::MathedInset(MathedInset * inset)
|
||||
{
|
||||
if (inset) {
|
||||
name = inset->GetName();
|
||||
@ -52,7 +52,7 @@ MathedInset::MathedInset(MathedInset* inset)
|
||||
}
|
||||
|
||||
|
||||
MathFuncInset::MathFuncInset(char const *nm, short ot, short st):
|
||||
MathFuncInset::MathFuncInset(char const * nm, short ot, short st):
|
||||
MathedInset("", ot, st)
|
||||
{
|
||||
ln = 0;
|
||||
@ -66,10 +66,13 @@ MathFuncInset::MathFuncInset(char const *nm, short ot, short st):
|
||||
}
|
||||
}
|
||||
|
||||
MathedInset *MathFuncInset::Clone()
|
||||
{
|
||||
MathFuncInset * MathFuncInset::Clone()
|
||||
{
|
||||
#if 0
|
||||
MathedInset *l = new MathFuncInset(name, GetType(), GetStyle());
|
||||
return l;
|
||||
#endif
|
||||
return new MathFuncInset(name, GetType(), GetStyle());
|
||||
}
|
||||
|
||||
MathSpaceInset::MathSpaceInset(int sp, short ot, short st):
|
||||
@ -77,13 +80,16 @@ MathSpaceInset::MathSpaceInset(int sp, short ot, short st):
|
||||
{
|
||||
}
|
||||
|
||||
MathedInset *MathSpaceInset::Clone()
|
||||
{
|
||||
MathSpaceInset * MathSpaceInset::Clone()
|
||||
{
|
||||
#if 0
|
||||
MathedInset *l = new MathSpaceInset(space, GetType(), GetStyle());
|
||||
return l;
|
||||
#endif
|
||||
return new MathSpaceInset(space, GetType(), GetStyle());
|
||||
}
|
||||
|
||||
MathParInset::MathParInset(short st, char const *nm, short ot):
|
||||
MathParInset::MathParInset(short st, char const * nm, short ot):
|
||||
MathedInset(nm, ot, st)
|
||||
{
|
||||
array = 0;
|
||||
@ -95,7 +101,7 @@ MathParInset::MathParInset(short st, char const *nm, short ot):
|
||||
flag |= LMPF_SCRIPT;
|
||||
}
|
||||
|
||||
MathParInset::MathParInset(MathParInset* p): MathedInset(p)
|
||||
MathParInset::MathParInset(MathParInset * p): MathedInset(p)
|
||||
{
|
||||
flag = p->flag;
|
||||
p->setArgumentIdx(0);
|
||||
@ -114,14 +120,17 @@ MathParInset::~MathParInset()
|
||||
}
|
||||
|
||||
|
||||
MathedInset *MathParInset::Clone()
|
||||
{
|
||||
MathParInset* p = new MathParInset(this);
|
||||
MathParInset * MathParInset::Clone()
|
||||
{
|
||||
#if 0
|
||||
MathParInset * p = new MathParInset(this);
|
||||
return p;
|
||||
#endif
|
||||
return new MathParInset(this);
|
||||
}
|
||||
|
||||
|
||||
void MathParInset::SetData(LyxArrayBase *a)
|
||||
void MathParInset::SetData(LyxArrayBase * a)
|
||||
{
|
||||
array = a;
|
||||
|
||||
@ -144,9 +153,9 @@ MathSqrtInset::MathSqrtInset(short st): MathParInset(st, "sqrt", LM_OT_SQRT)
|
||||
}
|
||||
|
||||
|
||||
MathedInset *MathSqrtInset::Clone()
|
||||
MathSqrtInset * MathSqrtInset::Clone()
|
||||
{
|
||||
MathSqrtInset* p = new MathSqrtInset(GetStyle());
|
||||
MathSqrtInset * p = new MathSqrtInset(GetStyle());
|
||||
MathedIter it(array);
|
||||
p->SetData(it.Copy());
|
||||
return p;
|
||||
@ -164,7 +173,7 @@ MathDelimInset::MathDelimInset(int l, int r, short st):
|
||||
{
|
||||
}
|
||||
|
||||
MathedInset * MathDelimInset::Clone()
|
||||
MathDelimInset * MathDelimInset::Clone()
|
||||
{
|
||||
MathDelimInset * p = new MathDelimInset(left, right, GetStyle());
|
||||
MathedIter it(array);
|
||||
@ -179,7 +188,7 @@ MathDecorationInset::MathDecorationInset(int d, short st):
|
||||
upper = (deco!= LM_underline && deco!= LM_underbrace);
|
||||
}
|
||||
|
||||
MathedInset * MathDecorationInset::Clone()
|
||||
MathDecorationInset * MathDecorationInset::Clone()
|
||||
{
|
||||
MathDecorationInset * p = new MathDecorationInset(deco, GetStyle());
|
||||
MathedIter it(array);
|
||||
@ -204,7 +213,7 @@ MathFracInset::~MathFracInset()
|
||||
delete den;
|
||||
}
|
||||
|
||||
MathedInset * MathFracInset::Clone()
|
||||
MathFracInset * MathFracInset::Clone()
|
||||
{
|
||||
MathFracInset * p = new MathFracInset(GetType());
|
||||
MathedIter itn(array);
|
||||
@ -232,13 +241,13 @@ void MathFracInset::SetStyle(short st)
|
||||
den->SetStyle((size == LM_ST_DISPLAY) ? (short)LM_ST_TEXT: size);
|
||||
}
|
||||
|
||||
void MathFracInset::SetData(LyxArrayBase *n, LyxArrayBase *d)
|
||||
void MathFracInset::SetData(LyxArrayBase * n, LyxArrayBase * d)
|
||||
{
|
||||
den->SetData(d);
|
||||
MathParInset::SetData(n);
|
||||
}
|
||||
|
||||
void MathFracInset::SetData(LyxArrayBase *d)
|
||||
void MathFracInset::SetData(LyxArrayBase * d)
|
||||
{
|
||||
if (idx == 0)
|
||||
MathParInset::SetData(d);
|
||||
@ -247,7 +256,7 @@ void MathFracInset::SetData(LyxArrayBase *d)
|
||||
}
|
||||
}
|
||||
|
||||
void MathFracInset::GetXY(int& x, int& y) const
|
||||
void MathFracInset::GetXY(int & x, int & y) const
|
||||
{
|
||||
if (idx == 0)
|
||||
MathParInset::GetXY(x, y);
|
||||
@ -255,7 +264,7 @@ void MathFracInset::GetXY(int& x, int& y) const
|
||||
den->GetXY(x, y);
|
||||
}
|
||||
|
||||
LyxArrayBase *MathFracInset::GetData()
|
||||
LyxArrayBase * MathFracInset::GetData()
|
||||
{
|
||||
if (idx == 0)
|
||||
return array;
|
||||
@ -305,7 +314,7 @@ MathMatrixInset::MathMatrixInset(int m, int n, short st):
|
||||
}
|
||||
|
||||
|
||||
MathMatrixInset::MathMatrixInset(MathMatrixInset *mt):
|
||||
MathMatrixInset::MathMatrixInset(MathMatrixInset * mt):
|
||||
MathParInset(mt->GetStyle(), mt->GetName(), mt->GetType())
|
||||
{
|
||||
nr = 0;
|
||||
@ -342,17 +351,17 @@ MathMatrixInset::~MathMatrixInset()
|
||||
{
|
||||
delete[] ws;
|
||||
|
||||
MathedRowSt *r = row;
|
||||
MathedRowSt * r = row;
|
||||
while (r) {
|
||||
MathedRowSt *q = r->next;
|
||||
MathedRowSt * q = r->next;
|
||||
delete r;
|
||||
r = q;
|
||||
}
|
||||
}
|
||||
|
||||
MathedInset *MathMatrixInset::Clone()
|
||||
MathMatrixInset * MathMatrixInset::Clone()
|
||||
{
|
||||
MathMatrixInset* mt = new MathMatrixInset(this);
|
||||
MathMatrixInset * mt = new MathMatrixInset(this);
|
||||
return mt;
|
||||
}
|
||||
|
||||
@ -364,7 +373,7 @@ void MathMatrixInset::SetAlign(char vv, char const* hh)
|
||||
|
||||
|
||||
// Check the number of tabs and crs
|
||||
void MathMatrixInset::SetData(LyxArrayBase *a)
|
||||
void MathMatrixInset::SetData(LyxArrayBase * a)
|
||||
{
|
||||
if (!a) return;
|
||||
MathedIter it(a);
|
||||
@ -502,9 +511,9 @@ MathAccentInset::~MathAccentInset()
|
||||
delete inset;
|
||||
}
|
||||
|
||||
MathedInset *MathAccentInset::Clone()
|
||||
MathAccentInset * MathAccentInset::Clone()
|
||||
{
|
||||
MathAccentInset* p;
|
||||
MathAccentInset * p;
|
||||
|
||||
if (inset)
|
||||
p = new MathAccentInset(inset->Clone(), code, GetStyle());
|
||||
@ -521,20 +530,26 @@ MathBigopInset::MathBigopInset(char const* nam, int id, short st):
|
||||
lims = -1;
|
||||
}
|
||||
|
||||
MathedInset *MathBigopInset::Clone()
|
||||
{
|
||||
MathBigopInset * MathBigopInset::Clone()
|
||||
{
|
||||
#if 0
|
||||
MathBigopInset* p = new MathBigopInset(name, sym, GetStyle());
|
||||
return p;
|
||||
#endif
|
||||
return new MathBigopInset(name, sym, GetStyle());
|
||||
}
|
||||
|
||||
MathDotsInset::MathDotsInset(char const* nam, int id, short st):
|
||||
MathDotsInset::MathDotsInset(char const * nam, int id, short st):
|
||||
MathedInset(nam, LM_OT_DOTS, st), code(id)
|
||||
{
|
||||
}
|
||||
|
||||
MathedInset *MathDotsInset::Clone()
|
||||
MathDotsInset * MathDotsInset::Clone()
|
||||
{
|
||||
#if 0
|
||||
MathDotsInset* p = new MathDotsInset(name, code, GetStyle());
|
||||
return p;
|
||||
#endif
|
||||
return new MathDotsInset(name, code, GetStyle());
|
||||
}
|
||||
|
||||
|
||||
@ -38,17 +38,17 @@
|
||||
class MathFuncInset: public MathedInset {
|
||||
public:
|
||||
///
|
||||
MathFuncInset(char const *nm, short ot= LM_OT_FUNC, short st= LM_ST_TEXT);
|
||||
MathFuncInset(char const * nm, short ot= LM_OT_FUNC, short st= LM_ST_TEXT);
|
||||
///
|
||||
~MathFuncInset();
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathFuncInset * Clone();
|
||||
///
|
||||
void Draw(int, int);
|
||||
///
|
||||
void Write(FILE *file);
|
||||
void Write(FILE * file);
|
||||
///
|
||||
void Write(string &file);
|
||||
void Write(string & file);
|
||||
///
|
||||
void Metrics();
|
||||
///
|
||||
@ -59,7 +59,7 @@ protected:
|
||||
///
|
||||
bool lims;
|
||||
///
|
||||
char *fname;
|
||||
char * fname;
|
||||
};
|
||||
|
||||
|
||||
@ -73,13 +73,13 @@ class MathAccentInset: public MathedInset {
|
||||
///
|
||||
~MathAccentInset();
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathAccentInset * Clone();
|
||||
///
|
||||
void Draw(int, int);
|
||||
///
|
||||
void Write(FILE *file);
|
||||
void Write(FILE * file);
|
||||
///
|
||||
void Write(string &file);
|
||||
void Write(string & file);
|
||||
///
|
||||
void Metrics();
|
||||
///
|
||||
@ -93,7 +93,7 @@ class MathAccentInset: public MathedInset {
|
||||
///
|
||||
int code;
|
||||
///
|
||||
MathedInset *inset;
|
||||
MathedInset * inset;
|
||||
///
|
||||
int dh, dy;
|
||||
};
|
||||
@ -103,15 +103,15 @@ class MathAccentInset: public MathedInset {
|
||||
class MathDotsInset: public MathedInset {
|
||||
public:
|
||||
///
|
||||
MathDotsInset(char const*, int, short st= LM_ST_TEXT);
|
||||
MathDotsInset(char const *, int, short st= LM_ST_TEXT);
|
||||
///
|
||||
~MathDotsInset() { };
|
||||
~MathDotsInset() {}
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathDotsInset * Clone();
|
||||
///
|
||||
void Draw(int, int);
|
||||
///
|
||||
void Write(FILE *file);
|
||||
void Write(FILE * file);
|
||||
///
|
||||
void Write(string &file);
|
||||
///
|
||||
@ -126,17 +126,17 @@ class MathDotsInset: public MathedInset {
|
||||
class MathSpaceInset: public MathedInset {
|
||||
public:
|
||||
///
|
||||
MathSpaceInset(int sp, short ot= LM_OT_SPACE, short st= LM_ST_TEXT);
|
||||
MathSpaceInset(int sp, short ot = LM_OT_SPACE, short st = LM_ST_TEXT);
|
||||
///
|
||||
~MathSpaceInset() { };
|
||||
~MathSpaceInset() {}
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathSpaceInset * Clone();
|
||||
///
|
||||
void Draw(int, int);
|
||||
///
|
||||
void Write(FILE *file);
|
||||
void Write(FILE * file);
|
||||
///
|
||||
void Write(string &file);
|
||||
void Write(string & file);
|
||||
///
|
||||
inline void Metrics();
|
||||
///
|
||||
@ -153,17 +153,17 @@ class MathSpaceInset: public MathedInset {
|
||||
class MathBigopInset: public MathedInset {
|
||||
public:
|
||||
///
|
||||
MathBigopInset(char const*, int, short st= LM_ST_TEXT);
|
||||
MathBigopInset(char const *, int, short st = LM_ST_TEXT);
|
||||
///
|
||||
~MathBigopInset() { };
|
||||
~MathBigopInset() {}
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathBigopInset * Clone();
|
||||
///
|
||||
void Draw(int, int);
|
||||
///
|
||||
void Write(FILE *file);
|
||||
void Write(FILE * file);
|
||||
///
|
||||
void Write(string &file);
|
||||
void Write(string & file);
|
||||
///
|
||||
void Metrics();
|
||||
///
|
||||
@ -186,9 +186,9 @@ class MathSqrtInset: public MathParInset {
|
||||
///
|
||||
MathSqrtInset(short st= LM_ST_TEXT);
|
||||
///
|
||||
~MathSqrtInset() { };
|
||||
~MathSqrtInset() {}
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathSqrtInset * Clone();
|
||||
///
|
||||
void Draw(int x, int baseline);
|
||||
///
|
||||
@ -214,24 +214,24 @@ class MathFracInset: public MathParInset {
|
||||
///
|
||||
~MathFracInset();
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathFracInset * Clone();
|
||||
///
|
||||
void Draw(int x, int baseline);
|
||||
///
|
||||
void Write(FILE *file);
|
||||
void Write(FILE * file);
|
||||
///
|
||||
void Write(string &file);
|
||||
void Write(string & file);
|
||||
///
|
||||
void Metrics();
|
||||
|
||||
/** This does the same that SetData(LyxArrayBase*) but for both
|
||||
numerator and denominator at once.
|
||||
*/
|
||||
void SetData(LyxArrayBase*, LyxArrayBase*);
|
||||
void SetData(LyxArrayBase *, LyxArrayBase *);
|
||||
///
|
||||
void SetData(LyxArrayBase*);
|
||||
void SetData(LyxArrayBase *);
|
||||
///
|
||||
void GetXY(int& x, int& y) const;
|
||||
void GetXY(int & x, int & y) const;
|
||||
///
|
||||
void SetFocus(int, int);
|
||||
///
|
||||
@ -241,7 +241,7 @@ class MathFracInset: public MathParInset {
|
||||
///
|
||||
bool setArgumentIdx(int i); // was bool Up/down(void);
|
||||
///
|
||||
int getArgumentIdx() { return (int)idx; }
|
||||
int getArgumentIdx() { return int(idx); }
|
||||
///
|
||||
int getMaxArgumentIdx() { return 1; }
|
||||
///
|
||||
@ -250,7 +250,7 @@ class MathFracInset: public MathParInset {
|
||||
///
|
||||
short idx;
|
||||
///
|
||||
MathParInset *den;
|
||||
MathParInset * den;
|
||||
///
|
||||
int w0, w1, des0, dh;
|
||||
};
|
||||
@ -262,15 +262,15 @@ class MathDelimInset: public MathParInset {
|
||||
///
|
||||
MathDelimInset(int, int, short st= LM_ST_TEXT);
|
||||
///
|
||||
~MathDelimInset() { };
|
||||
~MathDelimInset() {}
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathDelimInset * Clone();
|
||||
///
|
||||
void Draw(int, int);
|
||||
///
|
||||
void Write(FILE *file);
|
||||
void Write(FILE * file);
|
||||
///
|
||||
void Write(string &file);
|
||||
void Write(string & file);
|
||||
///
|
||||
void Metrics();
|
||||
protected:
|
||||
@ -287,15 +287,15 @@ class MathDecorationInset: public MathParInset {
|
||||
///
|
||||
MathDecorationInset(int, short st= LM_ST_TEXT);
|
||||
///
|
||||
~MathDecorationInset() { };
|
||||
~MathDecorationInset() {}
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathDecorationInset * Clone();
|
||||
///
|
||||
void Draw(int, int);
|
||||
///
|
||||
void Write(FILE *file);
|
||||
void Write(FILE * file);
|
||||
///
|
||||
void Write(string &file);
|
||||
void Write(string & file);
|
||||
///
|
||||
void Metrics();
|
||||
///
|
||||
@ -322,17 +322,17 @@ MathFuncInset::~MathFuncInset()
|
||||
inline
|
||||
bool MathFuncInset::GetLimits() const
|
||||
{
|
||||
return (bool)(lims && (GetStyle() == LM_ST_DISPLAY));
|
||||
return bool(lims && (GetStyle() == LM_ST_DISPLAY));
|
||||
}
|
||||
|
||||
inline
|
||||
void MathFuncInset::Write(FILE *file)
|
||||
void MathFuncInset::Write(FILE * file)
|
||||
{
|
||||
fprintf(file, "\\%s ", name);
|
||||
}
|
||||
|
||||
inline
|
||||
void MathFuncInset::Write(string &file)
|
||||
void MathFuncInset::Write(string & file)
|
||||
{
|
||||
file += '\\';
|
||||
file += name;
|
||||
@ -342,7 +342,7 @@ void MathFuncInset::Write(string &file)
|
||||
inline
|
||||
void MathSpaceInset::Metrics()
|
||||
{
|
||||
width = (space) ? space*2: 2;
|
||||
width = (space) ? space * 2 : 2;
|
||||
if (space>3) width *= 2;
|
||||
if (space == 5) width *= 2;
|
||||
width += 4;
|
||||
@ -360,26 +360,24 @@ inline
|
||||
bool MathBigopInset::GetLimits() const
|
||||
{
|
||||
// Default case
|
||||
if (lims<0) {
|
||||
return (bool)(sym!= LM_int && sym!= LM_oint && (GetStyle() == LM_ST_DISPLAY));
|
||||
if (lims < 0) {
|
||||
return sym != LM_int && sym != LM_oint && GetStyle() == LM_ST_DISPLAY;
|
||||
}
|
||||
|
||||
// Custom
|
||||
return (bool)(lims>0);
|
||||
return lims > 0;
|
||||
}
|
||||
|
||||
inline
|
||||
void MathBigopInset::SetLimits(bool ls)
|
||||
{
|
||||
lims = (ls) ? 1: 0;
|
||||
lims = ls ? 1 : 0;
|
||||
}
|
||||
|
||||
inline
|
||||
bool MathDecorationInset::GetLimits() const
|
||||
{
|
||||
return (bool)(deco == LM_underbrace||deco == LM_overbrace);
|
||||
return deco == LM_underbrace || deco == LM_overbrace;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -101,10 +101,13 @@ MathMacro::~MathMacro()
|
||||
}
|
||||
|
||||
|
||||
MathedInset *MathMacro::Clone()
|
||||
MathMacro * MathMacro::Clone()
|
||||
{
|
||||
#if 0
|
||||
MathMacro *m = new MathMacro(this);
|
||||
return m;
|
||||
#endif
|
||||
return new MathMacro(this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ class MathMacro: public MathParInset
|
||||
///
|
||||
void Metrics();
|
||||
///
|
||||
MathedInset *Clone();
|
||||
MathMacro * Clone();
|
||||
///
|
||||
void Write(FILE *);
|
||||
///
|
||||
@ -111,7 +111,7 @@ class MathMacroArgument: public MathParInset
|
||||
///
|
||||
~MathMacroArgument() { lyxerr << "help, destroyme!" << endl; }
|
||||
///
|
||||
MathedInset *Clone() { return this; }
|
||||
MathMacroArgument * Clone() { return this; }
|
||||
///
|
||||
void Metrics();
|
||||
///
|
||||
|
||||
@ -35,9 +35,9 @@ MathRootInset::~MathRootInset()
|
||||
}
|
||||
|
||||
|
||||
MathedInset *MathRootInset::Clone()
|
||||
MathRootInset * MathRootInset::Clone()
|
||||
{
|
||||
MathRootInset* p = new MathRootInset(GetStyle());
|
||||
MathRootInset * p = new MathRootInset(GetStyle());
|
||||
MathedIter it(array), itr(uroot->GetData());
|
||||
p->SetData(it.Copy());
|
||||
p->setArgumentIdx(0);
|
||||
|
||||
@ -36,7 +36,7 @@ class MathRootInset: public MathSqrtInset {
|
||||
///
|
||||
~MathRootInset();
|
||||
///
|
||||
MathedInset * Clone();
|
||||
MathRootInset * Clone();
|
||||
///
|
||||
void Draw(int x, int baseline);
|
||||
///
|
||||
|
||||
Loading…
Reference in New Issue
Block a user