More requires --> required, for C++2a.

[lyx.git] / src / insets / InsetInfo.h

diff --git a/src/insets/InsetInfo.h b/src/insets/InsetInfo.h
index 5d60e05b7928c118bccd2592d9dbbb610ed4e4fd..fa3cfda72899f653a77dd2ede20ecbfdbae47479 100644 (file)
--- a/src/insets/InsetInfo.h
+++ b/src/insets/InsetInfo.h
@@ -50,6 +50,20 @@ fixdate: Same as date. A fixed date (in ISO format) is prepended to the argument
     delimited by '@'.
     The output is a localized formatted fix date.
 
+time: argument of this type of InsetInfo is either a fixed time type of
+    "long" (long localized time, as provided by QLocale),
+    "short" (short localized time, as provided by QLocale),
+    "ISO" (ISO-conforming time)
+    or a custom date using the QTime syntax.
+    The output is a localized formatted (current) time.
+
+modtime: Same as time.
+    The output is a localized formatted time of last file modification (saving).
+
+fixtime: Same as time. A fixed time (in ISO format) is prepended to the argument,
+    delimited by '@'.
+    The output is a localized formatted fix time.
+
 shortcuts: argument is the name of the LFUN such as "math-insert \alpha".
     The syntax is the same as what is used in the bind and ui files.
     The output of this inset is all shortcuts for this LFUN separated by comma.
@@ -71,16 +85,21 @@ menu: argument is the name of the LFUN such as "paste". The syntax is the same
     triggers this LFUN. For example, "File > Paste", where '>' is actually
     \lyxarrow (an InsetSpecialChar).
 
+l7n: argument is an English string that is marked for localization. The output
+    is the localization of that string in the current GUI language (if available).
+    Trailing colons are stripped, accelerators removed.
+    This is used to refer to GUI items in the docs.
+
 icon: argument is the name of the LFUN such as "paste". The syntax is the same
     as what is used in the bind and ui files. The output is the icon use in
     the toolbar for this LFUN. Alternatively, argument can be the icon path
     without extension specified with respect to the images directory.
 
-buffer: argument can be one of "name", "path", "class". This inset output the
-    filename, path, and textclass of this buffer.
+buffer: argument can be one of "name", "name-noext", "path", "class". This inset output the
+    filename (with extension), filename (without extension), path, and textclass of this buffer.
 
-lyxinfo: argument must (presently) be "version". This inset outputs information
-    about the version of LyX currently in use.
+lyxinfo: argument must be "version" or "layoutformat". This outputs information
+    about the version of LyX currently in use or the current LyX layout format, respectively.
 
 vcs: argument can be one of "revision", "tree-revision", "author", "time", "date".
     This insets outputs revision control information, if available.
@@ -100,9 +119,12 @@ the command buffer (view->Toolbar->Command Buffer).
 class InsetInfoParams {
 public:
        enum info_type {
-               DATE_INFO,       // Current Date
+               DATE_INFO,       // Current date
                MODDATE_INFO,    // Date of last modification
                FIXDATE_INFO,    // Fix date
+               TIME_INFO,       // Current time
+               MODTIME_INFO,    // Time of last modification
+               FIXTIME_INFO,    // Fix time
                BUFFER_INFO,     // Buffer related information
                VCS_INFO,        // Version control information
                PACKAGE_INFO,    // Availability of package
@@ -113,14 +135,20 @@ public:
                MENU_INFO,       // Which menu item is used for certain function
                ICON_INFO,       // which toolbar icon is used for certain function
                LYX_INFO,        // LyX version information
+               L7N_INFO,        // Localized string
                UNKNOWN_INFO,    // Invalid type
        };
        ///
-       docstring getDate(std::string const, QDate const date = QDate::currentDate()) const;
+       docstring getDate(std::string const &, QDate const date = QDate::currentDate()) const;
+       ///
+       docstring getTime(std::string const &, QTime const time = QTime::currentTime()) const;
        ///
        std::vector<std::pair<std::string,docstring>> getArguments(Buffer const * buf,
                                                                   std::string const &) const;
        ///
+       bool validateArgument(Buffer const * buf, docstring const & argument,
+                             bool const usedefault = false) const;
+       ///
        info_type type;
        ///
        std::string infoType() const;
@@ -159,7 +187,8 @@ public:
        ///
        void write(std::ostream & os) const;
        ///
-       bool validateModifyArgument(docstring const & argument) const;
+       bool validateModifyArgument(docstring const & argument) const {
+               return params_.validateArgument(&buffer(), argument); }
        ///
        bool showInsetDialog(BufferView * bv) const;
        ///
@@ -167,7 +196,7 @@ public:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        /// Force inset into LTR environment if surroundings are RTL
-       bool forceLTR() const;
+       bool forceLTR(OutputParams const &) const;
        ///
        void setInfo(std::string const & info);
        ///