RptCleanup - fold report/report-system into report

This moves a lot of files and all scm modules that get moved need to have their definition updated.
Aside of that, it also tweaks the install location of the report scm files that are not modules
(but instead included in report.scm).
Lastly, report-system.scm has been renamed to report.scm to match the gnc-module name.
This required a rename of the original report.scm (which is not a module). I chose to rename
that to report-core.scm as it's implementing the guts of the report system.

Still missing in this commit: some compatibility code to give users a warning when they try to
use the old scm module names.

.gitignore

@@ -173,8 +173,8 @@ gnucash/register/register-gnome/test/test-link-module
 gnucash/report/business-reports/gnucash
 gnucash/report/locale-specific/us/gnucash
 gnucash/report/locale-specific/us/test/test-link-module
-gnucash/report/report-system/gnucash
-gnucash/report/report-system/test/test-link-module
+gnucash/report/gnucash
+gnucash/report/test/test-link-module
 gnucash/report/reports/gnucash
 gnucash/report/stylesheets/gnucash
 gnucash/report/utility-reports/gnucash

gnucash/CMakeLists.txt

@@ -66,7 +66,7 @@ endif (BUILDING_FROM_VCS)
 
 target_link_libraries (gnucash
    gncmod-ledger-core gnc-gnome gncmod-gnome-utils gncmod-app-utils
-   gncmod-engine gnc-module gnc-core-utils gncmod-report-system
+   gncmod-engine gnc-module gnc-core-utils gncmod-report
    ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
 

gnucash/gnome/CMakeLists.txt

@@ -134,7 +134,7 @@ set (gnc_gnome_SOURCES
 set_source_files_properties (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
 add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})
-target_link_libraries(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-html gncmod-report-system
+target_link_libraries(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-html gncmod-report
     gncmod-register-gnome gncmod-register-core gncmod-gnome-utils gncmod-engine ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS})
 
 target_compile_definitions (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})
@@ -228,7 +228,7 @@ set(GUILE_DEPENDS
     scm-gnome-utils
     scm-gnc-module
     scm-scm
-    scm-report-system
+    scm-report
     scm-reports
 )
 

gnucash/gnome/report-menus.scm

@@ -37,7 +37,7 @@
 (use-modules (sw_gnome))
 
 (gnc:module-load "gnucash/gnome-utils" 0)
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (export gnc:report-menu-setup)
 (export gnc:add-report-template-menu-items)

gnucash/gnucash-bin.c

@@ -501,7 +501,7 @@ load_gnucash_modules()
         { "gnucash/import-export/aqbanking", 0, TRUE },
         { "gnucash/import-export/bi-import", 0, TRUE},
         { "gnucash/import-export/customer-import", 0, TRUE},
-        { "gnucash/report/report-system", 0, FALSE },
+        { "gnucash/report", 0, FALSE },
         { "gnucash/report/stylesheets", 0, FALSE },
         { "gnucash/report/locale-specific/us", 0, FALSE },
         { "gnucash/python", 0, TRUE },

gnucash/report/CMakeLists.txt

@@ -1,10 +1,113 @@
 
 add_subdirectory(jqplot)
 add_subdirectory(locale-specific)
-add_subdirectory(report-system)
 add_subdirectory(reports)
 add_subdirectory(stylesheets)
+add_subdirectory(test)
 
-set_local_dist(report_DIST_local CMakeLists.txt )
-set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST} ${report_system_DIST}
-                ${reports_DIST} ${stylesheets_DIST} PARENT_SCOPE)
+set (report_HEADERS
+  gnc-report.h
+)
+
+# Command to generate the swig-report.c wrapper file
+gnc_add_swig_guile_command (swig-report-c
+    SWIG_REPORT_C swig-report.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/report.i ${report_HEADERS}
+)
+
+set (report_SOURCES
+  gncmod-report.c
+  gnc-report.c
+)
+
+add_library (gncmod-report
+  ${report_SOURCES}
+  ${report_HEADERS}
+  ${SWIG_REPORT_C}
+)
+
+target_compile_definitions(gncmod-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
+
+target_link_libraries(gncmod-report gnc-module gncmod-app-utils ${GTK3_LDFLAGS} ${GUILE_LDFLAGS})
+
+target_include_directories (gncmod-report
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${GTK3_INCLUDE_DIRS}
+)
+
+
+if (APPLE)
+  set_target_properties (gncmod-report PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+endif()
+
+install(TARGETS gncmod-report
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+install(FILES ${report_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
+
+# Scheme
+
+set (report_SCHEME
+    report.scm
+    eguile-gnc.scm
+    eguile-utilities.scm
+    eguile-html-utilities.scm
+)
+
+set (report_SCHEME_2
+    commodity-utilities.scm
+    html-acct-table.scm
+    html-chart.scm
+    html-barchart.scm
+    html-document.scm
+    html-fonts.scm
+    html-piechart.scm
+    html-scatter.scm
+    html-linechart.scm
+    html-style-info.scm
+    html-style-sheet.scm
+    html-anytag.scm
+    html-table.scm
+    html-text.scm
+    html-utilities.scm
+    options-utilities.scm
+    report-core.scm
+    report-utilities.scm
+    report-register-hooks.scm
+    trep-engine.scm
+)
+
+set(GUILE_DEPENDS
+  gncmod-html
+  scm-gnome-utils
+  gncmod-report
+  scm-app-utils
+  scm-scm
+  scm-gnc-module
+  )
+
+gnc_add_scheme_targets(scm-report-1
+  "${report_SCHEME}"
+  "gnucash/report"
+  "${GUILE_DEPENDS}"
+  FALSE
+)
+
+gnc_add_scheme_targets(scm-report-2
+  "${report_SCHEME_2}"
+  "gnucash/report"
+  scm-report-1
+  TRUE
+)
+
+add_custom_target(scm-report ALL DEPENDS scm-report-2)
+
+set_local_dist(report_DIST_local CMakeLists.txt
+  report.i
+  ${report_HEADERS} ${report_SOURCES}
+  ${report_SCHEME} ${report_SCHEME_1}
+  ${report_SCHEME_2})
+
+set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST}
+                ${reports_DIST} ${stylesheets_DIST} ${test_report_DIST} PARENT_SCOPE)

gnucash/report/eguile-html-utilities.scm

@@ -29,7 +29,7 @@
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash app-utils))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/app-utils" 0)
 
 (use-modules (ice-9 regex))  ; for regular expressions

gnucash/report/eguile-utilities.scm

@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/app-utils" 0)
 
 

gnucash/report/gncmod-report.c

@@ -1,5 +1,5 @@
 /*********************************************************************
- * gncmod-report-system.c
+ * gncmod-report.c
  * module definition/initialization for the report infrastructure
  *
  * Copyright (c) 2001 Linux Developers Group, Inc.
@@ -32,33 +32,33 @@
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
-GNC_MODULE_API_DECL(libgncmod_report_system)
+GNC_MODULE_API_DECL(libgncmod_report)
 
 /* version of the gnc module system interface we require */
-int libgncmod_report_system_gnc_module_system_interface = 0;
+int libgncmod_report_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_report_system_gnc_module_current  = 0;
-int libgncmod_report_system_gnc_module_revision = 0;
-int libgncmod_report_system_gnc_module_age      = 0;
+int libgncmod_report_gnc_module_current  = 0;
+int libgncmod_report_gnc_module_revision = 0;
+int libgncmod_report_gnc_module_age      = 0;
 
 
 char *
-libgncmod_report_system_gnc_module_path(void)
+libgncmod_report_gnc_module_path(void)
 {
-    return g_strdup("gnucash/report/report-system");
+    return g_strdup("gnucash/report");
 }
 
 char *
-libgncmod_report_system_gnc_module_description(void)
+libgncmod_report_gnc_module_description(void)
 {
     return g_strdup("Core components of GnuCash report generation system");
 }
 
-extern SCM scm_init_sw_report_system_module(void);
+extern SCM scm_init_sw_report_module(void);
 
 int
-libgncmod_report_system_gnc_module_init(int refcount)
+libgncmod_report_gnc_module_init(int refcount)
 {
     /* load the engine (we depend on it) */
     if (!gnc_module_load("gnucash/engine", 0))
@@ -70,9 +70,9 @@ libgncmod_report_system_gnc_module_init(int refcount)
     {
         return FALSE;
     }
-    scm_init_sw_report_system_module();
+    scm_init_sw_report_module();
 
-    scm_c_eval_string("(use-modules (gnucash report report-system))");
+    scm_c_eval_string("(use-modules (gnucash report report))");
 
     /* if this is the first time the module's being loaded, initialize
      * the relative date system */
@@ -85,7 +85,7 @@ libgncmod_report_system_gnc_module_init(int refcount)
 }
 
 int
-libgncmod_report_system_gnc_module_end(int refcount)
+libgncmod_report_gnc_module_end(int refcount)
 {
     return TRUE;
 }

gnucash/report/html-barchart.scm

@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define <html-barchart>
   (make-record-type "<html-barchart>"

gnucash/report/html-linechart.scm

@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define <html-linechart>
   (make-record-type "<html-linechart>"

gnucash/report/html-piechart.scm

@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define <html-piechart>
   (make-record-type "<html-piechart>"

gnucash/report/html-scatter.scm

@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define <html-scatter>
   (make-record-type "<html-scatter>"

gnucash/report/locale-specific/us/CMakeLists.txt

@@ -38,7 +38,7 @@ set(GUILE_DEPENDS
   scm-scm
   scm-test-core
   scm-tax-us
-  scm-report-system
+  scm-report
   scm-gnome-utils
   )
 

gnucash/report/locale-specific/us/gncmod-locale-reports-us.c

@@ -98,7 +98,7 @@ libgncmod_locale_reports_us_gnc_module_init(int refcount)
     }
 
     /* load the report system */
-    if (!gnc_module_load("gnucash/report/report-system", 0))
+    if (!gnc_module_load("gnucash/report", 0))
     {
         return FALSE;
     }

gnucash/report/locale-specific/us/taxtxf-de_DE.scm

@@ -74,7 +74,7 @@
 
 (use-modules (gnucash gnc-module))
 (gnc:module-load "gnucash/tax/de_DE" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/engine" 0)
 
 (define reportname (N_ "Tax Report / TXF Export"))
@@ -119,7 +119,7 @@
            (<= t end-date)))))
 
 ;; This is nearly identical to, and could be shared with
-;; display-report-list-item in report.scm. This adds warn-msg parameter
+;; display-report-list-item in report-impl.scm. This adds warn-msg parameter
 (define (gnc:display-report-list-item item port warn-msg)
   (cond
    ((string? item) (display item port))

gnucash/report/locale-specific/us/taxtxf.scm

@@ -113,7 +113,7 @@
 
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/tax/us" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Tax Schedule Report/TXF Export"))
 
@@ -151,7 +151,7 @@
            (<= t64 end-date-t64)))))
 
 ;; This is nearly identical to, and could be shared with
-;; display-report-list-item in report.scm. This adds warn-msg parameter
+;; display-report-list-item in report-impl.scm. This adds warn-msg parameter
 (define (gnc:display-report-list-item item port warn-msg)
   (cond
    ((string? item) (display item port))

gnucash/report/report-core.scm

@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; report.scm : structures/utilities for representing reports 
+;; report-impl.scm : structures/utilities for representing reports
 ;; Copyright 2000 Bill Gribble <grib@gnumatic.com>
 ;;
 ;; This program is free software; you can redistribute it and/or    
@@ -24,8 +24,8 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash gettext))
 (eval-when (compile load eval expand)
-  (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module"))
-(use-modules (sw_report_system))
+  (load-extension "libgncmod-report" "scm_init_sw_report_module"))
+(use-modules (sw_report))
 
 ;; Terminology in this file:
 ;; report-template: a report definition of some form. This can be a report
@@ -94,11 +94,11 @@
 (define (gui-error str)
   (if (gnucash-ui-is-running)
       (gnc-error-dialog '() str)
-      (gnc:error "report.scm error: " str)))
+      (gnc:error "report-impl.scm error: " str)))
 (define (gui-warning str)
   (if (gnucash-ui-is-running)
       (gnc-warning-dialog '() str)
-      (gnc:warn "report.scm warning: " str)))
+      (gnc:warn "report-impl.scm warning: " str)))
 (define (gui-error-missing-template template-name)
   (gui-error
    (string-append

gnucash/report/report-system/CMakeLists.txt

@@ -1,107 +0,0 @@
-add_subdirectory(test)
-
-set (report_system_HEADERS
-  gnc-report.h
-)
-
-# Command to generate the swig-report-system.c wrapper file
-gnc_add_swig_guile_command (swig-report-system-c
-    SWIG_REPORT_SYSTEM_C swig-report-system.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/report-system.i ${report_system_HEADERS}
-)
-
-set (report_system_SOURCES
-  gncmod-report-system.c
-  gnc-report.c
-)  
-
-add_library (gncmod-report-system
-  ${report_system_SOURCES}
-  ${report_system_HEADERS}
-  ${SWIG_REPORT_SYSTEM_C}
-)
-
-target_compile_definitions(gncmod-report-system PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
-
-target_link_libraries(gncmod-report-system gnc-module gncmod-app-utils ${GTK3_LDFLAGS} ${GUILE_LDFLAGS})
-
-target_include_directories (gncmod-report-system
-    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${GTK3_INCLUDE_DIRS}
-)
-
-
-if (APPLE)
-  set_target_properties (gncmod-report-system PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-endif()
-
-install(TARGETS gncmod-report-system
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-install(FILES ${report_system_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
-
-# Scheme
-
-set (report_system_SCHEME
-    report-system.scm
-    eguile-gnc.scm
-    eguile-utilities.scm
-    eguile-html-utilities.scm
-)
-
-set (report_system_SCHEME_2
-    commodity-utilities.scm
-    html-acct-table.scm
-    html-chart.scm
-    html-barchart.scm
-    html-document.scm
-    html-fonts.scm
-    html-piechart.scm
-    html-scatter.scm
-    html-linechart.scm
-    html-style-info.scm
-    html-style-sheet.scm
-    html-anytag.scm
-    html-table.scm
-    html-text.scm
-    html-utilities.scm
-    options-utilities.scm
-    report-utilities.scm
-    report-register-hooks.scm
-    report.scm
-    trep-engine.scm
-)
-
-set(GUILE_DEPENDS
-  gncmod-html
-  scm-gnome-utils
-  gncmod-report-system
-  scm-app-utils
-  scm-scm
-  scm-gnc-module
-  )
-
-gnc_add_scheme_targets(scm-report-system-1
-  "${report_system_SCHEME}"
-  "gnucash/report"
-  "${GUILE_DEPENDS}"
-  FALSE
-)
-
-gnc_add_scheme_targets(scm-report-system-2
-  "${report_system_SCHEME_2}"
-  ""
-  scm-report-system-1
-  FALSE
-)
-
-add_custom_target(scm-report-system ALL DEPENDS scm-report-system-2)
-
-set_local_dist(report_system_DIST_local CMakeLists.txt
-  report-system.i
-  ${report_system_HEADERS} ${report_system_SOURCES}
-  ${report_system_SCHEME} ${report_system_SCHEME_1}
-  ${report_system_SCHEME_2})
-
-set(report_system_DIST ${report_system_DIST_local} ${test_report_system_DIST} PARENT_SCOPE)

gnucash/report/report-system/test/CMakeLists.txt

@@ -1,72 +0,0 @@
-
-set(REPORT_SYSTEM_TEST_INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
-  ${GUILE_INCLUDE_DIRS}
-)
-set(REPORT_SYSTEM_TEST_LIBS gnc-module)
-
-gnc_add_test_with_guile(test-link-module-report-system test-link-module.c
-  REPORT_SYSTEM_TEST_INCLUDE_DIRS REPORT_SYSTEM_TEST_LIBS
-)
-
-set(scm_test_report_system_SOURCES
-  test-load-report-system-module.scm
-  test-test-extras.scm
-)
-
-set (scm_test_report_system_with_srfi64_SOURCES
-  test-commodity-utils.scm
-  test-report-utilities.scm
-  test-html-utilities-srfi64.scm
-  test-html-fonts.scm
-  test-html-chart.scm
-  test-report-html.scm
-  test-report-system.scm
-  )
-
-set(GUILE_DEPENDS
-  scm-gnc-module
-  scm-app-utils
-  scm-core-utils
-  scm-gettext
-  scm-engine
-  scm-test-engine
-  scm-scm
-  scm-report-system
-  scm-test-report-system
-  )
-gnc_add_scheme_tests("${scm_test_report_system_SOURCES}")
-
-if (HAVE_SRFI64)
-  gnc_add_scheme_test_targets(scm-test-report-system-srfi64
-    "${scm_test_report_system_with_srfi64_SOURCES}"
-    "tests"
-    "${GUILE_DEPENDS};scm-srfi64-extras"
-    FALSE
-    )
-
-  gnc_add_scheme_tests ("${scm_test_report_system_with_srfi64_SOURCES}")
-endif (HAVE_SRFI64)
-
-gnc_add_scheme_test_targets(scm-test-report-system
-  "test-report-system-extras.scm"
-  "tests"
-  "${GUILE_DEPENDS}"
-  FALSE
-  )
-
-gnc_add_scheme_test_targets(scm-test-report-system-2
-  "${scm_test_report_system_SOURCES}"
-  "tests"
-  "scm-test-report-system"
-  FALSE
-)
-
-add_dependencies(check scm-test-report-system)
-set_dist_list(test_report_system_DIST
-  CMakeLists.txt
-  ${scm_test_report_system_with_srfi64_SOURCES}
-  ${scm_test_report_system_SOURCES}
-  test-report-system-extras.scm
-  test-link-module.c
-)

gnucash/report/report.i

@@ -18,7 +18,7 @@
  *                                                                  *
 \********************************************************************/
 
-%module sw_report_system
+%module sw_report
 %{
 /* Includes the header in the wrapper code */
 #include <config.h>
@@ -28,7 +28,7 @@
 %{
 #include "guile-mappings.h"
 
-SCM scm_init_sw_report_system_module (void);
+SCM scm_init_sw_report_module (void);
 %}
 #endif
 
@@ -41,4 +41,4 @@ gint gnc_report_add(SCM report);
 gchar* gnc_get_default_report_font_family();
 
 void gnc_saved_reports_backup (void);
-gboolean gnc_saved_reports_write_to_file (const gchar* report_def, gboolean overwrite);
+gboolean gnc_saved_reports_write_to_file (const gchar* report_def, gboolean overwrite);

gnucash/report/report.scm

@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  report-system.scm
+;;  report.scm
 ;;  module definition for the report system code
 ;;
 ;;  Copyright (c) 2001 Linux Developers Group, Inc.
@@ -24,7 +24,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report report-system))
+(define-module (gnucash report report))
 (use-modules (gnucash utilities)) 
 (use-modules (ice-9 regex))
 (use-modules (srfi srfi-1))
@@ -122,7 +122,7 @@
 (export gnc:html-css-include)
 (export gnc:html-string-sanitize)
 
-;; report.scm
+;; report-core.scm
 (export gnc:menuname-reports)
 (export gnc:menuname-asset-liability)
 (export gnc:menuname-income-expense)
@@ -758,27 +758,27 @@
 (export gnc:lookup-register-report)
 
 
-(load-from-path "commodity-utilities")
-(load-from-path "html-chart")
-(load-from-path "html-barchart")
-(load-from-path "html-document")
-(load-from-path "html-piechart")
-(load-from-path "html-scatter")
-(load-from-path "html-linechart")
-(load-from-path "html-style-info")
-(load-from-path "html-fonts")
+(load-from-path "gnucash/report/commodity-utilities")
+(load-from-path "gnucash/report/html-chart")
+(load-from-path "gnucash/report/html-barchart")
+(load-from-path "gnucash/report/html-document")
+(load-from-path "gnucash/report/html-piechart")
+(load-from-path "gnucash/report/html-scatter")
+(load-from-path "gnucash/report/html-linechart")
+(load-from-path "gnucash/report/html-style-info")
+(load-from-path "gnucash/report/html-fonts")
 
-(load-from-path "html-style-sheet")
-(load-from-path "html-anytag")
-(load-from-path "html-table")
-(load-from-path "html-text")
-(load-from-path "html-acct-table")
-(load-from-path "html-utilities")
-(load-from-path "options-utilities")
-(load-from-path "report-utilities")
-(load-from-path "report-register-hooks")
-(load-from-path "report")
-(load-from-path "trep-engine")
+(load-from-path "gnucash/report/html-style-sheet")
+(load-from-path "gnucash/report/html-anytag")
+(load-from-path "gnucash/report/html-table")
+(load-from-path "gnucash/report/html-text")
+(load-from-path "gnucash/report/html-acct-table")
+(load-from-path "gnucash/report/html-utilities")
+(load-from-path "gnucash/report/options-utilities")
+(load-from-path "gnucash/report/report-utilities")
+(load-from-path "gnucash/report/report-register-hooks")
+(load-from-path "gnucash/report/report-core")
+(load-from-path "gnucash/report/trep-engine")
 
 ;; Report uuids used for the category barcharts
 

gnucash/report/reports/CMakeLists.txt

@@ -67,7 +67,7 @@ set(scm_rpts_GUILE_DEPENDS
   scm-gettext
   scm-scm
   scm-gnome-utils
-  scm-report-system
+  scm-report
   )
 
 set(scm_rpt_example_GUILE_DEPENDS
@@ -79,7 +79,7 @@ set(scm_rpt_example_GUILE_DEPENDS
   scm-scm
   scm-reports-example-links
   scm-gnome-utils
-  scm-report-system
+  scm-report
   )
 
 set(scm_rpt_std_GUILE_DEPENDS

gnucash/report/reports/aging.scm

@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash report reports))
 

gnucash/report/reports/example/average-balance.scm

@@ -31,7 +31,7 @@
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Average Balance"))
 

gnucash/report/reports/example/daily-reports.scm

@@ -32,7 +32,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define menuname-income (N_ "Income vs. Day of Week"))
 (define menuname-expense (N_ "Expenses vs. Day of Week"))

gnucash/report/reports/example/hello-world.scm

@@ -30,7 +30,7 @@
 
 (debug-enable 'backtrace)
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0) ;for gnc-build-url
 
 ;; This function will generate a set of options that GnuCash

gnucash/report/reports/example/sample-graphs.scm

@@ -32,7 +32,7 @@
 ;; Use (_ string) to use a translation of this string if it exists.
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 ;; It's common to define frequently used strings once

gnucash/report/reports/example/welcome-to-gnucash.scm

@@ -29,10 +29,10 @@
 (use-modules (gnucash gnc-module))
 (eval-when
       (compile load eval expand)
-      (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module"))
-(use-modules (sw_report_system))
+      (load-extension "libgncmod-report" "scm_init_sw_report_module"))
+(use-modules (sw_report))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (options)
   (gnc:new-options))

gnucash/report/reports/reports.scm

@@ -28,7 +28,7 @@
 (use-modules (srfi srfi-13))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash utilities))
 
 (export gnc:register-report-create)

gnucash/report/reports/standard/account-piecharts.scm

@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define menuname-income (N_ "Income Piechart"))
 (define menuname-expense (N_ "Expense Piechart"))

gnucash/report/reports/standard/account-summary.scm

@@ -55,7 +55,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; account summary report prints a table of account information,
 ;; optionally with clickable links to open the corresponding register

gnucash/report/reports/standard/advanced-portfolio.scm

@@ -32,7 +32,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Advanced Portfolio"))
 

gnucash/report/reports/standard/balance-forecast.scm

@@ -29,7 +29,7 @@
 (use-modules (gnucash gettext))
 (use-modules (srfi srfi-1))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ; Name definitions
 (define reportname           (N_ "Balance Forecast"))

gnucash/report/reports/standard/balance-sheet.scm

@@ -67,7 +67,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Balance Sheet"))
 

gnucash/report/reports/standard/balsheet-eg.scm

@@ -42,7 +42,7 @@
 (use-modules (ice-9 local-eval))  ; for the-environment
 (use-modules (srfi srfi-13)) ; for extra string functions
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0)
 
 (define debugging? #f)

gnucash/report/reports/standard/balsheet-pnl.scm

@@ -31,7 +31,7 @@
 (use-modules (gnucash gettext))
 (use-modules (srfi srfi-1))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define FOOTER-TEXT
   (gnc:make-html-text

gnucash/report/reports/standard/budget-balance-sheet.scm

@@ -33,7 +33,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Budget Balance Sheet"))
 

gnucash/report/reports/standard/budget-barchart.scm

@@ -31,7 +31,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname
   (N_ "Budget Chart"))

gnucash/report/reports/standard/budget-flow.scm

@@ -30,7 +30,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (define reportname

gnucash/report/reports/standard/budget-income-statement.scm

@@ -45,7 +45,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; define all option's names and help text so that they are properly
 ;; defined in *one* place.

gnucash/report/reports/standard/budget.scm

@@ -35,7 +35,7 @@
 
 (use-modules (srfi srfi-1))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (define reportname (N_ "Budget Report"))

gnucash/report/reports/standard/cash-flow.scm

@@ -33,7 +33,7 @@
 (use-modules (gnucash gettext))
 (use-modules (gnucash engine))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
 
 (export cash-flow-calc-money-in-out)

gnucash/report/reports/standard/cashflow-barchart.scm

@@ -35,7 +35,7 @@
 (use-modules (gnucash engine))
 (use-modules (gnucash report reports standard cash-flow))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Cash Flow Barchart"))
 

gnucash/report/reports/standard/category-barchart.scm

@@ -29,7 +29,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; The option names are defined here to 1. save typing and 2. avoid
 ;; spelling errors. The *reportnames* are defined here (and not only

gnucash/report/reports/standard/customer-summary.scm

@@ -33,7 +33,7 @@
 (use-modules (gnucash utilities))                ; for gnc:debug
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (use-modules (gnucash report reports))
 
 ;; Option names

gnucash/report/reports/standard/dashboard.scm

@@ -31,10 +31,10 @@
 (use-modules (gnucash gnc-module))
 (eval-when
       (compile load eval expand)
-      (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module"))
-(use-modules (sw_report_system))
+      (load-extension "libgncmod-report" "scm_init_sw_report_module"))
+(use-modules (sw_report))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define multicolumn-guid "d8ba4a2e89e8479ca9f6eccdeb164588")
 (define acct-summary-guid "3298541c236b494998b236dfad6ad752")

gnucash/report/reports/standard/equity-statement.scm

@@ -50,7 +50,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Equity Statement"))
 

gnucash/report/reports/standard/general-journal.scm

@@ -32,7 +32,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "General Journal"))
 (define regrptname (N_ "Register"))

gnucash/report/reports/standard/general-ledger.scm

@@ -35,7 +35,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "General Ledger"))
 (define xactrptguid "2fe3b9833af044abb929a88d5a59620f")

gnucash/report/reports/standard/income-gst-statement.scm

@@ -31,7 +31,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; Define the strings here to avoid typos and make changes easier.
 (define reportname (N_ "Income and GST Statement"))

gnucash/report/reports/standard/income-statement.scm

@@ -46,7 +46,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 ;; define all option's names and help text so that they are properly
 ;; defined in *one* place.

gnucash/report/reports/standard/invoice.scm

@@ -29,7 +29,7 @@
 (use-modules (gnucash gettext))
 (use-modules (gnucash utilities))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (use-modules (gnucash report reports))
 
 (define (addif pred . data) (if pred data '()))

gnucash/report/reports/standard/job-report.scm

@@ -31,7 +31,7 @@
 (use-modules (gnucash utilities))		; for gnc:debug
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (use-modules (gnucash report reports))
 
 (define acct-string (N_ "Account"))

gnucash/report/reports/standard/net-charts.scm

@@ -33,7 +33,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 
 (define optname-from-date (N_ "Start Date"))

gnucash/report/reports/standard/owner-report.scm

@@ -32,7 +32,7 @@
 (use-modules (gnucash utilities))        ; for gnc:debug
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (use-modules (gnucash report reports))
 
 ;; Option names

gnucash/report/reports/standard/payables.scm

@@ -29,7 +29,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash report reports aging))
 (use-modules (gnucash report reports))

gnucash/report/reports/standard/portfolio.scm

@@ -28,7 +28,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Investment Portfolio"))
 

gnucash/report/reports/standard/price-scatter.scm

@@ -30,7 +30,7 @@
 (use-modules (gnucash core-utils))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define optname-from-date (N_ "Start Date"))
 (define optname-to-date (N_ "End Date"))

gnucash/report/reports/standard/receipt.scm

@@ -20,7 +20,7 @@
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/engine" 0)
 

gnucash/report/reports/standard/receivables.scm

@@ -29,7 +29,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash report reports aging))
 (use-modules (gnucash report reports))

gnucash/report/reports/standard/reconcile-report.scm

@@ -28,7 +28,7 @@
 
 (use-modules (gnucash gettext))
 (use-modules (gnucash gnc-module))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (reconcile-report-options-generator)
   (let ((options (gnc:trep-options-generator)))

gnucash/report/reports/standard/register.scm

@@ -27,7 +27,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define (date-col columns-used)
   (vector-ref columns-used 0))
@@ -708,7 +708,7 @@
 
 ;; we get called from elsewhere... but this doesn't work FIX-ME, find
 ;; out how to get report-guid's exported from report into the report
-;; system at large. might have to define this at the report-system
+;; system at large. might have to define this at the report
 ;; level to get them read by other reports. Look at the aging reports
 ;; for suggestions, perhaps
 (export register-report-guid)

gnucash/report/reports/standard/sx-summary.scm

@@ -38,7 +38,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Future Scheduled Transactions Summary"))
 

gnucash/report/reports/standard/taxinvoice.scm

@@ -28,7 +28,7 @@
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/engine" 0)
 

gnucash/report/reports/standard/test/CMakeLists.txt

@@ -28,7 +28,7 @@ set(GUILE_DEPENDS
   scm-test-engine
   scm-gettext
   scm-scm
-  scm-test-report-system
+  scm-test-report
   scm-reports
   scm-report-stylesheets
   )

gnucash/report/reports/standard/test/test-average-balance.scm

@@ -1,11 +1,11 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports example average-balance))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash report reports standard budget))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets))
 (use-modules (tests srfi64-extras))
 (use-modules (srfi srfi-1))

gnucash/report/reports/standard/test/test-balsheet-pnl.scm

@@ -4,8 +4,8 @@
 (use-modules (gnucash report reports standard balance-sheet))
 (use-modules (gnucash report reports standard income-statement))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (sxml simple))

gnucash/report/reports/standard/test/test-budget.scm

@@ -23,15 +23,15 @@
 (use-modules (gnucash gnc-module))
 (use-modules (tests srfi64-extras))
 
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard budget))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets))
 (use-modules (tests test-engine-extras))
 

gnucash/report/reports/standard/test/test-cash-flow.scm

@@ -4,7 +4,7 @@
 
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard cash-flow))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 
 (define (run-test)
   (and (test test-one-tx-in-cash-flow)

gnucash/report/reports/standard/test/test-cashflow-barchart.scm

@@ -20,14 +20,14 @@
 (use-modules (gnucash gnc-module))
 
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard cashflow-barchart))
 (use-modules (gnucash report stylesheets))
 (use-modules (srfi srfi-1))

gnucash/report/reports/standard/test/test-charts.scm

@@ -8,8 +8,8 @@
 (use-modules (gnucash report reports standard price-scatter))
 (use-modules (gnucash report reports example daily-reports))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (sxml simple))

gnucash/report/reports/standard/test/test-income-gst.scm

@@ -3,8 +3,8 @@
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard income-gst-statement))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (sxml simple))

gnucash/report/reports/standard/test/test-invoice.scm

@@ -3,8 +3,8 @@
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash report reports standard invoice))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))

gnucash/report/reports/standard/test/test-register.scm

@@ -28,15 +28,15 @@
 ;; causing the test to fail
 ;; That's what the wrapper below is meant for:
 
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard register))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets))
 (use-modules (tests test-engine-extras))
 

gnucash/report/reports/standard/test/test-standard-category-report.scm

@@ -28,15 +28,15 @@
 ;; causing the test to fail
 ;; That's what the wrapper below is meant for:
 
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash utilities)) 
-(use-modules (gnucash report report-system))
+(use-modules (gnucash report report))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (gnucash report reports standard net-charts))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard category-barchart))
 (use-modules (gnucash report stylesheets))
 (use-modules (tests test-engine-extras))

gnucash/report/reports/standard/test/test-standard-net-barchart.scm

@@ -18,7 +18,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (srfi srfi-1))
@@ -26,7 +26,7 @@
 (use-modules (gnucash report stylesheets))
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard net-charts))
 
 ;; Explicitly set locale to make the report output predictable

gnucash/report/reports/standard/test/test-standard-net-linechart.scm

@@ -18,7 +18,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
 (use-modules (srfi srfi-1))
@@ -26,7 +26,7 @@
 (use-modules (gnucash report stylesheets))
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
-(use-modules (tests test-report-system-extras))
+(use-modules (tests test-report-extras))
 (use-modules (gnucash report reports standard net-charts))
 
 ;; Explicitly set locale to make the report output predictable

gnucash/report/reports/standard/test/test-stress-options.scm

@@ -8,8 +8,8 @@
 (use-modules (gnucash report reports standard view-column))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report reports standard taxinvoice))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (srfi srfi-98))
 (use-modules (tests srfi64-extras))

gnucash/report/reports/standard/test/test-transaction.scm

@@ -4,8 +4,8 @@
 (use-modules (gnucash report reports standard transaction))
 (use-modules (gnucash report reports standard reconcile-report))
 (use-modules (gnucash report stylesheets))
-(use-modules (gnucash report report-system))
-(use-modules (tests test-report-system-extras))
+(use-modules (gnucash report report))
+(use-modules (tests test-report-extras))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (sxml simple))

gnucash/report/reports/standard/transaction.scm

@@ -26,7 +26,7 @@
 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (gnc:define-report
  'version 1

gnucash/report/reports/standard/trial-balance.scm

@@ -55,7 +55,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-load "gnucash/report" 0)
 
 (define reportname (N_ "Trial Balance"))