move the catInit call around

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27481 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 1f5b9159483bd406a7d73a692cb7505d727b89c3..b9194833023b5e1d9ae77a599e6584bc37f64631 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -250,7 +250,7 @@ void InsetBibitem::fillWithBibKeys(BiblioInfo & keys, InsetIterator const & it)
 /// Update the counters of this inset and of its contents
 void InsetBibitem::updateLabels(ParIterator const &) 
 {
-       Counters & counters = buffer().params().documentClass().counters();
+       Counters & counters = buffer().masterBuffer()->params().documentClass().counters();
        docstring const bibitem = from_ascii("bibitem");
        if (counters.hasCounter(bibitem) && getParam("label").empty()) {
                counters.step(bibitem);

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index d771dacd49692eb36ad7ba6a409fcf3947fbcf6d..615171d0e28343486f925bdf7143db4968fb00da 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -47,7 +47,7 @@ docstring InsetFoot::editMessage() const
 
 void InsetFoot::updateLabels(ParIterator const & it)
 {
-       DocumentClass const & tclass = buffer().params().documentClass();
+       DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass();
        Counters & cnts = tclass.counters();
        docstring const foot = from_ascii("footnote");
        Paragraph const & outer =  it.paragraph();

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 36197ee8322a5f858db8cf3486dbe99130e6a96e..647d401386484503f54b7c3ae2663250fab2d275 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -73,7 +73,7 @@ Inset::DisplayType InsetListings::display() const
 
 void InsetListings::updateLabels(ParIterator const & it)
 {
-       Counters & cnts = buffer().params().documentClass().counters();
+       Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
        string const saveflt = cnts.current_float();
 
        // Tell to captions what the current float is

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index c9c18706ed350c26751840eac8ba86667172a2fb..7338daba1e3fd3c8c734009e05c9a4b1ead0ae44 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3211,7 +3211,7 @@ void InsetTabular::edit(Cursor & cur, bool front, EntryDirection)
 void InsetTabular::updateLabels(ParIterator const & it)
 {
        // In a longtable, tell captions what the current float is
-       Counters & cnts = buffer().params().documentClass().counters();
+       Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
        string const saveflt = cnts.current_float();
        if (tabular.is_long_tabular)
                cnts.current_float("table");

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index eaeecc106b72ed4079ba9e7c252cfa57a5f93f44..e4722e123835314904c4e278e06825caab3c1abc 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -462,7 +462,7 @@ void InsetText::updateLabels(ParIterator const & it)
        if (producesOutput())
                lyx::updateLabels(buffer(), it2);
        else {
-               DocumentClass const & tclass = buffer().params().documentClass();
+               DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass();
                Counters const savecnt = tclass.counters();
                lyx::updateLabels(buffer(), it2);
                tclass.counters() = savecnt;

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 293a843c75dfc7c509d816cb355e5d62e5b09343..68b228ef5366bc71b385a8f24e030a06330340e7 100644 (file)
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -25,6 +25,11 @@ CatCode theCatcode[256];
 
 void catInit()
 {
+       static bool init_done = false;
+       if (init_done) 
+               return;
+       init_done = true;
+
        fill(theCatcode, theCatcode + 256, catOther);
        fill(theCatcode + 'a', theCatcode + 'z' + 1, catLetter);
        fill(theCatcode + 'A', theCatcode + 'Z' + 1, catLetter);
@@ -358,6 +363,7 @@ string const Parser::verbatimEnvironment(string const & name)
 
 void Parser::tokenize_one()
 {
+       catInit();
        char c;
        if (!is_.get(c)) 
                return;
@@ -434,13 +440,6 @@ void Parser::tokenize_one()
 
 void Parser::tokenize()
 {
-       static bool init_done = false;
-
-       if (!init_done) {
-               catInit();
-               init_done = true;
-       }
-
        while (is_) 
                tokenize_one();
 }