mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 03:11:59 +00:00
integrate lengthcommon.cpp into Length.cpp.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21490 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
cd4c58fb92
commit
5a8a8b6b0c
@ -16,6 +16,8 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "Length.h"
|
||||
|
||||
#include "gettext.h"
|
||||
#include "LyXRC.h"
|
||||
|
||||
#include "support/docstream.h"
|
||||
@ -29,6 +31,32 @@ namespace lyx {
|
||||
using std::ostringstream;
|
||||
using std::string;
|
||||
|
||||
// FIXME: I am not sure if "mu" should be possible to select (Lgb)
|
||||
char const * const unit_name[] = {
|
||||
"sp", "pt", "bp", "dd", "mm", "pc",
|
||||
"cc", "cm", "in", "ex", "em", "mu",
|
||||
"text%", "col%", "page%", "line%",
|
||||
"theight%", "pheight%", "" };
|
||||
|
||||
|
||||
int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
|
||||
|
||||
|
||||
char const * const unit_name_gui[] = {
|
||||
N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
|
||||
N_("cc[[unit of measure]]"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
|
||||
N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
|
||||
N_("Text Height %"), N_("Page Height %"), "" };
|
||||
|
||||
|
||||
Length::UNIT unitFromString(string const & data)
|
||||
{
|
||||
int i = 0;
|
||||
while (i < num_units && data != unit_name[i])
|
||||
++i;
|
||||
return static_cast<Length::UNIT>(i);
|
||||
}
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
@ -182,7 +182,6 @@ liblyxcore_la_SOURCES = \
|
||||
LayoutEnums.h \
|
||||
Length.cpp \
|
||||
Length.h \
|
||||
lengthcommon.cpp \
|
||||
Lexer.cpp \
|
||||
Lexer.h \
|
||||
lfuns.h \
|
||||
|
@ -1,52 +0,0 @@
|
||||
/**
|
||||
* \file lengthcommon.cpp
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author Lars Gullik Bjønnes
|
||||
* \author Matthias Ettrich
|
||||
* \author John Levon
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "Length.h"
|
||||
#include "gettext.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
namespace lyx {
|
||||
|
||||
using std::string;
|
||||
|
||||
// I am not sure if "mu" should be possible to select (Lgb)
|
||||
|
||||
// the latex units
|
||||
char const * const unit_name[] = {
|
||||
"sp", "pt", "bp", "dd", "mm", "pc",
|
||||
"cc", "cm", "in", "ex", "em", "mu",
|
||||
"text%", "col%", "page%", "line%",
|
||||
"theight%", "pheight%", "" };
|
||||
|
||||
int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
|
||||
|
||||
// the LyX gui units
|
||||
char const * const unit_name_gui[] = {
|
||||
N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
|
||||
N_("cc[[unit of measure]]"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
|
||||
N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
|
||||
N_("Text Height %"), N_("Page Height %"), "" };
|
||||
|
||||
Length::UNIT unitFromString(string const & data)
|
||||
{
|
||||
int i = 0;
|
||||
while (i < num_units && data != unit_name[i])
|
||||
++i;
|
||||
return static_cast<Length::UNIT>(i);
|
||||
}
|
||||
|
||||
|
||||
} // namespace lyx
|
Loading…
Reference in New Issue
Block a user