Merge branch 'master' into translation

[lilypond.git] / lily / lily-imports.cc

diff --git a/lily/lily-imports.cc b/lily/lily-imports.cc
index 37a92578d49155d49ed0c39348a88a1a42c9da3a..62e58b603c1ff36e8c150fbf920c9e6bae711965 100644 (file)
--- a/lily/lily-imports.cc
+++ b/lily/lily-imports.cc
@@ -22,6 +22,7 @@
 namespace Guile_user {
   Scm_module module ("guile-user");
 
+  Variable apply ("apply");
   Variable plus ("+");
   Variable make_module ("make-module");
 #if GUILEV2
@@ -51,11 +52,17 @@ namespace Lily {
   Variable beat_structure ("beat-structure");
   Variable calc_repeat_slash_count ("calc-repeat-slash-count");
   Variable car_less ("car<");
+  Variable chordmodifiers ("chordmodifiers");
   Variable construct_chord_elements ("construct-chord-elements");
   Variable default_time_signature_settings ("default-time-signature-settings");
+  Variable drum_pitch_names ("drumPitchNames");
+  Variable grob_compose_function ("grob::compose-function");
+  Variable grob_offset_function ("grob::offset-function");
   Variable hash_table_to_alist ("hash-table->alist");
   Variable interpret_markup_list ("interpret-markup-list");
   Variable invalidate_alterations ("invalidate-alterations");
+  Variable key_p ("key?");
+  Variable key_list_p ("key-list?");
   Variable key_signature_interface_alteration_positions ("key-signature-interface::alteration-positions");
   Variable layout_extract_page_properties ("layout-extract-page-properties");
   Variable lilypond_main ("lilypond-main");
@@ -80,6 +87,7 @@ namespace Lily {
 #endif
   Variable f_parser ("%parser");
   Variable percussion_p ("percussion?");
+  Variable pitchnames ("pitchnames");
   Variable pure_chain_offset_callback ("pure-chain-offset-callback");
   Variable remove_stencil_warnings ("remove-stencil-warnings");
   Variable scale_layout ("scale-layout");
@@ -89,12 +97,15 @@ namespace Lily {
   Variable scorify_music ("scorify-music");
   Variable span_bar_notify_grobs_of_my_existence ("span-bar::notify-grobs-of-my-existence");
   Variable stencil_whiteout ("stencil-whiteout");
-  Variable stencil_whiteout_box ("stencil-whiteout-box");
   Variable symbol_list_p ("symbol-list?");
   Variable tremolo_get_music_list ("tremolo::get-music-list");
   Variable type_name ("type-name");
   Variable volta_bracket_calc_hook_visibility ("volta-bracket::calc-hook-visibility");
   Variable write_performances_midis ("write-performances-midis");
+}
+
+namespace Syntax {
+  Scm_module module ("scm ly-syntax-constructors");
 
   Variable add_lyrics ("add-lyrics");
   Variable argument_error ("argument-error");
@@ -107,7 +118,14 @@ namespace Lily {
   Variable multi_measure_rest ("multi-measure-rest");
   Variable music_function ("music-function");
   Variable music_function_call_error ("music-function-call-error");
-  Variable property_operation ("property-operation");
+  Variable partial_markup ("partial-markup");
+  Variable partial_music_function ("partial-music-function");
+  Variable property_override ("property-override");
+  Variable property_override_function ("property-override-function");
+  Variable property_revert ("property-revert");
+  Variable property_set ("property-set");
+  Variable property_set_function ("property-set-function");
+  Variable property_unset ("property-unset");
   Variable repeat ("repeat");
   Variable repetition_chord ("repetition-chord");
   Variable sequential_music ("sequential-music");