(c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <locale.h>
-#include <string.h>
+#include "main.hh"
+
+#include <cassert>
+#include <clocale>
+#include <cstring>
#include "config.hh"
#include "all-font-metrics.hh"
#include "file-name.hh"
-#include "file-path.hh"
#include "getopt-long.hh"
#include "global-ctor.hh"
#include "kpath.hh"
#include "lily-guile.hh"
#include "lily-version.hh"
-#include "main.hh"
#include "misc.hh"
#include "output-def.hh"
-#include "string.hh"
#include "warn.hh"
+#include "freetype.hh"
/*
* Global options that can be overridden through command line.
/* 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 output_format_global = "ps";
+ One of tex, ps, scm, as.
+*/
+String output_format_global = "tex";
/* Current output name. */
String output_name_global;
bool make_ps = false;
bool make_png = false;
bool make_preview = false;
+bool make_pages = true;
bool make_tex = false;
/*
static Long_option_init options_static[] =
{
{_i ("EXPR"), "evaluate", 'e',
- _i ("set options, use -e '(ly:option-usage)' for help")},
- /* Bug in option parser: --output=foe is taken as an abbreviation
+ _i ("set option, 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 ("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, "no-pages", 0, _i ("don't generate full pages")},
{0, "png", 0, _i ("generate PNG")},
{0, "ps", 0, _i ("generate PostScript")},
{0, "dvi", 0, _i ("generate DVI")},
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 : ""));
}
identify (FILE *out)
{
fputs (gnu_lilypond_version_string ().to_str0 (), out);
+ fputs ("\n", out);
}
static void
notice ()
{
identify (stdout);
- printf ("\n");
printf (_f (NOTICE, PROGRAM_NAME).to_str0 ());
printf ("\n");
copyright ();
usage ()
{
/* No version number or newline here. It confuses help2man. */
- printf (_f ("Usage: %s [OPTIONS]... FILE...", PROGRAM_NAME).to_str0 ());
+ printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ());
printf ("\n\n");
printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ());
printf ("\n\n");
/* Adding mf/out make lilypond unchanged source directory, when setting
LILYPONDPREFIX to lilypond-x.y.z */
- char *suffixes[] = {"ly", "afm", "mf/out", "scm", "tfm", "ps", 0};
+ char *suffixes[] = {"ly", "otf", "mf/out", "scm", "tfm", "ps", "svg", 0};
for (unsigned i = 0; prefix_directory[i]; i++)
for (char **s = suffixes; *s; s++)
static void
determine_output_options ()
{
-
- bool found_tex = false;
- SCM formats = ly_output_formats ();
- for (SCM s = formats; ly_c_pair_p (s); s = ly_cdr (s))
+ bool found_gnome = (output_format_global == "gnome");
+ bool found_svg = (output_format_global == "svg");
+ bool found_tex = (output_format_global == "tex");
+
+
+ if (make_pdf || make_png)
{
- found_tex = found_tex || (ly_scm2string (ly_car (s)) == "tex");
+ make_ps = true;
}
-
-
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))
+ if (!found_gnome
+ && !found_svg
+ && !(make_dvi
+ || make_tex
+ || make_ps
+ || make_png
+ || make_pdf))
{
make_pdf = true;
make_ps = true;
}
}
+void init_global_tweak_registry ();
+
static void
main_with_guile (void *, int, char **)
{
ly_c_init_guile ();
call_constructors ();
- progress_indication ("\n");
-
+ init_global_tweak_registry ();
+ init_freetype ();
determine_output_options ();
all_fonts_global = new All_font_metrics (global_path.to_string ());
exit (2);
}
- SCM result = scm_call_1 (ly_scheme_function ("lilypond-main"), files);
+ SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files);
(void) result;
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;
+ else if (String (opt->longname_str0_) == "no-pages")
+ make_pages = false;
break;
case 'v':
safe_global_b = true;
break;
case 'm':
- no_paper_global_b = true;
+ no_layout_global_b = true;
break;
case 'p':
make_preview = true;
if (help_b)
{
+ identify (stdout);
usage ();
if (verbose_global_b)
dir_info (stdout);
int
main (int argc, char **argv)
{
- setup_localisation ();
+ setup_localisation ();
setup_paths ();
parse_argv (argc, argv);
+ identify (stderr);
initialize_kpathsea (argv[0]);
scm_boot_guile (argc, argv, main_with_guile, 0);