#include <locale.h>
#include <string.h>
-#include "config.h"
+#include "config.hh"
#if HAVE_GETTEXT
#include <libintl.h>
#include "lily-guile.hh"
#include "lily-version.hh"
#include "main.hh"
-#include "midi-def.hh"
#include "misc.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "string.hh"
#include "warn.hh"
/* Name of initialisation file. */
String init_name_global;
-/* Do not calculate and write paper output? */
-bool no_paper_global_b = false;
+/* Do not calculate and write layout output? */
+bool no_layout_global_b = false;
/* Selected output format.
One of tex, ps, scm, as. */
*/
String init_scheme_code_string = "(begin #t ";
-
+bool make_pdf = false;
+bool make_dvi = false;
+bool make_ps = false;
+bool make_png = false;
+bool make_preview = false;
+bool make_tex = false;
/*
* Miscellaneous global stuff.
" Han-Wen Nienhuys <hanwen@cs.uu.nl>\n"
" Jan Nieuwenhuizen <janneke@gnu.org>\n";
-static char const *PROGRAM_NAME = "lilypond-bin";
+static char const *PROGRAM_NAME = "lilypond";
static char const *PROGRAM_URL = "http://lilypond.org";
static char const *NOTICE =
_i ("This program is free software. It is covered by the GNU General Public\n"
"License and you are welcome to change it and/or distribute copies of it\n"
- "under certain conditions. Invoke as `lilypond-bin --warranty' for more\n"
+ "under certain conditions. Invoke as `lilypond --warranty' for more\n"
"information.\n");
static char const *WARRANTY =
static Long_option_init options_static[] =
{
{_i ("EXPR"), "evaluate", 'e',
- _i ("set options, use -e '(ly-option-usage)' for help")},
+ _i ("set options, use -e '(ly:option-usage)' for help")},
/* Bug in option parser: --output=foe is taken as an abbreviation
for --output-format. */
- {_i ("EXT"), "format", 'f', _i ("use output format EXT")},
+ {_i ("EXT"), "format", 'f', _i ("select back-end to use")},
{0, "help", 'h', _i ("print this help")},
{_i ("FIELD"), "header", 'H', _i ("write header field to BASENAME.FIELD")},
{_i ("DIR"), "include", 'I', _i ("add DIR to search path")},
{_i ("FILE"), "init", 'i', _i ("use FILE as init file")},
- {0, "no-paper", 'm', _i ("produce MIDI output only")},
+ {0, "no-layout", 'm', _i ("produce MIDI output only")},
{_i ("FILE"), "output", 'o', _i ("write output to FILE")},
+ {0, "preview", 'p', _i ("generate a preview")},
+ {0, "png", 0, _i ("generate PNG")},
+ {0, "ps", 0, _i ("generate PostScript")},
+ {0, "dvi", 0, _i ("generate DVI")},
+ {0, "pdf", 0, _i ("generate PDF (default)")},
+ {0, "tex", 0, _i ("generate TeX")},
{0, "safe-mode", 's', _i ("run in safe mode")},
{0, "version", 'v', _i ("print version number")},
{0, "verbose", 'V', _i ("be verbose")},
dir_info (FILE *out)
{
fputs ("\n", out);
- fprintf (out, "lilypond_datadir: `%s'\n", LILYPOND_DATADIR);
- fprintf (out, "local_lilypond_datadir: `%s'\n", LOCAL_LILYPOND_DATADIR);
- fprintf (out, "localedir: `%s'\n", LOCALEDIR);
+ fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR);
+ fprintf (out, "LOCAL_LILYPOND_DATADIR=\%s\"\n", LOCAL_LILYPOND_DATADIR);
+ fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR);
char *lilypond_prefix = getenv ("LILYPONDPREFIX");
- fprintf (out, "LILYPONDPREFIX: `%s'\n",
+ fprintf (out, "LILYPONDPREFIX=\"%s\"\n",
(lilypond_prefix ? lilypond_prefix : ""));
}
#if !KPATHSEA
/* Urg: GNU make's $ (word) index starts at 1 */
int i = 1;
- while (global_path.try_add (p + to_string (".") + to_string (i)))
+ while (global_path.try_append (p + to_string (".") + to_string (i)))
i++;
#endif
}
scm_c_eval_string (s.to_str0 ());
}
+static void
+determine_output_options ()
+{
+
+ bool found_tex = false;
+ SCM formats = ly_output_formats ();
+ for (SCM s = formats; scm_is_pair (s); s = scm_cdr (s))
+ {
+ found_tex = found_tex || (ly_scm2string (scm_car (s)) == "tex");
+ }
+
+
+ if (make_ps && found_tex)
+ {
+ make_dvi = true;
+ }
+ if (make_pdf || make_png)
+ {
+ make_ps = true;
+ }
+ if (make_dvi && found_tex)
+ {
+ make_tex = true;
+ }
+ if (!(make_dvi
+ || make_tex
+ || make_ps
+ || make_png
+ || make_pdf))
+ {
+ make_pdf = true;
+ make_ps = true;
+ if (found_tex)
+ {
+ make_dvi = true;
+ make_tex = true;
+ }
+ }
+}
+
static void
main_with_guile (void *, int, char **)
{
call_constructors ();
progress_indication ("\n");
+ determine_output_options ();
all_fonts_global = new All_font_metrics (global_path.to_string ());
init_scheme_code_string += ")";
{
switch (opt->shortname_char_)
{
+ case 0:
+ if (String (opt->longname_str0_) == "png")
+ make_png = true;
+ else if (String (opt->longname_str0_) == "pdf")
+ make_pdf = true;
+ else if (String (opt->longname_str0_) == "ps")
+ make_ps = true;
+ else if (String (opt->longname_str0_) == "dvi")
+ make_dvi = true;
+ else if (String (opt->longname_str0_) == "tex")
+ make_tex = true;
+ else if (String (opt->longname_str0_) == "preview")
+ make_preview = true;
+ break;
+
case 'v':
notice ();
exit (0);
{
String s = option_parser->optional_argument_str0_;
File_name file_name (s);
- if (s != "-" && file_name.ext_.is_empty ())
- file_name.ext_ = output_format_global;
output_name_global = file_name.to_string ();
}
break;
safe_global_b = true;
break;
case 'm':
- no_paper_global_b = true;
+ no_layout_global_b = true;
+ break;
+ case 'p':
+ make_preview = true;
break;
default:
+ programming_error (to_string ("unhandled short option: %c",
+ opt->shortname_char_));
assert (false);
break;
}
projects / lilypond.git / blobdiff