From: John Darrington Date: Tue, 7 Apr 2009 11:30:23 +0000 (+0800) Subject: Merge commit 'origin/stable' X-Git-Tag: v0.7.3~176^2 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=7fbfc32fc3c636959b0a25b3e76609f86519e84a;hp=da299bd9871b178336a440c6ac53aebc3cea672e Merge commit 'origin/stable' Conflicts: src/language/stats/crosstabs.q src/language/stats/examine.q src/language/stats/frequencies.q src/language/stats/oneway.q tests/command/examine-extremes.sh tests/command/examine.sh --- diff --git a/.gitignore b/.gitignore index c29aff49..b50c6a37 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,11 @@ reloc-ldflags stamp-h1 texinfo.tex gitlog-to-changelog +*~ +*.o +*.lo +*.a +*.dirstamp +*.deps +*.la +*.libs diff --git a/AUTHORS b/AUTHORS index 12b25ab7..af7e9075 100644 --- a/AUTHORS +++ b/AUTHORS @@ -14,6 +14,7 @@ to other modules. including lib/gslextras and the linear regression features. Jason is also an important contributor to GSL, which is used by PSPP. + We also thank past contributors: * John Williams wrote an initial draft of the T-TEST procedure. @@ -21,3 +22,8 @@ We also thank past contributors: * Michael Kiefte contributed bug fixes and other enhancements. * Patrick Kobly contributed bug fixes and other enhancements. + +* Rob van Son wrote the original version of the routine for + calculation of the significance of the Wilcoxon matched pairs signed + rank statistic used by the NPAR TEST command. + diff --git a/INSTALL b/INSTALL index ea43342e..d3a469cf 100644 --- a/INSTALL +++ b/INSTALL @@ -50,9 +50,6 @@ use the GUI, you must run `configure' with --without-gui. * GTK+ (http://www.gtk.org/), version 2.12.0 or later. - * libglade (http://www.jamesh.id.au/software/libglade/), version - 2.6 or later. - Installing the following packages will allow your PSPP binary to read Gnumeric files. @@ -112,6 +109,10 @@ release. available. The most common of these are listed under "Optional Features", below. + It is best to build and install PSPP in directories whose names do + not contain unusual characters such as spaces or single-quotes, due + to limitations of the tools involved in the build process. + If you installed some of the libraries that PSPP uses in a non-standard location (on many systems, anywhere other than /usr), you may need to provide some special flags to `configure' @@ -148,8 +149,9 @@ release. 4. Type `make install' to install the programs and any data files and documentation. Ordinarily you will need root permissions to - do this; if you cannot get root permissions, see "Installation - Names", below. + do this. The "su" and "sudo" commands are common ways to obtain + root permissions. If you cannot get root permissions, see + "Installation Names", below. 5. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the @@ -232,7 +234,12 @@ Optional Features of libraries are detected. Use of this option is not recommended. If you use it, some features may be missing and the build may fail with obscure error messages. - + +`--enable-relocatable' + This option is useful for building a package which can be installed + into an arbitrary directory and freely copied to any other directory. + If you use this option, you will probably want to install the pspp + with a command similar to "make install DESTDIR=". Defining Variables ================== diff --git a/Makefile.am b/Makefile.am index ab32f996..f606cbf1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,13 +32,15 @@ EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el CLEANFILES = ACLOCAL_AMFLAGS = -I m4 -I gl/m4 noinst_LIBRARIES= +noinst_LTLIBRARIES= noinst_PROGRAMS= check_PROGRAMS= bin_PROGRAMS= DIST_HOOKS = +INSTALL_DATA_HOOKS = +UNINSTALL_DATA_HOOKS = PHONY = -DIST_HOOKS += generate-changelog generate-changelog: if test -d $(top_srcdir)/.git; then \ $(top_srcdir)/gitlog-to-changelog --since=2008-07-27 \ @@ -47,6 +49,9 @@ generate-changelog: mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi +DIST_HOOKS += generate-changelog + + include $(top_srcdir)/lib/automake.mk include $(top_srcdir)/doc/automake.mk include $(top_srcdir)/config/automake.mk @@ -59,6 +64,19 @@ if WITH_GUI_TOOLS include $(top_srcdir)/glade/automake.mk endif -PHONY += $(DIST_HOOKS) -dist-hook: $(DIST_HOOKS) +if WITH_PERL_MODULE +include $(top_srcdir)/perl-module/automake.mk +endif + +PHONY += $(DIST_HOOKS) $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) + .PHONY: $(PHONY) + +dist-hook: $(DIST_HOOKS) + +install-data-hook: $(INSTALL_DATA_HOOKS) + +uninstall-hook: $(UNINSTALL_DATA_HOOKS) + + + diff --git a/NEWS b/NEWS index bff9a787..a83f8310 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,27 @@ PSPP NEWS -- history of user-visible changes. -Time-stamp: <2008-10-09 21:32:07 blp> -Copyright (C) 1996-9, 2000, 2008 Free Software Foundation, Inc. +Time-stamp: <2009-02-05 20:31:51 blp> +Copyright (C) 1996-9, 2000, 2008, 2009 Free Software Foundation, Inc. See the end for copying conditions. Please send PSPP bug reports to bug-gnu-pspp@gnu.org. +Changes from 0.7.1 to 0.7.2: + + * Updated Perl module interface. + +Changes from 0.7.0 to 0.7.1: + + * Added a perl module to facilitate reading and writing of pspp system + files from perl programs. + +Changes from 0.6.1 to 0.7.0: + + * Custom variable and data file attributes are now supported. + Commands VARIABLE ATTRIBUTE and DATAFILE ATTRIBUTE have been added + for setting and clear attributes. Support for attributes has also + been added to commands that read and write system files, such as + SAVE and GET, as well as to the DISPLAY command. + Changes from 0.6.0 to 0.6.1: * Statistical bug fixes: diff --git a/Smake b/Smake index 5a76b3c1..4c8d83bc 100644 --- a/Smake +++ b/Smake @@ -5,6 +5,7 @@ GNULIB = ../gnulib GNULIB_TOOL = $(GNULIB)/gnulib-tool GNULIB_MODULES = \ + argp \ assert \ byteswap \ c-ctype \ @@ -112,6 +113,7 @@ gettextize: po/POTFILES.in: for f in `find src $ -name \*.[qc] -o -name \*.glade $ ! -name .\* -print` ; do \ if test $$f = src/libpspp/version.c; then continue; fi; \ + if test $$f = src/ui/gui/psppire-marshal.c; then continue; fi; \ if test -e `dirname $$f`/`basename $$f .c`.q ; then continue; fi; \ echo $$f ; \ done | sort | uniq > $@.tmp diff --git a/configure.ac b/configure.ac index 3284ec81..7e7a4c60 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. AC_PREREQ(2.60) -AC_INIT([pspp],[0.6.1],[bug-gnu-pspp@gnu.org]) +AC_INIT([pspp],[0.7.2],[bug-gnu-pspp@gnu.org]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE @@ -15,6 +15,7 @@ AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL PKG_PROG_PKG_CONFIG +m4_pattern_forbid([PKG_CHECK_MODULES]) AC_ARG_ENABLE( anachronistic-dependencies, @@ -49,15 +50,10 @@ AC_ARG_WITH( [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])]) required_gtk_version=2.12 -if test x"$enable_anachronistic_dependencies" = x"yes" ; then - required_gtk_version=2.8.20 -fi if test x"$with_gui" != x"no" ; then PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,, [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])]) - PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,, - [PSPP_REQUIRED_PREREQ([libglade 2.0 v2.6.0 or later (or use --without-gui)])]) fi AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no") @@ -125,12 +121,14 @@ AM_CONDITIONAL(GNM_SUPPORT, test x"$gnm_support" = x"yes") AC_ARG_WITH( gui_tools, - [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools])]) + [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools. For DEVELOPERS only! There is no reason why users will need this flag.])]) if test x"$with_gui_tools" = x"yes" ; then PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0) fi AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes") +AM_CONDITIONAL(WITH_PERL_MODULE, test x"$cross_compiling" != x"yes") + AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])]) PSPP_GSL_NEEDS_FGNU89_INLINE diff --git a/doc/automake.mk b/doc/automake.mk index 3445379a..67c2d83c 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -11,6 +11,7 @@ doc_pspp_TEXINFOS = doc/version.texi \ doc/data-selection.texi \ doc/expressions.texi \ doc/files.texi \ + doc/combining.texi \ doc/flow-control.texi \ doc/function-index.texi \ doc/installing.texi \ @@ -32,6 +33,7 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \ doc/dev/concepts.texi \ doc/dev/syntax.texi \ doc/dev/data.texi \ + doc/dev/i18n.texi \ doc/dev/output.texi \ doc/dev/system-file-format.texi \ doc/dev/portable-file-format.texi \ @@ -44,22 +46,14 @@ doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl @$(MKDIR_P) doc @PERL@ $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@ -# It seems that recent versions of yelp, upon which the gui relies to display the reference -# manual, are broken. It only works on compressed info files. So we must compress them. -if WITHGUI -YELP_CHECK = yelp-check -else -YELP_CHECK = -endif -install-data-hook:: $(YELP_CHECK) - for ifile in $(DESTDIR)$(infodir)/pspp.info-[0-9] \ - $(DESTDIR)$(infodir)/pspp.info ; do \ - gzip -f $$ifile ; \ - done +doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS) + @$(MKDIR_P) doc + $(MAKEINFO) --docbook -I $(top_srcdir) $< -o $@ + $(SED) -i -e 's/Time-&-Date/Time-\&-Date/g' $@ + +docbookdir = $(docdir) +docbook_DATA = doc/pspp.xml -uninstall-hook:: - rm -f $(DESTDIR)$(infodir)/pspp.info-[0-9].gz - rm -f $(DESTDIR)$(infodir)/pspp.info.gz EXTRA_DIST += doc/OChangeLog -CLEANFILES += pspp-dev.dvi +CLEANFILES += pspp-dev.dvi $(docbook_DATA) diff --git a/doc/bugs.texi b/doc/bugs.texi index 86208d92..e597a82c 100644 --- a/doc/bugs.texi +++ b/doc/bugs.texi @@ -8,15 +8,8 @@ visit PSPP's project webpage at @uref{https://savannah.gnu.org/projects/pspp}. You can also submit your own bug report there: click on ``Bugs,'' then on ``Submit a Bug,'' and fill out the form. Alternatively, PSPP bug reports may be -sent by email to -@ifinfo -. -@end ifinfo -@iftex -@code{}. -@end iftex +sent by email to @email{bug-gnu-pspp@@gnu.org}. For known bugs in individual language features, see the documentation for that feature. -@setfilename ignored diff --git a/doc/combining.texi b/doc/combining.texi new file mode 100644 index 00000000..a77c3b07 --- /dev/null +++ b/doc/combining.texi @@ -0,0 +1,336 @@ +@node Combining Data Files +@chapter Combining Data Files + +This chapter describes commands that allow data from system files, +portable file, scratch files, and the active file to be combined to +form a new active file. These commands can combine data files in the +following ways: + +@itemize +@item +@cmd{ADD FILES} interleaves or appends the cases from each input file. +It is used with input files that have variables in common, but +distinct sets of cases. + +@item +@cmd{MATCH FILES} adds the data together in cases that match across +multiple input files. It is used with input files that have cases in +common, but different information about each case. + +@item +@cmd{UPDATE} updates a master data file from data in a set of +transaction files. Each case in a transaction data file modifies a +matching case in the primary data file, or it adds a new case if no +matching case can be found. +@end itemize + +These commands share the majority of their syntax, which is described +in the following section, followed by one section for each command +that describes its specific syntax and semantics. + +@menu +* Combining Files Common Syntax:: +* ADD FILES:: Interleave cases from multiple files. +* MATCH FILES:: Merge cases from multiple files. +* UPDATE:: Update cases using transactional data. +@end menu + +@node Combining Files Common Syntax +@section Common Syntax + +@display +Per input file: + /FILE=@{*,'file-name'@} + [/RENAME=(src_names=target_names)@dots{}] + [/IN=var_name] + [/SORT] + +Once per command: + /BY var_list[(@{D|A@})] [var_list[(@{D|A@}]]@dots{} + [/DROP=var_list] + [/KEEP=var_list] + [/FIRST=var_name] + [/LAST=var_name] + [/MAP] +@end display + +This section describes the syntactical features in common among the +@cmd{ADD FILES}, @cmd{MATCH FILES}, and @cmd{UPDATE} commands. The +following sections describe details specific to each command. + +Each of these commands reads two or more input files and combines +them. The command's output becomes the new active file. The input +files are not changed on disk. + +The syntax of each command begins with a specification of the files to +be read as input. For each input file, specify FILE with a system, +portable, or scratch file's name as a string or a file handle +(@pxref{File Handles}), or specify an asterisk (@samp{*}) to use the +active file as input. Use of portable or scratch files on FILE is a +PSPP extension. + +At least two FILE subcommands must be specified. If the active file +is used as an input source, then @cmd{TEMPORARY} must not be in +effect. + +Each FILE subcommand may be followed by any number of RENAME +subcommands that specify a parenthesized group or groups of variable +names as they appear in the input file, followed by those variables' +new names, separated by an equals sign (@samp{=}), +e.g. @samp{/RENAME=(OLD1=NEW1)(OLD2=NEW2)}. To rename a single +variable, the parentheses may be omitted: @samp{/RENAME=OLD=NEW}. +Within a parenthesized group, variables are renamed simultaneously, so +that @samp{/RENAME=(A B=B A)} exchanges the names of variables A and +B. Otherwise, renaming occurs in left-to-right order. + +Each FILE subcommand may optionally be followed by a single IN +subcommand, which creates a numeric variable with the specified name +and format F1.0. The IN variable takes value 1 in an output case if +the given input file contributed to that output case, and 0 otherwise. +The DROP, KEEP, and RENAME subcommands have no effect on IN variables. + +If BY is used (see below), the SORT keyword must be specified after a +FILE if that input file is not already sorted on the BY variables. +When SORT is specified, PSPP sorts the input file's data on the BY +variables before it applies it to the command. When SORT is used, BY +is required. SORT is a PSPP extension. + +PSPP merges the dictionaries of all of the input files to form the new +active file dictionary, like so: + +@itemize @bullet +@item +The new active file's variables are the union of all the input files' +variables, matched based on their name. When a single input file +contains a variable with a given name, the output file will contain +exactly that variable. When more than one input file contains a +variable with a given name, those variables must all have the same +type (numeric or string) and, for string variables, the same width. +Variables are matched after renaming with the RENAME subcommand. +Thus, RENAME can be used to resolve conflicts. + +@item +The variable label for each output variable is taken from the first +specified input file that has a variable label for that variable, and +similarly for value labels and missing values. + +@item +The new active file's file label (@pxref{FILE LABEL}) is that of the +first specified FILE that has a file label. + +@item +The new active file's documents (@pxref{DOCUMENT}) are the +concatenation of all the input files' documents, in the order in which +the FILE subcommands are specified. + +@item +If all of the input files are weighted on the same variable, then the +new active file is weighted on that variable. Otherwise, the new +active file is not weighted. +@end itemize + +The remaining subcommands apply to the output file as a whole, rather +than to individual input files. They must be specified at the end of +the command specification, following all of the FILE and related +subcommands. The most important of these subcommands is BY, which +specifies a set of one or more variables that may be used to find +corresponding cases in each of the input files. The variables +specified on BY must be present in all of the input files. +Furthermore, if any of the input files are not sorted on the BY +variables, then SORT must be specified for those input files. + +The variables listed on BY may include (A) or (D) annotations to +specify ascending or descending sort order. @xref{SORT CASES}, for +more details on this notation. Adding (A) or (D) to the BY subcommand +specification is a PSPP extension. + +The DROP subcommand can be used to specify a list of variables to +exclude from the output. By contrast, the KEEP subcommand can be used +to specify variables to include in the output; all variables not +listed are dropped. DROP and KEEP are executed in left-to-right order +and may be repeated any number of times. DROP and KEEP do not affect +variables created by the IN, FIRST, and LAST subcommands, which are +always included in the new active file, but they can be used to drop +BY variables. + +The FIRST and LAST subcommands are optional. They may only be +specified on @cmd{MATCH FILES} and @cmd{ADD FILES}, and only when BY +is used. FIRST and LIST each adds a numeric variable to the new +active file, with the name given as the subcommand's argument and F1.0 +print and write formats. The value of the FIRST variable is 1 in the +first output case with a given set of values for the BY variables, and +0 in other cases. Similarly, the LAST variable is 1 in the last case +with a given of BY values, and 0 in other cases. + +When any of these commands creates an output case, variables that are +only in files that are not present for the current case are set to the +system-missing value for numeric variables or spaces for string +variables. + +@node ADD FILES +@section ADD FILES +@vindex ADD FILES + +@display +ADD FILES + +Per input file: + /FILE=@{*,'file-name'@} + [/RENAME=(src_names=target_names)@dots{}] + [/IN=var_name] + [/SORT] + +Once per command: + [/BY var_list[(@{D|A@})] [var_list[(@{D|A@})]@dots{}]] + [/DROP=var_list] + [/KEEP=var_list] + [/FIRST=var_name] + [/LAST=var_name] + [/MAP] +@end display + +@cmd{ADD FILES} adds cases from multiple input files. The output, +which replaces the active file, consists all of the cases in all of +the input files. + +ADD FILES shares the bulk of its syntax with other PSPP commands for +combining multiple data files. @xref{Combining Files Common Syntax}, +above, for an explanation of this common syntax. + +When BY is not used, the output of ADD FILES consists of all the cases +from the first input file specified, followed by all the cases from +the second file specified, and so on. When BY is used, the output is +additionally sorted on the BY variables. + +When ADD FILES creates an output case, variables that are not part of +the input file from which the case was drawn are set to the +system-missing value for numeric variables or spaces for string +variables. + +@node MATCH FILES +@section MATCH FILES +@vindex MATCH FILES + +@display +MATCH FILES + +Per input file: + /@{FILE,TABLE@}=@{*,'file-name'@} + [/RENAME=(src_names=target_names)@dots{}] + [/IN=var_name] + [/SORT] + +Once per command: + /BY var_list[(@{D|A@}] [var_list[(@{D|A@})]@dots{}] + [/DROP=var_list] + [/KEEP=var_list] + [/FIRST=var_name] + [/LAST=var_name] + [/MAP] +@end display + +@cmd{MATCH FILES} merges sets of corresponding cases in multiple +input files into single cases in the output, combining their data. + +MATCH FILES shares the bulk of its syntax with other PSPP commands for +combining multiple data files. @xref{Combining Files Common Syntax}, +above, for an explanation of this common syntax. + +How MATCH FILES matches up cases from the input files depends on +whether BY is specified: + +@itemize @bullet +@item +If BY is not used, MATCH FILES combines the first case from each input +file to produce the first output case, then the second case from each +input file for the second output case, and so on. If some input files +have fewer cases than others, then the shorter files do not contribute +to cases output after their input has been exhausted. + +@item +If BY is used, MATCH FILES combines cases from each input file that +have identical values for the BY variables. + +When BY is used, TABLE subcommands may be used to introduce @dfn{table +lookup file}. TABLE has same syntax as FILE, and the RENAME, IN, and +SORT subcommands may follow a TABLE in the same way as a FILE. +Regardless of the number of TABLEs, at least one FILE must specified. +Table lookup files are treated in the same way as other input files +for most purposes and, in particular, table lookup files must be +sorted on the BY variables or the SORT subcommand must be specified +for that TABLE. + +Cases in table lookup files are not consumed after they have been used +once. This means that data in table lookup files can correspond to +any number of cases in FILE input files. Table lookup files are +analogous to lookup tables in traditional relational database systems. + +If a table lookup file contains more than one case with a given set of +BY variables, only the first case is used. +@end itemize + +When MATCH FILES creates an output case, variables that are only in +files that are not present for the current case are set to the +system-missing value for numeric variables or spaces for string +variables. + +@node UPDATE +@section UPDATE +@vindex UPDATE + +@display +UPDATE + +Per input file: + /FILE=@{*,'file-name'@} + [/RENAME=(src_names=target_names)@dots{}] + [/IN=var_name] + [/SORT] + +Once per command: + /BY var_list[(@{D|A@})] [var_list[(@{D|A@})]]@dots{} + [/DROP=var_list] + [/KEEP=var_list] + [/MAP] +@end display + +@cmd{UPDATE} updates a @dfn{master file} by applying modifications +from one or more @dfn{transaction files}. + +UPDATE shares the bulk of its syntax with other PSPP commands for +combining multiple data files. @xref{Combining Files Common Syntax}, +above, for an explanation of this common syntax. + +At least two FILE subcommands must be specified. The first FILE +subcommand names the master file, and the rest name transaction files. +Every input file must either be sorted on the variables named on the +BY subcommand, or the SORT subcommand must be used just after the FILE +subcommand for that input file. + +UPDATE uses the variables specified on the BY subcommand, which is +required, to attempt to match each case in a transaction file with a +case in the master file: + +@itemize @bullet +@item +When a match is found, then the values of the variables present in the +transaction file replace those variable's values in the new active +file. If there are matching cases in more than more transaction file, +PSPP applies the replacements from the first transaction file, then +from the second transaction file, and so on. Similarly, if a single +transaction file has cases with duplicate BY values, then those are +applied in order to the master file. + +When a variable in a transaction file has a missing value or a string +variable's value is all blanks, that value is never used to update the +master file. + +@item +If a case in the master file has no matching case in any transaction +file, then it is copied unchanged to the output. + +@item +If a case in a transaction file has no matching case in the master +file, then it causes a new case to be added to the output, initialized +from the values in the transaction file. +@end itemize diff --git a/doc/command-index.texi b/doc/command-index.texi index c53b1db6..d26f9074 100644 --- a/doc/command-index.texi +++ b/doc/command-index.texi @@ -1,4 +1,3 @@ @node Command Index @chapter Command Index @printindex vr -@setfilename ignored diff --git a/doc/concept-index.texi b/doc/concept-index.texi index 742488e4..29d8a624 100644 --- a/doc/concept-index.texi +++ b/doc/concept-index.texi @@ -1,4 +1,3 @@ @node Concept Index @chapter Concept Index @printindex cp -@setfilename ignored diff --git a/doc/data-io.texi b/doc/data-io.texi index b6a3a6d2..0b9583b0 100644 --- a/doc/data-io.texi +++ b/doc/data-io.texi @@ -25,6 +25,7 @@ actually be read until a procedure is executed. @menu * BEGIN DATA:: Embed data within a syntax file. * CLOSE FILE HANDLE:: Close a file handle. +* DATAFILE ATTRIBUTE:: Set custom attributes on data files. * DATA LIST:: Fundamental data reading command. * END CASE:: Output the current case. * END FILE:: Terminate the current input program. @@ -89,6 +90,52 @@ DATA} and @cmd{END DATA}, cannot be closed. Attempts to close it with @cmd{CLOSE FILE HANDLE} is a PSPP extension. +@node DATAFILE ATTRIBUTE +@section DATAFILE ATTRIBUTE +@vindex DATAFILE ATTRIBUTE + +@display +DATAFILE ATTRIBUTE + ATTRIBUTE=name('value') [name('value')]@dots{} + ATTRIBUTE=name@b{[}index@b{]}('value') [name@b{[}index@b{]}('value')]@dots{} + DELETE=name [name]@dots{} + DELETE=name@b{[}index@b{]} [name@b{[}index@b{]}]@dots{} +@end display + +@cmd{DATAFILE ATTRIBUTE} adds, modifies, or removes user-defined +attributes associated with the active file. Custom data file +attributes are not interpreted by PSPP, but they are saved as part of +system files and may be used by other software that reads them. + +Use the ATTRIBUTE subcommand to add or modify a custom data file +attribute. Specify the name of the attribute as an identifier +(@pxref{Tokens}), followed by the desired value, in parentheses, as a +quoted string. Attribute names that begin with @code{$} are reserved +for PSPP's internal use, and attribute names that begin with @code{@@} +or @code{$@@} are not displayed by most PSPP commands that display +other attributes. Other attribute names are not treated specially. + +Attributes may also be organized into arrays. To assign to an array +element, add an integer array index enclosed in square brackets +(@code{[} and @code{]}) between the attribute name and value. Array +indexes start at 1, not 0. An attribute array that has a single +element (number 1) is not distinguished from a non-array attribute. + +Use the DELETE subcommand to delete an attribute. Specify an +attribute name by itself to delete an entire attribute, including all +array elements for attribute arrays. Specify an attribute name +followed by an array index in square brackets to delete a single +element of an attribute array. In the latter case, all the array +elements numbered higher than the deleted element are shifted down, +filling the vacated position. + +To associate custom attributes with particular variables, instead of +with the entire active file, use @cmd{VARIABLE ATTRIBUTE} (@pxref{VARIABLE ATTRIBUTE}) instead. + +@cmd{DATAFILE ATTRIBUTE} takes effect immediately. It is not affected +by conditional and looping structures such as @cmd{DO IF} or +@cmd{LOOP}. + @node DATA LIST @section DATA LIST @vindex DATA LIST @@ -1095,4 +1142,3 @@ specified output format, whereas @cmd{WRITE} outputs the system-missing value as a field filled with spaces. Binary formats are an exception. @end itemize -@setfilename ignored diff --git a/doc/data-selection.texi b/doc/data-selection.texi index e7a12853..04269f32 100644 --- a/doc/data-selection.texi +++ b/doc/data-selection.texi @@ -264,4 +264,3 @@ the next procedure (@pxref{TEMPORARY}). @cmd{WEIGHT} does not cause cases in the active file to be replicated in memory. -@setfilename ignored diff --git a/doc/dev/i18n.texi b/doc/dev/i18n.texi new file mode 100644 index 00000000..836ff810 --- /dev/null +++ b/doc/dev/i18n.texi @@ -0,0 +1,134 @@ +@node Internationalisation +@chapter Internationalisation + +Internationalisation in pspp is complicated. +The most annoying aspect is that of character-encoding. +Currently, pspp does not fully deal with the issues. +This chapter attempts to describe the problems and current ways +in which they are addressed. + + +@section The working locales +Pspp has three ``working'' locales: + +@itemize +@item The local of the user interface. +@item The local of the output. +@item The local of the data. +@end itemize + +Each of these locales may, at different times take +separate (or identical) values. +So for example, a French statistician can use pspp to prepare a report +in the English language, using +a datafile which has been created by a Japanese researcher hence +uses a Japanese character set. + +It's rarely, if ever, necessary to interrogate the system to find out +the values of the 3 locales. +However it's important to be aware of the source (destination) locale +when reading (writing) string data. +When transfering data between a source and a destination, the appropriate +recoding must be performed. + + +@subsection The user interface locale +This is the locale which is visible to the person using pspp. +Error messages and confidence indications are written in this locale. +For example ``Cannot open file'' will be written in the user interface locale. + +This locale is set from the environment of the user who starts pspp@{ire@} or +from the system locale if not set. + +@subsection The output locale +This locale is the one that should be visible to the person reading a +report generated by pspp. Non-data related strings (Eg: ``Page number'', +``Standard Deviation'' etc.) will appear in this locale. + +@subsection The data locale +This locale is the one associated with the data being analysed with pspp. +The only important aspect of this locale is the character encoding. +@footnote {It might also be desirable for the LC_COLLATE category to be used for the purposes of sorting data.} +Any string data stored in a @union{value} will be encoded in the character set +of the data locale. + +The data locale defaults to the locale of the user who starts pspp@{ire@}. +Spss has a @cmd{SET LOCALE} command (not currently supported in pspp) which +can be used to specify the character encoding of the data locale. + + +@section System files +@file{*.sav} files contain a field which is supposed to identify the encoding +of the data they contain (@pxref{Machine Integer Info Record}). +This field is currently unused by Pspp. +Probably, would be appropriate to set the data locale from this field when +reading a new data file, and set it back to the default value +upon a @cmd{NEW FILE} command. +However, many +files produced by early versions of spss set this to ``2'' (ASCII) regardless +of the encoding of the data. + + +@section GUI +The psppire graphic user interface is written using the Gtk+ api, for which +all strings must be encoded in UTF8. +All strings passed to the Gtk+/Glib library functions must be UTF-8 encoded +otherwise errors will occur. +Thus, for the purposes of the programming psppire, the user interface locale +should be assumed to be UTF8, even if setlocale and/or nl_langinfo +indicates otherwise. + + +@section Existing locale handling functions +The major aspect of locale handling which the programmer has to consider is +that of character encoding. + +The following function is used to recode strings: + +@deftypefun char * recode_string (enum conv_id @var{how}, const char *@var{text}, int @var{len}); +Converts the string @var{text} to a new encoding according to @var{how}. +@var{How} can (currently) take the values @code{CONV_PSPP_TO_UTF8}, @code{CONV_SYSTEM_TO_PSPP} or @code{CONV_UTF8_TO_PSPP} @footnote{The label ``_PSPP'' ought to be changed to ``_DATA''}. +If @var{len} is not -1, then it must be the number of bytes in @var{text}. +It is the caller's responsibility to free the returned string when no +longer required. +@end deftypefun + + +For example, in order to display a string variable's value in a label widget in the psppire gui one would use code similar to +@example + +struct variable *var = /* assigned from somewhere */ +struct case c = /* from somewhere else */ + +const union value *val = case_data (&c, var); + +char *utf8string = recode_string (CONV_PSPP_TO_UTF8, val->s, + var_get_width (var)); + +GtkWidget *entry = gtk_entry_new(); +gtk_entry_set_text (entry, utf8string); +gtk_widget_show (entry); + +free (utf8string); + +@end example + + + +@section Quirks +For historical reasons, not all locale handling follows posix conventions. +This makes it difficult (impossible?) to elegantly handle the issues. +For example, it would make sense for the gui's datasheet to display +numbers formatted according to the LC_NUMERIC category of the data locale. +Instead however there is the @func{data_out} function +(@pxref{Obtaining Properties of Format Types}) which uses the +@func{settings_get_decimal_char} function instead of the decimal separator +of the locale. Similarly, formatting of monetary values is displayed +in a pspp/spss specific fashion instead of using the LC_MONETARY category. + + + +@c LocalWords: pspp itemize Eg LC Spss cmd sav pxref spss GUI psppire Gtk api +@c LocalWords: UTF gtk setlocale nl langinfo deftypefun enum conv var const +@c LocalWords: int len gui struct val utf GtkWidget posix gui's datasheet +@c LocalWords: func diff --git a/doc/dev/system-file-format.texi b/doc/dev/system-file-format.texi index 70fa385c..3e764c8c 100644 --- a/doc/dev/system-file-format.texi +++ b/doc/dev/system-file-format.texi @@ -96,6 +96,7 @@ Each type of record is described separately below. * Variable Display Parameter Record:: * Long Variable Names Record:: * Very Long String Record:: +* Data File and Variable Attributes Records:: * Miscellaneous Informational Records:: * Dictionary Termination Record:: * Data Record:: @@ -791,6 +792,85 @@ After the last tuple, there may be a single byte 00, or @{00, 09@}. The total length is @code{count} bytes. @end table +@node Data File and Variable Attributes Records +@section Data File and Variable Attributes Records + +The data file and variable attributes records represent custom +attributes for the system file or for individual variables in the +system file, as defined on the DATAFILE ATTRIBUTE (@pxref{DATAFILE +ATTRIBUTE,,,pspp, PSPP Users Guide}) and VARIABLE ATTRIBUTE commands +(@pxref{VARIABLE ATTRIBUTE,,,pspp, PSPP Users Guide}), respectively. + +@example +/* @r{Header.} */ +int32 rec_type; +int32 subtype; +int32 size; +int32 count; + +/* @r{Exactly @code{count} bytes of data.} */ +char attributes[]; +@end example + +@table @code +@item int32 rec_type; +Record type. Always set to 7. + +@item int32 subtype; +Record subtype. Always set to 17 for a data file attribute record or +to 18 for a variable attributes record. + +@item int32 size; +The size of each element in the @code{attributes} member. Always set to 1. + +@item int32 count; +The total number of bytes in @code{attributes}. + +@item char attributes[]; +The attributes, in a text-based format. + +In record type 17, this field contains a single attribute set. An +attribute set is a sequence of one or more attributes concatenated +together. Each attribute consists of a name, which has the same +syntax as a variable name, followed by, inside parentheses, a sequence +of one or more values. Each value consists of a string enclosed in +single quotes (@code{'}) followed by a line feed (byte 0x0a). A value +may contain single quote characters, which are not themselves escaped +or quoted or required to be present in pairs. There is no apparent +way to embed a line feed in a value. There is no distinction between +an attribute with a single value and an attribute array with one +element. + +In record type 18, this field contains a sequence of one or more +variable attribute sets. If more than one variable attribute set is +present, each one after the first is delimited from the previous by +@code{/}. Each variable attribute set consists of a variable name, +followed by @code{:}, followed by an attribute set with the same +syntax as on record type 17. + +The total length is @code{count} bytes. +@end table + +@subheading Example + +A system file produced with the following VARIABLE ATTRIBUTE commands +in effect: + +@example +VARIABLE ATTRIBUTE VARIABLES=dummy ATTRIBUTE=fred[1]('23') fred[2]('34'). +VARIABLE ATTRIBUTE VARIABLES=dummy ATTRIBUTE=bert('123'). +@end example + +@noindent +will contain a variable attribute record with the following contents: + +@example +00000000 07 00 00 00 12 00 00 00 01 00 00 00 22 00 00 00 |............"...| +00000010 64 75 6d 6d 79 3a 66 72 65 64 28 27 32 33 27 0a |dummy:fred('23'.| +00000020 27 33 34 27 0a 29 62 65 72 74 28 27 31 32 33 27 |'34'.)bert('123'| +00000030 0a 29 |.) | +@end example + @node Miscellaneous Informational Records @section Miscellaneous Informational Records diff --git a/doc/expressions.texi b/doc/expressions.texi index 1021708a..32ace6c2 100644 --- a/doc/expressions.texi +++ b/doc/expressions.texi @@ -1516,4 +1516,3 @@ subtraction. @item @code{AND NOT OR} @end enumerate -@setfilename ignored diff --git a/doc/files.texi b/doc/files.texi index 30a023ae..13237490 100644 --- a/doc/files.texi +++ b/doc/files.texi @@ -1,5 +1,5 @@ -@node System and Portable Files -@chapter System Files and Portable Files +@node System and Portable File IO +@chapter System and Portable File I/O The commands in this chapter read, write, and examine system files and portable files. @@ -10,7 +10,6 @@ portable files. * GET:: Read from a system file. * GET DATA:: Read from foreign files. * IMPORT:: Read from a portable file. -* MATCH FILES:: Merge system files. * SAVE:: Write to a system file. * SYSFILE INFO:: Display system file dictionary. * XEXPORT:: Write to a portable file, as a transformation. @@ -39,25 +38,46 @@ Only variables with names that exist in both the active file and the system file are considered. Variables with the same name but different types (numeric, string) will cause an error message. Otherwise, the system file variables' attributes will replace those in their matching -active file variables, as described below. +active file variables: +@itemize @bullet +@item If a system file variable has a variable label, then it will replace the active file variable's variable label. If the system file variable does not have a variable label, then the active file variable's variable -label, if any, will be retained. +label, if any, will be retained. + +@item +If the system file variable has custom attributes (@pxref{VARIABLE +ATTRIBUTE}), then those attributes replace the active file variable's +custom attributes. If the system file variable does not have custom +attributes, then the active file variable's custom attributes, if any, +will be retained. +@item If the active file variable is numeric or short string, then value labels and missing values, if any, will be copied to the active file variable. If the system file variable does not have value labels or missing values, then those in the active file variable, if any, will not be disturbed. +@end itemize -Finally, weighting of the active file is updated (@pxref{WEIGHT}). If -the active file has a weighting variable, and the system file does not, -or if the weighting variable in the system file does not exist in the -active file, then the active file weighting variable, if any, is -retained. Otherwise, the weighting variable in the system file becomes -the active file weighting variable. +In addition to properties of variables, some properties of the active +file dictionary as a whole are updated: + +@itemize @bullet +@item +If the system file has custom attributes (@pxref{DATAFILE ATTRIBUTE}), +then those attributes replace the active file variable's custom +attributes. + +@item +If the active file has a weighting variable (@pxref{WEIGHT}), and the +system file does not, or if the weighting variable in the system file +does not exist in the active file, then the active file weighting +variable, if any, is retained. Otherwise, the weighting variable in +the system file becomes the active file weighting variable. +@end itemize @cmd{APPLY DICTIONARY} takes effect immediately. It does not read the active @@ -630,99 +650,6 @@ data is read later, when a procedure is executed. Use of @cmd{IMPORT} to read a system file or scratch file is a PSPP extension. -@node MATCH FILES -@section MATCH FILES -@vindex MATCH FILES - -@display -MATCH FILES - /@{FILE,TABLE@}=@{*,'file-name'@} - /RENAME=(src_names=target_names)@dots{} - /IN=var_name - - /BY=var_list - /DROP=var_list - /KEEP=var_list - /FIRST=var_name - /LAST=var_name - /MAP -@end display - -@cmd{MATCH FILES} merges one or more system, portable, or scratch files, -optionally -including the active file. Cases with the same values for BY -variables are combined into a single case. Cases with different -values are output in order. Thus, multiple sorted files are -combined into a single sorted file based on the value of the BY -variables. The results of the merge become the new active file. - -Specify FILE with a system, portable, or scratch file as a file name -string or file handle -(@pxref{File Handles}), or with an asterisk (@samp{*}) to -indicate the current active file. The files specified on FILE are -merged together based on the BY variables, or combined case-by-case if -BY is not specified. - -Specify TABLE with a file to use it as a @dfn{table -lookup file}. Cases in table lookup files are not used up after -they've been used once. This means that data in table lookup files can -correspond to any number of cases in FILE files. Table lookup files -correspond to lookup tables in traditional relational database systems. -If a table lookup file contains more than one case with a given set of -BY variables, only the first case is used. - -Any number of FILE and TABLE subcommands may be specified. -Ordinarily, at least two FILE subcommands, or one FILE and at least -one TABLE, should be specified. Each instance of FILE or TABLE can be -followed by any sequence of RENAME subcommands. These have the same -form and meaning as the corresponding subcommands of @cmd{GET} -(@pxref{GET}), but apply only to variables in the given file. - -Each FILE or TABLE may optionally be followed by an IN subcommand, -which creates a numeric variable with the specified name and format -F1.0. The IN variable takes value 1 in a case if the given file -contributed a row to the merged file, 0 otherwise. The DROP, KEEP, -and RENAME subcommands do not affect IN variables. - -When more than one FILE or TABLE contains a variable with a given -name, those variables must all have the same type (numeric or string) -and, for string variables, the same width. This rules applies to -variable names after renaming with RENAME; thus, RENAME can be used to -resolve conflicts. - -FILE and TABLE must be specified at the beginning of the command, with -any RENAME or IN specifications immediately after the corresponding -FILE or TABLE. These subcommands are followed by BY, DROP, KEEP, -FIRST, LAST, and MAP. - -The BY subcommand specifies a list of variables that are used to match -cases from each of the files. When TABLE or IN is used, BY is -required; otherwise, it is optional. When BY is specified, all the -files named on FILE and TABLE subcommands must be sorted in ascending -order of the BY variables. Variables belonging to files that are not -present for the current case are set to the system-missing value for -numeric variables or spaces for string variables. - -The DROP and KEEP subcommands allow variables to be dropped from or -reordered within the new active file. These subcommands have the same -form and meaning as the corresponding subcommands of @cmd{GET} -(@pxref{GET}). They apply to the new active file as a whole, not to -individual input files. The variable names specified on DROP and KEEP -are those after any renaming with RENAME. - -The optional FIRST and LAST subcommands name variables that @cmd{MATCH -FILES} adds to the active file. The new variables are numeric with -print and write format F1.0. The value of the FIRST variable is 1 in -the first case with a given set of values for the BY variables, and 0 -in other cases. Similarly, the LAST variable is 1 in the last case -with a given of BY values, and 0 in other cases. - -@cmd{MATCH FILES} may not be specified following @cmd{TEMPORARY} -(@pxref{TEMPORARY}) if the active file is used as an input source. - -Use of portable or scratch files on @cmd{MATCH FILES} is a PSPP -extension. - @node SAVE @section SAVE @vindex SAVE @@ -873,4 +800,3 @@ the data is read by a procedure or procedure-like command. @end itemize @xref{SAVE}, for more information. -@setfilename ignored diff --git a/doc/flow-control.texi b/doc/flow-control.texi index f501c65a..868143b3 100644 --- a/doc/flow-control.texi +++ b/doc/flow-control.texi @@ -170,4 +170,3 @@ variable as the loop index. When @cmd{LOOP} or @cmd{END LOOP} is specified following @cmd{TEMPORARY} (@pxref{TEMPORARY}), the @cmd{LAG} function may not be used (@pxref{LAG}). -@setfilename ignored diff --git a/doc/function-index.texi b/doc/function-index.texi index 2a63e136..a41e60de 100644 --- a/doc/function-index.texi +++ b/doc/function-index.texi @@ -1,4 +1,3 @@ @node Function Index @chapter Function Index @printindex fn -@setfilename ignored diff --git a/doc/installing.texi b/doc/installing.texi index fe5caa38..5a9c2791 100644 --- a/doc/installing.texi +++ b/doc/installing.texi @@ -56,4 +56,3 @@ but only if that directory already exists. (optional) Type @samp{make clean} to delete the PSPP binaries from the source tree. @end enumerate -@setfilename ignored diff --git a/doc/introduction.texi b/doc/introduction.texi index e87731b5..735a54c5 100644 --- a/doc/introduction.texi +++ b/doc/introduction.texi @@ -31,4 +31,3 @@ The author hopes to fully support all features in the products that PSPP replaces, eventually. The author welcomes questions, comments, donations, and code submissions. @xref{Bugs,,Submitting Bug Reports}, for instructions on contacting the author. -@setfilename ignored diff --git a/doc/invoking.texi b/doc/invoking.texi index b5f157e6..6b45392b 100644 --- a/doc/invoking.texi +++ b/doc/invoking.texi @@ -7,12 +7,12 @@ @cindex options, command-line @example pspp [ -B @var{dir} | --config-dir=@var{dir} ] [ -o @var{device} | --device=@var{device} ] - [ -d @var{var}[=@var{value}] | --define=@var{var}[=@var{value}] ] [-u @var{var} | --undef=@var{var} ] - [ -f @var{file} | --out-file=@var{file} ] [ -p | --pipe ] [ -I- | --no-include ] + [ -a @{compatible|enhanced@} | --algorithm=@{compatible|enhanced@}] + [ -x @{compatible|enhanced@} | --syntax=@{compatible|enhanced@}] + [ -I- | --no-include ] [ -I @var{dir} | --include=@var{dir} ] [ -i | --interactive ] - [ -n | --edit | --dry-run | --just-print | --recon ] [ -r | --no-statrc ] [ -h | --help ] [ -l | --list ] - [ -c @var{command} | --command @var{command} ] [ -s | --safer ] + [ -s | --safer ] [ --testing-mode ] [ -V | --version ] [ -v | --verbose ] [ @var{key}=@var{value} ] @var{file}@enddots{} @end example @@ -101,19 +101,6 @@ Input and output options affect how PSPP reads input and writes output. These are the input and output options: @table @code -@item -f @var{file} -@itemx --out-file=@var{file} - -This overrides the output file name for devices designated as listing -devices. If a file named @var{file} already exists, it is overwritten. - -@item -p -@itemx --pipe - -Allows PSPP to be used as a filter by causing the syntax file to be -read from stdin and output to be written to stdout. Conflicts with the -@code{-f @var{file}} and @code{--file=@var{file}} options. - @item -I- @itemx --no-include @@ -127,12 +114,6 @@ configuring}. Appends directory @var{dir} to the path that is searched for include files in PSPP syntax files. -@item -c @var{command} -@itemx --command=@var{command} - -Execute literal command @var{command}. The command is executed before -startup syntax files, if any. - @item --testing-mode Invoke heuristics to assist with testing PSPP. For use by @code{make @@ -158,16 +139,6 @@ mode, rather than the default batch mode. @xref{Tokenizing lines}, for information on the differences between batch mode and interactive mode command interpretation. -@item -n -@itemx --edit -@itemx --dry-run -@itemx --just-print -@itemx --recon - -Only the syntax of any syntax file specified or of commands entered at -the command line is checked. Transformations are not performed and -procedures are not executed. Not yet implemented. - @item -r @itemx --no-statrc @@ -253,4 +224,3 @@ Individual directories included in file searches. Each verbosity level also includes messages from lower verbosity levels. @end table -@setfilename ignored diff --git a/doc/language.texi b/doc/language.texi index 13454336..62267414 100644 --- a/doc/language.texi +++ b/doc/language.texi @@ -497,6 +497,11 @@ they are displayed. Example: a width of 8, with 2 decimal places. @item Write format Similar to print format, but used by the @cmd{WRITE} command (@pxref{WRITE}). + +@cindex custom attributes +@item Custom attributes +User-defined associations between names and values. @xref{VARIABLE +ATTRIBUTE}. @end table @node System Variables @@ -1167,6 +1172,7 @@ trailing white space. The maximum width for time and date formats is 40 columns. Minimum input and output width for each of the time and date formats is shown below: + @float @multitable {DATETIME} {Min. Input Width} {Min. Output Width} {4-digit year} @headitem Format @tab Min. Input Width @tab Min. Output Width @tab Option @@ -1488,4 +1494,3 @@ The first nonterminal defined in a set of productions is called the @dfn{start symbol}. The start symbol defines the entire syntax for that command. @end itemize -@setfilename ignored diff --git a/doc/not-implemented.texi b/doc/not-implemented.texi index 0dd77d49..42e02b7c 100644 --- a/doc/not-implemented.texi +++ b/doc/not-implemented.texi @@ -9,4 +9,3 @@ implemented. @include doc/ni.texi -@setfilename ignored diff --git a/doc/pspp-dev.texinfo b/doc/pspp-dev.texinfo index c2507412..4b92654d 100644 --- a/doc/pspp-dev.texinfo +++ b/doc/pspp-dev.texinfo @@ -79,6 +79,7 @@ modify this GNU manual.'' * Parsing Command Syntax:: How to parse command syntax. * Processing Data:: Data input, output, and processing. * Presenting Output:: Producing machine- and human-readable output. +* Internationalisation:: Dealing with locale issues. * Function Index:: Index of PSPP functions. * Concept Index:: Index of concepts. @@ -95,6 +96,7 @@ modify this GNU manual.'' @include dev/syntax.texi @include dev/data.texi @include dev/output.texi +@include dev/i18n.texi @include function-index.texi @include concept-index.texi diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo index 6171df6d..975ee660 100644 --- a/doc/pspp.texinfo +++ b/doc/pspp.texinfo @@ -70,7 +70,8 @@ modify this GNU manual.'' * Expressions:: Numeric and string expression syntax. * Data Input and Output:: Reading data from user files. -* System and Portable Files:: Dealing with system & portable files. +* System and Portable File IO:: Reading and writing system & portable files. +* Combining Data Files:: Combining data from multiple files. * Variable Attributes:: Adjusting and examining variables. * Data Manipulation:: Simple operations on data. * Data Selection:: Select certain cases for analysis. @@ -98,6 +99,7 @@ modify this GNU manual.'' @include expressions.texi @include data-io.texi @include files.texi +@include combining.texi @include variables.texi @include transformation.texi @include data-selection.texi diff --git a/doc/regression.texi b/doc/regression.texi index 90caf866..b47416b7 100644 --- a/doc/regression.texi +++ b/doc/regression.texi @@ -110,4 +110,3 @@ list. regression /variables=v0 v1 v2 /statistics defaults /dependent=v2 /save pred resid /method=enter. @end example -@setfilename ignored diff --git a/doc/statistics.texi b/doc/statistics.texi index 8fa93b15..98556060 100644 --- a/doc/statistics.texi +++ b/doc/statistics.texi @@ -14,6 +14,7 @@ far. * ONEWAY:: One way analysis of variance. * RANK:: Compute rank scores. * REGRESSION:: Linear regression. +* RELIABILITY:: Reliability analysis. @end menu @node DESCRIPTIVES @@ -232,7 +233,7 @@ EXAMINE /PLOT=@{BOXPLOT, NPPLOT, HISTOGRAM, ALL, NONE@} /CINTERVAL n /COMPARE=@{GROUPS,VARIABLES@} - /ID=@{case_number, var_name@} + /ID=var_name /@{TOTAL,NOTOTAL@} /PERCENTILE=[value_list]=@{HAVERAGE, WAVERAGE, ROUND, AEMPIRICAL, EMPIRICAL @} /MISSING=@{LISTWISE, PAIRWISE@} [@{EXCLUDE, INCLUDE@}] @@ -271,6 +272,12 @@ If /COMPARE=VARIABLES is specified, then one plot per factor is produced, each each containing one boxplot per dependent variable. If the /COMPARE subcommand is ommitted, then PSPP uses the default value of /COMPARE=GROUPS. + +The ID subcommand also pertains to boxplots. If given, it must +specify a variable name. Outliers and extreme cases plotted in +boxplots will be labelled with the case from that variable. Numeric or +string variables are permissible. If the ID subcommand is not given, +then the casenumber will be used for labelling. The CINTERVAL subcommand specifies the confidence interval to use in calculation of the descriptives command. The default it 95%. @@ -499,6 +506,8 @@ NPAR TESTS [ /STATISTICS=@{DESCRIPTIVES@} ] [ /MISSING=@{ANALYSIS, LISTWISE@} @{INCLUDE, EXCLUDE@} ] + + [ /METHOD=EXACT [ TIMER [(n)] ] ] @end display NPAR TESTS performs nonparametric tests. @@ -508,10 +517,21 @@ One or more tests may be specified by using the corresponding subcommand. If the /STATISTICS subcommand is also specified, then summary statistics are produces for each variable that is the subject of any test. +Certain tests may take a long time to execute, if an exact figure is required. +Therefore, by default asymptotic approximations are used unless the +subcommand /METHOD=EXACT is specified. +Exact tests give more accurate results, but may take an unacceptably long +time to perform. If the TIMER keyword is used, it sets a maximum time, +after which the test will be abandoned, and a warning message printed. +The time, in minutes, should be specified in parentheses after the TIMER keyword. +If the TIMER keyword is given without this figure, then a default value of 5 minutes +is used. + @menu * BINOMIAL:: Binomial Test * CHISQUARE:: Chisquare Test +* WILCOXON:: Wilcoxon Signed Ranks Test @end menu @@ -591,6 +611,34 @@ sum of the frequencies need not be 1. If no /EXPECTED subcommand is given, then then equal frequencies are expected. +@node WILCOXON +@subsection Wilcoxon +@comment node-name, next, previous, up +@vindex WILCOXON +@cindex wilcoxon matched pairs signed ranks test + +@display + [ /WILCOXON varlist [ WITH varlist [ (PAIRED) ]]] +@end display + +The wilcoxon subcommand tests for differences between means of the +variables listed. The test does not make any assumptions about the +variances of the samples. + +If the @code{WITH} keyword is omitted, then tests for all +combinations of the listed variables are performed. +If the @code{WITH} keyword is given, and the @code{(PAIRED)} keyword +is also given, then the number of variables preceding @code{WITH} +must be the same as the number following it. +In this case, tests for each respective pair of variables are +performed. +If the @code{WITH} keyword is given, but the +@code{(PAIRED)} keyword is omitted, then tests for each combination +of variable preceding @code{WITH} against variable following +@code{WITH} are performed. + +If the number of observations is large, and exact tests have been +requested. then the test may take a very long time to complete. @node T-TEST @comment node-name, next, previous, up @@ -766,7 +814,6 @@ If the total sum of the coefficients are not zero, then PSPP will display a warning, but will proceed with the analysis. The @code{CONTRAST} subcommand may be given up to 10 times in order to specify different contrast tests. -@setfilename ignored @node RANK @comment node-name, next, previous, up @@ -831,3 +878,50 @@ user-missing are to be excluded from the rank scores. A setting of INCLUDE means they are to be included. The default is EXCLUDE. @include regression.texi + + +@node RELIABILITY +@section RELIABILITY + +@vindex RELIABILITY +@display +RELIABILITY + /VARIABLES=var_list + /SCALE (@var{name}) = @{var_list, ALL@} + /MODEL=@{ALPHA, SPLIT[(N)]@} + /SUMMARY=@{TOTAL,ALL@} + /MISSING=@{EXCLUDE,INCLUDE@} +@end display + +@cindex Cronbach's Alpha +The @cmd{RELIABILTY} command performs reliablity analysis on the data. + +The VARIABLES subcommand is required. It determines the set of variables +upon which analysis is to be performed. + +The SCALE subcommand determines which variables reliability is to be +calculated for. If it is omitted, then analysis for all variables named +in the VARIABLES subcommand will be used. +Optionally, the @var{name} parameter may be specified to set a string name +for the scale. + +The MODEL subcommand determines the type of analysis. If ALPHA is specified, +then Cronbach's Alpha is calculated for the scale. If the model is SPLIT, +then the variables are divided into 2 subsets. An optional parameter +@var{N} may be given, to specify how many variables to be in the first subset. +If @var{N} is omitted, then it defaults to one half of the variables in the +scale, or one half minus one if there are an odd number of variables. +The default model is ALPHA. + +By default, any cases with user missing, or system missing values for +any variables given +in the VARIABLES subcommand will be omitted from analysis. +The MISSING subcommand determines whether user missing values are to +be included or excluded in the analysis. + +The SUMMARY subcommand determines the type of summary analysis to be performed. +Currently there is only one type: SUMMARY=TOTAL, which displays per-item +analysis tested against the totals. + + + diff --git a/doc/transformation.texi b/doc/transformation.texi index 27bbb2da..5eedba64 100644 --- a/doc/transformation.texi +++ b/doc/transformation.texi @@ -83,7 +83,7 @@ list. Each set must have exactly as many source variables as aggregation variables. Each aggregation variable receives the results of applying the specified aggregation function to the corresponding source -variable. The MEAN, SD, and SUM aggregation functions may only be +variable. The MEAN, MEDIAN, SD, and SUM aggregation functions may only be applied to numeric variables. All the rest may be applied to numeric and short and long string variables. @@ -128,6 +128,9 @@ dictionary information from the source variable. Arithmetic mean. Limited to numeric values. The default format is F8.2. +@item MEDIAN(var_name) +The median value. Limited to numeric values. The default format is F8.2. + @item MIN(var_name) Minimum value. The aggregation variable receives the complete dictionary information from the source variable. @@ -550,4 +553,3 @@ If workspace is exhausted, it falls back to a merge sort algorithm that involves creates numerous temporary files. @cmd{SORT CASES} may not be specified following TEMPORARY. -@setfilename ignored diff --git a/doc/utilities.texi b/doc/utilities.texi index 35ea20e2..95cfa25d 100644 --- a/doc/utilities.texi +++ b/doc/utilities.texi @@ -414,10 +414,13 @@ default. Any real value may be assigned. @item DECIMAL @anchor{SET DECIMAL} -The default DOT setting causes the decimal point character to be -@samp{.} and the grouping character to be @samp{,}. A setting of COMMA +This value may be set to DOT or COMMA. +Setting it to DOT causes the decimal point character to be +@samp{.} and the grouping character to be @samp{,}. +Setting it to COMMA causes the decimal point character to be @samp{,} and the grouping character to be @samp{.}. +The default value is determined from the system locale. @item FORMAT Allows the default numeric input/output format to be specified. The @@ -784,4 +787,3 @@ on the output device. Specify a title as a string in quotes. The alternate syntax that did not require quotes is now obsolete. If it is used then the title is converted to all uppercase. -@setfilename ignored diff --git a/doc/variables.texi b/doc/variables.texi index a66e4232..08c4bdea 100644 --- a/doc/variables.texi +++ b/doc/variables.texi @@ -7,8 +7,7 @@ several utility functions for examining and adjusting them. @menu * ADD VALUE LABELS:: Add value labels to variables. * DELETE VARIABLES:: Delete variables. -* DISPLAY:: Display variable names & descriptions. -* DISPLAY VECTORS:: Display a list of vectors. +* DISPLAY:: Display information about the active file. * FORMATS:: Set print and write formats. * LEAVE:: Don't clear variables between cases. * MISSING VALUES:: Set missing values for variables. @@ -18,6 +17,7 @@ several utility functions for examining and adjusting them. * RENAME VARIABLES:: Rename variables. * VALUE LABELS:: Set value labels for variables. * STRING:: Create new string variables. +* VARIABLE ATTRIBUTE:: Set custom attributes on variables. * VARIABLE LABELS:: Set variable labels for variables. * VARIABLE ALIGNMENT:: Set the alignment for display. * VARIABLE WIDTH:: Set the display width. @@ -61,15 +61,26 @@ effect, it causes the temporary transformations to become permanent. @vindex DISPLAY @display -DISPLAY @{NAMES,INDEX,LABELS,VARIABLES,DICTIONARY,SCRATCH@} - [SORTED] [var_list] +DISPLAY [SORTED] NAMES [[/VARIABLES=]var_list]. +DISPLAY [SORTED] INDEX [[/VARIABLES=]var_list]. +DISPLAY [SORTED] LABELS [[/VARIABLES=]var_list]. +DISPLAY [SORTED] VARIABLES [[/VARIABLES=]var_list]. +DISPLAY [SORTED] DICTIONARY [[/VARIABLES=]var_list]. +DISPLAY [SORTED] SCRATCH [[/VARIABLES=]var_list]. +DISPLAY [SORTED] ATTRIBUTES [[/VARIABLES=]var_list]. +DISPLAY [SORTED] @@ATTRIBUTES [[/VARIABLES=]var_list]. +DISPLAY [SORTED] VECTORS. @end display -@cmd{DISPLAY} displays requested information on variables. Variables can -optionally be sorted alphabetically. The entire dictionary or just -specified variables can be described. +@cmd{DISPLAY} displays information about the active file. A variety +of different forms of information can be requested. -One of the following keywords can be present: +The following keywords primarily cause information about variables to +be displayed. With these keywords, by default information is +displayed about all variable in the active file, in the order that +variables occur in the active file dictionary. The SORTED keyword +causes output to be sorted alphabetically by variable name. The +VARIABLES subcommand limits output to the specified variables. @table @asis @item NAMES @@ -91,23 +102,24 @@ Variable names, positions, print and write formats, missing values, variable labels, and value labels are displayed. @item SCRATCH -Varible names are displayed, for scratch variables only (@pxref{Scratch +Variable names are displayed, for scratch variables only (@pxref{Scratch Variables}). -@end table -If SORTED is specified, then the variables are displayed in ascending -order based on their names; otherwise, they are displayed in the order -that they occur in the active file dictionary. +@item ATTRIBUTES +Datafile and variable attributes are displayed, except that attributes +whose names begin with @code{@@} or @code{$@@} are omitted. -@node DISPLAY VECTORS -@section DISPLAY VECTORS -@vindex DISPLAY VECTORS +@itemx @@ATTRIBUTES +All datafile and variable attributes are displayed. +@end table -@display -DISPLAY VECTORS. -@end display +With the @code{VECTOR} keyword, @cmd{DISPLAY} lists all the currently +declared vectors. If the SORTED keyword is given, the vectors are +listed in alphabetical order; otherwise, they are listed in textual +order of definition within the PSPP syntax file. -@cmd{DISPLAY VECTORS} lists all the currently declared vectors. +For related commands, see @ref{DISPLAY DOCUMENTS} and @ref{DISPLAY +FILE LABEL}. @node FORMATS @section FORMATS @@ -357,6 +369,60 @@ implicitly derived from the specified output formats. Created variables are initialized to spaces. +@node VARIABLE ATTRIBUTE +@section VARIABLE ATTRIBUTE +@vindex VARIABLE ATTRIBUTE + +@display +VARIABLE ATTRIBUTE + VARIABLES=var_list + ATTRIBUTE=name('value') [name('value')]@dots{} + ATTRIBUTE=name@b{[}index@b{]}('value') [name@b{[}index@b{]}('value')]@dots{} + DELETE=name [name]@dots{} + DELETE=name@b{[}index@b{]} [name@b{[}index@b{]}]@dots{} +@end display + +@cmd{VARIABLE ATTRIBUTE} adds, modifies, or removes user-defined +attributes associated with variables in the active file. Custom +variable attributes are not interpreted by PSPP, but they are saved as +part of system files and may be used by other software that reads +them. + +The required VARIABLES subcommand must come first. Specify the +variables to which the following ATTRIBUTE or DELETE subcommand +should apply. + +Use the ATTRIBUTE subcommand to add or modify custom variable +attributes. Specify the name of the attribute as an identifier +(@pxref{Tokens}), followed by the desired value, in parentheses, as a +quoted string. The specified attributes are then added or modified in +the variables specified on VARIABLES. Attribute names that begin with +@code{$} are reserved for PSPP's internal use, and attribute names +that begin with @code{@@} or @code{$@@} are not displayed by most PSPP +commands that display other attributes. Other attribute names are not +treated specially. + +Attributes may also be organized into arrays. To assign to an array +element, add an integer array index enclosed in square brackets +(@code{[} and @code{]}) between the attribute name and value. Array +indexes start at 1, not 0. An attribute array that has a single +element (number 1) is not distinguished from a non-array attribute. + +Use the DELETE subcommand to delete an attribute from the variable +specified on VARIABLES. Specify an attribute name by itself to delete +an entire attribute, including all array elements for attribute +arrays. Specify an attribute name followed by an array index in +square brackets to delete a single element of an attribute array. In +the latter case, all the array elements numbered higher than the +deleted element are shifted down, filling the vacated position. + +To associate custom attributes with the entire active file, instead of +with particular variables, use @cmd{DATAFILE ATTRIBUTE} (@pxref{DATAFILE ATTRIBUTE}) instead. + +@cmd{VARIABLE ATTRIBUTE} takes effect immediately. It is not affected +by conditional and looping structures such as @cmd{DO IF} or +@cmd{LOOP}. + @node VARIABLE LABELS @section VARIABLE LABELS @vindex VARIABLE LABELS @@ -489,4 +555,3 @@ variables to the specified format specification. Its syntax is identical to that of FORMATS (@pxref{FORMATS}), but @cmd{WRITE FORMATS} sets only write formats, not print formats. -@setfilename ignored diff --git a/examples/grid.sps b/examples/grid.sps new file mode 100644 index 00000000..ea7f9d74 --- /dev/null +++ b/examples/grid.sps @@ -0,0 +1,20 @@ +COMMENT -*-pspp-*- . + +COMMENT This program is useful for testing the behaviour of the Data and Variable Sheets. + +input program. +vector var(500 F8.3). + loop #c = 1 to 1000. + loop #v = 1 to 500. + compute var(#v) = #v + #c / 1000. + end loop. + end case. + end loop. + end file. +end input program. + +variable label var1 'First variable' var2 'Second variable' var3 'Third variable'. + +save outfile='grid.sav'. + +execute. diff --git a/glade/automake.mk b/glade/automake.mk index 7827516e..8e51e1f7 100644 --- a/glade/automake.mk +++ b/glade/automake.mk @@ -14,12 +14,15 @@ libglade_psppire_la_SOURCES = \ glade/bbox.c \ glade/selector.c \ glade/acr.c \ + glade/dictview.c \ + src/ui/gui/psppire-conf.c \ src/ui/gui/psppire-acr.c \ src/ui/gui/psppire-buttonbox.c \ src/ui/gui/psppire-hbuttonbox.c \ src/ui/gui/psppire-vbuttonbox.c \ src/ui/gui/psppire-dialog.c \ src/ui/gui/psppire-keypad.c \ + src/ui/gui/psppire-dictview.c \ src/ui/gui/psppire-selector.c dist_catalog_DATA = \ diff --git a/glade/dictview.c b/glade/dictview.c new file mode 100644 index 00000000..5d23b06d --- /dev/null +++ b/glade/dictview.c @@ -0,0 +1,82 @@ +#include + +#include +#include +#include "psppire-dictview.h" + +#include + + +GType +psppire_dict_get_type () +{ + return 0; +} + + + +void +glade_psppire_dictview_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) +{ + GladeWidget *widget ; + + PsppireDictView *dictview = PSPPIRE_DICT_VIEW (object); + + g_return_if_fail (PSPPIRE_IS_DICT_VIEW (dictview)); + + widget = glade_widget_get_from_gobject (GTK_WIDGET (dictview)); + if (!widget) + return; + + if (reason == GLADE_CREATE_USER) + { + /* HIG complient border-width defaults on dictviews */ + glade_widget_property_set (widget, "border-width", 5); + } +} + + +GtkWidget * +glade_psppire_dictview_get_internal_child (GladeWidgetAdaptor *adaptor, + PsppireDictView *dictview, + const gchar *name) +{ +#if DEBUGGING + g_print ("%s\n", __FUNCTION__); +#endif + return GTK_WIDGET (dictview); +} + + + +void +glade_psppire_dictview_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) +{ +#if DEBUGGING + g_print ("%s(%p) Type=\"%s\" Id=\"%s\"\n", __FUNCTION__, object, + G_OBJECT_TYPE_NAME( object ), + id); +#endif + + GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor, object, + id, value); +} + + +GList * +glade_psppire_dictview_get_children (GladeWidgetAdaptor *adaptor, + PsppireDictView *dv) +{ + GList *list = NULL; + + g_return_val_if_fail (PSPPIRE_IS_DICT_VIEW (dv), NULL); + + list = glade_util_container_get_all_children (GTK_CONTAINER (dv)); + + return list; +} diff --git a/glade/psppire.xml b/glade/psppire.xml index e2dc4b76..50a03661 100644 --- a/glade/psppire.xml +++ b/glade/psppire.xml @@ -197,6 +197,24 @@ + + + + + glade_psppire_dictview_post_create + glade_psppire_dictview_get_children + glade_psppire_dictview_get_internal_child + + + + + + + + + + + @@ -204,8 +222,9 @@

- +

diff --git a/lib/automake.mk b/lib/automake.mk index 6410988b..6b20c674 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -3,7 +3,7 @@ include $(top_srcdir)/lib/linreg/automake.mk if WITHGUI -include $(top_srcdir)/lib/gtksheet/automake.mk +include $(top_srcdir)/lib/gtk-contrib/automake.mk endif EXTRA_DIST += lib/OChangeLog diff --git a/lib/gtk-contrib/COPYING.LESSER b/lib/gtk-contrib/COPYING.LESSER new file mode 100644 index 00000000..8add30ad --- /dev/null +++ b/lib/gtk-contrib/COPYING.LESSER @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/lib/gtk-contrib/OChangeLog b/lib/gtk-contrib/OChangeLog new file mode 100644 index 00000000..b5ba1c82 --- /dev/null +++ b/lib/gtk-contrib/OChangeLog @@ -0,0 +1,149 @@ +2008-05-08 Ben Pfaff + + Patch #6506. Reviewed by John Darrington. + + * gtksheet.c (gtk_sheet_unrealize): Don't call gtk_widget_unparent + on sheet->button if it's null. + +2008-05-06 Ben Pfaff + + * gtksheet.c (gtk_sheet_dispose): Set the sheet's entry_container + and button members to NULL after unref'ing them, so that a later + call to gtk_sheet_for_all will not try to dereference a dangling + pointer. + +2008-03-06 John Darrington + + * gsheet-row-iface.c gsheet-row-iface.h: Delete unused, unneccesary + gpointer variable from the interface. + + * gtksheet.c: Update to match new gsheet-row-iface + +2008-02-27 John Darrington + * gtksheet.c gtksheet.h: Corrected some leaks and other problems + related to de-allocating the sheet. + +2008-02-27 John Darrington + * gtksheet.c: (gtk_sheet_expose) Don't queue a redraw on the entry + widget. Fixes bug #21073 + +2008-02-20 John Darrington + + * gtksheet.c gtksheet.h: Removed some unused signals. + Made the models properties of the widget. + +2008-02-08 John Darrington + + * gtksheet.c: Removed the sheet_locked feature, which we never + used, and interfered with the editability of the entry widget. + + * gtksheet.c: Add one to the row to which we scroll. Seems like + the best way to cope with granularity problems. + +21 Septempber 2007 John Darrington + + * gtksheet.c (range_update_callback): Scroll to cell 0,0 if the + current position is outside the model's range. + +24 July 2007 John Darrington + + * gtksheet.c gtksheet.h: Removed the `clip' feature, which IMO + is a croc, and we're unlikely to use. In its place, added a primary + selection which supports text and html targets. + +16 July 2007 John Darrington + + * gtksheet.c gtksheet.h: Removed some legacy functions called from + gtk_sheet_finalize which caused unnecessary delays when shutting down. + +12 July 2007 John Darrington + + * gtksheet.c gtksheet.h: Removed view member and replaced with + function call. Removed hadjustment_changed and vadjustment_changed + functions which did nothing. Added some whitespace arount != + operators. + +09 July 2007 John Darrington + + * gtksheet.c gtksheet.h (gtk_sheet_get_active_cell): Allowed row, + column to be NULL. + +07 July 2007 John Darrington + + * gsheet-column-iface.c gsheet-column-iface.h gsheet-row-iface.c + gsheet-row-iface.h gtksheet.c gtksheet.h: Added a "subtitle" + feature on row/column titles, which shows tooltip-like popups. + +03 July 2007 John Darrington + + * gtksheet.c gtksheet.h: Removed the autoscroll-on-select feature + that was causing us grief. + +28 June 2007 John Darrington + + * gtksheet.c: Removed some features that we dont use, to get better + speed. + +Sat Feb 17 17:36:56 2007 Ben Pfaff + + * gsheet-column-iface.c gsheet-hetero-column.c gsheet-row-iface.c + gsheet-uniform-column.c gsheet-uniform-row.c gsheetmodel.c + gtkextra-marshal.c gtkextra.c gtkiconlist.c gtkitementry.c + gtksheet.c: Add "#include ". + +Mon Jun 19 18:03:21 WST 2006 John Darrington + + * gsheet-column-iface.c gsheet-column-iface.h + gsheet-hetero-column.c gsheet-row-iface.c gsheet-row-iface.h + gsheet-uniform-column.c gsheet-uniform-row.c gtksheet.c + gtksheet.h: Fixed some warnings. Corrected errors updating + row/column titles + +Di Mai 30 19:51:19 WST 2006 John Darrington + + * gtksheet.c gtksheet.h: constness. Removed dependence on glib2.10 + +Sat May 27 16:29:36 WST 2006 John Darrington + + * gtksheet.c: Removed call to gtk_entry_set_text, which caused warnings + and was unnecessary. + +Thu May 25 17:58:51 WST 2006 John Darrington + + * gsheet-column-iface.c gsheet-column-iface.h gsheet-hetero-column.c + gsheet-row-iface.c gsheet-row-iface.h gsheet-uniform-row.c + gtksheet-extra.h gtksheet.c: Plugged memory leaks. Rationalised the way + that GtkSheetButtons are created. + +Sat May 20 21:02:03 WST 2006 John Darrington + + * gsheetmodel.c gsheetmodel.h: Added columns-inserted and columns-deleted + signals. Added g_sheet_get_{row,column}_count functions. + + * gtksheet.c gtksheet.h: Allowed -1 to be passed to + gtk_sheet_set_active_cell to indicate no active cell. + +Mon May 15 16:10:49 WST 2006 John Darrington + + * gtksheet.c: Removed code which rendered the title buttons a second + time. Cut and Paste error ? + +Sat May 13 07:58:32 WST 2006 John Darrington + + * gsheetmodel.c gsheetmodel.h gtksheet.c gtksheeet.h: Added + free_strings flag to tell the sheet whether to free the string + data passed from the model. + +Thu May 11 22:20:04 WST 2006 John Darrington + + * gtksheet.c, gtksheet.h: Fixed broken deallocation of sheet->pixmap. + +Thu May 4 17:55:48 WST 2006 John Darrington + + * gtksheet.c: Added callback on inserted rows. + +Sat Jan 28 08:48:08 2006 UTC John Darrington + + * Separated the data out of the GtkSheet. The gtksheet should now be + regarded as a way of looking into the data. The data is represented by a + GSheetModel and the rows and columns by GSheetRow and GSheetColumn. diff --git a/lib/gtk-contrib/README b/lib/gtk-contrib/README new file mode 100644 index 00000000..e6e23d94 --- /dev/null +++ b/lib/gtk-contrib/README @@ -0,0 +1,10 @@ +This is not part of the GNU PSPP program, but is used with GNU PSPP. + +This directory contains a version of the GtkXPaned widget. It includes +minor modifications. GtkXPaned is licensed under the GNU Lesser +General Public License. See COPYING.LESSER. + + +This directory also contains the PsppireSheet widget which is a very +heavily modified version of GtkSheet widget. This modified version if +licensed under the GNU General Public License version 3 or later. diff --git a/lib/gtk-contrib/automake.mk b/lib/gtk-contrib/automake.mk new file mode 100644 index 00000000..f3cd96e2 --- /dev/null +++ b/lib/gtk-contrib/automake.mk @@ -0,0 +1,17 @@ +## Process this file with automake to produce Makefile.in -*- makefile -*- + +noinst_LIBRARIES += lib/gtk-contrib/libgtksheet.a + +lib_gtk_contrib_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 + +lib_gtk_contrib_libgtksheet_a_SOURCES = \ + lib/gtk-contrib/gtkextra-sheet.h \ + lib/gtk-contrib/psppire-sheet.c \ + lib/gtk-contrib/psppire-sheet.h \ + lib/gtk-contrib/gtkxpaned.c \ + lib/gtk-contrib/gtkxpaned.h + +EXTRA_DIST += lib/gtk-contrib/OChangeLog \ + lib/gtk-contrib/README \ + lib/gtk-contrib/gtk-builder-convert + diff --git a/lib/gtk-contrib/gtk-builder-convert b/lib/gtk-contrib/gtk-builder-convert new file mode 100755 index 00000000..bfcb03c9 --- /dev/null +++ b/lib/gtk-contrib/gtk-builder-convert @@ -0,0 +1,750 @@ +#!/usr/bin/env python +# +# This file was downloaded from +# http://svn.gnome.org/svn/gtk+/tags/GTK_2_14_7/gtk/gtk-builder-convert +# on 11 March 2009 +# +# Copyright (C) 2006-2008 Async Open Source +# Henrique Romano +# Johan Dahlin +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser 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 Lesser 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. +# +# TODO: +# Toolbars + +"""Usage: gtk-builder-convert [OPTION] [INPUT] [OUTPUT] +Converts Glade files into XML files which can be loaded with GtkBuilder. +The [INPUT] file is + + -w, --skip-windows Convert everything but GtkWindow subclasses. + -r, --root Convert only widget named root and its children + -h, --help display this help and exit + +When OUTPUT is -, write to standard input. + +Examples: + gtk-builder-convert preference.glade preferences.ui + +Report bugs to http://bugzilla.gnome.org/.""" + +import getopt +import os +import sys + +from xml.dom import minidom, Node + +WINDOWS = ['GtkWindow', + 'GtkDialog', + 'GtkFileChooserDialog', + 'GtkMessageDialog'] + +# The subprocess is only available in Python 2.4+ +try: + import subprocess + subprocess # pyflakes +except ImportError: + subprocess = None + +def get_child_nodes(node): + assert node.tagName == 'object' + nodes = [] + for child in node.childNodes: + if child.nodeType != Node.ELEMENT_NODE: + continue + if child.tagName != 'child': + continue + nodes.append(child) + return nodes + +def get_properties(node): + assert node.tagName == 'object' + properties = {} + for child in node.childNodes: + if child.nodeType != Node.ELEMENT_NODE: + continue + if child.tagName != 'property': + continue + value = child.childNodes[0].data + properties[child.getAttribute('name')] = value + return properties + +def get_property(node, property_name): + assert node.tagName == 'object' + properties = get_properties(node) + return properties.get(property_name) + +def get_property_node(node, property_name): + assert node.tagName == 'object' + properties = {} + for child in node.childNodes: + if child.nodeType != Node.ELEMENT_NODE: + continue + if child.tagName != 'property': + continue + if child.getAttribute('name') == property_name: + return child + +def get_signal_nodes(node): + assert node.tagName == 'object' + signals = [] + for child in node.childNodes: + if child.nodeType != Node.ELEMENT_NODE: + continue + if child.tagName == 'signal': + signals.append(child) + return signals + +def get_property_nodes(node): + assert node.tagName == 'object' + properties = [] + for child in node.childNodes: + if child.nodeType != Node.ELEMENT_NODE: + continue + # FIXME: handle comments + if child.tagName == 'property': + properties.append(child) + return properties + +def get_accelerator_nodes(node): + assert node.tagName == 'object' + accelerators = [] + for child in node.childNodes: + if child.nodeType != Node.ELEMENT_NODE: + continue + if child.tagName == 'accelerator': + accelerators.append(child) + return accelerators + +def get_object_node(child_node): + assert child_node.tagName == 'child', child_node + nodes = [] + for node in child_node.childNodes: + if node.nodeType != Node.ELEMENT_NODE: + continue + if node.tagName == 'object': + nodes.append(node) + assert len(nodes) == 1, nodes + return nodes[0] + +def copy_properties(node, props, prop_dict): + assert node.tagName == 'object' + for prop_name in props: + child = get_property_node(node, prop_name) + if child is not None: + prop_dict[prop_name] = child + + return node + +class GtkBuilderConverter(object): + + def __init__(self, skip_windows, root): + self.skip_windows = skip_windows + self.root = root + self.root_objects = [] + self.objects = {} + + # + # Public API + # + + def parse_file(self, file): + self._dom = minidom.parse(file) + self._parse() + + def parse_buffer(self, buffer): + self._dom = minidom.parseString(buffer) + self._parse() + + def to_xml(self): + xml = self._dom.toprettyxml("", "") + return xml.encode('utf-8') + + # + # Private + # + + def _get_object(self, name): + return self.objects.get(name) + + def _get_objects_by_attr(self, attribute, value): + return [w for w in self._dom.getElementsByTagName("object") + if w.getAttribute(attribute) == value] + + def _create_object(self, obj_class, obj_id, template=None, properties=None): + """ + Creates a new