Remove .gitignore do nothing is ignored.
[synfig.git] / synfig-core / trunk / src / tool / main.cpp
index c37a2b7..fbf64b0 100644 (file)
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file main.cpp
+/*!    \file tool/main.cpp
 **     \brief SYNFIG Tool
 **
-**     $Id: main.cpp,v 1.9 2005/01/23 04:41:10 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -34,6 +35,7 @@
 #include <list>
 #include <ETL/clock>
 #include <algorithm>
+#include <cstring>
 
 #include <synfig/loadcanvas.h>
 #include <synfig/savecanvas.h>
@@ -48,6 +50,7 @@
 #include <synfig/paramdesc.h>
 #include <synfig/main.h>
 #include <synfig/guid.h>
+#include <autorevision.h>
 #endif
 
 using namespace std;
@@ -56,18 +59,26 @@ using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
+#ifdef ENABLE_NLS
+#undef _
+#define _(x) gettext(x)
+#else
+#undef _
+#define _(x) (x)
+#endif
+
 enum exit_code
 {
-       SYNFIGTOOL_OK                           =0,
-       SYNFIGTOOL_FILENOTFOUND         =1,
-       SYNFIGTOOL_BORRED                       =2,
-       SYNFIGTOOL_HELP                         =3,
-       SYNFIGTOOL_UNKNOWNARGUMENT      =4,     
-       SYNFIGTOOL_UNKNOWNERROR         =5,     
-       SYNFIGTOOL_INVALIDTARGET                =6,     
-       SYNFIGTOOL_RENDERFAILURE                =7,     
-       SYNFIGTOOL_BLANK                                =8,
-       SYNFIGTOOL_BADVERSION           =9,
+       SYNFIGTOOL_OK                           = 0,
+       SYNFIGTOOL_FILENOTFOUND         = 1,
+       SYNFIGTOOL_BORED                        = 2,
+       SYNFIGTOOL_HELP                         = 3,
+       SYNFIGTOOL_UNKNOWNARGUMENT      = 4,
+       SYNFIGTOOL_UNKNOWNERROR         = 5,
+       SYNFIGTOOL_INVALIDTARGET        = 6,
+       SYNFIGTOOL_RENDERFAILURE        = 7,
+       SYNFIGTOOL_BLANK                        8,
+       SYNFIGTOOL_BADVERSION           = 9,
        SYNFIGTOOL_MISSINGARGUMENT      =10
 };
 
@@ -95,11 +106,11 @@ bool print_benchmarks=false;
 class Progress : public synfig::ProgressCallback
 {
        const char *program;
-       
+
 public:
-       
+
        Progress(const char *name):program(name) { }
-       
+
        virtual bool
        task(const String &task)
        {
@@ -122,7 +133,7 @@ public:
        }
 
        virtual bool
-       amount_complete(int current, int total)
+       amount_complete(int /*current*/, int /*total*/)
        {
                return true;
        }
@@ -131,16 +142,16 @@ public:
 class RenderProgress : public synfig::ProgressCallback
 {
        string taskname;
-       
+
        etl::clock clk;
        int clk_scanline; // The scanline at which the clock was reset
        etl::clock clk2;
 
-       float last_time;        
+       float last_time;
 public:
-       
-       RenderProgress():clk_scanline(0) { }
-       
+
+       RenderProgress():clk_scanline(0), last_time(0) { }
+
        virtual bool
        task(const String &thetask)
        {
@@ -178,7 +189,7 @@ public:
                        if(clk2()<0.2)
                                return true;
                        clk2.reset();
-                               
+
                        if(scanline)
                                seconds=(int)time+1;
                        else
@@ -187,7 +198,7 @@ public:
                                clk.reset();
                                clk_scanline=scanline;
                        }
-                       
+
                        if(seconds<0)
                        {
                                clk.reset();
@@ -202,7 +213,7 @@ public:
                                days++,hours-=24;
                        while(days>=7)
                                weeks++,days-=7;
-                       
+
                        cerr<<taskname<<": "<<_("Line")<<" "<<scanline<<_(" of ")<<h<<" -- ";
                        //cerr<<time/(h-clk_scanline)<<" ";
                        /*
@@ -213,9 +224,9 @@ public:
                        {
                                //cerr<<"reset"<<endl;
                                clk.reset();
-                               clk_scanline=scanline;                          
+                               clk_scanline=scanline;
                        }
-                       
+
                        if(weeks)
                                cerr<<weeks<<"w ";
                        if(days)
@@ -226,7 +237,7 @@ public:
                                cerr<<minutes<<"m ";
                        if(seconds)
                                cerr<<seconds<<"s ";
-                       
+
                        cerr<<"           \r";
                }
                else
@@ -239,15 +250,28 @@ struct Job
 {
        String filename;
        String outfilename;
-       
+
        RendDesc desc;
 
        Canvas::Handle root;
        Canvas::Handle canvas;
        Target::Handle target;
-       
+
        int quality;
        bool sifout;
+       bool list_canvases;
+
+       bool canvas_info, canvas_info_all, canvas_info_time_start, canvas_info_time_end, canvas_info_frame_rate,
+                canvas_info_frame_start, canvas_info_frame_end, canvas_info_w, canvas_info_h, canvas_info_image_aspect,
+                canvas_info_pw, canvas_info_ph, canvas_info_pixel_aspect, canvas_info_tl, canvas_info_br,
+                canvas_info_physical_w, canvas_info_physical_h, canvas_info_x_res, canvas_info_y_res, canvas_info_span,
+                canvas_info_interlaced, canvas_info_antialias, canvas_info_clamp, canvas_info_flags, canvas_info_focus,
+                canvas_info_bg_color, canvas_info_metadata;
+
+       Job()
+       {
+               canvas_info = canvas_info_all = canvas_info_time_start = canvas_info_time_end = canvas_info_frame_rate = canvas_info_frame_start = canvas_info_frame_end = canvas_info_w = canvas_info_h = canvas_info_image_aspect = canvas_info_pw = canvas_info_ph = canvas_info_pixel_aspect = canvas_info_tl = canvas_info_br = canvas_info_physical_w = canvas_info_physical_h = canvas_info_x_res = canvas_info_y_res = canvas_info_span = canvas_info_interlaced = canvas_info_antialias = canvas_info_clamp = canvas_info_flags = canvas_info_focus = canvas_info_bg_color = canvas_info_metadata = false;
+       };
 };
 
 typedef list<String> arg_list_t;
@@ -257,9 +281,7 @@ void guid_test()
 {
        cout<<"GUID Test"<<endl;
        for(int i=20;i;i--)
-       {
                cout<<synfig::GUID().get_string()<<' '<<synfig::GUID().get_string()<<endl;
-       }
 }
 
 void signal_test_func()
@@ -283,72 +305,72 @@ void signal_test()
 
 /* === P R O C E D U R E S ================================================= */
 
-void display_help(int amount)
+void display_help_option(const char *flag, const char *arg, string description)
 {
-       class Argument
-       {
-       public:
-               Argument(const char *flag,const char *arg, string description)
-               {
-                       const char spaces[]="                      ";
-                       if(arg)
-                               cerr<<strprintf(" %s %s %s",flag, arg, spaces+strlen(arg)+strlen(flag)+1)+description<<endl;
-                       else
-                               cerr<<strprintf(" %s %s",flag,spaces+strlen(flag))+description<<endl;
-               
-               }
-       };
-       cerr<<_("syntax: ")<<progname<<" [DEFAULT OPTIONS] ([SIF FILE] [SPECIFIC OPTIONS])..."<<endl;
-       cerr<<endl;
-       if(amount>=1)
+       const char spaces[]="                      ";
+       if(arg)
+               cerr << strprintf(" %s %s %s", flag, arg, spaces+strlen(arg)+strlen(flag)+1)+description << endl;
+       else
+               cerr << strprintf(" %s %s", flag, spaces+strlen(flag))+description << endl;
+}
+
+void display_help(bool full)
+{
+       cerr << endl << _("syntax: ") << progname << " [DEFAULT OPTIONS] ([SIF FILE] [SPECIFIC OPTIONS])..." << endl << endl;
+
+       if(full)
        {
-               Argument("-t","<output type>",_("Specify output target (Default:unknown)"));
-               Argument("-w","<pixel width>",_("Set the image width (Use zero for file default)"));
-               Argument("-h","<pixel height>",_("Set the image height (Use zero for file default)"));
-               Argument("-s","<image dist>",_("Set the diagonal size of image window (Span)"));
-               Argument("-a","<1...30>",_("Set antialias amount for parametric renderer."));
-               Argument("-Q","<0...10>",strprintf(_("Specify image quality for accelerated renderer (default=%d)"),DEFAULT_QUALITY).c_str());
-               Argument("-g","<amount>",_("Gamma (default=2.2)"));
-               Argument("-v",NULL,_("Verbose Output (add more for more verbosity)"));
-               Argument("-q",NULL,_("Quiet mode (No progress/time-remaining display)"));
-               Argument("-c","<canvas id>",_("Render the canvas with the given id instead of the root."));
-               Argument("-o","<output file>",_("Specify output filename"));
-               Argument("-T","<# of threads>",_("Enable multithreaded renderer using specified # of threads"));
-
-               Argument("-b",NULL,_("Print Benchmarks"));
-
-               Argument("--fps","<framerate>",_("Set the frame rate"));
-               Argument("--time","<time>",_("Render a single frame at <seconds>"));
-               Argument("--begin-time","<time>",_("Set the starting time"));
-               Argument("--end-time","<time>",_("Set the ending time"));
-               Argument("--dpi","<res>",_("Set the dots-per-inch"));
-               Argument("--append","<filename>",_("Append layers in <filename> to composition"));
-
-               Argument("--layer-info","<layer>",_("Print out layer's description, parameter info, etc."));
-               Argument("--layers",NULL,_("Print out the list of available layers"));
-               Argument("--targets",NULL,_("Print out the list of available targets"));
-               Argument("--importers",NULL,_("Print out the list of available importers"));
-               Argument("--valuenodes",NULL,_("Print out the list of available ValueNodes"));
-               Argument("--modules",NULL,_("Print out the list of loaded modules"));
-               Argument("--version",NULL,_("Print out version information"));
-               Argument("--info",NULL,_("Print out misc build information"));
-               Argument("--license",NULL,_("Print out license information"));
+               display_help_option("-t", "<output type>", _("Specify output target (Default:unknown)"));
+               display_help_option("-w", "<pixel width>", _("Set the image width (Use zero for file default)"));
+               display_help_option("-h", "<pixel height>", _("Set the image height (Use zero for file default)"));
+               display_help_option("-s", "<image dist>", _("Set the diagonal size of image window (Span)"));
+               display_help_option("-a", "<1...30>", _("Set antialias amount for parametric renderer."));
+               display_help_option("-Q", "<0...10>", strprintf(_("Specify image quality for accelerated renderer (default=%d)"), DEFAULT_QUALITY).c_str());
+               display_help_option("-g", "<amount>", _("Gamma (default=2.2)"));
+               display_help_option("-v", NULL, _("Verbose Output (add more for more verbosity)"));
+               display_help_option("-q", NULL, _("Quiet mode (No progress/time-remaining display)"));
+               display_help_option("-c", "<canvas id>", _("Render the canvas with the given id instead of the root."));
+               display_help_option("-o", "<output file>", _("Specify output filename"));
+               display_help_option("-T", "<# of threads>", _("Enable multithreaded renderer using specified # of threads"));
+               display_help_option("-b", NULL, _("Print Benchmarks"));
+               display_help_option("--fps", "<framerate>", _("Set the frame rate"));
+               display_help_option("--time", "<time>", _("Render a single frame at <seconds>"));
+               display_help_option("--begin-time", "<time>", _("Set the starting time"));
+               display_help_option("--start-time", "<time>", _("Set the starting time"));
+               display_help_option("--end-time", "<time>", _("Set the ending time"));
+               display_help_option("--dpi", "<res>", _("Set the physical resolution (dots-per-inch)"));
+               display_help_option("--dpi-x", "<res>", _("Set the physical X resolution (dots-per-inch)"));
+               display_help_option("--dpi-y", "<res>", _("Set the physical Y resolution (dots-per-inch)"));
+
+               display_help_option("--list-canvases", NULL, _("List the exported canvases in the composition"));
+               display_help_option("--canvas-info", "<fields>", _("Print out specified details of the root canvas"));
+               display_help_option("--append", "<filename>", _("Append layers in <filename> to composition"));
+
+               display_help_option("--layer-info", "<layer>", _("Print out layer's description, parameter info, etc."));
+               display_help_option("--layers", NULL, _("Print out the list of available layers"));
+               display_help_option("--targets", NULL, _("Print out the list of available targets"));
+               display_help_option("--importers", NULL, _("Print out the list of available importers"));
+               display_help_option("--valuenodes", NULL, _("Print out the list of available ValueNodes"));
+               display_help_option("--modules", NULL, _("Print out the list of loaded modules"));
+               display_help_option("--version", NULL, _("Print out version information"));
+               display_help_option("--info", NULL, _("Print out misc build information"));
+               display_help_option("--license", NULL, _("Print out license information"));
 
 #ifdef _DEBUG
-               Argument("--guid-test",NULL,_("Test GUID generation"));
-               Argument("--signal-test",NULL,_("Test signal implementation"));
+               display_help_option("--guid-test", NULL, _("Test GUID generation"));
+               display_help_option("--signal-test", NULL, _("Test signal implementation"));
 #endif
        }
        else
+               display_help_option("--help", NULL, _("Print out usage and syntax info"));
 
-       Argument("--help",NULL,_("Print out usage and syntax info"));
-       cerr<<endl;
+       cerr << endl;
 }
 
 int process_global_flags(arg_list_t &arg_list)
 {
        arg_list_t::iterator iter, next;
-       
+
        for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
        {
                if(*iter == "--")
@@ -359,25 +381,26 @@ int process_global_flags(arg_list_t &arg_list)
                        signal_test();
                        return SYNFIGTOOL_HELP;
                }
-               
+
                if(*iter == "--guid-test")
                {
                        guid_test();
                        return SYNFIGTOOL_HELP;
                }
 
-               
                if(*iter == "--help")
                {
-                       display_help(1);
-
+                       display_help(true);
                        return SYNFIGTOOL_HELP;
                }
 
                if(*iter == "--info")
                {
                        cout<<PACKAGE"-"VERSION<<endl;
-                       cout<<"Compiled on "__DATE__ " at "__TIME__;
+                       #ifdef DEVEL_VERSION
+                               cout<<endl<<DEVEL_VERSION<<endl<<endl;
+                       #endif
+                       cout<<"Compiled on "__DATE__ /* " at "__TIME__ */;
 #ifdef __GNUC__
                        cout<<" with GCC "<<__VERSION__;
 #endif
@@ -387,7 +410,6 @@ int process_global_flags(arg_list_t &arg_list)
 #ifdef __TCPLUSPLUS__
                        cout<<" with Borland Turbo C++ "<<(__TCPLUSPLUS__>>8)<<'.'<<((__TCPLUSPLUS__&255)>>4)<<'.'<<(__TCPLUSPLUS__&15);
 #endif
-
                        cout<<endl<<SYNFIG_COPYRIGHT<<endl;
                        cout<<endl;
                        return SYNFIGTOOL_HELP;
@@ -399,7 +421,8 @@ int process_global_flags(arg_list_t &arg_list)
                        synfig::Main synfig_main(dirname(progname),&p);
                        synfig::Layer::Book::iterator iter=synfig::Layer::book().begin();
                        for(;iter!=synfig::Layer::book().end();iter++)
-                               cout<<iter->first<<endl;
+                               if (iter->second.category != CATEGORY_DO_NOT_USE)
+                                       cout<<iter->first<<endl;
 
                        return SYNFIGTOOL_HELP;
                }
@@ -409,6 +432,11 @@ int process_global_flags(arg_list_t &arg_list)
                        Progress p(PACKAGE);
                        synfig::Main synfig_main(dirname(progname),&p);
                        iter=next++;
+                       if (iter==arg_list.end())
+                       {
+                               error("The `%s' flag requires a value.  Use --help for a list of options.", "--layer-info");
+                               return SYNFIGTOOL_MISSINGARGUMENT;
+                       }
                        Layer::Handle layer=synfig::Layer::create(*iter);
                        cout<<"Layer Name: "<<layer->get_name()<<endl;
                        cout<<"Localized Layer Name: "<<layer->get_local_name()<<endl;
@@ -446,7 +474,6 @@ int process_global_flags(arg_list_t &arg_list)
                        synfig::Target::Book::iterator iter=synfig::Target::book().begin();
                        for(;iter!=synfig::Target::book().end();iter++)
                                cout<<iter->first<<endl;
-                               
                        return SYNFIGTOOL_HELP;
                }
 
@@ -457,7 +484,6 @@ int process_global_flags(arg_list_t &arg_list)
                        synfig::LinkableValueNode::Book::iterator iter=synfig::LinkableValueNode::book().begin();
                        for(;iter!=synfig::LinkableValueNode::book().end();iter++)
                                cout<<iter->first<<endl;
-                               
                        return SYNFIGTOOL_HELP;
                }
 
@@ -468,16 +494,13 @@ int process_global_flags(arg_list_t &arg_list)
                        synfig::Importer::Book::iterator iter=synfig::Importer::book().begin();
                        for(;iter!=synfig::Importer::book().end();iter++)
                                cout<<iter->first<<endl;
-                               
                        return SYNFIGTOOL_HELP;
                }
 
                if(*iter == "--version")
                {
                        cerr<<PACKAGE<<" "<<VERSION<<endl;
-               
                        arg_list.erase(iter);
-                       
                        return SYNFIGTOOL_HELP;
                }
 
@@ -491,46 +514,49 @@ int process_global_flags(arg_list_t &arg_list)
 **     published by the Free Software Foundation; either version 2 of\n\
 **     the License, or (at your option) any later version.\n\
 **\n\
-**     " << endl << endl;      
+**     " << endl << endl;
                        arg_list.erase(iter);
-                       
                        return SYNFIGTOOL_HELP;
                }
 
                if(*iter == "-v")
                {
                        verbosity++;
-                       
                        arg_list.erase(iter);
-                       
                        continue;
                }
 
                if(*iter == "-q")
                {
                        be_quiet=true;
-
                        arg_list.erase(iter);
-
                        continue;
                }
                if(*iter == "-b")
                {
                        print_benchmarks=true;
-
                        arg_list.erase(iter);
-
                        continue;
                }
        }
-       
+
        return SYNFIGTOOL_OK;
 }
 
+/* true if the given flag takes an extra parameter */
+bool flag_requires_value(String flag)
+{
+       return (flag=="-a"                      || flag=="-c"                   || flag=="-g"                   || flag=="-h"                   || flag=="-o"                   ||
+                       flag=="-Q"                      || flag=="-s"                   || flag=="-t"                   || flag=="-T"                   || flag=="-w"                   ||
+                       flag=="--append"        || flag=="--begin-time" || flag=="--canvas-info"|| flag=="--dpi"                || flag=="--dpi-x"              ||
+                       flag=="--dpi-y"         || flag=="--end-time"   || flag=="--fps"                || flag=="--layer-info" || flag=="--start-time" ||
+                       flag=="--time"          );
+}
+
 int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
 {
        arg_list_t::iterator iter, next;
-       
+
        for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
        {
                if(*iter->begin() != '-')
@@ -539,43 +565,22 @@ int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
                        return SYNFIGTOOL_OK;
                }
 
-               if(
-                       *iter=="-t" ||
-                       *iter=="-w" ||
-                       *iter=="-h" ||
-                       *iter=="-a" ||
-                       *iter=="-g" ||
-                       *iter=="-o" ||
-                       *iter=="-s" ||
-                       *iter=="-Q" ||
-                       *iter=="-c" ||
-                       *iter=="--fps" ||
-                       *iter=="--start-time" ||
-                       *iter=="--begin-time" ||
-                       *iter=="--end-time" ||
-                       *iter=="--start-frame" ||
-                       *iter=="--end-frame" ||
-                       *iter=="--time" ||
-                       *iter=="--frame" ||
-                       *iter=="--dpi" ||
-                       *iter=="--dpi-x" ||
-                       *iter=="--dpi-y" ||
-                       *iter=="--append" ||
-                       *iter=="-T" )
+               if (flag_requires_value(*iter))
                {
                        cluster.push_back(*iter);
                        arg_list.erase(iter);
                        iter=next++;
-                       if (iter==arg_list.end()) {
+                       if (iter==arg_list.end())
+                       {
                                error("The `%s' flag requires a value.  Use --help for a list of options.", cluster.back().c_str());
                                return SYNFIGTOOL_MISSINGARGUMENT;
                        }
                }
-                       
+
                cluster.push_back(*iter);
                arg_list.erase(iter);
        }
-       
+
        return SYNFIGTOOL_OK;
 }
 
@@ -682,30 +687,24 @@ int extract_RendDesc(arg_list_t &arg_list,RendDesc &desc)
                else if(*iter=="-g")
                {
                        synfig::warning("Gamma argument is currently ignored");
-                       //arg_list.erase(iter);
-                       //iter=next++;
+                       arg_list.erase(iter);
+                       iter=next++;
                        //desc.set_gamma(Gamma(atof(iter->c_str())));
-                       //arg_list.erase(iter);
+                       arg_list.erase(iter);
                }
+               else if (flag_requires_value(*iter))
+                       iter=next++;
        }
-       if(w&&h)
+       if (w||h)
        {
+               if (!w)
+                       w = desc.get_w() * h / desc.get_h();
+               else if (!h)
+                       h = desc.get_h() * w / desc.get_w();
+
                desc.set_wh(w,h);
                VERBOSE_OUT(1)<<strprintf(_("Resolution set to %dx%d"),w,h)<<endl;
        }
-       else
-       {
-               if(w)
-               {
-                       VERBOSE_OUT(1)<<strprintf(_("Width set to %d pixels"),w)<<endl;
-                       desc.set_w(w);
-               }
-               if(h)
-               {
-                       VERBOSE_OUT(1)<<strprintf(_("Height set to %d pixels"),h)<<endl;
-                       desc.set_h(h);
-               }
-       }
        if(span)
                desc.set_span(span);
        return SYNFIGTOOL_OK;
@@ -724,8 +723,10 @@ int extract_quality(arg_list_t &arg_list,int &quality)
                        VERBOSE_OUT(1)<<strprintf(_("Quality set to %d"),quality)<<endl;
                        arg_list.erase(iter);
                }
+               else if (flag_requires_value(*iter))
+                       iter=next++;
        }
-       
+
        return SYNFIGTOOL_OK;
 }
 
@@ -742,8 +743,10 @@ int extract_threads(arg_list_t &arg_list,int &threads)
                        VERBOSE_OUT(1)<<strprintf(_("Threads set to %d"),threads)<<endl;
                        arg_list.erase(iter);
                }
+               else if (flag_requires_value(*iter))
+                       iter=next++;
        }
-       
+
        return SYNFIGTOOL_OK;
 }
 
@@ -751,7 +754,7 @@ int extract_target(arg_list_t &arg_list,string &type)
 {
        arg_list_t::iterator iter, next;
        type.clear();
-       
+
        for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
        {
                if(*iter=="-t")
@@ -761,6 +764,8 @@ int extract_target(arg_list_t &arg_list,string &type)
                        type=*iter;
                        arg_list.erase(iter);
                }
+               else if (flag_requires_value(*iter))
+                       iter=next++;
        }
 
        return SYNFIGTOOL_OK;
@@ -770,7 +775,7 @@ int extract_append(arg_list_t &arg_list,string &filename)
 {
        arg_list_t::iterator iter, next;
        filename.clear();
-       
+
        for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
        {
                if(*iter=="--append")
@@ -780,6 +785,8 @@ int extract_append(arg_list_t &arg_list,string &filename)
                        filename=*iter;
                        arg_list.erase(iter);
                }
+               else if (flag_requires_value(*iter))
+                       iter=next++;
        }
 
        return SYNFIGTOOL_OK;
@@ -790,7 +797,7 @@ int extract_outfile(arg_list_t &arg_list,string &outfile)
        arg_list_t::iterator iter, next;
        int ret=SYNFIGTOOL_FILENOTFOUND;
        outfile.clear();
-       
+
        for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
        {
                if(*iter=="-o")
@@ -801,6 +808,8 @@ int extract_outfile(arg_list_t &arg_list,string &outfile)
                        arg_list.erase(iter);
                        ret=SYNFIGTOOL_OK;
                }
+               else if (flag_requires_value(*iter))
+                       iter=next++;
        }
 
        return ret;
@@ -810,7 +819,7 @@ int extract_canvasid(arg_list_t &arg_list,string &canvasid)
 {
        arg_list_t::iterator iter, next;
        //canvasid.clear();
-       
+
        for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
        {
                if(*iter=="-c")
@@ -820,11 +829,287 @@ int extract_canvasid(arg_list_t &arg_list,string &canvasid)
                        canvasid=*iter;
                        arg_list.erase(iter);
                }
+               else if (flag_requires_value(*iter))
+                       iter=next++;
        }
 
        return SYNFIGTOOL_OK;
 }
 
+int extract_list_canvases(arg_list_t &arg_list,bool &list_canvases)
+{
+       arg_list_t::iterator iter, next;
+
+       for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
+               if(*iter=="--list-canvases")
+               {
+                       list_canvases = true;
+                       arg_list.erase(iter);
+               }
+
+       return SYNFIGTOOL_OK;
+}
+
+void extract_canvas_info(arg_list_t &arg_list, Job &job)
+{
+       arg_list_t::iterator iter, next;
+
+       for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
+               if(*iter=="--canvas-info")
+               {
+                       job.canvas_info = true;
+                       arg_list.erase(iter);
+                       iter=next++;
+                       String values(*iter), value;
+                       arg_list.erase(iter);
+
+                       std::string::size_type pos;
+                       while (!values.empty())
+                       {
+                               pos = values.find_first_of(',');
+                               if (pos == std::string::npos)
+                               {
+                                       value = values;
+                                       values = "";
+                               }
+                               else
+                               {
+                                       value = values.substr(0, pos);
+                                       values = values.substr(pos+1);
+                               }
+                               if (value == "all")
+                               {
+                                       job.canvas_info_all = true;
+                                       return;
+                               }
+
+                               if (value == "time_start")                      job.canvas_info_time_start              = true;
+                               else if (value == "time_end")           job.canvas_info_time_end                = true;
+                               else if (value == "frame_rate")         job.canvas_info_frame_rate              = true;
+                               else if (value == "frame_start")        job.canvas_info_frame_start             = true;
+                               else if (value == "frame_end")          job.canvas_info_frame_end               = true;
+                               else if (value == "w")                          job.canvas_info_w                               = true;
+                               else if (value == "h")                          job.canvas_info_h                               = true;
+                               else if (value == "image_aspect")       job.canvas_info_image_aspect    = true;
+                               else if (value == "pw")                         job.canvas_info_pw                              = true;
+                               else if (value == "ph")                         job.canvas_info_ph                              = true;
+                               else if (value == "pixel_aspect")       job.canvas_info_pixel_aspect    = true;
+                               else if (value == "tl")                         job.canvas_info_tl                              = true;
+                               else if (value == "br")                         job.canvas_info_br                              = true;
+                               else if (value == "physical_w")         job.canvas_info_physical_w              = true;
+                               else if (value == "physical_h")         job.canvas_info_physical_h              = true;
+                               else if (value == "x_res")                      job.canvas_info_x_res                   = true;
+                               else if (value == "y_res")                      job.canvas_info_y_res                   = true;
+                               else if (value == "span")                       job.canvas_info_span                    = true;
+                               else if (value == "interlaced")         job.canvas_info_interlaced              = true;
+                               else if (value == "antialias")          job.canvas_info_antialias               = true;
+                               else if (value == "clamp")                      job.canvas_info_clamp                   = true;
+                               else if (value == "flags")                      job.canvas_info_flags                   = true;
+                               else if (value == "focus")                      job.canvas_info_focus                   = true;
+                               else if (value == "bg_color")           job.canvas_info_bg_color                = true;
+                               else if (value == "metadata")           job.canvas_info_metadata                = true;
+                               else
+                               {
+                                       cerr<<_("Unrecognised canvas variable: ") << "'" << value << "'" << endl;
+                                       cerr<<_("Recognized variables are:") << endl <<
+                                               "  all, time_start, time_end, frame_rate, frame_start, frame_end, w, h," << endl <<
+                                               "  image_aspect, pw, ph, pixel_aspect, tl, br, physical_w, physical_h," << endl <<
+                                               "  x_res, y_res, span, interlaced, antialias, clamp, flags," << endl <<
+                                               "  focus, bg_color, metadata" << endl;
+                               }
+
+                               if (pos == std::string::npos)
+                                       break;
+                       };
+               }
+}
+
+void list_child_canvases(string prefix, Canvas::Handle canvas)
+{
+       Canvas::Children children(canvas->children());
+       for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
+       {
+               cout << prefix << ":" << (*iter)->get_id() << endl;
+               list_child_canvases(prefix + ":" + (*iter)->get_id(), *iter);
+       }
+}
+
+void list_canvas_info(Job job)
+{
+       Canvas::Handle canvas(job.canvas);
+       const RendDesc &rend_desc(canvas->rend_desc());
+
+       if (job.canvas_info_all || job.canvas_info_time_start)
+       {
+               cout << endl << "# " << _("Start Time") << endl;
+               cout << "time_start"    << "=" << rend_desc.get_time_start().get_string().c_str() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_time_end)
+       {
+               cout << endl << "# " << _("End Time") << endl;
+               cout << "time_end"              << "=" << rend_desc.get_time_end().get_string().c_str() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_frame_rate)
+       {
+               cout << endl << "# " << _("Frame Rate") << endl;
+               cout << "frame_rate"    << "=" << rend_desc.get_frame_rate() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_frame_start)
+       {
+               cout << endl << "# " << _("Start Frame") << endl;
+               cout << "frame_start"   << "=" << rend_desc.get_frame_start() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_frame_end)
+       {
+               cout << endl << "# " << _("End Frame") << endl;
+               cout << "frame_end"             << "=" << rend_desc.get_frame_end() << endl;
+       }
+
+       if (job.canvas_info_all)
+               cout << endl;
+
+       if (job.canvas_info_all || job.canvas_info_w)
+       {
+               cout << endl << "# " << _("Width") << endl;
+               cout << "w"                             << "=" << rend_desc.get_w() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_h)
+       {
+               cout << endl << "# " << _("Height") << endl;
+               cout << "h"                             << "=" << rend_desc.get_h() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_image_aspect)
+       {
+               cout << endl << "# " << _("Image Aspect Ratio") << endl;
+               cout << "image_aspect"  << "=" << rend_desc.get_image_aspect() << endl;
+       }
+
+       if (job.canvas_info_all)
+               cout << endl;
+
+       if (job.canvas_info_all || job.canvas_info_pw)
+       {
+               cout << endl << "# " << _("Pixel Width") << endl;
+               cout << "pw"                    << "=" << rend_desc.get_pw() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_ph)
+       {
+               cout << endl << "# " << _("Pixel Height") << endl;
+               cout << "ph"                    << "=" << rend_desc.get_ph() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_pixel_aspect)
+       {
+               cout << endl << "# " << _("Pixel Aspect Ratio") << endl;
+               cout << "pixel_aspect"  << "=" << rend_desc.get_pixel_aspect() << endl;
+       }
+
+       if (job.canvas_info_all)
+               cout << endl;
+
+       if (job.canvas_info_all || job.canvas_info_tl)
+       {
+               cout << endl << "# " << _("Top Left") << endl;
+               cout << "tl"                    << "=" << rend_desc.get_tl()[0]
+                        << " " << rend_desc.get_tl()[1] << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_br)
+       {
+               cout << endl << "# " << _("Bottom Right") << endl;
+               cout << "br"                    << "=" << rend_desc.get_br()[0]
+                        << " " << rend_desc.get_br()[1] << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_physical_w)
+       {
+               cout << endl << "# " << _("Physical Width") << endl;
+               cout << "physical_w"    << "=" << rend_desc.get_physical_w() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_physical_h)
+       {
+               cout << endl << "# " << _("Physical Height") << endl;
+               cout << "physical_h"    << "=" << rend_desc.get_physical_h() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_x_res)
+       {
+               cout << endl << "# " << _("X Resolution") << endl;
+               cout << "x_res"                 << "=" << rend_desc.get_x_res() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_y_res)
+       {
+               cout << endl << "# " << _("Y Resolution") << endl;
+               cout << "y_res"                 << "=" << rend_desc.get_y_res() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_span)
+       {
+               cout << endl << "# " << _("Diagonal Image Span") << endl;
+               cout << "span"                  << "=" << rend_desc.get_span() << endl;
+       }
+
+       if (job.canvas_info_all)
+               cout << endl;
+
+       if (job.canvas_info_all || job.canvas_info_interlaced)
+       {
+               cout << endl << "# " << _("Interlaced") << endl;
+               cout << "interlaced"    << "=" << rend_desc.get_interlaced() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_antialias)
+       {
+               cout << endl << "# " << _("Antialias") << endl;
+               cout << "antialias"             << "=" << rend_desc.get_antialias() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_clamp)
+       {
+               cout << endl << "# " << _("Clamp") << endl;
+               cout << "clamp"                 << "=" << rend_desc.get_clamp() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_flags)
+       {
+               cout << endl << "# " << _("Flags") << endl;
+               cout << "flags"                 << "=" << rend_desc.get_flags() << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_focus)
+       {
+               cout << endl << "# " << _("Focus") << endl;
+               cout << "focus"                 << "=" << rend_desc.get_focus()[0]
+                        << " " << rend_desc.get_focus()[1] << endl;
+       }
+
+       if (job.canvas_info_all || job.canvas_info_bg_color)
+       {
+               cout << endl << "# " << _("Background Color") << endl;
+               cout << "bg_color"              << "=" << rend_desc.get_bg_color().get_string().c_str() << endl;
+       }
+
+       if (job.canvas_info_all)
+               cout << endl;
+
+       if (job.canvas_info_all || job.canvas_info_metadata)
+       {
+               std::list<String> keys(canvas->get_meta_data_keys());
+               cout << endl << "# " << _("Metadata") << endl;
+               for (std::list<String>::iterator iter = keys.begin(); iter != keys.end(); iter++)
+                       cout << *iter << "=" << canvas->get_meta_data(*iter) << endl;
+       }
+}
+
 /* === M E T H O D S ======================================================= */
 
 /* === E N T R Y P O I N T ================================================= */
@@ -834,72 +1119,95 @@ int main(int argc, char *argv[])
        int i;
        arg_list_t arg_list;
        job_list_t job_list;
-       
+
+       setlocale(LC_ALL, "");
+
+#ifdef ENABLE_NLS
+       bindtextdomain("synfig", LOCALEDIR);
+       bind_textdomain_codeset("synfig", "UTF-8");
+       textdomain("synfig");
+#endif
+
        progname=argv[0];
        Progress p(argv[0]);
-       
+
        if(!SYNFIG_CHECK_VERSION())
        {
                cerr<<_("FATAL: Synfig Version Mismatch")<<endl;
                return SYNFIGTOOL_BADVERSION;
        }
+
        if(argc==1)
        {
-               display_help(0);
+               display_help(false);
                return SYNFIGTOOL_BLANK;
        }
 
        for(i=1;i<argc;i++)
                arg_list.push_back(argv[i]);
-       
+
        if((i=process_global_flags(arg_list)))
                return i;
 
        VERBOSE_OUT(1)<<_("verbosity set to ")<<verbosity<<endl;
        synfig::Main synfig_main(dirname(progname),&p);
-       
+
        {
                arg_list_t defaults, imageargs;
                int ret;
-               
+
                // Grab the defaults before the first file
                if ((ret = extract_arg_cluster(arg_list,defaults)) != SYNFIGTOOL_OK)
                  return ret;
-               
+
                while(arg_list.size())
                {
                        string target_name;
                        job_list.push_front(Job());
                        int threads=0;
-                       
+
                        imageargs=defaults;
                        job_list.front().filename=arg_list.front();
                        arg_list.pop_front();
 
                        if ((ret = extract_arg_cluster(arg_list,imageargs)) != SYNFIGTOOL_OK)
                          return ret;
-                       
+
                        // Open the composition
+                       String errors, warnings;
+                       try
                        {
-                               job_list.front().root=open_canvas(job_list.front().filename);
+                               job_list.front().root=open_canvas(job_list.front().filename, errors, warnings);
                        }
+                       catch(runtime_error x)
+                       {
+                               job_list.front().root = 0;
+                       }
+
                        if(!job_list.front().root)
                        {
-                               cerr<<_("Unable to open ")<<job_list.front().filename<<"."<<endl;
+                               cerr<<_("Unable to load '")<<job_list.front().filename<<"'."<<endl;
                                cerr<<_("Throwing out job...")<<endl;
                                job_list.pop_front();
                                continue;
                        }
 
+                       bool list_canvases = false;
+                       extract_list_canvases(imageargs, list_canvases);
+                       job_list.front().list_canvases = list_canvases;
+
+                       extract_canvas_info(imageargs, job_list.front());
+
                        job_list.front().root->set_time(0);
-                       
+
                        string canvasid;
                        extract_canvasid(imageargs,canvasid);
                        if(!canvasid.empty())
                        {
                                try
                                {
-                                       job_list.front().canvas=job_list.front().root->find_canvas(canvasid);
+                                       String warnings;
+                                       job_list.front().canvas=job_list.front().root->find_canvas(canvasid, warnings);
                                }
                                catch(Exception::IDNotFound)
                                {
@@ -907,7 +1215,7 @@ int main(int argc, char *argv[])
                                        cerr<<_("Throwing out job...")<<endl;
                                        job_list.pop_front();
                                        continue;
-                                       
+
                                }
                                catch(Exception::BadLinkName)
                                {
@@ -915,12 +1223,11 @@ int main(int argc, char *argv[])
                                        cerr<<_("Throwing out job...")<<endl;
                                        job_list.pop_front();
                                        continue;
-                                       
                                }
                        }
                        else
                                job_list.front().canvas=job_list.front().root;
-                       
+
                        extract_RendDesc(imageargs,job_list.front().canvas->rend_desc());
                        extract_target(imageargs,target_name);
                        extract_threads(imageargs,threads);
@@ -936,9 +1243,13 @@ int main(int argc, char *argv[])
                                extract_append(imageargs,composite_file);
                                if(!composite_file.empty())
                                {
-                                       Canvas::Handle composite(open_canvas(composite_file));
+                                       String errors, warnings;
+                                       Canvas::Handle composite(open_canvas(composite_file, errors, warnings));
                                        if(!composite)
+                                       {
+                                               cerr<<_("Unable to append '")<<composite_file<<"'."<<endl;
                                                break;
+                                       }
                                        Canvas::reverse_iterator iter;
                                        for(iter=composite->rbegin();iter!=composite->rend();++iter)
                                        {
@@ -948,25 +1259,37 @@ int main(int argc, char *argv[])
                                        }
                                        VERBOSE_OUT(2)<<_("Appended contents of ")<<composite_file<<endl;
                                }
-                       }while(false);
-                       
+                       } while(false);
+
                        VERBOSE_OUT(4)<<_("Attempting to determine target/outfile...")<<endl;
-                       
+
                        // If the target type is not yet defined,
                        // try to figure it out from the outfile.
                        if(target_name.empty() && !job_list.front().outfilename.empty())
-                       try
                        {
                                VERBOSE_OUT(3)<<_("Target name undefined, attempting to figure it out")<<endl;
-                               string ext=string(find(job_list.front().outfilename.begin(),job_list.front().outfilename.end(),'.')+1,job_list.front().outfilename.end());
+                               string ext = filename_extension(job_list.front().outfilename);
+                               if (ext.length()) ext = ext.substr(1);
                                if(Target::ext_book().count(ext))
+                               {
                                        target_name=Target::ext_book()[ext];
+                                       info("target name not specified - using %s", target_name.c_str());
+                               }
                                else
-                                       target_name=ext;
-                       }
-                       catch(std::length_error)
-                       {
-                               synfig::warning("Length error caught when attempting to figure out target name");
+                               {
+                                       string lower_ext(ext);
+
+                                       for(unsigned int i=0;i<ext.length();i++)
+                                               lower_ext[i] = tolower(ext[i]);
+
+                                       if(Target::ext_book().count(lower_ext))
+                                       {
+                                               target_name=Target::ext_book()[lower_ext];
+                                               info("target name not specified - using %s", target_name.c_str());
+                                       }
+                                       else
+                                               target_name=ext;
+                               }
                        }
 
                        // If the target type is STILL not yet defined, then
@@ -982,9 +1305,7 @@ int main(int argc, char *argv[])
                        // given input filename. (ie: change the extension)
                        if(job_list.front().outfilename.empty())
                        {
-                               job_list.front().outfilename=job_list.front().filename;
-                               job_list.front().outfilename.erase(find(job_list.front().outfilename.begin(),job_list.front().outfilename.end(),'.'),job_list.front().outfilename.end());
-                               job_list.front().outfilename+='.';
+                               job_list.front().outfilename = filename_sans_extension(job_list.front().filename) + '.';
                                if(Target::book().count(target_name))
                                        job_list.front().outfilename+=Target::book()[target_name].second;
                                else
@@ -993,14 +1314,12 @@ int main(int argc, char *argv[])
 
                        VERBOSE_OUT(4)<<"target_name="<<target_name<<endl;
                        VERBOSE_OUT(4)<<"outfile_name="<<job_list.front().outfilename<<endl;
-                       
+
                        VERBOSE_OUT(4)<<_("Creating the target...")<<endl;
                        job_list.front().target=synfig::Target::create(target_name,job_list.front().outfilename);
-                       
+
                        if(target_name=="sif")
-                       {
                                job_list.front().sifout=true;
-                       }
                        else
                        {
                                if(!job_list.front().target)
@@ -1018,16 +1337,14 @@ int main(int argc, char *argv[])
                        {
                                VERBOSE_OUT(4)<<_("Setting the canvas on the target...")<<endl;
                                job_list.front().target->set_canvas(job_list.front().canvas);
-                               VERBOSE_OUT(4)<<_("Setting the quality of the target...")<<endl;                                
+                               VERBOSE_OUT(4)<<_("Setting the quality of the target...")<<endl;
                                job_list.front().target->set_quality(job_list.front().quality);
                        }
-                       
+
                        // Set the threads for the target
                        if(job_list.front().target && Target_Scanline::Handle::cast_dynamic(job_list.front().target))
-                       {
                                Target_Scanline::Handle::cast_dynamic(job_list.front().target)->set_threads(threads);
-                       }
-                       
+
                        if(imageargs.size())
                        {
                                cerr<<_("Unidentified arguments for ")<<job_list.front().filename<<": ";
@@ -1038,11 +1355,9 @@ int main(int argc, char *argv[])
                                job_list.pop_front();
                                continue;
                        }
-                       //string bleh;
-                       //getline(cin,bleh);
                }
        }
-       
+
        if(arg_list.size())
        {
                cerr<<_("Unidentified arguments:");
@@ -1051,13 +1366,13 @@ int main(int argc, char *argv[])
                cerr<<endl;
                return SYNFIGTOOL_UNKNOWNARGUMENT;
        }
-       
+
        if(!job_list.size())
        {
                cerr<<_("Nothing to do!")<<endl;
-               return SYNFIGTOOL_BORRED;
+               return SYNFIGTOOL_BORED;
        }
-       
+
        for(;job_list.size();job_list.pop_front())
        {
                VERBOSE_OUT(3)<<job_list.front().filename<<" -- "<<endl<<'\t'<<
@@ -1074,38 +1389,46 @@ int main(int argc, char *argv[])
                        job_list.front().desc.get_br()[0],job_list.front().desc.get_br()[1],
                        job_list.front().desc.get_focus()[0],job_list.front().desc.get_focus()[1]
                        )<<endl;
-               
+
                RenderProgress p;
                p.task(job_list.front().filename+" ==> "+job_list.front().outfilename);
-               if(!job_list.front().sifout)
+               if(job_list.front().sifout)
                {
-                       VERBOSE_OUT(1)<<_("Rendering...")<<endl;
-                       etl::clock timer;
-                       timer.reset();
-                       // Call the render member of the target
-                       if(!job_list.front().target->render(&p))
+                       if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
                        {
                                cerr<<"Render Failure."<<endl;
                                return SYNFIGTOOL_RENDERFAILURE;
                        }
-                       if(print_benchmarks)
-                       {
-                               cout<<job_list.front().filename+": Rendered in "<<timer()<<" seconds."<<endl;
-                       }
+               }
+               else if (job_list.front().list_canvases)
+               {
+                       list_child_canvases(job_list.front().filename + "#", job_list.front().canvas);
+                       cerr << endl;
+               }
+               else if (job_list.front().canvas_info)
+               {
+                       list_canvas_info(job_list.front());
+                       cerr << endl;
                }
                else
                {
-                       if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
+                       VERBOSE_OUT(1)<<_("Rendering...")<<endl;
+                       etl::clock timer;
+                       timer.reset();
+                       // Call the render member of the target
+                       if(!job_list.front().target->render(&p))
                        {
                                cerr<<"Render Failure."<<endl;
                                return SYNFIGTOOL_RENDERFAILURE;
                        }
+                       if(print_benchmarks)
+                               cout<<job_list.front().filename+": Rendered in "<<timer()<<" seconds."<<endl;
                }
        }
-       
+
        job_list.clear();
-       
+
        VERBOSE_OUT(1)<<_("Done.")<<endl;
-       
+
        return SYNFIGTOOL_OK;
 }