Merge commit 'origin/data-encoding'

Conflicts:

	src/language/dictionary/split-file.c

diff --cc src/data/sys-file-reader.c
Simple merge

diff --cc src/data/value.h
index 6955eea0bd358e144fc1bd4ff8ed9e615aa7b68f,84f08d87ce5da9241c07192fda84b45665eab365..f9782e2d867d47028f134c4b406dbfd53313d68c
--- 1/src/data/value.h
--- 2/src/data/value.h
+++ b/src/data/value.h
@@@ -55,9 -56,12 +56,9 @@@ static inline bool value_try_init (unio
  static inline void value_destroy (union value *, int width);
  
  static inline double value_num (const union value *);
- static inline const char *value_str (const union value *, int width);
- static inline char *value_str_rw (union value *, int width);
+ static inline const uint8_t *value_str (const union value *, int width);
+ static inline uint8_t *value_str_rw (union value *, int width);
  
 -int compare_values (const void *, const void *, const void *var);
 -unsigned hash_value (const void *, const void *var);
 -
  static inline void value_copy (union value *, const union value *, int width);
  void value_copy_rpad (union value *, int dst_width,
                        const union value *, int src_width,

diff --cc src/language/data-io/data-parser.c
Simple merge

diff --cc src/language/data-io/print.c
Simple merge

diff --cc src/language/dictionary/split-file.c
index d2b79c63dd6ce2a6c65cac7153ad468e52b6877f,0024787fdd203e022b9e6b2911e3333c90ab6f76..5d2b42d758eed2d1e305d05046d59cf0aa290877
--- 1/src/language/dictionary/split-file.c
--- 2/src/language/dictionary/split-file.c
+++ b/src/language/dictionary/split-file.c
@@@ -92,13 -92,13 +92,13 @@@ output_split_file_values (const struct 
        const char *val_lab;
        const struct fmt_spec *print = var_get_print_format (v);
  
 -      tab_text (t, 0, i + 1, TAB_LEFT | TAT_PRINTF, "%s", var_get_name (v));
 +      tab_text_format (t, 0, i + 1, TAB_LEFT, "%s", var_get_name (v));
  
-       data_out (case_data (c, v), print, temp_buf);
-       temp_buf[print->w] = 0;
- 
-       tab_text_format (t, 1, i + 1, 0, "%.*s", print->w, temp_buf);
+       s = data_out (case_data (c, v), dict_get_encoding (dict), print);
++      tab_text_format (t, 1, i + 1, 0, "%.*s", print->w, s);
  
 -      tab_text (t, 1, i + 1, TAT_PRINTF, "%.*s", print->w, s);
+       free (s);
+       
        val_lab = var_lookup_value_label (v, case_data (c, v));
        if (val_lab)
        tab_text (t, 2, i + 1, TAB_LEFT, val_lab);

diff --cc src/language/stats/crosstabs.q
Simple merge

diff --cc src/math/interaction.c
Simple merge

diff --cc src/output/table.c
Simple merge

diff --cc src/output/table.h
Simple merge