Hi,
the attached patch changes some uses of the term "glossary" to
"nomenclature".
I will commit as soon as I get two OKs. (José vote will count as two).
Michael
José Matos schrieb:
On Wednesday 25 April 2007 8:53:54 am Georg Baum wrote:
What I mean is that the insets that creates a nomenclature for LaTeX should
not create a glossary for docbook. This is confusing, therefore the
nomenclature inset should output something else than glossary entries for
docbook IMHO.
You are right.
I don't have any good suggestion at the moment, I searched both for notation
and for nomenclature and I found no elements.
I will try to have a more close look later.
Georg
Index: src/insets/InsetNomencl.cpp
===================================================================
--- src/insets/InsetNomencl.cpp (Revision 18089)
+++ src/insets/InsetNomencl.cpp (Arbeitskopie)
@@ -30,20 +30,20 @@
InsetNomencl::InsetNomencl(InsetCommandParams const & p)
: InsetCommand(p, "nomenclature"),
- glossary_entry_id(sgml::uniqueID(from_ascii("gloss")))
+ nomenclature_entry_id(sgml::uniqueID(from_ascii("nomen")))
{}
docstring const InsetNomencl::getScreenLabel(Buffer const &) const
{
- return _("Glo");
+ return _("Nom");
}
int InsetNomencl::docbook(Buffer const &, odocstream & os,
OutputParams const &) const
{
- os << "<glossterm linkend=\"" << glossary_entry_id << "\">"
+ os << "<glossterm linkend=\"" << nomenclature_entry_id << "\">"
<< sgml::escapeString(getParam("symbol"))
<< "</glossterm>";
return 0;
@@ -52,7 +52,7 @@
int InsetNomencl::docbookGlossary(odocstream & os) const
{
- os << "<glossentry id=\"" << glossary_entry_id << "\">\n"
+ os << "<glossentry id=\"" << nomenclature_entry_id << "\">\n"
<< "<glossterm>"
<< sgml::escapeString(getParam("symbol"))
<< "</glossterm>\n"
@@ -83,7 +83,7 @@
docstring const InsetPrintNomencl::getScreenLabel(Buffer const &) const
{
- return _("Glossary");
+ return _("Nomenclature");
}
Index: src/insets/InsetNomencl.h
===================================================================
--- src/insets/InsetNomencl.h (Revision 18089)
+++ src/insets/InsetNomencl.h (Arbeitskopie)
@@ -21,7 +21,7 @@
class LaTeXFeatures;
-/** Used to insert glossary labels
+/** Used to insert nomenclature entries
*/
class InsetNomencl : public InsetCommand {
public:
@@ -44,8 +44,8 @@
virtual std::auto_ptr<Inset> doClone() const {
return std::auto_ptr<Inset>(new InsetNomencl(params()));
}
- /// unique id for this glossary entry for docbook export
- docstring glossary_entry_id;
+ /// unique id for this nomenclature entry for docbook export
+ docstring nomenclature_entry_id;
};
Index: src/frontends/qt4/Dialogs.cpp
===================================================================
--- src/frontends/qt4/Dialogs.cpp (Revision 18089)
+++ src/frontends/qt4/Dialogs.cpp (Arbeitskopie)
@@ -225,7 +225,7 @@
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "nomenclature") {
dialog->setController(new ControlCommand(*dialog, name, name));
- dialog->setView(new QNomencl(*dialog, _("Glossary Entry")));
+ dialog->setView(new QNomencl(*dialog, _("Nomenclature Entry")));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "label") {
dialog->setController(new ControlCommand(*dialog, name, name));
Index: lib/doc/LaTeXConfig.lyx.in
===================================================================
--- lib/doc/LaTeXConfig.lyx.in (Revision 18089)
+++ lib/doc/LaTeXConfig.lyx.in (Arbeitskopie)
@@ -2956,7 +2956,7 @@
\family sans
nomencl
\family default
- is needed by LyX to produce a glossary.
+ is needed by LyX to produce a nomenclature.
\end_layout
\begin_layout Subsection
Index: lib/ui/stdtoolbars.inc
===================================================================
--- lib/ui/stdtoolbars.inc (Revision 18089)
+++ lib/ui/stdtoolbars.inc (Arbeitskopie)
@@ -92,7 +92,7 @@
Item "Insert cross-reference" "dialog-show-new-inset ref"
Item "Insert citation" "dialog-show-new-inset citation"
Item "Insert index entry" "index-insert"
- Item "Insert glossary entry" "nomencl-insert"
+ Item "Insert nomenclature entry" "nomencl-insert"
Separator
Item "Insert footnote" "footnote-insert"
Item "Insert margin note" "marginalnote-insert"
Index: lib/ui/stdmenus.inc
===================================================================
--- lib/ui/stdmenus.inc (Revision 18089)
+++ lib/ui/stdmenus.inc (Arbeitskopie)
@@ -302,7 +302,7 @@
Item "Label...|L" "label-insert"
Item "Caption" "caption-insert"
Item "Index Entry|d" "index-insert"
- Item "Glossary Entry...|y" "nomencl-insert"
+ Item "Nomenclature Entry...|y" "nomencl-insert"
Separator
Item "Table...|T" "tabular-insert"
Item "Graphics...|G" "dialog-show-new-inset graphics"
@@ -375,7 +375,7 @@
Item "Table of Contents|C" "toc-insert"
FloatListInsert
Item "Index List|I" "index-print"
- Item "Glossary|G" "nomencl-print"
+ Item "Nomenclature|N" "nomencl-print"
Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex"
End
Index: lib/ui/classic.ui
===================================================================
--- lib/ui/classic.ui (Revision 18089)
+++ lib/ui/classic.ui (Arbeitskopie)
@@ -221,7 +221,7 @@
Item "Marginal Note|M" "marginalnote-insert"
Item "Short Title" "optional-insert"
Item "Index Entry|I" "index-insert"
- Item "Glossary Entry" "nomencl-insert"
+ Item "Nomenclature Entry" "nomencl-insert"
Item "URL...|U" "url-insert"
Item "Note|N" "note-insert"
Submenu "Lists & TOC|O" "insert_toc"
@@ -310,7 +310,7 @@
Item "Table of Contents|C" "toc-insert"
FloatListInsert
Item "Index List|I" "index-print"
- Item "Glossary|G" "nomencl-print"
+ Item "Nomenclature|N" "nomencl-print"
Item "BibTeX Bibliography...|B" "dialog-show-new-inset bibtex"
End
Index: NEWS
===================================================================
--- NEWS (Revision 18089)
+++ NEWS (Arbeitskopie)
@@ -77,7 +77,7 @@
provides beautiful and elegant tabulars.
-* Glossaries
+* Nomenclatures
Native LyX support for the nomencl package was implemented. With this,
you can treat your document with all sorts of nomenclatures,
Index: development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt
===================================================================
--- development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt (Revision 18089)
+++ development/Win32/packaging/installer/LyXWinInstaller/Changelog.txt (Arbeitskopie)
@@ -40,7 +40,7 @@
- new layout and template files for the g-brief2 letter class and the
moderncv and europecv curriculum vitae classes
- reworked BibTeX file parser
- - reworked graphics, glossary, and math delimiter dialog
+ - reworked graphics, nomenclature, and math delimiter dialog
- new Spanish translation of the Extended manual
- many other bugfixes
Index: ANNOUNCE
===================================================================
--- ANNOUNCE (Revision 18089)
+++ ANNOUNCE (Arbeitskopie)
@@ -142,7 +142,7 @@
provides beautiful and elegant tabulars.
-* Glossaries
+* Nomenclatures
Native LyX support for the nomencl package was implemented. With this,
you can treat your document with all sorts of nomenclatures,
