prepare for 1.1.6pre2

[lyx.git] / src / insets / insetref.C

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index bb985a9ed857cc0a88432679440a3a802eb94df3..b936e53ad941b1301fba6f4c22964f94cabc9d8f 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -1,66 +1,53 @@
 #include <config.h>
 
-#include <cstdlib>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include FORMS_H_LOCATION 
 #include "insetref.h"
 #include "buffer.h"
-#include "debug.h"
-#include "lyx_gui_misc.h" // CancelCloseBoxCB
-#include "LyXView.h"
-#include "lyxfunc.h"
 #include "commandtags.h"
+#include "debug.h"
 #include "gettext.h"
+#include "LaTeXFeatures.h"
+#include "lyxfunc.h"
+#include "LyXView.h"
+#include "frontends/Dialogs.h"
 
 using std::ostream;
 
-extern BufferView * current_view;
-
+InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
+       : InsetCommand(p), isLatex(buf.isLatex())
+{}
 
-InsetRef::InsetRef(string const & cmd, Buffer * bf)
-       : master(bf)
+void InsetRef::Edit(BufferView * bv, int, int, unsigned int button)
 {
-       scanCommand(cmd);
-       if (getCmdName() == "ref")
-               flag = InsetRef::REF;
-       else
-               flag = InsetRef::PAGE_REF;
+       // Eventually trigger dialog with button 3 not 1
+       if (button == 3 )
+               bv->owner()->getLyXFunc()->
+                       Dispatch(LFUN_REF_GOTO, getContents());
+       else if (button == 1 )
+               bv->owner()->getDialogs()->showRef( this );
 }
 
 
-InsetRef::InsetRef(InsetCommand const & inscmd, Buffer * bf)
-       : master(bf)
+string const InsetRef::getScreenLabel() const
 {
-       setCmdName(inscmd.getCmdName());
-       setContents(inscmd.getContents());
-       setOptions(inscmd.getOptions());
+       string temp;
        if (getCmdName() == "ref")
-               flag = InsetRef::REF;
+               temp = _( "Ref: " );
+       else if (getCmdName() == "pageref")
+               temp = _( "Page: " );
+       else if (getCmdName() == "vref")
+               temp = _( "TextRef: " );
+       else if (getCmdName() == "vpageref")
+               temp = _( "TextPage: " );
        else
-               flag = InsetRef::PAGE_REF;
-}
+               temp = _( "PrettyRef: " );
 
-
-void InsetRef::Edit(BufferView * bv, int, int, unsigned int)
-{
-        bv->owner()->getLyXFunc()->
-               Dispatch(LFUN_REFGOTO, getContents().c_str());
-}
-
-
-string InsetRef::getScreenLabel() const
-{
-       string temp;
-       if (flag == InsetRef::PAGE_REF)
-               temp += _("Page: ");
-       else 
-               temp += _("Ref: ");
        temp += getContents();
-       if(!current_view->buffer()->isLatex()
+
+       if (!isLatex
           && !getOptions().empty()) {
                temp += "||";
                temp += getOptions();
@@ -69,22 +56,27 @@ string InsetRef::getScreenLabel() const
 }
 
 
-int InsetRef::Latex(ostream & os,
+int InsetRef::Latex(Buffer const *, ostream & os,
                    bool /*fragile*/, bool /*fs*/) const
 {
-       if(getOptions().empty())
+       if (getOptions().empty())
                os << escape(getCommand());
        else {
-               string ns;
-               InsetCommand clone = InsetCommand(getCmdName(),
-                                                 getContents(), ns);
-               os << escape(clone.getCommand());
+               InsetCommandParams p( getCmdName(), getContents(), "" );
+               os << escape(p.getCommand());
        }
        return 0;
 }
 
 
-int InsetRef::Linuxdoc(ostream & os) const
+int InsetRef::Ascii(Buffer const *, ostream & os, int) const
+{
+       os << "[" << getContents() << "]";
+       return 0;
+}
+
+
+int InsetRef::Linuxdoc(Buffer const *, ostream & os) const
 {
        os << "<ref id=\"" << getContents()
           << "\" name=\"" << getOptions() << "\" >";
@@ -92,7 +84,7 @@ int InsetRef::Linuxdoc(ostream & os) const
 }
 
 
-int InsetRef::DocBook(ostream & os) const
+int InsetRef::DocBook(Buffer const *, ostream & os) const
 {
        os << "<link linkend=\"" << getContents()
           << "\">" << getOptions() << "</link>";
@@ -102,7 +94,7 @@ int InsetRef::DocBook(ostream & os) const
 
 // This function escapes 8-bit characters and other problematic characters
 // It's exactly the same code as in insetlabel.C.
-string InsetRef::escape(string const & lab) const
+string const InsetRef::escape(string const & lab) const
 {
        char hexdigit[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
                              '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
@@ -119,3 +111,12 @@ string InsetRef::escape(string const & lab) const
        }
        return enc;
 }
+
+
+void InsetRef::Validate(LaTeXFeatures & features) const
+{
+       if (getCmdName() == "vref" || getCmdName() == "vpageref")
+               features.varioref = true;
+       else if (getCmdName() == "prettyref")
+               features.prettyref = true;
+}