anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix output of formatted counters.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33122 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-01-20 22:28:42 +00:00
parent 0568e46eea
commit aff3907ec6
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/layouts/stdcounters.inc
View File

@ -11,32 +11,32 @@ Counter part
End
Counter chapter
PrettyFormat "Chapter \arabic{chapter}"
PrettyFormat "Chapter ##"
End
Counter section
Within chapter
PrettyFormat "Section \arabic{section}"
PrettyFormat "Section ##"
End
Counter subsection
Within section
PrettyFormat "Section \arabic{subsection}"
PrettyFormat "Section ##"
End
Counter subsubsection
Within subsection
PrettyFormat "Section \arabic{subsubsection}"
PrettyFormat "Section ##"
End
Counter paragraph
Within subsubsection
PrettyFormat "Paragraph \arabic{paragraph}"
PrettyFormat "Paragraph ##"
End
Counter subparagraph
Within paragraph
PrettyFormat "Paragraph \arabic{subparagraph}"
PrettyFormat "Paragraph ##"
End
Counter enumi
@ -65,9 +65,9 @@ Counter listing
End
Counter equation
PrettyFormat "Equation \arabic{equation}"
PrettyFormat "Equation ##"
End
Counter footnote
PrettyFormat "Footnote \arabic{footnote}"
PrettyFormat "Footnote ##"
End

16
src/Counters.cpp
View File

@ -545,21 +545,19 @@ docstring Counters::counterLabel(docstring const & format,
}
docstring Counters::prettyCounter(docstring const & counter,
docstring Counters::prettyCounter(docstring const & name,
string const & lang) const
{
CounterList::const_iterator it = counterList_.find(counter);
CounterList::const_iterator it = counterList_.find(name);
if (it == counterList_.end())
return from_ascii("??");
Counter const & ctr = it->second;
docstring const value = theCounter(name, lang);
docstring const & format = ctr.prettyFormat();
// FIXME We need to "flatten" the format to get proper output,
// but doing so will take a bit of work.
if (true || format.empty()) {
docstring cntrname = translateIfPossible(counter, lang);
return cntrname + " " + theCounter(counter, lang);
}
return counterLabel(format, lang);
if (format.empty())
return value;
return subst(format, from_ascii("##"), value);
}