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

Small fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@624 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-03-22 15:02:51 +00:00
parent 91a2ea274e
commit c5609edc64
5 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2000-03-21 Kayvan A. Sylvan <kayvan@camel.internal.sylvan.com>
* src/lyx_main.C (easyParse): Removed misplaced gui=false which
caused lyx to startup with no GUI in place, causing in a crash
upon startup when called with arguments.
2000-03-21 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/FontLoader.C: better initialization of dummyXFontStruct.
2000-03-20 José Abílio Matos <jamatos@lyx.org> 2000-03-20 José Abílio Matos <jamatos@lyx.org>
* src/lyxrc.[Ch] Removed \sgml_extra_options, added 6 other flags * src/lyxrc.[Ch] Removed \sgml_extra_options, added 6 other flags

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2000-03-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* es.po: bugfix from Jose M. Alcaide
2000-03-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2000-03-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* fr.po: updated from Olivier Faucheux * fr.po: updated from Olivier Faucheux

10
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: lyx-1.0.0\n" "Project-Id-Version: lyx-1.0.0\n"
"POT-Creation-Date: 2000-02-17 01:59+0100\n" "POT-Creation-Date: 2000-02-17 01:59+0100\n"
"PO-Revision-Date: 2000-01-20 22:46+00:00\n" "PO-Revision-Date: 2000-03-22 15:54+01:00\n"
"Last-Translator: David Suárez de lis <excalibor@iname.com>\n" "Last-Translator: David Suárez de lis <excalibor@iname.com>\n"
"Language-Team: Spanish <es@li.org>\n" "Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -3266,17 +3266,13 @@ msgstr " Dist. peque
msgid "" msgid ""
" Default | Custom | USletter | USlegal | USexecutive | A3 | A4 | A5 | B3 | " " Default | Custom | USletter | USlegal | USexecutive | A3 | A4 | A5 | B3 | "
"B4 | B5 " "B4 | B5 "
msgstr "" msgstr " Por defecto | Personalizado | CartaUS | LegalUS | EjecutivoUS | A3 | A4 | A5 | B3 | B4 | B5 "
" Por defecto | Personalizado | LegalUS | EjecutivoUS | A3 | A4 | A5 | B3 | "
"B4 | B5 "
#: src/lyx_gui.C:478 #: src/lyx_gui.C:478
msgid "" msgid ""
" None | A4 small Margins (only portrait) | A4 very small Margins (only " " None | A4 small Margins (only portrait) | A4 very small Margins (only "
"portrait) | A4 very wide margins (only portrait) " "portrait) | A4 very wide margins (only portrait) "
msgstr "" msgstr " Ninguno | A4 márgenes pequeños (sólo retrato) | A4 mágenes muy pequeños (sólo retrato) | A4 márgenes muy anchos (sólo retrato) "
" Ninguno | A4 márgenes pequeñas (sólo retrato) | A4 mágenes muy pequeños "
"(sólo retrato) | A4 márgenes muy anchos (sólo márgenes) "
#: src/lyx_gui.C:524 #: src/lyx_gui.C:524
msgid " ``text'' | ''text'' | ,,text`` | ,,text'' | «text» | »text« " msgid " ``text'' | ''text'' | ,,text`` | ,,text'' | «text» | »text« "

34
src/FontLoader.C
View File

@ -198,27 +198,9 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
} }
// A dummy fontstruct used when there is no gui. Only the last 3 have // A dummy fontstruct used when there is no gui.
// well-thought values... static XFontStruct dummyXFontStruct;
static XFontStruct dummyXFontStruct = { static bool dummyXFontStructisGood = false;
/*XExtData *ext_data; */ 0,
/* Font fid; */ 0,
/* unsigned direction; */ FontLeftToRight,
/* unsigned min_char_or_byte2; */ 0,
/* unsigned max_char_or_byte2; */ 0,
/* unsigned min_byte1; */ 0,
/* unsigned max_byte1; */ 0,
/* Bool all_chars_exist; */ 0,
/* unsigned default_char; */ 0,
/* int n_properties; */ 0,
/* XFontProp *properties; */ 0,
/* XCharStruct min_bounds; */ 0,
/* XCharStruct max_bounds; */ 0,
/* XCharStruct *per_char; */ 0, // no character specific info
/* int ascent; */ 1, // unit ascent on character displays
/* int descent; */ 0, // no descent on character displays
};
/// Do load font /// Do load font
XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family, XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
@ -227,6 +209,16 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
LyXFont::FONT_SIZE size) LyXFont::FONT_SIZE size)
{ {
if (!lyxrc.use_gui) { if (!lyxrc.use_gui) {
if (!dummyXFontStructisGood) {
// no character specific info
dummyXFontStruct.per_char=0;
// unit ascent on character displays
dummyXFontStruct.ascent = 1;
// no descent on character displays
dummyXFontStruct.descent = 0;
dummyXFontStructisGood = true;
}
return &dummyXFontStruct; return &dummyXFontStruct;
} }

1
src/lyx_main.C
View File

@ -575,7 +575,6 @@ bool LyX::easyParse(int * argc, char * argv[])
"ps...] after ") "ps...] after ")
<< arg << _(" switch!") << endl; << arg << _(" switch!") << endl;
} }
gui = false;
} }
return gui; return gui;
} }