* flower/string-convert.cc: remove publib.h

* scm/define-markup-commands.scm (verbatim-file): new markup
command \verbatim-file

diff --git a/ChangeLog b/ChangeLog
index 784a214849f985ac2c71ec5fc7468ea819d3b97b..cc1e4e602b21fd3cae919ccd3aea1cb2b4b45791 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * flower/string-convert.cc: remove publib.h
+
        * scm/define-markup-commands.scm (verbatim-file): new markup
        command \verbatim-file
 

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 7f36355fa883c269ca936ee91cb98d4e4f7e01ff..140c77632deb526a681c3e22556e7977cbfbfa79 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -6,7 +6,6 @@
 
 #include "string-convert.hh"
 
-#include <publib.h>
 #include <cstring>
 #include <cstdio>
 using namespace std;

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 10c68a27af077a33a523db245c0d352ddb1390ec..a914e69888281ed608775125313be7355bd1078e 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -756,7 +756,7 @@ any sort of property supported by @internalsref{font-interface} and
   (interpret-markup
    layout props
    (if  (ly:get-option 'safe)
-       "Cannot read file in Safe mode"
+       "verbatim-file disabled in safe mode"
        (let*
            ((str (ly:gulp-file name))
             (lines (string-split str #\nl)))