From 2b01ca42d85a4bb019778a50e1b806b76cedd6a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 20 Oct 2006 20:30:00 +0000 Subject: [PATCH] Move counters toward unicode. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15418 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/buffer_funcs.C | 40 +++++++++---------- src/buffer_funcs.h | 6 ++- src/counters.C | 92 ++++++++++++++++++++++++++------------------ src/counters.h | 34 ++++++++-------- src/lyxtextclass.C | 6 ++- src/output_docbook.C | 3 +- src/sgml.C | 7 ++-- 7 files changed, 105 insertions(+), 83 deletions(-) diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C index 7dd64ea012..0e94ff2b62 100644 --- a/src/buffer_funcs.C +++ b/src/buffer_funcs.C @@ -386,11 +386,10 @@ void setLabel(Buffer const & buf, ParIterator & it) if (layout->toclevel <= buf.params().secnumdepth && (layout->latextype != LATEX_ENVIRONMENT || isFirstInSequence(it.pit(), it.plist()))) { - counters.step(layout->counter); // FIXME UNICODE - docstring label = - lyx::from_ascii(expandLabel(buf, layout, - par.params().appendix())); + counters.step(lyx::from_ascii(layout->counter)); + docstring label = expandLabel(buf, layout, + par.params().appendix()); par.params().labelString(label); } } else if (layout->labeltype == LABEL_ITEMIZE) { @@ -420,7 +419,7 @@ void setLabel(Buffer const & buf, ParIterator & it) // FIXME // Yes I know this is a really, really! bad solution // (Lgb) - string enumcounter = "enum"; + docstring enumcounter = lyx::from_ascii("enum"); switch (par.itemdepth) { case 2: @@ -464,11 +463,10 @@ void setLabel(Buffer const & buf, ParIterator & it) break; } - // FIXME UNICODE - par.params().labelString(lyx::from_utf8(counters.counterLabel(lyx::to_utf8(buf.B_(format))))); + par.params().labelString(counters.counterLabel(buf.B_(format))); } else if (layout->labeltype == LABEL_BIBLIO) {// ale970302 - counters.step("bibitem"); - int number = counters.value("bibitem"); + counters.step(lyx::from_ascii("bibitem")); + int number = counters.value(lyx::from_ascii("bibitem")); if (par.bibitem()) par.bibitem()->setCounter(number); par.params().labelString(buf.B_(layout->labelstring())); @@ -490,8 +488,8 @@ void setLabel(Buffer const & buf, ParIterator & it) docstring s; if (!type.empty()) { Floating const & fl = textclass.floats().getType(type); - - counters.step(fl.type()); + // FIXME UNICODE + counters.step(lyx::from_ascii(fl.type())); // Doesn't work... yet. s = bformat(_("%1$s #:"), buf.B_(fl.name())); @@ -591,24 +589,24 @@ void updateLabels(Buffer const & buf) } -string expandLabel(Buffer const & buf, - LyXLayout_ptr const & layout, bool appendix) +docstring expandLabel(Buffer const & buf, + LyXLayout_ptr const & layout, bool appendix) { LyXTextClass const & tclass = buf.params().getLyXTextClass(); - // FIXME UNICODE - string fmt = lyx::to_utf8(buf.B_(appendix ? layout->labelstring_appendix() - : layout->labelstring())); + docstring fmt = buf.B_(appendix ? layout->labelstring_appendix() + : layout->labelstring()); // handle 'inherited level parts' in 'fmt', // i.e. the stuff between '@' in '@Section@.\arabic{subsection}' size_t const i = fmt.find('@', 0); - if (i != string::npos) { + if (i != docstring::npos) { size_t const j = fmt.find('@', i + 1); - if (j != string::npos) { - string parent(fmt, i + 1, j - i - 1); - string label = expandLabel(buf, tclass[parent], appendix); - fmt = string(fmt, 0, i) + label + string(fmt, j + 1, string::npos); + if (j != docstring::npos) { + docstring parent(fmt, i + 1, j - i - 1); + // FIXME UNICODE + docstring label = expandLabel(buf, tclass[lyx::to_utf8(parent)], appendix); + fmt = docstring(fmt, 0, i) + label + docstring(fmt, j + 1, docstring::npos); } } diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h index 599a2dbc71..eb2b3d4a68 100644 --- a/src/buffer_funcs.h +++ b/src/buffer_funcs.h @@ -13,6 +13,7 @@ #define BUFFER_FUNCS_H #include "lyxlayout_ptr_fwd.h" +#include "support/docstring.h" #include @@ -45,8 +46,9 @@ void bufferErrors(Buffer const &, TeXErrors const &, ErrorList &); int countWords(DocIterator const & from, DocIterator const & to); /// Expand the counters for the labelstring of \c layout -std::string expandLabel(Buffer const & buf, LyXLayout_ptr const & layout, - bool appendix); +lyx::docstring expandLabel(Buffer const & buf, + LyXLayout_ptr const & layout, + bool appendix); /// update labels at "iter". diff --git a/src/counters.C b/src/counters.C index 573eeb63c3..624d71cc33 100644 --- a/src/counters.C +++ b/src/counters.C @@ -22,6 +22,8 @@ #include +using lyx::docstring; + using std::endl; using std::ostringstream; using std::string; @@ -63,45 +65,52 @@ void Counter::reset() } -string Counter::master() const +docstring Counter::master() const { return master_; } -void Counter::setMaster(string const & m) +void Counter::setMaster(docstring const & m) { master_ = m; } -void Counters::newCounter(string const & newc) +void Counters::newCounter(docstring const & newc) { // First check if newc already exist CounterList::iterator const cit = counterList.find(newc); // if already exist give warning and return if (cit != counterList.end()) { - lyxerr << "New counter already exists: " << newc << endl; + lyxerr << "New counter already exists: " + << lyx::to_utf8(newc) + << endl; return; } counterList[newc]; } -void Counters::newCounter(string const & newc, string const & masterc) +void Counters::newCounter(docstring const & newc, + docstring const & masterc) { // First check if newc already exists CounterList::iterator const cit = counterList.find(newc); // if already existant give warning and return if (cit != counterList.end()) { - lyxerr << "New counter already exists: " << newc << endl; + lyxerr << "New counter already exists: " + << lyx::to_utf8(newc) + << endl; return; } // then check if masterc exists CounterList::iterator const it = counterList.find(masterc); // if not give warning and return if (it == counterList.end()) { - lyxerr << "Master counter does not exist: " << masterc << endl; + lyxerr << "Master counter does not exist: " + << lyx::to_utf8(masterc) + << endl; return; } @@ -109,44 +118,48 @@ void Counters::newCounter(string const & newc, string const & masterc) } -void Counters::set(string const & ctr, int const val) +void Counters::set(docstring const & ctr, int const val) { CounterList::iterator const it = counterList.find(ctr); if (it == counterList.end()) { - lyxerr << "set: Counter does not exist: " << ctr << endl; + lyxerr << "set: Counter does not exist: " + << lyx::to_utf8(ctr) << endl; return; } it->second.set(val); } -void Counters::addto(string const & ctr, int const val) +void Counters::addto(docstring const & ctr, int const val) { CounterList::iterator const it = counterList.find(ctr); if (it == counterList.end()) { - lyxerr << "addto: Counter does not exist: " << ctr << endl; + lyxerr << "addto: Counter does not exist: " + << lyx::to_utf8(ctr) << endl; return; } it->second.addto(val); } -int Counters::value(string const & ctr) const +int Counters::value(docstring const & ctr) const { CounterList::const_iterator const cit = counterList.find(ctr); if (cit == counterList.end()) { - lyxerr << "value: Counter does not exist: " << ctr << endl; + lyxerr << "value: Counter does not exist: " + << lyx::to_utf8(ctr) << endl; return 0; } return cit->second.value(); } -void Counters::step(string const & ctr) +void Counters::step(docstring const & ctr) { CounterList::iterator it = counterList.find(ctr); if (it == counterList.end()) { - lyxerr << "step: Counter does not exist: " << ctr << endl; + lyxerr << "step: Counter does not exist: " + << lyx::to_utf8(ctr) << endl; return; } @@ -171,7 +184,7 @@ void Counters::reset() } -void Counters::reset(string const & match) +void Counters::reset(docstring const & match) { BOOST_ASSERT(!match.empty()); @@ -184,7 +197,7 @@ void Counters::reset(string const & match) } -void Counters::copy(Counters & from, Counters & to, string const & match) +void Counters::copy(Counters & from, Counters & to, docstring const & match) { CounterList::iterator it = counterList.begin(); CounterList::iterator end = counterList.end(); @@ -228,7 +241,7 @@ char hebrewCounter(int const n) } -string const lowerromanCounter(int const n) +docstring const lowerromanCounter(int const n) { static char const * const roman[20] = { "i", "ii", "iii", "iv", "v", @@ -238,12 +251,12 @@ string const lowerromanCounter(int const n) }; if (n < 1 || n > 20) - return "??"; - return roman[n - 1]; + return lyx::from_ascii("??"); + return lyx::from_ascii(roman[n - 1]); } -string const romanCounter(int const n) +docstring const romanCounter(int const n) { static char const * const roman[20] = { "I", "II", "III", "IV", "V", @@ -253,28 +266,31 @@ string const romanCounter(int const n) }; if (n < 1 || n > 20) - return "??"; - return roman[n - 1]; + return lyx::from_ascii("??"); + return lyx::from_ascii(roman[n - 1]); } } // namespace anon -string Counters::labelItem(string const & ctr, string const & numbertype) +docstring Counters::labelItem(docstring const & ctr, + docstring const & numbertype) { if (counterList.find(ctr) == counterList.end()) { - lyxerr << "Counter " << ctr << " does not exist." << endl; - return string(); + lyxerr << "Counter " + << lyx::to_utf8(ctr) + << " does not exist." << endl; + return docstring(); } if (numbertype == "hebrew") - return string(1, hebrewCounter(value(ctr))); + return docstring(1, hebrewCounter(value(ctr))); if (numbertype == "alph") - return string(1, loweralphaCounter(value(ctr))); + return docstring(1, loweralphaCounter(value(ctr))); if (numbertype == "Alph") - return string(1, alphaCounter(value(ctr))); + return docstring(1, alphaCounter(value(ctr))); if (numbertype == "roman") return lowerromanCounter(value(ctr)); @@ -282,31 +298,31 @@ string Counters::labelItem(string const & ctr, string const & numbertype) if (numbertype == "Roman") return romanCounter(value(ctr)); - return convert(value(ctr)); + return convert(value(ctr)); } -string Counters::counterLabel(string const & format) +docstring Counters::counterLabel(docstring const & format) { - string label = format; + docstring label = format; while (true) { #ifdef WITH_WARNINGS #warning Using boost::regex or boost::spirit would make this code a lot simpler... (Lgb) #endif size_t const i = label.find('\\', 0); - if (i == string::npos) + if (i == docstring::npos) break; size_t const j = label.find('{', i + 1); - if (j == string::npos) + if (j == docstring::npos) break; size_t const k = label.find('}', j + 1); if (k == string::npos) break; - string const numbertype(label, i + 1, j - i - 1); - string const counter(label, j + 1, k - j - 1); - string const rep = labelItem(counter, numbertype); - label = string(label, 0, i) + rep + string(label, k + 1, string::npos); + docstring const numbertype(label, i + 1, j - i - 1); + docstring const counter(label, j + 1, k - j - 1); + docstring const rep = labelItem(counter, numbertype); + label = docstring(label, 0, i) + rep + docstring(label, k + 1, string::npos); //lyxerr << " : " << " (" << counter << "," // << numbertype << ") -> " << label << endl; } diff --git a/src/counters.h b/src/counters.h index df9a0a6149..5fa2670133 100644 --- a/src/counters.h +++ b/src/counters.h @@ -15,8 +15,9 @@ #ifndef COUNTERS_H #define COUNTERS_H +#include "support/docstring.h" + #include -#include /// This represents a single counter. class Counter { @@ -34,16 +35,16 @@ public: /// void reset(); /// Returns the master counter of this counter - std::string master() const; + lyx::docstring master() const; /// sets the master counter for this counter - void setMaster(std::string const & m); + void setMaster(lyx::docstring const & m); private: /// int value_; /// contains master counter name; master counter is the counter /// that, if stepped (incremented) zeroes this counter. E.g. /// "subparagraph"'s master is "paragraph". - std::string master_; + lyx::docstring master_; }; @@ -52,36 +53,39 @@ private: class Counters { public: /// Add a new counter to array. - void newCounter(std::string const & newc); + void newCounter(lyx::docstring const & newc); /// Add new counter having oldc as its master. - void newCounter(std::string const & newc, std::string const & oldc); + void newCounter(lyx::docstring const & newc, + lyx::docstring const & oldc); /// - void set(std::string const & ctr, int val); + void set(lyx::docstring const & ctr, int val); /// - void addto(std::string const & ctr, int val); + void addto(lyx::docstring const & ctr, int val); /// - int value(std::string const & ctr) const; + int value(lyx::docstring const & ctr) const; /// Step (increment by one) counter named by arg, and /// zeroes slave counter(s) for which it is the master. /// NOTE sub-slaves not zeroed! That happens at slave's /// first step 0->1. Seems to be sufficient. - void step(std::string const & ctr); + void step(lyx::docstring const & ctr); /// Reset all counters. void reset(); /// Reset counters matched by match string. - void reset(std::string const & match); + void reset(lyx::docstring const & match); /// Copy counters whose name matches match from the &from to /// the &to array of counters. Empty string matches all. - void copy(Counters & from, Counters & to, std::string const & match = std::string()); + void copy(Counters & from, Counters & to, + lyx::docstring const & match = lyx::docstring()); /// A complete expanded label, like 2.1.4 for a subsubsection /// according to the given format - std::string counterLabel(std::string const & format); + lyx::docstring counterLabel(lyx::docstring const & format); private: /// A counter label's single item, 1 for subsection number in /// the 2.1.4 subsubsection number label. - std::string labelItem(std::string const & ctr, std::string const & numbertype); + lyx::docstring labelItem(lyx::docstring const & ctr, + lyx::docstring const & numbertype); /// Maps counter (layout) names to actual counters. - typedef std::map CounterList; + typedef std::map CounterList; /// Instantiate. CounterList counterList; diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C index 8ccde35996..f82a8fd3d2 100644 --- a/src/lyxtextclass.C +++ b/src/lyxtextclass.C @@ -835,10 +835,12 @@ void LyXTextClass::readCounter(LyXLex & lexrc) // Here if have a full counter if getout == true if (getout) { + // FIXME UNICODE if (within.empty()) { - ctrs_->newCounter(name); + ctrs_->newCounter(lyx::from_ascii(name)); } else { - ctrs_->newCounter(name, within); + ctrs_->newCounter(lyx::from_ascii(name), + lyx::from_ascii(within)); } } diff --git a/src/output_docbook.C b/src/output_docbook.C index 16ef71411c..eb1097043f 100644 --- a/src/output_docbook.C +++ b/src/output_docbook.C @@ -235,8 +235,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf, // Label around sectioning number: if (!bstyle->labeltag().empty()) { sgml::openTag(os, bstyle->labeltag()); - // FIXME UNICODE - os << lyx::from_ascii(expandLabel(buf, bstyle, false)); + os << expandLabel(buf, bstyle, false); sgml::closeTag(os, bstyle->labeltag()); } diff --git a/src/sgml.C b/src/sgml.C index 35d5de1998..23d4904fad 100644 --- a/src/sgml.C +++ b/src/sgml.C @@ -227,11 +227,12 @@ void sgml::openTag(Buffer const & buf, odocstream & os, OutputParams const & run attribute = id + ' ' + param; } else { if (param.find('#') != string::npos) { + // FIXME UNICODE if(!style->counter.empty()) - counters.step(style->counter); + counters.step(lyx::from_ascii(style->counter)); else - counters.step(style->latexname()); - int i = counters.value(name); + counters.step(lyx::from_ascii(style->latexname())); + int i = counters.value(lyx::from_ascii(name)); attribute = subst(param, "#", convert(i)); } else { attribute = param; -- 2.39.2