Merge branch 'master' into dev/johngourlay/issue-4751

[lilypond.git] / lily / include / lily-imports.hh

diff --git a/lily/include/lily-imports.hh b/lily/include/lily-imports.hh
index 68b8102444df29b8d3667c1eb44e5263886f1f37..97982895f50c851ef1b993c157956fdf9fb771b6 100644 (file)
--- a/lily/include/lily-imports.hh
+++ b/lily/include/lily-imports.hh
@@ -26,6 +26,7 @@ namespace Guile_user {
   extern Scm_module module;
   typedef Module_variable<module> Variable;
 
+  extern Variable apply;
   extern Variable plus;
   extern Variable make_module;
 #if GUILEV2
@@ -59,9 +60,13 @@ namespace Lily {
   extern Variable car_less;
   extern Variable construct_chord_elements;
   extern Variable default_time_signature_settings;
+  extern Variable grob_compose_function;
+  extern Variable grob_offset_function;
   extern Variable hash_table_to_alist;
   extern Variable interpret_markup_list;
   extern Variable invalidate_alterations;
+  extern Variable key_p;
+  extern Variable key_list_p;
   extern Variable key_signature_interface_alteration_positions;
   extern Variable layout_extract_page_properties;
   extern Variable lilypond_main;
@@ -101,6 +106,11 @@ namespace Lily {
   extern Variable type_name;
   extern Variable volta_bracket_calc_hook_visibility;
   extern Variable write_performances_midis;
+}
+
+namespace Syntax {
+  extern Scm_module module;
+  typedef Module_variable<module> Variable;
 
   extern Variable add_lyrics;
   extern Variable argument_error;
@@ -113,7 +123,14 @@ namespace Lily {
   extern Variable multi_measure_rest;
   extern Variable music_function;
   extern Variable music_function_call_error;
-  extern Variable property_operation;
+  extern Variable partial_markup;
+  extern Variable partial_music_function;
+  extern Variable property_override;
+  extern Variable property_override_function;
+  extern Variable property_revert;
+  extern Variable property_set;
+  extern Variable property_set_function;
+  extern Variable property_unset;
   extern Variable repeat;
   extern Variable repetition_chord;
   extern Variable sequential_music;