Update sk.po

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 1b727065b62b6a0e0a98b141f75b4da51c29a184..f6ec875167bec63b1b0186cbcdce79f05d840301 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -59,7 +59,7 @@ namespace lyx {
 // You should also run the development/tools/updatelayouts.py script,
 // to update the format of all of our layout files.
 //
-int const LAYOUT_FORMAT = 93; // tcuvelier: DocBookNoFontInside
+int const LAYOUT_FORMAT = 104; // rkh: RefFormat for counters
 
 
 // Layout format for the current lyx file format. Controls which format is
@@ -691,7 +691,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
                case TC_PKGOPTS : {
                        lexrc.next();
                        string const pkg = lexrc.getString();
-                       lexrc.next();
+                       lexrc.eatLine();
                        string const options = lexrc.getString();
                        package_options_[pkg] = options;
                        break;
@@ -894,7 +894,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
                        error = !readOutlinerName(lexrc);
                        break;
 
-        case TC_TABLESTYLE:
+               case TC_TABLESTYLE:
                        lexrc.next();
                        tablestyle_ = rtrim(lexrc.getString());
                        break;
@@ -1402,14 +1402,17 @@ bool TextClass::readFloat(Lexer & lexrc)
                FT_HTMLATTR,
                FT_HTMLTAG,
                FT_DOCBOOKATTR,
+               FT_DOCBOOKFLOATTYPE,
                FT_DOCBOOKTAG,
                FT_DOCBOOKTAGTYPE,
+               FT_DOCBOOKCAPTION,
                FT_LISTCOMMAND,
                FT_REFPREFIX,
                FT_ALLOWED_PLACEMENT,
                FT_ALLOWS_SIDEWAYS,
                FT_ALLOWS_WIDE,
                FT_REQUIRES,
+               FT_PRETTYFORMAT,
                FT_END
        };
 
@@ -1418,6 +1421,8 @@ bool TextClass::readFloat(Lexer & lexrc)
                { "allowssideways", FT_ALLOWS_SIDEWAYS },
                { "allowswide", FT_ALLOWS_WIDE },
                { "docbookattr", FT_DOCBOOKATTR },
+               { "docbookcaption", FT_DOCBOOKCAPTION },
+               { "docbookfloattype", FT_DOCBOOKFLOATTYPE },
                { "docbooktag", FT_DOCBOOKTAG },
                { "docbooktagtype", FT_DOCBOOKTAGTYPE },
                { "end", FT_END },
@@ -1431,6 +1436,7 @@ bool TextClass::readFloat(Lexer & lexrc)
                { "listname", FT_LISTNAME },
                { "numberwithin", FT_WITHIN },
                { "placement", FT_PLACEMENT },
+               { "prettyformat", FT_PRETTYFORMAT },
                { "refprefix", FT_REFPREFIX },
                { "requires", FT_REQUIRES },
                { "style", FT_STYLE },
@@ -1445,8 +1451,10 @@ bool TextClass::readFloat(Lexer & lexrc)
        docstring htmlstyle;
        string htmltag;
        string docbookattr;
+       string docbookcaption;
        string docbooktag;
        string docbooktagtype;
+       string docbookfloattype;
        string listname;
        string listcommand;
        string name;
@@ -1457,6 +1465,7 @@ bool TextClass::readFloat(Lexer & lexrc)
        string type;
        string within;
        string required;
+       docstring prettyformat;
        bool usesfloat = true;
        bool ispredefined = false;
        bool allowswide = true;
@@ -1560,10 +1569,18 @@ bool TextClass::readFloat(Lexer & lexrc)
                        lexrc.next();
                        htmltag = lexrc.getString();
                        break;
+               case FT_PRETTYFORMAT:
+                       lexrc.next();
+                       prettyformat = lexrc.getDocString();
+                       break;
                case FT_DOCBOOKATTR:
                        lexrc.next();
                        docbookattr = lexrc.getString();
                        break;
+               case FT_DOCBOOKCAPTION:
+                       lexrc.next();
+                       docbookcaption = lexrc.getString();
+                       break;
                case FT_DOCBOOKTAG:
                        lexrc.next();
                        docbooktag = lexrc.getString();
@@ -1572,6 +1589,10 @@ bool TextClass::readFloat(Lexer & lexrc)
                        lexrc.next();
                        docbooktagtype = lexrc.getString();
                        break;
+               case FT_DOCBOOKFLOATTYPE:
+                       lexrc.next();
+                       docbookfloattype = lexrc.getString();
+                       break;
                case FT_END:
                        getout = true;
                        break;
@@ -1602,19 +1623,22 @@ bool TextClass::readFloat(Lexer & lexrc)
                }
                Floating fl(type, placement, ext, within, style, name,
                        listname, listcommand, refprefix, allowed_placement,
-                       htmltag, htmlattr, htmlstyle, docbookattr,
-                       docbooktagtype, required, usesfloat, ispredefined,
+                       htmltag, htmlattr, htmlstyle, docbooktag, docbookattr,
+                       docbooktagtype, docbookfloattype, docbookcaption,
+                       required, usesfloat, ispredefined,
                allowswide, allowssideways);
                floatlist_.newFloat(fl);
                // each float has its own counter
                counters_.newCounter(from_ascii(type), from_ascii(within),
                                docstring(), docstring(),
+                               prettyformat.empty() ? bformat(_("%1$s ##"), _(name)) : prettyformat,
                                bformat(_("%1$s (Float)"), _(name)));
                // also define sub-float counters
                docstring const subtype = "sub-" + from_ascii(type);
                counters_.newCounter(subtype, from_ascii(type),
                                "\\alph{" + subtype + "}", docstring(),
-                                bformat(_("Sub-%1$s (Float)"), _(name)));
+                               prettyformat.empty() ? bformat(_("Sub-%1$s ##"), _(name)) : prettyformat,
+                               bformat(_("Sub-%1$s (Float)"), _(name)));
        }
        return getout;
 }