diff -Nru gtksourceview3-3.3.5/aclocal.m4 gtksourceview3-3.4.0/aclocal.m4 --- gtksourceview3-3.3.5/aclocal.m4 2012-03-19 22:39:05.000000000 +0000 +++ gtksourceview3-3.4.0/aclocal.m4 2012-03-26 17:11:53.000000000 +0000 @@ -19,1634 +19,1636 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) - warning_flags= - realsave_CFLAGS="$CFLAGS" +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; - maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` ]) -dnl For C++, do basically the same thing. - -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) +# AM_CONDITIONAL -*- Autoconf -*- - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) +# serial 9 - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) +# serial 10 - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# Configure paths for GTK+ -# Owen Taylor 1997-2001 -dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GTK_3_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) - - pkg_config_args=gtk+-3.0 - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl - no_gtk="" +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub - if test x$PKG_CONFIG != xno ; then - if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) - min_gtk_version=ifelse([$1], ,3.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi fi + done - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include -int -main () -{ - int major, minor, micro; - char *tmp_version; +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) - fclose (fopen ("conf.gtktest", "w")); - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) +# Generate code to set up dependency tracking. -*- Autoconf -*- -dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Tests for BACKEND-NAME in the GTK targets list -dnl -AC_DEFUN([GTK_CHECK_BACKEND], -[ - pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0) - min_gtk_version=ifelse([$2],,3.0.0,$2) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])]) +#serial 5 - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args ; then - target_found=yes - else - target_found=no - fi +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS - if test "x$target_found" = "xno"; then - ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4]) - else - ifelse([$3],,[:],[$3]) - fi -]) -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) -# serial 1 +# Do all the work for Automake. -*- Autoconf -*- -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl +# serial 16 - AC_MSG_CHECKING([for gobject-introspection]) +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +AC_SUBST(install_sh)]) -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# serial 2 -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# serial 5 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -$$1_PKG_ERRORS +# Check to see how 'make' treats includes. -*- Autoconf -*- -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_PKG_TEXT]) - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +# serial 4 -_PKG_TEXT +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) -To get pkg-config, see .]) - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +# serial 6 -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac ]) -# AM_CONDITIONAL -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 4 -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +# serial 5 - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi - cd .. - rm -rf conftest.dir + test "$[2]" = conftest.file + ) +then + # Ok. + : else - am_cv_$1_dependencies_compiler_type=none + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) +AC_MSG_RESULT(yes)]) +# Copyright (C) 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +# serial 1 - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# serial 2 -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -# Do all the work for Automake. -*- Autoconf -*- +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 2 -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi -fi -AC_SUBST([CYGPATH_W]) +done +rm -rf conftest.dir -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# serial 2 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +$$1_PKG_ERRORS -# serial 5 +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +_PKG_TEXT]) + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -# Check to see how 'make' treats includes. -*- Autoconf -*- +_PKG_TEXT -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +To get pkg-config, see .]) + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# serial 4 +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings +dnl For now, only works on GCC +AC_DEFUN([GNOME_COMPILE_WARNINGS],[ + dnl ****************************** + dnl More compiler warnings + dnl ****************************** -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) + AC_ARG_ENABLE(compile-warnings, + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [Turn on compiler warnings]),, + [enable_compile_warnings="m4_default([$1],[yes])"]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + warning_flags= + realsave_CFLAGS="$CFLAGS" -# serial 6 + case "$enable_compile_warnings" in + no) + warning_flags= + ;; + minimum) + warning_flags="-Wall" + ;; + yes) + warning_flags="-Wall -Wmissing-prototypes" + ;; + maximum|error) + warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" + CFLAGS="$warning_flags $CFLAGS" + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_RESULT($has_option) + if test $has_option = yes; then + warning_flags="$warning_flags $option" + fi + unset has_option + unset SAVE_CFLAGS + done + unset option + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + ;; + *) + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; + esac + CFLAGS="$realsave_CFLAGS" + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + AC_MSG_RESULT($warning_flags) -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) + AC_ARG_ENABLE(iso-c, + AC_HELP_STRING([--enable-iso-c], + [Try to warn if code is not ISO C ]),, + [enable_iso_c=no]) + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi + WARN_CFLAGS="$warning_flags $complCFLAGS" + AC_SUBST(WARN_CFLAGS) ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +dnl For C++, do basically the same thing. -# Helper functions for option handling. -*- Autoconf -*- +AC_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + [Turn on compiler warnings.]),, + [enable_cxx_warnings="m4_default([$1],[minimum])"]) -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GXX" != xyes; then + enable_cxx_warnings=no + fi + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac -# serial 4 + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" + fi + fi + fi + AC_MSG_RESULT($warnCXXFLAGS) -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + AC_ARG_ENABLE(iso-cxx, + AC_HELP_STRING([--enable-iso-cxx], + [Try to warn if code is not ISO C++ ]),, + [enable_iso_cxx=no]) -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Configure paths for GTK+ +# Owen Taylor 1997-2001 -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) +dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, +dnl pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GTK_3_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], + , enable_gtktest=yes) -# Check to make sure that the build environment is sane. -*- Autoconf -*- + pkg_config_args=gtk+-3.0 + for module in . $4 + do + case "$module" in + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + esac + done -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + no_gtk="" -# serial 5 + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac + if test x$PKG_CONFIG != xno ; then + if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then + : + else + echo "*** pkg-config too old; version 0.7 or better required." + no_gtk=yes + PKG_CONFIG=no + fi + else + no_gtk=yes + fi -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then + min_gtk_version=ifelse([$1], ,3.0.0,$1) + AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" + enable_gtktest=no + fi - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) + if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then + : + else + no_gtk=yes + fi + fi + + if test x"$no_gtk" = x ; then + GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` + GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` + gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" +dnl +dnl Now check if the installed GTK+ is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + fclose (fopen ("conf.gtktest", "w")); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://pkgconfig.sourceforge.net" + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK+ test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK+ or finding the wrong" + echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest +]) -# Copyright (C) 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Tests for BACKEND-NAME in the GTK targets list +dnl +AC_DEFUN([GTK_CHECK_BACKEND], +[ + pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0) + min_gtk_version=ifelse([$2],,3.0.0,$2) -# serial 1 + AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])]) -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl + if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args ; then + target_found=yes + else + target_found=no + fi + + if test "x$target_found" = "xno"; then + ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4]) + else + ifelse([$3],,[:],[$3]) + fi ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# serial 1 -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -# serial 2 + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) + AC_MSG_CHECKING([for gobject-introspection]) -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl -# Check how to create a tarball. -*- Autoconf -*- + AC_MSG_RESULT([$found_introspection]) -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) -# serial 2 + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) m4_include([m4/gettext.m4]) m4_include([m4/gtk-doc.m4]) diff -Nru gtksourceview3-3.3.5/ChangeLog gtksourceview3-3.4.0/ChangeLog --- gtksourceview3-3.3.5/ChangeLog 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/ChangeLog 2012-03-26 17:33:51.000000000 +0000 @@ -1,6 +1,22 @@ +commit bfa8868ca3dea6ebefc19e43b49bf0ad56312435 +Author: Daniel Korostil +Date: 2012-03-25 + + Uploaded Ukranian + +M po/uk.po + +commit 073eba637f5eada54b72e9ad0f3e14ff524f2f2b +Author: YunQiang Su +Date: 2012-03-21 + + update Simplified Chinese (zh_CN) translation + +M po/zh_CN.po + commit 767ffd60f113aaafe8179d12d156c64a576c6e56 Author: Paolo Borelli -Date: 2012-03-19 +Date: 2012-03-19 Release 3.3.5 diff -Nru gtksourceview3-3.3.5/configure gtksourceview3-3.4.0/configure --- gtksourceview3-3.3.5/configure 2012-03-19 22:39:06.000000000 +0000 +++ gtksourceview3-3.4.0/configure 2012-03-26 17:11:54.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gtksourceview 3.3.5. +# Generated by GNU Autoconf 2.68 for gtksourceview 3.4.0. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='gtksourceview' PACKAGE_TARNAME='gtksourceview' -PACKAGE_VERSION='3.3.5' -PACKAGE_STRING='gtksourceview 3.3.5' +PACKAGE_VERSION='3.4.0' +PACKAGE_STRING='gtksourceview 3.4.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview' PACKAGE_URL='http://projects.gnome.org/gtksourceview/' @@ -1409,7 +1409,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gtksourceview 3.3.5 to adapt to many kinds of systems. +\`configure' configures gtksourceview 3.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1479,7 +1479,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtksourceview 3.3.5:";; + short | recursive ) echo "Configuration of gtksourceview 3.4.0:";; esac cat <<\_ACEOF @@ -1620,7 +1620,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtksourceview configure 3.3.5 +gtksourceview configure 3.4.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1989,7 +1989,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtksourceview $as_me 3.3.5, which was +It was created by gtksourceview $as_me 3.4.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2811,7 +2811,7 @@ # Define the identity of the package. PACKAGE='gtksourceview' - VERSION='3.3.5' + VERSION='3.4.0' cat >>confdefs.h <<_ACEOF @@ -12364,7 +12364,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@' INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -12690,7 +12690,7 @@ if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -15024,6 +15024,7 @@ else found_introspection=no fi + enable_introspection=$found_introspection ;; #( *) : as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 @@ -15653,7 +15654,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtksourceview $as_me 3.3.5, which was +This file was extended by gtksourceview $as_me 3.4.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15720,7 +15721,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gtksourceview config.status 3.3.5 +gtksourceview config.status 3.4.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru gtksourceview3-3.3.5/configure.ac gtksourceview3-3.4.0/configure.ac --- gtksourceview3-3.3.5/configure.ac 2012-03-19 22:38:32.000000000 +0000 +++ gtksourceview3-3.4.0/configure.ac 2012-03-26 17:10:51.000000000 +0000 @@ -3,8 +3,8 @@ AC_PREREQ(2.64) m4_define(gtksourceview_major_version, 3) -m4_define(gtksourceview_minor_version, 3) -m4_define(gtksourceview_micro_version, 5) +m4_define(gtksourceview_minor_version, 4) +m4_define(gtksourceview_micro_version, 0) m4_define(gtksourceview_version, gtksourceview_major_version.gtksourceview_minor_version.gtksourceview_micro_version) AC_INIT([gtksourceview],[gtksourceview_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtksourceview],[gtksourceview],[http://projects.gnome.org/gtksourceview/]) diff -Nru gtksourceview3-3.3.5/debian/changelog gtksourceview3-3.4.0/debian/changelog --- gtksourceview3-3.3.5/debian/changelog 2012-03-21 18:37:49.000000000 +0000 +++ gtksourceview3-3.4.0/debian/changelog 2012-03-27 09:12:32.000000000 +0000 @@ -1,4 +1,4 @@ -gtksourceview3 (3.3.5-1ubuntu1) precise; urgency=low +gtksourceview3 (3.4.0-1ubuntu1) precise-proposed; urgency=low * Rebased on Debian, the remaining diff (can be dropped after precise) is: * debian/control.in: @@ -7,6 +7,12 @@ -- Sebastien Bacher Tue, 20 Mar 2012 13:11:48 +0100 +gtksourceview3 (3.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl Tue, 27 Mar 2012 02:03:40 +0200 + gtksourceview3 (3.3.5-1) experimental; urgency=low * New upstream development release. diff -Nru gtksourceview3-3.3.5/docs/reference/html/annotation-glossary.html gtksourceview3-3.4.0/docs/reference/html/annotation-glossary.html --- gtksourceview3-3.3.5/docs/reference/html/annotation-glossary.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/annotation-glossary.html 2012-03-26 17:33:44.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -40,6 +40,9 @@
out

Parameter for returning results. Default is transfer full.

+
+out caller-allocates
+

Out parameter, where caller must allocate storage.

A

allow-none
@@ -65,10 +68,10 @@

Free data after the code is done.

type
-

Override the parsed C type with given type

+

Override the parsed C type with given type.

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/api-index-3-0.html gtksourceview3-3.4.0/docs/reference/html/api-index-3-0.html --- gtksourceview3-3.3.5/docs/reference/html/api-index-3-0.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/api-index-3-0.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/api-index-deprecated.html gtksourceview3-3.4.0/docs/reference/html/api-index-deprecated.html --- gtksourceview3-3.3.5/docs/reference/html/api-index-deprecated.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/api-index-deprecated.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/api-index-full.html gtksourceview3-3.4.0/docs/reference/html/api-index-full.html --- gtksourceview3-3.3.5/docs/reference/html/api-index-full.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/api-index-full.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -1533,6 +1533,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceBuffer.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceBuffer.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceBuffer.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceBuffer.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,82 +47,82 @@ #include <gtksourceview/gtksourcebuffer.h> struct GtkSourceBuffer; -GtkSourceBuffer * gtk_source_buffer_new (GtkTextTagTable *table); +GtkSourceBuffer * gtk_source_buffer_new (GtkTextTagTable *table); GtkSourceBuffer * gtk_source_buffer_new_with_language (GtkSourceLanguage *language); void gtk_source_buffer_set_highlight_syntax (GtkSourceBuffer *buffer, - gboolean highlight); -gboolean gtk_source_buffer_get_highlight_syntax + gboolean highlight); +gboolean gtk_source_buffer_get_highlight_syntax (GtkSourceBuffer *buffer); void gtk_source_buffer_set_language (GtkSourceBuffer *buffer, GtkSourceLanguage *language); GtkSourceLanguage * gtk_source_buffer_get_language (GtkSourceBuffer *buffer); void gtk_source_buffer_set_highlight_matching_brackets (GtkSourceBuffer *buffer, - gboolean highlight); -gboolean gtk_source_buffer_get_highlight_matching_brackets + gboolean highlight); +gboolean gtk_source_buffer_get_highlight_matching_brackets (GtkSourceBuffer *buffer); void gtk_source_buffer_set_style_scheme (GtkSourceBuffer *buffer, GtkSourceStyleScheme *scheme); GtkSourceStyleScheme * gtk_source_buffer_get_style_scheme (GtkSourceBuffer *buffer); -gint gtk_source_buffer_get_max_undo_levels +gint gtk_source_buffer_get_max_undo_levels (GtkSourceBuffer *buffer); void gtk_source_buffer_set_max_undo_levels (GtkSourceBuffer *buffer, - gint max_undo_levels); + gint max_undo_levels); void gtk_source_buffer_redo (GtkSourceBuffer *buffer); void gtk_source_buffer_undo (GtkSourceBuffer *buffer); -gboolean gtk_source_buffer_can_redo (GtkSourceBuffer *buffer); -gboolean gtk_source_buffer_can_undo (GtkSourceBuffer *buffer); +gboolean gtk_source_buffer_can_redo (GtkSourceBuffer *buffer); +gboolean gtk_source_buffer_can_undo (GtkSourceBuffer *buffer); void gtk_source_buffer_begin_not_undoable_action (GtkSourceBuffer *buffer); void gtk_source_buffer_end_not_undoable_action (GtkSourceBuffer *buffer); void gtk_source_buffer_ensure_highlight (GtkSourceBuffer *buffer, - const GtkTextIter *start, - const GtkTextIter *end); + const GtkTextIter *start, + const GtkTextIter *end); GtkSourceMark * gtk_source_buffer_create_source_mark (GtkSourceBuffer *buffer, - const gchar *name, - const gchar *category, - const GtkTextIter *where); -gboolean gtk_source_buffer_forward_iter_to_source_mark - (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *category); -gboolean gtk_source_buffer_backward_iter_to_source_mark - (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *category); -GSList * gtk_source_buffer_get_source_marks_at_line - (GtkSourceBuffer *buffer, - gint line, - const gchar *category); -GSList * gtk_source_buffer_get_source_marks_at_iter + const gchar *name, + const gchar *category, + const GtkTextIter *where); +gboolean gtk_source_buffer_forward_iter_to_source_mark + (GtkSourceBuffer *buffer, + GtkTextIter *iter, + const gchar *category); +gboolean gtk_source_buffer_backward_iter_to_source_mark + (GtkSourceBuffer *buffer, + GtkTextIter *iter, + const gchar *category); +GSList * gtk_source_buffer_get_source_marks_at_line + (GtkSourceBuffer *buffer, + gint line, + const gchar *category); +GSList * gtk_source_buffer_get_source_marks_at_iter (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *category); + GtkTextIter *iter, + const gchar *category); void gtk_source_buffer_remove_source_marks (GtkSourceBuffer *buffer, - const GtkTextIter *start, - const GtkTextIter *end, - const gchar *category); -gboolean gtk_source_buffer_iter_has_context_class - (GtkSourceBuffer *buffer, - const GtkTextIter *iter, - const gchar *context_class); -gchar ** gtk_source_buffer_get_context_classes_at_iter - (GtkSourceBuffer *buffer, - const GtkTextIter *iter); -gboolean gtk_source_buffer_iter_forward_to_context_class_toggle - (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *context_class); -gboolean gtk_source_buffer_iter_backward_to_context_class_toggle + const GtkTextIter *start, + const GtkTextIter *end, + const gchar *category); +gboolean gtk_source_buffer_iter_has_context_class + (GtkSourceBuffer *buffer, + const GtkTextIter *iter, + const gchar *context_class); +gchar ** gtk_source_buffer_get_context_classes_at_iter + (GtkSourceBuffer *buffer, + const GtkTextIter *iter); +gboolean gtk_source_buffer_iter_forward_to_context_class_toggle + (GtkSourceBuffer *buffer, + GtkTextIter *iter, + const gchar *context_class); +gboolean gtk_source_buffer_iter_backward_to_context_class_toggle (GtkSourceBuffer *buffer, - GtkTextIter *iter, - const gchar *context_class); + GtkTextIter *iter, + const gchar *context_class); GtkSourceUndoManager * gtk_source_buffer_get_undo_manager (GtkSourceBuffer *buffer); void gtk_source_buffer_set_undo_manager (GtkSourceBuffer *buffer, @@ -132,20 +132,20 @@

Object Hierarchy

-  GObject
-   +----GtkTextBuffer
+  GObject
+   +----GtkTextBuffer
          +----GtkSourceBuffer

Properties

-  "can-redo"                 gboolean              : Read
-  "can-undo"                 gboolean              : Read
-  "highlight-matching-brackets" gboolean              : Read / Write
-  "highlight-syntax"         gboolean              : Read / Write
+  "can-redo"                 gboolean              : Read
+  "can-undo"                 gboolean              : Read
+  "highlight-matching-brackets" gboolean              : Read / Write
+  "highlight-syntax"         gboolean              : Read / Write
   "language"                 GtkSourceLanguage*    : Read / Write
-  "max-undo-levels"          gint                  : Read / Write
+  "max-undo-levels"          gint                  : Read / Write
   "style-scheme"             GtkSourceStyleScheme*  : Read / Write
   "undo-manager"             GtkSourceUndoManager*  : Read / Write / Construct
@@ -153,18 +153,18 @@

Signals

-  "bracket-matched"                                : Run Last
-  "highlight-updated"                              : Run Last
-  "redo"                                           : Run Last
-  "source-mark-updated"                            : Run Last
-  "undo"                                           : Run Last
+  "bracket-matched"                                : Run Last
+  "highlight-updated"                              : Run Last
+  "redo"                                           : Run Last
+  "source-mark-updated"                            : Run Last
+  "undo"                                           : Run Last

Description

The GtkSourceBuffer object is the model for GtkSourceView widgets. -It extends the GtkTextBuffer object by adding features useful to display +It extends the GtkTextBuffer object by adding features useful to display and edit source code as syntax highlighting and bracket matching. It also implements support for undo/redo operations.

@@ -187,7 +187,7 @@

gtk_source_buffer_new ()

-
GtkSourceBuffer *   gtk_source_buffer_new               (GtkTextTagTable *table);
+
GtkSourceBuffer *   gtk_source_buffer_new               (GtkTextTagTable *table);

Creates a new source buffer.

@@ -196,7 +196,7 @@

table :

-a GtkTextTagTable, or NULL to create a new one. [allow-none] +a GtkTextTagTable, or NULL to create a new one. [allow-none] @@ -235,12 +235,12 @@

gtk_source_buffer_set_highlight_syntax ()

void                gtk_source_buffer_set_highlight_syntax
                                                         (GtkSourceBuffer *buffer,
-                                                         gboolean highlight);
+ gboolean highlight);

Controls whether syntax is highlighted in the buffer. If highlight -is TRUE, the text will be highlighted according to the syntax +is TRUE, the text will be highlighted according to the syntax patterns specified in the language set with -gtk_source_buffer_set_language(). If highlight is FALSE, syntax highlighting +gtk_source_buffer_set_language(). If highlight is FALSE, syntax highlighting is disabled and all the GtkTextTag objects that have been added by the syntax highlighting engine are removed from the buffer.

@@ -254,7 +254,7 @@

highlight :

-TRUE to enable syntax highlighting, FALSE to disable it. +TRUE to enable syntax highlighting, FALSE to disable it.
@@ -262,7 +262,7 @@

gtk_source_buffer_get_highlight_syntax ()

-
gboolean            gtk_source_buffer_get_highlight_syntax
+
gboolean            gtk_source_buffer_get_highlight_syntax
                                                         (GtkSourceBuffer *buffer);

 

 Determines whether syntax highlighting is activated in the source
@@ -278,7 +278,7 @@
 
 
Returns :

 
-TRUE if syntax highlighting is enabled, FALSE otherwise.
+TRUE if syntax highlighting is enabled, FALSE otherwise.
@@ -290,9 +290,9 @@ GtkSourceLanguage *language);

Associate a GtkSourceLanguage with the buffer. If language is -not-NULL and syntax highlighting is enabled (see gtk_source_buffer_set_highlight_syntax()), +not-NULL and syntax highlighting is enabled (see gtk_source_buffer_set_highlight_syntax()), the syntax patterns defined in language will be used to highlight the text -contained in the buffer. If language is NULL, the text contained in the +contained in the buffer. If language is NULL, the text contained in the buffer is not highlighted.

@@ -307,7 +307,7 @@

language :

-a GtkSourceLanguage to set, or NULL. [allow-none] +a GtkSourceLanguage to set, or NULL. [allow-none] @@ -331,7 +331,7 @@

Returns :

-the GtkSourceLanguage associated with the buffer, or NULL. [transfer none] +the GtkSourceLanguage associated with the buffer, or NULL. [transfer none] @@ -342,7 +342,7 @@

gtk_source_buffer_set_highlight_matching_brackets ()

void                gtk_source_buffer_set_highlight_matching_brackets
                                                         (GtkSourceBuffer *buffer,
-                                                         gboolean highlight);
+ gboolean highlight);

Controls the bracket match highlighting function in the buffer. If activated, when you position your cursor over a bracket character @@ -361,7 +361,7 @@

highlight :

-TRUE if you want matching brackets highlighted. +TRUE if you want matching brackets highlighted.
@@ -369,7 +369,7 @@

gtk_source_buffer_get_highlight_matching_brackets ()

-
gboolean            gtk_source_buffer_get_highlight_matching_brackets
+
gboolean            gtk_source_buffer_get_highlight_matching_brackets
                                                         (GtkSourceBuffer *buffer);

 

 Determines whether bracket match highlighting is activated for the
@@ -385,7 +385,7 @@
 
 
Returns :

 
-TRUE if the source buffer will highlight matching
+TRUE if the source buffer will highlight matching
 brackets.
 
 
@@ -397,7 +397,7 @@
 
void                gtk_source_buffer_set_style_scheme  (GtkSourceBuffer *buffer,
                                                          GtkSourceStyleScheme *scheme);

 

-Sets style scheme used by the buffer. If scheme is NULL no
+Sets style scheme used by the buffer. If scheme is NULL no
 style scheme is used.
 

 

@@ -409,7 +409,7 @@
 
-
@@ -435,7 +435,7 @@
 
@@ -444,7 +444,7 @@
 

 
gtk_source_buffer_get_max_undo_levels ()

-
gint                gtk_source_buffer_get_max_undo_levels
+
gint                gtk_source_buffer_get_max_undo_levels
                                                         (GtkSourceBuffer *buffer);

 

 Determines the number of undo levels the buffer will track for
@@ -470,7 +470,7 @@
 
gtk_source_buffer_set_max_undo_levels ()

 
void                gtk_source_buffer_set_max_undo_levels
                                                         (GtkSourceBuffer *buffer,
-                                                         gint max_undo_levels);

+                                                         gint max_undo_levels);

 

 Sets the number of undo levels for user actions the buffer will
 track.  If the number of user actions exceeds the limit set by this
@@ -481,7 +481,7 @@
 

 

 A new action is started whenever the function
-gtk_text_buffer_begin_user_action() is called.  In general, this
+gtk_text_buffer_begin_user_action() is called.  In general, this
 happens whenever the user presses any key which modifies the
 buffer, but the undo manager will try to merge similar consecutive
 actions, such as multiple character insertions into one action.
@@ -528,8 +528,8 @@
 

 

 Actions are defined as groups of operations between a call to
-gtk_text_buffer_begin_user_action() and
-gtk_text_buffer_end_user_action(), or sequences of similar edits
+gtk_text_buffer_begin_user_action() and
+gtk_text_buffer_end_user_action(), or sequences of similar edits
 (inserts or deletes) on the same line.
 

 

 

 
scheme :
a GtkSourceStyleScheme or NULL. [allow-none]
+a GtkSourceStyleScheme or NULL. [allow-none]
 
 

 

 
Returns :

 the GtkSourceStyleScheme associated
-with the buffer, or NULL. [transfer none]
+with the buffer, or NULL. [transfer none]
 
 

 
 

@@ -543,7 +543,7 @@
 

 
gtk_source_buffer_can_redo ()

-
gboolean            gtk_source_buffer_can_redo          (GtkSourceBuffer *buffer);

+
gboolean            gtk_source_buffer_can_redo          (GtkSourceBuffer *buffer);

 

 Determines whether a source buffer can redo the last action
 (i.e. if the last operation was an undo).
@@ -558,7 +558,7 @@
 

+TRUE if a redo is possible.

 

 
Returns :

 
-TRUE if a redo is possible.
 

 
 

@@ -566,7 +566,7 @@
 

 

 
gtk_source_buffer_can_undo ()

-
gboolean            gtk_source_buffer_can_undo          (GtkSourceBuffer *buffer);

+
gboolean            gtk_source_buffer_can_undo          (GtkSourceBuffer *buffer);

 

 Determines whether a source buffer can undo the last action.
 

@@ -580,7 +580,7 @@
 
 
Returns :

 
-TRUE if it's possible to undo the last action.
+TRUE if it's possible to undo the last action.
 
 
 

@@ -631,8 +631,8 @@
 

 
gtk_source_buffer_ensure_highlight ()

 
void                gtk_source_buffer_ensure_highlight  (GtkSourceBuffer *buffer,
-                                                         const GtkTextIter *start,
-                                                         const GtkTextIter *end);

+                                                         const GtkTextIter *start,
+                                                         const GtkTextIter *end);

Forces buffer to analyze and highlight the given area synchronously.

@@ -671,17 +671,17 @@

gtk_source_buffer_create_source_mark ()

GtkSourceMark *     gtk_source_buffer_create_source_mark
                                                         (GtkSourceBuffer *buffer,
-                                                         const gchar *name,
-                                                         const gchar *category,
-                                                         const GtkTextIter *where);
+ const gchar *name, + const gchar *category, + const GtkTextIter *where);

Creates a source mark in the buffer of category category. A source mark is -a GtkTextMark but organised into categories. Depending on the category +a GtkTextMark but organised into categories. Depending on the category a pixbuf can be specified that will be displayed along the line of the mark.

-Like a GtkTextMark, a GtkSourceMark can be anonymous if the -passed name is NULL. Also, the buffer owns the marks so you +Like a GtkTextMark, a GtkSourceMark can be anonymous if the +passed name is NULL. Also, the buffer owns the marks so you shouldn't unreference it.

@@ -701,7 +701,7 @@

name :

-the name of the mark, or NULL. [allow-none] +the name of the mark, or NULL. [allow-none] @@ -724,13 +724,13 @@

gtk_source_buffer_forward_iter_to_source_mark ()

-
gboolean            gtk_source_buffer_forward_iter_to_source_mark
+
gboolean            gtk_source_buffer_forward_iter_to_source_mark
                                                         (GtkSourceBuffer *buffer,
-                                                         GtkTextIter *iter,
-                                                         const gchar *category);

+                                                         GtkTextIter *iter,
+                                                         const gchar *category);

Moves iter to the position of the next GtkSourceMark of the given -category. Returns TRUE if iter was moved. If category is NULL, the +category. Returns TRUE if iter was moved. If category is NULL, the next source mark can be of any category.

@@ -746,7 +746,7 @@ - @@ -760,13 +760,13 @@

gtk_source_buffer_backward_iter_to_source_mark ()

-
gboolean            gtk_source_buffer_backward_iter_to_source_mark
+
gboolean            gtk_source_buffer_backward_iter_to_source_mark
                                                         (GtkSourceBuffer *buffer,
-                                                         GtkTextIter *iter,
-                                                         const gchar *category);

+                                                         GtkTextIter *iter,
+                                                         const gchar *category);

Moves iter to the position of the previous GtkSourceMark of the given -category. Returns TRUE if iter was moved. If category is NULL, the +category. Returns TRUE if iter was moved. If category is NULL, the previous source mark can be of any category.

category :

category to search for, or NULL. [allow-none] +category to search for, or NULL. [allow-none]
@@ -782,7 +782,7 @@ - @@ -796,10 +796,10 @@

gtk_source_buffer_get_source_marks_at_line ()

-
GSList *            gtk_source_buffer_get_source_marks_at_line
+
GSList *            gtk_source_buffer_get_source_marks_at_line
                                                         (GtkSourceBuffer *buffer,
-                                                         gint line,
-                                                         const gchar *category);

+                                                         gint line,
+                                                         const gchar *category);

Returns the list of marks of the given category at line. If category is NULL, all marks at line are returned. @@ -817,12 +817,12 @@

- - @@ -832,13 +832,13 @@

gtk_source_buffer_get_source_marks_at_iter ()

-
GSList *            gtk_source_buffer_get_source_marks_at_iter
+
GSList *            gtk_source_buffer_get_source_marks_at_iter
                                                         (GtkSourceBuffer *buffer,
-                                                         GtkTextIter *iter,
-                                                         const gchar *category);

+                                                         GtkTextIter *iter,
+                                                         const gchar *category);

Returns the list of marks of the given category at iter. If category -is NULL it returns all marks at iter. +is NULL it returns all marks at iter.

category :

category to search for, or NULL. [allow-none] +category to search for, or NULL. [allow-none]

category :

category to search for, or NULL. [allow-none] +category to search for, or NULL. [allow-none]

Returns :

a newly allocated GSList. [element-type GtkSource.Mark][transfer container] +a newly allocated GSList. [element-type GtkSource.Mark][transfer container]
@@ -853,12 +853,12 @@ - - @@ -870,9 +870,9 @@

gtk_source_buffer_remove_source_marks ()

void                gtk_source_buffer_remove_source_marks
                                                         (GtkSourceBuffer *buffer,
-                                                         const GtkTextIter *start,
-                                                         const GtkTextIter *end,
-                                                         const gchar *category);
+ const GtkTextIter *start, + const GtkTextIter *end, + const gchar *category);

Remove all marks of category between start and end from the buffer. If category is NULL, all marks in the range will be removed. @@ -886,15 +886,15 @@

- + - + - @@ -904,10 +904,10 @@

gtk_source_buffer_iter_has_context_class ()

-
gboolean            gtk_source_buffer_iter_has_context_class
+
gboolean            gtk_source_buffer_iter_has_context_class
                                                         (GtkSourceBuffer *buffer,
-                                                         const GtkTextIter *iter,
-                                                         const gchar *context_class);

+                                                         const GtkTextIter *iter,
+                                                         const gchar *context_class);

Check if the class context_klass is set on iter.

@@ -920,7 +920,7 @@
- + @@ -933,9 +933,9 @@

gtk_source_buffer_get_context_classes_at_iter ()

-
gchar **            gtk_source_buffer_get_context_classes_at_iter
+
gchar **            gtk_source_buffer_get_context_classes_at_iter
                                                         (GtkSourceBuffer *buffer,
-                                                         const GtkTextIter *iter);

+                                                         const GtkTextIter *iter);

Get all defined context classes at iter.

@@ -948,13 +948,13 @@
- + - @@ -964,13 +964,13 @@

gtk_source_buffer_iter_forward_to_context_class_toggle ()

-
gboolean            gtk_source_buffer_iter_forward_to_context_class_toggle
+
gboolean            gtk_source_buffer_iter_forward_to_context_class_toggle
                                                         (GtkSourceBuffer *buffer,
-                                                         GtkTextIter *iter,
-                                                         const gchar *context_class);

+                                                         GtkTextIter *iter,
+                                                         const gchar *context_class);

Moves forward to the next toggle (on or off) of the context class. If no -matching context class toggles are found, returns FALSE, otherwise TRUE. +matching context class toggles are found, returns FALSE, otherwise TRUE. Does not return toggles located at iter, only toggles after iter. Sets iter to the location of the toggle, or to the end of the buffer if no toggle is found. @@ -984,7 +984,7 @@

- + @@ -1002,13 +1002,13 @@

gtk_source_buffer_iter_backward_to_context_class_toggle ()

-
gboolean            gtk_source_buffer_iter_backward_to_context_class_toggle
+
gboolean            gtk_source_buffer_iter_backward_to_context_class_toggle
                                                         (GtkSourceBuffer *buffer,
-                                                         GtkTextIter *iter,
-                                                         const gchar *context_class);

+                                                         GtkTextIter *iter,
+                                                         const gchar *context_class);

Moves backward to the next toggle (on or off) of the context class. If no -matching context class toggles are found, returns FALSE, otherwise TRUE. +matching context class toggles are found, returns FALSE, otherwise TRUE. Does not return toggles located at iter, only toggles after iter. Sets iter to the location of the toggle, or to the end of the buffer if no toggle is found. @@ -1022,7 +1022,7 @@

- + @@ -1056,7 +1056,7 @@ - @@ -1068,7 +1068,7 @@ 
void                gtk_source_buffer_set_undo_manager  (GtkSourceBuffer *buffer,
                                                          GtkSourceUndoManager *manager);

-Set the buffer undo manager. If manager is NULL the default undo manager +Set the buffer undo manager. If manager is NULL the default undo manager will be set.

category :

category to search for, or NULL. [allow-none] +category to search for, or NULL. [allow-none]

Returns :

a newly allocated GSList. [element-type GtkSource.Mark][transfer container] +a newly allocated GSList. [element-type GtkSource.Mark][transfer container]

start :

a GtkTextIter.a GtkTextIter.

end :

a GtkTextIter.a GtkTextIter.

category :

category to search for, or NULL. [allow-none] +category to search for, or NULL. [allow-none]

iter :

a GtkTextIter.a GtkTextIter.

context_class :

iter :

a GtkTextIter.a GtkTextIter.

Returns :

a new NULL +a new NULL terminated array of context class names. -Use g_strfreev() to free the array if it is no longer needed. [array zero-terminated=1][transfer full] +Use g_strfreev() to free the array if it is no longer needed. [array zero-terminated=1][transfer full]

iter :

a GtkTextIter.a GtkTextIter.

context_class :

iter :

a GtkTextIter.a GtkTextIter.

context_class :

Returns :

the GtkSourceUndoManager associated with the buffer, or NULL. [transfer none] +the GtkSourceUndoManager associated with the buffer, or NULL. [transfer none]
@@ -1080,7 +1080,7 @@ - @@ -1091,21 +1091,21 @@

Property Details

The "can-redo" property

-
  "can-redo"                 gboolean              : Read
+
  "can-redo"                 gboolean              : Read

Whether Redo operation is possible.

Default value: FALSE

The "can-undo" property

-
  "can-undo"                 gboolean              : Read
+
  "can-undo"                 gboolean              : Read

Whether Undo operation is possible.

Default value: FALSE

The "highlight-matching-brackets" property

-
  "highlight-matching-brackets" gboolean              : Read / Write
+
  "highlight-matching-brackets" gboolean              : Read / Write

Whether to highlight matching brackets in the buffer.

@@ -1114,7 +1114,7 @@

The "highlight-syntax" property

-
  "highlight-syntax"         gboolean              : Read / Write
+
  "highlight-syntax"         gboolean              : Read / Write

Whether to highlight syntax in the buffer.

@@ -1129,7 +1129,7 @@

The "max-undo-levels" property

-
  "max-undo-levels"          gint                  : Read / Write
+
  "max-undo-levels"          gint                  : Read / Write

Number of undo levels for the buffer. -1 means no limit. This property will only affect the default undo manager. @@ -1159,9 +1159,9 @@

The "bracket-matched" signal

void                user_function                      (GtkSourceBuffer          *buffer,
-                                                        GtkTextIter              *iter,
+                                                        GtkTextIter              *iter,
                                                         GtkSourceBracketMatchType state,
-                                                        gpointer                  user_data)      : Run Last
+ gpointer user_data) : Run Last

Sets iter to a valid iterator pointing to the matching bracket if state is GTK_SOURCE_BRACKET_MATCH_FOUND. Otherwise iter is @@ -1194,22 +1194,22 @@

The "highlight-updated" signal

void                user_function                      (GtkSourceBuffer *sourcebuffer,
-                                                        GtkTextIter     *arg1,
-                                                        GtkTextIter     *arg2,
-                                                        gpointer         user_data)         : Run Last
+ GtkTextIter *arg1, + GtkTextIter *arg2, + gpointer user_data) : Run Last

The "redo" signal

void                user_function                      (GtkSourceBuffer *sourcebuffer,
-                                                        gpointer         user_data)         : Run Last
+ gpointer user_data) : Run Last

The "source-mark-updated" signal

void                user_function                      (GtkSourceBuffer *buffer,
-                                                        GtkTextMark     *arg1,
-                                                        gpointer         user_data)      : Run Last
+ GtkTextMark *arg1, + gpointer user_data) : Run Last

The ::source_mark_updated signal is emitted each time a mark is added to, moved or removed from the buffer. @@ -1232,16 +1232,16 @@

The "undo" signal

void                user_function                      (GtkSourceBuffer *sourcebuffer,
-                                                        gpointer         user_data)         : Run Last
+ gpointer user_data) : Run Last

See Also

-GtkTextBuffer,GtkSourceView +GtkTextBuffer,GtkSourceView
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletion.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletion.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletion.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletion.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,16 +47,16 @@ #include <gtksourceview/gtksourcecompletion.h> struct GtkSourceCompletion; -gboolean gtk_source_completion_add_provider (GtkSourceCompletion *completion, +gboolean gtk_source_completion_add_provider (GtkSourceCompletion *completion, GtkSourceCompletionProvider *provider, - GError **error); -gboolean gtk_source_completion_remove_provider + GError **error); +gboolean gtk_source_completion_remove_provider (GtkSourceCompletion *completion, GtkSourceCompletionProvider *provider, - GError **error); -GList * gtk_source_completion_get_providers (GtkSourceCompletion *completion); -gboolean gtk_source_completion_show (GtkSourceCompletion *completion, - GList *providers, + GError **error); +GList * gtk_source_completion_get_providers (GtkSourceCompletion *completion); +gboolean gtk_source_completion_show (GtkSourceCompletion *completion, + GList *providers, GtkSourceCompletionContext *context); void gtk_source_completion_hide (GtkSourceCompletion *completion); GtkSourceCompletionInfo * gtk_source_completion_get_info_window @@ -64,9 +64,9 @@ struct _GtkSourceView * gtk_source_completion_get_view (GtkSourceCompletion *completion); GtkSourceCompletionContext * gtk_source_completion_create_context (GtkSourceCompletion *completion, - GtkTextIter *position); + GtkTextIter *position); void gtk_source_completion_move_window (GtkSourceCompletion *completion, - GtkTextIter *iter); + GtkTextIter *iter); void gtk_source_completion_block_interactive (GtkSourceCompletion *completion); void gtk_source_completion_unblock_interactive @@ -76,33 +76,33 @@

Object Hierarchy

-  GObject
+  GObject
    +----GtkSourceCompletion

Properties

-  "accelerators"             guint                 : Read / Write / Construct
-  "auto-complete-delay"      guint                 : Read / Write / Construct
-  "proposal-page-size"       guint                 : Read / Write / Construct
-  "provider-page-size"       guint                 : Read / Write / Construct
-  "remember-info-visibility" gboolean              : Read / Write / Construct
-  "select-on-show"           gboolean              : Read / Write / Construct
-  "show-headers"             gboolean              : Read / Write / Construct
-  "show-icons"               gboolean              : Read / Write / Construct
+  "accelerators"             guint                 : Read / Write / Construct
+  "auto-complete-delay"      guint                 : Read / Write / Construct
+  "proposal-page-size"       guint                 : Read / Write / Construct
+  "provider-page-size"       guint                 : Read / Write / Construct
+  "remember-info-visibility" gboolean              : Read / Write / Construct
+  "select-on-show"           gboolean              : Read / Write / Construct
+  "show-headers"             gboolean              : Read / Write / Construct
+  "show-icons"               gboolean              : Read / Write / Construct
   "view"                     GtkSourceView*        : Read / Write / Construct Only

Signals

-  "activate-proposal"                              : Action
-  "hide"                                           : Action
-  "move-cursor"                                    : Action
-  "move-page"                                      : Action
-  "populate-context"                               : Action
-  "show"                                           : Action
+  "activate-proposal"                              : Action
+  "hide"                                           : Action
+  "move-cursor"                                    : Action
+  "move-page"                                      : Action
+  "populate-context"                               : Action
+  "show"                                           : Action
@@ -117,9 +117,9 @@

gtk_source_completion_add_provider ()

-
gboolean            gtk_source_completion_add_provider  (GtkSourceCompletion *completion,
+
gboolean            gtk_source_completion_add_provider  (GtkSourceCompletion *completion,
                                                          GtkSourceCompletionProvider *provider,
-                                                         GError **error);

+                                                         GError **error);

Add a new GtkSourceCompletionProvider to the completion object. This will add a reference provider, so make sure to unref your own copy when you @@ -138,14 +138,14 @@

- +TRUE if provider was successfully added, otherwise if error +is provided, it will be set with the error and FALSE is returned.

manager :

A GtkSourceUndoManager or NULL. [allow-none] +A GtkSourceUndoManager or NULL. [allow-none]

error :

a GError. [allow-none] +a GError. [allow-none]

Returns :

 -TRUE if provider was successfully added, otherwise if error -is provided, it will be set with the error and FALSE is returned.
@@ -153,10 +153,10 @@

gtk_source_completion_remove_provider ()

-
gboolean            gtk_source_completion_remove_provider
+
gboolean            gtk_source_completion_remove_provider
                                                         (GtkSourceCompletion *completion,
                                                          GtkSourceCompletionProvider *provider,
-                                                         GError **error);

+                                                         GError **error);

Remove provider from the completion.

@@ -173,14 +173,14 @@

error :

-a GError. [allow-none] +a GError. [allow-none]

Returns :

-TRUE if provider was successfully removed, otherwise if error -is provided, it will be set with the error and FALSE is returned. +TRUE if provider was successfully removed, otherwise if error +is provided, it will be set with the error and FALSE is returned.
@@ -188,7 +188,7 @@

gtk_source_completion_get_providers ()

-
GList *             gtk_source_completion_get_providers (GtkSourceCompletion *completion);
+
GList *             gtk_source_completion_get_providers (GtkSourceCompletion *completion);

Get list of providers registered on completion. The returned list is owned by the completion and should not be freed. @@ -211,8 +211,8 @@

gtk_source_completion_show ()

-
gboolean            gtk_source_completion_show          (GtkSourceCompletion *completion,
-                                                         GList *providers,
+
gboolean            gtk_source_completion_show          (GtkSourceCompletion *completion,
+                                                         GList *providers,
                                                          GtkSourceCompletionContext *context);

 

 Starts a new completion with the specified GtkSourceCompletionContext and
@@ -227,7 +227,7 @@
 
 
 
providers :

-a list of GtkSourceCompletionProvider, or NULL. [element-type GtkSource.CompletionProvider][allow-none]
+a list of GtkSourceCompletionProvider, or NULL. [element-type GtkSource.CompletionProvider][allow-none]
 
 
 
@@ -239,7 +239,7 @@
 
 
Returns :

 
-TRUE if it was possible to the show completion window.
+TRUE if it was possible to the show completion window.
@@ -300,7 +300,7 @@

Returns :

-The GtkSourceView associated with completion. [type GtkSource.View][transfer none] +The GtkSourceView associated with completion. [type GtkSource.View][transfer none] @@ -311,11 +311,11 @@

gtk_source_completion_create_context ()

GtkSourceCompletionContext * gtk_source_completion_create_context
                                                         (GtkSourceCompletion *completion,
-                                                         GtkTextIter *position);
+ GtkTextIter *position);

Create a new GtkSourceCompletionContext for completion. The position at which the completion using the new context will consider completion can -be provider by position. If position is NULL, the current cursor +be provider by position. If position is NULL, the current cursor position will be used.

@@ -327,7 +327,7 @@ - @@ -345,7 +345,7 @@

gtk_source_completion_move_window ()

void                gtk_source_completion_move_window   (GtkSourceCompletion *completion,
-                                                         GtkTextIter *iter);
+ GtkTextIter *iter);

Move the completion window to a specific iter.

@@ -358,7 +358,7 @@
- +

position :

a GtkTextIter, or NULL. [allow-none] +a GtkTextIter, or NULL. [allow-none]

iter :

a GtkTextIter.a GtkTextIter.
@@ -405,7 +405,7 @@

Property Details

The "accelerators" property

-
  "accelerators"             guint                 : Read / Write / Construct
+
  "accelerators"             guint                 : Read / Write / Construct

Number of accelerators to show for the first proposals.

@@ -415,7 +415,7 @@

The "auto-complete-delay" property

-
  "auto-complete-delay"      guint                 : Read / Write / Construct
+
  "auto-complete-delay"      guint                 : Read / Write / Construct

Determines the popup delay (in milliseconds) at which the completion will be shown for interactive completion. @@ -425,7 +425,7 @@

The "proposal-page-size" property

-
  "proposal-page-size"       guint                 : Read / Write / Construct
+
  "proposal-page-size"       guint                 : Read / Write / Construct

The scroll page size of the proposals in the completion window.

@@ -435,7 +435,7 @@

The "provider-page-size" property

-
  "provider-page-size"       guint                 : Read / Write / Construct
+
  "provider-page-size"       guint                 : Read / Write / Construct

The scroll page size of the provider pages in the completion window.

@@ -445,7 +445,7 @@

The "remember-info-visibility" property

-
  "remember-info-visibility" gboolean              : Read / Write / Construct
+
  "remember-info-visibility" gboolean              : Read / Write / Construct

Determines whether the visibility of the info window should be saved when the completion is hidden, and restored when the completion @@ -456,7 +456,7 @@

The "select-on-show" property

-
  "select-on-show"           gboolean              : Read / Write / Construct
+
  "select-on-show"           gboolean              : Read / Write / Construct

Determines whether the first proposal should be selected when the completion is first shown. @@ -466,7 +466,7 @@

The "show-headers" property

-
  "show-headers"             gboolean              : Read / Write / Construct
+
  "show-headers"             gboolean              : Read / Write / Construct

Determines whether provider headers should be shown in the proposal list if there is more than one provider with proposals. @@ -476,7 +476,7 @@

The "show-icons" property

-
  "show-icons"               gboolean              : Read / Write / Construct
+
  "show-icons"               gboolean              : Read / Write / Construct

Determines whether provider and proposal icons should be shown in the completion popup. @@ -497,14 +497,14 @@

The "activate-proposal" signal

void                user_function                      (GtkSourceCompletion *completion,
-                                                        gpointer             user_data)       : Action
+ gpointer user_data) : Action

The ::activate-proposal signal is a keybinding signal which gets emitted when the user initiates a proposal activation.

Applications should not connect to it, but may emit it with -g_signal_emit_by_name if they need to control the proposal activation +g_signal_emit_by_name if they need to control the proposal activation programmatically.

@@ -525,7 +525,7 @@

The "hide" signal

void                user_function                      (GtkSourceCompletion *completion,
-                                                        gpointer             user_data)       : Action
+ gpointer user_data) : Action

Emitted when the completion window is hidden. The default handler will actually hide the window. @@ -548,16 +548,16 @@

The "move-cursor" signal

void                user_function                      (GtkSourceCompletion *completion,
-                                                        GtkScrollStep        step,
-                                                        gint                 num,
-                                                        gpointer             user_data)       : Action
+ GtkScrollStep step, + gint num, + gpointer user_data) : Action

The ::move-cursor signal is a keybinding signal which gets emitted when the user initiates a cursor movement.

Applications should not connect to it, but may emit it with -g_signal_emit_by_name if they need to control the cursor +g_signal_emit_by_name if they need to control the cursor programmatically.

@@ -569,7 +569,7 @@ - + @@ -586,9 +586,9 @@

The "move-page" signal

void                user_function                      (GtkSourceCompletion *completion,
-                                                        GtkScrollStep        step,
-                                                        gint                 num,
-                                                        gpointer             user_data)       : Action
+ GtkScrollStep step, + gint num, + gpointer user_data) : Action

The ::move-page signal is a keybinding signal which gets emitted when the user initiates a page movement (i.e. switches between provider @@ -596,7 +596,7 @@

Applications should not connect to it, but may emit it with -g_signal_emit_by_name if they need to control the page selection +g_signal_emit_by_name if they need to control the page selection programmatically.

step :

The GtkScrollStep by which to move the cursorThe GtkScrollStep by which to move the cursor

num :

@@ -608,7 +608,7 @@ - + @@ -626,7 +626,7 @@

The "populate-context" signal

void                user_function                      (GtkSourceCompletion        *completion,
                                                         GtkSourceCompletionContext *context,
-                                                        gpointer                    user_data)       : Action
+ gpointer user_data) : Action

Emitted just before starting to populate the completion with providers. You can use this signal to add additional attributes in the context. @@ -653,7 +653,7 @@

The "show" signal

void                user_function                      (GtkSourceCompletion *completion,
-                                                        gpointer             user_data)       : Action
+ gpointer user_data) : Action

Emitted when the completion window is shown. The default handler will actually show the window. @@ -676,6 +676,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletionInfo.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletionInfo.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletionInfo.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletionInfo.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,24 +51,24 @@ (void); voidgtk_source_completion_info_move_to_iter (GtkSourceCompletionInfo *info, - GtkTextView *view, - GtkTextIter *iter); + GtkTextView *view, + GtkTextIter *iter); voidgtk_source_completion_info_set_widget (GtkSourceCompletionInfo *info, - GtkWidget *widget); -GtkWidget * gtk_source_completion_info_get_widget + GtkWidget *widget); +GtkWidget * gtk_source_completion_info_get_widget (GtkSourceCompletionInfo *info);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkWindow
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkBin
+                           +----GtkWindow
                                  +----GtkSourceCompletionInfo
@@ -76,12 +76,12 @@

Implemented Interfaces

GtkSourceCompletionInfo implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

Signals

-  "before-show"                                    : Action
+  "before-show"                                    : Action
@@ -115,11 +115,11 @@

gtk_source_completion_info_move_to_iter ()

void                gtk_source_completion_info_move_to_iter
                                                         (GtkSourceCompletionInfo *info,
-                                                         GtkTextView *view,
-                                                         GtkTextIter *iter);
+ GtkTextView *view, + GtkTextIter *iter);

-Moves the GtkSourceCompletionInfo to iter. If iter is NULL info is -moved to the cursor position. Moving will respect the GdkGravity setting +Moves the GtkSourceCompletionInfo to iter. If iter is NULL info is +moved to the cursor position. Moving will respect the GdkGravity setting of the info window and will ensure the line at iter is not occluded by the window.

@@ -132,11 +132,11 @@
- + - @@ -147,13 +147,13 @@

gtk_source_completion_info_set_widget ()

void                gtk_source_completion_info_set_widget
                                                         (GtkSourceCompletionInfo *info,
-                                                         GtkWidget *widget);
+ GtkWidget *widget);

Sets the content widget of the info window. If widget does not fit within -the size requirements of the window, a GtkScrolledWindow will automatically +the size requirements of the window, a GtkScrolledWindow will automatically be created and added to the window. See that the previous widget will lose a reference and it can be destroyed, so if you do not want this to happen -you must g_object_ref() before calling this method. +you must g_object_ref() before calling this method.

step :

The GtkScrollStep by which to move the pageThe GtkScrollStep by which to move the page

num :

view :

a GtkTextView on which the info window should be positioned.a GtkTextView on which the info window should be positioned.

iter :

a GtkTextIter. [allow-none] +a GtkTextIter. [allow-none]
@@ -164,7 +164,7 @@ - @@ -173,7 +173,7 @@

gtk_source_completion_info_get_widget ()

-
GtkWidget *         gtk_source_completion_info_get_widget
+
GtkWidget *         gtk_source_completion_info_get_widget
                                                         (GtkSourceCompletionInfo *info);

 

 Get the current content widget.
@@ -199,12 +199,12 @@
 

 
The "before-show" signal

 
void                user_function                      (GtkSourceCompletionInfo *sourcecompletioninfo,
-                                                        gpointer                 user_data)                 : Action

+                                                        gpointer                 user_data)                 : Action
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletionItem.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletionItem.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletionItem.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletionItem.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -48,26 +48,26 @@ struct GtkSourceCompletionItem; GtkSourceCompletionItem * gtk_source_completion_item_new - (const gchar *label, - const gchar *text, - GdkPixbuf *icon, - const gchar *info); + (const gchar *label, + const gchar *text, + GdkPixbuf *icon, + const gchar *info); GtkSourceCompletionItem * gtk_source_completion_item_new_with_markup - (const gchar *markup, - const gchar *text, - GdkPixbuf *icon, - const gchar *info); + (const gchar *markup, + const gchar *text, + GdkPixbuf *icon, + const gchar *info); GtkSourceCompletionItem * gtk_source_completion_item_new_from_stock - (const gchar *label, - const gchar *text, - const gchar *stock, - const gchar *info); + (const gchar *label, + const gchar *text, + const gchar *stock, + const gchar *info);

Object Hierarchy

-  GObject
+  GObject
    +----GtkSourceCompletionItem
@@ -80,11 +80,11 @@

Properties

-  "icon"                     GdkPixbuf*            : Read / Write
-  "info"                     gchar*                : Read / Write
-  "label"                    gchar*                : Read / Write
-  "markup"                   gchar*                : Read / Write
-  "text"                     gchar*                : Read / Write
+  "icon"                     GdkPixbuf*            : Read / Write
+  "info"                     gchar*                : Read / Write
+  "label"                    gchar*                : Read / Write
+  "markup"                   gchar*                : Read / Write
+  "text"                     gchar*                : Read / Write
@@ -100,13 +100,13 @@

gtk_source_completion_item_new ()

GtkSourceCompletionItem * gtk_source_completion_item_new
-                                                        (const gchar *label,
-                                                         const gchar *text,
-                                                         GdkPixbuf *icon,
-                                                         const gchar *info);
+ (const gchar *label, + const gchar *text, + GdkPixbuf *icon, + const gchar *info);

Create a new GtkSourceCompletionItem with label label, icon icon and -extra information info. Both icon and info can be NULL in which case +extra information info. Both icon and info can be NULL in which case there will be no icon shown and no extra information available.

widget :

a GtkWidget. [allow-none] +a GtkWidget. [allow-none]
@@ -141,13 +141,13 @@

gtk_source_completion_item_new_with_markup ()

GtkSourceCompletionItem * gtk_source_completion_item_new_with_markup
-                                                        (const gchar *markup,
-                                                         const gchar *text,
-                                                         GdkPixbuf *icon,
-                                                         const gchar *info);
+ (const gchar *markup, + const gchar *text, + GdkPixbuf *icon, + const gchar *info);

Create a new GtkSourceCompletionItem with markup label markup, icon -icon and extra information info. Both icon and info can be NULL in +icon and extra information info. Both icon and info can be NULL in which case there will be no icon shown and no extra information available.

@@ -182,12 +182,12 @@

gtk_source_completion_item_new_from_stock ()

GtkSourceCompletionItem * gtk_source_completion_item_new_from_stock
-                                                        (const gchar *label,
-                                                         const gchar *text,
-                                                         const gchar *stock,
-                                                         const gchar *info);
+ (const gchar *label, + const gchar *text, + const gchar *stock, + const gchar *info);

-Creates a new GtkSourceCompletionItem from a stock item. If label is NULL, +Creates a new GtkSourceCompletionItem from a stock item. If label is NULL, the stock label will be used.

@@ -223,7 +223,7 @@

Property Details

The "icon" property

-
  "icon"                     GdkPixbuf*            : Read / Write
+
  "icon"                     GdkPixbuf*            : Read / Write

Icon to be shown for this proposal.

@@ -231,7 +231,7 @@

The "info" property

-
  "info"                     gchar*                : Read / Write
+
  "info"                     gchar*                : Read / Write

Optional extra information to be shown for this proposal.

@@ -240,7 +240,7 @@

The "label" property

-
  "label"                    gchar*                : Read / Write
+
  "label"                    gchar*                : Read / Write

Label to be shown for this proposal.

@@ -249,7 +249,7 @@

The "markup" property

-
  "markup"                   gchar*                : Read / Write
+
  "markup"                   gchar*                : Read / Write

Label with markup to be shown for this proposal.

@@ -258,7 +258,7 @@

The "text" property

-
  "text"                     gchar*                : Read / Write
+
  "text"                     gchar*                : Read / Write

Proposal text.

@@ -268,6 +268,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletionProposal.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletionProposal.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletionProposal.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletionProposal.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -49,20 +49,20 @@ #include <gtksourceview/gtksourcecompletionproposal.h> GtkSourceCompletionProposal; -gchar * gtk_source_completion_proposal_get_label +gchar * gtk_source_completion_proposal_get_label (GtkSourceCompletionProposal *proposal); -gchar * gtk_source_completion_proposal_get_markup +gchar * gtk_source_completion_proposal_get_markup (GtkSourceCompletionProposal *proposal); -gchar * gtk_source_completion_proposal_get_text +gchar * gtk_source_completion_proposal_get_text (GtkSourceCompletionProposal *proposal); -GdkPixbuf * gtk_source_completion_proposal_get_icon +GdkPixbuf * gtk_source_completion_proposal_get_icon (GtkSourceCompletionProposal *proposal); -gchar * gtk_source_completion_proposal_get_info +gchar * gtk_source_completion_proposal_get_info (GtkSourceCompletionProposal *proposal); void gtk_source_completion_proposal_changed (GtkSourceCompletionProposal *proposal); -guint gtk_source_completion_proposal_hash (GtkSourceCompletionProposal *proposal); -gboolean gtk_source_completion_proposal_equal +guint gtk_source_completion_proposal_hash (GtkSourceCompletionProposal *proposal); +gboolean gtk_source_completion_proposal_equal (GtkSourceCompletionProposal *proposal, GtkSourceCompletionProposal *other); @@ -78,7 +78,7 @@

Prerequisites

GtkSourceCompletionProposal requires - GObject.

+ GObject.

Known Implementations

@@ -89,7 +89,7 @@

Signals

-  "changed"                                        : Action
+  "changed"                                        : Action
@@ -109,13 +109,13 @@

gtk_source_completion_proposal_get_label ()

-
gchar *             gtk_source_completion_proposal_get_label
+
gchar *             gtk_source_completion_proposal_get_label
                                                         (GtkSourceCompletionProposal *proposal);

 

 Gets the label of proposal. The label is shown in the list of proposals as
 plain text. If you need any markup (such as bold or italic text), you have
 to implement gtk_source_completion_proposal_get_markup. The returned string
-must be freed with g_free().
+must be freed with g_free().
@@ -134,13 +134,13 @@

gtk_source_completion_proposal_get_markup ()

-
gchar *             gtk_source_completion_proposal_get_markup
+
gchar *             gtk_source_completion_proposal_get_markup
                                                         (GtkSourceCompletionProposal *proposal);

 

 Gets the label of proposal with markup. The label is shown in the list of 
 proposals and may contain markup. This will be used instead of
 gtk_source_completion_proposal_get_label if implemented. The returned string
-must be freed with g_free().
+must be freed with g_free().
@@ -159,13 +159,13 @@

gtk_source_completion_proposal_get_text ()

-
gchar *             gtk_source_completion_proposal_get_text
+
gchar *             gtk_source_completion_proposal_get_text
                                                         (GtkSourceCompletionProposal *proposal);

 

 Gets the text of proposal. The text that is inserted into
 the text buffer when the proposal is activated by the default activation.
 You are free to implement a custom activation handler in the provider and
-not implement this function. The returned string must be freed with g_free().
+not implement this function. The returned string must be freed with g_free().
@@ -184,7 +184,7 @@

gtk_source_completion_proposal_get_icon ()

-
GdkPixbuf *         gtk_source_completion_proposal_get_icon
+
GdkPixbuf *         gtk_source_completion_proposal_get_icon
                                                         (GtkSourceCompletionProposal *proposal);

 

 Gets the icon of proposal.
@@ -207,12 +207,12 @@
 

 

 
gtk_source_completion_proposal_get_info ()

-
gchar *             gtk_source_completion_proposal_get_info
+
gchar *             gtk_source_completion_proposal_get_info
                                                         (GtkSourceCompletionProposal *proposal);

 

 Gets extra information associated to the proposal. This information will be
 used to present the user with extra, detailed information about the
-selected proposal. The returned string must be freed with g_free().
+selected proposal. The returned string must be freed with g_free().
@@ -223,7 +223,7 @@ - @@ -250,11 +250,11 @@

gtk_source_completion_proposal_hash ()

-
guint               gtk_source_completion_proposal_hash (GtkSourceCompletionProposal *proposal);
+
guint               gtk_source_completion_proposal_hash (GtkSourceCompletionProposal *proposal);

Get the hash value of proposal. This is used to (together with gtk_source_completion_proposal_equal) to match proposals in the completion -model. By default, it uses a direct hash (g_direct_hash). +model. By default, it uses a direct hash (g_direct_hash).

Returns :

a new string containing extra information of proposal or NULL if +a new string containing extra information of proposal or NULL if no extra information is associated to proposal.
@@ -273,13 +273,13 @@

gtk_source_completion_proposal_equal ()

-
gboolean            gtk_source_completion_proposal_equal
+
gboolean            gtk_source_completion_proposal_equal
                                                         (GtkSourceCompletionProposal *proposal,
                                                          GtkSourceCompletionProposal *other);

 

 Get whether two proposal objects are the same.  This is used to (together 
 with gtk_source_completion_proposal_hash) to match proposals in the 
-completion model. By default, it uses direct equality (g_direct_equal).
+completion model. By default, it uses direct equality (g_direct_equal).
@@ -295,7 +295,7 @@ +TRUE if proposal and object are the same proposal

Returns :

 -TRUE if proposal and object are the same proposal
@@ -306,7 +306,7 @@

The "changed" signal

void                user_function                      (GtkSourceCompletionProposal *proposal,
-                                                        gpointer                     user_data)      : Action
+ gpointer user_data) : Action

Emitted when the proposal has changed. The completion popup will react to this by updating the shown information. @@ -330,6 +330,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletionProvider.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletionProvider.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceCompletionProvider.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceCompletionProvider.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -45,37 +45,37 @@ #include <gtksourceview/gtksourcecompletionprovider.h> GtkSourceCompletionProvider; -gchar * gtk_source_completion_provider_get_name +gchar * gtk_source_completion_provider_get_name (GtkSourceCompletionProvider *provider); -GdkPixbuf * gtk_source_completion_provider_get_icon +GdkPixbuf * gtk_source_completion_provider_get_icon (GtkSourceCompletionProvider *provider); void gtk_source_completion_provider_populate (GtkSourceCompletionProvider *provider, GtkSourceCompletionContext *context); GtkSourceCompletionActivation gtk_source_completion_provider_get_activation (GtkSourceCompletionProvider *provider); -gboolean gtk_source_completion_provider_match +gboolean gtk_source_completion_provider_match (GtkSourceCompletionProvider *provider, GtkSourceCompletionContext *context); -GtkWidget * gtk_source_completion_provider_get_info_widget +GtkWidget * gtk_source_completion_provider_get_info_widget (GtkSourceCompletionProvider *provider, GtkSourceCompletionProposal *proposal); void gtk_source_completion_provider_update_info (GtkSourceCompletionProvider *provider, GtkSourceCompletionProposal *proposal, GtkSourceCompletionInfo *info); -gboolean gtk_source_completion_provider_get_start_iter +gboolean gtk_source_completion_provider_get_start_iter (GtkSourceCompletionProvider *provider, GtkSourceCompletionContext *context, GtkSourceCompletionProposal *proposal, - GtkTextIter *iter); -gboolean gtk_source_completion_provider_activate_proposal + GtkTextIter *iter); +gboolean gtk_source_completion_provider_activate_proposal (GtkSourceCompletionProvider *provider, GtkSourceCompletionProposal *proposal, - GtkTextIter *iter); -gint gtk_source_completion_provider_get_interactive_delay + GtkTextIter *iter); +gint gtk_source_completion_provider_get_interactive_delay (GtkSourceCompletionProvider *provider); -gint gtk_source_completion_provider_get_priority +gint gtk_source_completion_provider_get_priority (GtkSourceCompletionProvider *provider);
@@ -90,7 +90,7 @@

Prerequisites

GtkSourceCompletionProvider requires - GObject.

+ GObject.

Description

@@ -107,12 +107,12 @@

gtk_source_completion_provider_get_name ()

-
gchar *             gtk_source_completion_provider_get_name
+
gchar *             gtk_source_completion_provider_get_name
                                                         (GtkSourceCompletionProvider *provider);

 

 Get the name of the provider. This should be a translatable name for
 display to the user. For example: _("Document word completion provider"). The
-returned string must be freed with g_free().
+returned string must be freed with g_free().
 

 
@@ -131,7 +131,7 @@
 

 
gtk_source_completion_provider_get_icon ()

-
GdkPixbuf *         gtk_source_completion_provider_get_icon
+
GdkPixbuf *         gtk_source_completion_provider_get_icon
                                                         (GtkSourceCompletionProvider *provider);

 

 Get the icon of the provider.
@@ -147,7 +147,7 @@
 

@@ -201,7 +201,7 @@
 

 
gtk_source_completion_provider_match ()

-
gboolean            gtk_source_completion_provider_match
+
gboolean            gtk_source_completion_provider_match
                                                         (GtkSourceCompletionProvider *provider,
                                                          GtkSourceCompletionContext *context);

 

@@ -222,7 +222,7 @@
 

+TRUE if provider matches the completion context, FALSE otherwise.

 

 

 
Returns :

 The icon to be used for the provider,
-or NULL if the provider does not have a special icon. [transfer none]
+or NULL if the provider does not have a special icon. [transfer none]
 
 

 
 

 
Returns :

 
-TRUE if provider matches the completion context, FALSE otherwise.
 

 
 

@@ -230,7 +230,7 @@
 

 

 
gtk_source_completion_provider_get_info_widget ()

-
GtkWidget *         gtk_source_completion_provider_get_info_widget
+
GtkWidget *         gtk_source_completion_provider_get_info_widget
                                                         (GtkSourceCompletionProvider *provider,
                                                          GtkSourceCompletionProposal *proposal);

 

@@ -256,7 +256,7 @@
 
 
 
Returns :

-a custom GtkWidget to show extra
+a custom GtkWidget to show extra
 information about proposal. [transfer none]
 
 
@@ -297,13 +297,13 @@
 

 

 
gtk_source_completion_provider_get_start_iter ()

-
gboolean            gtk_source_completion_provider_get_start_iter
+
gboolean            gtk_source_completion_provider_get_start_iter
                                                         (GtkSourceCompletionProvider *provider,
                                                          GtkSourceCompletionContext *context,
                                                          GtkSourceCompletionProposal *proposal,
-                                                         GtkTextIter *iter);

+                                                         GtkTextIter *iter);

 

-Get the GtkTextIter at which the completion for proposal starts. When
+Get the GtkTextIter at which the completion for proposal starts. When
 implemented, the completion can use this information to position the
 completion window accordingly when a proposal is selected in the completion
 window.
@@ -325,12 +325,12 @@
 
 
 
iter :

-a GtkTextIter.
+a GtkTextIter.
 
 
 
Returns :

 
-TRUE if iter was set for proposal, FALSE otherwise.
+TRUE if iter was set for proposal, FALSE otherwise.
 
 
 

@@ -338,12 +338,12 @@
 

 

 
gtk_source_completion_provider_activate_proposal ()

-
gboolean            gtk_source_completion_provider_activate_proposal
+
gboolean            gtk_source_completion_provider_activate_proposal
                                                         (GtkSourceCompletionProvider *provider,
                                                          GtkSourceCompletionProposal *proposal,
-                                                         GtkTextIter *iter);

+                                                         GtkTextIter *iter);

 

-Activate proposal at iter. When this functions returns FALSE, the default
+Activate proposal at iter. When this functions returns FALSE, the default
 activation of proposal will take place which replaces the word at iter
 with the label of proposal.
 

@@ -360,13 +360,13 @@
 
 
 
iter :

-a GtkTextIter.
+a GtkTextIter.
 
 
 
Returns :

 
-TRUE to indicate that the proposal activation has been handled,
-FALSE otherwise.
+TRUE to indicate that the proposal activation has been handled,
+FALSE otherwise.
 
 
 

@@ -374,7 +374,7 @@
 

 

 
gtk_source_completion_provider_get_interactive_delay ()

-
gint                gtk_source_completion_provider_get_interactive_delay
+
gint                gtk_source_completion_provider_get_interactive_delay
                                                         (GtkSourceCompletionProvider *provider);

 

 Get the delay in milliseconds before starting interactive completion for
@@ -398,7 +398,7 @@
 

 

 
gtk_source_completion_provider_get_priority ()

-
gint                gtk_source_completion_provider_get_priority
+
gint                gtk_source_completion_provider_get_priority
                                                         (GtkSourceCompletionProvider *provider);

 

 Get the provider priority. The priority determines the order in which
@@ -423,6 +423,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.18.1

 
 
\ No newline at end of file
diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceGutter.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceGutter.html
--- gtksourceview3-3.3.5/docs/reference/html/GtkSourceGutter.html	2012-03-19 22:51:41.000000000 +0000
+++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceGutter.html	2012-03-26 17:33:44.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -45,13 +45,13 @@
 #include <gtksourceview/gtksourcegutter.h>
 
 struct              GtkSourceGutter;
-GdkWindow *         gtk_source_gutter_get_window        (GtkSourceGutter *gutter);
-gboolean            gtk_source_gutter_insert            (GtkSourceGutter *gutter,
+GdkWindow *         gtk_source_gutter_get_window        (GtkSourceGutter *gutter);
+gboolean            gtk_source_gutter_insert            (GtkSourceGutter *gutter,
                                                          GtkSourceGutterRenderer *renderer,
-                                                         gint position);
+                                                         gint position);
 void                gtk_source_gutter_reorder           (GtkSourceGutter *gutter,
                                                          GtkSourceGutterRenderer *renderer,
-                                                         gint position);
+                                                         gint position);
 void                gtk_source_gutter_remove            (GtkSourceGutter *gutter,
                                                          GtkSourceGutterRenderer *renderer);
 void                gtk_source_gutter_queue_draw        (GtkSourceGutter *gutter);
@@ -60,7 +60,7 @@
 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----GtkSourceGutter
 

 

@@ -68,9 +68,9 @@
 
Properties

 
   "view"                     GtkSourceView*        : Read / Write / Construct Only
-  "window-type"              GtkTextWindowType     : Read / Write / Construct Only
-  "xpad"                     gint                  : Read / Write / Construct
-  "ypad"                     gint                  : Read / Write / Construct
+  "window-type"              GtkTextWindowType     : Read / Write / Construct Only
+  "xpad"                     gint                  : Read / Write / Construct
+  "ypad"                     gint                  : Read / Write / Construct
 

 

 

@@ -83,9 +83,9 @@
 drawings.
 

 

-The gutter works very much the same way as cells rendered in a GtkTreeView.
+The gutter works very much the same way as cells rendered in a GtkTreeView.
 The concept is similar, with the exception that the gutter does not have an
-underlying GtkTreeModel. The builtin line number renderer is at position
+underlying GtkTreeModel. The builtin line number renderer is at position
 GTK_SOURCE_VIEW_GUTTER_POSITION_LINES (-30) and the marks renderer is at
 GTK_SOURCE_VIEW_GUTTER_POSITION_MARKS (-20). You can use these values to
 position custom renderers accordingly.
@@ -100,9 +100,9 @@
 

 

 
gtk_source_gutter_get_window ()

-
GdkWindow *         gtk_source_gutter_get_window        (GtkSourceGutter *gutter);

+
GdkWindow *         gtk_source_gutter_get_window        (GtkSourceGutter *gutter);

 

-Get the GdkWindow of the gutter. The window will only be available when the
+Get the GdkWindow of the gutter. The window will only be available when the
 gutter has at least one, non-zero width, cell renderer packed.
 

 

@@ -114,7 +114,7 @@
 
-
@@ -125,9 +125,9 @@
 

 
gtk_source_gutter_insert ()

-
gboolean            gtk_source_gutter_insert            (GtkSourceGutter *gutter,
+
gboolean            gtk_source_gutter_insert            (GtkSourceGutter *gutter,
                                                          GtkSourceGutterRenderer *renderer,
-                                                         gint position);

+                                                         gint position);

 

 Insert renderer into the gutter. If renderer is yet unowned then gutter
 claims its ownership. Otherwise just increases renderer's reference count.
@@ -151,7 +151,7 @@
 

+TRUE if operation succeeded. Otherwise FALSE.

 

 
Returns :
the GdkWindow of the gutter, or NULL
+the GdkWindow of the gutter, or NULL
 if the gutter has no window. [transfer none]
 
 

 

 
Returns :

 
-TRUE if operation succeeded. Otherwise FALSE.
 

 
 

@@ -162,7 +162,7 @@
 
gtk_source_gutter_reorder ()

 
void                gtk_source_gutter_reorder           (GtkSourceGutter *gutter,
                                                          GtkSourceGutterRenderer *renderer,
-                                                         gint position);

+                                                         gint position);

Reorders renderer in gutter to new position.

@@ -175,7 +175,7 @@

renderer :

-a GtkCellRenderer. +a GtkCellRenderer.

position :

@@ -238,7 +238,7 @@

The "window-type" property

-
  "window-type"              GtkTextWindowType     : Read / Write / Construct Only
+
  "window-type"              GtkTextWindowType     : Read / Write / Construct Only

The text window type on which the window is placed

@@ -247,7 +247,7 @@

The "xpad" property

-
  "xpad"                     gint                  : Read / Write / Construct
+
  "xpad"                     gint                  : Read / Write / Construct

The x-padding.

Allowed values: >= G_MAXULONG

Default value: 0

@@ -255,7 +255,7 @@

The "ypad" property

-
  "ypad"                     gint                  : Read / Write / Construct
+
  "ypad"                     gint                  : Read / Write / Construct

The y-padding.

Allowed values: >= G_MAXULONG

Default value: 0

@@ -268,6 +268,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceLanguage.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceLanguage.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceLanguage.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceLanguage.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -45,36 +45,36 @@ #include <gtksourceview/gtksourcelanguage.h> struct GtkSourceLanguage; -const gchar * gtk_source_language_get_id (GtkSourceLanguage *language); -const gchar * gtk_source_language_get_name (GtkSourceLanguage *language); -const gchar * gtk_source_language_get_section (GtkSourceLanguage *language); -gboolean gtk_source_language_get_hidden (GtkSourceLanguage *language); -const gchar * gtk_source_language_get_metadata (GtkSourceLanguage *language, - const gchar *name); -gchar ** gtk_source_language_get_mime_types (GtkSourceLanguage *language); -gchar ** gtk_source_language_get_globs (GtkSourceLanguage *language); -const gchar * gtk_source_language_get_style_name (GtkSourceLanguage *language, - const gchar *style_id); -gchar ** gtk_source_language_get_style_ids (GtkSourceLanguage *language); -const gchar * gtk_source_language_get_style_fallback +const gchar * gtk_source_language_get_id (GtkSourceLanguage *language); +const gchar * gtk_source_language_get_name (GtkSourceLanguage *language); +const gchar * gtk_source_language_get_section (GtkSourceLanguage *language); +gboolean gtk_source_language_get_hidden (GtkSourceLanguage *language); +const gchar * gtk_source_language_get_metadata (GtkSourceLanguage *language, + const gchar *name); +gchar ** gtk_source_language_get_mime_types (GtkSourceLanguage *language); +gchar ** gtk_source_language_get_globs (GtkSourceLanguage *language); +const gchar * gtk_source_language_get_style_name (GtkSourceLanguage *language, + const gchar *style_id); +gchar ** gtk_source_language_get_style_ids (GtkSourceLanguage *language); +const gchar * gtk_source_language_get_style_fallback (GtkSourceLanguage *language, - const gchar *style_id); + const gchar *style_id);

Object Hierarchy

-  GObject
+  GObject
    +----GtkSourceLanguage

Properties

-  "hidden"                   gboolean              : Read
-  "id"                       gchar*                : Read
-  "name"                     gchar*                : Read
-  "section"                  gchar*                : Read
+  "hidden"                   gboolean              : Read
+  "id"                       gchar*                : Read
+  "name"                     gchar*                : Read
+  "section"                  gchar*                : Read
@@ -95,7 +95,7 @@

gtk_source_language_get_id ()

-
const gchar *       gtk_source_language_get_id          (GtkSourceLanguage *language);
+
const gchar *       gtk_source_language_get_id          (GtkSourceLanguage *language);

Returns the ID of the language. The ID is not locale-dependent. The returned string is owned by language and should not be freed @@ -118,7 +118,7 @@

gtk_source_language_get_name ()

-
const gchar *       gtk_source_language_get_name        (GtkSourceLanguage *language);
+
const gchar *       gtk_source_language_get_name        (GtkSourceLanguage *language);

Returns the localized name of the language. The returned string is owned by language and should not be freed @@ -141,7 +141,7 @@

gtk_source_language_get_section ()

-
const gchar *       gtk_source_language_get_section     (GtkSourceLanguage *language);
+
const gchar *       gtk_source_language_get_section     (GtkSourceLanguage *language);

Returns the localized section of the language. Each language belong to a section (ex. HTML belogs to the @@ -166,7 +166,7 @@

gtk_source_language_get_hidden ()

-
gboolean            gtk_source_language_get_hidden      (GtkSourceLanguage *language);
+
gboolean            gtk_source_language_get_hidden      (GtkSourceLanguage *language);

Returns whether the language should be hidden from the user.

@@ -181,7 +181,7 @@

Returns :

-TRUE if the language should be hidden, FALSE otherwise. +TRUE if the language should be hidden, FALSE otherwise.
@@ -189,8 +189,8 @@

gtk_source_language_get_metadata ()

-
const gchar *       gtk_source_language_get_metadata    (GtkSourceLanguage *language,
-                                                         const gchar *name);
+
const gchar *       gtk_source_language_get_metadata    (GtkSourceLanguage *language,
+                                                         const gchar *name);
@@ -205,7 +205,7 @@ @@ -215,7 +215,7 @@

gtk_source_language_get_mime_types ()

-
gchar **            gtk_source_language_get_mime_types  (GtkSourceLanguage *language);
+
gchar **            gtk_source_language_get_mime_types  (GtkSourceLanguage *language);

Returns the mime types associated to this language. This is just an utility wrapper around gtk_source_language_get_metadata() to @@ -232,9 +232,9 @@

@@ -243,7 +243,7 @@

gtk_source_language_get_globs ()

-
gchar **            gtk_source_language_get_globs       (GtkSourceLanguage *language);
+
gchar **            gtk_source_language_get_globs       (GtkSourceLanguage *language);

Returns the globs associated to this language. This is just an utility wrapper around gtk_source_language_get_metadata() to @@ -259,8 +259,8 @@

@@ -269,8 +269,8 @@

gtk_source_language_get_style_name ()

-
const gchar *       gtk_source_language_get_style_name  (GtkSourceLanguage *language,
-                                                         const gchar *style_id);
+
const gchar *       gtk_source_language_get_style_name  (GtkSourceLanguage *language,
+                                                         const gchar *style_id);

Returns the name of the style with ID style_id defined by this language.

@@ -288,7 +288,7 @@
@@ -298,7 +298,7 @@

gtk_source_language_get_style_ids ()

-
gchar **            gtk_source_language_get_style_ids   (GtkSourceLanguage *language);
+
gchar **            gtk_source_language_get_style_ids   (GtkSourceLanguage *language);

Returns the ids of the styles defined by this language.

@@ -311,10 +311,10 @@
- @@ -323,9 +323,9 @@

gtk_source_language_get_style_fallback ()

-
const gchar *       gtk_source_language_get_style_fallback
+
const gchar *       gtk_source_language_get_style_fallback
                                                         (GtkSourceLanguage *language,
-                                                         const gchar *style_id);

+                                                         const gchar *style_id);

Returns the ID of the style to use if the specified style_id is not present in the current style scheme. @@ -344,7 +344,7 @@

@@ -357,28 +357,28 @@

Property Details

The "hidden" property

-
  "hidden"                   gboolean              : Read
+
  "hidden"                   gboolean              : Read

Whether the language should be hidden from the user.

Default value: FALSE

The "id" property

-
  "id"                       gchar*                : Read
+
  "id"                       gchar*                : Read

Language id.

Default value: NULL

The "name" property

-
  "name"                     gchar*                : Read
+
  "name"                     gchar*                : Read

Language name.

Default value: NULL

The "section" property

-
  "section"                  gchar*                : Read
+
  "section"                  gchar*                : Read

Language section.

Default value: NULL

@@ -390,6 +390,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceLanguageManager.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceLanguageManager.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceLanguageManager.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceLanguageManager.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,32 +51,32 @@ (void); voidgtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, - gchar **dirs); -const gchar * const * gtk_source_language_manager_get_search_path + gchar **dirs); +const gchar * const * gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm); -const gchar * const * gtk_source_language_manager_get_language_ids +const gchar * const * gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm); GtkSourceLanguage * gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm, - const gchar *id); + const gchar *id); GtkSourceLanguage * gtk_source_language_manager_guess_language (GtkSourceLanguageManager *lm, - const gchar *filename, - const gchar *content_type); + const gchar *filename, + const gchar *content_type);

Object Hierarchy

-  GObject
+  GObject
    +----GtkSourceLanguageManager

Properties

-  "language-ids"             GStrv                 : Read
-  "search-path"              GStrv                 : Read / Write
+  "language-ids"             GStrv                 : Read
+  "search-path"              GStrv                 : Read / Write
@@ -138,11 +138,11 @@

gtk_source_language_manager_set_search_path ()

void                gtk_source_language_manager_set_search_path
                                                         (GtkSourceLanguageManager *lm,
-                                                         gchar **dirs);
+ gchar **dirs);

Sets the list of directories where the lm looks for language files. -If dirs is NULL, the search path is reset to default. +If dirs is NULL, the search path is reset to default.

@@ -166,7 +166,7 @@
- @@ -175,7 +175,7 @@

gtk_source_language_manager_get_search_path ()

-
const gchar * const * gtk_source_language_manager_get_search_path
+
const gchar * const * gtk_source_language_manager_get_search_path
                                                         (GtkSourceLanguageManager *lm);

 

 Gets the list directories where lm looks for language files.
@@ -190,7 +190,7 @@
@@ -201,7 +201,7 @@

gtk_source_language_manager_get_language_ids ()

-
const gchar * const * gtk_source_language_manager_get_language_ids
+
const gchar * const * gtk_source_language_manager_get_language_ids
                                                         (GtkSourceLanguageManager *lm);

 

 Returns the ids of the available languages.
@@ -215,8 +215,8 @@
- - @@ -262,12 +262,12 @@

gtk_source_language_manager_guess_language ()

GtkSourceLanguage * gtk_source_language_manager_guess_language
                                                         (GtkSourceLanguageManager *lm,
-                                                         const gchar *filename,
-                                                         const gchar *content_type);
+ const gchar *filename, + const gchar *content_type);

Picks a GtkSourceLanguage for given file name and content type, according to the information in lang files. Either filename or -content_type may be NULL. This function can be used as follows: +content_type may be NULL. This function can be used as follows:

@@ -279,7 +279,7 @@ 2 3 @@ -312,21 +312,21 @@ 13 14 15 - +g_free (content_type);

Returns :

 value of property name stored in the metadata of language -or NULL if language doesn't contain that metadata property. +or NULL if language doesn't contain that metadata property. The returned string is owned by language and should not be freed or modified.

Returns :

 a newly-allocated -NULL terminated array containing the mime types or NULL if no +NULL terminated array containing the mime types or NULL if no mime types are found. -The returned array must be freed with g_strfreev(). [array zero-terminated=1][transfer full] +The returned array must be freed with g_strfreev(). [array zero-terminated=1][transfer full]

Returns :

 a newly-allocated -NULL terminated array containing the globs or NULL if no globs are found. -The returned array must be freed with g_strfreev(). [array zero-terminated=1][transfer full] +NULL terminated array containing the globs or NULL if no globs are found. +The returned array must be freed with g_strfreev(). [array zero-terminated=1][transfer full]

Returns :

 the name of the style with ID style_id defined by this language or -NULL if the style has no name or there is no style with ID style_id defined +NULL if the style has no name or there is no style with ID style_id defined by this language. The returned string is owned by the language and must not be modified.

Returns :

a NULL terminated +a NULL terminated array containing ids of the styles defined by this language or -NULL if no style is defined. -The returned array must be freed with g_strfreev(). [array zero-terminated=1][transfer full] +NULL if no style is defined. +The returned array must be freed with g_strfreev(). [array zero-terminated=1][transfer full]

Returns :

 the ID of the style to use if the specified style_id -is not present in the current style scheme or NULL if the style has +is not present in the current style scheme or NULL if the style has no fallback defined. The returned string is owned by the language and must not be modified.

dirs :

a NULL-terminated array of strings or NULL. [allow-none][array zero-terminated=1] +a NULL-terminated array of strings or NULL. [allow-none][array zero-terminated=1]

Returns :

 -NULL-terminated array +NULL-terminated array containg a list of language files directories. The array is owned by lm and must not be modified. [array zero-terminated=1][transfer none]

Returns :

a NULL-terminated array of string -containing the ids of the available languages or NULL if +a NULL-terminated array of string +containing the ids of the available languages or NULL if no language is available. The array is sorted alphabetically according to the language name. @@ -231,7 +231,7 @@

gtk_source_language_manager_get_language ()

GtkSourceLanguage * gtk_source_language_manager_get_language
                                                         (GtkSourceLanguageManager *lm,
-                                                         const gchar *id);
+ const gchar *id);

Gets the GtkSourceLanguage identified by the given id in the language manager. @@ -249,7 +249,7 @@

Returns :

a GtkSourceLanguage, or NULL if there is no language +a GtkSourceLanguage, or NULL if there is no language identified by the given id. Return value is owned by lm and should not be freed. [transfer none] 
GtkSourceLanguage *lang;
-lang = gtk_source_language_manager_guess_language (filename, NULL);
+lang = gtk_source_language_manager_guess_language (filename, NULL);
 gtk_source_buffer_set_language (buffer, lang);
 
GtkSourceLanguage *lang = NULL;
+        
GtkSourceLanguage *lang = NULL;
 gboolean result_uncertain;
 gchar *content_type;
 
-content_type = g_content_type_guess (filename, NULL, 0, &result_uncertain);
+content_type = g_content_type_guess (filename, NULL, 0, &result_uncertain);
 if (result_uncertain)
   {
-    g_free (content_type);
-    content_type = NULL;
+    g_free (content_type);
+    content_type = NULL;
   }
 
 lang = gtk_source_language_manager_guess_language (manager, filename, content_type);
 gtk_source_buffer_set_language (buffer, lang);
 
-g_free (content_type);
@@ -347,17 +347,17 @@

filename :

-a filename in Glib filename encoding, or NULL. [allow-none] +a filename in Glib filename encoding, or NULL. [allow-none]

content_type :

-a content type (as in GIO API), or NULL. [allow-none] +a content type (as in GIO API), or NULL. [allow-none]

Returns :

-a GtkSourceLanguage, or NULL if there is no suitable language +a GtkSourceLanguage, or NULL if there is no suitable language for given filename and/or content_type. Return value is owned by lm and should not be freed. [transfer none] @@ -371,13 +371,13 @@

Property Details

The "language-ids" property

-
  "language-ids"             GStrv                 : Read
+
  "language-ids"             GStrv                 : Read

List of the ids of the available languages.

The "search-path" property

-
  "search-path"              GStrv                 : Read / Write
+
  "search-path"              GStrv                 : Read / Write

List of directories where the language specification files (.lang) are located.

@@ -388,6 +388,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceMarkAttributes.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceMarkAttributes.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceMarkAttributes.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceMarkAttributes.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,38 +51,38 @@ (void); void gtk_source_mark_attributes_set_background (GtkSourceMarkAttributes *attributes, - const GdkRGBA *background); -gboolean gtk_source_mark_attributes_get_background + const GdkRGBA *background); +gboolean gtk_source_mark_attributes_get_background (GtkSourceMarkAttributes *attributes, - GdkRGBA *background); + GdkRGBA *background); void gtk_source_mark_attributes_set_stock_id (GtkSourceMarkAttributes *attributes, - const gchar *stock_id); -const gchar * gtk_source_mark_attributes_get_stock_id + const gchar *stock_id); +const gchar * gtk_source_mark_attributes_get_stock_id (GtkSourceMarkAttributes *attributes); void gtk_source_mark_attributes_set_icon_name (GtkSourceMarkAttributes *attributes, - const gchar *icon_name); -const gchar * gtk_source_mark_attributes_get_icon_name + const gchar *icon_name); +const gchar * gtk_source_mark_attributes_get_icon_name (GtkSourceMarkAttributes *attributes); void gtk_source_mark_attributes_set_gicon (GtkSourceMarkAttributes *attributes, - GIcon *gicon); -GIcon * gtk_source_mark_attributes_get_gicon + GIcon *gicon); +GIcon * gtk_source_mark_attributes_get_gicon (GtkSourceMarkAttributes *attributes); void gtk_source_mark_attributes_set_pixbuf (GtkSourceMarkAttributes *attributes, - const GdkPixbuf *pixbuf); -const GdkPixbuf * gtk_source_mark_attributes_get_pixbuf + const GdkPixbuf *pixbuf); +const GdkPixbuf * gtk_source_mark_attributes_get_pixbuf (GtkSourceMarkAttributes *attributes); -const GdkPixbuf * gtk_source_mark_attributes_render_icon +const GdkPixbuf * gtk_source_mark_attributes_render_icon (GtkSourceMarkAttributes *attributes, - GtkWidget *widget, - gint size); -gchar * gtk_source_mark_attributes_get_tooltip_text + GtkWidget *widget, + gint size); +gchar * gtk_source_mark_attributes_get_tooltip_text (GtkSourceMarkAttributes *attributes, GtkSourceMark *mark); -gchar * gtk_source_mark_attributes_get_tooltip_markup +gchar * gtk_source_mark_attributes_get_tooltip_markup (GtkSourceMarkAttributes *attributes, GtkSourceMark *mark); @@ -90,25 +90,25 @@

Object Hierarchy

-  GObject
+  GObject
    +----GtkSourceMarkAttributes

Properties

-  "background"               GdkRGBA*              : Read / Write
-  "gicon"                    GIcon*                : Read / Write
-  "icon-name"                gchar*                : Read / Write
-  "pixbuf"                   GdkPixbuf*            : Read / Write
-  "stock-id"                 gchar*                : Read / Write
+  "background"               GdkRGBA*              : Read / Write
+  "gicon"                    GIcon*                : Read / Write
+  "icon-name"                gchar*                : Read / Write
+  "pixbuf"                   GdkPixbuf*            : Read / Write
+  "stock-id"                 gchar*                : Read / Write

Signals

-  "query-tooltip-markup"                           : Run Last
-  "query-tooltip-text"                             : Run Last
+  "query-tooltip-markup"                           : Run Last
+  "query-tooltip-text"                             : Run Last
@@ -186,7 +186,7 @@

gtk_source_mark_attributes_set_background ()

void                gtk_source_mark_attributes_set_background
                                                         (GtkSourceMarkAttributes *attributes,
-                                                         const GdkRGBA *background);
+ const GdkRGBA *background);

Sets background color to the one given in background.

@@ -199,7 +199,7 @@

background :

-a GdkRGBA. +a GdkRGBA.
@@ -207,9 +207,9 @@

gtk_source_mark_attributes_get_background ()

-
gboolean            gtk_source_mark_attributes_get_background
+
gboolean            gtk_source_mark_attributes_get_background
                                                         (GtkSourceMarkAttributes *attributes,
-                                                         GdkRGBA *background);

+                                                         GdkRGBA *background);

Stores background color in background.

@@ -222,7 +222,7 @@

background :

-a GdkRGBA. [out caller-allocates] +a GdkRGBA. [out caller-allocates] @@ -237,7 +237,7 @@

gtk_source_mark_attributes_set_stock_id ()

void                gtk_source_mark_attributes_set_stock_id
                                                         (GtkSourceMarkAttributes *attributes,
-                                                         const gchar *stock_id);
+ const gchar *stock_id);

Sets stock id to be used as a base for rendered icon.

@@ -258,11 +258,11 @@

gtk_source_mark_attributes_get_stock_id ()

-
const gchar *       gtk_source_mark_attributes_get_stock_id
+
const gchar *       gtk_source_mark_attributes_get_stock_id
                                                         (GtkSourceMarkAttributes *attributes);

 

 Gets a stock id of an icon used by this attributes. Note that the stock id can
-be NULL if it wasn't set earlier.
+be NULL if it wasn't set earlier.
 

 
@@ -285,7 +285,7 @@
 
gtk_source_mark_attributes_set_icon_name ()
void                gtk_source_mark_attributes_set_icon_name
                                                         (GtkSourceMarkAttributes *attributes,
-                                                         const gchar *icon_name);

+                                                         const gchar *icon_name);

 Sets a name of an icon to be used as a base for rendered icon.
 

@@ -306,11 +306,11 @@
 

 
gtk_source_mark_attributes_get_icon_name ()

-
const gchar *       gtk_source_mark_attributes_get_icon_name
+
const gchar *       gtk_source_mark_attributes_get_icon_name
                                                         (GtkSourceMarkAttributes *attributes);

 

 Gets a name of an icon to be used as a base for rendered icon. Note that the
-icon name can be NULL if it wasn't set earlier.
+icon name can be NULL if it wasn't set earlier.
 

 

 

 
 
 
@@ -333,7 +333,7 @@
 
gtk_source_mark_attributes_set_gicon ()
void                gtk_source_mark_attributes_set_gicon
                                                         (GtkSourceMarkAttributes *attributes,
-                                                         GIcon *gicon);

+                                                         GIcon *gicon);

 Sets an icon to be used as a base for rendered icon.
 

@@ -346,7 +346,7 @@
 
-
+

 

 
 
 

 
gicon :
a GIcon to be used.a GIcon to be used.
 

 
 

@@ -354,11 +354,11 @@
 

 

 
gtk_source_mark_attributes_get_gicon ()

-
GIcon *             gtk_source_mark_attributes_get_gicon
+
GIcon *             gtk_source_mark_attributes_get_gicon
                                                         (GtkSourceMarkAttributes *attributes);

 

-Gets a GIcon to be used as a base for rendered icon. Note that the icon can
-be NULL if it wasn't set earlier.
+Gets a GIcon to be used as a base for rendered icon. Note that the icon can
+be NULL if it wasn't set earlier.
 

 
@@ -381,7 +381,7 @@
 
gtk_source_mark_attributes_set_pixbuf ()
void                gtk_source_mark_attributes_set_pixbuf
                                                         (GtkSourceMarkAttributes *attributes,
-                                                         const GdkPixbuf *pixbuf);

+                                                         const GdkPixbuf *pixbuf);

 Sets a pixbuf to be used as a base for rendered icon.
 

@@ -394,7 +394,7 @@
 
-
+

 

 
 
 

 
pixbuf :
a GdkPixbuf to be used.a GdkPixbuf to be used.
 

 
 

@@ -402,11 +402,11 @@
 

 

 
gtk_source_mark_attributes_get_pixbuf ()

-
const GdkPixbuf *   gtk_source_mark_attributes_get_pixbuf
+
const GdkPixbuf *   gtk_source_mark_attributes_get_pixbuf
                                                         (GtkSourceMarkAttributes *attributes);

 

-Gets a GdkPixbuf to be used as a base for rendered icon. Note that the
-pixbuf can be NULL if it wasn't set earlier.
+Gets a GdkPixbuf to be used as a base for rendered icon. Note that the
+pixbuf can be NULL if it wasn't set earlier.
 

 
@@ -427,10 +427,10 @@
 

 
gtk_source_mark_attributes_render_icon ()

-
const GdkPixbuf *   gtk_source_mark_attributes_render_icon
+
const GdkPixbuf *   gtk_source_mark_attributes_render_icon
                                                         (GtkSourceMarkAttributes *attributes,
-                                                         GtkWidget *widget,
-                                                         gint size);

+                                                         GtkWidget *widget,
+                                                         gint size);

 

 Renders an icon of given size. The base of the icon is set by the last call
 to one of: gtk_source_mark_attributes_set_pixbuf(),
@@ -465,7 +465,7 @@
 

 

 
gtk_source_mark_attributes_get_tooltip_text ()

-
gchar *             gtk_source_mark_attributes_get_tooltip_text
+
gchar *             gtk_source_mark_attributes_get_tooltip_text
                                                         (GtkSourceMarkAttributes *attributes,
                                                          GtkSourceMark *mark);

 

@@ -487,7 +487,7 @@
 

@@ -496,7 +496,7 @@
 

 
gtk_source_mark_attributes_get_tooltip_markup ()

-
gchar *             gtk_source_mark_attributes_get_tooltip_markup
+
gchar *             gtk_source_mark_attributes_get_tooltip_markup
                                                         (GtkSourceMarkAttributes *attributes,
                                                          GtkSourceMark *mark);

 

@@ -518,7 +518,7 @@
 

@@ -529,7 +529,7 @@
 
Property Details

 
The "background" property

-
  "background"               GdkRGBA*              : Read / Write

+
  "background"               GdkRGBA*              : Read / Write

 

 A color used for background of a line.
 

@@ -537,15 +537,15 @@
 

 

 
The "gicon" property

-
  "gicon"                    GIcon*                : Read / Write

+
  "gicon"                    GIcon*                : Read / Write

 

-A GIcon that may be a base of a rendered icon.
+A GIcon that may be a base of a rendered icon.
 

 

 

 

 
The "icon-name" property

-
  "icon-name"                gchar*                : Read / Write

+
  "icon-name"                gchar*                : Read / Write

 

 An icon name that may be a base of a rendered icon.
 

@@ -554,15 +554,15 @@
 

 

 
The "pixbuf" property

-
  "pixbuf"                   GdkPixbuf*            : Read / Write

+
  "pixbuf"                   GdkPixbuf*            : Read / Write

 

-A GdkPixbuf that may be a base of a rendered icon.
+A GdkPixbuf that may be a base of a rendered icon.
 

 

 

 

 
The "stock-id" property

-
  "stock-id"                 gchar*                : Read / Write

+
  "stock-id"                 gchar*                : Read / Write

 

 A stock id that may be a base of a rendered icon.
 

@@ -573,9 +573,9 @@
 
Signal Details

 

 
The "query-tooltip-markup" signal

-
gchar*              user_function                      (GtkSourceMarkAttributes *attributes,
+
gchar*              user_function                      (GtkSourceMarkAttributes *attributes,
                                                         GtkSourceMark           *mark,
-                                                        gpointer                 user_data)       : Run Last

+                                                        gpointer                 user_data)       : Run Last

 

 The code should connect to this signal to provide a tooltip for given
 mark. The tooltip can contain a markup.
@@ -598,7 +598,7 @@
 

@@ -607,9 +607,9 @@
 

 
The "query-tooltip-text" signal

-
gchar*              user_function                      (GtkSourceMarkAttributes *attributes,
+
gchar*              user_function                      (GtkSourceMarkAttributes *attributes,
                                                         GtkSourceMark           *mark,
-                                                        gpointer                 user_data)       : Run Last

+                                                        gpointer                 user_data)       : Run Last

 

 The code should connect to this signal to provide a tooltip for given
 mark. The tooltip should be just a plain text.
@@ -632,7 +632,7 @@
 

@@ -646,6 +646,6 @@
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.18.1
\ No newline at end of file
diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceMark.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceMark.html
--- gtksourceview3-3.3.5/docs/reference/html/GtkSourceMark.html	2012-03-19 22:51:41.000000000 +0000
+++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceMark.html	2012-03-26 17:33:44.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -45,34 +45,34 @@
 #include <gtksourceview/gtksourcemark.h>
 
 struct              GtkSourceMark;
-GtkSourceMark *     gtk_source_mark_new                 (const gchar *name,
-                                                         const gchar *category);
-const gchar *       gtk_source_mark_get_category        (GtkSourceMark *mark);
+GtkSourceMark *     gtk_source_mark_new                 (const gchar *name,
+                                                         const gchar *category);
+const gchar *       gtk_source_mark_get_category        (GtkSourceMark *mark);
 GtkSourceMark *     gtk_source_mark_next                (GtkSourceMark *mark,
-                                                         const gchar *category);
+                                                         const gchar *category);
 GtkSourceMark *     gtk_source_mark_prev                (GtkSourceMark *mark,
-                                                         const gchar *category);
+                                                         const gchar *category);
 

 
Object Hierarchy

 
-  GObject
-   +----GtkTextMark
+  GObject
+   +----GtkTextMark
          +----GtkSourceMark
 

 

 
Properties

 
-  "category"                 gchar*                : Read / Write / Construct Only
+  "category"                 gchar*                : Read / Write / Construct Only
 

 

 
Description

 

 A GtkSourceMark marks a position in the text where you want to display
-additional info. It is based on GtkTextMark and thus is still valid after
+additional info. It is based on GtkTextMark and thus is still valid after
 the text has changed though its position may change.
 

 

@@ -95,12 +95,12 @@
 

 

 
gtk_source_mark_new ()

-
GtkSourceMark *     gtk_source_mark_new                 (const gchar *name,
-                                                         const gchar *category);

+
GtkSourceMark *     gtk_source_mark_new                 (const gchar *name,
+                                                         const gchar *category);

 

-Creates a text mark. Add it to a buffer using gtk_text_buffer_add_mark(). 
+Creates a text mark. Add it to a buffer using gtk_text_buffer_add_mark(). 
 If name is NULL, the mark is anonymous; otherwise, the mark can be retrieved
-by name using gtk_text_buffer_get_mark().
+by name using gtk_text_buffer_get_mark().
 Normally marks are created using the utility function 
 gtk_source_buffer_create_mark().
 

@@ -120,7 +120,7 @@
 
 

-
+

 

 

 
Returns :

 A tooltip. The returned string should be freed by
-using g_free() when done with it. [transfer full]
+using g_free() when done with it. [transfer full]
 
 

 
 

 
Returns :

 A tooltip. The returned string should be freed by
-using g_free() when done with it. [transfer full]
+using g_free() when done with it. [transfer full]
 
 

 
 

 
Returns :

 A tooltip. The string should be freed with
-g_free() when done with it. [transfer full]
+g_free() when done with it. [transfer full]
 
 

 
 

 
Returns :

 A tooltip. The string should be freed with
-g_free() when done with it. [transfer full]
+g_free() when done with it. [transfer full]
 
 

 
 
 
 
 
 
 
 
 
 
 
 
 

 
Returns :
a new GtkSourceMark that can be added using gtk_text_buffer_add_mark().a new GtkSourceMark that can be added using gtk_text_buffer_add_mark().
 

 
 

@@ -129,7 +129,7 @@
 

 

 
gtk_source_mark_get_category ()

-
const gchar *       gtk_source_mark_get_category        (GtkSourceMark *mark);

+
const gchar *       gtk_source_mark_get_category        (GtkSourceMark *mark);

 

 Returns the mark category.
 

@@ -152,13 +152,13 @@
 

 
gtk_source_mark_next ()

 
GtkSourceMark *     gtk_source_mark_next                (GtkSourceMark *mark,
-                                                         const gchar *category);

+                                                         const gchar *category);

 

-Returns the next GtkSourceMark in the buffer or NULL if the mark
-was not added to a buffer. If there is no next mark, NULL will be returned.
+Returns the next GtkSourceMark in the buffer or NULL if the mark
+was not added to a buffer. If there is no next mark, NULL will be returned.
 

 

-If category is NULL, looks for marks of any category.
+If category is NULL, looks for marks of any category.
 

 
@@ -169,12 +169,12 @@
 
-
-
@@ -185,13 +185,13 @@
 

 
gtk_source_mark_prev ()

 
GtkSourceMark *     gtk_source_mark_prev                (GtkSourceMark *mark,
-                                                         const gchar *category);

+                                                         const gchar *category);
 

-Returns the previous GtkSourceMark in the buffer or NULL if the mark
-was not added to a buffer. If there is no previous mark, NULL is returned.
+Returns the previous GtkSourceMark in the buffer or NULL if the mark
+was not added to a buffer. If there is no previous mark, NULL is returned.
 

 

-If category is NULL, looks for marks of any category
+If category is NULL, looks for marks of any category
 

 

 

 

 
category :
a string specifying the mark category, or NULL. [allow-none]
+a string specifying the mark category, or NULL. [allow-none]
 
 

 

 
Returns :
the next GtkSourceMark, or NULL. [transfer none]
+the next GtkSourceMark, or NULL. [transfer none]
 
 

 
@@ -202,11 +202,11 @@
 
-
+
-
@@ -218,7 +218,7 @@
 
Property Details

 
The "category" property

-
  "category"                 gchar*                : Read / Write / Construct Only

+
  "category"                 gchar*                : Read / Write / Construct Only

 

 The category of the GtkSourceMark, classifies the mark and controls
 which pixbuf is used and with which priority it is drawn.
@@ -233,6 +233,6 @@
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.18.1
\ No newline at end of file
diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourcePrintCompositor.html gtksourceview3-3.4.0/docs/reference/html/GtkSourcePrintCompositor.html
--- gtksourceview3-3.3.5/docs/reference/html/GtkSourcePrintCompositor.html	2012-03-19 22:51:41.000000000 +0000
+++ gtksourceview3-3.4.0/docs/reference/html/GtkSourcePrintCompositor.html	2012-03-26 17:33:44.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -53,129 +53,129 @@
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_tab_width
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         guint width);
-guintgtk_source_print_compositor_get_tab_width
+                                                         guint width);
+guintgtk_source_print_compositor_get_tab_width
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_wrap_mode
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkWrapMode wrap_mode);
-GtkWrapModegtk_source_print_compositor_get_wrap_mode
+                                                         GtkWrapMode wrap_mode);
+GtkWrapModegtk_source_print_compositor_get_wrap_mode
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_highlight_syntax
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean highlight);
-gbooleangtk_source_print_compositor_get_highlight_syntax
+                                                         gboolean highlight);
+gbooleangtk_source_print_compositor_get_highlight_syntax
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_print_line_numbers
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         guint interval);
-guintgtk_source_print_compositor_get_print_line_numbers
+                                                         guint interval);
+guintgtk_source_print_compositor_get_print_line_numbers
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_body_font_name
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         const gchar *font_name);
-gchar *             gtk_source_print_compositor_get_body_font_name
+                                                         const gchar *font_name);
+gchar *             gtk_source_print_compositor_get_body_font_name
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_line_numbers_font_name
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         const gchar *font_name);
-gchar *             gtk_source_print_compositor_get_line_numbers_font_name
+                                                         const gchar *font_name);
+gchar *             gtk_source_print_compositor_get_line_numbers_font_name
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_header_font_name
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         const gchar *font_name);
-gchar *             gtk_source_print_compositor_get_header_font_name
+                                                         const gchar *font_name);
+gchar *             gtk_source_print_compositor_get_header_font_name
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_footer_font_name
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         const gchar *font_name);
-gchar *             gtk_source_print_compositor_get_footer_font_name
+                                                         const gchar *font_name);
+gchar *             gtk_source_print_compositor_get_footer_font_name
                                                         (GtkSourcePrintCompositor *compositor);
-gdoublegtk_source_print_compositor_get_top_margin
+gdoublegtk_source_print_compositor_get_top_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkUnit unit);
+                                                         GtkUnit unit);
 voidgtk_source_print_compositor_set_top_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gdouble margin,
-                                                         GtkUnit unit);
-gdoublegtk_source_print_compositor_get_bottom_margin
+                                                         gdouble margin,
+                                                         GtkUnit unit);
+gdoublegtk_source_print_compositor_get_bottom_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkUnit unit);
+                                                         GtkUnit unit);
 voidgtk_source_print_compositor_set_bottom_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gdouble margin,
-                                                         GtkUnit unit);
-gdoublegtk_source_print_compositor_get_left_margin
+                                                         gdouble margin,
+                                                         GtkUnit unit);
+gdoublegtk_source_print_compositor_get_left_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkUnit unit);
+                                                         GtkUnit unit);
 voidgtk_source_print_compositor_set_left_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gdouble margin,
-                                                         GtkUnit unit);
-gdoublegtk_source_print_compositor_get_right_margin
+                                                         gdouble margin,
+                                                         GtkUnit unit);
+gdoublegtk_source_print_compositor_get_right_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkUnit unit);
+                                                         GtkUnit unit);
 voidgtk_source_print_compositor_set_right_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gdouble margin,
-                                                         GtkUnit unit);
+                                                         gdouble margin,
+                                                         GtkUnit unit);
 voidgtk_source_print_compositor_set_print_header
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean print);
-gbooleangtk_source_print_compositor_get_print_header
+                                                         gboolean print);
+gbooleangtk_source_print_compositor_get_print_header
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_print_footer
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean print);
-gbooleangtk_source_print_compositor_get_print_footer
+                                                         gboolean print);
+gbooleangtk_source_print_compositor_get_print_footer
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_set_header_format
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean separator,
-                                                         const gchar *left,
-                                                         const gchar *center,
-                                                         const gchar *right);
+                                                         gboolean separator,
+                                                         const gchar *left,
+                                                         const gchar *center,
+                                                         const gchar *right);
 voidgtk_source_print_compositor_set_footer_format
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean separator,
-                                                         const gchar *left,
-                                                         const gchar *center,
-                                                         const gchar *right);
-gintgtk_source_print_compositor_get_n_pages
+                                                         gboolean separator,
+                                                         const gchar *left,
+                                                         const gchar *center,
+                                                         const gchar *right);
+gintgtk_source_print_compositor_get_n_pages
                                                         (GtkSourcePrintCompositor *compositor);
-gbooleangtk_source_print_compositor_paginate
+gbooleangtk_source_print_compositor_paginate
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkPrintContext *context);
-gdoublegtk_source_print_compositor_get_pagination_progress
+                                                         GtkPrintContext *context);
+gdoublegtk_source_print_compositor_get_pagination_progress
                                                         (GtkSourcePrintCompositor *compositor);
 voidgtk_source_print_compositor_draw_page
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkPrintContext *context,
-                                                         gint page_nr);
+                                                         GtkPrintContext *context,
+                                                         gint page_nr);
 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----GtkSourcePrintCompositor
 

 

 
Properties

 
-  "body-font-name"           gchar*                : Read / Write
+  "body-font-name"           gchar*                : Read / Write
   "buffer"                   GtkSourceBuffer*      : Read / Write / Construct Only
-  "footer-font-name"         gchar*                : Read / Write
-  "header-font-name"         gchar*                : Read / Write
-  "highlight-syntax"         gboolean              : Read / Write
-  "line-numbers-font-name"   gchar*                : Read / Write
-  "n-pages"                  gint                  : Read
-  "print-footer"             gboolean              : Read / Write
-  "print-header"             gboolean              : Read / Write
-  "print-line-numbers"       guint                 : Read / Write
-  "tab-width"                guint                 : Read / Write
-  "wrap-mode"                GtkWrapMode           : Read / Write
+  "footer-font-name"         gchar*                : Read / Write
+  "header-font-name"         gchar*                : Read / Write
+  "highlight-syntax"         gboolean              : Read / Write
+  "line-numbers-font-name"   gchar*                : Read / Write
+  "n-pages"                  gint                  : Read
+  "print-footer"             gboolean              : Read / Write
+  "print-header"             gboolean              : Read / Write
+  "print-line-numbers"       guint                 : Read / Write
+  "tab-width"                guint                 : Read / Write
+  "wrap-mode"                GtkWrapMode           : Read / Write
 

 

@@ -184,13 +184,13 @@
 The GtkSourcePrintCompositor object is used to compose a GtkSourceBuffer
 for printing. You can set various configuration options to customize the
 printed output. GtkSourcePrintCompositor is designed to be used with the
-high-level printing API of gtk+, i.e. GtkPrintOperation.
+high-level printing API of gtk+, i.e. GtkPrintOperation.
 

 

 The margins specified in this object are the layout margins: they define the
 blank space bordering the printed area of the pages. They must not be
 confused with the "print margins", i.e. the parts of the page that the
-printer cannot print on, defined in the GtkPageSetup objects. If the
+printer cannot print on, defined in the GtkPageSetup objects. If the
 specified layout margins are smaller than the "print margins", the latter
 ones are used as a fallback by the GtkSourcePrintCompositor object, so that
 the printed area is not clipped.
@@ -285,7 +285,7 @@
 
gtk_source_print_compositor_set_tab_width ()

 
void                gtk_source_print_compositor_set_tab_width
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         guint width);

+                                                         guint width);
 

 Sets the width of tabulation in characters for printed text. 
 

@@ -311,7 +311,7 @@
 

 

 
gtk_source_print_compositor_get_tab_width ()

-
guint               gtk_source_print_compositor_get_tab_width
+
guint               gtk_source_print_compositor_get_tab_width
                                                         (GtkSourcePrintCompositor *compositor);

 

 Returns the width of tabulation in characters for printed text.
@@ -336,7 +336,7 @@
 
gtk_source_print_compositor_set_wrap_mode ()

 
void                gtk_source_print_compositor_set_wrap_mode
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkWrapMode wrap_mode);

+                                                         GtkWrapMode wrap_mode);

 

 Sets the line wrapping mode for the printed text.
 

@@ -353,7 +353,7 @@
 
 

-
+

 

 

 
category :
a string specifying the mark category, or NULL.a string specifying the mark category, or NULL.
 

 

 
Returns :
the previous GtkSourceMark, or NULL. [transfer none]
+the previous GtkSourceMark, or NULL. [transfer none]
 
 

 
 
 
 
 
 
 
 
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
 
 
 
 

 
wrap_mode :
a GtkWrapMode.a GtkWrapMode.
 

 
 

@@ -362,7 +362,7 @@
 

 

 
gtk_source_print_compositor_get_wrap_mode ()

-
GtkWrapMode         gtk_source_print_compositor_get_wrap_mode
+
GtkWrapMode         gtk_source_print_compositor_get_wrap_mode
                                                         (GtkSourcePrintCompositor *compositor);

 

 Gets the line wrapping mode for the printed text.
@@ -387,7 +387,7 @@
 
gtk_source_print_compositor_set_highlight_syntax ()

 
void                gtk_source_print_compositor_set_highlight_syntax
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean highlight);

+                                                         gboolean highlight);

 

 Sets whether the printed text will be highlighted according to the
 buffer rules.  Both color and font style are applied.
@@ -414,7 +414,7 @@
 

 

 
gtk_source_print_compositor_get_highlight_syntax ()

-
gboolean            gtk_source_print_compositor_get_highlight_syntax
+
gboolean            gtk_source_print_compositor_get_highlight_syntax
                                                         (GtkSourcePrintCompositor *compositor);

 

 Determines whether the printed text will be highlighted according to the
@@ -431,7 +431,7 @@
 
 
Returns :

 
-TRUE if the printed output will be highlighted.
+TRUE if the printed output will be highlighted.
 
 
 

@@ -442,7 +442,7 @@
 
gtk_source_print_compositor_set_print_line_numbers ()

 
void                gtk_source_print_compositor_set_print_line_numbers
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         guint interval);

+                                                         guint interval);

 

 Sets the interval for printed line numbers.  If interval is 0 no
 numbers will be printed.  If greater than 0, a number will be
@@ -473,7 +473,7 @@
 

 

 
gtk_source_print_compositor_get_print_line_numbers ()

-
guint               gtk_source_print_compositor_get_print_line_numbers
+
guint               gtk_source_print_compositor_get_print_line_numbers
                                                         (GtkSourcePrintCompositor *compositor);

 

 Returns the interval used for line number printing.  If the
@@ -500,14 +500,14 @@
 
gtk_source_print_compositor_set_body_font_name ()

 
void                gtk_source_print_compositor_set_body_font_name
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         const gchar *font_name);

+                                                         const gchar *font_name);

 

 Sets the default font for the printed text. 
 

 

 font_name should be a
 string representation of a font description Pango can understand.
-(e.g. "Monospace 10"). See pango_font_description_from_string()
+(e.g. "Monospace 10"). See pango_font_description_from_string()
 for a description of the format of the string representation. 
 

 

@@ -532,11 +532,11 @@
 

 

 
gtk_source_print_compositor_get_body_font_name ()

-
gchar *             gtk_source_print_compositor_get_body_font_name
+
gchar *             gtk_source_print_compositor_get_body_font_name
                                                         (GtkSourcePrintCompositor *compositor);

 

 Returns the name of the font used to print the text body. The returned string
-must be freed with g_free().
+must be freed with g_free().
 

 
@@ -559,16 +559,16 @@
 
gtk_source_print_compositor_set_line_numbers_font_name ()
void                gtk_source_print_compositor_set_line_numbers_font_name
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         const gchar *font_name);

+                                                         const gchar *font_name);

 Sets the font for printing line numbers on the left margin.  If
-NULL is supplied, the default font (i.e. the one being used for the
+NULL is supplied, the default font (i.e. the one being used for the
 text) will be used instead.  
 

 font_name should be a
 string representation of a font description Pango can understand.
-(e.g. "Monospace 10"). See pango_font_description_from_string()
+(e.g. "Monospace 10"). See pango_font_description_from_string()
 for a description of the format of the string representation. 
 

@@ -584,7 +584,7 @@
 
 

-
@@ -594,11 +594,11 @@
 

 
gtk_source_print_compositor_get_line_numbers_font_name ()

-
gchar *             gtk_source_print_compositor_get_line_numbers_font_name
+
gchar *             gtk_source_print_compositor_get_line_numbers_font_name
                                                         (GtkSourcePrintCompositor *compositor);

 

 Returns the name of the font used to print line numbers on the left margin. 
-The returned string must be freed with g_free().
+The returned string must be freed with g_free().
 

 

 

 
 
 
 

 
font_name :
the name of the font for line numbers, or NULL. [allow-none]
+the name of the font for line numbers, or NULL. [allow-none]
 
 

 
 
@@ -621,16 +621,16 @@
 
gtk_source_print_compositor_set_header_font_name ()
void                gtk_source_print_compositor_set_header_font_name
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         const gchar *font_name);

+                                                         const gchar *font_name);

 Sets the font for printing the page header. If
-NULL is supplied, the default font (i.e. the one being used for the
+NULL is supplied, the default font (i.e. the one being used for the
 text) will be used instead.  
 

 font_name should be a
 string representation of a font description Pango can understand.
-(e.g. "Monospace 10"). See pango_font_description_from_string()
+(e.g. "Monospace 10"). See pango_font_description_from_string()
 for a description of the format of the string representation. 
 

@@ -646,7 +646,7 @@
 
 

-
@@ -656,11 +656,11 @@
 

 
gtk_source_print_compositor_get_header_font_name ()

-
gchar *             gtk_source_print_compositor_get_header_font_name
+
gchar *             gtk_source_print_compositor_get_header_font_name
                                                         (GtkSourcePrintCompositor *compositor);

 

 Returns the name of the font used to print the page header. 
-The returned string must be freed with g_free().
+The returned string must be freed with g_free().
 

 

 

 
 
 
 

 
font_name :
the name of the font for header text, or NULL. [allow-none]
+the name of the font for header text, or NULL. [allow-none]
 
 

 
 
@@ -683,16 +683,16 @@
 
gtk_source_print_compositor_set_footer_font_name ()
void                gtk_source_print_compositor_set_footer_font_name
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         const gchar *font_name);

+                                                         const gchar *font_name);

 Sets the font for printing the page footer. If
-NULL is supplied, the default font (i.e. the one being used for the
+NULL is supplied, the default font (i.e. the one being used for the
 text) will be used instead.  
 

 font_name should be a
 string representation of a font description Pango can understand.
-(e.g. "Monospace 10"). See pango_font_description_from_string()
+(e.g. "Monospace 10"). See pango_font_description_from_string()
 for a description of the format of the string representation. 
 

@@ -708,7 +708,7 @@
 
 

-
@@ -718,11 +718,11 @@
 

 
gtk_source_print_compositor_get_footer_font_name ()

-
gchar *             gtk_source_print_compositor_get_footer_font_name
+
gchar *             gtk_source_print_compositor_get_footer_font_name
                                                         (GtkSourcePrintCompositor *compositor);

 

 Returns the name of the font used to print the page footer. 
-The returned string must be freed with g_free().
+The returned string must be freed with g_free().
 

 

 

 
 
 
 

 
font_name :
the name of the font for the footer text, or NULL. [allow-none]
+the name of the font for the footer text, or NULL. [allow-none]
 
 

 
 
@@ -743,9 +743,9 @@
 

 
gtk_source_print_compositor_get_top_margin ()

-
gdouble             gtk_source_print_compositor_get_top_margin
+
gdouble             gtk_source_print_compositor_get_top_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkUnit unit);

+                                                         GtkUnit unit);

 

 Gets the top margin in units of unit.
 

@@ -773,8 +773,8 @@
 
gtk_source_print_compositor_set_top_margin ()

 
void                gtk_source_print_compositor_set_top_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gdouble margin,
-                                                         GtkUnit unit);

+                                                         gdouble margin,
+                                                         GtkUnit unit);
 

 Sets the top margin used by compositor.
 

@@ -802,9 +802,9 @@
 

 

 
gtk_source_print_compositor_get_bottom_margin ()

-
gdouble             gtk_source_print_compositor_get_bottom_margin
+
gdouble             gtk_source_print_compositor_get_bottom_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkUnit unit);

+                                                         GtkUnit unit);

 

 Gets the bottom margin in units of unit.
 

@@ -832,8 +832,8 @@
 
gtk_source_print_compositor_set_bottom_margin ()

 
void                gtk_source_print_compositor_set_bottom_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gdouble margin,
-                                                         GtkUnit unit);

+                                                         gdouble margin,
+                                                         GtkUnit unit);
 

 Sets the bottom margin used by compositor.
 

@@ -859,9 +859,9 @@
 

 

 
gtk_source_print_compositor_get_left_margin ()

-
gdouble             gtk_source_print_compositor_get_left_margin
+
gdouble             gtk_source_print_compositor_get_left_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkUnit unit);

+                                                         GtkUnit unit);

 

 Gets the left margin in units of unit.
 

@@ -889,8 +889,8 @@
 
gtk_source_print_compositor_set_left_margin ()

 
void                gtk_source_print_compositor_set_left_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gdouble margin,
-                                                         GtkUnit unit);

+                                                         gdouble margin,
+                                                         GtkUnit unit);
 

 Sets the left margin used by compositor.
 

@@ -916,9 +916,9 @@
 

 

 
gtk_source_print_compositor_get_right_margin ()

-
gdouble             gtk_source_print_compositor_get_right_margin
+
gdouble             gtk_source_print_compositor_get_right_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkUnit unit);

+                                                         GtkUnit unit);

 

 Gets the right margin in units of unit.
 

@@ -946,8 +946,8 @@
 
gtk_source_print_compositor_set_right_margin ()

 
void                gtk_source_print_compositor_set_right_margin
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gdouble margin,
-                                                         GtkUnit unit);

+                                                         gdouble margin,
+                                                         GtkUnit unit);
 

 Sets the right margin used by compositor.
 

@@ -975,7 +975,7 @@
 
gtk_source_print_compositor_set_print_header ()

 
void                gtk_source_print_compositor_set_print_header
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean print);

+                                                         gboolean print);
 

 Sets whether you want to print a header in each page.  The 
 header consists of three pieces of text and an optional line
@@ -1000,7 +1000,7 @@
 

+TRUE if you want the header to be printed.

 

 

 
print :

 
-TRUE if you want the header to be printed.
 

 
 

@@ -1009,11 +1009,11 @@
 

 

 
gtk_source_print_compositor_get_print_header ()

-
gboolean            gtk_source_print_compositor_get_print_header
+
gboolean            gtk_source_print_compositor_get_print_header
                                                         (GtkSourcePrintCompositor *compositor);

 

 Determines if a header is set to be printed for each page.  A
-header will be printed if this function returns TRUE
+header will be printed if this function returns TRUE
 and some format strings have been specified
 with gtk_source_print_compositor_set_header_format().
 

@@ -1027,7 +1027,7 @@
 
 
Returns :

 
-TRUE if the header is set to be printed.
+TRUE if the header is set to be printed.
 
 
 

@@ -1038,7 +1038,7 @@
 
gtk_source_print_compositor_set_print_footer ()

 
void                gtk_source_print_compositor_set_print_footer
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean print);

+                                                         gboolean print);

 

 Sets whether you want to print a footer in each page.  The 
 footer consists of three pieces of text and an optional line
@@ -1063,7 +1063,7 @@
 
 
print :

 
-TRUE if you want the footer to be printed.
+TRUE if you want the footer to be printed.
 
 
 

@@ -1072,11 +1072,11 @@
 

 

 
gtk_source_print_compositor_get_print_footer ()

-
gboolean            gtk_source_print_compositor_get_print_footer
+
gboolean            gtk_source_print_compositor_get_print_footer
                                                         (GtkSourcePrintCompositor *compositor);

 

 Determines if a footer is set to be printed for each page.  A
-footer will be printed if this function returns TRUE
+footer will be printed if this function returns TRUE
 and some format strings have been specified
 with gtk_source_print_compositor_set_footer_format().
 

@@ -1090,7 +1090,7 @@
 
 
Returns :

 
-TRUE if the footer is set to be printed.
+TRUE if the footer is set to be printed.
 
 
 

@@ -1101,10 +1101,10 @@
 
gtk_source_print_compositor_set_header_format ()

 
void                gtk_source_print_compositor_set_header_format
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean separator,
-                                                         const gchar *left,
-                                                         const gchar *center,
-                                                         const gchar *right);

+                                                         gboolean separator,
+                                                         const gchar *left,
+                                                         const gchar *center,
+                                                         const gchar *right);

Sets strftime like header format strings, to be printed on the left, center and right of the top of each page. The strings may @@ -1117,7 +1117,7 @@ the header from the document text.

-If NULL is given for any of the three arguments, that particular +If NULL is given for any of the three arguments, that particular string will not be printed.

@@ -1139,7 +1139,7 @@

separator :

-TRUE if you want a separator line to be printed. +TRUE if you want a separator line to be printed.

left :

@@ -1165,10 +1165,10 @@

gtk_source_print_compositor_set_footer_format ()

void                gtk_source_print_compositor_set_footer_format
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         gboolean separator,
-                                                         const gchar *left,
-                                                         const gchar *center,
-                                                         const gchar *right);
+ gboolean separator, + const gchar *left, + const gchar *center, + const gchar *right);

Sets strftime like header format strings, to be printed on the left, center and right of the bottom of each page. The strings may @@ -1181,7 +1181,7 @@ the footer from the document text.

-If NULL is given for any of the three arguments, that particular +If NULL is given for any of the three arguments, that particular string will not be printed.

@@ -1203,7 +1203,7 @@

separator :

-TRUE if you want a separator line to be printed. +TRUE if you want a separator line to be printed.

left :

@@ -1227,7 +1227,7 @@

gtk_source_print_compositor_get_n_pages ()

-
gint                gtk_source_print_compositor_get_n_pages
+
gint                gtk_source_print_compositor_get_n_pages
                                                         (GtkSourcePrintCompositor *compositor);

 

 Returns the number of pages in the document or -1 if the 
@@ -1252,9 +1252,9 @@
 

 

 
gtk_source_print_compositor_paginate ()

-
gboolean            gtk_source_print_compositor_paginate
+
gboolean            gtk_source_print_compositor_paginate
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkPrintContext *context);

+                                                         GtkPrintContext *context);

 

 Paginate the document associated with the compositor.
 

@@ -1263,10 +1263,10 @@
 Each time gtk_source_print_compositor_paginate() is invoked, a chunk of the document 
 is paginated. To paginate the entire document, gtk_source_print_compositor_paginate() 
 must be invoked multiple times.
-It returns TRUE if the document has been completely paginated, otherwise it returns FALSE.
+It returns TRUE if the document has been completely paginated, otherwise it returns FALSE.
 

 

-This method has been designed to be invoked in the handler of the "paginate" signal,
+This method has been designed to be invoked in the handler of the "paginate" signal,
 as shown in the following example:
 

 

@@ -1300,7 +1300,7 @@
 23
// Signal handler for the GtkPrintOperation::paginate signal
 
-static gboolean
+static gboolean
 paginate (GtkPrintOperation *operation,
           GtkPrintContext   *context,
           gpointer           user_data)
@@ -1314,12 +1314,12 @@
         gint n_pages;
         
         n_pages = gtk_source_print_compositor_get_n_pages (compositor);
-        gtk_print_operation_set_n_pages (operation, n_pages);
+        gtk_print_operation_set_n_pages (operation, n_pages);
 
-        return TRUE;
+        return TRUE;
     }
      
-    return FALSE;
+    return FALSE;
 }
@@ -1330,7 +1330,7 @@

If you don't need to do pagination in chunks, you can simply do it all in the -"begin-print" handler, and set the number of pages from there, like +"begin-print" handler, and set the number of pages from there, like in the following example:

@@ -1371,7 +1371,7 @@ while (!gtk_source_print_compositor_paginate (compositor, context)); n_pages = gtk_source_print_compositor_get_n_pages (compositor); - gtk_print_operation_set_n_pages (operation, n_pages); + gtk_print_operation_set_n_pages (operation, n_pages); } @@ -1389,13 +1389,13 @@

context :

-the GtkPrintContext whose parameters (e.g. paper size, print margins, etc.) +the GtkPrintContext whose parameters (e.g. paper size, print margins, etc.) are used by the the compositor to paginate the document.

Returns :

-TRUE if the document has been completely paginated, FALSE otherwise. +TRUE if the document has been completely paginated, FALSE otherwise.
@@ -1404,7 +1404,7 @@

gtk_source_print_compositor_get_pagination_progress ()

-
gdouble             gtk_source_print_compositor_get_pagination_progress
+
gdouble             gtk_source_print_compositor_get_pagination_progress
                                                         (GtkSourcePrintCompositor *compositor);

 

 Returns the current fraction of the document pagination that has been completed.
@@ -1429,13 +1429,13 @@
 
gtk_source_print_compositor_draw_page ()

 
void                gtk_source_print_compositor_draw_page
                                                         (GtkSourcePrintCompositor *compositor,
-                                                         GtkPrintContext *context,
-                                                         gint page_nr);

+                                                         GtkPrintContext *context,
+                                                         gint page_nr);

Draw page page_nr for printing on the the Cairo context encapsuled in context.

-This method has been designed to be called in the handler of the "draw_page" signal +This method has been designed to be called in the handler of the "draw_page" signal as shown in the following example:

@@ -1492,7 +1492,7 @@

context :

-the GtkPrintContext encapsulating the context information that is required when +the GtkPrintContext encapsulating the context information that is required when drawing the page for printing. @@ -1507,13 +1507,13 @@

Property Details

The "body-font-name" property

-
  "body-font-name"           gchar*                : Read / Write
+
  "body-font-name"           gchar*                : Read / Write

Name of the font used for the text body.

Accepted values are strings representing a font description Pango can understand. -(e.g. "Monospace 10"). See pango_font_description_from_string() +(e.g. "Monospace 10"). See pango_font_description_from_string() for a description of the format of the string representation.

@@ -1535,14 +1535,14 @@

The "footer-font-name" property

-
  "footer-font-name"         gchar*                : Read / Write
+
  "footer-font-name"         gchar*                : Read / Write

Name of the font used to print page footer. If this property is unspecified, the text body font is used.

Accepted values are strings representing a font description Pango can understand. -(e.g. "Monospace 10"). See pango_font_description_from_string() +(e.g. "Monospace 10"). See pango_font_description_from_string() for a description of the format of the string representation.

@@ -1555,14 +1555,14 @@

The "header-font-name" property

-
  "header-font-name"         gchar*                : Read / Write
+
  "header-font-name"         gchar*                : Read / Write

Name of the font used to print page header. If this property is unspecified, the text body font is used.

Accepted values are strings representing a font description Pango can understand. -(e.g. "Monospace 10"). See pango_font_description_from_string() +(e.g. "Monospace 10"). See pango_font_description_from_string() for a description of the format of the string representation.

@@ -1575,7 +1575,7 @@

The "highlight-syntax" property

-
  "highlight-syntax"         gboolean              : Read / Write
+
  "highlight-syntax"         gboolean              : Read / Write

Whether to print the document with highlighted syntax. @@ -1588,14 +1588,14 @@

The "line-numbers-font-name" property

-
  "line-numbers-font-name"   gchar*                : Read / Write
+
  "line-numbers-font-name"   gchar*                : Read / Write

Name of the font used to print line numbers on the left margin. If this property is unspecified, the text body font is used.

Accepted values are strings representing a font description Pango can understand. -(e.g. "Monospace 10"). See pango_font_description_from_string() +(e.g. "Monospace 10"). See pango_font_description_from_string() for a description of the format of the string representation.

@@ -1608,7 +1608,7 @@

The "n-pages" property

-
  "n-pages"                  gint                  : Read
+
  "n-pages"                  gint                  : Read

The number of pages in the document or -1 if the document has not been completely paginated. @@ -1620,7 +1620,7 @@

The "print-footer" property

-
  "print-footer"             gboolean              : Read / Write
+
  "print-footer"             gboolean              : Read / Write

Whether to print a footer in each page.

@@ -1639,7 +1639,7 @@

The "print-header" property

-
  "print-header"             gboolean              : Read / Write
+
  "print-header"             gboolean              : Read / Write

Whether to print a header in each page.

@@ -1658,7 +1658,7 @@

The "print-line-numbers" property

-
  "print-line-numbers"       guint                 : Read / Write
+
  "print-line-numbers"       guint                 : Read / Write

Interval of printed line numbers. If this property is set to 0 no numbers will be printed. If greater than 0, a number will be @@ -1675,7 +1675,7 @@

The "tab-width" property

-
  "tab-width"                guint                 : Read / Write
+
  "tab-width"                guint                 : Read / Write

Width of a tab character expressed in spaces.

@@ -1690,7 +1690,7 @@

The "wrap-mode" property

-
  "wrap-mode"                GtkWrapMode           : Read / Write
+
  "wrap-mode"                GtkWrapMode           : Read / Write

Whether to wrap lines never, at word boundaries, or at character boundaries.

@@ -1705,6 +1705,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceStyle.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceStyle.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceStyle.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceStyle.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,27 +51,27 @@

Object Hierarchy

-  GObject
+  GObject
    +----GtkSourceStyle

Properties

-  "background"               gchar*                : Read / Write / Construct Only
-  "background-set"           gboolean              : Read / Write / Construct Only
-  "bold"                     gboolean              : Read / Write / Construct Only
-  "bold-set"                 gboolean              : Read / Write / Construct Only
-  "foreground"               gchar*                : Read / Write / Construct Only
-  "foreground-set"           gboolean              : Read / Write / Construct Only
-  "italic"                   gboolean              : Read / Write / Construct Only
-  "italic-set"               gboolean              : Read / Write / Construct Only
-  "line-background"          gchar*                : Read / Write / Construct Only
-  "line-background-set"      gboolean              : Read / Write / Construct Only
-  "strikethrough"            gboolean              : Read / Write / Construct Only
-  "strikethrough-set"        gboolean              : Read / Write / Construct Only
-  "underline"                gboolean              : Read / Write / Construct Only
-  "underline-set"            gboolean              : Read / Write / Construct Only
+  "background"               gchar*                : Read / Write / Construct Only
+  "background-set"           gboolean              : Read / Write / Construct Only
+  "bold"                     gboolean              : Read / Write / Construct Only
+  "bold-set"                 gboolean              : Read / Write / Construct Only
+  "foreground"               gchar*                : Read / Write / Construct Only
+  "foreground-set"           gboolean              : Read / Write / Construct Only
+  "italic"                   gboolean              : Read / Write / Construct Only
+  "italic-set"               gboolean              : Read / Write / Construct Only
+  "line-background"          gchar*                : Read / Write / Construct Only
+  "line-background-set"      gboolean              : Read / Write / Construct Only
+  "strikethrough"            gboolean              : Read / Write / Construct Only
+  "strikethrough-set"        gboolean              : Read / Write / Construct Only
+  "underline"                gboolean              : Read / Write / Construct Only
+  "underline-set"            gboolean              : Read / Write / Construct Only
@@ -104,7 +104,7 @@

Returns :

-copy of style, call g_object_unref() +copy of style, call g_object_unref() when you are done with it. [transfer full] @@ -117,98 +117,98 @@

Property Details

The "background" property

-
  "background"               gchar*                : Read / Write / Construct Only
+
  "background"               gchar*                : Read / Write / Construct Only

Background color.

Default value: NULL

The "background-set" property

-
  "background-set"           gboolean              : Read / Write / Construct Only
+
  "background-set"           gboolean              : Read / Write / Construct Only

Whether background color is set.

Default value: FALSE

The "bold" property

-
  "bold"                     gboolean              : Read / Write / Construct Only
+
  "bold"                     gboolean              : Read / Write / Construct Only

Bold.

Default value: FALSE

The "bold-set" property

-
  "bold-set"                 gboolean              : Read / Write / Construct Only
+
  "bold-set"                 gboolean              : Read / Write / Construct Only

Whether bold attribute is set.

Default value: FALSE

The "foreground" property

-
  "foreground"               gchar*                : Read / Write / Construct Only
+
  "foreground"               gchar*                : Read / Write / Construct Only

Foreground color.

Default value: NULL

The "foreground-set" property

-
  "foreground-set"           gboolean              : Read / Write / Construct Only
+
  "foreground-set"           gboolean              : Read / Write / Construct Only

Whether foreground color is set.

Default value: FALSE

The "italic" property

-
  "italic"                   gboolean              : Read / Write / Construct Only
+
  "italic"                   gboolean              : Read / Write / Construct Only

Italic.

Default value: FALSE

The "italic-set" property

-
  "italic-set"               gboolean              : Read / Write / Construct Only
+
  "italic-set"               gboolean              : Read / Write / Construct Only

Whether italic attribute is set.

Default value: FALSE

The "line-background" property

-
  "line-background"          gchar*                : Read / Write / Construct Only
+
  "line-background"          gchar*                : Read / Write / Construct Only

Line background color.

Default value: NULL

The "line-background-set" property

-
  "line-background-set"      gboolean              : Read / Write / Construct Only
+
  "line-background-set"      gboolean              : Read / Write / Construct Only

Whether line background color is set.

Default value: FALSE

The "strikethrough" property

-
  "strikethrough"            gboolean              : Read / Write / Construct Only
+
  "strikethrough"            gboolean              : Read / Write / Construct Only

Strikethrough.

Default value: FALSE

The "strikethrough-set" property

-
  "strikethrough-set"        gboolean              : Read / Write / Construct Only
+
  "strikethrough-set"        gboolean              : Read / Write / Construct Only

Whether strikethrough attribute is set.

Default value: FALSE

The "underline" property

-
  "underline"                gboolean              : Read / Write / Construct Only
+
  "underline"                gboolean              : Read / Write / Construct Only

Underline.

Default value: FALSE

The "underline-set" property

-
  "underline-set"            gboolean              : Read / Write / Construct Only
+
  "underline-set"            gboolean              : Read / Write / Construct Only

Whether underline attribute is set.

Default value: FALSE

@@ -220,6 +220,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceStyleScheme.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceStyleScheme.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceStyleScheme.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceStyleScheme.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -45,32 +45,32 @@ #include <gtksourceview/gtksourcestylescheme.h> struct GtkSourceStyleScheme; -const gchar * gtk_source_style_scheme_get_id (GtkSourceStyleScheme *scheme); -const gchar * gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme); -const gchar * gtk_source_style_scheme_get_description +const gchar * gtk_source_style_scheme_get_id (GtkSourceStyleScheme *scheme); +const gchar * gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme); +const gchar * gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme); -const gchar * const * gtk_source_style_scheme_get_authors +const gchar * const * gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme); -const gchar * gtk_source_style_scheme_get_filename +const gchar * gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme); GtkSourceStyle * gtk_source_style_scheme_get_style (GtkSourceStyleScheme *scheme, - const gchar *style_id); + const gchar *style_id);

Object Hierarchy

-  GObject
+  GObject
    +----GtkSourceStyleScheme

Properties

-  "description"              gchar*                : Read
-  "filename"                 gchar*                : Read
-  "id"                       gchar*                : Read / Write / Construct Only
-  "name"                     gchar*                : Read
+  "description"              gchar*                : Read
+  "filename"                 gchar*                : Read
+  "id"                       gchar*                : Read / Write / Construct Only
+  "name"                     gchar*                : Read
@@ -96,7 +96,7 @@

gtk_source_style_scheme_get_id ()

-
const gchar *       gtk_source_style_scheme_get_id      (GtkSourceStyleScheme *scheme);
+
const gchar *       gtk_source_style_scheme_get_id      (GtkSourceStyleScheme *scheme);
@@ -116,7 +116,7 @@

gtk_source_style_scheme_get_name ()

-
const gchar *       gtk_source_style_scheme_get_name    (GtkSourceStyleScheme *scheme);
+
const gchar *       gtk_source_style_scheme_get_name    (GtkSourceStyleScheme *scheme);
@@ -136,7 +136,7 @@

gtk_source_style_scheme_get_description ()

-
const gchar *       gtk_source_style_scheme_get_description
+
const gchar *       gtk_source_style_scheme_get_description
                                                         (GtkSourceStyleScheme *scheme);
@@ -148,7 +148,7 @@ +scheme description (if defined), or NULL.

Returns :

 -scheme description (if defined), or NULL.
@@ -157,7 +157,7 @@

gtk_source_style_scheme_get_authors ()

-
const gchar * const * gtk_source_style_scheme_get_authors
+
const gchar * const * gtk_source_style_scheme_get_authors
                                                         (GtkSourceStyleScheme *scheme);

 
@@ -168,8 +168,8 @@
 
-
@@ -180,7 +180,7 @@
 

 
gtk_source_style_scheme_get_filename ()

-
const gchar *       gtk_source_style_scheme_get_filename
+
const gchar *       gtk_source_style_scheme_get_filename
                                                         (GtkSourceStyleScheme *scheme);

 

 

 

 
Returns :
a NULL-terminated
-array containing the scheme authors or NULL if no author
+a NULL-terminated
+array containing the scheme authors or NULL if no author
 is specified by the style scheme. [array zero-terminated=1][transfer none]
 
 

 
@@ -193,7 +193,7 @@
 
+style scheme file or NULL in the other cases.

 

Returns :

 
 scheme file name if the scheme was created parsing a
-style scheme file or NULL in the other cases.
 

 
 

@@ -203,7 +203,7 @@
 

 
gtk_source_style_scheme_get_style ()

 
GtkSourceStyle *    gtk_source_style_scheme_get_style   (GtkSourceStyleScheme *scheme,
-                                                         const gchar *style_id);

+                                                         const gchar *style_id);
@@ -218,7 +218,7 @@ @@ -231,14 +231,14 @@

Property Details

The "description" property

-
  "description"              gchar*                : Read
+
  "description"              gchar*                : Read

Style scheme description.

Default value: NULL

The "filename" property

-
  "filename"                 gchar*                : Read
+
  "filename"                 gchar*                : Read

Style scheme filename or NULL.

@@ -247,7 +247,7 @@

The "id" property

-
  "id"                       gchar*                : Read / Write / Construct Only
+
  "id"                       gchar*                : Read / Write / Construct Only

Style scheme id, a unique string used to identify the style scheme in GtkSourceStyleSchemeManager. @@ -257,7 +257,7 @@

The "name" property

-
  "name"                     gchar*                : Read
+
  "name"                     gchar*                : Read

Style scheme name, a translatable string to present to user.

@@ -271,6 +271,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceStyleSchemeManager.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceStyleSchemeManager.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceStyleSchemeManager.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceStyleSchemeManager.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,20 +51,20 @@ (void); void gtk_source_style_scheme_manager_set_search_path (GtkSourceStyleSchemeManager *manager, - gchar **path); + gchar **path); void gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSchemeManager *manager, - const gchar *path); + const gchar *path); void gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager *manager, - const gchar *path); -const gchar * const * gtk_source_style_scheme_manager_get_search_path + const gchar *path); +const gchar * const * gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager); -const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids +const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager); GtkSourceStyleScheme * gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager, - const gchar *scheme_id); + const gchar *scheme_id); void gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manager); @@ -72,15 +72,15 @@

Object Hierarchy

-  GObject
+  GObject
    +----GtkSourceStyleSchemeManager

Properties

-  "scheme-ids"               GStrv                 : Read
-  "search-path"              GStrv                 : Read / Write
+  "scheme-ids"               GStrv                 : Read
+  "search-path"              GStrv                 : Read / Write
@@ -132,11 +132,11 @@

gtk_source_style_scheme_manager_set_search_path ()

void                gtk_source_style_scheme_manager_set_search_path
                                                         (GtkSourceStyleSchemeManager *manager,
-                                                         gchar **path);
+ gchar **path);

Sets the list of directories where the manager looks for style scheme files. -If path is NULL, the search path is reset to default. +If path is NULL, the search path is reset to default.

Returns :

 style which corresponds to style_id -in the scheme, or NULL when no style with this name found. +in the scheme, or NULL when no style with this name found. It is owned by scheme and may not be unref'ed. [transfer none]
@@ -147,7 +147,7 @@ - @@ -158,7 +158,7 @@

gtk_source_style_scheme_manager_append_search_path ()

void                gtk_source_style_scheme_manager_append_search_path
                                                         (GtkSourceStyleSchemeManager *manager,
-                                                         const gchar *path);
+ const gchar *path);

Appends path to the list of directories where the manager looks for style scheme files. @@ -183,7 +183,7 @@

gtk_source_style_scheme_manager_prepend_search_path ()

void                gtk_source_style_scheme_manager_prepend_search_path
                                                         (GtkSourceStyleSchemeManager *manager,
-                                                         const gchar *path);
+ const gchar *path);

Prepends path to the list of directories where the manager looks for style scheme files. @@ -206,7 +206,7 @@

gtk_source_style_scheme_manager_get_search_path ()

-
const gchar * const * gtk_source_style_scheme_manager_get_search_path
+
const gchar * const * gtk_source_style_scheme_manager_get_search_path
                                                         (GtkSourceStyleSchemeManager *manager);

 

 Returns the current search path for the manager.
@@ -221,7 +221,7 @@
- @@ -232,7 +232,7 @@

gtk_source_style_scheme_manager_get_scheme_ids ()

-
const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids
+
const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids
                                                         (GtkSourceStyleSchemeManager *manager);

 

 Returns the ids of the available style schemes.
@@ -246,8 +246,8 @@
- +TRUE if there are undo operations available, FALSE otherwise

path :

a NULL-terminated array of strings or NULL. [array zero-terminated=1][allow-none] +a NULL-terminated array of strings or NULL. [array zero-terminated=1][allow-none]

Returns :

a NULL-terminated array +a NULL-terminated array of string containing the search path. The array is owned by the manager and must not be modified. [array zero-terminated=1][transfer none]

Returns :

a NULL-terminated array -of string containing the ids of the available style schemes or NULL if no +a NULL-terminated array +of string containing the ids of the available style schemes or NULL if no style scheme is available. The array is sorted alphabetically according to the scheme name. The array is owned by the manager and must not be modified. [array zero-terminated=1][transfer none] @@ -261,7 +261,7 @@

gtk_source_style_scheme_manager_get_scheme ()

GtkSourceStyleScheme * gtk_source_style_scheme_manager_get_scheme
                                                         (GtkSourceStyleSchemeManager *manager,
-                                                         const gchar *scheme_id);
+ const gchar *scheme_id);

Looks up style scheme by id.

@@ -308,13 +308,13 @@

Property Details

The "scheme-ids" property

-
  "scheme-ids"               GStrv                 : Read
+
  "scheme-ids"               GStrv                 : Read

List of the ids of the available style schemes.

The "search-path" property

-
  "search-path"              GStrv                 : Read / Write
+
  "search-path"              GStrv                 : Read / Write

List of directories and files where the style schemes are located.

@@ -325,6 +325,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceUndoManager.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceUndoManager.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceUndoManager.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceUndoManager.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,8 +47,8 @@ #include <gtksourceview/gtksourceundomanager.h> GtkSourceUndoManager; -gboolean gtk_source_undo_manager_can_undo (GtkSourceUndoManager *manager); -gboolean gtk_source_undo_manager_can_redo (GtkSourceUndoManager *manager); +gboolean gtk_source_undo_manager_can_undo (GtkSourceUndoManager *manager); +gboolean gtk_source_undo_manager_can_redo (GtkSourceUndoManager *manager); void gtk_source_undo_manager_undo (GtkSourceUndoManager *manager); void gtk_source_undo_manager_redo (GtkSourceUndoManager *manager); void gtk_source_undo_manager_begin_not_undoable_action @@ -72,13 +72,13 @@

Prerequisites

GtkSourceUndoManager requires - GObject.

+ GObject.

Signals

-  "can-redo-changed"                               : Action
-  "can-undo-changed"                               : Action
+  "can-redo-changed"                               : Action
+  "can-undo-changed"                               : Action
@@ -104,7 +104,7 @@

gtk_source_undo_manager_can_undo ()

-
gboolean            gtk_source_undo_manager_can_undo    (GtkSourceUndoManager *manager);
+
gboolean            gtk_source_undo_manager_can_undo    (GtkSourceUndoManager *manager);

Get whether there are undo operations available.

@@ -118,7 +118,7 @@

Returns :

 -TRUE if there are undo operations available, FALSE otherwise
@@ -127,7 +127,7 @@

gtk_source_undo_manager_can_redo ()

-
gboolean            gtk_source_undo_manager_can_redo    (GtkSourceUndoManager *manager);
+
gboolean            gtk_source_undo_manager_can_redo    (GtkSourceUndoManager *manager);

Get whether there are redo operations available.

@@ -141,7 +141,7 @@

Returns :

-TRUE if there are redo operations available, FALSE otherwise +TRUE if there are redo operations available, FALSE otherwise
@@ -259,7 +259,7 @@

The "can-redo-changed" signal

void                user_function                      (GtkSourceUndoManager *manager,
-                                                        gpointer              user_data)      : Action
+ gpointer user_data) : Action

Emitted when the ability to redo has changed.

@@ -283,7 +283,7 @@

The "can-undo-changed" signal

void                user_function                      (GtkSourceUndoManager *manager,
-                                                        gpointer              user_data)      : Action
+ gpointer user_data) : Action

Emitted when the ability to undo has changed.

@@ -306,11 +306,11 @@

See Also

-GtkTextBuffer, GtkSourceView +GtkTextBuffer, GtkSourceView
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0-completioncontext.html gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0-completioncontext.html --- gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0-completioncontext.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0-completioncontext.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,11 +51,11 @@ void gtk_source_completion_context_add_proposals (GtkSourceCompletionContext *context, struct _GtkSourceCompletionProvider *provider, - GList *proposals, - gboolean finished); + GList *proposals, + gboolean finished); void gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context, - GtkTextIter *iter); + GtkTextIter *iter); GtkSourceCompletionActivation gtk_source_completion_context_get_activation (GtkSourceCompletionContext *context); @@ -63,8 +63,8 @@

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
+  GObject
+   +----GInitiallyUnowned
          +----GtkSourceCompletionContext
@@ -73,13 +73,13 @@ 
   "activation"               GtkSourceCompletionActivation  : Read / Write
   "completion"               GtkSourceCompletion*  : Read / Write / Construct Only
-  "iter"                     GtkTextIter*          : Read / Write
+  "iter"                     GtkTextIter*          : Read / Write

Signals

-  "cancelled"                                      : Action
+  "cancelled"                                      : Action
@@ -128,12 +128,12 @@ 
void                gtk_source_completion_context_add_proposals
                                                         (GtkSourceCompletionContext *context,
                                                          struct _GtkSourceCompletionProvider *provider,
-                                                         GList *proposals,
-                                                         gboolean finished);
+ GList *proposals, + gboolean finished);

Providers can use this function to add proposals to the completion. They can do so asynchronously by means of the finished argument. Providers must -ensure that they always call this function with finished set to TRUE +ensure that they always call this function with finished set to TRUE once each population (even if no proposals need to be added).

@@ -145,7 +145,7 @@ - @@ -165,7 +165,7 @@

gtk_source_completion_context_get_iter ()

void                gtk_source_completion_context_get_iter
                                                         (GtkSourceCompletionContext *context,
-                                                         GtkTextIter *iter);
+ GtkTextIter *iter);

Get the iter at which the completion was invoked. Providers can use this to determine how and if to match proposals. @@ -179,7 +179,7 @@

- @@ -228,9 +228,9 @@

The "iter" property

-
  "iter"                     GtkTextIter*          : Read / Write
+
  "iter"                     GtkTextIter*          : Read / Write

-The GtkTextIter at which the completion is invoked. +The GtkTextIter at which the completion is invoked.

@@ -239,7 +239,7 @@

The "cancelled" signal

void                user_function                      (GtkSourceCompletionContext *arg0,
-                                                        gpointer                    user_data)      : Action
+ gpointer user_data) : Action

Emitted when the current population of proposals has been cancelled. Providers adding proposals asynchronously should connect to this signal @@ -257,6 +257,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0.devhelp2 gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0.devhelp2 --- gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0.devhelp2 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0.devhelp2 2012-03-26 17:33:44.000000000 +0000 @@ -412,11 +412,11 @@ - - - - - + + + + + diff -Nru gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRenderer.html gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRenderer.html --- gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRenderer.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRenderer.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -44,79 +44,79 @@ enum GtkSourceGutterRendererState; enum GtkSourceGutterRendererAlignmentMode; void gtk_source_gutter_renderer_begin (GtkSourceGutterRenderer *renderer, - cairo_t *cr, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkTextIter *start, - GtkTextIter *end); + cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end); void gtk_source_gutter_renderer_draw (GtkSourceGutterRenderer *renderer, - cairo_t *cr, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkTextIter *start, - GtkTextIter *end, + cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end, GtkSourceGutterRendererState state); void gtk_source_gutter_renderer_end (GtkSourceGutterRenderer *renderer); -gint gtk_source_gutter_renderer_get_size (GtkSourceGutterRenderer *renderer); +gint gtk_source_gutter_renderer_get_size (GtkSourceGutterRenderer *renderer); void gtk_source_gutter_renderer_set_size (GtkSourceGutterRenderer *renderer, - gint size); + gint size); void gtk_source_gutter_renderer_set_visible (GtkSourceGutterRenderer *renderer, - gboolean visible); -gboolean gtk_source_gutter_renderer_get_visible + gboolean visible); +gboolean gtk_source_gutter_renderer_get_visible (GtkSourceGutterRenderer *renderer); void gtk_source_gutter_renderer_get_padding (GtkSourceGutterRenderer *renderer, - gint *xpad, - gint *ypad); + gint *xpad, + gint *ypad); void gtk_source_gutter_renderer_set_padding (GtkSourceGutterRenderer *renderer, - gint xpad, - gint ypad); + gint xpad, + gint ypad); void gtk_source_gutter_renderer_get_alignment (GtkSourceGutterRenderer *renderer, - gfloat *xalign, - gfloat *yalign); + gfloat *xalign, + gfloat *yalign); void gtk_source_gutter_renderer_set_alignment (GtkSourceGutterRenderer *renderer, - gfloat xalign, - gfloat yalign); + gfloat xalign, + gfloat yalign); void gtk_source_gutter_renderer_set_alignment_mode (GtkSourceGutterRenderer *renderer, GtkSourceGutterRendererAlignmentMode mode); -GtkTextWindowType gtk_source_gutter_renderer_get_window_type +GtkTextWindowType gtk_source_gutter_renderer_get_window_type (GtkSourceGutterRenderer *renderer); -GtkTextView * gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer); +GtkTextView * gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer); GtkSourceGutterRendererAlignmentMode gtk_source_gutter_renderer_get_alignment_mode (GtkSourceGutterRenderer *renderer); -gboolean gtk_source_gutter_renderer_get_background +gboolean gtk_source_gutter_renderer_get_background (GtkSourceGutterRenderer *renderer, - GdkRGBA *color); + GdkRGBA *color); void gtk_source_gutter_renderer_set_background (GtkSourceGutterRenderer *renderer, - const GdkRGBA *color); + const GdkRGBA *color); void gtk_source_gutter_renderer_activate (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - GdkRectangle *area, - GdkEvent *event); -gboolean gtk_source_gutter_renderer_query_activatable - (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - GdkRectangle *area, - GdkEvent *event); + GtkTextIter *iter, + GdkRectangle *area, + GdkEvent *event); +gboolean gtk_source_gutter_renderer_query_activatable + (GtkSourceGutterRenderer *renderer, + GtkTextIter *iter, + GdkRectangle *area, + GdkEvent *event); void gtk_source_gutter_renderer_queue_draw (GtkSourceGutterRenderer *renderer); -gboolean gtk_source_gutter_renderer_query_tooltip +gboolean gtk_source_gutter_renderer_query_tooltip (GtkSourceGutterRenderer *renderer, - GtkTextIter *iter, - GdkRectangle *area, - gint x, - gint y, - GtkTooltip *tooltip); + GtkTextIter *iter, + GdkRectangle *area, + gint x, + gint y, + GtkTooltip *tooltip); void gtk_source_gutter_renderer_query_data (GtkSourceGutterRenderer *renderer, - GtkTextIter *start, - GtkTextIter *end, + GtkTextIter *start, + GtkTextIter *end, GtkSourceGutterRendererState state); @@ -166,11 +166,11 @@

gtk_source_gutter_renderer_begin ()

void                gtk_source_gutter_renderer_begin    (GtkSourceGutterRenderer *renderer,
-                                                         cairo_t *cr,
-                                                         GdkRectangle *background_area,
-                                                         GdkRectangle *cell_area,
-                                                         GtkTextIter *start,
-                                                         GtkTextIter *end);
+ cairo_t *cr, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkTextIter *start, + GtkTextIter *end);

Called when drawing a region begins. The region to be drawn is indicated by start and end. The purpose is to allow the implementation to precompute @@ -186,27 +186,27 @@

- - - - - @@ -216,11 +216,11 @@

gtk_source_gutter_renderer_draw ()

void                gtk_source_gutter_renderer_draw     (GtkSourceGutterRenderer *renderer,
-                                                         cairo_t *cr,
-                                                         GdkRectangle *background_area,
-                                                         GdkRectangle *cell_area,
-                                                         GtkTextIter *start,
-                                                         GtkTextIter *end,
+                                                         cairo_t *cr,
+                                                         GdkRectangle *background_area,
+                                                         GdkRectangle *cell_area,
+                                                         GtkTextIter *start,
+                                                         GtkTextIter *end,
                                                          GtkSourceGutterRendererState state);

Main renderering method. Implementations should implement this method to @@ -247,20 +247,20 @@

- + - + - - @@ -290,7 +290,7 @@

gtk_source_gutter_renderer_get_size ()

-
gint                gtk_source_gutter_renderer_get_size (GtkSourceGutterRenderer *renderer);
+
gint                gtk_source_gutter_renderer_get_size (GtkSourceGutterRenderer *renderer);

Get the size of the renderer.

@@ -313,7 +313,7 @@

gtk_source_gutter_renderer_set_size ()

void                gtk_source_gutter_renderer_set_size (GtkSourceGutterRenderer *renderer,
-                                                         gint size);
+ gint size);

Sets the size of the renderer. A value of -1 specifies that the size is to be determined dynamically. @@ -338,7 +338,7 @@

gtk_source_gutter_renderer_set_visible ()

void                gtk_source_gutter_renderer_set_visible
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         gboolean visible);
+ gboolean visible);

Set whether the gutter renderer is visible.

@@ -360,7 +360,7 @@

gtk_source_gutter_renderer_get_visible ()

-
gboolean            gtk_source_gutter_renderer_get_visible
+
gboolean            gtk_source_gutter_renderer_get_visible
                                                         (GtkSourceGutterRenderer *renderer);

 

 Get whether the gutter renderer is visible.
@@ -376,7 +376,7 @@
+TRUE if the renderer is visible, FALSE otherwise

provider :

a GtkSourceCompletionProvider. [type GtkSource.CompletionProvider] +a GtkSourceCompletionProvider. [type GtkSource.CompletionProvider]

iter :

a GtkTextIter. [out] +a GtkTextIter. [out]

cr :

a cairo_t +a cairo_t

background_area :

a GdkRectangle +a GdkRectangle

cell_area :

a GdkRectangle +a GdkRectangle

start :

a GtkTextIter +a GtkTextIter

end :

a GtkTextIter +a GtkTextIter

background_area :

a GdkRectangle indicating the total area to be drawna GdkRectangle indicating the total area to be drawn

cell_area :

a GdkRectangle indicating the area to draw contenta GdkRectangle indicating the area to draw content

start :

a GtkTextIter +a GtkTextIter

end :

a GtkTextIter +a GtkTextIter

Returns :

 -TRUE if the renderer is visible, FALSE otherwise
@@ -386,8 +386,8 @@

gtk_source_gutter_renderer_get_padding ()

void                gtk_source_gutter_renderer_get_padding
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         gint *xpad,
-                                                         gint *ypad);
+ gint *xpad, + gint *ypad);

Get the x-padding and y-padding of the gutter renderer.

@@ -401,12 +401,12 @@

xpad :

-return location for the x-padding (can be NULL). [out caller-allocates][allow-none] +return location for the x-padding (can be NULL). [out caller-allocates][allow-none]

ypad :

-return location for the y-padding (can be NULL). [out caller-allocates][allow-none] +return location for the y-padding (can be NULL). [out caller-allocates][allow-none] @@ -417,8 +417,8 @@

gtk_source_gutter_renderer_set_padding ()

void                gtk_source_gutter_renderer_set_padding
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         gint xpad,
-                                                         gint ypad);
+ gint xpad, + gint ypad);

Set the padding of the gutter renderer. Both xpad and ypad can be -1, which means the values will not be changed (this allows changing only @@ -448,8 +448,8 @@

gtk_source_gutter_renderer_get_alignment ()

void                gtk_source_gutter_renderer_get_alignment
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         gfloat *xalign,
-                                                         gfloat *yalign);
+ gfloat *xalign, + gfloat *yalign);

Get the x-alignment and y-alignment of the gutter renderer.

@@ -463,12 +463,12 @@

xalign :

-return location for the x-alignment (can be NULL). [out caller-allocates][allow-none] +return location for the x-alignment (can be NULL). [out caller-allocates][allow-none]

yalign :

-return location for the y-alignment (can be NULL). [out caller-allocates][allow-none] +return location for the y-alignment (can be NULL). [out caller-allocates][allow-none] @@ -479,8 +479,8 @@

gtk_source_gutter_renderer_set_alignment ()

void                gtk_source_gutter_renderer_set_alignment
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         gfloat xalign,
-                                                         gfloat yalign);
+ gfloat xalign, + gfloat yalign);

Set the alignment of the gutter renderer. Both xalign and yalign can be -1, which means the values will not be changed (this allows changing only @@ -534,10 +534,10 @@

gtk_source_gutter_renderer_get_window_type ()

-
GtkTextWindowType   gtk_source_gutter_renderer_get_window_type
+
GtkTextWindowType   gtk_source_gutter_renderer_get_window_type
                                                         (GtkSourceGutterRenderer *renderer);

 

-Get the GtkTextWindowType associated with the gutter renderer.
+Get the GtkTextWindowType associated with the gutter renderer.
 

 
@@ -549,7 +549,7 @@
 
-
@@ -558,7 +558,7 @@
 

 
gtk_source_gutter_renderer_get_view ()

-
GtkTextView *       gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer);

+
GtkTextView *       gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer);

 

 Get the view associated to the gutter renderer
 

@@ -572,7 +572,7 @@
 
 

-
@@ -606,9 +606,9 @@
 

 
gtk_source_gutter_renderer_get_background ()

-
gboolean            gtk_source_gutter_renderer_get_background
+
gboolean            gtk_source_gutter_renderer_get_background
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         GdkRGBA *color);

+                                                         GdkRGBA *color);

 

 Get the background color of the renderer.
 

@@ -622,13 +622,13 @@
 
 

-
+TRUE if the background color is set, FALSE otherwise

 

 

 
Returns :
a GtkTextWindowType
+a GtkTextWindowType
 
 

 
 

 
Returns :
a GtkTextView. [transfer none]
+a GtkTextView. [transfer none]
 
 

 
 

 
color :
return value for a GdkRGBA. [out caller-allocates][allow-none]
+return value for a GdkRGBA. [out caller-allocates][allow-none]
 
 

 

 
Returns :

 
-TRUE if the background color is set, FALSE otherwise
 

 
 

@@ -638,9 +638,9 @@
 
gtk_source_gutter_renderer_set_background ()

 
void                gtk_source_gutter_renderer_set_background
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         const GdkRGBA *color);

+                                                         const GdkRGBA *color);

-Set the background color of the renderer. If color is set to NULL, the +Set the background color of the renderer. If color is set to NULL, the renderer will not have a background color.

@@ -653,7 +653,7 @@ - @@ -663,9 +663,9 @@

gtk_source_gutter_renderer_activate ()

void                gtk_source_gutter_renderer_activate (GtkSourceGutterRenderer *renderer,
-                                                         GtkTextIter *iter,
-                                                         GdkRectangle *area,
-                                                         GdkEvent *event);
+ GtkTextIter *iter, + GdkRectangle *area, + GdkEvent *event);

Emits the ::activate signal of the renderer. This is called from GtkSourceGutter and should never have to be called manually. @@ -680,11 +680,11 @@

- + - + @@ -696,11 +696,11 @@

gtk_source_gutter_renderer_query_activatable ()

-
gboolean            gtk_source_gutter_renderer_query_activatable
+
gboolean            gtk_source_gutter_renderer_query_activatable
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         GtkTextIter *iter,
-                                                         GdkRectangle *area,
-                                                         GdkEvent *event);

+                                                         GtkTextIter *iter,
+                                                         GdkRectangle *area,
+                                                         GdkEvent *event);

Get whether the renderer is activatable at the location in event. This is called from GtkSourceGutter to determine whether a renderer is activatable @@ -716,11 +716,11 @@

- + - + @@ -729,7 +729,7 @@ +TRUE if the renderer can be activated, FALSE otherwise

color :

a GdkRGBA or NULL. [allow-none] +a GdkRGBA or NULL. [allow-none]

iter :

a GtkTextIter at the start of the line where the renderer is activateda GtkTextIter at the start of the line where the renderer is activated

area :

a GdkRectangle of the cell area where the renderer is activateda GdkRectangle of the cell area where the renderer is activated

event :

iter :

a GtkTextIter at the start of the line to be activateda GtkTextIter at the start of the line to be activated

area :

a GdkRectangle of the cell area to be activateda GdkRectangle of the cell area to be activated

event :

Returns :

 -TRUE if the renderer can be activated, FALSE otherwise
@@ -756,13 +756,13 @@

gtk_source_gutter_renderer_query_tooltip ()

-
gboolean            gtk_source_gutter_renderer_query_tooltip
+
gboolean            gtk_source_gutter_renderer_query_tooltip
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         GtkTextIter *iter,
-                                                         GdkRectangle *area,
-                                                         gint x,
-                                                         gint y,
-                                                         GtkTooltip *tooltip);

+                                                         GtkTextIter *iter,
+                                                         GdkRectangle *area,
+                                                         gint x,
+                                                         gint y,
+                                                         GtkTooltip *tooltip);

Emits the ::query-tooltip signal. This function is called from GtkSourceGutter. Implementations can override the default signal handler @@ -777,11 +777,11 @@

iter :

-a GtkTextIter. +a GtkTextIter.

area :

-a GdkRectangle. +a GdkRectangle.

x :

@@ -793,12 +793,12 @@

tooltip :

-a GtkTooltip. +a GtkTooltip.

Returns :

-TRUE if the tooltip has been set, FALSE otherwise +TRUE if the tooltip has been set, FALSE otherwise
@@ -808,8 +808,8 @@

gtk_source_gutter_renderer_query_data ()

void                gtk_source_gutter_renderer_query_data
                                                         (GtkSourceGutterRenderer *renderer,
-                                                         GtkTextIter *start,
-                                                         GtkTextIter *end,
+                                                         GtkTextIter *start,
+                                                         GtkTextIter *end,
                                                          GtkSourceGutterRendererState state);

Emit the ::query-data signal. This function is called to query for data @@ -826,11 +826,11 @@

start :

-a GtkTextIter. +a GtkTextIter.

end :

-a GtkTextIter. +a GtkTextIter.

state :

@@ -843,6 +843,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRendererPixbuf.html gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRendererPixbuf.html --- gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRendererPixbuf.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRendererPixbuf.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -45,23 +45,23 @@ (void); void gtk_source_gutter_renderer_pixbuf_set_pixbuf (GtkSourceGutterRendererPixbuf *renderer, - GdkPixbuf *pixbuf); -GdkPixbuf * gtk_source_gutter_renderer_pixbuf_get_pixbuf + GdkPixbuf *pixbuf); +GdkPixbuf * gtk_source_gutter_renderer_pixbuf_get_pixbuf (GtkSourceGutterRendererPixbuf *renderer); void gtk_source_gutter_renderer_pixbuf_set_stock_id (GtkSourceGutterRendererPixbuf *renderer, - const gchar *stock_id); -const gchar * gtk_source_gutter_renderer_pixbuf_get_stock_id + const gchar *stock_id); +const gchar * gtk_source_gutter_renderer_pixbuf_get_stock_id (GtkSourceGutterRendererPixbuf *renderer); void gtk_source_gutter_renderer_pixbuf_set_gicon (GtkSourceGutterRendererPixbuf *renderer, - GIcon *icon); -GIcon * gtk_source_gutter_renderer_pixbuf_get_gicon + GIcon *icon); +GIcon * gtk_source_gutter_renderer_pixbuf_get_gicon (GtkSourceGutterRendererPixbuf *renderer); void gtk_source_gutter_renderer_pixbuf_set_icon_name (GtkSourceGutterRendererPixbuf *renderer, - const gchar *icon_name); -const gchar * gtk_source_gutter_renderer_pixbuf_get_icon_name + const gchar *icon_name); +const gchar * gtk_source_gutter_renderer_pixbuf_get_icon_name (GtkSourceGutterRendererPixbuf *renderer);
@@ -98,12 +98,12 @@

gtk_source_gutter_renderer_pixbuf_set_pixbuf ()

void                gtk_source_gutter_renderer_pixbuf_set_pixbuf
                                                         (GtkSourceGutterRendererPixbuf *renderer,
-                                                         GdkPixbuf *pixbuf);
+ GdkPixbuf *pixbuf);

gtk_source_gutter_renderer_pixbuf_get_pixbuf ()

-
GdkPixbuf *         gtk_source_gutter_renderer_pixbuf_get_pixbuf
+
GdkPixbuf *         gtk_source_gutter_renderer_pixbuf_get_pixbuf
                                                         (GtkSourceGutterRendererPixbuf *renderer);

 

 Get the pixbuf of the renderer.
@@ -118,7 +118,7 @@
 
 
 
Returns :

-a GdkPixbuf. [transfer none]
+a GdkPixbuf. [transfer none]
 
 
 
@@ -129,12 +129,12 @@
 
gtk_source_gutter_renderer_pixbuf_set_stock_id ()

 
void                gtk_source_gutter_renderer_pixbuf_set_stock_id
                                                         (GtkSourceGutterRendererPixbuf *renderer,
-                                                         const gchar *stock_id);

+                                                         const gchar *stock_id);

gtk_source_gutter_renderer_pixbuf_get_stock_id ()

-
const gchar *       gtk_source_gutter_renderer_pixbuf_get_stock_id
+
const gchar *       gtk_source_gutter_renderer_pixbuf_get_stock_id
                                                         (GtkSourceGutterRendererPixbuf *renderer);
@@ -142,12 +142,12 @@

gtk_source_gutter_renderer_pixbuf_set_gicon ()

void                gtk_source_gutter_renderer_pixbuf_set_gicon
                                                         (GtkSourceGutterRendererPixbuf *renderer,
-                                                         GIcon *icon);
+ GIcon *icon);

gtk_source_gutter_renderer_pixbuf_get_gicon ()

-
GIcon *             gtk_source_gutter_renderer_pixbuf_get_gicon
+
GIcon *             gtk_source_gutter_renderer_pixbuf_get_gicon
                                                         (GtkSourceGutterRendererPixbuf *renderer);

 

 Get the gicon of the renderer
@@ -162,7 +162,7 @@
 
 
 
Returns :

-a GIcon. [transfer none]
+a GIcon. [transfer none]
 
 
 
@@ -173,18 +173,18 @@
 
gtk_source_gutter_renderer_pixbuf_set_icon_name ()

 
void                gtk_source_gutter_renderer_pixbuf_set_icon_name
                                                         (GtkSourceGutterRendererPixbuf *renderer,
-                                                         const gchar *icon_name);

+                                                         const gchar *icon_name);

gtk_source_gutter_renderer_pixbuf_get_icon_name ()

-
const gchar *       gtk_source_gutter_renderer_pixbuf_get_icon_name
+
const gchar *       gtk_source_gutter_renderer_pixbuf_get_icon_name
                                                         (GtkSourceGutterRendererPixbuf *renderer);
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRendererText.html gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRendererText.html --- gtksourceview3-3.3.5/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRendererText.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/gtksourceview-3.0-GtkSourceGutterRendererText.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -45,22 +45,22 @@ (void); void gtk_source_gutter_renderer_text_set_markup (GtkSourceGutterRendererText *renderer, - const gchar *markup, - gint length); + const gchar *markup, + gint length); void gtk_source_gutter_renderer_text_set_text (GtkSourceGutterRendererText *renderer, - const gchar *text, - gint length); + const gchar *text, + gint length); void gtk_source_gutter_renderer_text_measure (GtkSourceGutterRendererText *renderer, - const gchar *text, - gint *width, - gint *height); + const gchar *text, + gint *width, + gint *height); void gtk_source_gutter_renderer_text_measure_markup (GtkSourceGutterRendererText *renderer, - const gchar *markup, - gint *width, - gint *height); + const gchar *markup, + gint *width, + gint *height);
@@ -96,39 +96,39 @@

gtk_source_gutter_renderer_text_set_markup ()

void                gtk_source_gutter_renderer_text_set_markup
                                                         (GtkSourceGutterRendererText *renderer,
-                                                         const gchar *markup,
-                                                         gint length);
+ const gchar *markup, + gint length);

gtk_source_gutter_renderer_text_set_text ()

void                gtk_source_gutter_renderer_text_set_text
                                                         (GtkSourceGutterRendererText *renderer,
-                                                         const gchar *text,
-                                                         gint length);
+ const gchar *text, + gint length);

gtk_source_gutter_renderer_text_measure ()

void                gtk_source_gutter_renderer_text_measure
                                                         (GtkSourceGutterRendererText *renderer,
-                                                         const gchar *text,
-                                                         gint *width,
-                                                         gint *height);
+ const gchar *text, + gint *width, + gint *height);

gtk_source_gutter_renderer_text_measure_markup ()

void                gtk_source_gutter_renderer_text_measure_markup
                                                         (GtkSourceGutterRendererText *renderer,
-                                                         const gchar *markup,
-                                                         gint *width,
-                                                         gint *height);
+ const gchar *markup, + gint *width, + gint *height);
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/GtkSourceView.html gtksourceview3-3.4.0/docs/reference/html/GtkSourceView.html --- gtksourceview3-3.3.5/docs/reference/html/GtkSourceView.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/GtkSourceView.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -52,77 +52,77 @@ enum GtkSourceSmartHomeEndType; enum GtkSourceDrawSpacesFlags; enum GtkSourceViewGutterPosition; -GtkWidget * gtk_source_view_new (void); -GtkWidget * gtk_source_view_new_with_buffer (GtkSourceBuffer *buffer); +GtkWidget * gtk_source_view_new (void); +GtkWidget * gtk_source_view_new_with_buffer (GtkSourceBuffer *buffer); void gtk_source_view_set_auto_indent (GtkSourceView *view, - gboolean enable); -gboolean gtk_source_view_get_auto_indent (GtkSourceView *view); + gboolean enable); +gboolean gtk_source_view_get_auto_indent (GtkSourceView *view); void gtk_source_view_set_indent_on_tab (GtkSourceView *view, - gboolean enable); -gboolean gtk_source_view_get_indent_on_tab (GtkSourceView *view); + gboolean enable); +gboolean gtk_source_view_get_indent_on_tab (GtkSourceView *view); void gtk_source_view_set_indent_width (GtkSourceView *view, - gint width); -gint gtk_source_view_get_indent_width (GtkSourceView *view); + gint width); +gint gtk_source_view_get_indent_width (GtkSourceView *view); void gtk_source_view_set_insert_spaces_instead_of_tabs (GtkSourceView *view, - gboolean enable); -gboolean gtk_source_view_get_insert_spaces_instead_of_tabs + gboolean enable); +gboolean gtk_source_view_get_insert_spaces_instead_of_tabs (GtkSourceView *view); void gtk_source_view_set_smart_home_end (GtkSourceView *view, GtkSourceSmartHomeEndType smart_he); GtkSourceSmartHomeEndType gtk_source_view_get_smart_home_end (GtkSourceView *view); void gtk_source_view_set_mark_attributes (GtkSourceView *view, - const gchar *category, + const gchar *category, GtkSourceMarkAttributes *attributes, - gint priority); + gint priority); GtkSourceMarkAttributes * gtk_source_view_get_mark_attributes (GtkSourceView *view, - const gchar *category, - gint *priority); + const gchar *category, + gint *priority); void gtk_source_view_set_highlight_current_line (GtkSourceView *view, - gboolean hl); -gboolean gtk_source_view_get_highlight_current_line + gboolean hl); +gboolean gtk_source_view_get_highlight_current_line (GtkSourceView *view); void gtk_source_view_set_show_line_marks (GtkSourceView *view, - gboolean show); -gboolean gtk_source_view_get_show_line_marks (GtkSourceView *view); + gboolean show); +gboolean gtk_source_view_get_show_line_marks (GtkSourceView *view); void gtk_source_view_set_show_line_numbers (GtkSourceView *view, - gboolean show); -gboolean gtk_source_view_get_show_line_numbers + gboolean show); +gboolean gtk_source_view_get_show_line_numbers (GtkSourceView *view); void gtk_source_view_set_show_right_margin (GtkSourceView *view, - gboolean show); -gboolean gtk_source_view_get_show_right_margin + gboolean show); +gboolean gtk_source_view_get_show_right_margin (GtkSourceView *view); void gtk_source_view_set_right_margin_position (GtkSourceView *view, - guint pos); -guint gtk_source_view_get_right_margin_position + guint pos); +guint gtk_source_view_get_right_margin_position (GtkSourceView *view); void gtk_source_view_set_tab_width (GtkSourceView *view, - guint width); -guint gtk_source_view_get_tab_width (GtkSourceView *view); + guint width); +guint gtk_source_view_get_tab_width (GtkSourceView *view); void gtk_source_view_set_draw_spaces (GtkSourceView *view, GtkSourceDrawSpacesFlags flags); GtkSourceDrawSpacesFlags gtk_source_view_get_draw_spaces (GtkSourceView *view); GtkSourceCompletion * gtk_source_view_get_completion (GtkSourceView *view); GtkSourceGutter * gtk_source_view_get_gutter (GtkSourceView *view, - GtkTextWindowType window_type); + GtkTextWindowType window_type);

Object Hierarchy

-  GObject
-   +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkTextView
+  GObject
+   +----GInitiallyUnowned
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkTextView
                            +----GtkSourceView
@@ -130,36 +130,36 @@

Implemented Interfaces

GtkSourceView implements - AtkImplementorIface, GtkBuildable and GtkScrollable.

+ AtkImplementorIface, GtkBuildable and GtkScrollable.

Properties

-  "auto-indent"              gboolean              : Read / Write
+  "auto-indent"              gboolean              : Read / Write
   "completion"               GtkSourceCompletion*  : Read
   "draw-spaces"              GtkSourceDrawSpacesFlags  : Read / Write
-  "highlight-current-line"   gboolean              : Read / Write
-  "indent-on-tab"            gboolean              : Read / Write
-  "indent-width"             gint                  : Read / Write
-  "insert-spaces-instead-of-tabs" gboolean              : Read / Write
-  "right-margin-position"    guint                 : Read / Write
-  "show-line-marks"          gboolean              : Read / Write
-  "show-line-numbers"        gboolean              : Read / Write
-  "show-right-margin"        gboolean              : Read / Write
+  "highlight-current-line"   gboolean              : Read / Write
+  "indent-on-tab"            gboolean              : Read / Write
+  "indent-width"             gint                  : Read / Write
+  "insert-spaces-instead-of-tabs" gboolean              : Read / Write
+  "right-margin-position"    guint                 : Read / Write
+  "show-line-marks"          gboolean              : Read / Write
+  "show-line-numbers"        gboolean              : Read / Write
+  "show-right-margin"        gboolean              : Read / Write
   "smart-home-end"           GtkSourceSmartHomeEndType  : Read / Write
-  "tab-width"                guint                 : Read / Write
+  "tab-width"                guint                 : Read / Write

Signals

-  "line-mark-activated"                            : Run Last
-  "move-lines"                                     : Action
-  "move-words"                                     : Action
-  "redo"                                           : Action
-  "show-completion"                                : Action
-  "smart-home-end"                                 : Run Last
-  "undo"                                           : Action
+  "line-mark-activated"                            : Run Last
+  "move-lines"                                     : Action
+  "move-words"                                     : Action
+  "redo"                                           : Action
+  "show-completion"                                : Action
+  "smart-home-end"                                 : Run Last
+  "undo"                                           : Action
@@ -318,7 +318,7 @@

gtk_source_view_new ()

-
GtkWidget *         gtk_source_view_new                 (void);
+
GtkWidget *         gtk_source_view_new                 (void);

Creates a new GtkSourceView. An empty default buffer will be created for you. If you want to specify your own buffer, consider @@ -335,7 +335,7 @@

gtk_source_view_new_with_buffer ()

-
GtkWidget *         gtk_source_view_new_with_buffer     (GtkSourceBuffer *buffer);
+
GtkWidget *         gtk_source_view_new_with_buffer     (GtkSourceBuffer *buffer);

Creates a new GtkSourceView widget displaying the buffer buffer. One buffer can be shared among many widgets. @@ -358,9 +358,9 @@

gtk_source_view_set_auto_indent ()

void                gtk_source_view_set_auto_indent     (GtkSourceView *view,
-                                                         gboolean enable);
+ gboolean enable);

-If TRUE auto indentation of text is enabled. +If TRUE auto indentation of text is enabled.

@@ -379,7 +379,7 @@

gtk_source_view_get_auto_indent ()

-
gboolean            gtk_source_view_get_auto_indent     (GtkSourceView *view);
+
gboolean            gtk_source_view_get_auto_indent     (GtkSourceView *view);

Returns whether auto indentation of text is enabled.

@@ -393,7 +393,7 @@
+TRUE if auto indentation is enabled.

Returns :

 -TRUE if auto indentation is enabled.
@@ -402,9 +402,9 @@

gtk_source_view_set_indent_on_tab ()

void                gtk_source_view_set_indent_on_tab   (GtkSourceView *view,
-                                                         gboolean enable);
+ gboolean enable);

-If TRUE, when the tab key is pressed and there is a selection, the +If TRUE, when the tab key is pressed and there is a selection, the selected text is indented of one level instead of being replaced with the \t characters. Shift+Tab unindents the selection.

@@ -426,7 +426,7 @@

gtk_source_view_get_indent_on_tab ()

-
gboolean            gtk_source_view_get_indent_on_tab   (GtkSourceView *view);
+
gboolean            gtk_source_view_get_indent_on_tab   (GtkSourceView *view);

Returns whether when the tab key is pressed the current selection should get indented instead of replaced with the \t character. @@ -441,7 +441,7 @@

Returns :

-TRUE if the selection is indented when tab is pressed. +TRUE if the selection is indented when tab is pressed.
@@ -451,7 +451,7 @@

gtk_source_view_set_indent_width ()

void                gtk_source_view_set_indent_width    (GtkSourceView *view,
-                                                         gint width);
+ gint width);

Sets the number of spaces to use for each step of indent. If width is -1, the value of the GtkSourceView::tab-width property @@ -474,7 +474,7 @@

gtk_source_view_get_indent_width ()

-
gint                gtk_source_view_get_indent_width    (GtkSourceView *view);
+
gint                gtk_source_view_get_indent_width    (GtkSourceView *view);

Returns the number of spaces to use for each step of indent. See gtk_source_view_set_indent_width() for details. @@ -498,9 +498,9 @@

gtk_source_view_set_insert_spaces_instead_of_tabs ()

void                gtk_source_view_set_insert_spaces_instead_of_tabs
                                                         (GtkSourceView *view,
-                                                         gboolean enable);
+ gboolean enable);

-If TRUE any tabulator character inserted is replaced by a group +If TRUE any tabulator character inserted is replaced by a group of space characters.

@@ -520,7 +520,7 @@

gtk_source_view_get_insert_spaces_instead_of_tabs ()

-
gboolean            gtk_source_view_get_insert_spaces_instead_of_tabs
+
gboolean            gtk_source_view_get_insert_spaces_instead_of_tabs
                                                         (GtkSourceView *view);

 

 Returns whether when inserting a tabulator character it should
@@ -536,7 +536,7 @@
+TRUE if spaces are inserted instead of tabs.

Returns :

 -TRUE if spaces are inserted instead of tabs.
@@ -591,9 +591,9 @@

gtk_source_view_set_mark_attributes ()

void                gtk_source_view_set_mark_attributes (GtkSourceView *view,
-                                                         const gchar *category,
+                                                         const gchar *category,
                                                          GtkSourceMarkAttributes *attributes,
-                                                         gint priority);
+ gint priority);

Sets attributes and priority for the category.

@@ -624,8 +624,8 @@

gtk_source_view_get_mark_attributes ()

GtkSourceMarkAttributes * gtk_source_view_get_mark_attributes
                                                         (GtkSourceView *view,
-                                                         const gchar *category,
-                                                         gint *priority);
+ const gchar *category, + gint *priority);

Gets attributes and priority for the category.

@@ -659,9 +659,9 @@

gtk_source_view_set_highlight_current_line ()

void                gtk_source_view_set_highlight_current_line
                                                         (GtkSourceView *view,
-                                                         gboolean hl);
+ gboolean hl);

-If hl is TRUE the current line is highlighted. +If hl is TRUE the current line is highlighted.

@@ -680,7 +680,7 @@

gtk_source_view_get_highlight_current_line ()

-
gboolean            gtk_source_view_get_highlight_current_line
+
gboolean            gtk_source_view_get_highlight_current_line
                                                         (GtkSourceView *view);

 

 Returns whether the current line is highlighted.
@@ -695,7 +695,7 @@
+TRUE if the current line is highlighted.

Returns :

 -TRUE if the current line is highlighted.
@@ -704,9 +704,9 @@

gtk_source_view_set_show_line_marks ()

void                gtk_source_view_set_show_line_marks (GtkSourceView *view,
-                                                         gboolean show);
+ gboolean show);

-If TRUE line marks will be displayed beside the text. +If TRUE line marks will be displayed beside the text.

@@ -726,7 +726,7 @@

gtk_source_view_get_show_line_marks ()

-
gboolean            gtk_source_view_get_show_line_marks (GtkSourceView *view);
+
gboolean            gtk_source_view_get_show_line_marks (GtkSourceView *view);

Returns whether line marks are displayed beside the text.

@@ -740,7 +740,7 @@
+TRUE if the line marks are displayed.

Returns :

 -TRUE if the line marks are displayed.
@@ -751,9 +751,9 @@

gtk_source_view_set_show_line_numbers ()

void                gtk_source_view_set_show_line_numbers
                                                         (GtkSourceView *view,
-                                                         gboolean show);
+ gboolean show);

-If TRUE line numbers will be displayed beside the text. +If TRUE line numbers will be displayed beside the text.

@@ -772,7 +772,7 @@

gtk_source_view_get_show_line_numbers ()

-
gboolean            gtk_source_view_get_show_line_numbers
+
gboolean            gtk_source_view_get_show_line_numbers
                                                         (GtkSourceView *view);

 

 Returns whether line numbers are displayed beside the text.
@@ -787,7 +787,7 @@
+TRUE if the line numbers are displayed.

Returns :

 -TRUE if the line numbers are displayed.
@@ -797,9 +797,9 @@

gtk_source_view_set_show_right_margin ()

void                gtk_source_view_set_show_right_margin
                                                         (GtkSourceView *view,
-                                                         gboolean show);
+ gboolean show);

-If TRUE a right margin is displayed. +If TRUE a right margin is displayed.

@@ -818,7 +818,7 @@

gtk_source_view_get_show_right_margin ()

-
gboolean            gtk_source_view_get_show_right_margin
+
gboolean            gtk_source_view_get_show_right_margin
                                                         (GtkSourceView *view);

 

 Returns whether a right margin is displayed.
@@ -833,7 +833,7 @@
+TRUE if the right margin is shown.

Returns :

 -TRUE if the right margin is shown.
@@ -843,7 +843,7 @@

gtk_source_view_set_right_margin_position ()

void                gtk_source_view_set_right_margin_position
                                                         (GtkSourceView *view,
-                                                         guint pos);
+ guint pos);

Sets the position of the right margin in the given view.

@@ -864,7 +864,7 @@

gtk_source_view_get_right_margin_position ()

-
guint               gtk_source_view_get_right_margin_position
+
guint               gtk_source_view_get_right_margin_position
                                                         (GtkSourceView *view);

 

 Gets the position of the right margin in the given view.
@@ -887,7 +887,7 @@
 

 
gtk_source_view_set_tab_width ()

 
void                gtk_source_view_set_tab_width       (GtkSourceView *view,
-                                                         guint width);

+                                                         guint width);

Sets the width of tabulation in characters.

@@ -908,7 +908,7 @@

gtk_source_view_get_tab_width ()

-
guint               gtk_source_view_get_tab_width       (GtkSourceView *view);
+
guint               gtk_source_view_get_tab_width       (GtkSourceView *view);

Returns the width of tabulation in characters.

@@ -991,7 +991,7 @@

Returns :

-the GtkSourceCompletion associated with view. [type GtkSource.Completion][transfer none] +the GtkSourceCompletion associated with view. [type GtkSource.Completion][transfer none] @@ -1001,7 +1001,7 @@

gtk_source_view_get_gutter ()

GtkSourceGutter *   gtk_source_view_get_gutter          (GtkSourceView *view,
-                                                         GtkTextWindowType window_type);
+ GtkTextWindowType window_type);

Returns the GtkSourceGutter object associated with window_type for view. Only GTK_TEXT_WINDOW_LEFT and GTK_TEXT_WINDOW_RIGHT are supported, @@ -1034,7 +1034,7 @@

Property Details

The "auto-indent" property

-
  "auto-indent"              gboolean              : Read / Write
+
  "auto-indent"              gboolean              : Read / Write

Whether to enable auto indentation.

Default value: FALSE

@@ -1056,21 +1056,21 @@

The "highlight-current-line" property

-
  "highlight-current-line"   gboolean              : Read / Write
+
  "highlight-current-line"   gboolean              : Read / Write

Whether to highlight the current line.

Default value: FALSE

The "indent-on-tab" property

-
  "indent-on-tab"            gboolean              : Read / Write
+
  "indent-on-tab"            gboolean              : Read / Write

Whether to indent the selected text when the tab key is pressed.

Default value: TRUE

The "indent-width" property

-
  "indent-width"             gint                  : Read / Write
+
  "indent-width"             gint                  : Read / Write

Width of an indentation step expressed in number of spaces.

@@ -1080,14 +1080,14 @@

The "insert-spaces-instead-of-tabs" property

-
  "insert-spaces-instead-of-tabs" gboolean              : Read / Write
+
  "insert-spaces-instead-of-tabs" gboolean              : Read / Write

Whether to insert spaces instead of tabs.

Default value: FALSE

The "right-margin-position" property

-
  "right-margin-position"    guint                 : Read / Write
+
  "right-margin-position"    guint                 : Read / Write

Position of the right margin.

@@ -1097,7 +1097,7 @@

The "show-line-marks" property

-
  "show-line-marks"          gboolean              : Read / Write
+
  "show-line-marks"          gboolean              : Read / Write

Whether to display line mark pixbufs

@@ -1106,7 +1106,7 @@

The "show-line-numbers" property

-
  "show-line-numbers"        gboolean              : Read / Write
+
  "show-line-numbers"        gboolean              : Read / Write

Whether to display line numbers

@@ -1115,7 +1115,7 @@

The "show-right-margin" property

-
  "show-right-margin"        gboolean              : Read / Write
+
  "show-right-margin"        gboolean              : Read / Write

Whether to display the right margin.

@@ -1134,7 +1134,7 @@

The "tab-width" property

-
  "tab-width"                guint                 : Read / Write
+
  "tab-width"                guint                 : Read / Write

Width of an tab character expressed in number of spaces.

@@ -1147,9 +1147,9 @@

The "line-mark-activated" signal

void                user_function                      (GtkSourceView *view,
-                                                        GtkTextIter   *iter,
-                                                        GdkEvent      *event,
-                                                        gpointer       user_data)      : Run Last
+ GtkTextIter *iter, + GdkEvent *event, + gpointer user_data) : Run Last

Emitted when a line mark has been activated (for instance when there was a button press in the line marks gutter). You can use iter to @@ -1165,12 +1165,12 @@

iter :

-a GtkTextIter +a GtkTextIter

event :

-the GdkEvent that activated the event +the GdkEvent that activated the event

user_data :

@@ -1183,9 +1183,9 @@

The "move-lines" signal

void                user_function                      (GtkSourceView *view,
-                                                        gboolean       copy,
-                                                        gint           count,
-                                                        gpointer       user_data)      : Action
+ gboolean copy, + gint count, + gpointer user_data) : Action

The ::move-lines signal is a keybinding which gets emitted when the user initiates moving a line. The default binding key @@ -1203,8 +1203,8 @@

copy :

-TRUE if the line should be copied, -FALSE if it should be moved +TRUE if the line should be copied, +FALSE if it should be moved

count :

@@ -1222,8 +1222,8 @@

The "move-words" signal

void                user_function                      (GtkSourceView *view,
-                                                        gint           count,
-                                                        gpointer       user_data)      : Action
+ gint count, + gpointer user_data) : Action

The ::move-words signal is a keybinding which gets emitted when the user initiates moving a word. The default binding key @@ -1253,20 +1253,20 @@

The "redo" signal

void                user_function                      (GtkSourceView *sourceview,
-                                                        gpointer       user_data)       : Action
+ gpointer user_data) : Action

The "show-completion" signal

void                user_function                      (GtkSourceView *view,
-                                                        gpointer       user_data)      : Action
+ gpointer user_data) : Action

The ::show-completion signal is a keybinding signal which gets emitted when the user initiates a completion in default mode.

Applications should not connect to it, but may emit it with -g_signal_emit_by_name if they need to control the default mode +g_signal_emit_by_name if they need to control the default mode completion activation.

@@ -1287,9 +1287,9 @@

The "smart-home-end" signal

void                user_function                      (GtkSourceView *view,
-                                                        GtkTextIter   *iter,
-                                                        gint           count,
-                                                        gpointer       user_data)      : Run Last
+ GtkTextIter *iter, + gint count, + gpointer user_data) : Run Last

Emitted when a the cursor was moved according to the smart home end setting. The signal is emitted after the cursor is moved, but @@ -1307,7 +1307,7 @@

- @@ -1326,16 +1326,16 @@

The "undo" signal

void                user_function                      (GtkSourceView *sourceview,
-                                                        gpointer       user_data)       : Action
+ gpointer user_data) : Action

See Also

-GtkTextView,GtkSourceBuffer +GtkTextView,GtkSourceBuffer
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/index.html gtksourceview3-3.4.0/docs/reference/html/index.html --- gtksourceview3-3.3.5/docs/reference/html/index.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/index.html 2012-03-26 17:33:44.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@

iter :

a GtkTextIter +a GtkTextIter
-

for GtkSourceView 3.3.5 +

for GtkSourceView 3.4.0

@@ -112,6 +112,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/index.sgml gtksourceview3-3.4.0/docs/reference/html/index.sgml --- gtksourceview3-3.3.5/docs/reference/html/index.sgml 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/index.sgml 2012-03-26 17:33:44.000000000 +0000 @@ -561,6 +561,7 @@ + diff -Nru gtksourceview3-3.3.5/docs/reference/html/lang-reference.html gtksourceview3-3.4.0/docs/reference/html/lang-reference.html --- gtksourceview3-3.3.5/docs/reference/html/lang-reference.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/lang-reference.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -31,7 +31,7 @@
-

Overview

+

Overview

This is an overview of the Language Definition XML format, describing the meaning and usage of every element and attribute. The formal definition is @@ -43,7 +43,7 @@

-

Tag <language> +

Tag <language>

The root element for Language Definition files. @@ -103,7 +103,7 @@

-

Tag <metadata> +

Tag <metadata>

Contains optional metadata about the language definition. @@ -137,7 +137,7 @@

-

Tag <styles> +

Tag <styles>

Contains the definitions of every style used in the current language and @@ -149,7 +149,7 @@

-

Tag <style> +

Tag <style>

Defines a style, associating it's id with a user visible translatable @@ -196,7 +196,7 @@

-

Tag <keyword-char-class> +

Tag <keyword-char-class>

Contains a regex character class used to redefine the customizable @@ -209,7 +209,7 @@

-

Tag <default-regex-options> +

Tag <default-regex-options>

Used to set global options for how regular expressions are processed. @@ -253,7 +253,7 @@

-

Tag <definitions> +

Tag <definitions>

The element containing the real description of the syntax to be @@ -274,7 +274,7 @@

-

Tag <define-regex> +

Tag <define-regex>

Defines a regular expression that can be reused inside other regular @@ -320,7 +320,7 @@

-

Tag <context> +

Tag <context>

This is the most important element when describing the syntax: the file to @@ -330,7 +330,7 @@ contexts, sub-pattern contexts, reference contexts and keyword contexts.

-

Simple contexts

+

Simple contexts

They contain a mandatory <match> element and an optional <include> element. The context will span over the strings matched by the regular expression contained in the <match> @@ -398,7 +398,7 @@
-

Container contexts

+

Container contexts

They contain a <start> element and an optional <end>. They respectively contain the regular expression that makes the engine enter in the context and the terminating one. @@ -487,7 +487,7 @@
-

Sub-pattern contexts

+

Sub-pattern contexts

They refer to a group in a regular expression of the parent context, so it is possible to highlight differently only a portion of the matched regular @@ -532,7 +532,7 @@

-

Reference contexts

+

Reference contexts

Used to include a previously defined context.

@@ -576,7 +576,7 @@
-

Keyword contexts

+

Keyword contexts

They contain a list of <keyword> and matches every keyword listed. You can also put a <prefix> and/or a @@ -597,7 +597,7 @@

-

Tag <include> +

Tag <include>

Contains the list of context contained in the current @@ -609,7 +609,7 @@

-

Tag <match> +

Tag <match>

Contains the regular expression for the current simple context. @@ -623,7 +623,7 @@

-

Tag <start> +

Tag <start>

Contains the starting regular expression for the current container context. @@ -637,7 +637,7 @@

-

Tag <end> +

Tag <end>

Contains the terminating regular expression for the current container @@ -663,7 +663,7 @@

-

Tag <keyword> +

Tag <keyword>

Contains a keyword to be matched by the current context. The keyword is a @@ -674,7 +674,7 @@

-

Tag <prefix> +

Tag <prefix>

Contains a prefix common to all of the following keywords in the current @@ -687,7 +687,7 @@

-

Tag <suffix> +

Tag <suffix>

Contains a suffix common to all of the following keywords in the current @@ -700,7 +700,7 @@

-

Tag <replace> +

Tag <replace>

The replace tag allows you to change one context so it functions as @@ -739,6 +739,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/lang-tutorial.html gtksourceview3-3.4.0/docs/reference/html/lang-tutorial.html --- gtksourceview3-3.3.5/docs/reference/html/lang-tutorial.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/lang-tutorial.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -510,7 +510,7 @@
-

The full language definition

+

The full language definition

This is the full language definition for the subset of C taken in consideration for this tutorial: @@ -646,6 +646,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/rn01.html gtksourceview3-3.4.0/docs/reference/html/rn01.html --- gtksourceview3-3.3.5/docs/reference/html/rn01.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/rn01.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,7 +22,7 @@

-API reference

+API reference
@@ -96,6 +96,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/rn02.html gtksourceview3-3.4.0/docs/reference/html/rn02.html --- gtksourceview3-3.3.5/docs/reference/html/rn02.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/rn02.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -22,7 +22,7 @@

-Syntax highlighting reference

+Syntax highlighting reference
@@ -48,6 +48,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/html/style-reference.html gtksourceview3-3.4.0/docs/reference/html/style-reference.html --- gtksourceview3-3.3.5/docs/reference/html/style-reference.html 2012-03-19 22:51:41.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/html/style-reference.html 2012-03-26 17:33:44.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -31,7 +31,7 @@
-

Overview

+

Overview

This is an overview of the Style Scheme Definition XML format, describing the meaning and usage of every element and attribute. The formal definition is @@ -235,6 +235,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru gtksourceview3-3.3.5/docs/reference/Makefile.in gtksourceview3-3.4.0/docs/reference/Makefile.in --- gtksourceview3-3.3.5/docs/reference/Makefile.in 2012-03-19 22:39:07.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/Makefile.in 2012-03-26 17:11:55.000000000 +0000 @@ -677,7 +677,7 @@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: diff -Nru gtksourceview3-3.3.5/docs/reference/version.xml gtksourceview3-3.4.0/docs/reference/version.xml --- gtksourceview3-3.3.5/docs/reference/version.xml 2012-03-19 22:39:15.000000000 +0000 +++ gtksourceview3-3.4.0/docs/reference/version.xml 2012-03-26 17:12:01.000000000 +0000 @@ -1 +1 @@ -3.3.5 +3.4.0 diff -Nru gtksourceview3-3.3.5/gtk-doc.make gtksourceview3-3.4.0/gtk-doc.make --- gtksourceview3-3.3.5/gtk-doc.make 2012-03-19 22:39:01.000000000 +0000 +++ gtksourceview3-3.4.0/gtk-doc.make 2012-03-26 17:11:50.000000000 +0000 @@ -200,7 +200,7 @@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: diff -Nru gtksourceview3-3.3.5/m4/intltool.m4 gtksourceview3-3.4.0/m4/intltool.m4 --- gtksourceview3-3.3.5/m4/intltool.m4 2012-03-19 22:39:01.000000000 +0000 +++ gtksourceview3-3.4.0/m4/intltool.m4 2012-03-26 17:11:50.000000000 +0000 @@ -66,7 +66,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' @@ -119,7 +119,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then diff -Nru gtksourceview3-3.3.5/NEWS gtksourceview3-3.4.0/NEWS --- gtksourceview3-3.3.5/NEWS 2012-03-19 22:38:25.000000000 +0000 +++ gtksourceview3-3.4.0/NEWS 2012-03-26 17:11:09.000000000 +0000 @@ -1,3 +1,7 @@ +News in 3.4.0 +------------- +* Updated translations + News in 3.3.5 ------------- * Misc bugfixes diff -Nru gtksourceview3-3.3.5/po/Makefile.in.in gtksourceview3-3.4.0/po/Makefile.in.in --- gtksourceview3-3.3.5/po/Makefile.in.in 2012-03-19 22:39:01.000000000 +0000 +++ gtksourceview3-3.4.0/po/Makefile.in.in 2012-03-26 17:11:50.000000000 +0000 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ diff -Nru gtksourceview3-3.3.5/po/uk.po gtksourceview3-3.4.0/po/uk.po --- gtksourceview3-3.3.5/po/uk.po 2011-12-28 11:16:45.000000000 +0000 +++ gtksourceview3-3.4.0/po/uk.po 2012-03-26 17:10:25.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the gtksourceview package. # Maxim Dziumanenko , 2003-2008 # wanderlust , 2009. -# Korostil Daniel , 2011. +# Korostil Daniel , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: gtksourceview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-18 18:02+0200\n" -"PO-Revision-Date: 2011-03-18 18:37+0300\n" +"POT-Creation-Date: 2012-03-25 00:14+0200\n" +"PO-Revision-Date: 2012-03-25 00:54+0300\n" "Last-Translator: Korostil Daniel \n" "Language-Team: translation@linux.org.ua\n" "Language: uk\n" @@ -18,54 +18,48 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Virtaal 0.6.1\n" +"X-Generator: Virtaal 0.7.1\n" #: ../data/glade/gtksourceview.xml.in.h:1 -msgid "After" -msgstr "Після" - -#. Translators: "All" is used as a label in thestatus bar of the -#. popup, telling that all completion pages are shown -#: ../data/glade/gtksourceview.xml.in.h:2 -#: ../gtksourceview/gtksourcecompletion.c:648 -msgid "All" -msgstr "Усі" +msgid "GtkSourceView" +msgstr "GtkSourceView" +#. Translators: It is related to an option of a set of values #: ../data/glade/gtksourceview.xml.in.h:3 -msgid "Always" -msgstr "Завжди" +msgid "Disabled" +msgstr "Вимкнено" #: ../data/glade/gtksourceview.xml.in.h:4 msgid "Before" msgstr "Перед" #: ../data/glade/gtksourceview.xml.in.h:5 -msgid "Disabled" -msgstr "Вимкнено" +msgid "After" +msgstr "Після" #: ../data/glade/gtksourceview.xml.in.h:6 -msgid "GtkSourceView" -msgstr "GtkSourceView" +msgid "Always" +msgstr "Завжди" #: ../data/glade/gtksourceview.xml.in.h:7 -msgid "Leading" -msgstr "Ведення" +msgid "Space" +msgstr "Пробіл" #: ../data/glade/gtksourceview.xml.in.h:8 +msgid "Tab" +msgstr "Вкладка" + +#: ../data/glade/gtksourceview.xml.in.h:9 msgid "Newline" msgstr "Новий рядок" -#: ../data/glade/gtksourceview.xml.in.h:9 +#: ../data/glade/gtksourceview.xml.in.h:10 msgid "Non Breaking Whitespace" msgstr "Нерозривні пробіли" -#: ../data/glade/gtksourceview.xml.in.h:10 -msgid "Space" -msgstr "Пробіл" - #: ../data/glade/gtksourceview.xml.in.h:11 -msgid "Tab" -msgstr "Вкладка" +msgid "Leading" +msgstr "Ведення" #: ../data/glade/gtksourceview.xml.in.h:12 #: ../gtksourceview/gtksourcecompletionitem.c:255 @@ -77,511 +71,573 @@ msgid "Trailing" msgstr "Кінцевий" -#: ../data/language-specs/ada.lang.h:1 -msgid "Ada" -msgstr "Ada" - -#: ../data/language-specs/ada.lang.h:2 -msgid "Arbitrary base number" -msgstr "Число довільної точності" +#. Translators: "All" is used as a label in thestatus bar of the +#. popup, telling that all completion pages are shown +#: ../data/glade/gtksourceview.xml.in.h:14 +#: ../gtksourceview/gtksourcecompletion.c:648 +msgid "All" +msgstr "Усі" -#. A boolean constant: TRUE, false -#: ../data/language-specs/ada.lang.h:3 ../data/language-specs/asp.lang.h:3 -#: ../data/language-specs/bennugd.lang.h:2 ../data/language-specs/c.lang.h:1 -#: ../data/language-specs/cg.lang.h:2 ../data/language-specs/csharp.lang.h:1 -#: ../data/language-specs/def.lang.h:4 ../data/language-specs/fsharp.lang.h:2 -#: ../data/language-specs/go.lang.h:1 ../data/language-specs/gtkrc.lang.h:1 -#: ../data/language-specs/ini.lang.h:2 ../data/language-specs/java.lang.h:1 -#: ../data/language-specs/javascript.lang.h:1 -#: ../data/language-specs/lua.lang.h:1 ../data/language-specs/nemerle.lang.h:2 -#: ../data/language-specs/ocaml.lang.h:2 ../data/language-specs/ooc.lang.h:1 -#: ../data/language-specs/opal.lang.h:1 ../data/language-specs/php.lang.h:1 -#: ../data/language-specs/R.lang.h:2 ../data/language-specs/ruby.lang.h:3 +#: ../data/language-specs/ada.lang.h:1 ../data/language-specs/asp.lang.h:1 +#: ../data/language-specs/bennugd.lang.h:1 ../data/language-specs/boo.lang.h:1 +#: ../data/language-specs/cg.lang.h:1 ../data/language-specs/chdr.lang.h:1 +#: ../data/language-specs/c.lang.h:1 ../data/language-specs/cobol.lang.h:1 +#: ../data/language-specs/cpp.lang.h:1 ../data/language-specs/csharp.lang.h:1 +#: ../data/language-specs/cuda.lang.h:1 ../data/language-specs/d.lang.h:1 +#: ../data/language-specs/eiffel.lang.h:1 +#: ../data/language-specs/erlang.lang.h:1 +#: ../data/language-specs/forth.lang.h:1 +#: ../data/language-specs/fortran.lang.h:1 +#: ../data/language-specs/fsharp.lang.h:1 ../data/language-specs/glsl.lang.h:1 +#: ../data/language-specs/go.lang.h:1 ../data/language-specs/haskell.lang.h:1 +#: ../data/language-specs/haskell-literate.lang.h:1 +#: ../data/language-specs/idl.lang.h:1 ../data/language-specs/java.lang.h:1 +#: ../data/language-specs/makefile.lang.h:1 +#: ../data/language-specs/nemerle.lang.h:1 +#: ../data/language-specs/objc.lang.h:1 ../data/language-specs/objj.lang.h:1 +#: ../data/language-specs/ocaml.lang.h:1 ../data/language-specs/ooc.lang.h:1 +#: ../data/language-specs/opal.lang.h:1 ../data/language-specs/opencl.lang.h:1 +#: ../data/language-specs/pascal.lang.h:1 +#: ../data/language-specs/prolog.lang.h:1 +#: ../data/language-specs/scheme.lang.h:1 ../data/language-specs/sml.lang.h:1 +#: ../data/language-specs/sparql.lang.h:1 ../data/language-specs/sql.lang.h:1 +#: ../data/language-specs/systemverilog.lang.h:1 #: ../data/language-specs/vala.lang.h:1 ../data/language-specs/vbnet.lang.h:1 -#: ../data/language-specs/vhdl.lang.h:2 -msgid "Boolean value" -msgstr "Булеве значення" +#: ../data/language-specs/verilog.lang.h:1 +#: ../data/language-specs/vhdl.lang.h:1 +msgid "Sources" +msgstr "Тексти програми" + +#: ../data/language-specs/ada.lang.h:2 +msgid "Ada" +msgstr "Ada" #. Any comment -#: ../data/language-specs/ada.lang.h:4 ../data/language-specs/asp.lang.h:4 -#: ../data/language-specs/bennugd.lang.h:4 ../data/language-specs/boo.lang.h:4 -#: ../data/language-specs/c.lang.h:4 ../data/language-specs/cg.lang.h:5 -#: ../data/language-specs/cobol.lang.h:2 -#: ../data/language-specs/csharp.lang.h:4 ../data/language-specs/css.lang.h:3 -#: ../data/language-specs/def.lang.h:11 ../data/language-specs/d.lang.h:3 -#: ../data/language-specs/dosbatch.lang.h:2 -#: ../data/language-specs/dot.lang.h:2 ../data/language-specs/eiffel.lang.h:3 -#: ../data/language-specs/erlang.lang.h:4 ../data/language-specs/fcl.lang.h:2 -#: ../data/language-specs/forth.lang.h:1 -#: ../data/language-specs/fortran.lang.h:2 -#: ../data/language-specs/fsharp.lang.h:4 ../data/language-specs/gap.lang.h:2 -#: ../data/language-specs/go.lang.h:3 ../data/language-specs/gtkrc.lang.h:2 -#: ../data/language-specs/haskell.lang.h:2 -#: ../data/language-specs/html.lang.h:3 ../data/language-specs/idl.lang.h:1 -#: ../data/language-specs/ini.lang.h:3 ../data/language-specs/java.lang.h:3 -#: ../data/language-specs/javascript.lang.h:2 -#: ../data/language-specs/latex.lang.h:2 ../data/language-specs/lua.lang.h:2 -#: ../data/language-specs/nemerle.lang.h:4 -#: ../data/language-specs/nsis.lang.h:1 ../data/language-specs/ocaml.lang.h:4 -#: ../data/language-specs/ocl.lang.h:1 ../data/language-specs/octave.lang.h:3 -#: ../data/language-specs/ooc.lang.h:2 ../data/language-specs/opal.lang.h:2 -#: ../data/language-specs/pascal.lang.h:1 ../data/language-specs/perl.lang.h:2 -#: ../data/language-specs/php.lang.h:2 ../data/language-specs/po.lang.h:1 -#: ../data/language-specs/prolog.lang.h:1 ../data/language-specs/ruby.lang.h:5 -#: ../data/language-specs/scheme.lang.h:2 -#: ../data/language-specs/scilab.lang.h:2 ../data/language-specs/sh.lang.h:1 -#: ../data/language-specs/sql.lang.h:1 ../data/language-specs/t2t.lang.h:3 -#: ../data/language-specs/texinfo.lang.h:1 -#: ../data/language-specs/vala.lang.h:2 ../data/language-specs/vbnet.lang.h:2 -#: ../data/language-specs/verilog.lang.h:2 -#: ../data/language-specs/vhdl.lang.h:4 ../data/language-specs/xml.lang.h:4 +#: ../data/language-specs/ada.lang.h:3 ../data/language-specs/asp.lang.h:3 +#: ../data/language-specs/bennugd.lang.h:3 ../data/language-specs/boo.lang.h:3 +#: ../data/language-specs/cg.lang.h:3 ../data/language-specs/c.lang.h:3 +#: ../data/language-specs/cobol.lang.h:3 +#: ../data/language-specs/csharp.lang.h:3 ../data/language-specs/def.lang.h:3 +#: ../data/language-specs/d.lang.h:3 ../data/language-specs/dosbatch.lang.h:3 +#: ../data/language-specs/dot.lang.h:3 ../data/language-specs/eiffel.lang.h:3 +#: ../data/language-specs/erlang.lang.h:3 ../data/language-specs/fcl.lang.h:3 +#: ../data/language-specs/forth.lang.h:3 +#: ../data/language-specs/fortran.lang.h:3 +#: ../data/language-specs/fsharp.lang.h:3 ../data/language-specs/gap.lang.h:3 +#: ../data/language-specs/go.lang.h:3 ../data/language-specs/gtkrc.lang.h:3 +#: ../data/language-specs/haskell.lang.h:4 +#: ../data/language-specs/html.lang.h:3 ../data/language-specs/idl.lang.h:3 +#: ../data/language-specs/ini.lang.h:3 ../data/language-specs/latex.lang.h:3 +#: ../data/language-specs/lua.lang.h:3 ../data/language-specs/matlab.lang.h:3 +#: ../data/language-specs/nemerle.lang.h:3 +#: ../data/language-specs/nsis.lang.h:4 ../data/language-specs/ocaml.lang.h:3 +#: ../data/language-specs/ocl.lang.h:3 ../data/language-specs/octave.lang.h:3 +#: ../data/language-specs/ooc.lang.h:3 ../data/language-specs/opal.lang.h:4 +#: ../data/language-specs/pascal.lang.h:3 ../data/language-specs/perl.lang.h:3 +#: ../data/language-specs/php.lang.h:3 ../data/language-specs/po.lang.h:3 +#: ../data/language-specs/prolog.lang.h:3 ../data/language-specs/ruby.lang.h:4 +#: ../data/language-specs/scheme.lang.h:3 +#: ../data/language-specs/scilab.lang.h:3 ../data/language-specs/sh.lang.h:3 +#: ../data/language-specs/sml.lang.h:3 ../data/language-specs/sql.lang.h:3 +#: ../data/language-specs/t2t.lang.h:3 ../data/language-specs/texinfo.lang.h:3 +#: ../data/language-specs/vala.lang.h:3 ../data/language-specs/vbnet.lang.h:3 +#: ../data/language-specs/verilog.lang.h:3 +#: ../data/language-specs/vhdl.lang.h:3 ../data/language-specs/xml.lang.h:3 msgid "Comment" msgstr "Коментар" -#. map-to="def:others" -#: ../data/language-specs/ada.lang.h:5 ../data/language-specs/asp.lang.h:5 -#: ../data/language-specs/bennugd.lang.h:5 ../data/language-specs/boo.lang.h:5 -#: ../data/language-specs/c.lang.h:6 ../data/language-specs/cg.lang.h:6 -#: ../data/language-specs/cpp.lang.h:3 ../data/language-specs/csharp.lang.h:5 -#: ../data/language-specs/cuda.lang.h:2 ../data/language-specs/d.lang.h:5 +#. A string constant: "this is a string" +#: ../data/language-specs/ada.lang.h:4 ../data/language-specs/asp.lang.h:4 +#: ../data/language-specs/boo.lang.h:5 ../data/language-specs/c.lang.h:4 +#: ../data/language-specs/cobol.lang.h:8 +#: ../data/language-specs/csharp.lang.h:6 ../data/language-specs/css.lang.h:5 +#: ../data/language-specs/def.lang.h:17 ../data/language-specs/d.lang.h:5 +#: ../data/language-specs/dosbatch.lang.h:4 #: ../data/language-specs/eiffel.lang.h:4 -#: ../data/language-specs/forth.lang.h:3 -#: ../data/language-specs/fortran.lang.h:3 -#: ../data/language-specs/fsharp.lang.h:5 ../data/language-specs/glsl.lang.h:4 -#: ../data/language-specs/go.lang.h:4 ../data/language-specs/gtkrc.lang.h:3 -#: ../data/language-specs/haskell.lang.h:3 ../data/language-specs/idl.lang.h:2 -#: ../data/language-specs/ini.lang.h:4 ../data/language-specs/java.lang.h:4 -#: ../data/language-specs/javascript.lang.h:5 -#: ../data/language-specs/nemerle.lang.h:5 -#: ../data/language-specs/objc.lang.h:2 ../data/language-specs/ocaml.lang.h:5 -#: ../data/language-specs/ocl.lang.h:2 ../data/language-specs/ooc.lang.h:3 -#: ../data/language-specs/opal.lang.h:4 ../data/language-specs/pascal.lang.h:2 -#: ../data/language-specs/php.lang.h:4 ../data/language-specs/sparql.lang.h:3 -#: ../data/language-specs/sql.lang.h:2 ../data/language-specs/vala.lang.h:3 -#: ../data/language-specs/vbnet.lang.h:3 -msgid "Data Type" -msgstr "Тип даних" +#: ../data/language-specs/erlang.lang.h:7 +#: ../data/language-specs/forth.lang.h:4 +#: ../data/language-specs/fsharp.lang.h:7 +#: ../data/language-specs/gdb-log.lang.h:8 ../data/language-specs/go.lang.h:5 +#: ../data/language-specs/gtkrc.lang.h:4 +#: ../data/language-specs/haskell.lang.h:9 ../data/language-specs/idl.lang.h:7 +#: ../data/language-specs/imagej.lang.h:10 ../data/language-specs/ini.lang.h:5 +#: ../data/language-specs/java.lang.h:4 +#: ../data/language-specs/javascript.lang.h:13 +#: ../data/language-specs/json.lang.h:4 ../data/language-specs/lua.lang.h:4 +#: ../data/language-specs/matlab.lang.h:4 +#: ../data/language-specs/nemerle.lang.h:7 +#: ../data/language-specs/nsis.lang.h:5 ../data/language-specs/objc.lang.h:6 +#: ../data/language-specs/objj.lang.h:8 ../data/language-specs/ocaml.lang.h:8 +#: ../data/language-specs/ocl.lang.h:4 ../data/language-specs/octave.lang.h:4 +#: ../data/language-specs/ooc.lang.h:6 ../data/language-specs/opal.lang.h:7 +#: ../data/language-specs/pascal.lang.h:4 ../data/language-specs/perl.lang.h:6 +#: ../data/language-specs/php.lang.h:9 ../data/language-specs/po.lang.h:5 +#: ../data/language-specs/prolog.lang.h:6 +#: ../data/language-specs/protobuf.lang.h:6 +#: ../data/language-specs/python.lang.h:6 +#: ../data/language-specs/python3.lang.h:6 +#: ../data/language-specs/ruby.lang.h:14 +#: ../data/language-specs/scheme.lang.h:5 +#: ../data/language-specs/scilab.lang.h:5 ../data/language-specs/sh.lang.h:5 +#: ../data/language-specs/sml.lang.h:7 ../data/language-specs/sql.lang.h:5 +#: ../data/language-specs/texinfo.lang.h:6 +#: ../data/language-specs/vala.lang.h:6 ../data/language-specs/vbnet.lang.h:4 +#: ../data/language-specs/verilog.lang.h:4 +#: ../data/language-specs/vhdl.lang.h:4 +msgid "String" +msgstr "Рядок" + +#. keywords: "if", "for", "while", etc. +#: ../data/language-specs/ada.lang.h:5 ../data/language-specs/asp.lang.h:6 +#: ../data/language-specs/awk.lang.h:3 ../data/language-specs/bennugd.lang.h:7 +#: ../data/language-specs/boo.lang.h:10 ../data/language-specs/cg.lang.h:8 +#: ../data/language-specs/c.lang.h:9 ../data/language-specs/cobol.lang.h:6 +#: ../data/language-specs/cpp.lang.h:3 ../data/language-specs/csharp.lang.h:11 +#: ../data/language-specs/css.lang.h:14 ../data/language-specs/cuda.lang.h:3 +#: ../data/language-specs/def.lang.h:47 ../data/language-specs/d.lang.h:6 +#: ../data/language-specs/dosbatch.lang.h:5 +#: ../data/language-specs/dot.lang.h:5 ../data/language-specs/eiffel.lang.h:7 +#: ../data/language-specs/erlang.lang.h:4 ../data/language-specs/fcl.lang.h:5 +#: ../data/language-specs/forth.lang.h:6 +#: ../data/language-specs/fortran.lang.h:5 +#: ../data/language-specs/fsharp.lang.h:8 ../data/language-specs/gap.lang.h:5 +#: ../data/language-specs/glsl.lang.h:5 ../data/language-specs/go.lang.h:8 +#: ../data/language-specs/gtkrc.lang.h:5 +#: ../data/language-specs/haskell.lang.h:7 ../data/language-specs/idl.lang.h:6 +#: ../data/language-specs/imagej.lang.h:8 ../data/language-specs/ini.lang.h:6 +#: ../data/language-specs/java.lang.h:12 +#: ../data/language-specs/javascript.lang.h:7 +#: ../data/language-specs/lua.lang.h:5 ../data/language-specs/nemerle.lang.h:8 +#: ../data/language-specs/objc.lang.h:3 ../data/language-specs/objj.lang.h:4 +#: ../data/language-specs/ocaml.lang.h:9 ../data/language-specs/ocl.lang.h:5 +#: ../data/language-specs/octave.lang.h:13 +#: ../data/language-specs/ooc.lang.h:11 ../data/language-specs/opal.lang.h:8 +#: ../data/language-specs/opencl.lang.h:3 +#: ../data/language-specs/pascal.lang.h:5 ../data/language-specs/perl.lang.h:7 +#: ../data/language-specs/php.lang.h:12 ../data/language-specs/po.lang.h:7 +#: ../data/language-specs/prolog.lang.h:5 +#: ../data/language-specs/protobuf.lang.h:4 +#: ../data/language-specs/python.lang.h:4 +#: ../data/language-specs/python3.lang.h:4 ../data/language-specs/R.lang.h:3 +#: ../data/language-specs/ruby.lang.h:7 ../data/language-specs/scheme.lang.h:6 +#: ../data/language-specs/scilab.lang.h:6 ../data/language-specs/sh.lang.h:6 +#: ../data/language-specs/sml.lang.h:4 ../data/language-specs/sparql.lang.h:7 +#: ../data/language-specs/sql.lang.h:6 +#: ../data/language-specs/systemverilog.lang.h:5 +#: ../data/language-specs/tcl.lang.h:4 ../data/language-specs/texinfo.lang.h:7 +#: ../data/language-specs/vala.lang.h:7 ../data/language-specs/vbnet.lang.h:6 +#: ../data/language-specs/verilog.lang.h:10 +#: ../data/language-specs/vhdl.lang.h:6 +msgid "Keyword" +msgstr "Ключове слово" #. A decimal number: 1234 -#: ../data/language-specs/ada.lang.h:6 ../data/language-specs/bennugd.lang.h:6 -#: ../data/language-specs/c.lang.h:7 ../data/language-specs/cg.lang.h:7 -#: ../data/language-specs/csharp.lang.h:6 ../data/language-specs/def.lang.h:19 -#: ../data/language-specs/d.lang.h:6 ../data/language-specs/eiffel.lang.h:6 -#: ../data/language-specs/erlang.lang.h:6 -#: ../data/language-specs/fsharp.lang.h:6 ../data/language-specs/go.lang.h:5 -#: ../data/language-specs/nemerle.lang.h:6 -#: ../data/language-specs/ocaml.lang.h:6 ../data/language-specs/ooc.lang.h:4 -#: ../data/language-specs/opal.lang.h:5 ../data/language-specs/php.lang.h:5 -#: ../data/language-specs/python.lang.h:7 ../data/language-specs/ruby.lang.h:7 -#: ../data/language-specs/vala.lang.h:4 +#: ../data/language-specs/ada.lang.h:6 +#: ../data/language-specs/bennugd.lang.h:10 +#: ../data/language-specs/cg.lang.h:13 ../data/language-specs/c.lang.h:16 +#: ../data/language-specs/csharp.lang.h:15 +#: ../data/language-specs/def.lang.h:26 ../data/language-specs/d.lang.h:12 +#: ../data/language-specs/eiffel.lang.h:15 +#: ../data/language-specs/erlang.lang.h:9 +#: ../data/language-specs/fsharp.lang.h:6 ../data/language-specs/go.lang.h:13 +#: ../data/language-specs/nemerle.lang.h:13 +#: ../data/language-specs/ocaml.lang.h:7 ../data/language-specs/ooc.lang.h:15 +#: ../data/language-specs/opal.lang.h:10 ../data/language-specs/php.lang.h:19 +#: ../data/language-specs/python.lang.h:13 +#: ../data/language-specs/python3.lang.h:12 +#: ../data/language-specs/ruby.lang.h:11 msgid "Decimal number" msgstr "Десяткове число" -#. map to nothing -#: ../data/language-specs/ada.lang.h:7 ../data/language-specs/bennugd.lang.h:8 -#: ../data/language-specs/c.lang.h:9 ../data/language-specs/cg.lang.h:9 -#: ../data/language-specs/csharp.lang.h:8 -#: ../data/language-specs/eiffel.lang.h:9 -#: ../data/language-specs/fsharp.lang.h:7 ../data/language-specs/go.lang.h:7 -#: ../data/language-specs/haskell.lang.h:5 -#: ../data/language-specs/java.lang.h:7 ../data/language-specs/lua.lang.h:3 -#: ../data/language-specs/ocaml.lang.h:8 ../data/language-specs/ooc.lang.h:7 -#: ../data/language-specs/php.lang.h:8 ../data/language-specs/prolog.lang.h:3 -#: ../data/language-specs/python.lang.h:8 ../data/language-specs/ruby.lang.h:8 -#: ../data/language-specs/texinfo.lang.h:2 -#: ../data/language-specs/verilog.lang.h:5 -msgid "Escaped Character" -msgstr "Символ екранування" - -#. keywords: "if", "for", "while", etc. -#: ../data/language-specs/ada.lang.h:8 ../data/language-specs/asp.lang.h:7 -#: ../data/language-specs/awk.lang.h:2 +#. A boolean constant: TRUE, false +#: ../data/language-specs/ada.lang.h:7 ../data/language-specs/asp.lang.h:13 #: ../data/language-specs/bennugd.lang.h:12 -#: ../data/language-specs/boo.lang.h:7 ../data/language-specs/c.lang.h:13 -#: ../data/language-specs/cg.lang.h:14 ../data/language-specs/cobol.lang.h:5 -#: ../data/language-specs/cpp.lang.h:4 ../data/language-specs/csharp.lang.h:10 -#: ../data/language-specs/css.lang.h:8 ../data/language-specs/cuda.lang.h:6 -#: ../data/language-specs/def.lang.h:36 ../data/language-specs/d.lang.h:10 -#: ../data/language-specs/dosbatch.lang.h:4 -#: ../data/language-specs/dot.lang.h:5 ../data/language-specs/eiffel.lang.h:12 -#: ../data/language-specs/erlang.lang.h:9 ../data/language-specs/fcl.lang.h:6 +#: ../data/language-specs/cg.lang.h:16 ../data/language-specs/c.lang.h:19 +#: ../data/language-specs/csharp.lang.h:14 +#: ../data/language-specs/def.lang.h:34 +#: ../data/language-specs/fsharp.lang.h:19 ../data/language-specs/go.lang.h:16 +#: ../data/language-specs/gtkrc.lang.h:10 ../data/language-specs/ini.lang.h:10 +#: ../data/language-specs/java.lang.h:14 ../data/language-specs/lua.lang.h:10 +#: ../data/language-specs/nemerle.lang.h:11 +#: ../data/language-specs/ocaml.lang.h:19 ../data/language-specs/ooc.lang.h:13 +#: ../data/language-specs/opal.lang.h:9 ../data/language-specs/php.lang.h:17 +#: ../data/language-specs/protobuf.lang.h:5 ../data/language-specs/R.lang.h:8 +#: ../data/language-specs/ruby.lang.h:9 ../data/language-specs/sml.lang.h:11 +#: ../data/language-specs/vala.lang.h:8 ../data/language-specs/vbnet.lang.h:9 +#: ../data/language-specs/vhdl.lang.h:8 +msgid "Boolean value" +msgstr "Булеве значення" + +#: ../data/language-specs/ada.lang.h:8 ../data/language-specs/cg.lang.h:10 +#: ../data/language-specs/c.lang.h:12 ../data/language-specs/go.lang.h:10 +#: ../data/language-specs/java.lang.h:10 ../data/language-specs/ooc.lang.h:9 +msgid "Storage Class" +msgstr "Клас зберігання змінної" + +#: ../data/language-specs/ada.lang.h:9 ../data/language-specs/asp.lang.h:11 +#: ../data/language-specs/bennugd.lang.h:8 ../data/language-specs/boo.lang.h:8 +#: ../data/language-specs/cg.lang.h:9 ../data/language-specs/c.lang.h:11 +#: ../data/language-specs/cpp.lang.h:4 ../data/language-specs/csharp.lang.h:5 +#: ../data/language-specs/cuda.lang.h:4 ../data/language-specs/d.lang.h:7 +#: ../data/language-specs/eiffel.lang.h:8 #: ../data/language-specs/forth.lang.h:7 -#: ../data/language-specs/fortran.lang.h:8 -#: ../data/language-specs/fsharp.lang.h:10 ../data/language-specs/gap.lang.h:6 -#: ../data/language-specs/glsl.lang.h:5 ../data/language-specs/go.lang.h:12 +#: ../data/language-specs/fortran.lang.h:9 +#: ../data/language-specs/fsharp.lang.h:11 +#: ../data/language-specs/glsl.lang.h:4 ../data/language-specs/go.lang.h:9 #: ../data/language-specs/gtkrc.lang.h:7 -#: ../data/language-specs/haskell.lang.h:9 ../data/language-specs/idl.lang.h:4 -#: ../data/language-specs/ini.lang.h:7 ../data/language-specs/java.lang.h:11 -#: ../data/language-specs/javascript.lang.h:10 -#: ../data/language-specs/lua.lang.h:5 -#: ../data/language-specs/nemerle.lang.h:10 -#: ../data/language-specs/objc.lang.h:3 ../data/language-specs/ocaml.lang.h:10 -#: ../data/language-specs/ocl.lang.h:3 ../data/language-specs/octave.lang.h:7 -#: ../data/language-specs/ooc.lang.h:12 ../data/language-specs/opal.lang.h:8 -#: ../data/language-specs/pascal.lang.h:4 ../data/language-specs/perl.lang.h:9 -#: ../data/language-specs/php.lang.h:14 ../data/language-specs/po.lang.h:3 -#: ../data/language-specs/prolog.lang.h:4 -#: ../data/language-specs/python.lang.h:11 ../data/language-specs/R.lang.h:6 -#: ../data/language-specs/ruby.lang.h:12 -#: ../data/language-specs/scheme.lang.h:4 -#: ../data/language-specs/scilab.lang.h:5 ../data/language-specs/sh.lang.h:5 -#: ../data/language-specs/sparql.lang.h:7 ../data/language-specs/sql.lang.h:6 -#: ../data/language-specs/systemverilog.lang.h:2 -#: ../data/language-specs/tcl.lang.h:1 ../data/language-specs/texinfo.lang.h:6 -#: ../data/language-specs/vala.lang.h:7 ../data/language-specs/vbnet.lang.h:4 -#: ../data/language-specs/verilog.lang.h:9 -#: ../data/language-specs/vhdl.lang.h:5 -msgid "Keyword" -msgstr "Ключове слово" +#: ../data/language-specs/haskell.lang.h:8 ../data/language-specs/idl.lang.h:4 +#: ../data/language-specs/ini.lang.h:9 ../data/language-specs/java.lang.h:17 +#: ../data/language-specs/javascript.lang.h:8 +#: ../data/language-specs/nemerle.lang.h:9 +#: ../data/language-specs/objc.lang.h:4 ../data/language-specs/objj.lang.h:5 +#: ../data/language-specs/ocaml.lang.h:12 ../data/language-specs/ocl.lang.h:7 +#: ../data/language-specs/ooc.lang.h:19 ../data/language-specs/opal.lang.h:11 +#: ../data/language-specs/opencl.lang.h:4 +#: ../data/language-specs/pascal.lang.h:7 ../data/language-specs/php.lang.h:15 +#: ../data/language-specs/protobuf.lang.h:3 +#: ../data/language-specs/sml.lang.h:5 ../data/language-specs/sparql.lang.h:4 +#: ../data/language-specs/sql.lang.h:9 ../data/language-specs/vala.lang.h:5 +#: ../data/language-specs/vbnet.lang.h:7 +msgid "Data Type" +msgstr "Тип даних" -#: ../data/language-specs/ada.lang.h:9 ../data/language-specs/asp.lang.h:10 -#: ../data/language-specs/bennugd.lang.h:14 ../data/language-specs/c.lang.h:15 -#: ../data/language-specs/cg.lang.h:16 ../data/language-specs/csharp.lang.h:12 -#: ../data/language-specs/forth.lang.h:9 -#: ../data/language-specs/fsharp.lang.h:15 -#: ../data/language-specs/glsl.lang.h:7 -#: ../data/language-specs/haskell.lang.h:11 -#: ../data/language-specs/idl.lang.h:5 -#: ../data/language-specs/nemerle.lang.h:14 -#: ../data/language-specs/pascal.lang.h:6 +#: ../data/language-specs/ada.lang.h:10 ../data/language-specs/asp.lang.h:5 +#: ../data/language-specs/bennugd.lang.h:4 ../data/language-specs/cg.lang.h:5 +#: ../data/language-specs/c.lang.h:5 ../data/language-specs/csharp.lang.h:12 +#: ../data/language-specs/forth.lang.h:5 +#: ../data/language-specs/fsharp.lang.h:20 +#: ../data/language-specs/glsl.lang.h:3 +#: ../data/language-specs/haskell.lang.h:3 ../data/language-specs/idl.lang.h:5 +#: ../data/language-specs/nemerle.lang.h:5 +#: ../data/language-specs/objj.lang.h:6 ../data/language-specs/pascal.lang.h:8 #: ../data/language-specs/vbnet.lang.h:5 msgid "Preprocessor" msgstr "Директива препроцесору" -#: ../data/language-specs/ada.lang.h:10 -#: ../data/language-specs/csharp.lang.h:13 -#: ../data/language-specs/vala.lang.h:9 -#: ../data/language-specs/verilog.lang.h:11 -#: ../data/language-specs/vhdl.lang.h:7 +#: ../data/language-specs/ada.lang.h:11 +msgid "Arbitrary base number" +msgstr "Число довільної точності" + +#: ../data/language-specs/ada.lang.h:12 +#: ../data/language-specs/csharp.lang.h:17 +#: ../data/language-specs/verilog.lang.h:14 +#: ../data/language-specs/vhdl.lang.h:10 msgid "Real number" msgstr "Дійсне число" -#: ../data/language-specs/ada.lang.h:11 ../data/language-specs/asp.lang.h:11 -#: ../data/language-specs/bennugd.lang.h:15 -#: ../data/language-specs/boo.lang.h:13 ../data/language-specs/chdr.lang.h:2 -#: ../data/language-specs/c.lang.h:17 ../data/language-specs/cg.lang.h:17 -#: ../data/language-specs/cobol.lang.h:8 ../data/language-specs/cpp.lang.h:5 -#: ../data/language-specs/csharp.lang.h:14 -#: ../data/language-specs/cuda.lang.h:7 ../data/language-specs/d.lang.h:13 -#: ../data/language-specs/eiffel.lang.h:14 -#: ../data/language-specs/erlang.lang.h:11 -#: ../data/language-specs/forth.lang.h:10 -#: ../data/language-specs/fortran.lang.h:9 -#: ../data/language-specs/fsharp.lang.h:16 -#: ../data/language-specs/glsl.lang.h:9 ../data/language-specs/go.lang.h:14 -#: ../data/language-specs/haskell.lang.h:12 -#: ../data/language-specs/haskell-literate.lang.h:2 -#: ../data/language-specs/idl.lang.h:6 ../data/language-specs/java.lang.h:15 -#: ../data/language-specs/makefile.lang.h:4 -#: ../data/language-specs/nemerle.lang.h:15 -#: ../data/language-specs/objc.lang.h:5 ../data/language-specs/ocaml.lang.h:16 -#: ../data/language-specs/ooc.lang.h:17 ../data/language-specs/opal.lang.h:11 -#: ../data/language-specs/pascal.lang.h:7 -#: ../data/language-specs/prolog.lang.h:8 -#: ../data/language-specs/scheme.lang.h:6 -#: ../data/language-specs/sparql.lang.h:14 ../data/language-specs/sql.lang.h:9 -#: ../data/language-specs/systemverilog.lang.h:3 -#: ../data/language-specs/vala.lang.h:10 ../data/language-specs/vbnet.lang.h:6 -#: ../data/language-specs/verilog.lang.h:12 -#: ../data/language-specs/vhdl.lang.h:8 -msgid "Sources" -msgstr "Тексти програми" - -#: ../data/language-specs/ada.lang.h:12 ../data/language-specs/c.lang.h:19 -#: ../data/language-specs/cg.lang.h:18 ../data/language-specs/go.lang.h:15 -#: ../data/language-specs/java.lang.h:16 ../data/language-specs/ooc.lang.h:18 -msgid "Storage Class" -msgstr "Клас зберігання змінної" - -#. A string constant: "this is a string" -#: ../data/language-specs/ada.lang.h:13 ../data/language-specs/asp.lang.h:13 -#: ../data/language-specs/bennugd.lang.h:16 -#: ../data/language-specs/boo.lang.h:15 ../data/language-specs/c.lang.h:20 -#: ../data/language-specs/cobol.lang.h:10 -#: ../data/language-specs/csharp.lang.h:15 -#: ../data/language-specs/css.lang.h:13 ../data/language-specs/def.lang.h:57 -#: ../data/language-specs/d.lang.h:15 ../data/language-specs/dosbatch.lang.h:6 -#: ../data/language-specs/eiffel.lang.h:15 -#: ../data/language-specs/erlang.lang.h:12 -#: ../data/language-specs/forth.lang.h:11 -#: ../data/language-specs/fsharp.lang.h:17 -#: ../data/language-specs/gdb-log.lang.h:10 -#: ../data/language-specs/go.lang.h:16 ../data/language-specs/gtkrc.lang.h:9 -#: ../data/language-specs/haskell.lang.h:13 -#: ../data/language-specs/idl.lang.h:7 ../data/language-specs/ini.lang.h:9 -#: ../data/language-specs/java.lang.h:17 -#: ../data/language-specs/javascript.lang.h:15 -#: ../data/language-specs/lua.lang.h:10 -#: ../data/language-specs/nemerle.lang.h:16 -#: ../data/language-specs/nsis.lang.h:5 ../data/language-specs/objc.lang.h:6 -#: ../data/language-specs/ocaml.lang.h:18 ../data/language-specs/ocl.lang.h:7 -#: ../data/language-specs/octave.lang.h:11 -#: ../data/language-specs/ooc.lang.h:19 ../data/language-specs/opal.lang.h:12 -#: ../data/language-specs/pascal.lang.h:8 -#: ../data/language-specs/perl.lang.h:19 ../data/language-specs/php.lang.h:20 -#: ../data/language-specs/po.lang.h:8 ../data/language-specs/prolog.lang.h:9 -#: ../data/language-specs/python.lang.h:17 -#: ../data/language-specs/ruby.lang.h:21 -#: ../data/language-specs/scheme.lang.h:7 -#: ../data/language-specs/scilab.lang.h:9 ../data/language-specs/sh.lang.h:9 -#: ../data/language-specs/sql.lang.h:10 -#: ../data/language-specs/texinfo.lang.h:10 -#: ../data/language-specs/vala.lang.h:11 ../data/language-specs/vbnet.lang.h:8 -#: ../data/language-specs/verilog.lang.h:13 -#: ../data/language-specs/vhdl.lang.h:9 -msgid "String" -msgstr "Рядок" +#. map to nothing +#: ../data/language-specs/ada.lang.h:13 ../data/language-specs/cg.lang.h:11 +#: ../data/language-specs/c.lang.h:14 ../data/language-specs/csharp.lang.h:8 +#: ../data/language-specs/eiffel.lang.h:12 +#: ../data/language-specs/fsharp.lang.h:18 ../data/language-specs/go.lang.h:11 +#: ../data/language-specs/haskell.lang.h:11 +#: ../data/language-specs/java.lang.h:3 +#: ../data/language-specs/javascript.lang.h:3 +#: ../data/language-specs/json.lang.h:3 ../data/language-specs/lua.lang.h:6 +#: ../data/language-specs/ocaml.lang.h:18 ../data/language-specs/ooc.lang.h:5 +#: ../data/language-specs/php.lang.h:8 ../data/language-specs/prolog.lang.h:10 +#: ../data/language-specs/python.lang.h:7 +#: ../data/language-specs/python3.lang.h:7 +#: ../data/language-specs/ruby.lang.h:3 ../data/language-specs/sml.lang.h:8 +#: ../data/language-specs/texinfo.lang.h:4 +#: ../data/language-specs/verilog.lang.h:5 +msgid "Escaped Character" +msgstr "Символ екранування" -#: ../data/language-specs/asp.lang.h:1 +#: ../data/language-specs/asp.lang.h:2 msgid "ASP" msgstr "ASP" -#: ../data/language-specs/asp.lang.h:2 -msgid "ASP Object" -msgstr "Об'єкт ASP" - #. A function name (also: methods for classes) -#: ../data/language-specs/asp.lang.h:6 -#: ../data/language-specs/changelog.lang.h:6 -#: ../data/language-specs/cg.lang.h:11 ../data/language-specs/css.lang.h:7 -#: ../data/language-specs/def.lang.h:32 ../data/language-specs/gap.lang.h:4 -#: ../data/language-specs/gdb-log.lang.h:4 -#: ../data/language-specs/gtk-doc.lang.h:3 -#: ../data/language-specs/javascript.lang.h:7 -#: ../data/language-specs/lua.lang.h:4 ../data/language-specs/octave.lang.h:6 -#: ../data/language-specs/scheme.lang.h:3 -#: ../data/language-specs/scilab.lang.h:4 ../data/language-specs/sh.lang.h:3 -#: ../data/language-specs/sparql.lang.h:4 ../data/language-specs/sql.lang.h:5 +#: ../data/language-specs/asp.lang.h:7 ../data/language-specs/cg.lang.h:18 +#: ../data/language-specs/changelog.lang.h:8 +#: ../data/language-specs/css.lang.h:8 ../data/language-specs/def.lang.h:38 +#: ../data/language-specs/gap.lang.h:6 ../data/language-specs/gdb-log.lang.h:7 +#: ../data/language-specs/gtk-doc.lang.h:10 +#: ../data/language-specs/javascript.lang.h:9 +#: ../data/language-specs/lua.lang.h:8 ../data/language-specs/scheme.lang.h:7 +#: ../data/language-specs/scilab.lang.h:7 ../data/language-specs/sh.lang.h:4 +#: ../data/language-specs/sparql.lang.h:5 ../data/language-specs/sql.lang.h:7 msgid "Function" msgstr "Функція" -#. A generic number constant -#: ../data/language-specs/asp.lang.h:8 ../data/language-specs/boo.lang.h:11 -#: ../data/language-specs/cobol.lang.h:6 ../data/language-specs/def.lang.h:40 -#: ../data/language-specs/desktop.lang.h:11 -#: ../data/language-specs/forth.lang.h:8 ../data/language-specs/java.lang.h:13 -#: ../data/language-specs/prolog.lang.h:5 ../data/language-specs/vhdl.lang.h:6 -msgid "Number" -msgstr "Число" - #. Operators: "+", "*", etc. -#: ../data/language-specs/asp.lang.h:9 -#: ../data/language-specs/bennugd.lang.h:13 -#: ../data/language-specs/cmake.lang.h:6 ../data/language-specs/cobol.lang.h:7 -#: ../data/language-specs/def.lang.h:42 -#: ../data/language-specs/erlang.lang.h:10 -#: ../data/language-specs/nsis.lang.h:3 ../data/language-specs/perl.lang.h:11 -#: ../data/language-specs/php.lang.h:17 ../data/language-specs/prolog.lang.h:6 -#: ../data/language-specs/sparql.lang.h:10 +#: ../data/language-specs/asp.lang.h:8 ../data/language-specs/bennugd.lang.h:6 +#: ../data/language-specs/c.lang.h:10 ../data/language-specs/cmake.lang.h:6 +#: ../data/language-specs/cobol.lang.h:10 ../data/language-specs/def.lang.h:45 +#: ../data/language-specs/erlang.lang.h:5 +#: ../data/language-specs/imagej.lang.h:9 ../data/language-specs/nsis.lang.h:3 +#: ../data/language-specs/octave.lang.h:5 +#: ../data/language-specs/perl.lang.h:12 ../data/language-specs/php.lang.h:14 +#: ../data/language-specs/prolog.lang.h:8 +#: ../data/language-specs/sparql.lang.h:15 msgid "Operator" msgstr "Оператор" -#. A special constant like NULL in C or null in Java -#: ../data/language-specs/asp.lang.h:12 ../data/language-specs/def.lang.h:53 -#: ../data/language-specs/vbnet.lang.h:7 -msgid "Special constant" -msgstr "Спеціальна константа" +#: ../data/language-specs/asp.lang.h:9 +msgid "ASP Object" +msgstr "Об'єкт ASP" -#: ../data/language-specs/asp.lang.h:14 +#: ../data/language-specs/asp.lang.h:10 msgid "VBScript and ADO constants" msgstr "VBScript та константи ADO" -#: ../data/language-specs/awk.lang.h:1 ../data/language-specs/boo.lang.h:3 -#: ../data/language-specs/glsl.lang.h:2 ../data/language-specs/perl.lang.h:1 -#: ../data/language-specs/python.lang.h:4 -msgid "Builtin Function" -msgstr "Вбудована функція" +#. A special constant like NULL in C or null in Java +#: ../data/language-specs/asp.lang.h:12 ../data/language-specs/def.lang.h:32 +#: ../data/language-specs/vbnet.lang.h:8 +msgid "Special constant" +msgstr "Спеціальна константа" -#: ../data/language-specs/awk.lang.h:3 -msgid "Pattern" -msgstr "Шаблон" +#. A generic number constant +#: ../data/language-specs/asp.lang.h:14 ../data/language-specs/boo.lang.h:14 +#: ../data/language-specs/cobol.lang.h:9 ../data/language-specs/def.lang.h:22 +#: ../data/language-specs/desktop.lang.h:8 +#: ../data/language-specs/forth.lang.h:8 ../data/language-specs/java.lang.h:15 +#: ../data/language-specs/prolog.lang.h:7 +#: ../data/language-specs/vhdl.lang.h:11 +msgid "Number" +msgstr "Число" -#: ../data/language-specs/awk.lang.h:4 -#: ../data/language-specs/dosbatch.lang.h:5 -#: ../data/language-specs/javascript.lang.h:14 -#: ../data/language-specs/lua.lang.h:9 ../data/language-specs/m4.lang.h:3 -#: ../data/language-specs/perl.lang.h:18 ../data/language-specs/php.lang.h:19 -#: ../data/language-specs/python.lang.h:15 -#: ../data/language-specs/ruby.lang.h:19 ../data/language-specs/sh.lang.h:7 -#: ../data/language-specs/tcl.lang.h:2 +#: ../data/language-specs/automake.lang.h:1 +msgid "Automake" +msgstr "Automake" + +#: ../data/language-specs/automake.lang.h:2 +msgid "Automake Variable" +msgstr "Змінні Automake" + +#: ../data/language-specs/automake.lang.h:3 +msgid "Primary" +msgstr "Основний" + +#: ../data/language-specs/automake.lang.h:4 +msgid "Secondary" +msgstr "Вторинний" + +#: ../data/language-specs/automake.lang.h:5 +msgid "Prefix" +msgstr "Префікс" + +#: ../data/language-specs/automake.lang.h:6 +msgid "Optional Target" +msgstr "Додаткова ціль" + +#: ../data/language-specs/automake.lang.h:7 +msgid "Built-in Target" +msgstr "Вбудована ціль" + +#: ../data/language-specs/automake.lang.h:8 +msgid "Other Keyword" +msgstr "Інакше ключове слово" + +#: ../data/language-specs/automake.lang.h:9 +msgid "Substitution" +msgstr "Заміщення" + +#: ../data/language-specs/awk.lang.h:1 +#: ../data/language-specs/dosbatch.lang.h:1 +#: ../data/language-specs/javascript.lang.h:1 +#: ../data/language-specs/lua.lang.h:1 ../data/language-specs/m4.lang.h:1 +#: ../data/language-specs/perl.lang.h:1 ../data/language-specs/php.lang.h:1 +#: ../data/language-specs/python.lang.h:1 +#: ../data/language-specs/python3.lang.h:1 +#: ../data/language-specs/ruby.lang.h:1 ../data/language-specs/sh.lang.h:1 +#: ../data/language-specs/tcl.lang.h:1 msgid "Scripts" msgstr "Мови сценаріїв" +#: ../data/language-specs/awk.lang.h:2 +msgid "awk" +msgstr "awk" + +#: ../data/language-specs/awk.lang.h:4 +msgid "Pattern" +msgstr "Шаблон" + #: ../data/language-specs/awk.lang.h:5 ../data/language-specs/cmake.lang.h:8 -#: ../data/language-specs/cobol.lang.h:11 -#: ../data/language-specs/haskell.lang.h:15 -#: ../data/language-specs/ini.lang.h:10 -#: ../data/language-specs/makefile.lang.h:8 -#: ../data/language-specs/nsis.lang.h:6 ../data/language-specs/perl.lang.h:21 -#: ../data/language-specs/php.lang.h:21 +#: ../data/language-specs/cobol.lang.h:5 +#: ../data/language-specs/haskell.lang.h:5 ../data/language-specs/ini.lang.h:8 +#: ../data/language-specs/makefile.lang.h:3 +#: ../data/language-specs/nsis.lang.h:6 +#: ../data/language-specs/octave.lang.h:14 +#: ../data/language-specs/perl.lang.h:13 ../data/language-specs/php.lang.h:5 #: ../data/language-specs/pkgconfig.lang.h:3 -#: ../data/language-specs/prolog.lang.h:10 -#: ../data/language-specs/ruby.lang.h:23 ../data/language-specs/sh.lang.h:11 -#: ../data/language-specs/sparql.lang.h:15 ../data/language-specs/tcl.lang.h:4 +#: ../data/language-specs/prolog.lang.h:4 +#: ../data/language-specs/protobuf.lang.h:2 +#: ../data/language-specs/ruby.lang.h:21 ../data/language-specs/sh.lang.h:7 +#: ../data/language-specs/sparql.lang.h:14 ../data/language-specs/tcl.lang.h:3 msgid "Variable" msgstr "Змінна" -#: ../data/language-specs/awk.lang.h:6 -msgid "awk" -msgstr "awk" +#: ../data/language-specs/awk.lang.h:6 ../data/language-specs/boo.lang.h:15 +#: ../data/language-specs/glsl.lang.h:6 ../data/language-specs/perl.lang.h:8 +#: ../data/language-specs/python.lang.h:18 +#: ../data/language-specs/python3.lang.h:17 +msgid "Builtin Function" +msgstr "Вбудована функція" -#: ../data/language-specs/bennugd.lang.h:1 +#: ../data/language-specs/bennugd.lang.h:2 msgid "BennuGD" msgstr "BennuGD" -#. A character constant: 'c' -#: ../data/language-specs/bennugd.lang.h:3 ../data/language-specs/c.lang.h:3 -#: ../data/language-specs/csharp.lang.h:3 ../data/language-specs/def.lang.h:9 -#: ../data/language-specs/gap.lang.h:1 ../data/language-specs/go.lang.h:2 -#: ../data/language-specs/haskell.lang.h:1 -#: ../data/language-specs/java.lang.h:2 -#: ../data/language-specs/nemerle.lang.h:3 -#: ../data/language-specs/vhdl.lang.h:3 -msgid "Character" -msgstr "Символ" - -#. Any erroneous construct -#: ../data/language-specs/bennugd.lang.h:7 ../data/language-specs/c.lang.h:8 -#: ../data/language-specs/cg.lang.h:8 ../data/language-specs/cobol.lang.h:4 -#: ../data/language-specs/csharp.lang.h:7 ../data/language-specs/css.lang.h:6 -#: ../data/language-specs/def.lang.h:28 ../data/language-specs/d.lang.h:7 -#: ../data/language-specs/dot.lang.h:3 ../data/language-specs/go.lang.h:6 -#: ../data/language-specs/html.lang.h:5 ../data/language-specs/java.lang.h:6 -#: ../data/language-specs/javascript.lang.h:6 -#: ../data/language-specs/nemerle.lang.h:7 -#: ../data/language-specs/ocaml.lang.h:7 ../data/language-specs/ooc.lang.h:6 -#: ../data/language-specs/opal.lang.h:6 ../data/language-specs/perl.lang.h:4 -#: ../data/language-specs/php.lang.h:6 ../data/language-specs/prolog.lang.h:2 -#: ../data/language-specs/vala.lang.h:5 -#: ../data/language-specs/verilog.lang.h:4 ../data/language-specs/xml.lang.h:8 -msgid "Error" -msgstr "Помилка" +#. Any variable name +#: ../data/language-specs/bennugd.lang.h:5 +#: ../data/language-specs/def.lang.h:36 ../data/language-specs/php.lang.h:6 +msgid "Identifier" +msgstr "Ідентифікатор" #. A floating point constant: 2.3e10 -#: ../data/language-specs/bennugd.lang.h:9 ../data/language-specs/c.lang.h:10 -#: ../data/language-specs/cg.lang.h:10 ../data/language-specs/def.lang.h:30 -#: ../data/language-specs/d.lang.h:8 ../data/language-specs/erlang.lang.h:8 -#: ../data/language-specs/go.lang.h:8 ../data/language-specs/nemerle.lang.h:8 -#: ../data/language-specs/ooc.lang.h:9 ../data/language-specs/php.lang.h:9 -#: ../data/language-specs/python.lang.h:9 ../data/language-specs/R.lang.h:4 -#: ../data/language-specs/ruby.lang.h:9 +#: ../data/language-specs/bennugd.lang.h:9 ../data/language-specs/cg.lang.h:12 +#: ../data/language-specs/c.lang.h:15 ../data/language-specs/def.lang.h:24 +#: ../data/language-specs/d.lang.h:11 ../data/language-specs/erlang.lang.h:8 +#: ../data/language-specs/go.lang.h:12 ../data/language-specs/json.lang.h:9 +#: ../data/language-specs/nemerle.lang.h:12 +#: ../data/language-specs/ooc.lang.h:14 ../data/language-specs/php.lang.h:18 +#: ../data/language-specs/python.lang.h:12 +#: ../data/language-specs/python3.lang.h:11 ../data/language-specs/R.lang.h:10 +#: ../data/language-specs/ruby.lang.h:10 msgid "Floating point number" msgstr "Число з рухомою комою" -#: ../data/language-specs/bennugd.lang.h:10 ../data/language-specs/c.lang.h:11 -#: ../data/language-specs/cg.lang.h:12 ../data/language-specs/csharp.lang.h:9 -#: ../data/language-specs/d.lang.h:9 ../data/language-specs/eiffel.lang.h:11 -#: ../data/language-specs/go.lang.h:10 ../data/language-specs/nemerle.lang.h:9 -#: ../data/language-specs/ooc.lang.h:11 ../data/language-specs/php.lang.h:12 -#: ../data/language-specs/vala.lang.h:6 +#: ../data/language-specs/bennugd.lang.h:11 +#: ../data/language-specs/cg.lang.h:15 ../data/language-specs/c.lang.h:18 +#: ../data/language-specs/csharp.lang.h:16 ../data/language-specs/d.lang.h:15 +#: ../data/language-specs/eiffel.lang.h:16 ../data/language-specs/go.lang.h:15 +#: ../data/language-specs/nemerle.lang.h:16 +#: ../data/language-specs/ooc.lang.h:17 ../data/language-specs/php.lang.h:21 msgid "Hexadecimal number" msgstr "Шістнадцяткове число" -#. Any variable name -#: ../data/language-specs/bennugd.lang.h:11 -#: ../data/language-specs/def.lang.h:34 ../data/language-specs/php.lang.h:13 -msgid "Identifier" -msgstr "Ідентифікатор" - #: ../data/language-specs/bibtex.lang.h:1 +#: ../data/language-specs/docbook.lang.h:1 ../data/language-specs/dtd.lang.h:1 +#: ../data/language-specs/gtk-doc.lang.h:1 +#: ../data/language-specs/haddock.lang.h:1 +#: ../data/language-specs/html.lang.h:1 ../data/language-specs/latex.lang.h:1 +#: ../data/language-specs/mallard.lang.h:1 +#: ../data/language-specs/markdown.lang.h:1 +#: ../data/language-specs/t2t.lang.h:1 ../data/language-specs/texinfo.lang.h:1 +#: ../data/language-specs/xml.lang.h:1 ../data/language-specs/xslt.lang.h:1 +#: ../gtksourceview/gtksourcecompletionitem.c:242 +#: ../gtksourceview/gtksourcegutterrenderertext.c:395 +msgid "Markup" +msgstr "Розмітка" + +#: ../data/language-specs/bibtex.lang.h:2 msgid "BibTeX" msgstr "BibTeX" -#: ../data/language-specs/bibtex.lang.h:2 +#: ../data/language-specs/bibtex.lang.h:3 msgid "Entries" msgstr "Предикати" -#: ../data/language-specs/bibtex.lang.h:3 +#: ../data/language-specs/bibtex.lang.h:4 msgid "Field" msgstr "Поле" -#: ../data/language-specs/bibtex.lang.h:4 -#: ../data/language-specs/docbook.lang.h:5 ../data/language-specs/dtd.lang.h:2 -#: ../data/language-specs/gtk-doc.lang.h:6 -#: ../data/language-specs/haddock.lang.h:14 -#: ../data/language-specs/html.lang.h:7 ../data/language-specs/latex.lang.h:6 -#: ../data/language-specs/mallard.lang.h:4 ../data/language-specs/t2t.lang.h:6 -#: ../data/language-specs/texinfo.lang.h:8 ../data/language-specs/xml.lang.h:9 -#: ../data/language-specs/xslt.lang.h:2 -#: ../gtksourceview/gtksourcecompletionitem.c:242 -#: ../gtksourceview/gtksourcegutterrenderertext.c:395 -msgid "Markup" -msgstr "Розмітка" - -#: ../data/language-specs/boo.lang.h:1 +#: ../data/language-specs/boo.lang.h:2 msgid "Boo" msgstr "Boo" -#: ../data/language-specs/boo.lang.h:2 ../data/language-specs/desktop.lang.h:3 -#: ../data/language-specs/d.lang.h:2 ../data/language-specs/libtool.lang.h:1 -#: ../data/language-specs/octave.lang.h:2 -#: ../data/language-specs/python.lang.h:2 -#: ../data/language-specs/scheme.lang.h:1 -#: ../data/language-specs/scilab.lang.h:1 -#: ../data/language-specs/sparql.lang.h:1 -msgid "Boolean" -msgstr "Булове" - -#: ../data/language-specs/boo.lang.h:6 -msgid "Definition" -msgstr "Означення" - -#: ../data/language-specs/boo.lang.h:8 ../data/language-specs/python.lang.h:13 +#: ../data/language-specs/boo.lang.h:4 ../data/language-specs/python.lang.h:5 +#: ../data/language-specs/python3.lang.h:5 msgid "Multiline string" msgstr "Рядок з переносами" -#: ../data/language-specs/boo.lang.h:9 ../data/language-specs/sparql.lang.h:9 -#: ../data/language-specs/xml.lang.h:10 ../data/language-specs/xslt.lang.h:3 +#: ../data/language-specs/boo.lang.h:6 +#: ../data/language-specs/javascript.lang.h:14 +#: ../data/language-specs/perl.lang.h:16 ../data/language-specs/ruby.lang.h:24 +msgid "Regular Expression" +msgstr "Регулярний вираз" + +#: ../data/language-specs/boo.lang.h:7 ../data/language-specs/sparql.lang.h:8 +#: ../data/language-specs/xml.lang.h:12 ../data/language-specs/xslt.lang.h:4 msgid "Namespace" msgstr "Простір назв" -#: ../data/language-specs/boo.lang.h:10 -#: ../data/language-specs/csharp.lang.h:11 ../data/language-specs/d.lang.h:11 -#: ../data/language-specs/fsharp.lang.h:13 -#: ../data/language-specs/java.lang.h:12 -#: ../data/language-specs/javascript.lang.h:11 -#: ../data/language-specs/nemerle.lang.h:12 -#: ../data/language-specs/ooc.lang.h:13 ../data/language-specs/php.lang.h:15 -#: ../data/language-specs/vala.lang.h:8 +#: ../data/language-specs/boo.lang.h:9 +msgid "Definition" +msgstr "Означення" + +#: ../data/language-specs/boo.lang.h:11 +#: ../data/language-specs/python.lang.h:10 +#: ../data/language-specs/python3.lang.h:9 +#: ../data/language-specs/ruby.lang.h:19 +msgid "Special Variable" +msgstr "Спеціальна змінна" + +#: ../data/language-specs/boo.lang.h:12 +#: ../data/language-specs/csharp.lang.h:13 ../data/language-specs/d.lang.h:9 +#: ../data/language-specs/fsharp.lang.h:21 +#: ../data/language-specs/java.lang.h:13 +#: ../data/language-specs/javascript.lang.h:4 +#: ../data/language-specs/json.lang.h:5 +#: ../data/language-specs/nemerle.lang.h:10 +#: ../data/language-specs/objj.lang.h:9 ../data/language-specs/ooc.lang.h:12 +#: ../data/language-specs/php.lang.h:16 ../data/language-specs/vala.lang.h:9 msgid "Null Value" msgstr "Значення Null" -#: ../data/language-specs/boo.lang.h:12 ../data/language-specs/perl.lang.h:17 -#: ../data/language-specs/ruby.lang.h:17 -msgid "Regular Expression" -msgstr "Регулярний вираз" +#: ../data/language-specs/boo.lang.h:13 +#: ../data/language-specs/desktop.lang.h:9 ../data/language-specs/d.lang.h:10 +#: ../data/language-specs/imagej.lang.h:4 +#: ../data/language-specs/libtool.lang.h:4 +#: ../data/language-specs/objj.lang.h:3 ../data/language-specs/octave.lang.h:8 +#: ../data/language-specs/python.lang.h:11 +#: ../data/language-specs/python3.lang.h:10 +#: ../data/language-specs/scheme.lang.h:4 +#: ../data/language-specs/scilab.lang.h:8 +#: ../data/language-specs/sparql.lang.h:9 +msgid "Boolean" +msgstr "Булове" -#: ../data/language-specs/boo.lang.h:14 -#: ../data/language-specs/python.lang.h:16 -#: ../data/language-specs/ruby.lang.h:20 -msgid "Special Variable" -msgstr "Спеціальна змінна" +#: ../data/language-specs/cg.lang.h:2 +msgid "CG Shader Language" +msgstr "Мова побудови тіней CG" -#: ../data/language-specs/changelog.lang.h:1 -msgid "Bullet" -msgstr "Точка" +#. Any erroneous construct +#: ../data/language-specs/cg.lang.h:4 ../data/language-specs/cobol.lang.h:11 +#: ../data/language-specs/csharp.lang.h:4 ../data/language-specs/css.lang.h:3 +#: ../data/language-specs/def.lang.h:53 ../data/language-specs/d.lang.h:4 +#: ../data/language-specs/dot.lang.h:4 ../data/language-specs/go.lang.h:4 +#: ../data/language-specs/html.lang.h:8 ../data/language-specs/json.lang.h:7 +#: ../data/language-specs/nemerle.lang.h:4 +#: ../data/language-specs/ocaml.lang.h:20 ../data/language-specs/ooc.lang.h:4 +#: ../data/language-specs/opal.lang.h:6 ../data/language-specs/perl.lang.h:17 +#: ../data/language-specs/php.lang.h:4 ../data/language-specs/prolog.lang.h:9 +#: ../data/language-specs/vala.lang.h:4 +#: ../data/language-specs/verilog.lang.h:6 +#: ../data/language-specs/xml.lang.h:13 +msgid "Error" +msgstr "Помилка" -#: ../data/language-specs/changelog.lang.h:2 -msgid "ChangeLog" -msgstr "ChangeLog" +#: ../data/language-specs/cg.lang.h:6 +msgid "Bindings" +msgstr "Прив'язки" -#: ../data/language-specs/changelog.lang.h:3 -#: ../data/language-specs/rpmspec.lang.h:3 -msgid "Date" -msgstr "Дата" +#: ../data/language-specs/cg.lang.h:7 ../data/language-specs/c.lang.h:7 +#: ../data/language-specs/go.lang.h:6 ../data/language-specs/objj.lang.h:7 +msgid "Included File" +msgstr "Включений файл" -#: ../data/language-specs/changelog.lang.h:4 -msgid "E-mail address" -msgstr "Адреса електронної пошти" +#: ../data/language-specs/cg.lang.h:14 ../data/language-specs/c.lang.h:17 +#: ../data/language-specs/d.lang.h:14 ../data/language-specs/go.lang.h:14 +#: ../data/language-specs/nemerle.lang.h:15 +#: ../data/language-specs/ooc.lang.h:16 ../data/language-specs/php.lang.h:20 +msgid "Octal number" +msgstr "Вісімкове число" -#: ../data/language-specs/changelog.lang.h:5 -msgid "File" -msgstr "Файл" +#: ../data/language-specs/cg.lang.h:17 +msgid "Swizzle operator" +msgstr "Оператор типу" -#: ../data/language-specs/changelog.lang.h:7 -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:464 -msgid "Name" -msgstr "Назва" +#. Translators: functions that are provided in the language +#: ../data/language-specs/cg.lang.h:19 ../data/language-specs/erlang.lang.h:11 +#: ../data/language-specs/imagej.lang.h:3 +#: ../data/language-specs/matlab.lang.h:5 +#: ../data/language-specs/octave.lang.h:16 +#: ../data/language-specs/ruby.lang.h:16 +msgid "Builtin" +msgstr "Вбудовані функції" #. * #. * SECTION:language @@ -594,28 +650,56 @@ #. * #GtkSourceLanguage instance, and gtk_source_buffer_set_language() to apply it #. * to a #GtkSourceBuffer. #. -#: ../data/language-specs/changelog.lang.h:8 -#: ../data/language-specs/cmake.lang.h:7 ../data/language-specs/css.lang.h:10 -#: ../data/language-specs/desktop.lang.h:12 -#: ../data/language-specs/diff.lang.h:9 ../data/language-specs/dot.lang.h:6 -#: ../data/language-specs/dpatch.lang.h:2 -#: ../data/language-specs/gdb-log.lang.h:8 -#: ../data/language-specs/gtkrc.lang.h:8 ../data/language-specs/ini.lang.h:8 -#: ../data/language-specs/libtool.lang.h:3 -#: ../data/language-specs/nsis.lang.h:4 ../data/language-specs/ocl.lang.h:6 +#: ../data/language-specs/changelog.lang.h:1 +#: ../data/language-specs/cmake.lang.h:1 ../data/language-specs/css.lang.h:1 +#: ../data/language-specs/desktop.lang.h:1 +#: ../data/language-specs/diff.lang.h:1 ../data/language-specs/dot.lang.h:1 +#: ../data/language-specs/dpatch.lang.h:1 +#: ../data/language-specs/gdb-log.lang.h:1 +#: ../data/language-specs/gtkrc.lang.h:1 ../data/language-specs/ini.lang.h:1 +#: ../data/language-specs/json.lang.h:1 +#: ../data/language-specs/libtool.lang.h:1 +#: ../data/language-specs/nsis.lang.h:1 ../data/language-specs/ocl.lang.h:1 #: ../data/language-specs/pkgconfig.lang.h:1 -#: ../data/language-specs/po.lang.h:5 ../data/language-specs/rpmspec.lang.h:10 -#: ../data/language-specs/sh.lang.h:6 ../data/language-specs/texinfo.lang.h:9 +#: ../data/language-specs/po.lang.h:1 ../data/language-specs/protobuf.lang.h:1 +#: ../data/language-specs/rpmspec.lang.h:1 ../data/language-specs/sh.lang.h:10 +#: ../data/language-specs/texinfo.lang.h:5 #: ../data/language-specs/yacc.lang.h:1 #: ../gtksourceview/gtksourcelanguage.c:55 msgid "Others" msgstr "Інше" +#: ../data/language-specs/changelog.lang.h:2 +msgid "ChangeLog" +msgstr "ChangeLog" + +#: ../data/language-specs/changelog.lang.h:3 +#: ../data/language-specs/rpmspec.lang.h:14 +msgid "Date" +msgstr "Дата" + +#: ../data/language-specs/changelog.lang.h:4 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:455 +msgid "Name" +msgstr "Назва" + +#: ../data/language-specs/changelog.lang.h:5 +msgid "E-mail address" +msgstr "Адреса електронної пошти" + +#: ../data/language-specs/changelog.lang.h:6 +msgid "File" +msgstr "Файл" + +#: ../data/language-specs/changelog.lang.h:7 +msgid "Bullet" +msgstr "Точка" + #: ../data/language-specs/changelog.lang.h:9 msgid "Release" msgstr "Випуск" -#: ../data/language-specs/chdr.lang.h:1 +#: ../data/language-specs/chdr.lang.h:2 msgid "C/C++/ObjC Header" msgstr "Заголовок C/C++/ObjC" @@ -623,87 +707,68 @@ msgid "C" msgstr "C" -#: ../data/language-specs/c.lang.h:5 ../data/language-specs/cpp.lang.h:2 -#: ../data/language-specs/objc.lang.h:1 ../data/language-specs/opal.lang.h:3 +#: ../data/language-specs/c.lang.h:6 ../data/language-specs/cpp.lang.h:5 +#: ../data/language-specs/objc.lang.h:5 ../data/language-specs/opal.lang.h:5 msgid "Common Defines" msgstr "Загальне визначення" -#: ../data/language-specs/c.lang.h:12 ../data/language-specs/cg.lang.h:13 -#: ../data/language-specs/go.lang.h:11 -msgid "Included File" -msgstr "Включений файл" - -#: ../data/language-specs/c.lang.h:14 ../data/language-specs/cg.lang.h:15 -#: ../data/language-specs/d.lang.h:12 ../data/language-specs/go.lang.h:13 -#: ../data/language-specs/nemerle.lang.h:13 -#: ../data/language-specs/ooc.lang.h:15 ../data/language-specs/php.lang.h:16 -msgid "Octal number" -msgstr "Вісімкове число" +#. A character constant: 'c' +#: ../data/language-specs/c.lang.h:8 ../data/language-specs/csharp.lang.h:7 +#: ../data/language-specs/def.lang.h:15 ../data/language-specs/gap.lang.h:4 +#: ../data/language-specs/go.lang.h:7 ../data/language-specs/haskell.lang.h:10 +#: ../data/language-specs/java.lang.h:5 +#: ../data/language-specs/nemerle.lang.h:6 ../data/language-specs/sml.lang.h:6 +#: ../data/language-specs/vhdl.lang.h:5 +msgid "Character" +msgstr "Символ" -#: ../data/language-specs/c.lang.h:16 -msgid "Signal name" -msgstr "Назва сигналу" +#: ../data/language-specs/c.lang.h:13 +msgid "printf Conversion" +msgstr "Перетворення printf" -#: ../data/language-specs/c.lang.h:18 +#: ../data/language-specs/c.lang.h:20 msgid "Standard stream" msgstr "Стандартний потік" #: ../data/language-specs/c.lang.h:21 -msgid "printf Conversion" -msgstr "Перетворення printf" - -#: ../data/language-specs/cg.lang.h:1 -msgid "Bindings" -msgstr "Прив'язки" - -#: ../data/language-specs/cg.lang.h:3 ../data/language-specs/erlang.lang.h:3 -#: ../data/language-specs/ruby.lang.h:4 -msgid "Builtin" -msgstr "Вбудовані функції" - -#: ../data/language-specs/cg.lang.h:4 -msgid "CG Shader Language" -msgstr "Мова побудови тіней CG" +msgid "Signal name" +msgstr "Назва сигналу" -#: ../data/language-specs/cg.lang.h:19 -msgid "Swizzle operator" -msgstr "Оператор типу" +#: ../data/language-specs/cmake.lang.h:2 +msgid "CMake" +msgstr "CMake" -#: ../data/language-specs/cmake.lang.h:1 +#: ../data/language-specs/cmake.lang.h:3 msgid "Builtin Command" msgstr "Вбудована команда" -#: ../data/language-specs/cmake.lang.h:2 ../data/language-specs/glsl.lang.h:3 +#: ../data/language-specs/cmake.lang.h:4 ../data/language-specs/glsl.lang.h:8 msgid "Builtin Variable" msgstr "Вбудована змінна" -#: ../data/language-specs/cmake.lang.h:3 -msgid "CMake" -msgstr "CMake" - #. Any constant -#: ../data/language-specs/cmake.lang.h:4 ../data/language-specs/cobol.lang.h:3 -#: ../data/language-specs/def.lang.h:15 -#: ../data/language-specs/gtk-doc.lang.h:1 -#: ../data/language-specs/libtool.lang.h:2 -#: ../data/language-specs/ruby.lang.h:6 +#: ../data/language-specs/cmake.lang.h:5 ../data/language-specs/cobol.lang.h:7 +#: ../data/language-specs/def.lang.h:13 +#: ../data/language-specs/gtk-doc.lang.h:8 +#: ../data/language-specs/libtool.lang.h:3 +#: ../data/language-specs/ruby.lang.h:17 msgid "Constant" msgstr "Константа" -#: ../data/language-specs/cmake.lang.h:5 +#: ../data/language-specs/cmake.lang.h:7 msgid "Control Keyword" msgstr "Контрольне ключове слово" -#: ../data/language-specs/cobol.lang.h:1 +#: ../data/language-specs/cobol.lang.h:2 msgid "Cobol" msgstr "Cobol" #. Any statement -#: ../data/language-specs/cobol.lang.h:9 ../data/language-specs/def.lang.h:55 +#: ../data/language-specs/cobol.lang.h:4 ../data/language-specs/def.lang.h:43 msgid "Statement" msgstr "Оператор" -#: ../data/language-specs/cpp.lang.h:1 +#: ../data/language-specs/cpp.lang.h:2 msgid "C++" msgstr "C++" @@ -711,253 +776,274 @@ msgid "C#" msgstr "C#" -#: ../data/language-specs/csharp.lang.h:16 +#. Translators: this is a format that appears in the strings +#: ../data/language-specs/csharp.lang.h:10 ../data/language-specs/po.lang.h:8 msgid "String Format" msgstr "Формат рядку" -#: ../data/language-specs/css.lang.h:1 +#: ../data/language-specs/css.lang.h:2 msgid "CSS" msgstr "CSS" -#: ../data/language-specs/css.lang.h:2 +#: ../data/language-specs/css.lang.h:4 +msgid "Others 2" +msgstr "Інше 2" + +#: ../data/language-specs/css.lang.h:6 msgid "Color" msgstr "Колір" -#: ../data/language-specs/css.lang.h:4 ../data/language-specs/fcl.lang.h:3 -#: ../data/language-specs/fortran.lang.h:4 ../data/language-specs/gap.lang.h:3 -#: ../data/language-specs/gtkrc.lang.h:4 -#: ../data/language-specs/haskell.lang.h:4 ../data/language-specs/ini.lang.h:5 -#: ../data/language-specs/octave.lang.h:4 -#: ../data/language-specs/pascal.lang.h:3 ../data/language-specs/sql.lang.h:3 +#: ../data/language-specs/css.lang.h:7 +msgid "Others 3" +msgstr "Інше 3" + +#. Translator: it is a type of number +#: ../data/language-specs/css.lang.h:10 ../data/language-specs/fcl.lang.h:7 +#: ../data/language-specs/fortran.lang.h:8 ../data/language-specs/gap.lang.h:7 +#: ../data/language-specs/gtkrc.lang.h:6 +#: ../data/language-specs/haskell.lang.h:13 +#: ../data/language-specs/ini.lang.h:7 ../data/language-specs/json.lang.h:8 +#: ../data/language-specs/octave.lang.h:9 +#: ../data/language-specs/pascal.lang.h:6 ../data/language-specs/sml.lang.h:10 +#: ../data/language-specs/sql.lang.h:8 msgid "Decimal" msgstr "Десяткове число" -#: ../data/language-specs/css.lang.h:5 +#: ../data/language-specs/css.lang.h:11 msgid "Dimension" msgstr "Розмір" -#: ../data/language-specs/css.lang.h:9 +#: ../data/language-specs/css.lang.h:12 msgid "Known Property Value" msgstr "Властивість з відомим значенням" -#: ../data/language-specs/css.lang.h:11 -msgid "Others 2" -msgstr "Інше 2" - -#: ../data/language-specs/css.lang.h:12 -msgid "Others 3" -msgstr "Інше 3" - -#: ../data/language-specs/css.lang.h:14 +#: ../data/language-specs/css.lang.h:13 msgid "at-rules" msgstr "правила at" -#: ../data/language-specs/cuda.lang.h:1 -msgid "CUDA" -msgstr "CUDA" - -#: ../data/language-specs/cuda.lang.h:3 -msgid "Device Functions" -msgstr "Функції пристрою" - -#: ../data/language-specs/cuda.lang.h:4 -msgid "Global Functions" -msgstr "Глобальні функції" - -#: ../data/language-specs/cuda.lang.h:5 -msgid "Global Variables" -msgstr "Глобальні змінні" +#: ../data/language-specs/css.lang.h:15 +msgid "ID Selector" +msgstr "Вибір ідентифікатора" + +#: ../data/language-specs/css.lang.h:16 +msgid "Class Selector" +msgstr "Вибір класу" + +#: ../data/language-specs/css.lang.h:17 +msgid "Tag Name Selector" +msgstr "Вибір назви мітки" -#. A base-N number: 0xFFFF -#: ../data/language-specs/def.lang.h:2 ../data/language-specs/python.lang.h:1 -#: ../data/language-specs/ruby.lang.h:2 -msgid "Base-N number" -msgstr "Ціле число у N системі числення" +#: ../data/language-specs/cuda.lang.h:2 +msgid "CUDA" +msgstr "CUDA" -#. A builtin name: like __import__, abs in Python -#. (see http://docs.python.org/lib/built-in-funcs.html) -#: ../data/language-specs/def.lang.h:7 -msgid "Built-in identifier" -msgstr "Вбудований ідентифікатор" +#: ../data/language-specs/cuda.lang.h:5 +msgid "Global Functions" +msgstr "Глобальні функції" -#. A complex number -#: ../data/language-specs/def.lang.h:13 ../data/language-specs/python.lang.h:6 -msgid "Complex number" -msgstr "Комплексне число" +#: ../data/language-specs/cuda.lang.h:6 +msgid "Device Functions" +msgstr "Функції пристрою" -#. A primitive data type: int, long, char, etc. -#: ../data/language-specs/def.lang.h:17 -msgid "Data type" -msgstr "Тип даних" +#: ../data/language-specs/cuda.lang.h:7 +msgid "Global Variables" +msgstr "Глобальні змінні" -#: ../data/language-specs/def.lang.h:20 +#: ../data/language-specs/def.lang.h:1 msgid "Defaults" msgstr "Типово" +#. A shebang: #!/bin/sh +#: ../data/language-specs/def.lang.h:5 +msgid "Shebang" +msgstr "Shebang" + #. A special comment containing documentation like in javadoc or #. gtk-doc -#: ../data/language-specs/def.lang.h:23 +#: ../data/language-specs/def.lang.h:8 msgid "Documentation comment" msgstr "Документація" #. This style doesn't map to anything since it must be used as an additional #. style for text which is already styled as a "doc-comment" -#: ../data/language-specs/def.lang.h:26 +#: ../data/language-specs/def.lang.h:11 msgid "Documentation comment element" msgstr "Елемент коментаря документації" -#. Anything that needs extra attention; mostly the keywords TODO, FIXME and XXX -#: ../data/language-specs/def.lang.h:38 -msgid "Note (FIXME, TODO, XXX, etc.)" -msgstr "Примітка (FIXME, TODO, XXX, тощо)." +#. This style doesn't map to anything since it must be used as an additional +#. style for text which is already styled as a "string" +#: ../data/language-specs/def.lang.h:20 +msgid "Special character (inside a string)" +msgstr "Спеціальний символ (всередині рядка)" + +#. A base-N number: 0xFFFF +#: ../data/language-specs/def.lang.h:28 +#: ../data/language-specs/python.lang.h:14 +#: ../data/language-specs/python3.lang.h:13 +#: ../data/language-specs/ruby.lang.h:12 +msgid "Base-N number" +msgstr "Ціле число у N системі числення" + +#. A complex number +#: ../data/language-specs/def.lang.h:30 +#: ../data/language-specs/python.lang.h:15 +#: ../data/language-specs/python3.lang.h:14 +msgid "Complex number" +msgstr "Комплексне число" + +#. A builtin name: like __import__, abs in Python +#. (see http://docs.python.org/lib/built-in-funcs.html) +#: ../data/language-specs/def.lang.h:41 +msgid "Built-in identifier" +msgstr "Вбудований ідентифікатор" + +#. A primitive data type: int, long, char, etc. +#: ../data/language-specs/def.lang.h:49 ../data/language-specs/octave.lang.h:6 +msgid "Data type" +msgstr "Тип даних" #. This one is for '#include ' and "#pragma blah", or 'use foobar', etc.. -#: ../data/language-specs/def.lang.h:44 +#: ../data/language-specs/def.lang.h:51 msgid "Preprocessor directive" msgstr "Директива препроцесору" #. Reserved keywords: like "const" and "goto" in Java -#: ../data/language-specs/def.lang.h:46 +#: ../data/language-specs/def.lang.h:55 msgid "Reserved keyword" msgstr "Зарезервовані ключові слова" -#. A shebang: #!/bin/sh -#: ../data/language-specs/def.lang.h:48 ../data/language-specs/sh.lang.h:8 -msgid "Shebang" -msgstr "Shebang" - -#. This style doesn't map to anything since it must be used as an additional -#. style for text which is already styled as a "string" -#: ../data/language-specs/def.lang.h:51 -msgid "Special character (inside a string)" -msgstr "Спеціальний символ (всередині рядка)" +#. Anything that needs extra attention; mostly the keywords TODO, FIXME and XXX +#: ../data/language-specs/def.lang.h:57 +msgid "Note (FIXME, TODO, XXX, etc.)" +msgstr "Примітка (FIXME, TODO, XXX, тощо)." #. Text that stands out, HTML links, e-mail addresses, etc. #: ../data/language-specs/def.lang.h:59 msgid "Underlined" msgstr "Підкреслене" -#: ../data/language-specs/desktop.lang.h:1 +#: ../data/language-specs/desktop.lang.h:2 msgid ".desktop" msgstr ".desktop" -#: ../data/language-specs/desktop.lang.h:2 -msgid "Additional Category" -msgstr "Додаткова категорія" - -#: ../data/language-specs/desktop.lang.h:4 -msgid "Encoding" -msgstr "Кодування" - -#: ../data/language-specs/desktop.lang.h:5 -msgid "Exec parameter" -msgstr "Параметр запуску" - -#: ../data/language-specs/desktop.lang.h:6 +#: ../data/language-specs/desktop.lang.h:3 msgid "Group" msgstr "Група" #. Translators: "Key" here means key value, that is the left hand #. side in a myoption=something line in a .desktop file -#: ../data/language-specs/desktop.lang.h:9 +#: ../data/language-specs/desktop.lang.h:6 +#: ../data/language-specs/json.lang.h:2 msgid "Key" msgstr "Поле ключа" +#: ../data/language-specs/desktop.lang.h:7 +msgid "Translation" +msgstr "Переклад" + #: ../data/language-specs/desktop.lang.h:10 +msgid "Exec parameter" +msgstr "Параметр запуску" + +#: ../data/language-specs/desktop.lang.h:11 +msgid "Encoding" +msgstr "Кодування" + +#: ../data/language-specs/desktop.lang.h:12 msgid "Main Category" msgstr "Головна категорія" #: ../data/language-specs/desktop.lang.h:13 +msgid "Additional Category" +msgstr "Додаткова категорія" + +#: ../data/language-specs/desktop.lang.h:14 msgid "Reserved Category" msgstr "Зарезервована категорія" -#: ../data/language-specs/desktop.lang.h:14 -msgid "Translation" -msgstr "Переклад" +#: ../data/language-specs/diff.lang.h:2 +msgid "Diff" +msgstr "Diff" -#: ../data/language-specs/diff.lang.h:1 +#: ../data/language-specs/diff.lang.h:3 msgid "Added line" msgstr "Доданий рядок" +#. Others 2 +#: ../data/language-specs/diff.lang.h:5 +msgid "Removed line" +msgstr "Видалений рядок" + #. Others 3 -#: ../data/language-specs/diff.lang.h:3 +#: ../data/language-specs/diff.lang.h:7 msgid "Changed line" msgstr "Змінений рядок" -#: ../data/language-specs/diff.lang.h:4 -msgid "Diff" -msgstr "Diff" - -#. Keyword -#: ../data/language-specs/diff.lang.h:6 -msgid "Ignore" -msgstr "Ігнорувати" +#. Preprocessor +#: ../data/language-specs/diff.lang.h:9 +msgid "Special case" +msgstr "Спеціальний випадок" #. String -#: ../data/language-specs/diff.lang.h:8 ../data/language-specs/po.lang.h:4 +#: ../data/language-specs/diff.lang.h:11 ../data/language-specs/po.lang.h:4 msgid "Location" msgstr "Позиція" -#. Others 2 -#: ../data/language-specs/diff.lang.h:11 -msgid "Removed line" -msgstr "Видалений рядок" - -#. Preprocessor +#. Keyword #: ../data/language-specs/diff.lang.h:13 -msgid "Special case" -msgstr "Спеціальний випадок" - -#: ../data/language-specs/d.lang.h:1 ../data/language-specs/nemerle.lang.h:1 -msgid "Binary number" -msgstr "Двійкове число" +msgid "Ignore" +msgstr "Ігнорувати" -#: ../data/language-specs/d.lang.h:4 +#: ../data/language-specs/d.lang.h:2 msgid "D" msgstr "D" -#: ../data/language-specs/d.lang.h:14 +#: ../data/language-specs/d.lang.h:8 msgid "Special Token" msgstr "Спеціальні слова" -#: ../data/language-specs/docbook.lang.h:1 -msgid "Docbook" -msgstr "Docbook" +#: ../data/language-specs/d.lang.h:13 ../data/language-specs/nemerle.lang.h:14 +msgid "Binary number" +msgstr "Двійкове число" #: ../data/language-specs/docbook.lang.h:2 +msgid "DocBook" +msgstr "DocBook" + +#: ../data/language-specs/docbook.lang.h:3 +msgid "Header Elements" +msgstr "Елементи заголовків" + +#: ../data/language-specs/docbook.lang.h:4 msgid "Formatting Elements" msgstr "Елементи форматування" -#: ../data/language-specs/docbook.lang.h:3 +#: ../data/language-specs/docbook.lang.h:5 msgid "GUI Elements" msgstr "Графічні елементи" -#: ../data/language-specs/docbook.lang.h:4 -msgid "Header Elements" -msgstr "Елементи заголовків" - #: ../data/language-specs/docbook.lang.h:6 msgid "Structural Elements" msgstr "Структурні елементи" -#: ../data/language-specs/dosbatch.lang.h:1 -#: ../data/language-specs/latex.lang.h:1 +#: ../data/language-specs/dosbatch.lang.h:2 +msgid "DOS Batch" +msgstr "Пачка DOS" + +#: ../data/language-specs/dosbatch.lang.h:6 +#: ../data/language-specs/latex.lang.h:8 msgid "Command" msgstr "Команда" -#: ../data/language-specs/dosbatch.lang.h:3 -msgid "Dos Batch" -msgstr "Командний файл DOS" +#: ../data/language-specs/dot.lang.h:2 +msgid "Graphviz Dot" +msgstr "Graphviz Dot" -#: ../data/language-specs/dot.lang.h:1 ../data/language-specs/xml.lang.h:1 +#: ../data/language-specs/dot.lang.h:6 ../data/language-specs/xml.lang.h:8 msgid "Attribute name" msgstr "Назва атрибуту" -#: ../data/language-specs/dot.lang.h:4 -msgid "Graphviz Dot" -msgstr "Graphviz Dot" - -#: ../data/language-specs/dpatch.lang.h:1 +#: ../data/language-specs/dpatch.lang.h:2 msgid "DPatch" msgstr "DPatch" @@ -965,18 +1051,18 @@ msgid "patch-start" msgstr "patch-start" -#: ../data/language-specs/dtd.lang.h:1 ../data/language-specs/html.lang.h:4 +#: ../data/language-specs/dtd.lang.h:2 ../data/language-specs/html.lang.h:7 msgid "DTD" msgstr "DTD" #: ../data/language-specs/dtd.lang.h:3 -msgid "decl" -msgstr "елемент" - -#: ../data/language-specs/dtd.lang.h:4 msgid "entity" msgstr "предикат (entity)" +#: ../data/language-specs/dtd.lang.h:4 +msgid "decl" +msgstr "елемент" + #: ../data/language-specs/dtd.lang.h:5 msgid "error" msgstr "помилка" @@ -985,540 +1071,620 @@ msgid "quoted-value" msgstr "значення у дужках" -#: ../data/language-specs/eiffel.lang.h:1 -msgid "Assertion" -msgstr "Твердження" - #: ../data/language-specs/eiffel.lang.h:2 -msgid "Boolean Value" -msgstr "Булеве значення" +msgid "Eiffel" +msgstr "Eiffel" #: ../data/language-specs/eiffel.lang.h:5 msgid "Debug" msgstr "Налагодження" -#: ../data/language-specs/eiffel.lang.h:7 +#: ../data/language-specs/eiffel.lang.h:6 +msgid "Assertion" +msgstr "Твердження" + +#: ../data/language-specs/eiffel.lang.h:9 msgid "Design by Contract" msgstr "Дизайн за контрактом" -#: ../data/language-specs/eiffel.lang.h:8 -msgid "Eiffel" -msgstr "Eiffel" - #: ../data/language-specs/eiffel.lang.h:10 msgid "Exception Handling" msgstr "Обробка виключень" -#: ../data/language-specs/eiffel.lang.h:13 -#: ../data/language-specs/ruby.lang.h:16 +#: ../data/language-specs/eiffel.lang.h:11 +#: ../data/language-specs/ruby.lang.h:20 msgid "Predefined Variable" msgstr "Наперед визначена змінна" -#: ../data/language-specs/eiffel.lang.h:16 +#: ../data/language-specs/eiffel.lang.h:13 msgid "Void Value" msgstr "Значення Void" -#: ../data/language-specs/erlang.lang.h:1 +#: ../data/language-specs/eiffel.lang.h:14 +#: ../data/language-specs/javascript.lang.h:6 +#: ../data/language-specs/json.lang.h:6 +msgid "Boolean Value" +msgstr "Булеве значення" + +#: ../data/language-specs/erlang.lang.h:2 +msgid "Erlang" +msgstr "Erlang" + +#: ../data/language-specs/erlang.lang.h:6 msgid "Atom" msgstr "Atom" -#: ../data/language-specs/erlang.lang.h:2 -#: ../data/language-specs/fsharp.lang.h:1 -#: ../data/language-specs/ocaml.lang.h:1 -#: ../data/language-specs/octave.lang.h:1 -#: ../data/language-specs/verilog.lang.h:1 -#: ../data/language-specs/vhdl.lang.h:1 +#: ../data/language-specs/erlang.lang.h:10 +#: ../data/language-specs/fsharp.lang.h:4 +#: ../data/language-specs/ocaml.lang.h:5 +#: ../data/language-specs/octave.lang.h:11 ../data/language-specs/sml.lang.h:9 +#: ../data/language-specs/verilog.lang.h:13 +#: ../data/language-specs/vhdl.lang.h:9 msgid "Base-N Integer" msgstr "Ціле число у N системі числення" -#: ../data/language-specs/erlang.lang.h:5 -#: ../data/language-specs/forth.lang.h:2 -#: ../data/language-specs/systemverilog.lang.h:1 -#: ../data/language-specs/verilog.lang.h:3 +#: ../data/language-specs/erlang.lang.h:12 +#: ../data/language-specs/forth.lang.h:11 +#: ../data/language-specs/systemverilog.lang.h:3 +#: ../data/language-specs/verilog.lang.h:7 msgid "Compiler Directive" msgstr "Директива компілятора" -#: ../data/language-specs/erlang.lang.h:7 -msgid "Erlang" -msgstr "Erlang" - -#: ../data/language-specs/fcl.lang.h:1 -msgid "Block" -msgstr "Блок" +#: ../data/language-specs/fcl.lang.h:1 ../data/language-specs/gap.lang.h:1 +#: ../data/language-specs/imagej.lang.h:1 +#: ../data/language-specs/matlab.lang.h:1 +#: ../data/language-specs/octave.lang.h:1 ../data/language-specs/R.lang.h:1 +#: ../data/language-specs/scilab.lang.h:1 +msgid "Scientific" +msgstr "Наукове" -#: ../data/language-specs/fcl.lang.h:4 +#: ../data/language-specs/fcl.lang.h:2 msgid "FCL" msgstr "FCL" -#: ../data/language-specs/fcl.lang.h:5 ../data/language-specs/fortran.lang.h:5 -#: ../data/language-specs/ini.lang.h:6 ../data/language-specs/octave.lang.h:5 -#: ../data/language-specs/scilab.lang.h:3 ../data/language-specs/sql.lang.h:4 +#: ../data/language-specs/fcl.lang.h:4 ../data/language-specs/fortran.lang.h:4 +#: ../data/language-specs/ini.lang.h:4 ../data/language-specs/octave.lang.h:10 +#: ../data/language-specs/scilab.lang.h:4 ../data/language-specs/sql.lang.h:4 msgid "Floating Point" msgstr "Число з рухомою комою" -#: ../data/language-specs/fcl.lang.h:7 ../data/language-specs/octave.lang.h:9 -#: ../data/language-specs/scilab.lang.h:6 +#: ../data/language-specs/fcl.lang.h:6 +msgid "Block" +msgstr "Блок" + +#: ../data/language-specs/fcl.lang.h:8 ../data/language-specs/octave.lang.h:15 +#: ../data/language-specs/scilab.lang.h:9 msgid "Reserved Constant" msgstr "Зарезервована константа" -#: ../data/language-specs/fcl.lang.h:8 ../data/language-specs/gap.lang.h:7 -#: ../data/language-specs/octave.lang.h:10 ../data/language-specs/R.lang.h:9 -#: ../data/language-specs/scilab.lang.h:7 -msgid "Scientific" -msgstr "Наукове" +#: ../data/language-specs/forth.lang.h:2 +msgid "Forth" +msgstr "Forth" -#: ../data/language-specs/forth.lang.h:4 +#: ../data/language-specs/forth.lang.h:9 msgid "Debug Code" msgstr "Код налагодження" -#: ../data/language-specs/forth.lang.h:5 +#: ../data/language-specs/forth.lang.h:10 msgid "Error Text" msgstr "Текст помилки" -#: ../data/language-specs/forth.lang.h:6 -msgid "Forth" -msgstr "Forth" - -#: ../data/language-specs/fortran.lang.h:1 -msgid "BOZ Literal" -msgstr "Літерал BOZ" - -#: ../data/language-specs/fortran.lang.h:6 +#: ../data/language-specs/fortran.lang.h:2 msgid "Fortran 95" msgstr "Fortran 95" -#: ../data/language-specs/fortran.lang.h:7 +#: ../data/language-specs/fortran.lang.h:6 msgid "Intrinsic function" msgstr "Внутрішня функція" -#: ../data/language-specs/fsharp.lang.h:3 -#: ../data/language-specs/ocaml.lang.h:3 -msgid "Builtin-function keyword" -msgstr "Ключове слово вбудована функція" +#: ../data/language-specs/fortran.lang.h:7 +msgid "BOZ Literal" +msgstr "Літерал BOZ" -#: ../data/language-specs/fsharp.lang.h:8 +#: ../data/language-specs/fsharp.lang.h:2 msgid "F#" msgstr "F#" -#: ../data/language-specs/fsharp.lang.h:9 -#: ../data/language-specs/ocaml.lang.h:9 +#: ../data/language-specs/fsharp.lang.h:5 +#: ../data/language-specs/ocaml.lang.h:6 ../data/language-specs/sml.lang.h:12 msgid "Floating Point number" msgstr "Число з рухомою комою" -#: ../data/language-specs/fsharp.lang.h:11 +#: ../data/language-specs/fsharp.lang.h:9 +#: ../data/language-specs/ocaml.lang.h:10 +msgid "Type, module or object keyword" +msgstr "Ключові слова для типів, модулів та об'єктів" + +#: ../data/language-specs/fsharp.lang.h:10 #: ../data/language-specs/ocaml.lang.h:11 +msgid "Builtin-function keyword" +msgstr "Ключове слово вбудована функція" + +#: ../data/language-specs/fsharp.lang.h:12 +#: ../data/language-specs/ocaml.lang.h:13 msgid "Labeled argument" msgstr "Аргумент з позначкою" -#: ../data/language-specs/fsharp.lang.h:12 -#: ../data/language-specs/ocaml.lang.h:12 -msgid "Module Path" -msgstr "Шлях до модуля" +#: ../data/language-specs/fsharp.lang.h:13 +#: ../data/language-specs/ocaml.lang.h:14 +msgid "Polymorphic Variant" +msgstr "Поліморфний варіант" #: ../data/language-specs/fsharp.lang.h:14 #: ../data/language-specs/ocaml.lang.h:15 -msgid "Polymorphic Variant" -msgstr "Поліморфний варіант" +msgid "Variant Constructor" +msgstr "Конструктор варіантів" -#: ../data/language-specs/fsharp.lang.h:18 -#: ../data/language-specs/ocaml.lang.h:19 +#. Translators: this is a specific variable called Type +#: ../data/language-specs/fsharp.lang.h:16 +#: ../data/language-specs/ocaml.lang.h:16 msgid "Type Variable" msgstr "Змінна типу" -#: ../data/language-specs/fsharp.lang.h:19 -#: ../data/language-specs/ocaml.lang.h:20 -msgid "Type, module or object keyword" -msgstr "Ключові слова для типів, модулів та об'єктів" - -#: ../data/language-specs/fsharp.lang.h:20 -#: ../data/language-specs/ocaml.lang.h:21 -msgid "Variant Constructor" -msgstr "Конструктор варіантів" +#: ../data/language-specs/fsharp.lang.h:17 +#: ../data/language-specs/ocaml.lang.h:17 +msgid "Module Path" +msgstr "Шлях до модуля" -#: ../data/language-specs/gap.lang.h:5 +#: ../data/language-specs/gap.lang.h:2 msgid "GAP" msgstr "GAP" -#: ../data/language-specs/gdb-log.lang.h:1 -msgid "Address" -msgstr "Адреса" - #: ../data/language-specs/gdb-log.lang.h:2 -msgid "Filename" -msgstr "Назва файла" +msgid "GDB Log" +msgstr "Журнал GDB" #: ../data/language-specs/gdb-log.lang.h:3 -msgid "Frame Number" -msgstr "Кількість кадрів" +msgid "Thread Action" +msgstr "Дії гілки" + +#: ../data/language-specs/gdb-log.lang.h:4 +msgid "Thread Header" +msgstr "Заголовок гілки" #: ../data/language-specs/gdb-log.lang.h:5 -msgid "GDB Log" -msgstr "Журнал GDB" +msgid "Frame Number" +msgstr "Кількість кадрів" #: ../data/language-specs/gdb-log.lang.h:6 -msgid "Incomplete Sequence" -msgstr "Неповна послідовність" +msgid "Address" +msgstr "Адреса" + +#: ../data/language-specs/gdb-log.lang.h:9 +msgid "Filename" +msgstr "Назва файла" -#: ../data/language-specs/gdb-log.lang.h:7 +#: ../data/language-specs/gdb-log.lang.h:10 msgid "Optimized Out" msgstr "Оптимізований вивід" -#: ../data/language-specs/gdb-log.lang.h:9 -msgid "Prompt" -msgstr "Запитати" - #: ../data/language-specs/gdb-log.lang.h:11 -msgid "Thread Action" -msgstr "Дії гілки" +msgid "Incomplete Sequence" +msgstr "Неповна послідовність" #: ../data/language-specs/gdb-log.lang.h:12 -msgid "Thread Header" -msgstr "Заголовок гілки" - -#: ../data/language-specs/glsl.lang.h:1 ../data/language-specs/python.lang.h:3 -msgid "Builtin Constant" -msgstr "Вбудована константа" +msgid "Prompt" +msgstr "Запитати" -#: ../data/language-specs/glsl.lang.h:6 +#: ../data/language-specs/glsl.lang.h:2 msgid "OpenGL Shading Language" msgstr "Мова OpenGL Shading" -#: ../data/language-specs/glsl.lang.h:8 +#: ../data/language-specs/glsl.lang.h:7 +#: ../data/language-specs/python.lang.h:16 +#: ../data/language-specs/python3.lang.h:15 +msgid "Builtin Constant" +msgstr "Вбудована константа" + +#: ../data/language-specs/glsl.lang.h:9 msgid "Reserved Keywords" msgstr "Зарезервовані ключові слова" -#: ../data/language-specs/go.lang.h:9 +#: ../data/language-specs/go.lang.h:2 msgid "Go" msgstr "Перейти" #: ../data/language-specs/gtk-doc.lang.h:2 -msgid "Deprecated" -msgstr "Застаріло" +msgid "gtk-doc" +msgstr "gtk-doc" + +#: ../data/language-specs/gtk-doc.lang.h:3 +msgid "Inline Documentation Section" +msgstr "Вбудований розділ документації" #: ../data/language-specs/gtk-doc.lang.h:4 msgid "Function Name" msgstr "Назва функцій" #: ../data/language-specs/gtk-doc.lang.h:5 -msgid "Inline Documentation Section" -msgstr "Вбудований розділ документації" +msgid "Signal Name" +msgstr "Назва сигналу" + +#: ../data/language-specs/gtk-doc.lang.h:6 +msgid "Property Name" +msgstr "Назва властивості" #: ../data/language-specs/gtk-doc.lang.h:7 msgid "Parameter" msgstr "Параметр" -#: ../data/language-specs/gtk-doc.lang.h:8 -msgid "Property Name" -msgstr "Назва властивості" - #: ../data/language-specs/gtk-doc.lang.h:9 +#: ../data/language-specs/systemverilog.lang.h:6 +#: ../data/language-specs/verilog.lang.h:12 +#: ../data/language-specs/vhdl.lang.h:7 +msgid "Type" +msgstr "Тип" + +#: ../data/language-specs/gtk-doc.lang.h:11 msgid "Return" msgstr "Опис результату" -#: ../data/language-specs/gtk-doc.lang.h:10 -msgid "Signal Name" -msgstr "Назва сигналу" - -#: ../data/language-specs/gtk-doc.lang.h:11 +#: ../data/language-specs/gtk-doc.lang.h:12 msgid "Since" msgstr "Опис часу появи" -#: ../data/language-specs/gtk-doc.lang.h:12 -#: ../data/language-specs/systemverilog.lang.h:6 -#: ../data/language-specs/verilog.lang.h:14 -#: ../data/language-specs/vhdl.lang.h:10 -msgid "Type" -msgstr "Тип" - #: ../data/language-specs/gtk-doc.lang.h:13 -msgid "gtk-doc" -msgstr "gtk-doc" +msgid "Deprecated" +msgstr "Застаріло" -#: ../data/language-specs/gtkrc.lang.h:5 +#: ../data/language-specs/gtkrc.lang.h:2 msgid "GtkRC" msgstr "GtkRC" -#: ../data/language-specs/gtkrc.lang.h:6 -msgid "Include directive" -msgstr "Директива включення" - -#: ../data/language-specs/gtkrc.lang.h:10 +#: ../data/language-specs/gtkrc.lang.h:8 msgid "Widget State" msgstr "Стан віджету" -#: ../data/language-specs/haddock.lang.h:1 ../data/language-specs/t2t.lang.h:1 -msgid "Anchor" -msgstr "Вирівнювання" +#: ../data/language-specs/gtkrc.lang.h:9 +msgid "Include directive" +msgstr "Директива включення" #: ../data/language-specs/haddock.lang.h:2 -msgid "Code Block" -msgstr "Блок коду" +msgid "Haddock" +msgstr "Haddock" #: ../data/language-specs/haddock.lang.h:3 -msgid "Definition list" -msgstr "Список визначень" +msgid "Inline Haddock Section" +msgstr "Вбудований розділ Haddock" #: ../data/language-specs/haddock.lang.h:4 -msgid "Emphasis" -msgstr "Акцент" +msgid "Haddock Directive" +msgstr "Директиви Haddock" #: ../data/language-specs/haddock.lang.h:5 -msgid "Enumerated list" -msgstr "Нумерований список" +msgid "Hyperlinked Identifier" +msgstr "Зв'язаний ідентифікатор" #: ../data/language-specs/haddock.lang.h:6 -msgid "Escape" -msgstr "Escape" +msgid "Hyperlinked Module Name" +msgstr "Зв'язана назва модуля" #: ../data/language-specs/haddock.lang.h:7 -msgid "Haddock" -msgstr "Haddock" +msgid "Escape" +msgstr "Escape" #: ../data/language-specs/haddock.lang.h:8 -msgid "Haddock Directive" -msgstr "Директиви Haddock" +#: ../data/language-specs/markdown.lang.h:13 +msgid "Emphasis" +msgstr "Акцент" #: ../data/language-specs/haddock.lang.h:9 -msgid "Header Property" -msgstr "Властивості заголовку" +msgid "Monospace" +msgstr "Моноширинний" #: ../data/language-specs/haddock.lang.h:10 -msgid "Hyperlinked Identifier" -msgstr "Зв'язаний ідентифікатор" +msgid "Code Block" +msgstr "Блок коду" #: ../data/language-specs/haddock.lang.h:11 -msgid "Hyperlinked Module Name" -msgstr "Зв'язана назва модуля" +msgid "Header Property" +msgstr "Властивості заголовку" #: ../data/language-specs/haddock.lang.h:12 -msgid "Inline Haddock Section" -msgstr "Вбудований розділ Haddock" - -#: ../data/language-specs/haddock.lang.h:13 msgid "Itemized list" msgstr "Список пунктів" -#: ../data/language-specs/haddock.lang.h:15 -msgid "Monospace" -msgstr "Моноширинний" +#: ../data/language-specs/haddock.lang.h:13 +msgid "Enumerated list" +msgstr "Нумерований список" -#: ../data/language-specs/haddock.lang.h:16 +#: ../data/language-specs/haddock.lang.h:14 +msgid "Definition list" +msgstr "Список визначень" + +#: ../data/language-specs/haddock.lang.h:15 +#: ../data/language-specs/markdown.lang.h:8 msgid "URL" msgstr "URL" -#: ../data/language-specs/haskell.lang.h:6 -msgid "Float" -msgstr "Число з рухомою комою" +#: ../data/language-specs/haddock.lang.h:16 +#: ../data/language-specs/t2t.lang.h:13 +msgid "Anchor" +msgstr "Вирівнювання" -#: ../data/language-specs/haskell.lang.h:7 +#: ../data/language-specs/haskell.lang.h:2 msgid "Haskell" msgstr "Haskell" -#: ../data/language-specs/haskell.lang.h:8 -msgid "Hex" -msgstr "Шістнадцяткове" +#: ../data/language-specs/haskell.lang.h:6 +#: ../data/language-specs/ruby.lang.h:18 +msgid "Symbol" +msgstr "Символ" + +#: ../data/language-specs/haskell.lang.h:12 +msgid "Float" +msgstr "Число з рухомою комою" -#: ../data/language-specs/haskell.lang.h:10 +#: ../data/language-specs/haskell.lang.h:14 msgid "Octal" msgstr "Вісімкове" -#: ../data/language-specs/haskell.lang.h:14 -#: ../data/language-specs/ruby.lang.h:22 -msgid "Symbol" -msgstr "Символ" +#: ../data/language-specs/haskell.lang.h:15 +msgid "Hex" +msgstr "Шістнадцяткове" -#: ../data/language-specs/haskell-literate.lang.h:1 +#: ../data/language-specs/haskell-literate.lang.h:2 msgid "Literate Haskell" msgstr "Literate Haskell" -#: ../data/language-specs/html.lang.h:1 -msgid "Attribute Name" -msgstr "Назва атрибуту" - #: ../data/language-specs/html.lang.h:2 -msgid "Attribute Value" -msgstr "Значення атрибуту" - -#: ../data/language-specs/html.lang.h:6 msgid "HTML" msgstr "HTML" -#: ../data/language-specs/html.lang.h:8 ../data/language-specs/xml.lang.h:12 +#: ../data/language-specs/html.lang.h:4 ../data/language-specs/xml.lang.h:11 msgid "Tag" msgstr "Тег" -#: ../data/language-specs/idl.lang.h:3 +#: ../data/language-specs/html.lang.h:5 +msgid "Attribute Name" +msgstr "Назва атрибуту" + +#: ../data/language-specs/html.lang.h:6 +#: ../data/language-specs/markdown.lang.h:11 +msgid "Attribute Value" +msgstr "Значення атрибуту" + +#: ../data/language-specs/idl.lang.h:2 msgid "IDL" msgstr "IDL" -#: ../data/language-specs/ini.lang.h:1 +#: ../data/language-specs/imagej.lang.h:2 +msgid "ImageJ" +msgstr "ImageJ" + +#: ../data/language-specs/imagej.lang.h:5 +msgid "Commands" +msgstr "Команди" + +#: ../data/language-specs/imagej.lang.h:6 +#: ../data/language-specs/octave.lang.h:7 +msgid "Storage Type" +msgstr "Тип зберігання" + +#: ../data/language-specs/imagej.lang.h:7 +msgid "Escaped Characters" +msgstr "Символи екранування" + +#: ../data/language-specs/ini.lang.h:2 msgid ".ini" msgstr ".ini" -#: ../data/language-specs/java.lang.h:5 ../data/language-specs/ooc.lang.h:5 -msgid "Declaration" -msgstr "Визначення" +#: ../data/language-specs/java.lang.h:2 +msgid "Java" +msgstr "Java" -#: ../data/language-specs/java.lang.h:8 ../data/language-specs/ooc.lang.h:8 +#. Translators: refered to some specific keywords of the language that +#. allow to get external functionalities +#: ../data/language-specs/java.lang.h:8 ../data/language-specs/ooc.lang.h:7 msgid "External" msgstr "Зовнішні методи" -#: ../data/language-specs/java.lang.h:9 -#: ../data/language-specs/javascript.lang.h:8 -#: ../data/language-specs/ooc.lang.h:10 -msgid "Future Reserved Keywords" -msgstr "Слова, зарезервовані для майбутнього" - -#: ../data/language-specs/java.lang.h:10 -msgid "Java" -msgstr "Java" +#: ../data/language-specs/java.lang.h:9 ../data/language-specs/ooc.lang.h:8 +msgid "Declaration" +msgstr "Визначення" -#: ../data/language-specs/java.lang.h:14 ../data/language-specs/ooc.lang.h:16 +#: ../data/language-specs/java.lang.h:11 ../data/language-specs/ooc.lang.h:10 msgid "Scope Declaration" msgstr "Опис області дії" -#: ../data/language-specs/javascript.lang.h:3 -msgid "Constructors" -msgstr "Конструктори" +#: ../data/language-specs/java.lang.h:16 +#: ../data/language-specs/javascript.lang.h:12 +#: ../data/language-specs/ooc.lang.h:18 +msgid "Future Reserved Keywords" +msgstr "Слова, зарезервовані для майбутнього" -#: ../data/language-specs/javascript.lang.h:9 +#: ../data/language-specs/javascript.lang.h:2 msgid "JavaScript" msgstr "JavaScript" -#: ../data/language-specs/javascript.lang.h:12 -msgid "Object" -msgstr "Об'єкт" - -#: ../data/language-specs/javascript.lang.h:13 -msgid "Properties" -msgstr "Властивості" - -#: ../data/language-specs/javascript.lang.h:16 +#: ../data/language-specs/javascript.lang.h:5 msgid "Undefined Value" msgstr "Невизначена змінна" -#: ../data/language-specs/latex.lang.h:3 -#: ../data/language-specs/texinfo.lang.h:5 -msgid "Include" -msgstr "Директива \"Include\"" +#: ../data/language-specs/javascript.lang.h:10 +msgid "Properties" +msgstr "Властивості" -#: ../data/language-specs/latex.lang.h:4 -msgid "Inline Math Mode" -msgstr "Вбудована математика" +#: ../data/language-specs/javascript.lang.h:11 +msgid "Constructors" +msgstr "Конструктори" -#: ../data/language-specs/latex.lang.h:5 +#: ../data/language-specs/latex.lang.h:2 msgid "LaTeX" msgstr "LaTeX" -#: ../data/language-specs/latex.lang.h:7 +#: ../data/language-specs/latex.lang.h:4 msgid "Math Mode" msgstr "Математика" -#: ../data/language-specs/latex.lang.h:8 ../data/language-specs/t2t.lang.h:16 -msgid "Verbatim" -msgstr "Дослівний режим" +#: ../data/language-specs/latex.lang.h:5 +msgid "Inline Math Mode" +msgstr "Вбудована математика" -#: ../data/language-specs/latex.lang.h:9 +#: ../data/language-specs/latex.lang.h:6 msgid "math-bound" msgstr "Границя математики" -#: ../data/language-specs/libtool.lang.h:4 +#: ../data/language-specs/latex.lang.h:7 +#: ../data/language-specs/texinfo.lang.h:11 +msgid "Include" +msgstr "Директива \"Include\"" + +#: ../data/language-specs/latex.lang.h:9 ../data/language-specs/t2t.lang.h:16 +msgid "Verbatim" +msgstr "Дослівний режим" + +#: ../data/language-specs/libtool.lang.h:2 msgid "libtool" msgstr "libtool" -#: ../data/language-specs/lua.lang.h:6 +#: ../data/language-specs/lua.lang.h:2 msgid "Lua" msgstr "Lua" -#: ../data/language-specs/lua.lang.h:7 ../data/language-specs/ruby.lang.h:14 -msgid "Nil Constant" -msgstr "Константа Nil" - -#: ../data/language-specs/lua.lang.h:8 +#: ../data/language-specs/lua.lang.h:7 msgid "Reserved Identifier" msgstr "Зарезервований ідентифікатор" -#: ../data/language-specs/m4.lang.h:1 -msgid "Autoconf Macro" -msgstr "Макрос Autoconf" +#: ../data/language-specs/lua.lang.h:9 ../data/language-specs/ruby.lang.h:8 +msgid "Nil Constant" +msgstr "Константа Nil" #: ../data/language-specs/m4.lang.h:2 -msgid "Obsolete Autoconf Macro" -msgstr "Застарілий макрос Autoconf" - -#: ../data/language-specs/m4.lang.h:4 msgid "m4" msgstr "m4" -#: ../data/language-specs/m4.lang.h:5 +#: ../data/language-specs/m4.lang.h:3 +msgid "m4-comment" +msgstr "Коментар m4" + +#: ../data/language-specs/m4.lang.h:4 msgid "m4 Macro" msgstr "Макрос m4" -#: ../data/language-specs/m4.lang.h:6 -msgid "m4-comment" -msgstr "Коментар m4" +#: ../data/language-specs/m4.lang.h:5 +msgid "Autoconf Macro" +msgstr "Макрос Autoconf" -#: ../data/language-specs/makefile.lang.h:1 -msgid "Assignment Left Hand Side" -msgstr "Присвоєння зі значенням праворуч" +#: ../data/language-specs/m4.lang.h:6 +msgid "Obsolete Autoconf Macro" +msgstr "Застарілий макрос Autoconf" #: ../data/language-specs/makefile.lang.h:2 +msgid "Makefile" +msgstr "Makefile" + +#: ../data/language-specs/makefile.lang.h:4 msgid "Assignment Right Hand Side" msgstr "Присвоєння зі значенням ліворуч" -#: ../data/language-specs/makefile.lang.h:3 -msgid "Makefile" -msgstr "Makefile" +#: ../data/language-specs/makefile.lang.h:5 +msgid "Assignment Left Hand Side" +msgstr "Присвоєння зі значенням праворуч" + +#: ../data/language-specs/makefile.lang.h:6 +msgid "targets" +msgstr "цілі" -#. Translators: Trailing Tabs refers to tabulation characters present at -#. the end of the line #: ../data/language-specs/makefile.lang.h:7 -msgid "Trailing Tab" -msgstr "Табуляція на початку рядка" +msgid "prereq" +msgstr "залежність" -#: ../data/language-specs/makefile.lang.h:9 +#: ../data/language-specs/makefile.lang.h:8 msgid "command" msgstr "команда" -#: ../data/language-specs/makefile.lang.h:10 +#. Translators: Trailing Tabs refers to tabulation characters present at +#. the end of the line +#: ../data/language-specs/makefile.lang.h:11 +msgid "Trailing Tab" +msgstr "Табуляція на початку рядка" + +#: ../data/language-specs/makefile.lang.h:12 msgid "function" msgstr "функція" #. FIXME make it better names, and make them translatable -#: ../data/language-specs/makefile.lang.h:11 +#: ../data/language-specs/makefile.lang.h:13 #: ../data/language-specs/yacc.lang.h:4 msgid "keyword" msgstr "ключове слово" -#: ../data/language-specs/makefile.lang.h:12 -msgid "prereq" -msgstr "залежність" +#: ../data/language-specs/mallard.lang.h:2 +msgid "Mallard" +msgstr "Mallard" -#: ../data/language-specs/makefile.lang.h:13 -msgid "targets" -msgstr "цілі" +#: ../data/language-specs/mallard.lang.h:3 +msgid "Page Elements" +msgstr "Елементи сторінки" -#: ../data/language-specs/mallard.lang.h:1 +#: ../data/language-specs/mallard.lang.h:4 +msgid "Section Elements" +msgstr "Елементи розділу" + +#: ../data/language-specs/mallard.lang.h:5 msgid "Block Elements" msgstr "Елементи блоку" -#: ../data/language-specs/mallard.lang.h:2 +#: ../data/language-specs/mallard.lang.h:6 msgid "Inline Elements" msgstr "Вбудовані елементи" -#: ../data/language-specs/mallard.lang.h:3 -msgid "Mallard" -msgstr "Mallard" +#: ../data/language-specs/markdown.lang.h:2 +msgid "Markdown" +msgstr "Markdown" -#: ../data/language-specs/mallard.lang.h:5 -msgid "Page Elements" -msgstr "Елементи сторінки" +#: ../data/language-specs/markdown.lang.h:3 +#: ../data/language-specs/rpmspec.lang.h:4 ../data/language-specs/t2t.lang.h:6 +msgid "Header" +msgstr "Заголовок" -#: ../data/language-specs/mallard.lang.h:6 -msgid "Section Elements" -msgstr "Елементи розділу" +#: ../data/language-specs/markdown.lang.h:4 +msgid "Horizontal Rule" +msgstr "Горизонтальний заповнювач" + +#: ../data/language-specs/markdown.lang.h:5 +msgid "List Marker" +msgstr "Маркер списку" + +#: ../data/language-specs/markdown.lang.h:6 +msgid "Code" +msgstr "Код" + +#: ../data/language-specs/markdown.lang.h:7 +msgid "Blockquote Marker" +msgstr "Маркер цитат" + +#: ../data/language-specs/markdown.lang.h:9 +msgid "Link Text" +msgstr "Текст посилання" -#: ../data/language-specs/nemerle.lang.h:11 +#: ../data/language-specs/markdown.lang.h:10 +#: ../gtksourceview/gtksourcecompletionitem.c:229 +msgid "Label" +msgstr "Позначка" + +#: ../data/language-specs/markdown.lang.h:12 +msgid "Image Marker" +msgstr "Маркер зображення" + +#: ../data/language-specs/markdown.lang.h:14 +msgid "Strong Emphasis" +msgstr "Виділення жирним" + +#: ../data/language-specs/markdown.lang.h:15 +msgid "Backslash Escape" +msgstr "Екранування зворотної похилої риски" + +#: ../data/language-specs/markdown.lang.h:16 +msgid "Line Break" +msgstr "Розрив рядка" + +#: ../data/language-specs/matlab.lang.h:2 +msgid "Matlab" +msgstr "Matlab" + +#: ../data/language-specs/nemerle.lang.h:2 msgid "Nemerle" msgstr "Nemerle" @@ -1526,289 +1692,325 @@ msgid "NSIS" msgstr "NSIS" -#: ../data/language-specs/objc.lang.h:4 +#: ../data/language-specs/objc.lang.h:2 msgid "Objective-C" msgstr "Objective-C" -#: ../data/language-specs/ocaml.lang.h:13 +#: ../data/language-specs/objj.lang.h:2 +msgid "Objective-J" +msgstr "Objective-J" + +#: ../data/language-specs/ocaml.lang.h:2 msgid "Objective Caml" msgstr "Об'єктний Caml (ocaml)" -#: ../data/language-specs/ocaml.lang.h:14 +#: ../data/language-specs/ocaml.lang.h:4 msgid "Ocamldoc Comments" msgstr "Коментар Ocamldoc" -#: ../data/language-specs/ocaml.lang.h:17 -msgid "Standart Modules" +#: ../data/language-specs/ocaml.lang.h:21 +msgid "Standard Modules" msgstr "Стандартні модулі" -#: ../data/language-specs/ocl.lang.h:4 +#: ../data/language-specs/ocl.lang.h:2 msgid "OCL" msgstr "OCL" -#: ../data/language-specs/ocl.lang.h:5 -msgid "Operation operator" -msgstr "Оператор операцій" - -#: ../data/language-specs/ocl.lang.h:8 +#: ../data/language-specs/ocl.lang.h:6 msgid "Type Operators" msgstr "Оператор типу" -#: ../data/language-specs/octave.lang.h:8 +#: ../data/language-specs/ocl.lang.h:8 +msgid "Operation operator" +msgstr "Оператор операцій" + +#: ../data/language-specs/octave.lang.h:2 msgid "Octave" msgstr "Octave" -#: ../data/language-specs/ooc.lang.h:14 +#: ../data/language-specs/octave.lang.h:12 +msgid "Package Manager" +msgstr "Керування пакунками" + +#: ../data/language-specs/ooc.lang.h:2 msgid "OOC" msgstr "OOC" -#: ../data/language-specs/opal.lang.h:7 -msgid "Keysymbol" -msgstr "Ключовий символ" +#: ../data/language-specs/opal.lang.h:2 +msgid "Opal" +msgstr "Opal" -#: ../data/language-specs/opal.lang.h:9 -#: ../data/language-specs/python.lang.h:12 +#: ../data/language-specs/opal.lang.h:3 ../data/language-specs/python.lang.h:3 +#: ../data/language-specs/python3.lang.h:3 msgid "Module Handler" msgstr "Робота з модулями" -#: ../data/language-specs/opal.lang.h:10 -msgid "Opal" -msgstr "Opal" +#: ../data/language-specs/opal.lang.h:12 +msgid "Keysymbol" +msgstr "Ключовий символ" + +#: ../data/language-specs/opencl.lang.h:2 +msgid "OpenCL" +msgstr "OpenCL" + +#: ../data/language-specs/opencl.lang.h:5 +msgid "Global Function" +msgstr "Загальна функція (Global Functions)" + +#: ../data/language-specs/opencl.lang.h:6 +msgid "Device Function" +msgstr "Функція пристрою" + +#: ../data/language-specs/opencl.lang.h:7 +msgid "Device Cast" +msgstr "Форма пристрою" + +#: ../data/language-specs/opencl.lang.h:8 +msgid "OpenCL Constant" +msgstr "Константа OpenCL" + +#: ../data/language-specs/opencl.lang.h:9 +msgid "Global Variable" +msgstr "Загальна змінна" -#: ../data/language-specs/pascal.lang.h:5 +#: ../data/language-specs/pascal.lang.h:2 msgid "Pascal" msgstr "Pascal" -#: ../data/language-specs/perl.lang.h:3 -msgid "Control" -msgstr "Контрольна інструкція" +#: ../data/language-specs/perl.lang.h:2 +msgid "Perl" +msgstr "Perl" + +#: ../data/language-specs/perl.lang.h:4 +msgid "Line Directive" +msgstr "Директива включення" #: ../data/language-specs/perl.lang.h:5 -msgid "File Descriptor" -msgstr "Файловий дескриптор" +msgid "Include Statement" +msgstr "Оператор включення" -#: ../data/language-specs/perl.lang.h:6 ../data/language-specs/php.lang.h:10 -#: ../data/language-specs/ruby.lang.h:10 +#: ../data/language-specs/perl.lang.h:9 ../data/language-specs/php.lang.h:10 +#: ../data/language-specs/ruby.lang.h:22 msgid "Heredoc" msgstr "Документація" -#: ../data/language-specs/perl.lang.h:7 ../data/language-specs/php.lang.h:11 -#: ../data/language-specs/ruby.lang.h:11 ../data/language-specs/sh.lang.h:4 +#: ../data/language-specs/perl.lang.h:10 ../data/language-specs/php.lang.h:11 +#: ../data/language-specs/ruby.lang.h:23 ../data/language-specs/sh.lang.h:12 msgid "Heredoc Bound" msgstr "Межа документації" -#: ../data/language-specs/perl.lang.h:8 -msgid "Include Statement" -msgstr "Оператор включення" +#: ../data/language-specs/perl.lang.h:11 +msgid "System Command" +msgstr "Системна команда" -#: ../data/language-specs/perl.lang.h:10 -msgid "Line Directive" -msgstr "Директива включення" +#: ../data/language-specs/perl.lang.h:14 +msgid "File Descriptor" +msgstr "Файловий дескриптор" -#: ../data/language-specs/perl.lang.h:12 +#: ../data/language-specs/perl.lang.h:15 +msgid "Control" +msgstr "Контрольна інструкція" + +#: ../data/language-specs/perl.lang.h:18 msgid "POD" msgstr "POD" -#: ../data/language-specs/perl.lang.h:13 +#: ../data/language-specs/perl.lang.h:19 msgid "POD Escape" msgstr "Екран POD" -#: ../data/language-specs/perl.lang.h:14 -msgid "POD heading" -msgstr "Заголовок POD" - -#: ../data/language-specs/perl.lang.h:15 +#: ../data/language-specs/perl.lang.h:20 msgid "POD keyword" msgstr "Ключове слово POD" -#: ../data/language-specs/perl.lang.h:16 -msgid "Perl" -msgstr "Perl" +#: ../data/language-specs/perl.lang.h:21 +msgid "POD heading" +msgstr "Заголовок POD" -#: ../data/language-specs/perl.lang.h:20 -msgid "System Command" -msgstr "Системна команда" +#: ../data/language-specs/php.lang.h:2 +msgid "PHP" +msgstr "PHP" -#: ../data/language-specs/php.lang.h:3 +#: ../data/language-specs/php.lang.h:13 msgid "Common Function" msgstr "Загальна функція" -#: ../data/language-specs/php.lang.h:18 -msgid "PHP" -msgstr "PHP" - #: ../data/language-specs/pkgconfig.lang.h:2 -msgid "Package Info" -msgstr "Інформація про пакет" - -#: ../data/language-specs/pkgconfig.lang.h:4 msgid "pkg-config" msgstr "pkg-config" -#: ../data/language-specs/po.lang.h:2 -msgid "Fuzzy" -msgstr "Неточне" - -#. FIXME make it some nice name and mark it translatable -#: ../data/language-specs/po.lang.h:7 -msgid "Special" -msgstr "Спеціальне" +#: ../data/language-specs/pkgconfig.lang.h:4 +msgid "Package Info" +msgstr "Інформація про пакет" -#: ../data/language-specs/po.lang.h:9 +#: ../data/language-specs/po.lang.h:2 msgid "gettext translation" msgstr "Переклад у форматі gettext" -#: ../data/language-specs/prolog.lang.h:7 +#: ../data/language-specs/po.lang.h:6 +msgid "Fuzzy" +msgstr "Неточне" + +#: ../data/language-specs/prolog.lang.h:2 msgid "Prolog" msgstr "Prolog" -#: ../data/language-specs/python.lang.h:5 -msgid "Builtin Object" -msgstr "Вбудований об'єкт" +#: ../data/language-specs/python.lang.h:2 +msgid "Python" +msgstr "Python" -#: ../data/language-specs/python.lang.h:10 +#: ../data/language-specs/python.lang.h:8 +#: ../data/language-specs/python3.lang.h:8 msgid "Format" msgstr "Формат" -#: ../data/language-specs/python.lang.h:14 -msgid "Python" -msgstr "Python" - -#: ../data/language-specs/python.lang.h:18 +#: ../data/language-specs/python.lang.h:9 msgid "string-conversion" msgstr "перетворення рядка" -#: ../data/language-specs/R.lang.h:1 -msgid "Assignment Operator" -msgstr "Оператор присвоювання" - -#: ../data/language-specs/R.lang.h:3 -msgid "Delimiter" -msgstr "Розділювач" +#: ../data/language-specs/python.lang.h:17 +#: ../data/language-specs/python3.lang.h:16 +msgid "Builtin Object" +msgstr "Вбудований об'єкт" -#: ../data/language-specs/R.lang.h:5 ../data/language-specs/verilog.lang.h:8 -msgid "Integer Number" -msgstr "Ціле число" +#: ../data/language-specs/python3.lang.h:2 +msgid "Python 3" +msgstr "Python 3" -#: ../data/language-specs/R.lang.h:7 +#: ../data/language-specs/R.lang.h:2 msgid "R" msgstr "R" -#: ../data/language-specs/R.lang.h:8 +#: ../data/language-specs/R.lang.h:4 msgid "Reserved Class" msgstr "Зарезервований клас" -#: ../data/language-specs/R.lang.h:10 +#: ../data/language-specs/R.lang.h:5 +msgid "Assignment Operator" +msgstr "Оператор присвоювання" + +#: ../data/language-specs/R.lang.h:6 +msgid "Delimiter" +msgstr "Розділювач" + +#: ../data/language-specs/R.lang.h:7 msgid "Special Constant" msgstr "Спеціальна константа" -#: ../data/language-specs/rpmspec.lang.h:1 -msgid "Command Macro" -msgstr "Макрокоманда" +#: ../data/language-specs/R.lang.h:9 ../data/language-specs/verilog.lang.h:15 +msgid "Integer Number" +msgstr "Ціле число" #: ../data/language-specs/rpmspec.lang.h:2 -msgid "Conditional Macro" -msgstr "Макрос з умовою" +msgid "RPM spec" +msgstr "RPM spec" -#: ../data/language-specs/rpmspec.lang.h:4 +#: ../data/language-specs/rpmspec.lang.h:3 msgid "Define" msgstr "Визначення" -#: ../data/language-specs/rpmspec.lang.h:5 -msgid "Directory Macro" -msgstr "Макрос каталогу" +#: ../data/language-specs/rpmspec.lang.h:5 ../data/language-specs/t2t.lang.h:7 +msgid "Section" +msgstr "Розділ" #: ../data/language-specs/rpmspec.lang.h:6 -msgid "Email" -msgstr "Електронна пошта" +msgid "Spec Macro" +msgstr "Макрос Spec" #: ../data/language-specs/rpmspec.lang.h:7 -msgid "Flow Conditional" -msgstr "Умовний оператор" +msgid "Directory Macro" +msgstr "Макрос каталогу" -#: ../data/language-specs/rpmspec.lang.h:8 ../data/language-specs/t2t.lang.h:4 -msgid "Header" -msgstr "Заголовок" +#: ../data/language-specs/rpmspec.lang.h:8 +msgid "Command Macro" +msgstr "Макрокоманда" + +#: ../data/language-specs/rpmspec.lang.h:9 +msgid "Conditional Macro" +msgstr "Макрос з умовою" -#: ../data/language-specs/rpmspec.lang.h:9 +#: ../data/language-specs/rpmspec.lang.h:10 msgid "Other Macro" msgstr "Інший макрос" #: ../data/language-specs/rpmspec.lang.h:11 -msgid "RPM Variable" -msgstr "Змінна RPM" +msgid "Flow Conditional" +msgstr "Умовний оператор" #: ../data/language-specs/rpmspec.lang.h:12 -msgid "RPM spec" -msgstr "RPM spec" +msgid "RPM Variable" +msgstr "Змінна RPM" #: ../data/language-specs/rpmspec.lang.h:13 -#: ../data/language-specs/t2t.lang.h:9 -msgid "Section" -msgstr "Розділ" - -#: ../data/language-specs/rpmspec.lang.h:14 -msgid "Spec Macro" -msgstr "Макрос Spec" - -#: ../data/language-specs/rpmspec.lang.h:15 msgid "Switch" msgstr "Перемикання" -#: ../data/language-specs/ruby.lang.h:1 +#: ../data/language-specs/rpmspec.lang.h:15 +msgid "Email" +msgstr "Електронна пошта" + +#: ../data/language-specs/ruby.lang.h:2 +msgid "Ruby" +msgstr "Ruby" + +#: ../data/language-specs/ruby.lang.h:5 msgid "Attribute Definition" msgstr "Визначення атрибуту" -#: ../data/language-specs/ruby.lang.h:13 +#: ../data/language-specs/ruby.lang.h:6 msgid "Module handler" msgstr "Обробник модуля" -#: ../data/language-specs/ruby.lang.h:15 +#: ../data/language-specs/ruby.lang.h:13 msgid "Numeric literal" msgstr "Числове значення" -#: ../data/language-specs/ruby.lang.h:18 -msgid "Ruby" -msgstr "Ruby" - -#: ../data/language-specs/scheme.lang.h:5 +#: ../data/language-specs/scheme.lang.h:2 msgid "Scheme" msgstr "Scheme" -#: ../data/language-specs/scilab.lang.h:8 +#: ../data/language-specs/scilab.lang.h:2 msgid "Scilab" msgstr "Scilab" #: ../data/language-specs/sh.lang.h:2 +msgid "sh" +msgstr "sh" + +#. FIXME: need to sort out proper styles for variables +#: ../data/language-specs/sh.lang.h:9 +msgid "Variable Definition" +msgstr "Визначення змінної" + +#: ../data/language-specs/sh.lang.h:11 msgid "Common Commands" msgstr "Загальні команди" -#: ../data/language-specs/sh.lang.h:10 +#: ../data/language-specs/sh.lang.h:13 msgid "Subshell" msgstr "Дочірня оболонка" -#. FIXME: need to sort out proper styles for variables -#: ../data/language-specs/sh.lang.h:13 -msgid "Variable Definition" -msgstr "Визначення змінної" - -#: ../data/language-specs/sh.lang.h:14 -msgid "sh" -msgstr "sh" +#: ../data/language-specs/sml.lang.h:2 +msgid "Standard ML" +msgstr "Стандартний ML" + +#: ../data/language-specs/sml.lang.h:13 +msgid "Module name, Variant, etc" +msgstr "Назва модуля, варіант тощо" #: ../data/language-specs/sparql.lang.h:2 +msgid "SPARQL" +msgstr "SPARQL" + +#: ../data/language-specs/sparql.lang.h:3 msgid "Class" msgstr "Клас" -#: ../data/language-specs/sparql.lang.h:5 -msgid "IRI" -msgstr "IRI" - #: ../data/language-specs/sparql.lang.h:6 msgid "Individual" msgstr "Індивідуальний" -#: ../data/language-specs/sparql.lang.h:8 +#: ../data/language-specs/sparql.lang.h:10 msgid "Literal" msgstr "Літерал" @@ -1821,167 +2023,167 @@ msgstr "QName" #: ../data/language-specs/sparql.lang.h:13 -msgid "SPARQL" -msgstr "SPARQL" - -#: ../data/language-specs/sql.lang.h:7 -msgid "No idea what it is" -msgstr "Щось невизначене" +msgid "IRI" +msgstr "IRI" -#: ../data/language-specs/sql.lang.h:8 +#: ../data/language-specs/sql.lang.h:2 msgid "SQL" msgstr "SQL" -#: ../data/language-specs/systemverilog.lang.h:4 -msgid "System Task" -msgstr "Системне завдання" +#: ../data/language-specs/sql.lang.h:10 +msgid "No idea what it is" +msgstr "Щось невизначене" -#: ../data/language-specs/systemverilog.lang.h:5 +#: ../data/language-specs/systemverilog.lang.h:2 msgid "SystemVerilog" msgstr "SystemVerilog" -#: ../data/language-specs/t2t.lang.h:2 ../gtksourceview/gtksourcestyle.c:104 -#: ../gtksourceview/gtksourcestyle.c:105 -msgid "Bold" -msgstr "Жирний" +#: ../data/language-specs/systemverilog.lang.h:4 +msgid "System Task" +msgstr "Системне завдання" -#: ../data/language-specs/t2t.lang.h:5 ../gtksourceview/gtksourcestyle.c:112 -#: ../gtksourceview/gtksourcestyle.c:113 -msgid "Italic" -msgstr "Курсив" +#: ../data/language-specs/t2t.lang.h:2 +msgid "txt2tags" +msgstr "txt2tags" -#: ../data/language-specs/t2t.lang.h:7 +#: ../data/language-specs/t2t.lang.h:4 msgid "Option" msgstr "Параметр" -#: ../data/language-specs/t2t.lang.h:8 +#: ../data/language-specs/t2t.lang.h:5 msgid "Option Name" msgstr "Назва параметра" -#: ../data/language-specs/t2t.lang.h:10 +#: ../data/language-specs/t2t.lang.h:8 msgid "Section 1" msgstr "Секція 1" -#: ../data/language-specs/t2t.lang.h:11 +#: ../data/language-specs/t2t.lang.h:9 msgid "Section 2" msgstr "Секція 2" -#: ../data/language-specs/t2t.lang.h:12 +#: ../data/language-specs/t2t.lang.h:10 msgid "Section 3" msgstr "Секція 3" -#: ../data/language-specs/t2t.lang.h:13 +#: ../data/language-specs/t2t.lang.h:11 msgid "Section 4" msgstr "Секція 4" -#: ../data/language-specs/t2t.lang.h:14 +#: ../data/language-specs/t2t.lang.h:12 msgid "Section 5" msgstr "Секція 5" -#: ../data/language-specs/t2t.lang.h:15 -msgid "Text2Tags" -msgstr "Text2Tags" +#: ../data/language-specs/t2t.lang.h:14 ../gtksourceview/gtksourcestyle.c:112 +#: ../gtksourceview/gtksourcestyle.c:113 +msgid "Italic" +msgstr "Курсив" + +#: ../data/language-specs/t2t.lang.h:15 ../gtksourceview/gtksourcestyle.c:104 +#: ../gtksourceview/gtksourcestyle.c:105 +msgid "Bold" +msgstr "Жирний" #: ../data/language-specs/t2t.lang.h:17 msgid "Verbatim Block" msgstr "Дослівний блок" -#: ../data/language-specs/tcl.lang.h:3 +#: ../data/language-specs/tcl.lang.h:2 msgid "Tcl" msgstr "Tcl" -#: ../data/language-specs/texinfo.lang.h:3 +#: ../data/language-specs/texinfo.lang.h:2 +msgid "Texinfo" +msgstr "Texinfo" + +#: ../data/language-specs/texinfo.lang.h:8 +msgid "Macros" +msgstr "Макроси" + +#: ../data/language-specs/texinfo.lang.h:9 msgid "File Attributes" msgstr "Атрибути файлів" -#: ../data/language-specs/texinfo.lang.h:4 +#: ../data/language-specs/texinfo.lang.h:10 msgid "Generated Content" msgstr "Згенерований зміст" -#: ../data/language-specs/texinfo.lang.h:7 -msgid "Macros" -msgstr "Макроси" - -#: ../data/language-specs/texinfo.lang.h:11 -msgid "Texinfo" -msgstr "Texinfo" - -#: ../data/language-specs/vala.lang.h:12 +#: ../data/language-specs/vala.lang.h:2 msgid "Vala" msgstr "Vala" -#: ../data/language-specs/vbnet.lang.h:9 +#: ../data/language-specs/vbnet.lang.h:2 msgid "VB.NET" msgstr "VB.NET" -#: ../data/language-specs/verilog.lang.h:6 -msgid "Gate" -msgstr "Шлюз" +#: ../data/language-specs/verilog.lang.h:2 +msgid "Verilog" +msgstr "Verilog" -#: ../data/language-specs/verilog.lang.h:7 +#: ../data/language-specs/verilog.lang.h:8 msgid "IEEE System Task" msgstr "Системне завдання IEEE" -#: ../data/language-specs/verilog.lang.h:10 +#: ../data/language-specs/verilog.lang.h:9 msgid "LRM Additional System Task" msgstr "Додаткове системне завдання LRM" -#: ../data/language-specs/verilog.lang.h:15 -msgid "Verilog" -msgstr "Verilog" +#: ../data/language-specs/verilog.lang.h:11 +msgid "Gate" +msgstr "Шлюз" -#: ../data/language-specs/vhdl.lang.h:11 +#: ../data/language-specs/vhdl.lang.h:2 msgid "VHDL" msgstr "VHDL" #: ../data/language-specs/xml.lang.h:2 -msgid "Attribute value" -msgstr "Значення атрибуту" - -#: ../data/language-specs/xml.lang.h:3 -msgid "CDATA delimiter" -msgstr "Розділювач CDATA" +msgid "XML" +msgstr "XML" -#: ../data/language-specs/xml.lang.h:5 +#: ../data/language-specs/xml.lang.h:4 msgid "DOCTYPE" msgstr "Тип документу DOCTYPE" +#: ../data/language-specs/xml.lang.h:5 +msgid "CDATA delimiter" +msgstr "Розділювач CDATA" + #: ../data/language-specs/xml.lang.h:6 +msgid "Processing instruction" +msgstr "Інструкція обробки" + +#: ../data/language-specs/xml.lang.h:7 msgid "Element name" msgstr "Назва елементу" -#: ../data/language-specs/xml.lang.h:7 +#: ../data/language-specs/xml.lang.h:9 +msgid "Attribute value" +msgstr "Значення атрибуту" + +#: ../data/language-specs/xml.lang.h:10 msgid "Entity" msgstr "Предикат (entity)" -#: ../data/language-specs/xml.lang.h:11 -msgid "Processing instruction" -msgstr "Інструкція обробки" - -#: ../data/language-specs/xml.lang.h:13 -msgid "XML" -msgstr "XML" +#: ../data/language-specs/xslt.lang.h:2 +msgid "XSLT" +msgstr "XSLT" -#: ../data/language-specs/xslt.lang.h:1 +#: ../data/language-specs/xslt.lang.h:3 msgid "Element" msgstr "Елемент" -#: ../data/language-specs/xslt.lang.h:4 -msgid "XSLT" -msgstr "XSLT" - #: ../data/language-specs/yacc.lang.h:2 msgid "Yacc" msgstr "Yacc" #: ../data/language-specs/yacc.lang.h:5 -msgid "rule" -msgstr "правило" - -#: ../data/language-specs/yacc.lang.h:6 msgid "token-type" msgstr "тип лексеми" +#: ../data/language-specs/yacc.lang.h:6 +msgid "rule" +msgstr "правило" + #: ../data/styles/classic.xml.h:1 msgid "Classic" msgstr "Класична" @@ -1991,96 +2193,96 @@ msgstr "Класична схема кольорів" #: ../data/styles/cobalt.xml.h:1 -msgid "Blue based color scheme" -msgstr "Синя схема кольорів" - -#: ../data/styles/cobalt.xml.h:2 msgid "Cobalt" msgstr "Cobalt" -#: ../data/styles/kate.xml.h:1 -msgid "Color scheme used in the Kate text editor" -msgstr "Кольорова схема з текстового редактора Kate" +#: ../data/styles/cobalt.xml.h:2 +msgid "Blue based color scheme" +msgstr "Синя схема кольорів" -#: ../data/styles/kate.xml.h:2 +#: ../data/styles/kate.xml.h:1 msgid "Kate" msgstr "Kate" -#: ../data/styles/oblivion.xml.h:1 -msgid "Dark color scheme using the Tango color palette" -msgstr "Темна кольорова схема, що використовує палітру Tango" +#: ../data/styles/kate.xml.h:2 +msgid "Color scheme used in the Kate text editor" +msgstr "Кольорова схема з текстового редактора Kate" -#: ../data/styles/oblivion.xml.h:2 +#: ../data/styles/oblivion.xml.h:1 msgid "Oblivion" msgstr "Oblivion" -#: ../data/styles/tango.xml.h:1 -msgid "Color scheme using Tango color palette" -msgstr "Кольорова схема, що використовує палітру Tango" +#: ../data/styles/oblivion.xml.h:2 +msgid "Dark color scheme using the Tango color palette" +msgstr "Темна кольорова схема, що використовує палітру Tango" -#: ../data/styles/tango.xml.h:2 +#: ../data/styles/tango.xml.h:1 msgid "Tango" msgstr "Tango" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:380 +#: ../data/styles/tango.xml.h:2 +msgid "Color scheme using Tango color palette" +msgstr "Кольорова схема, що використовує палітру Tango" + +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:371 msgid "Document Words" msgstr "Слова документу" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:465 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:456 msgid "The provider name" msgstr "Назва джерела" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:472 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:463 #: ../gtksourceview/gtksourcecompletionitem.c:268 msgid "Icon" msgstr "Піктограма" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:473 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:464 msgid "The provider icon" msgstr "Піктограма джерела" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:480 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:471 msgid "Proposals Batch Size" msgstr "Розмір пакету джерела" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:481 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:472 msgid "Number of proposals added in one batch" msgstr "Кількість пропозицій, доданих у пакеті" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:490 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:481 msgid "Scan Batch Size" msgstr "Розмір сканування пакету" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:491 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:482 msgid "Number of lines scanned in one batch" msgstr "Кількість рядків, сканованих за один пакет " -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:500 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:491 msgid "Minimum Word Size" msgstr "Мінімальний розмір слова" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:501 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:492 msgid "The minimum word size to complete" msgstr "Мінімальний розмір слова для вмикання доповнення" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:510 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:501 msgid "Interactive Delay" msgstr "Інтерактивна затримка" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:511 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:502 msgid "The delay before initiating interactive completion" msgstr "Інтерактивна затримка перед ініціалізацією інтерактивного доповнення" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:520 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:511 msgid "Priority" msgstr "Пріоритет" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:521 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:512 msgid "Provider priority" msgstr "Пріоритет джерела" #: ../gtksourceview/gtksourcebuffer.c:234 -#: ../gtksourceview/gtksourceprintcompositor.c:505 +#: ../gtksourceview/gtksourceprintcompositor.c:502 msgid "Highlight Syntax" msgstr "Виділяти синтаксис кольором" @@ -2150,109 +2352,109 @@ msgid "No extra information available" msgstr "Немає додаткової інформації" -#: ../gtksourceview/gtksourcecompletion.c:2220 -#: ../gtksourceview/gtksourcegutter.c:548 +#: ../gtksourceview/gtksourcecompletion.c:2224 +#: ../gtksourceview/gtksourcegutter.c:547 msgid "View" -msgstr "Вигляд" +msgstr "Перегляд" -#: ../gtksourceview/gtksourcecompletion.c:2221 +#: ../gtksourceview/gtksourcecompletion.c:2225 msgid "The GtkSourceView bound to the completion" msgstr "Межа об'єкту GtkSourceBuffer для доповнення" -#: ../gtksourceview/gtksourcecompletion.c:2236 +#: ../gtksourceview/gtksourcecompletion.c:2240 msgid "Remember Info Visibility" msgstr "Пам'ятати видимість інформації" -#: ../gtksourceview/gtksourcecompletion.c:2237 +#: ../gtksourceview/gtksourcecompletion.c:2241 msgid "Remember the last info window visibility state" msgstr "Пам'ятати стан видимості останнього інформаційного вікна" -#: ../gtksourceview/gtksourcecompletion.c:2250 +#: ../gtksourceview/gtksourcecompletion.c:2254 msgid "Select on Show" msgstr "Виділення при показі" -#: ../gtksourceview/gtksourcecompletion.c:2251 +#: ../gtksourceview/gtksourcecompletion.c:2255 msgid "Select first proposal when completion is shown" msgstr "Виділяти першу пропозицію, при показі доповнення" -#: ../gtksourceview/gtksourcecompletion.c:2265 +#: ../gtksourceview/gtksourcecompletion.c:2269 msgid "Show Headers" msgstr "Показувати заголовки" -#: ../gtksourceview/gtksourcecompletion.c:2266 +#: ../gtksourceview/gtksourcecompletion.c:2270 msgid "" "Show provider headers when proposals from multiple providers are available" msgstr "" "Показувати заголовки джерела, коли доступні пропозиції з кількох джерел" -#: ../gtksourceview/gtksourcecompletion.c:2280 +#: ../gtksourceview/gtksourcecompletion.c:2284 msgid "Show Icons" msgstr "Показати значки" -#: ../gtksourceview/gtksourcecompletion.c:2281 +#: ../gtksourceview/gtksourcecompletion.c:2285 msgid "Show provider and proposal icons in the completion popup" msgstr "" "Показувати піктограму джерела та пропозиції у контекстному вікні доповнення" -#: ../gtksourceview/gtksourcecompletion.c:2294 +#: ../gtksourceview/gtksourcecompletion.c:2298 msgid "Accelerators" msgstr "Акселератори" -#: ../gtksourceview/gtksourcecompletion.c:2295 +#: ../gtksourceview/gtksourcecompletion.c:2299 msgid "Number of proposal accelerators to show" msgstr "Кількість акселераторів пропозицій, що показується" -#: ../gtksourceview/gtksourcecompletion.c:2311 +#: ../gtksourceview/gtksourcecompletion.c:2315 msgid "Auto Complete Delay" msgstr "Затримка автодоповнення" -#: ../gtksourceview/gtksourcecompletion.c:2312 +#: ../gtksourceview/gtksourcecompletion.c:2316 msgid "Completion popup delay for interactive completion" msgstr "Затримка контекстного вікна доповнення для інтерактивних доповнень" -#: ../gtksourceview/gtksourcecompletion.c:2327 +#: ../gtksourceview/gtksourcecompletion.c:2331 msgid "Provider Page Size" msgstr "Розмір сторінки джерела" -#: ../gtksourceview/gtksourcecompletion.c:2328 +#: ../gtksourceview/gtksourcecompletion.c:2332 msgid "Provider scrolling page size" msgstr "Розмір понакручуваної сторінки джерела" -#: ../gtksourceview/gtksourcecompletion.c:2343 +#: ../gtksourceview/gtksourcecompletion.c:2347 msgid "Proposal Page Size" msgstr "Розмір сторінки пропозицій" -#: ../gtksourceview/gtksourcecompletion.c:2344 +#: ../gtksourceview/gtksourcecompletion.c:2348 msgid "Proposal scrolling page size" msgstr "Розмір понакручуваної сторінки пропозиції" -#: ../gtksourceview/gtksourcecompletion.c:2689 +#: ../gtksourceview/gtksourcecompletion.c:2693 msgid "Provider" msgstr "Джерело" -#: ../gtksourceview/gtksourcecompletioncontext.c:237 +#: ../gtksourceview/gtksourcecompletioncontext.c:233 #: ../gtksourceview/gtksourceview.c:306 msgid "Completion" msgstr "Доповнення" -#: ../gtksourceview/gtksourcecompletioncontext.c:238 +#: ../gtksourceview/gtksourcecompletioncontext.c:234 msgid "The completion object to which the context belongs" msgstr "Об'єкт доповнення, для якого належить контекст" #. Translators: The GtkTextIter at which the completion was invoked -#: ../gtksourceview/gtksourcecompletioncontext.c:251 +#: ../gtksourceview/gtksourcecompletioncontext.c:247 msgid "Iterator" msgstr "Ітератор" -#: ../gtksourceview/gtksourcecompletioncontext.c:252 +#: ../gtksourceview/gtksourcecompletioncontext.c:248 msgid "The GtkTextIter at which the completion was invoked" msgstr "GtkTextIter, для якого викликано доповнення" -#: ../gtksourceview/gtksourcecompletioncontext.c:264 +#: ../gtksourceview/gtksourcecompletioncontext.c:260 msgid "Activation" msgstr "Активація" -#: ../gtksourceview/gtksourcecompletioncontext.c:265 +#: ../gtksourceview/gtksourcecompletioncontext.c:261 msgid "The type of activation" msgstr "Тип активації" @@ -2261,10 +2463,6 @@ msgid "Completion Info" msgstr "Інформація про завершення" -#: ../gtksourceview/gtksourcecompletionitem.c:229 -msgid "Label" -msgstr "Позначка" - #: ../gtksourceview/gtksourcecompletionitem.c:230 msgid "Label to be shown for this item" msgstr "Позначка, зо показується у цьому пункті" @@ -2289,15 +2487,11 @@ msgid "Info to be shown for this item" msgstr "Інформація показується у цьому пункту" -#: ../gtksourceview/gtksourcecontextengine.c:2969 -msgid "using \\C is not supported in language definitions" -msgstr "Використання \\C не підтримується у визначеннях мови" - #. regex_new could fail, for instance if there are different #. * named sub-patterns with the same name or if resulting regex is #. * too long. In this case fixing lang file helps (e.g. renaming #. * subpatterns, making huge keywords use bigger prefixes, etc.) -#: ../gtksourceview/gtksourcecontextengine.c:3593 +#: ../gtksourceview/gtksourcecontextengine.c:3171 #, c-format msgid "" "Cannot create a regex for all the transitions, the syntax highlighting " @@ -2308,7 +2502,7 @@ "синтаксису кольором буде виконуватися значно повільніше.\n" "Помилка: %s" -#: ../gtksourceview/gtksourcecontextengine.c:4928 +#: ../gtksourceview/gtksourcecontextengine.c:4509 msgid "" "Highlighting a single line took too much time, syntax highlighting will be " "disabled" @@ -2316,19 +2510,19 @@ "Виділення кольором одного рядка займає багато часу, виділення кольором буде " "вимкнено" -#: ../gtksourceview/gtksourcecontextengine.c:6181 +#: ../gtksourceview/gtksourcecontextengine.c:5762 #, c-format msgid "context '%s' cannot contain a \\%%{...@start} command" msgstr "контекст '%s' не може містити команду \\%%{...@start}" -#: ../gtksourceview/gtksourcecontextengine.c:6343 -#: ../gtksourceview/gtksourcecontextengine.c:6432 +#: ../gtksourceview/gtksourcecontextengine.c:5923 +#: ../gtksourceview/gtksourcecontextengine.c:6012 #, c-format msgid "duplicated context id '%s'" msgstr "повторний ідентифікатор контексту '%s'" -#: ../gtksourceview/gtksourcecontextengine.c:6547 -#: ../gtksourceview/gtksourcecontextengine.c:6607 +#: ../gtksourceview/gtksourcecontextengine.c:6127 +#: ../gtksourceview/gtksourcecontextengine.c:6187 #, c-format msgid "" "style override used with wildcard context reference in language '%s' in ref " @@ -2337,51 +2531,51 @@ "у мові '%s' використовувалось визначення стилю за допомогою шаблону у " "посиланні '%s'" -#: ../gtksourceview/gtksourcecontextengine.c:6621 +#: ../gtksourceview/gtksourcecontextengine.c:6201 #, c-format msgid "invalid context reference '%s'" msgstr "некоректне посилання на контекст '%s'" -#: ../gtksourceview/gtksourcecontextengine.c:6640 -#: ../gtksourceview/gtksourcecontextengine.c:6650 +#: ../gtksourceview/gtksourcecontextengine.c:6220 +#: ../gtksourceview/gtksourcecontextengine.c:6230 #, c-format msgid "unknown context '%s'" msgstr "невідомий контекст '%s'" -#: ../gtksourceview/gtksourcecontextengine.c:6750 +#: ../gtksourceview/gtksourcecontextengine.c:6330 #, c-format msgid "Missing main language definition (id = \"%s\".)" msgstr "Відсутнє головне визначення мови (id=\"%s\".)" -#: ../gtksourceview/gtksourcegutter.c:549 +#: ../gtksourceview/gtksourcegutter.c:548 msgid "The gutters' GtkSourceView" msgstr "Канал GtkSourceView" -#: ../gtksourceview/gtksourcegutter.c:561 +#: ../gtksourceview/gtksourcegutter.c:560 #: ../gtksourceview/gtksourcegutterrenderer.c:703 msgid "Window Type" msgstr "Тип вікна" -#: ../gtksourceview/gtksourcegutter.c:562 +#: ../gtksourceview/gtksourcegutter.c:561 msgid "The gutters text window type" msgstr "Тип каналу текстового вікна" -#: ../gtksourceview/gtksourcegutter.c:573 +#: ../gtksourceview/gtksourcegutter.c:572 #: ../gtksourceview/gtksourcegutterrenderer.c:479 msgid "X Padding" msgstr "Доповнення X" -#: ../gtksourceview/gtksourcegutter.c:574 +#: ../gtksourceview/gtksourcegutter.c:573 #: ../gtksourceview/gtksourcegutterrenderer.c:480 msgid "The x-padding" msgstr "Доповнення через x" -#: ../gtksourceview/gtksourcegutter.c:584 +#: ../gtksourceview/gtksourcegutter.c:583 #: ../gtksourceview/gtksourcegutterrenderer.c:495 msgid "Y Padding" msgstr "Доповнення Y" -#: ../gtksourceview/gtksourcegutter.c:585 +#: ../gtksourceview/gtksourcegutter.c:584 #: ../gtksourceview/gtksourcegutterrenderer.c:496 msgid "The y-padding" msgstr "Доповнення через y" @@ -2523,24 +2717,16 @@ msgid "List of the ids of the available languages" msgstr "Список ідентифікаторів для доступних мов" -#: ../gtksourceview/gtksourcelanguage-parser-2.c:951 +#: ../gtksourceview/gtksourcelanguage-parser-2.c:950 #, c-format msgid "Unknown id '%s' in regex '%s'" msgstr "Невідомий ідентифікатор '%s' у регулярному виразі '%s'" -#: ../gtksourceview/gtksourcelanguage-parser-2.c:1179 +#: ../gtksourceview/gtksourcelanguage-parser-2.c:1178 #, c-format msgid "in regex '%s': backreferences are not supported" msgstr "у регулярному виразі '%s': зворотні дужки не підтримуються" -#: ../gtksourceview/gtksourcemark.c:140 -msgid "category" -msgstr "категорія" - -#: ../gtksourceview/gtksourcemark.c:141 -msgid "The mark category" -msgstr "Категорія маркування" - #: ../gtksourceview/gtksourcemarkattributes.c:290 #: ../gtksourceview/gtksourcestyle.c:88 msgid "Background" @@ -2554,99 +2740,107 @@ msgid "The GIcon" msgstr "GIcon" -#: ../gtksourceview/gtksourceprintcompositor.c:445 +#: ../gtksourceview/gtksourcemark.c:140 +msgid "category" +msgstr "категорія" + +#: ../gtksourceview/gtksourcemark.c:141 +msgid "The mark category" +msgstr "Категорія маркування" + +#: ../gtksourceview/gtksourceprintcompositor.c:442 msgid "Source Buffer" msgstr "Первинний буфер" -#: ../gtksourceview/gtksourceprintcompositor.c:446 +#: ../gtksourceview/gtksourceprintcompositor.c:443 msgid "The GtkSourceBuffer object to print" msgstr "Об'єкт GtkSourceBuffer для друку" -#: ../gtksourceview/gtksourceprintcompositor.c:463 +#: ../gtksourceview/gtksourceprintcompositor.c:460 #: ../gtksourceview/gtksourceview.c:344 msgid "Tab Width" msgstr "Крок табуляції" -#: ../gtksourceview/gtksourceprintcompositor.c:464 +#: ../gtksourceview/gtksourceprintcompositor.c:461 #: ../gtksourceview/gtksourceview.c:345 msgid "Width of a tab character expressed in spaces" msgstr "Ширина табуляції у пробілах" -#: ../gtksourceview/gtksourceprintcompositor.c:484 +#: ../gtksourceview/gtksourceprintcompositor.c:481 msgid "Wrap Mode" msgstr "Режим переносу рядків" -#: ../gtksourceview/gtksourceprintcompositor.c:485 +#: ../gtksourceview/gtksourceprintcompositor.c:482 msgid "" "Whether to wrap lines never, at word boundaries, or at character boundaries." msgstr "Переносити рядки: неколи, по словах, по літерах." -#: ../gtksourceview/gtksourceprintcompositor.c:506 +#: ../gtksourceview/gtksourceprintcompositor.c:503 msgid "Whether to print the document with highlighted syntax" msgstr "Чи друкувати документ із виділенням синтаксису" -#: ../gtksourceview/gtksourceprintcompositor.c:527 +#: ../gtksourceview/gtksourceprintcompositor.c:524 msgid "Print Line Numbers" msgstr "Друкувати номери рядків" -#: ../gtksourceview/gtksourceprintcompositor.c:528 +#: ../gtksourceview/gtksourceprintcompositor.c:525 msgid "Interval of printed line numbers (0 means no numbers)" msgstr "Інтервал друку номерів рядків (0 означає \"без номерів\")" -#: ../gtksourceview/gtksourceprintcompositor.c:550 +#: ../gtksourceview/gtksourceprintcompositor.c:547 msgid "Print Header" msgstr "Друкувати заголовок" -#: ../gtksourceview/gtksourceprintcompositor.c:551 +#: ../gtksourceview/gtksourceprintcompositor.c:548 msgid "Whether to print a header in each page" msgstr "Чи друкувати заголовок на кожній сторінці" -#: ../gtksourceview/gtksourceprintcompositor.c:573 +#: ../gtksourceview/gtksourceprintcompositor.c:570 msgid "Print Footer" msgstr "Друкувати нижній колонтитул" -#: ../gtksourceview/gtksourceprintcompositor.c:574 +#: ../gtksourceview/gtksourceprintcompositor.c:571 msgid "Whether to print a footer in each page" msgstr "Чи друкувати нижній колонтитул на кожній сторінці" -#: ../gtksourceview/gtksourceprintcompositor.c:596 +#: ../gtksourceview/gtksourceprintcompositor.c:593 msgid "Body Font Name" msgstr "Назва основного шрифту" -#: ../gtksourceview/gtksourceprintcompositor.c:597 +#: ../gtksourceview/gtksourceprintcompositor.c:594 msgid "Name of the font to use for the text body (e.g. \"Monospace 10\")" msgstr "Назва шрифту тексту (наприклад, \"Monospace 10\")" -#: ../gtksourceview/gtksourceprintcompositor.c:620 +#: ../gtksourceview/gtksourceprintcompositor.c:617 msgid "Line Numbers Font Name" msgstr "Назва шрифту для номерів рядків" -#: ../gtksourceview/gtksourceprintcompositor.c:621 +#: ../gtksourceview/gtksourceprintcompositor.c:618 msgid "Name of the font to use for the line numbers (e.g. \"Monospace 10\")" msgstr "Назва шрифту для номерів рядків (наприклад, \"Monospace 10\")" -#: ../gtksourceview/gtksourceprintcompositor.c:644 +#: ../gtksourceview/gtksourceprintcompositor.c:641 msgid "Header Font Name" msgstr "Назва шрифту для заголовку" -#: ../gtksourceview/gtksourceprintcompositor.c:645 +#: ../gtksourceview/gtksourceprintcompositor.c:642 msgid "Name of the font to use for the page header (e.g. \"Monospace 10\")" msgstr "Назва шрифту для заголовку сторінки (наприклад, \"Monospace 10\")" -#: ../gtksourceview/gtksourceprintcompositor.c:668 +#: ../gtksourceview/gtksourceprintcompositor.c:665 msgid "Footer Font Name" msgstr "Назва шрифту для нижнього колонтитулу" -#: ../gtksourceview/gtksourceprintcompositor.c:669 +#: ../gtksourceview/gtksourceprintcompositor.c:666 msgid "Name of the font to use for the page footer (e.g. \"Monospace 10\")" msgstr "" "Назва шрифту для нижнього колонтитулу сторінки (наприклад, \"Monospace 10\")" -#: ../gtksourceview/gtksourceprintcompositor.c:685 +#: ../gtksourceview/gtksourceprintcompositor.c:682 msgid "Number of pages" msgstr "Кількість сторінок" -#: ../gtksourceview/gtksourceprintcompositor.c:686 +#: ../gtksourceview/gtksourceprintcompositor.c:683 msgid "" "The number of pages in the document (-1 means the document has not been " "completely paginated)." @@ -2654,6 +2848,10 @@ "Кількість сторінок у документі (-1 означає, що документ не був повністю " "розбитий на сторінки)." +#: ../gtksourceview/gtksourceregex.c:125 +msgid "using \\C is not supported in language definitions" +msgstr "Використання \\C не підтримується у визначеннях мови" + #: ../gtksourceview/gtksourcestyle.c:80 msgid "Line background" msgstr "Тло рядка" @@ -2738,23 +2936,23 @@ msgid "Whether strikethrough attribute is set" msgstr "Чи встановлено атрибут перекреслення" -#: ../gtksourceview/gtksourcestylescheme.c:194 -#: ../gtksourceview/gtksourcestylescheme.c:195 +#: ../gtksourceview/gtksourcestylescheme.c:212 +#: ../gtksourceview/gtksourcestylescheme.c:213 msgid "Style scheme id" msgstr "Ідентифікатор стильової схеми" -#: ../gtksourceview/gtksourcestylescheme.c:207 -#: ../gtksourceview/gtksourcestylescheme.c:208 +#: ../gtksourceview/gtksourcestylescheme.c:225 +#: ../gtksourceview/gtksourcestylescheme.c:226 msgid "Style scheme name" msgstr "Стильова схема" -#: ../gtksourceview/gtksourcestylescheme.c:220 -#: ../gtksourceview/gtksourcestylescheme.c:221 +#: ../gtksourceview/gtksourcestylescheme.c:238 +#: ../gtksourceview/gtksourcestylescheme.c:239 msgid "Style scheme description" msgstr "Опис стильової схеми" -#: ../gtksourceview/gtksourcestylescheme.c:233 -#: ../gtksourceview/gtksourcestylescheme.c:234 +#: ../gtksourceview/gtksourcestylescheme.c:251 +#: ../gtksourceview/gtksourcestylescheme.c:252 msgid "Style scheme filename" msgstr "Назва файлу стильової схеми" @@ -2878,11 +3076,24 @@ msgid "Set if and how the spaces should be visualized" msgstr "Встановити, коли і як зображати пробіли" -#: ../gtksourceview/gtksourceview-i18n.c:74 +#: ../gtksourceview/gtksourceview-i18n.c:72 msgid "translator-credits" -msgstr "Максим Дзюманенко \n" +msgstr "" +"Максим Дзюманенко \n" "Daniel Korostil " +#~ msgid "Docbook" +#~ msgstr "Docbook" + +#~ msgid "Object" +#~ msgstr "Об'єкт" + +#~ msgid "Special" +#~ msgstr "Спеціальне" + +#~ msgid "Text2Tags" +#~ msgstr "Text2Tags" + #~ msgid "Maximum width" #~ msgstr "Мінімальна ширина" diff -Nru gtksourceview3-3.3.5/po/zh_CN.po gtksourceview3-3.4.0/po/zh_CN.po --- gtksourceview3-3.3.5/po/zh_CN.po 2011-12-28 11:16:45.000000000 +0000 +++ gtksourceview3-3.4.0/po/zh_CN.po 2012-03-26 17:10:25.000000000 +0000 @@ -6,15 +6,15 @@ # Aron Xu , 2010. # Tao Wang , 2010. # 李炜 , 2011. -# YunQiang Su , 2011. +# YunQiang Su , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: gtksourceview master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gtksourceview&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-17 06:50+0000\n" -"PO-Revision-Date: 2011-09-28 01:04+0800\n" +"POT-Creation-Date: 2012-02-04 13:59+0000\n" +"PO-Revision-Date: 2012-03-21 01:25+0800\n" "Last-Translator: YunQiang Su \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" @@ -90,12 +90,11 @@ #. A boolean constant: TRUE, false #: ../data/language-specs/ada.lang.h:3 ../data/language-specs/asp.lang.h:3 -#: ../data/language-specs/bennugd.lang.h:2 ../data/language-specs/c.lang.h:1 -#: ../data/language-specs/cg.lang.h:2 ../data/language-specs/csharp.lang.h:1 +#: ../data/language-specs/bennugd.lang.h:2 ../data/language-specs/cg.lang.h:2 +#: ../data/language-specs/c.lang.h:1 ../data/language-specs/csharp.lang.h:1 #: ../data/language-specs/def.lang.h:4 ../data/language-specs/fsharp.lang.h:2 #: ../data/language-specs/go.lang.h:1 ../data/language-specs/gtkrc.lang.h:1 #: ../data/language-specs/ini.lang.h:2 ../data/language-specs/java.lang.h:1 -#: ../data/language-specs/javascript.lang.h:1 #: ../data/language-specs/lua.lang.h:1 ../data/language-specs/nemerle.lang.h:2 #: ../data/language-specs/ocaml.lang.h:2 ../data/language-specs/ooc.lang.h:1 #: ../data/language-specs/opal.lang.h:1 ../data/language-specs/php.lang.h:1 @@ -109,7 +108,7 @@ #. Any comment #: ../data/language-specs/ada.lang.h:4 ../data/language-specs/asp.lang.h:4 #: ../data/language-specs/bennugd.lang.h:3 ../data/language-specs/boo.lang.h:4 -#: ../data/language-specs/c.lang.h:4 ../data/language-specs/cg.lang.h:5 +#: ../data/language-specs/cg.lang.h:5 ../data/language-specs/c.lang.h:4 #: ../data/language-specs/cobol.lang.h:2 #: ../data/language-specs/csharp.lang.h:4 ../data/language-specs/def.lang.h:11 #: ../data/language-specs/d.lang.h:3 ../data/language-specs/dosbatch.lang.h:2 @@ -142,7 +141,7 @@ #: ../data/language-specs/ada.lang.h:5 ../data/language-specs/asp.lang.h:5 #: ../data/language-specs/bennugd.lang.h:4 ../data/language-specs/boo.lang.h:5 -#: ../data/language-specs/c.lang.h:6 ../data/language-specs/cg.lang.h:6 +#: ../data/language-specs/cg.lang.h:6 ../data/language-specs/c.lang.h:6 #: ../data/language-specs/cpp.lang.h:3 ../data/language-specs/csharp.lang.h:5 #: ../data/language-specs/cuda.lang.h:2 ../data/language-specs/d.lang.h:5 #: ../data/language-specs/eiffel.lang.h:4 @@ -168,7 +167,7 @@ #. A decimal number: 1234 #: ../data/language-specs/ada.lang.h:6 ../data/language-specs/bennugd.lang.h:5 -#: ../data/language-specs/c.lang.h:7 ../data/language-specs/cg.lang.h:7 +#: ../data/language-specs/cg.lang.h:7 ../data/language-specs/c.lang.h:7 #: ../data/language-specs/csharp.lang.h:6 ../data/language-specs/def.lang.h:19 #: ../data/language-specs/d.lang.h:6 ../data/language-specs/eiffel.lang.h:6 #: ../data/language-specs/erlang.lang.h:6 @@ -176,23 +175,27 @@ #: ../data/language-specs/nemerle.lang.h:6 #: ../data/language-specs/ocaml.lang.h:6 ../data/language-specs/ooc.lang.h:4 #: ../data/language-specs/opal.lang.h:5 ../data/language-specs/php.lang.h:5 -#: ../data/language-specs/python.lang.h:7 ../data/language-specs/ruby.lang.h:8 +#: ../data/language-specs/python.lang.h:7 +#: ../data/language-specs/python3.lang.h:7 +#: ../data/language-specs/ruby.lang.h:8 msgid "Decimal number" msgstr "十进制数" #. map to nothing -#: ../data/language-specs/ada.lang.h:7 ../data/language-specs/c.lang.h:8 -#: ../data/language-specs/cg.lang.h:9 ../data/language-specs/csharp.lang.h:8 +#: ../data/language-specs/ada.lang.h:7 ../data/language-specs/cg.lang.h:9 +#: ../data/language-specs/c.lang.h:8 ../data/language-specs/csharp.lang.h:8 #: ../data/language-specs/eiffel.lang.h:9 #: ../data/language-specs/fsharp.lang.h:7 ../data/language-specs/go.lang.h:7 #: ../data/language-specs/haskell.lang.h:5 #: ../data/language-specs/java.lang.h:5 #: ../data/language-specs/javascript.lang.h:4 -#: ../data/language-specs/lua.lang.h:3 ../data/language-specs/ocaml.lang.h:8 -#: ../data/language-specs/ooc.lang.h:7 ../data/language-specs/php.lang.h:8 -#: ../data/language-specs/prolog.lang.h:3 -#: ../data/language-specs/python.lang.h:8 ../data/language-specs/ruby.lang.h:9 -#: ../data/language-specs/sml.lang.h:7 ../data/language-specs/texinfo.lang.h:2 +#: ../data/language-specs/json.lang.h:4 ../data/language-specs/lua.lang.h:3 +#: ../data/language-specs/ocaml.lang.h:8 ../data/language-specs/ooc.lang.h:7 +#: ../data/language-specs/php.lang.h:8 ../data/language-specs/prolog.lang.h:3 +#: ../data/language-specs/python.lang.h:8 +#: ../data/language-specs/python3.lang.h:8 +#: ../data/language-specs/ruby.lang.h:9 ../data/language-specs/sml.lang.h:7 +#: ../data/language-specs/texinfo.lang.h:2 #: ../data/language-specs/verilog.lang.h:5 msgid "Escaped Character" msgstr "转码字符" @@ -200,8 +203,8 @@ #. keywords: "if", "for", "while", etc. #: ../data/language-specs/ada.lang.h:8 ../data/language-specs/asp.lang.h:7 #: ../data/language-specs/awk.lang.h:2 ../data/language-specs/bennugd.lang.h:9 -#: ../data/language-specs/boo.lang.h:7 ../data/language-specs/c.lang.h:12 -#: ../data/language-specs/cg.lang.h:14 ../data/language-specs/cobol.lang.h:5 +#: ../data/language-specs/boo.lang.h:7 ../data/language-specs/cg.lang.h:14 +#: ../data/language-specs/c.lang.h:12 ../data/language-specs/cobol.lang.h:5 #: ../data/language-specs/cpp.lang.h:4 ../data/language-specs/csharp.lang.h:10 #: ../data/language-specs/css.lang.h:10 ../data/language-specs/cuda.lang.h:6 #: ../data/language-specs/def.lang.h:36 ../data/language-specs/d.lang.h:10 @@ -227,7 +230,8 @@ #: ../data/language-specs/php.lang.h:14 ../data/language-specs/po.lang.h:3 #: ../data/language-specs/prolog.lang.h:4 #: ../data/language-specs/protobuf.lang.h:3 -#: ../data/language-specs/python.lang.h:11 ../data/language-specs/R.lang.h:6 +#: ../data/language-specs/python.lang.h:11 +#: ../data/language-specs/python3.lang.h:11 ../data/language-specs/R.lang.h:6 #: ../data/language-specs/ruby.lang.h:13 #: ../data/language-specs/scheme.lang.h:4 #: ../data/language-specs/scilab.lang.h:5 ../data/language-specs/sh.lang.h:5 @@ -242,8 +246,9 @@ msgstr "关键字" #: ../data/language-specs/ada.lang.h:9 ../data/language-specs/asp.lang.h:10 -#: ../data/language-specs/bennugd.lang.h:11 ../data/language-specs/c.lang.h:14 -#: ../data/language-specs/cg.lang.h:16 ../data/language-specs/csharp.lang.h:12 +#: ../data/language-specs/bennugd.lang.h:11 +#: ../data/language-specs/cg.lang.h:16 ../data/language-specs/c.lang.h:14 +#: ../data/language-specs/csharp.lang.h:12 #: ../data/language-specs/forth.lang.h:9 #: ../data/language-specs/fsharp.lang.h:15 #: ../data/language-specs/glsl.lang.h:7 @@ -264,8 +269,8 @@ #: ../data/language-specs/ada.lang.h:11 ../data/language-specs/asp.lang.h:11 #: ../data/language-specs/bennugd.lang.h:12 -#: ../data/language-specs/boo.lang.h:13 ../data/language-specs/chdr.lang.h:2 -#: ../data/language-specs/c.lang.h:16 ../data/language-specs/cg.lang.h:17 +#: ../data/language-specs/boo.lang.h:13 ../data/language-specs/cg.lang.h:17 +#: ../data/language-specs/chdr.lang.h:2 ../data/language-specs/c.lang.h:16 #: ../data/language-specs/cobol.lang.h:8 ../data/language-specs/cpp.lang.h:5 #: ../data/language-specs/csharp.lang.h:14 #: ../data/language-specs/cuda.lang.h:7 ../data/language-specs/d.lang.h:13 @@ -295,8 +300,8 @@ msgid "Sources" msgstr "源代码" -#: ../data/language-specs/ada.lang.h:12 ../data/language-specs/c.lang.h:18 -#: ../data/language-specs/cg.lang.h:18 ../data/language-specs/go.lang.h:15 +#: ../data/language-specs/ada.lang.h:12 ../data/language-specs/cg.lang.h:18 +#: ../data/language-specs/c.lang.h:18 ../data/language-specs/go.lang.h:15 #: ../data/language-specs/java.lang.h:16 ../data/language-specs/ooc.lang.h:18 msgid "Storage Class" msgstr "存储类" @@ -317,7 +322,9 @@ #: ../data/language-specs/haskell.lang.h:13 #: ../data/language-specs/idl.lang.h:7 ../data/language-specs/imagej.lang.h:10 #: ../data/language-specs/ini.lang.h:9 ../data/language-specs/java.lang.h:17 -#: ../data/language-specs/lua.lang.h:10 ../data/language-specs/matlab.lang.h:5 +#: ../data/language-specs/javascript.lang.h:13 +#: ../data/language-specs/json.lang.h:9 ../data/language-specs/lua.lang.h:10 +#: ../data/language-specs/matlab.lang.h:5 #: ../data/language-specs/nemerle.lang.h:16 #: ../data/language-specs/nsis.lang.h:5 ../data/language-specs/objc.lang.h:6 #: ../data/language-specs/objj.lang.h:9 ../data/language-specs/ocaml.lang.h:18 @@ -328,6 +335,7 @@ #: ../data/language-specs/po.lang.h:6 ../data/language-specs/prolog.lang.h:9 #: ../data/language-specs/protobuf.lang.h:5 #: ../data/language-specs/python.lang.h:17 +#: ../data/language-specs/python3.lang.h:17 #: ../data/language-specs/ruby.lang.h:22 #: ../data/language-specs/scheme.lang.h:7 #: ../data/language-specs/scilab.lang.h:9 ../data/language-specs/sh.lang.h:8 @@ -348,11 +356,10 @@ msgstr "ASP 对象" #. A function name (also: methods for classes) -#: ../data/language-specs/asp.lang.h:6 +#: ../data/language-specs/asp.lang.h:6 ../data/language-specs/cg.lang.h:11 #: ../data/language-specs/changelog.lang.h:6 -#: ../data/language-specs/cg.lang.h:11 ../data/language-specs/css.lang.h:8 -#: ../data/language-specs/def.lang.h:32 ../data/language-specs/gap.lang.h:4 -#: ../data/language-specs/gdb-log.lang.h:4 +#: ../data/language-specs/css.lang.h:8 ../data/language-specs/def.lang.h:32 +#: ../data/language-specs/gap.lang.h:4 ../data/language-specs/gdb-log.lang.h:4 #: ../data/language-specs/gtk-doc.lang.h:3 #: ../data/language-specs/javascript.lang.h:5 #: ../data/language-specs/lua.lang.h:4 ../data/language-specs/scheme.lang.h:3 @@ -394,9 +401,56 @@ msgid "VBScript and ADO constants" msgstr "VBScript 和 ADO 常数" +#: ../data/language-specs/automake.lang.h:1 +#| msgid "Atom" +msgid "Automake" +msgstr "Automake" + +#: ../data/language-specs/automake.lang.h:2 +#| msgid "Global Variable" +msgid "Automake Variable" +msgstr "Automake 变量" + +#: ../data/language-specs/automake.lang.h:3 +#| msgid "Builtin Variable" +msgid "Built-in Target" +msgstr "内建目标" + +#: ../data/language-specs/automake.lang.h:4 +#| msgid "Option Name" +msgid "Optional Target" +msgstr "可选目标" + +#: ../data/language-specs/automake.lang.h:5 +#| msgid "Control Keyword" +msgid "Other Keyword" +msgstr "其它关键字" + +#: ../data/language-specs/automake.lang.h:6 +msgid "Prefix" +msgstr "前缀" + +#: ../data/language-specs/automake.lang.h:7 +#, fuzzy +#| msgid "Priority" +msgid "Primary" +msgstr "主" + +#: ../data/language-specs/automake.lang.h:8 +#, fuzzy +#| msgid "Section" +msgid "Secondary" +msgstr "次" + +#: ../data/language-specs/automake.lang.h:9 +#, fuzzy +msgid "Substitution" +msgstr "替换" + #: ../data/language-specs/awk.lang.h:1 ../data/language-specs/boo.lang.h:3 #: ../data/language-specs/glsl.lang.h:2 ../data/language-specs/perl.lang.h:1 #: ../data/language-specs/python.lang.h:4 +#: ../data/language-specs/python3.lang.h:4 msgid "Builtin Function" msgstr "内置函数" @@ -410,6 +464,7 @@ #: ../data/language-specs/lua.lang.h:9 ../data/language-specs/m4.lang.h:3 #: ../data/language-specs/perl.lang.h:18 ../data/language-specs/php.lang.h:19 #: ../data/language-specs/python.lang.h:15 +#: ../data/language-specs/python3.lang.h:15 #: ../data/language-specs/ruby.lang.h:20 ../data/language-specs/sh.lang.h:7 #: ../data/language-specs/tcl.lang.h:2 msgid "Scripts" @@ -440,18 +495,19 @@ msgstr "BennuGD" #. A floating point constant: 2.3e10 -#: ../data/language-specs/bennugd.lang.h:6 ../data/language-specs/c.lang.h:9 -#: ../data/language-specs/cg.lang.h:10 ../data/language-specs/def.lang.h:30 +#: ../data/language-specs/bennugd.lang.h:6 ../data/language-specs/cg.lang.h:10 +#: ../data/language-specs/c.lang.h:9 ../data/language-specs/def.lang.h:30 #: ../data/language-specs/d.lang.h:8 ../data/language-specs/erlang.lang.h:8 -#: ../data/language-specs/go.lang.h:8 ../data/language-specs/nemerle.lang.h:8 -#: ../data/language-specs/ooc.lang.h:9 ../data/language-specs/php.lang.h:9 -#: ../data/language-specs/python.lang.h:9 ../data/language-specs/R.lang.h:4 +#: ../data/language-specs/go.lang.h:8 ../data/language-specs/json.lang.h:5 +#: ../data/language-specs/nemerle.lang.h:8 ../data/language-specs/ooc.lang.h:9 +#: ../data/language-specs/php.lang.h:9 ../data/language-specs/python.lang.h:9 +#: ../data/language-specs/python3.lang.h:9 ../data/language-specs/R.lang.h:4 #: ../data/language-specs/ruby.lang.h:10 msgid "Floating point number" msgstr "浮点数" -#: ../data/language-specs/bennugd.lang.h:7 ../data/language-specs/c.lang.h:10 -#: ../data/language-specs/cg.lang.h:12 ../data/language-specs/csharp.lang.h:9 +#: ../data/language-specs/bennugd.lang.h:7 ../data/language-specs/cg.lang.h:12 +#: ../data/language-specs/c.lang.h:10 ../data/language-specs/csharp.lang.h:9 #: ../data/language-specs/d.lang.h:9 ../data/language-specs/eiffel.lang.h:11 #: ../data/language-specs/go.lang.h:10 ../data/language-specs/nemerle.lang.h:9 #: ../data/language-specs/ooc.lang.h:11 ../data/language-specs/php.lang.h:12 @@ -499,6 +555,7 @@ #: ../data/language-specs/libtool.lang.h:1 #: ../data/language-specs/objj.lang.h:1 ../data/language-specs/octave.lang.h:2 #: ../data/language-specs/python.lang.h:2 +#: ../data/language-specs/python3.lang.h:2 #: ../data/language-specs/scheme.lang.h:1 #: ../data/language-specs/scilab.lang.h:1 #: ../data/language-specs/sparql.lang.h:1 @@ -510,6 +567,7 @@ msgstr "定义" #: ../data/language-specs/boo.lang.h:8 ../data/language-specs/python.lang.h:13 +#: ../data/language-specs/python3.lang.h:13 msgid "Multiline string" msgstr "多行字符串" @@ -523,6 +581,7 @@ #: ../data/language-specs/fsharp.lang.h:13 #: ../data/language-specs/java.lang.h:12 #: ../data/language-specs/javascript.lang.h:9 +#: ../data/language-specs/json.lang.h:7 #: ../data/language-specs/nemerle.lang.h:12 #: ../data/language-specs/objj.lang.h:5 ../data/language-specs/ooc.lang.h:13 #: ../data/language-specs/php.lang.h:15 ../data/language-specs/vala.lang.h:6 @@ -537,10 +596,58 @@ #: ../data/language-specs/boo.lang.h:14 #: ../data/language-specs/python.lang.h:16 +#: ../data/language-specs/python3.lang.h:16 #: ../data/language-specs/ruby.lang.h:21 msgid "Special Variable" msgstr "特殊变量" +#: ../data/language-specs/cg.lang.h:1 +msgid "Bindings" +msgstr "绑定" + +#. Translators: functions that are provided in the language +#: ../data/language-specs/cg.lang.h:3 ../data/language-specs/erlang.lang.h:3 +#: ../data/language-specs/imagej.lang.h:2 +#: ../data/language-specs/matlab.lang.h:1 +#: ../data/language-specs/octave.lang.h:3 ../data/language-specs/ruby.lang.h:5 +msgid "Builtin" +msgstr "内置" + +#: ../data/language-specs/cg.lang.h:4 +msgid "CG Shader Language" +msgstr "CG Shader" + +#. Any erroneous construct +#: ../data/language-specs/cg.lang.h:8 ../data/language-specs/cobol.lang.h:4 +#: ../data/language-specs/csharp.lang.h:7 ../data/language-specs/css.lang.h:7 +#: ../data/language-specs/def.lang.h:28 ../data/language-specs/d.lang.h:7 +#: ../data/language-specs/dot.lang.h:3 ../data/language-specs/go.lang.h:6 +#: ../data/language-specs/html.lang.h:5 ../data/language-specs/json.lang.h:3 +#: ../data/language-specs/nemerle.lang.h:7 +#: ../data/language-specs/ocaml.lang.h:7 ../data/language-specs/ooc.lang.h:6 +#: ../data/language-specs/opal.lang.h:6 ../data/language-specs/perl.lang.h:4 +#: ../data/language-specs/php.lang.h:6 ../data/language-specs/prolog.lang.h:2 +#: ../data/language-specs/vala.lang.h:4 +#: ../data/language-specs/verilog.lang.h:4 ../data/language-specs/xml.lang.h:8 +msgid "Error" +msgstr "错误" + +#: ../data/language-specs/cg.lang.h:13 ../data/language-specs/c.lang.h:11 +#: ../data/language-specs/go.lang.h:11 ../data/language-specs/objj.lang.h:3 +msgid "Included File" +msgstr "包含了的文件" + +#: ../data/language-specs/cg.lang.h:15 ../data/language-specs/c.lang.h:13 +#: ../data/language-specs/d.lang.h:12 ../data/language-specs/go.lang.h:13 +#: ../data/language-specs/nemerle.lang.h:13 +#: ../data/language-specs/ooc.lang.h:15 ../data/language-specs/php.lang.h:16 +msgid "Octal number" +msgstr "八进制数" + +#: ../data/language-specs/cg.lang.h:19 +msgid "Swizzle operator" +msgstr "鸡尾酒操作符" + #: ../data/language-specs/changelog.lang.h:1 msgid "Bullet" msgstr "点句符" @@ -563,7 +670,7 @@ msgstr "文件" #: ../data/language-specs/changelog.lang.h:7 -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:464 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:455 msgid "Name" msgstr "名称" @@ -585,6 +692,7 @@ #: ../data/language-specs/dpatch.lang.h:2 #: ../data/language-specs/gdb-log.lang.h:8 #: ../data/language-specs/gtkrc.lang.h:8 ../data/language-specs/ini.lang.h:8 +#: ../data/language-specs/json.lang.h:8 #: ../data/language-specs/libtool.lang.h:3 #: ../data/language-specs/nsis.lang.h:4 ../data/language-specs/ocl.lang.h:6 #: ../data/language-specs/pkgconfig.lang.h:1 @@ -623,18 +731,6 @@ msgid "Common Defines" msgstr "公共定义" -#: ../data/language-specs/c.lang.h:11 ../data/language-specs/cg.lang.h:13 -#: ../data/language-specs/go.lang.h:11 ../data/language-specs/objj.lang.h:3 -msgid "Included File" -msgstr "包含了的文件" - -#: ../data/language-specs/c.lang.h:13 ../data/language-specs/cg.lang.h:15 -#: ../data/language-specs/d.lang.h:12 ../data/language-specs/go.lang.h:13 -#: ../data/language-specs/nemerle.lang.h:13 -#: ../data/language-specs/ooc.lang.h:15 ../data/language-specs/php.lang.h:16 -msgid "Octal number" -msgstr "八进制数" - #: ../data/language-specs/c.lang.h:15 msgid "Signal name" msgstr "信号名称" @@ -647,41 +743,6 @@ msgid "printf Conversion" msgstr "printf 转换" -#: ../data/language-specs/cg.lang.h:1 -msgid "Bindings" -msgstr "绑定" - -#. Translators: functions that are provided in the language -#: ../data/language-specs/cg.lang.h:3 ../data/language-specs/erlang.lang.h:3 -#: ../data/language-specs/imagej.lang.h:2 -#: ../data/language-specs/matlab.lang.h:1 -#: ../data/language-specs/octave.lang.h:3 ../data/language-specs/ruby.lang.h:5 -msgid "Builtin" -msgstr "内置" - -#: ../data/language-specs/cg.lang.h:4 -msgid "CG Shader Language" -msgstr "CG Shader" - -#. Any erroneous construct -#: ../data/language-specs/cg.lang.h:8 ../data/language-specs/cobol.lang.h:4 -#: ../data/language-specs/csharp.lang.h:7 ../data/language-specs/css.lang.h:7 -#: ../data/language-specs/def.lang.h:28 ../data/language-specs/d.lang.h:7 -#: ../data/language-specs/dot.lang.h:3 ../data/language-specs/go.lang.h:6 -#: ../data/language-specs/html.lang.h:5 -#: ../data/language-specs/nemerle.lang.h:7 -#: ../data/language-specs/ocaml.lang.h:7 ../data/language-specs/ooc.lang.h:6 -#: ../data/language-specs/opal.lang.h:6 ../data/language-specs/perl.lang.h:4 -#: ../data/language-specs/php.lang.h:6 ../data/language-specs/prolog.lang.h:2 -#: ../data/language-specs/vala.lang.h:4 -#: ../data/language-specs/verilog.lang.h:4 ../data/language-specs/xml.lang.h:8 -msgid "Error" -msgstr "错误" - -#: ../data/language-specs/cg.lang.h:19 -msgid "Swizzle operator" -msgstr "鸡尾酒操作符" - #: ../data/language-specs/cmake.lang.h:1 msgid "Builtin Command" msgstr "内建命令" @@ -746,7 +807,7 @@ #: ../data/language-specs/fortran.lang.h:4 ../data/language-specs/gap.lang.h:3 #: ../data/language-specs/gtkrc.lang.h:4 #: ../data/language-specs/haskell.lang.h:4 ../data/language-specs/ini.lang.h:5 -#: ../data/language-specs/octave.lang.h:6 +#: ../data/language-specs/json.lang.h:2 ../data/language-specs/octave.lang.h:6 #: ../data/language-specs/pascal.lang.h:3 ../data/language-specs/sml.lang.h:6 #: ../data/language-specs/sql.lang.h:3 msgid "Decimal" @@ -798,6 +859,7 @@ #. A base-N number: 0xFFFF #: ../data/language-specs/def.lang.h:2 ../data/language-specs/python.lang.h:1 +#: ../data/language-specs/python3.lang.h:1 #: ../data/language-specs/ruby.lang.h:2 msgid "Base-N number" msgstr "N 进制整数" @@ -810,6 +872,7 @@ #. A complex number #: ../data/language-specs/def.lang.h:13 ../data/language-specs/python.lang.h:6 +#: ../data/language-specs/python3.lang.h:6 msgid "Complex number" msgstr "复数" @@ -888,6 +951,7 @@ #. Translators: "Key" here means key value, that is the left hand #. side in a myoption=something line in a .desktop file #: ../data/language-specs/desktop.lang.h:9 +#: ../data/language-specs/json.lang.h:6 msgid "Key" msgstr "关键字" @@ -1018,6 +1082,8 @@ msgstr "断言" #: ../data/language-specs/eiffel.lang.h:2 +#: ../data/language-specs/javascript.lang.h:1 +#: ../data/language-specs/json.lang.h:1 msgid "Boolean Value" msgstr "布尔值" @@ -1207,6 +1273,7 @@ msgstr "线程头" #: ../data/language-specs/glsl.lang.h:1 ../data/language-specs/python.lang.h:3 +#: ../data/language-specs/python3.lang.h:3 msgid "Builtin Constant" msgstr "内置常量" @@ -1442,7 +1509,7 @@ msgid "Properties" msgstr "属性" -#: ../data/language-specs/javascript.lang.h:13 +#: ../data/language-specs/javascript.lang.h:14 msgid "Undefined Value" msgstr "未定义值" @@ -1646,8 +1713,9 @@ msgstr "Ocamldoc 块注释" #: ../data/language-specs/ocaml.lang.h:17 -msgid "Standart Modules" -msgstr "Standart 模块" +#| msgid "Standart Modules" +msgid "Standard Modules" +msgstr "标准模块" #: ../data/language-specs/ocl.lang.h:4 msgid "OCL" @@ -1679,6 +1747,7 @@ #: ../data/language-specs/opal.lang.h:9 #: ../data/language-specs/python.lang.h:12 +#: ../data/language-specs/python3.lang.h:12 msgid "Module Handler" msgstr "模块句柄" @@ -1793,10 +1862,12 @@ msgstr "Prolog" #: ../data/language-specs/python.lang.h:5 +#: ../data/language-specs/python3.lang.h:5 msgid "Builtin Object" msgstr "内置对象" #: ../data/language-specs/python.lang.h:10 +#: ../data/language-specs/python3.lang.h:10 msgid "Format" msgstr "格式" @@ -1808,6 +1879,11 @@ msgid "string-conversion" msgstr "字符串转换" +#: ../data/language-specs/python3.lang.h:14 +#| msgid "Python" +msgid "Python 3" +msgstr "Python 3" + #: ../data/language-specs/R.lang.h:1 msgid "Assignment Operator" msgstr "赋值操作符" @@ -2157,65 +2233,65 @@ msgid "Tango" msgstr "Tango" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:380 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:371 msgid "Document Words" msgstr "文档字数" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:465 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:456 msgid "The provider name" msgstr "提供者名称" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:472 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:463 #: ../gtksourceview/gtksourcecompletionitem.c:268 msgid "Icon" msgstr "图标" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:473 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:464 msgid "The provider icon" msgstr "提供者图标" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:480 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:471 msgid "Proposals Batch Size" msgstr "提案批次大小" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:481 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:472 msgid "Number of proposals added in one batch" msgstr "一批添加的提案数量" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:490 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:481 msgid "Scan Batch Size" msgstr "扫描批次大小" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:491 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:482 msgid "Number of lines scanned in one batch" msgstr "一批扫描的行数" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:500 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:491 msgid "Minimum Word Size" msgstr "单词大小的下限" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:501 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:492 msgid "The minimum word size to complete" msgstr "补全时单词大小的下限" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:510 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:501 msgid "Interactive Delay" msgstr "交互延时" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:511 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:502 msgid "The delay before initiating interactive completion" msgstr "开始交互式补全前的延时" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:520 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:511 msgid "Priority" msgstr "优先级" -#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:521 +#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:512 msgid "Provider priority" msgstr "提供者优先级" #: ../gtksourceview/gtksourcebuffer.c:234 -#: ../gtksourceview/gtksourceprintcompositor.c:505 +#: ../gtksourceview/gtksourceprintcompositor.c:502 msgid "Highlight Syntax" msgstr "语法高亮" @@ -2285,107 +2361,107 @@ msgid "No extra information available" msgstr "没有可用的额外信息" -#: ../gtksourceview/gtksourcecompletion.c:2220 -#: ../gtksourceview/gtksourcegutter.c:548 +#: ../gtksourceview/gtksourcecompletion.c:2224 +#: ../gtksourceview/gtksourcegutter.c:547 msgid "View" msgstr "查看器" -#: ../gtksourceview/gtksourcecompletion.c:2221 +#: ../gtksourceview/gtksourcecompletion.c:2225 msgid "The GtkSourceView bound to the completion" msgstr "GtkSourceView 补全的界限" -#: ../gtksourceview/gtksourcecompletion.c:2236 +#: ../gtksourceview/gtksourcecompletion.c:2240 msgid "Remember Info Visibility" msgstr "记住信息可见程度" -#: ../gtksourceview/gtksourcecompletion.c:2237 +#: ../gtksourceview/gtksourcecompletion.c:2241 msgid "Remember the last info window visibility state" msgstr "记住最后信息窗口的可见程度" -#: ../gtksourceview/gtksourcecompletion.c:2250 +#: ../gtksourceview/gtksourcecompletion.c:2254 msgid "Select on Show" msgstr "显示时的选择" -#: ../gtksourceview/gtksourcecompletion.c:2251 +#: ../gtksourceview/gtksourcecompletion.c:2255 msgid "Select first proposal when completion is shown" msgstr "在显示自动补全时，选择第一个建议" -#: ../gtksourceview/gtksourcecompletion.c:2265 +#: ../gtksourceview/gtksourcecompletion.c:2269 msgid "Show Headers" msgstr "显示头信息" -#: ../gtksourceview/gtksourcecompletion.c:2266 +#: ../gtksourceview/gtksourcecompletion.c:2270 msgid "" "Show provider headers when proposals from multiple providers are available" msgstr "在有多个提供者的建议可用时显示提供者的开头信息" -#: ../gtksourceview/gtksourcecompletion.c:2280 +#: ../gtksourceview/gtksourcecompletion.c:2284 msgid "Show Icons" msgstr "显示图标" -#: ../gtksourceview/gtksourcecompletion.c:2281 +#: ../gtksourceview/gtksourcecompletion.c:2285 msgid "Show provider and proposal icons in the completion popup" msgstr "在补全弹出菜单中显示提供者及建议的图标" -#: ../gtksourceview/gtksourcecompletion.c:2294 +#: ../gtksourceview/gtksourcecompletion.c:2298 msgid "Accelerators" msgstr "加速器" -#: ../gtksourceview/gtksourcecompletion.c:2295 +#: ../gtksourceview/gtksourcecompletion.c:2299 msgid "Number of proposal accelerators to show" msgstr "显示的建议加速器的数目" -#: ../gtksourceview/gtksourcecompletion.c:2311 +#: ../gtksourceview/gtksourcecompletion.c:2315 msgid "Auto Complete Delay" msgstr "自动补全延时" -#: ../gtksourceview/gtksourcecompletion.c:2312 +#: ../gtksourceview/gtksourcecompletion.c:2316 msgid "Completion popup delay for interactive completion" msgstr "交互式补全的补全弹出菜单延时" -#: ../gtksourceview/gtksourcecompletion.c:2327 +#: ../gtksourceview/gtksourcecompletion.c:2331 msgid "Provider Page Size" msgstr "提供者的页面大小" -#: ../gtksourceview/gtksourcecompletion.c:2328 +#: ../gtksourceview/gtksourcecompletion.c:2332 msgid "Provider scrolling page size" msgstr "提供者滚动页面大小" -#: ../gtksourceview/gtksourcecompletion.c:2343 +#: ../gtksourceview/gtksourcecompletion.c:2347 msgid "Proposal Page Size" msgstr "建议的页面大小" -#: ../gtksourceview/gtksourcecompletion.c:2344 +#: ../gtksourceview/gtksourcecompletion.c:2348 msgid "Proposal scrolling page size" msgstr "提案滚动页面大小" -#: ../gtksourceview/gtksourcecompletion.c:2689 +#: ../gtksourceview/gtksourcecompletion.c:2693 msgid "Provider" msgstr "提供者" -#: ../gtksourceview/gtksourcecompletioncontext.c:237 +#: ../gtksourceview/gtksourcecompletioncontext.c:233 #: ../gtksourceview/gtksourceview.c:306 msgid "Completion" msgstr "补全" -#: ../gtksourceview/gtksourcecompletioncontext.c:238 +#: ../gtksourceview/gtksourcecompletioncontext.c:234 msgid "The completion object to which the context belongs" msgstr "上下文属于的补全对象" #. Translators: The GtkTextIter at which the completion was invoked -#: ../gtksourceview/gtksourcecompletioncontext.c:251 +#: ../gtksourceview/gtksourcecompletioncontext.c:247 msgid "Iterator" msgstr "迭代器" -#: ../gtksourceview/gtksourcecompletioncontext.c:252 +#: ../gtksourceview/gtksourcecompletioncontext.c:248 msgid "The GtkTextIter at which the completion was invoked" msgstr "GtkTextIter，在其上调用补全" -#: ../gtksourceview/gtksourcecompletioncontext.c:264 +#: ../gtksourceview/gtksourcecompletioncontext.c:260 msgid "Activation" msgstr "动作" -#: ../gtksourceview/gtksourcecompletioncontext.c:265 +#: ../gtksourceview/gtksourcecompletioncontext.c:261 msgid "The type of activation" msgstr "动作类型" @@ -2418,15 +2494,11 @@ msgid "Info to be shown for this item" msgstr "为此条目显示的信息" -#: ../gtksourceview/gtksourcecontextengine.c:2969 -msgid "using \\C is not supported in language definitions" -msgstr "语言定义中不支持使用 \\C" - #. regex_new could fail, for instance if there are different #. * named sub-patterns with the same name or if resulting regex is #. * too long. In this case fixing lang file helps (e.g. renaming #. * subpatterns, making huge keywords use bigger prefixes, etc.) -#: ../gtksourceview/gtksourcecontextengine.c:3593 +#: ../gtksourceview/gtksourcecontextengine.c:3171 #, c-format msgid "" "Cannot create a regex for all the transitions, the syntax highlighting " @@ -2436,76 +2508,76 @@ "无法为所有的转换创建正则表达式，语法加亮进程将会比正常情况慢。\n" "错误是：%s" -#: ../gtksourceview/gtksourcecontextengine.c:4928 +#: ../gtksourceview/gtksourcecontextengine.c:4509 msgid "" "Highlighting a single line took too much time, syntax highlighting will be " "disabled" msgstr "加亮一整行花费的时间太多，语法加亮将被禁用" -#: ../gtksourceview/gtksourcecontextengine.c:6181 +#: ../gtksourceview/gtksourcecontextengine.c:5762 #, c-format msgid "context '%s' cannot contain a \\%%{...@start} command" msgstr "上下文“%s”不能包含一个 \\%%{...@start} 命令" -#: ../gtksourceview/gtksourcecontextengine.c:6343 -#: ../gtksourceview/gtksourcecontextengine.c:6432 +#: ../gtksourceview/gtksourcecontextengine.c:5923 +#: ../gtksourceview/gtksourcecontextengine.c:6012 #, c-format msgid "duplicated context id '%s'" msgstr "重复的上下文 id “%s”" -#: ../gtksourceview/gtksourcecontextengine.c:6547 -#: ../gtksourceview/gtksourcecontextengine.c:6607 +#: ../gtksourceview/gtksourcecontextengine.c:6127 +#: ../gtksourceview/gtksourcecontextengine.c:6187 #, c-format msgid "" "style override used with wildcard context reference in language '%s' in ref " "'%s'" msgstr "语言“%s”在参考“%s”中与通配符上下文引用一同使用的样式覆盖" -#: ../gtksourceview/gtksourcecontextengine.c:6621 +#: ../gtksourceview/gtksourcecontextengine.c:6201 #, c-format msgid "invalid context reference '%s'" msgstr "无效的上下文引用“%s”" -#: ../gtksourceview/gtksourcecontextengine.c:6640 -#: ../gtksourceview/gtksourcecontextengine.c:6650 +#: ../gtksourceview/gtksourcecontextengine.c:6220 +#: ../gtksourceview/gtksourcecontextengine.c:6230 #, c-format msgid "unknown context '%s'" msgstr "未知的上下文“%s”" -#: ../gtksourceview/gtksourcecontextengine.c:6750 +#: ../gtksourceview/gtksourcecontextengine.c:6330 #, c-format msgid "Missing main language definition (id = \"%s\".)" msgstr "缺少主要语言定义(id = “%s”)。" -#: ../gtksourceview/gtksourcegutter.c:549 +#: ../gtksourceview/gtksourcegutter.c:548 msgid "The gutters' GtkSourceView" msgstr "gutters 的 GtkSourceView" -#: ../gtksourceview/gtksourcegutter.c:561 +#: ../gtksourceview/gtksourcegutter.c:560 #: ../gtksourceview/gtksourcegutterrenderer.c:703 msgid "Window Type" msgstr "窗口类型" -#: ../gtksourceview/gtksourcegutter.c:562 +#: ../gtksourceview/gtksourcegutter.c:561 msgid "The gutters text window type" msgstr "gutters 文本窗口类型" -#: ../gtksourceview/gtksourcegutter.c:573 +#: ../gtksourceview/gtksourcegutter.c:572 #: ../gtksourceview/gtksourcegutterrenderer.c:479 msgid "X Padding" msgstr "X 填充" -#: ../gtksourceview/gtksourcegutter.c:574 +#: ../gtksourceview/gtksourcegutter.c:573 #: ../gtksourceview/gtksourcegutterrenderer.c:480 msgid "The x-padding" msgstr "水平填充" -#: ../gtksourceview/gtksourcegutter.c:584 +#: ../gtksourceview/gtksourcegutter.c:583 #: ../gtksourceview/gtksourcegutterrenderer.c:495 msgid "Y Padding" msgstr "Y 填充" -#: ../gtksourceview/gtksourcegutter.c:585 +#: ../gtksourceview/gtksourcegutter.c:584 #: ../gtksourceview/gtksourcegutterrenderer.c:496 msgid "The y-padding" msgstr "竖直填充" @@ -2647,24 +2719,16 @@ msgid "List of the ids of the available languages" msgstr "可用语言的 id 列表" -#: ../gtksourceview/gtksourcelanguage-parser-2.c:951 +#: ../gtksourceview/gtksourcelanguage-parser-2.c:950 #, c-format msgid "Unknown id '%s' in regex '%s'" msgstr "正则表达式“%2$s”中的未知 ID “%1$s”" -#: ../gtksourceview/gtksourcelanguage-parser-2.c:1179 +#: ../gtksourceview/gtksourcelanguage-parser-2.c:1178 #, c-format msgid "in regex '%s': backreferences are not supported" msgstr "在正则表达式“%s”中：不支持向后引用" -#: ../gtksourceview/gtksourcemark.c:140 -msgid "category" -msgstr "类别" - -#: ../gtksourceview/gtksourcemark.c:141 -msgid "The mark category" -msgstr "标记的类别" - #: ../gtksourceview/gtksourcemarkattributes.c:290 #: ../gtksourceview/gtksourcestyle.c:88 msgid "Background" @@ -2678,103 +2742,115 @@ msgid "The GIcon" msgstr "GIcon" -#: ../gtksourceview/gtksourceprintcompositor.c:445 +#: ../gtksourceview/gtksourcemark.c:140 +msgid "category" +msgstr "类别" + +#: ../gtksourceview/gtksourcemark.c:141 +msgid "The mark category" +msgstr "标记的类别" + +#: ../gtksourceview/gtksourceprintcompositor.c:442 msgid "Source Buffer" msgstr "源缓冲区" -#: ../gtksourceview/gtksourceprintcompositor.c:446 +#: ../gtksourceview/gtksourceprintcompositor.c:443 msgid "The GtkSourceBuffer object to print" msgstr "待打印的 GtkSourceBuffer 对象" -#: ../gtksourceview/gtksourceprintcompositor.c:463 +#: ../gtksourceview/gtksourceprintcompositor.c:460 #: ../gtksourceview/gtksourceview.c:344 msgid "Tab Width" msgstr "Tab 宽度" -#: ../gtksourceview/gtksourceprintcompositor.c:464 +#: ../gtksourceview/gtksourceprintcompositor.c:461 #: ../gtksourceview/gtksourceview.c:345 msgid "Width of a tab character expressed in spaces" msgstr "以空格记的 Tab 字符的宽度" -#: ../gtksourceview/gtksourceprintcompositor.c:484 +#: ../gtksourceview/gtksourceprintcompositor.c:481 msgid "Wrap Mode" msgstr "自动换行模式" -#: ../gtksourceview/gtksourceprintcompositor.c:485 +#: ../gtksourceview/gtksourceprintcompositor.c:482 msgid "" "Whether to wrap lines never, at word boundaries, or at character boundaries." msgstr "是否自动换行，从不、在词边界或在字符边界。" -#: ../gtksourceview/gtksourceprintcompositor.c:506 +#: ../gtksourceview/gtksourceprintcompositor.c:503 msgid "Whether to print the document with highlighted syntax" msgstr "是否以语法加亮方式打印文档" -#: ../gtksourceview/gtksourceprintcompositor.c:527 +#: ../gtksourceview/gtksourceprintcompositor.c:524 msgid "Print Line Numbers" msgstr "打印行号" -#: ../gtksourceview/gtksourceprintcompositor.c:528 +#: ../gtksourceview/gtksourceprintcompositor.c:525 msgid "Interval of printed line numbers (0 means no numbers)" msgstr "待打印行号的区间(0代表无行号)" -#: ../gtksourceview/gtksourceprintcompositor.c:550 +#: ../gtksourceview/gtksourceprintcompositor.c:547 msgid "Print Header" msgstr "打印页眉" -#: ../gtksourceview/gtksourceprintcompositor.c:551 +#: ../gtksourceview/gtksourceprintcompositor.c:548 msgid "Whether to print a header in each page" msgstr "是否打印每页页眉" -#: ../gtksourceview/gtksourceprintcompositor.c:573 +#: ../gtksourceview/gtksourceprintcompositor.c:570 msgid "Print Footer" msgstr "打印页脚" -#: ../gtksourceview/gtksourceprintcompositor.c:574 +#: ../gtksourceview/gtksourceprintcompositor.c:571 msgid "Whether to print a footer in each page" msgstr "是否打印每页页脚" -#: ../gtksourceview/gtksourceprintcompositor.c:596 +#: ../gtksourceview/gtksourceprintcompositor.c:593 msgid "Body Font Name" msgstr "主体字体名" -#: ../gtksourceview/gtksourceprintcompositor.c:597 +#: ../gtksourceview/gtksourceprintcompositor.c:594 msgid "Name of the font to use for the text body (e.g. \"Monospace 10\")" msgstr "文本主体使用的字体名(如 “Monospace 10”)" -#: ../gtksourceview/gtksourceprintcompositor.c:620 +#: ../gtksourceview/gtksourceprintcompositor.c:617 msgid "Line Numbers Font Name" msgstr "行号字体名" -#: ../gtksourceview/gtksourceprintcompositor.c:621 +#: ../gtksourceview/gtksourceprintcompositor.c:618 msgid "Name of the font to use for the line numbers (e.g. \"Monospace 10\")" msgstr "行号使用的字体名(如 “Monospace 10”)" -#: ../gtksourceview/gtksourceprintcompositor.c:644 +#: ../gtksourceview/gtksourceprintcompositor.c:641 msgid "Header Font Name" msgstr "页眉字体名" -#: ../gtksourceview/gtksourceprintcompositor.c:645 +#: ../gtksourceview/gtksourceprintcompositor.c:642 msgid "Name of the font to use for the page header (e.g. \"Monospace 10\")" msgstr "页眉使用的字体名(如 “Monospace 10”)" -#: ../gtksourceview/gtksourceprintcompositor.c:668 +#: ../gtksourceview/gtksourceprintcompositor.c:665 msgid "Footer Font Name" msgstr "页脚字体名" -#: ../gtksourceview/gtksourceprintcompositor.c:669 +#: ../gtksourceview/gtksourceprintcompositor.c:666 msgid "Name of the font to use for the page footer (e.g. \"Monospace 10\")" msgstr "页脚使用的字体名(如 “Monospace 10”)" -#: ../gtksourceview/gtksourceprintcompositor.c:685 +#: ../gtksourceview/gtksourceprintcompositor.c:682 msgid "Number of pages" msgstr "页数" -#: ../gtksourceview/gtksourceprintcompositor.c:686 +#: ../gtksourceview/gtksourceprintcompositor.c:683 msgid "" "The number of pages in the document (-1 means the document has not been " "completely paginated)." msgstr "文档的页数(-1代表文档未被完整分页)。" +#: ../gtksourceview/gtksourceregex.c:125 +msgid "using \\C is not supported in language definitions" +msgstr "语言定义中不支持使用 \\C" + #: ../gtksourceview/gtksourcestyle.c:80 msgid "Line background" msgstr "行背景" @@ -2859,23 +2935,23 @@ msgid "Whether strikethrough attribute is set" msgstr "是否设定删除线属性" -#: ../gtksourceview/gtksourcestylescheme.c:221 -#: ../gtksourceview/gtksourcestylescheme.c:222 +#: ../gtksourceview/gtksourcestylescheme.c:212 +#: ../gtksourceview/gtksourcestylescheme.c:213 msgid "Style scheme id" msgstr "样式方案 id" -#: ../gtksourceview/gtksourcestylescheme.c:234 -#: ../gtksourceview/gtksourcestylescheme.c:235 +#: ../gtksourceview/gtksourcestylescheme.c:225 +#: ../gtksourceview/gtksourcestylescheme.c:226 msgid "Style scheme name" msgstr "样式方案名称" -#: ../gtksourceview/gtksourcestylescheme.c:247 -#: ../gtksourceview/gtksourcestylescheme.c:248 +#: ../gtksourceview/gtksourcestylescheme.c:238 +#: ../gtksourceview/gtksourcestylescheme.c:239 msgid "Style scheme description" msgstr "样式方案描述" -#: ../gtksourceview/gtksourcestylescheme.c:260 -#: ../gtksourceview/gtksourcestylescheme.c:261 +#: ../gtksourceview/gtksourcestylescheme.c:251 +#: ../gtksourceview/gtksourcestylescheme.c:252 msgid "Style scheme filename" msgstr "样式方案文件名" @@ -2997,7 +3073,7 @@ msgid "Set if and how the spaces should be visualized" msgstr "设定是否将空格可见化" -#: ../gtksourceview/gtksourceview-i18n.c:74 +#: ../gtksourceview/gtksourceview-i18n.c:72 msgid "translator-credits" msgstr "" "Funda Wang , 2003\n" diff -Nru gtksourceview3-3.3.5/README gtksourceview3-3.4.0/README --- gtksourceview3-3.3.5/README 2012-03-19 22:38:13.000000000 +0000 +++ gtksourceview3-3.4.0/README 2012-03-26 17:11:33.000000000 +0000 @@ -1,7 +1,7 @@ General Information =================== -This is version 3.3.5 of GtkSourceView. +This is version 3.4.0 of GtkSourceView. GtkSourceView is a text widget that extends the standard gtk+ 3.x text widget GtkTextView. @@ -32,8 +32,8 @@ Simple install procedure: - % tar Jxf gtksourceview-3.3.5.tar.xz # unpack the sources - % cd gtksourceview-3.3.5 # change to the toplevel directory + % tar Jxf gtksourceview-3.4.0.tar.xz # unpack the sources + % cd gtksourceview-3.4.0 # change to the toplevel directory % ./configure # run the `configure' script % make # build gtksourceview [ Become root if necessary ]