From e8db0ccc46566f36a1711e35c3758a2e785021f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 13 Dec 1999 21:59:26 +0000 Subject: [PATCH] small things. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@375 a592a061-630c-0410-9148-cb99ea01b6c8 --- acinclude.m4 | 4 +- development/Code_rules/Rules | 73 +- po/.cvsignore | 1 - po/no.po | 1340 +++++++++++++++++---------------- src/LString.h | 6 +- src/Literate.C | 2 +- src/bmtable.C | 13 +- src/buffer.C | 6 +- src/debug.C | 17 +- src/debug.h | 6 +- src/insets/insetlatexaccent.C | 2 +- src/kbmap.C | 129 ++-- src/kbmap.h | 28 +- src/layout.C | 28 + src/lyx_gui.C | 14 +- src/mathed/math_hash.C | 92 +-- src/mathed/math_parser.h | 12 +- src/support/lyxstring.C | 37 +- src/support/syscall.C | 2 +- src/trans.C | 4 +- src/trans.h | 4 +- 21 files changed, 975 insertions(+), 845 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 51bd89efab..9d7435fa5b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -193,8 +193,8 @@ dnl Check the version of g++ fi if test x$with_warnings = xyes ; then case $gxx_version in - 2.95.*) CXXFLAGS="$CXXFLAGS -Wall";; - *) CXXFLAGS="$CXXFLAGS -ansi -Wall";; + 2.95.*) CXXFLAGS="$CXXFLAGS -Wall -W -Wconversion";; + *) CXXFLAGS="$CXXFLAGS -ansi -Wall -W";; esac if test $lyx_devel_version = yes ; then case $gxx_version in diff --git a/development/Code_rules/Rules b/development/Code_rules/Rules index f065a90078..ffc74c8d68 100644 --- a/development/Code_rules/Rules +++ b/development/Code_rules/Rules @@ -1,9 +1,17 @@ Rules for the code in LyX ------------------------- +[updated from the C++STYLE distrubuted with the GNU C++ Standard] The aim of this file is to serve as a guide for the developers, to aid us to get clean and uniform code. Still uncomplete. +We really like to have new developers joining the LyX Project. However +since we have had problems in the past with developers leaving the +project and their contributed code in a far from perfect state. Most +of this happened before that we really became aware of these issues, +but still, we don't want it to happen again. So we have put together +some guidelines and rules for the developers. + In general, if you want to contribute to the main source, we expect at least that you: @@ -12,24 +20,70 @@ that you: - adapt the code to the structures already existing in LyX, or in case that you have better ideas, discuss them on the developer's list before writing the code. +- take advantage of the C++ standard library. These guidelines should save us a lot of work while cleaning up the code and help us to have quality code. LyX has been haunted by problems coming from unfinished projects by people who have left the team. Those problems will hopefully disappear if the code is easy to hand over to somebody else. +When you send in a patch or commit to the LyX cvs repository we expect +you to add a ChangeLog entry. The entry should have this syntax: + +1999-12-13 Lars Gullik Bjønnes + + * src/support/lyxstring.C (find): assert bug fixed. + +* Pointers and references + char * p = "flop"; + char & c = *p; + -NOT- + char *p = "flop"; // wrong + char &c = *p; // wrong + + Some time ago we had a huge discusion on this subject and after +convincing argumentation from Asger this is what we decided. Also note +that we will have: + char const * p; + -NOT- + const char * p; + +* Operator names and parentheses + operator==(type) + -NOT- + operator == (type) // wrong + + The == is part of the function name, separating it makes the +declaration look like an expression. + +* Function names and parentheses + void mangle() + -NOT- + void mangle () // wrong + +* Enumerators + enum { + one = 1, + two = 2, + three = 3 + }; + -NOT- + enum { one = 1, two = 2, three 3 }; * Naming rules for classes - Use descriptive but simple and short names. For stuff specific to LyX use LyX as prefix. Some modules, like mathed or spellchecker, could have other prefixes. + [I am not so sure about the LyX prefix] - Class names are usually capitalized, and function names lowercased. - Enums are in CAPS. + Enums are named like Classes, enum values in CAPS. - Long variables are named like thisLongVariableName. + New types are capitalized, so this goes for typedefs,classes,structs +and enums. * Formatting @@ -41,12 +95,16 @@ hopefully disappear if the code is easy to hand over to somebody else. * Use existing structures - - Use LString whereever possible. LyX will someday move to Unicode, and - that will be easy if everybody uses LString now. + - Use string whereever possible. LyX will someday move to Unicode, and + that will be easy if everybody uses string now. - Check out the filename and path tools in filetools.h - - Use the Error class to report errors and messages + - Check out the string tools in lstring.h, and the SubString class + and the regex class. + + - Use the DebugStream class to report errors and messages using + the lyxerr instantation. [add description of other existing structures] @@ -56,7 +114,9 @@ hopefully disappear if the code is easy to hand over to somebody else. - Use this order for the access sections of your class: public, protected, private. The public section is interesting for every user of the class. The private section is only of interest for the - implementors of the class (you). + implementors of the class (you). [Obvously not true since this is + for developers, and we do not want one developer only to be able to + read and understand the implementation of class internals. Lgb] - Avoid to declare global objects in the declaration file of the class. If the same variable is used for all object, use a static member. @@ -74,8 +134,7 @@ hopefully disappear if the code is easy to hand over to somebody else. - You document for the other developers, not for yourself. - You should document what the funtion do, not the implementation. - in the .C files you document the implementation. - - Short description (///), large description (/** ... */) - (someone explain this please) + - Single line description (///), multiple lines description (/** ... */) - You make the documentation by doing "make srcdoc" in the root, and then you'll find HTML in the srcdoc/ directory. Read with Netscape for best results. diff --git a/po/.cvsignore b/po/.cvsignore index 4b005af788..081a77b2b0 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -5,4 +5,3 @@ POTFILES *.mo cat-id-tbl.c stamp-cat-id -lyx.pot diff --git a/po/no.po b/po/no.po index 9f0475f5c9..4c3fa383e8 100644 --- a/po/no.po +++ b/po/no.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: lyx 1.1.3\n" -"POT-Creation-Date: 1999-11-30 23:57+0100\n" -"PO-Revision-Date: 1999-12-01 00:24+01:00\n" +"POT-Creation-Date: 1999-12-13 22:27+0100\n" +"PO-Revision-Date: 1999-12-13 22:33+01:00\n" "Last-Translator: Lars Gullik Bjønnes \n" "Language-Team: norsk \n" "MIME-Version: 1.0\n" @@ -14,17 +14,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. sgml2lyx failed -#: src/buffer.C:223 src/buffer.C:233 src/buffer.C:3575 src/bufferlist.C:513 -#: src/bufferlist.C:543 src/lyx_cb.C:517 src/lyx_cb.C:850 src/lyx_cb.C:882 +#: src/buffer.C:254 src/buffer.C:264 src/buffer.C:3685 src/bufferlist.C:520 +#: src/bufferlist.C:550 src/lyx_cb.C:537 src/lyx_cb.C:904 src/lyx_cb.C:940 #: src/lyx_sendfax_main.C:262 msgid "Error!" msgstr "Feil!" -#: src/buffer.C:224 +#: src/buffer.C:255 msgid "Specified file is unreadable: " msgstr "Den spesifiserte file er ulesbar: " -#: src/buffer.C:234 +#: src/buffer.C:265 msgid "Cannot open specified file: " msgstr "Kan ikke åpne valgt fil: " @@ -33,180 +33,181 @@ msgstr "Kan ikke #. or stop loading the file. #. I can substitute but I don't see how I can #. stop loading... ideas?? ARRae980418 -#: src/buffer.C:408 +#: src/buffer.C:456 msgid "Textclass Loading Error!" msgstr "Tekstklasse lese feil!" -#: src/buffer.C:409 +#: src/buffer.C:457 msgid "Can't load textclass " msgstr "Kan ikke lese tekstklasse " -#: src/buffer.C:411 +#: src/buffer.C:459 msgid "-- substituting default" msgstr "-- erstatter standard verdi" -#: src/buffer.C:1031 +#: src/buffer.C:1079 msgid "Warning: Ignoring Old Inset" msgstr "Advarsel: Ignorerer gammel inset" -#: src/buffer.C:1112 +#: src/buffer.C:1160 #, c-format msgid "Warning: need lyxformat %.2f but found %.2f\n" msgstr "Advarsel: trenger lyxformat %.2f men fant %.2f\n" -#: src/buffer.C:1116 +#: src/buffer.C:1164 #, c-format msgid "ERROR: need lyxformat %.2f but found %.2f\n" msgstr "FEIL: trenger lyxformat %.2f men fant %.2f\n" -#: src/buffer.C:1134 +#: src/buffer.C:1182 msgid "Warning!" msgstr "Advarsel!" -#: src/buffer.C:1135 +#: src/buffer.C:1183 msgid "Reading of document is not complete" msgstr "Lesing av dokumentet er ikke fullstendig" -#: src/buffer.C:1136 +#: src/buffer.C:1184 msgid "Maybe the document is truncated" msgstr "Kanskje er dokumentet forkortet" #. "\\lyxformat" not found -#: src/buffer.C:1142 src/buffer.C:1149 src/buffer.C:1152 +#: src/buffer.C:1190 src/buffer.C:1197 src/buffer.C:1200 msgid "ERROR!" msgstr "FEIL!" -#: src/buffer.C:1143 +#: src/buffer.C:1191 msgid "Old LyX file format found. Use LyX 0.10.x to read this!" msgstr "Gammelt LyX filformat funnet. Bruk LyX 0.10.x for å lese dette!" -#: src/buffer.C:1149 +#: src/buffer.C:1197 msgid "Not a LyX file!" msgstr "Ikke en LyX fil!" -#: src/buffer.C:1152 +#: src/buffer.C:1200 msgid "Unable to read file!" msgstr "Kan ikke lese filen!" -#: src/buffer.C:1168 src/buffer.C:1171 +#: src/buffer.C:1216 src/buffer.C:1219 msgid "Error! Document is read-only: " msgstr "Feil! Dokumentet er skrivebeskyttet." -#: src/buffer.C:1181 src/buffer.C:1184 src/buffer.C:1192 src/buffer.C:1195 +#: src/buffer.C:1229 src/buffer.C:1232 msgid "Error! Cannot write file: " msgstr "Feil! Kan ikke skrive til fil: " -#: src/buffer.C:1225 src/buffer.C:1228 -msgid "Error! Could not close file properly: " -msgstr "Feil! Filen ble ikke lukket skikkelig: " +#: src/buffer.C:1240 src/buffer.C:1243 +msgid "Error! Cannot open file: " +msgstr "Feil! Kan ikke åpne fil: " -#: src/buffer.C:1252 src/buffer.C:1571 +#: src/buffer.C:1291 msgid "Error: Cannot write file:" msgstr "Feil: Kan ikke skrive fil:" -#: src/buffer.C:1359 +#: src/buffer.C:1397 msgid "Error: Cannot open temporary file:" msgstr "Kan ikke åpne temporær fil:" -#: src/buffer.C:2074 src/buffer.C:2297 src/buffer.C:2992 -msgid "Error! Could not close file properly:" -msgstr "Feil: Filen ble ikke lukket skikkelig:" +#: src/buffer.C:1614 +msgid "Error: Cannot open file: " +msgstr "Feil: Kan ikke åpne fil: " -#: src/buffer.C:2144 src/buffer.C:2732 src/buffer.C:3496 src/buffer.C:3517 -#: src/paragraph.C:3575 +#: src/buffer.C:2187 src/buffer.C:2777 src/buffer.C:3604 src/buffer.C:3626 +#: src/paragraph.C:3577 msgid "LYX_ERROR:" msgstr "LYX_FEIL:" -#: src/buffer.C:2144 src/buffer.C:2732 +#: src/buffer.C:2187 src/buffer.C:2777 msgid "Cannot write file" msgstr "Kan ikke skrive fil" -#: src/buffer.C:2216 src/buffer.C:2814 +#: src/buffer.C:2259 src/buffer.C:2858 msgid "Error : Wrong depth for LatexType Command.\n" msgstr "Feil: Gal dybde for LaTeXType kommando.\n" #. path to LaTeX file -#: src/buffer.C:3174 +#: src/buffer.C:3238 msgid "Running LaTeX..." msgstr "Kjører LaTeX..." -#: src/buffer.C:3191 +#: src/buffer.C:3255 msgid "LaTeX did not work!" msgstr "LaTeX fungerte ikke!" -#: src/buffer.C:3192 src/buffer.C:3260 src/buffer.C:3328 +#: src/buffer.C:3256 src/buffer.C:3329 src/buffer.C:3402 msgid "Missing log file:" msgstr "Mangler logg fil:" #. no errors or any other things to think about so: -#: src/buffer.C:3194 src/buffer.C:3203 src/buffer.C:3262 src/buffer.C:3271 -#: src/buffer.C:3330 src/buffer.C:3338 src/combox.C:464 +#: src/buffer.C:3258 src/buffer.C:3267 src/buffer.C:3331 src/buffer.C:3340 +#: src/buffer.C:3404 src/buffer.C:3412 src/combox.C:465 msgid "Done" msgstr "Ferdig" #. path to Literate file -#: src/buffer.C:3239 +#: src/buffer.C:3308 msgid "Running Literate..." msgstr "Kjxrer Literate..." -#: src/buffer.C:3259 +#: src/buffer.C:3328 msgid "Literate command did not work!" msgstr "Literate kommando fungerte ikke!" #. path to Literate file -#: src/buffer.C:3307 +#: src/buffer.C:3381 msgid "Building Program..." msgstr "Lager programm..." -#: src/buffer.C:3327 +#: src/buffer.C:3401 msgid "Build did not work!" msgstr "Build did not work!" #. path to LaTeX file -#: src/buffer.C:3374 +#: src/buffer.C:3452 msgid "Running chktex..." msgstr "Kjører chktex..." -#: src/buffer.C:3390 +#: src/buffer.C:3468 msgid "chktex did not work!" msgstr "chktex fungerte ikke!" -#: src/buffer.C:3391 +#: src/buffer.C:3469 msgid "Could not run with file:" msgstr "Kunne ikke kjøre filen:" -#: src/buffer.C:3497 src/buffer.C:3518 src/paragraph.C:3576 +#: src/buffer.C:3605 src/buffer.C:3627 src/paragraph.C:3578 msgid "Cannot open temporary file:" msgstr "Kan ikke åpne temporær fil:" -#: src/buffer.C:3568 +#: src/buffer.C:3678 msgid "Error! Can't open temporary file:" msgstr "Feil! Kan ikke åpne temporær fil:" -#: src/buffer.C:3576 +#: src/buffer.C:3686 msgid "Error executing *roff command on table" msgstr "Feil under eksekvering av *roff kommando på tabell" -#: src/buffer.C:3772 src/lyx_cb.C:3154 src/text.C:1847 +#: src/buffer.C:3886 src/buffer.C:3938 src/lyx_cb.C:3627 src/lyx_cb.C:3705 +#: src/text.C:1847 msgid "Impossible Operation!" msgstr "Umulig operasjon!" -#: src/buffer.C:3773 +#: src/buffer.C:3887 src/buffer.C:3939 msgid "Cannot insert table/list in table." msgstr "Kan ikke sette inn tabell/liste i tabell." -#: src/buffer.C:3774 src/lyx_cb.C:3156 src/text.C:1849 src/text.C:3888 -#: src/text.C:3896 src/text.C:3911 src/text.C:3928 src/text2.C:2102 -#: src/text2.C:2112 +#: src/buffer.C:3888 src/buffer.C:3940 src/lyx_cb.C:3629 src/lyx_cb.C:3707 +#: src/text.C:1849 src/text.C:3888 src/text.C:3896 src/text.C:3911 +#: src/text.C:3928 src/text2.C:2102 src/text2.C:2112 msgid "Sorry." msgstr "Beklager." -#: src/bufferlist.C:98 src/bufferlist.C:256 src/lyxvc.C:87 src/lyxvc.C:117 +#: src/bufferlist.C:98 src/bufferlist.C:255 src/lyxvc.C:87 src/lyxvc.C:117 #: src/lyxvc.C:143 msgid "Changes in document:" msgstr "Dokumentet er endret:" -#: src/bufferlist.C:101 src/bufferlist.C:258 +#: src/bufferlist.C:101 src/bufferlist.C:257 msgid "Save document?" msgstr "Lagre dokument?" @@ -222,96 +223,97 @@ msgstr "Vil du avslutte likevel?" msgid "Saving document" msgstr "Lagrer dokument" -#: src/bufferlist.C:202 +#: src/bufferlist.C:201 msgid "Document saved as" msgstr "Dokument lagret som" -#: src/bufferlist.C:213 +#: src/bufferlist.C:212 msgid "Could not delete auto-save file!" msgstr "Kunne ikke slette autolagre fil!" -#: src/bufferlist.C:223 +#: src/bufferlist.C:222 msgid "Save failed!" msgstr "Lagring feilet!" -#: src/bufferlist.C:291 +#: src/bufferlist.C:290 msgid "No Documents Open!%t" msgstr "Ingen dokumeter åpne!%t" -#: src/bufferlist.C:361 +#: src/bufferlist.C:368 msgid "lyx: Attempting to save document " msgstr "LyX: Forsøker å lagre dokument " -#: src/bufferlist.C:364 +#: src/bufferlist.C:371 msgid " as..." msgstr " som..." -#: src/bufferlist.C:388 +#: src/bufferlist.C:395 msgid " Save seems successful. Phew." msgstr " Lagring trolig en suksess. Puh." -#: src/bufferlist.C:392 +#: src/bufferlist.C:399 msgid " Save failed! Trying..." msgstr " Lagring feilet! Prøver..." -#: src/bufferlist.C:395 +#: src/bufferlist.C:402 msgid " Save failed! Bummer. Document is lost." msgstr " Lagring feilet! Æsj. Mistet dokumentet." -#: src/bufferlist.C:422 +#: src/bufferlist.C:429 msgid "An emergency save of this document exists!" msgstr "En nødlagret versjon av dette dokumentet eksisterer!" -#: src/bufferlist.C:424 +#: src/bufferlist.C:431 msgid "Try to load that instead?" msgstr "Skal denne leses isteden?" -#: src/bufferlist.C:446 +#: src/bufferlist.C:453 msgid "Autosave file is newer." msgstr "Autolagret fil er nyere." -#: src/bufferlist.C:448 +#: src/bufferlist.C:455 msgid "Load that one instead?" msgstr "Les den isteden?" -#: src/bufferlist.C:513 +#: src/bufferlist.C:520 msgid "Unable to open template" msgstr "Kan ikke åpne mal" -#: src/bufferlist.C:544 +#: src/bufferlist.C:551 msgid "Could not convert file" msgstr "Kunne ikke konvertere filen" -#: src/bufferlist.C:557 src/lyxfunc.C:2559 src/lyxfunc.C:2698 -#: src/lyxfunc.C:2777 +#: src/bufferlist.C:564 src/lyxfunc.C:4675 src/lyxfunc.C:4814 +#: src/lyxfunc.C:4893 msgid "Document is already open:" msgstr "Dokumentet er allerede åpent:" -#: src/bufferlist.C:559 +#: src/bufferlist.C:566 msgid "Do you want to reload that document?" msgstr "Ønsker du å reåpne dokumentet?" -#: src/bufferlist.C:575 +#: src/bufferlist.C:582 msgid "File `" msgstr "Fil `" -#: src/bufferlist.C:576 +#: src/bufferlist.C:583 msgid "' is read-only." msgstr "' er skrivebeskyttet." -#: src/bufferlist.C:592 +#: src/bufferlist.C:599 msgid "Cannot open specified file:" msgstr "Kan ikke åpne valgt fil:" -#: src/bufferlist.C:594 +#: src/bufferlist.C:601 msgid "Create new document with this name?" msgstr "Skal det lages ett nytt dokument med dette navnet?" -#: src/BufferView.C:274 +#: src/BufferView.C:323 msgid "Formatting document..." msgstr "Formaterer dokument..." -#: src/BufferView.C:347 src/BufferView.C:351 +#: src/BufferView.C:437 src/BufferView.C:441 src/BufferView.C:458 +#: src/BufferView.C:462 msgid "No more errors" msgstr "Ingen flere feil" @@ -321,7 +323,7 @@ msgstr "St #: src/bullet_forms.C:51 src/credits_form.C:19 src/credits_form.C:59 #: src/form1.C:43 src/form1.C:117 src/form1.C:261 src/form1.C:284 -#: src/insets/insetbib.C:89 src/insets/insetbib.C:117 +#: src/insets/insetbib.C:95 src/insets/insetbib.C:123 #: src/insets/insetinclude.C:47 src/insets/insetindex.C:56 #: src/latexoptions.C:21 src/layout_forms.C:72 src/layout_forms.C:277 #: src/layout_forms.C:413 src/layout_forms.C:477 src/layout_forms.C:697 @@ -341,8 +343,8 @@ msgid "Apply|#A" msgstr "Bruk|#B" #: src/bullet_forms.C:57 src/form1.C:120 src/form1.C:264 src/form1.C:290 -#: src/insets/insetbib.C:92 src/insets/insetbib.C:93 src/insets/insetbib.C:120 -#: src/insets/insetbib.C:121 src/insets/insetinclude.C:50 +#: src/insets/insetbib.C:98 src/insets/insetbib.C:99 src/insets/insetbib.C:126 +#: src/insets/insetbib.C:127 src/insets/insetinclude.C:50 #: src/insets/insetinclude.C:51 src/insets/insetindex.C:60 #: src/insets/insetindex.C:61 src/latexoptions.C:27 src/layout_forms.C:64 #: src/layout_forms.C:285 src/layout_forms.C:391 src/layout_forms.C:419 @@ -753,62 +755,62 @@ msgstr "Eksakt ord|#k" msgid "Replace All|#A#a" msgstr "Erstatt Alle|#A#a" -#: src/insets/figinset.C:1097 +#: src/insets/figinset.C:1085 msgid "[render error]" msgstr "[rendre feil]" -#: src/insets/figinset.C:1098 +#: src/insets/figinset.C:1086 msgid "[rendering ... ]" msgstr "[rendrer ...]" -#: src/insets/figinset.C:1100 +#: src/insets/figinset.C:1088 msgid "[no file]" msgstr "[ingen fil]" -#: src/insets/figinset.C:1101 +#: src/insets/figinset.C:1089 msgid "[not displayed]" msgstr "[ikke vist]" -#: src/insets/figinset.C:1102 +#: src/insets/figinset.C:1090 msgid "[no ghostscript]" msgstr "[ingen ghostscript]" -#: src/insets/figinset.C:1104 +#: src/insets/figinset.C:1092 msgid "[unknown error]" msgstr "[ukjent feil]" -#: src/insets/figinset.C:1301 +#: src/insets/figinset.C:1289 msgid "Figure" msgstr "Figur" -#: src/insets/figinset.C:1363 src/insets/figinset.C:1501 +#: src/insets/figinset.C:1350 src/insets/figinset.C:1483 msgid "empty figure path" msgstr "tom figur filsti" -#: src/insets/figinset.C:2160 +#: src/insets/figinset.C:2137 msgid "Clipart" msgstr "Utklippsbilder" -#: src/insets/figinset.C:2161 src/lyxfunc.C:2591 src/lyxfunc.C:2654 -#: src/lyxfunc.C:2877 +#: src/insets/figinset.C:2138 src/lyxfunc.C:4707 src/lyxfunc.C:4770 +#: src/lyxfunc.C:4993 msgid "Document" msgstr "Dokumentet" -#: src/insets/figinset.C:2167 src/insets/figinset.C:2170 +#: src/insets/figinset.C:2144 src/insets/figinset.C:2147 msgid "EPS Figure" msgstr "EPS Figur" -#: src/insets/figinset.C:2184 +#: src/insets/figinset.C:2161 msgid "Filename can't contain any of these characters:" msgstr "Filnavn kan ikke inneholde noen av disse tegnene:" -#: src/insets/figinset.C:2185 +#: src/insets/figinset.C:2162 #, no-c-format msgid "space, '#', '~', '$' or '%'." msgstr "mellomrom, '#', '~', '$' or '%'." #. / what appears in the minibuffer when opening -#: src/insets/figinset.h:50 +#: src/insets/figinset.h:51 msgid "Opened figure" msgstr "Åpnet figur" @@ -836,61 +838,61 @@ msgstr "HTML type" msgid "HTML type|#H" msgstr "HTML type|#H" -#: src/LyXAction.C:132 src/insets/form_url.C:31 src/insets/inseterror.C:165 +#: src/LyXAction.C:114 src/insets/form_url.C:31 src/insets/inseterror.C:167 #: src/latexoptions.C:47 src/layout_forms.C:240 src/layout_forms.C:562 #: src/layout_forms.C:790 src/lyx.C:125 src/lyx_sendfax.C:109 src/lyxvc.C:251 #: src/mathed/math_forms.C:179 msgid "Close" msgstr "Lukk" -#: src/insets/insetbib.C:82 +#: src/insets/insetbib.C:88 msgid "Key:" msgstr "Tast:" -#: src/insets/insetbib.C:96 src/insets/insetbib.C:97 +#: src/insets/insetbib.C:102 src/insets/insetbib.C:103 msgid "Remark:|#R" msgstr "Bemerk:|#B" #. InsetBibtex uses the same form, with different labels -#: src/insets/insetbib.C:114 src/insets/insetbib.C:115 -#: src/insets/insetbib.C:266 src/insets/insetbib.C:267 +#: src/insets/insetbib.C:120 src/insets/insetbib.C:121 +#: src/insets/insetbib.C:274 src/insets/insetbib.C:275 msgid "Key:|#K" msgstr "Tast:|#T" -#: src/insets/insetbib.C:124 src/insets/insetbib.C:125 -#: src/insets/insetbib.C:268 src/insets/insetbib.C:269 +#: src/insets/insetbib.C:130 src/insets/insetbib.C:131 +#: src/insets/insetbib.C:276 src/insets/insetbib.C:277 msgid "Label:|#L" msgstr "Merke:|#M" -#: src/insets/insetbib.C:171 +#: src/insets/insetbib.C:179 msgid "Citation" msgstr "Sitering" -#: src/insets/insetbib.C:277 +#: src/insets/insetbib.C:285 msgid "Bibliography item" msgstr "Referanse del" -#: src/insets/insetbib.C:292 +#: src/insets/insetbib.C:300 msgid "BibTeX Generated References" msgstr "BibTeX genererte referanser" -#: src/insets/insetbib.C:407 +#: src/insets/insetbib.C:415 msgid "Database:" msgstr "Database:" -#: src/insets/insetbib.C:408 +#: src/insets/insetbib.C:416 msgid "Style: " msgstr "Stil: " -#: src/insets/insetbib.C:416 +#: src/insets/insetbib.C:424 msgid "BibTeX" msgstr "BibTeX" -#: src/insets/inseterror.C:66 src/insets/inseterror.C:85 src/lyx_cb.C:3684 +#: src/insets/inseterror.C:67 src/insets/inseterror.C:86 src/lyx_cb.C:4357 msgid "Error" msgstr "Feil" -#: src/insets/inseterror.C:178 +#: src/insets/inseterror.C:180 msgid "LaTeX Error" msgstr "LaTeX Feil" @@ -932,8 +934,8 @@ msgid "Use include|#U" msgstr "Bruk include|#c" #. launches dialog -#: src/insets/insetinclude.C:111 src/lyx_cb.C:366 src/lyxfunc.C:2539 -#: src/lyxfunc.C:2629 src/lyxfunc.C:2678 src/lyxfunc.C:2751 src/lyxfunc.C:2852 +#: src/insets/insetinclude.C:111 src/lyx_cb.C:386 src/lyxfunc.C:4655 +#: src/lyxfunc.C:4745 src/lyxfunc.C:4794 src/lyxfunc.C:4867 src/lyxfunc.C:4968 #: src/menus.C:177 src/menus.C:309 src/menus.C:310 src/menus.C:311 msgid "Documents" msgstr "Dokumenter" @@ -943,15 +945,15 @@ msgstr "Dokumenter" msgid "Select Child Document" msgstr "Velg subdokument" -#: src/insets/insetinclude.C:256 src/insets/insetinclude.C:291 +#: src/insets/insetinclude.C:258 src/insets/insetinclude.C:293 msgid "Include" msgstr "Inkluder" -#: src/insets/insetinclude.C:287 +#: src/insets/insetinclude.C:289 msgid "Input" msgstr "Input" -#: src/insets/insetinclude.C:289 +#: src/insets/insetinclude.C:291 msgid "Verbatim Input" msgstr "Sett inn Verbatim" @@ -971,12 +973,12 @@ msgstr "Ind" msgid "PrintIndex" msgstr "Skriv indeks" -#: src/insets/insetinfo.C:69 src/insets/insetinfo.C:88 -#: src/insets/insetinfo.C:208 +#: src/insets/insetinfo.C:70 src/insets/insetinfo.C:89 +#: src/insets/insetinfo.C:209 msgid "Note" msgstr "Notis" -#: src/insets/insetinfo.C:194 src/insets/insetinfo.C:199 src/lyx.C:155 +#: src/insets/insetinfo.C:195 src/insets/insetinfo.C:200 src/lyx.C:155 msgid "Close|#C^[" msgstr "Lukk|#L^[" @@ -1004,28 +1006,28 @@ msgstr "Liste over tabeller" msgid "Parent:" msgstr "Hoveddokument:" -#: src/insets/insetref.C:62 +#: src/insets/insetref.C:57 msgid "Page: " msgstr "Side: " -#: src/insets/insetref.C:64 +#: src/insets/insetref.C:59 msgid "Ref: " msgstr "Ref: " #. / -#: src/insets/insettoc.h:35 src/lyxfunc.C:863 +#: src/insets/insettoc.h:35 src/lyxfunc.C:889 src/lyxfunc.C:2972 msgid "Table of Contents" msgstr "Innholdsfortegnelse" -#: src/insets/inseturl.C:138 +#: src/insets/inseturl.C:139 msgid "Insert Url" msgstr "Sett inn Url" -#: src/insets/inseturl.C:152 +#: src/insets/inseturl.C:153 msgid "HtmlUrl: " msgstr "HtmlUrl: " -#: src/insets/inseturl.C:154 +#: src/insets/inseturl.C:155 msgid "Url: " msgstr "Url: " @@ -1035,19 +1037,19 @@ msgid "Opened Url" msgstr "Åpnet Url" #. / what appears in the minibuffer when opening -#: src/insets/lyxinset.h:94 +#: src/insets/lyxinset.h:95 msgid "Opened inset" msgstr "Åpnet inset" -#: src/intl.C:299 src/intl.C:300 +#: src/intl.C:292 src/intl.C:293 msgid "other..." msgstr "Annet..." -#: src/intl.C:367 +#: src/intl.C:360 msgid "Key Mappings" msgstr "Tastaturoppsett" -#: src/kbmap.C:303 +#: src/kbmap.C:298 msgid " options: " msgstr " opsjoner: " @@ -1063,19 +1065,19 @@ msgstr "Kj msgid "Running BibTeX." msgstr "Kjører BibTeX." -#: src/LaTeXLog.C:43 +#: src/LaTeXLog.C:44 msgid "Unable to show log file!" msgstr "Kan ikke vise log filen!" -#: src/LaTeXLog.C:46 +#: src/LaTeXLog.C:47 msgid "NO LATEX LOG FILE!" msgstr "INGEN LATEX LOGG FIL!" -#: src/LaTeXLog.C:53 +#: src/LaTeXLog.C:54 msgid "Build Program Log" msgstr "Lag Programm Logg" -#: src/LaTeXLog.C:53 +#: src/LaTeXLog.C:54 msgid "LaTeX Log" msgstr "LaTeX Logg" @@ -1087,27 +1089,27 @@ msgstr "Tillat aksenter p msgid "Update|#Uu" msgstr "Oppdater" -#: src/layout.C:1088 +#: src/layout.C:1359 msgid "LyX wasn't able to find its layout descriptions!" msgstr "LyX klarte ikke å finne sine stilbeskrivelser!" -#: src/layout.C:1089 +#: src/layout.C:1360 msgid "Check that the file \"textclass.lst\"" msgstr "Undersøk om filen \"textclass.lst\"" -#: src/layout.C:1090 +#: src/layout.C:1361 msgid "is installed correctly. Sorry, has to exit :-(" msgstr "er installert korrekt. Beklager, må avslutte :-(" -#: src/layout.C:1143 +#: src/layout.C:1414 msgid "LyX wasn't able to find any layout description!" msgstr "LyX klarte ikke å finne sine stilbeskrivelser!" -#: src/layout.C:1144 +#: src/layout.C:1415 msgid "Check the contents of the file \"textclass.lst\"" msgstr "Undersøk hva filen \"textclass.lst\" inneholder" -#: src/layout.C:1145 +#: src/layout.C:1416 msgid "Sorry, has to exit :-(" msgstr "Beklager, må avslutte :-(" @@ -1580,415 +1582,415 @@ msgstr "Vever dokument" msgid "Building program" msgstr "Lag programm" -#: src/LyXAction.C:97 +#: src/LyXAction.C:92 msgid "Insert appendix" msgstr "Sett inn appendiks" -#: src/LyXAction.C:99 +#: src/LyXAction.C:93 msgid "Describe command" msgstr "Beskriv kommando" -#: src/LyXAction.C:101 +#: src/LyXAction.C:95 msgid "Select previous char" msgstr "Merk forrige bokstav" -#: src/LyXAction.C:107 +#: src/LyXAction.C:98 msgid "Insert bibtex" msgstr "Sett inn BibTeX" -#: src/LyXAction.C:118 +#: src/LyXAction.C:105 msgid "Build program" msgstr "Lag programm" -#: src/LyXAction.C:120 +#: src/LyXAction.C:106 msgid "Autosave" msgstr "Auto lagrer" -#: src/LyXAction.C:122 +#: src/LyXAction.C:108 msgid "Go to beginning of document" msgstr "Gå til begynnelsen av dokumentet" -#: src/LyXAction.C:124 +#: src/LyXAction.C:110 msgid "Select to beginning of document" msgstr "Merk til begynnelsen av dokumentet" -#: src/LyXAction.C:130 +#: src/LyXAction.C:113 msgid "Check TeX" msgstr "Sjekk TeX" -#: src/LyXAction.C:134 +#: src/LyXAction.C:116 msgid "Go to end of document" msgstr "Gå til slutten av dokumentet" -#: src/LyXAction.C:136 +#: src/LyXAction.C:118 msgid "Select to end of document" msgstr "Merk til slutten av dokumentet" -#: src/LyXAction.C:138 +#: src/LyXAction.C:119 msgid "Export to" msgstr "Eksporter til" -#: src/LyXAction.C:140 +#: src/LyXAction.C:120 msgid "Fax" msgstr "Faks" -#: src/LyXAction.C:145 +#: src/LyXAction.C:123 msgid "Import document" msgstr "Importer dokument" -#: src/LyXAction.C:149 +#: src/LyXAction.C:126 msgid "New document" msgstr "Nytt dokument" -#: src/LyXAction.C:151 +#: src/LyXAction.C:128 msgid "New document from template" msgstr "Nytt dokument med mal" -#: src/LyXAction.C:153 +#: src/LyXAction.C:129 msgid "Open" msgstr "Åpne" -#: src/LyXAction.C:155 +#: src/LyXAction.C:131 msgid "Switch to previous document" msgstr "Bytt til forrige dokument" -#: src/LyXAction.C:159 src/lyx_cb.C:950 src/print_form.C:72 +#: src/LyXAction.C:132 src/lyx_cb.C:1015 src/print_form.C:72 msgid "Print" msgstr "Skriv ut" -#: src/LyXAction.C:161 +#: src/LyXAction.C:134 msgid "Revert to saved" msgstr "Tilbake til sist lagret" -#: src/LyXAction.C:163 +#: src/LyXAction.C:136 msgid "Toggle read-only" msgstr "Skrivebeskyttet av/på" -#: src/LyXAction.C:165 +#: src/LyXAction.C:137 msgid "Update DVI" msgstr "Oppdater DVI" -#: src/LyXAction.C:167 +#: src/LyXAction.C:139 msgid "Update PostScript" msgstr "Oppdater PostScript" -#: src/LyXAction.C:169 +#: src/LyXAction.C:140 msgid "View DVI" msgstr "Se på DVI" -#: src/LyXAction.C:171 +#: src/LyXAction.C:142 msgid "View PostScript" msgstr "Se på PostScript" -#: src/LyXAction.C:173 src/lyx_sendfax_main.C:278 +#: src/LyXAction.C:143 src/lyx_sendfax_main.C:278 msgid "Save" msgstr "Lagre" -#: src/LyXAction.C:175 +#: src/LyXAction.C:144 msgid "Save As" msgstr "Lagre som" -#: src/LyXAction.C:177 src/lyxfunc.C:639 +#: src/LyXAction.C:145 src/lyxfunc.C:665 src/lyxfunc.C:2748 msgid "Cancel" msgstr "Avbryt" -#: src/LyXAction.C:179 +#: src/LyXAction.C:146 msgid "Go one char back" msgstr "Gå en bokstav tilbake" -#: src/LyXAction.C:181 +#: src/LyXAction.C:147 msgid "Go one char forward" msgstr "Gå en bokstav fremover" -#: src/LyXAction.C:183 +#: src/LyXAction.C:149 msgid "Insert citation" msgstr "Sett inn sitat" -#: src/LyXAction.C:187 +#: src/LyXAction.C:152 msgid "Execute command" msgstr "Utfør kommando" -#: src/LyXAction.C:190 src/lyx_cb.C:2384 +#: src/LyXAction.C:154 src/lyx_cb.C:2742 src/lyx_cb.C:2749 msgid "Copy" msgstr "Kopier" -#: src/LyXAction.C:192 src/lyx_cb.C:2396 +#: src/LyXAction.C:155 src/lyx_cb.C:2769 msgid "Cut" msgstr "Klipp" -#: src/LyXAction.C:202 +#: src/LyXAction.C:161 msgid "Decrement environment depth" msgstr "Minsk omgivelsedybde" -#: src/LyXAction.C:204 +#: src/LyXAction.C:163 msgid "Increment environment depth" msgstr "Øk omgivelsedybde" -#: src/LyXAction.C:206 +#: src/LyXAction.C:165 msgid "Change environment depth" msgstr "Forandre omgivelsedybde" -#: src/LyXAction.C:208 +#: src/LyXAction.C:166 msgid "Insert ... dots" msgstr "Sett inn ellipsis" -#: src/LyXAction.C:210 +#: src/LyXAction.C:167 msgid "Go down" msgstr "Gå ned" -#: src/LyXAction.C:212 +#: src/LyXAction.C:169 msgid "Select next line" msgstr "Merk neste linje" -#: src/LyXAction.C:214 +#: src/LyXAction.C:171 msgid "Choose Paragraph Environment" msgstr "Velg avsnitt omgivelse" -#: src/LyXAction.C:216 +#: src/LyXAction.C:173 msgid "Insert end of sentence period" msgstr "Sett inn setningsslutt punktum" -#: src/LyXAction.C:218 +#: src/LyXAction.C:174 msgid "Go to next error" msgstr "Gå til neste feil" -#: src/LyXAction.C:220 +#: src/LyXAction.C:176 msgid "Remove all error boxes" msgstr "Fjern alle feilbokser" -#: src/LyXAction.C:222 src/lyx_cb.C:2336 +#: src/LyXAction.C:177 src/lyx_cb.C:2675 msgid "Insert Figure" msgstr "Sett inn figur" -#: src/LyXAction.C:232 src/lyxfr0.C:97 +#: src/LyXAction.C:182 src/lyxfr0.C:97 msgid "Find & Replace" msgstr "Finn & Erstatt" -#: src/LyXAction.C:234 +#: src/LyXAction.C:183 msgid "Toggle bold" msgstr "Fet av/på" -#: src/LyXAction.C:236 +#: src/LyXAction.C:184 msgid "Toggle code style" msgstr "Kode stil av/på" -#: src/LyXAction.C:238 +#: src/LyXAction.C:185 msgid "Default font style" msgstr "Standard font stil" -#: src/LyXAction.C:240 +#: src/LyXAction.C:186 msgid "Toggle emphasize" msgstr "Uthevet av/på" -#: src/LyXAction.C:242 +#: src/LyXAction.C:187 msgid "Toggle user defined style" msgstr "Bruker definert stil av/på" -#: src/LyXAction.C:244 +#: src/LyXAction.C:188 msgid "Toggle noun style" msgstr "Substantiv stil av/på" -#: src/LyXAction.C:246 +#: src/LyXAction.C:189 msgid "Toggle roman font style" msgstr "Roman font stil av/på" -#: src/LyXAction.C:248 +#: src/LyXAction.C:190 msgid "Toggle sans font style" msgstr "Sans serif font stil av/på" -#: src/LyXAction.C:250 +#: src/LyXAction.C:191 msgid "Set font size" msgstr "Sett font størrelse" -#: src/LyXAction.C:252 +#: src/LyXAction.C:192 msgid "Show font state" msgstr "Vis font status" -#: src/LyXAction.C:254 +#: src/LyXAction.C:194 msgid "Toggle font underline" msgstr "Understreking av/på" -#: src/LyXAction.C:256 +#: src/LyXAction.C:195 msgid "Insert Footnote" msgstr "Sett inn fotnote" -#: src/LyXAction.C:258 +#: src/LyXAction.C:196 msgid "Select next char" msgstr "Merk neste bokstav" -#: src/LyXAction.C:260 +#: src/LyXAction.C:198 msgid "Insert horizontal fill" msgstr "Sett inn horisontalt fyll" -#: src/LyXAction.C:264 +#: src/LyXAction.C:201 msgid "Insert hyphenation point" msgstr "Sett inn orddelingspunkt" -#: src/LyXAction.C:266 +#: src/LyXAction.C:203 msgid "Insert index item" msgstr "Sett inn indeks" -#: src/LyXAction.C:268 +#: src/LyXAction.C:205 msgid "Insert last index item" msgstr "Sett inn siste som indeks" -#: src/LyXAction.C:270 +#: src/LyXAction.C:206 msgid "Insert index list" msgstr "Sett inn indeksliste" -#: src/LyXAction.C:272 +#: src/LyXAction.C:207 msgid "Turn off keymap" msgstr "Slå av keymap" -#: src/LyXAction.C:274 +#: src/LyXAction.C:209 msgid "Use primary keymap" msgstr "Bruk primær keymap" -#: src/LyXAction.C:276 +#: src/LyXAction.C:211 msgid "Use secondary keymap" msgstr "Bruk sekundær keymap" -#: src/LyXAction.C:278 +#: src/LyXAction.C:212 msgid "Toggle keymap" msgstr "Keymap av/på" -#: src/LyXAction.C:280 +#: src/LyXAction.C:213 msgid "Insert Label" msgstr "Sett inn referanse merke" -#: src/LyXAction.C:282 +#: src/LyXAction.C:214 msgid "View LaTeX log" msgstr "Vis LaTeX Logg" -#: src/LyXAction.C:288 +#: src/LyXAction.C:218 msgid "Copy paragraph environment type" msgstr "Kopier avsnittsomgivelse" -#: src/LyXAction.C:297 +#: src/LyXAction.C:224 msgid "Paste paragraph environment type" msgstr "Lim inn avsnittsomgivelse" -#: src/LyXAction.C:306 +#: src/LyXAction.C:230 msgid "Go to beginning of line" msgstr "Gå til begynnelsen av linjen" -#: src/LyXAction.C:308 +#: src/LyXAction.C:232 msgid "Select to beginning of line" msgstr "Merk til begynnelsen av linjen" -#: src/LyXAction.C:312 +#: src/LyXAction.C:234 msgid "Go to end of line" msgstr "Gå til slutten av linjen" -#: src/LyXAction.C:314 +#: src/LyXAction.C:236 msgid "Select to end of line" msgstr "Merk til slutten av linjen" -#: src/LyXAction.C:316 +#: src/LyXAction.C:238 msgid "Insert list of algorithms" msgstr "Sett in liste over algoritmer" -#: src/LyXAction.C:318 +#: src/LyXAction.C:240 msgid "Insert list of figures" msgstr "Sett inn figurliste" -#: src/LyXAction.C:320 +#: src/LyXAction.C:242 msgid "Insert list of tables" msgstr "Sett inn liste over tabeller" -#: src/LyXAction.C:322 +#: src/LyXAction.C:243 msgid "Exit" msgstr "Avslutt" -#: src/LyXAction.C:324 +#: src/LyXAction.C:245 msgid "Insert Margin note" msgstr "Sett inn margnotat" -#: src/LyXAction.C:336 +#: src/LyXAction.C:251 msgid "Math Greek" msgstr "Greske bokstaver" -#: src/LyXAction.C:340 +#: src/LyXAction.C:254 msgid "Insert math symbol" msgstr "Sett inn mattesymbol" -#: src/LyXAction.C:350 +#: src/LyXAction.C:259 msgid "Math mode" msgstr "Matte modus" -#: src/LyXAction.C:360 src/lyx_cb.C:2427 +#: src/LyXAction.C:263 src/lyx_cb.C:2817 msgid "Melt" msgstr "Smelt" -#: src/LyXAction.C:373 +#: src/LyXAction.C:271 msgid "Go one paragraph down" msgstr "Gå ett avsnitt ned" -#: src/LyXAction.C:375 +#: src/LyXAction.C:273 msgid "Select next paragraph" msgstr "Merk neste avsnitt" -#: src/LyXAction.C:377 +#: src/LyXAction.C:275 msgid "Go one paragraph up" msgstr "Gå ett avsnitt opp" -#: src/LyXAction.C:379 +#: src/LyXAction.C:277 msgid "Select previous paragraph" msgstr "Merk forrige avsnitt" -#: src/LyXAction.C:383 src/lyx_cb.C:2405 +#: src/LyXAction.C:279 src/lyx_cb.C:2779 msgid "Paste" msgstr "Lim inn" -#: src/LyXAction.C:387 +#: src/LyXAction.C:284 msgid "Insert protected space" msgstr "Sett inn hardt mellomrom" -#: src/LyXAction.C:389 +#: src/LyXAction.C:285 msgid "Insert quote" msgstr "Sett inn sitattegn" -#: src/LyXAction.C:391 +#: src/LyXAction.C:287 msgid "Reconfigure" msgstr "Rekonfigurer" -#: src/LyXAction.C:393 src/lyx_cb.C:2094 +#: src/LyXAction.C:288 src/lyx_cb.C:2349 msgid "Redo" msgstr "Gjør om" -#: src/LyXAction.C:399 +#: src/LyXAction.C:292 msgid "Insert cross reference" msgstr "Sett inn kryssreferanse" -#: src/LyXAction.C:442 src/lyx_cb.C:2348 +#: src/LyXAction.C:314 src/lyx_cb.C:2687 msgid "Insert Table" msgstr "Sett inn tabell" -#: src/LyXAction.C:444 +#: src/LyXAction.C:315 msgid "Toggle TeX style" msgstr "TeX stil av/på" -#: src/LyXAction.C:446 +#: src/LyXAction.C:317 msgid "Insert table of contents" msgstr "Sett inn innholdsfortegnelse" -#: src/LyXAction.C:448 +#: src/LyXAction.C:319 msgid "View table of contents" msgstr "Vis innholdsfortegnelse" -#: src/LyXAction.C:450 +#: src/LyXAction.C:321 msgid "Toggle cursor does/doesn't follow the scrollbar" msgstr "Markør følger/følger ikke scrollbar" -#: src/LyXAction.C:457 src/lyx_cb.C:2074 +#: src/LyXAction.C:325 src/lyx_cb.C:2320 msgid "Undo" msgstr "Angre" -#: src/LyXAction.C:471 +#: src/LyXAction.C:333 msgid "Register document under version control" msgstr "Registrer dokumentet i versionskontroll" -#: src/LyXAction.C:692 +#: src/LyXAction.C:555 msgid "No description available!" msgstr "Ingen beskrivelse tilgjengelig!" @@ -2044,447 +2046,447 @@ msgstr "Sett inn side tall" msgid "Go to Reference|#G" msgstr "Gå til kryssreferansse|#G" -#: src/lyx_cb.C:345 +#: src/lyx_cb.C:361 msgid "Save failed. Rename and try again?" msgstr "Lagring feilet. Gi nytt navn og prøv igjen?" -#: src/lyx_cb.C:347 +#: src/lyx_cb.C:363 msgid "(If not, document is not saved.)" msgstr "(Hvis ikke blir ikke dokumentet lagret)" -#: src/lyx_cb.C:367 src/lyxfunc.C:2540 +#: src/lyx_cb.C:387 src/lyxfunc.C:4656 msgid "Templates" msgstr "Maler" -#: src/lyx_cb.C:372 +#: src/lyx_cb.C:392 msgid "Enter Filename to Save Document as" msgstr "Skriv inn filnavnet som dokumentet skal lagres som" #. Cancel: Do nothing -#: src/lyx_cb.C:379 src/lyxfunc.C:2546 src/lyxfunc.C:2573 src/lyxfunc.C:2638 -#: src/lyxfunc.C:2687 src/lyxfunc.C:2712 src/lyxfunc.C:2722 src/lyxfunc.C:2767 -#: src/lyxfunc.C:2792 src/lyxfunc.C:2802 src/lyxfunc.C:2861 +#: src/lyx_cb.C:399 src/lyxfunc.C:4662 src/lyxfunc.C:4689 src/lyxfunc.C:4754 +#: src/lyxfunc.C:4803 src/lyxfunc.C:4828 src/lyxfunc.C:4838 src/lyxfunc.C:4883 +#: src/lyxfunc.C:4908 src/lyxfunc.C:4918 src/lyxfunc.C:4977 msgid "Canceled." msgstr "Avbrutt." -#: src/lyx_cb.C:390 +#: src/lyx_cb.C:410 msgid "Same name as document already has:" msgstr "Samme navn som dokumentet allerede har:" -#: src/lyx_cb.C:392 +#: src/lyx_cb.C:412 msgid "Save anyway?" msgstr "Lagre likevel?" -#: src/lyx_cb.C:398 +#: src/lyx_cb.C:418 msgid "Another document with same name open!" msgstr "Ett annet dokument med samme navn er åpent!" -#: src/lyx_cb.C:400 +#: src/lyx_cb.C:420 msgid "Replace with current document?" msgstr "Erstatt med gjelende dokument?" -#: src/lyx_cb.C:408 +#: src/lyx_cb.C:428 msgid "Document renamed to '" msgstr "Dokument gitt nytt navn: '" -#: src/lyx_cb.C:410 +#: src/lyx_cb.C:430 msgid "', but not saved..." msgstr "', men ikke lagret..." -#: src/lyx_cb.C:416 +#: src/lyx_cb.C:436 msgid "Document already exists:" msgstr "Dokumentet finnes allerede." -#: src/lyx_cb.C:418 +#: src/lyx_cb.C:438 msgid "Replace file?" msgstr "Erstatt fil?" -#: src/lyx_cb.C:449 src/lyx_cb.C:479 +#: src/lyx_cb.C:469 src/lyx_cb.C:499 msgid "One error detected" msgstr "En feil oppdaget" -#: src/lyx_cb.C:450 src/lyx_cb.C:480 +#: src/lyx_cb.C:470 src/lyx_cb.C:500 msgid "You should try to fix it." msgstr "Du burde forsøke å fikse den." -#: src/lyx_cb.C:453 src/lyx_cb.C:483 +#: src/lyx_cb.C:473 src/lyx_cb.C:503 msgid " errors detected." msgstr " feil oppdaget." -#: src/lyx_cb.C:454 src/lyx_cb.C:484 +#: src/lyx_cb.C:474 src/lyx_cb.C:504 msgid "You should try to fix them." msgstr "Du burde forsøke å fikse dem." -#: src/lyx_cb.C:456 +#: src/lyx_cb.C:476 msgid "There were errors during the LaTeX run." msgstr "Det ble rapportert feil under kjøring av LaTeX." -#: src/lyx_cb.C:469 +#: src/lyx_cb.C:489 msgid "Wrong type of document" msgstr "Feil type dokument" -#: src/lyx_cb.C:470 +#: src/lyx_cb.C:490 msgid "The Build operation is not allowed in this document" msgstr "Det er ikke mulig e lage programm fra dette dokumentet" -#: src/lyx_cb.C:471 src/lyx_cb.C:486 +#: src/lyx_cb.C:491 src/lyx_cb.C:506 msgid "There were errors during the Build process." msgstr "Det ble rapportert feil under kjøring av 'Build' prosessen." -#: src/lyx_cb.C:497 +#: src/lyx_cb.C:517 msgid "Chktex does not work with SGML derived documents." msgstr "Chktex fungerer ikke for SGML dokumenter." -#: src/lyx_cb.C:506 +#: src/lyx_cb.C:526 msgid "No warnings found." msgstr "Ingen advarsler funnet." -#: src/lyx_cb.C:508 +#: src/lyx_cb.C:528 msgid "One warning found." msgstr "En advarsel funnet." -#: src/lyx_cb.C:509 +#: src/lyx_cb.C:529 msgid "Use 'Edit->Go to Error' to find it." msgstr "Bruk 'Rediger->Gå til feil' for å finne dem." -#: src/lyx_cb.C:512 +#: src/lyx_cb.C:532 msgid " warnings found." msgstr " advarsler funnet." -#: src/lyx_cb.C:513 +#: src/lyx_cb.C:533 msgid "Use 'Edit->Go to Error' to find them." msgstr "Bruk 'Rediger->Gå til feil' for a finne dem." -#: src/lyx_cb.C:515 +#: src/lyx_cb.C:535 msgid "Chktex run successfully" msgstr "Chktex kjørt med sukssess" -#: src/lyx_cb.C:517 +#: src/lyx_cb.C:537 msgid "It seems chktex does not work." msgstr "Det virker som om chktex ikke fungerte." -#: src/lyx_cb.C:602 src/lyx_cb.C:605 +#: src/lyx_cb.C:628 src/lyx_cb.C:631 msgid "Executing command:" msgstr "Eksekverer kommando:" -#: src/lyx_cb.C:824 src/lyx_cb.C:860 src/lyx_cb.C:893 src/lyx_cb.C:920 -#: src/lyxfunc.C:2582 +#: src/lyx_cb.C:874 src/lyx_cb.C:914 src/lyx_cb.C:951 src/lyx_cb.C:982 +#: src/lyxfunc.C:4698 msgid "File already exists:" msgstr "Filen finnes allerede:" -#: src/lyx_cb.C:826 src/lyx_cb.C:862 src/lyx_cb.C:895 src/lyx_cb.C:922 +#: src/lyx_cb.C:876 src/lyx_cb.C:916 src/lyx_cb.C:953 src/lyx_cb.C:984 msgid "Do you want to overwrite the file?" msgstr "Ønsker du Å skrive over filen?" -#: src/lyx_cb.C:827 src/lyx_cb.C:863 src/lyx_cb.C:896 src/lyx_cb.C:923 +#: src/lyx_cb.C:877 src/lyx_cb.C:917 src/lyx_cb.C:954 src/lyx_cb.C:985 msgid "Canceled" msgstr "Avbrutt." -#: src/lyx_cb.C:832 +#: src/lyx_cb.C:882 msgid "DocBook does not have a latex backend" msgstr "DocBook har ikke en latex motor" -#: src/lyx_cb.C:838 +#: src/lyx_cb.C:888 msgid "Nice LaTeX file saved as" msgstr "Pen LaTeX fil lagret som" -#: src/lyx_cb.C:850 +#: src/lyx_cb.C:904 msgid "Document class must be linuxdoc." msgstr "Tekstklassen må være linuxdoc." -#: src/lyx_cb.C:867 +#: src/lyx_cb.C:921 msgid "Building LinuxDoc SGML file `" msgstr "Lager LinuxDoc SGML fil `" -#: src/lyx_cb.C:872 +#: src/lyx_cb.C:926 msgid "LinuxDoc SGML file save as" msgstr "LinuxDoc SGML fil lagre som" -#: src/lyx_cb.C:883 +#: src/lyx_cb.C:941 msgid "Document class must be docbook." msgstr "Tekstklassen må være docbook." -#: src/lyx_cb.C:900 +#: src/lyx_cb.C:958 msgid "Building DocBook SGML file `" msgstr "Lager DocBook SGML fil `" -#: src/lyx_cb.C:905 +#: src/lyx_cb.C:963 msgid "DocBook SGML file save as" msgstr "DocBook SGML fil lagre som" -#: src/lyx_cb.C:929 +#: src/lyx_cb.C:991 msgid "Ascii file saved as" msgstr "Ascii fil lagret som" -#: src/lyx_cb.C:995 +#: src/lyx_cb.C:1060 msgid "Autosaving current document..." msgstr "Autolagrer gjelende dokument..." -#: src/lyx_cb.C:1035 +#: src/lyx_cb.C:1100 msgid "Autosave Failed!" msgstr "Autolagring feilet!" -#: src/lyx_cb.C:1091 +#: src/lyx_cb.C:1156 msgid "File to Insert" msgstr "Fil som skal settes inn" -#: src/lyx_cb.C:1101 +#: src/lyx_cb.C:1166 msgid "Error! Specified file is unreadable: " msgstr "Feil! Den spesifiserte filen kan ikke åpnes: " -#: src/lyx_cb.C:1108 +#: src/lyx_cb.C:1173 msgid "Error! Cannot open specified file: " msgstr "Feil! Kan ikke åpne spesifisert fil: " -#: src/lyx_cb.C:1144 +#: src/lyx_cb.C:1220 msgid "Table Of Contents" msgstr "Innholdsfortegnelse" -#: src/lyx_cb.C:1160 src/mathed/formula.C:1049 +#: src/lyx_cb.C:1236 src/mathed/formula.C:1050 msgid "Enter new label to insert:" msgstr "Skriv inn referansemerke som skal settes inn:" -#: src/lyx_cb.C:1180 +#: src/lyx_cb.C:1256 msgid "Insert Reference" msgstr "Sett inn referanse" -#: src/lyx_cb.C:1214 +#: src/lyx_cb.C:1291 msgid "Inserting Footnote..." msgstr "Setter inn fotnote..." #. Import file -#: src/lyx_cb.C:1277 +#: src/lyx_cb.C:1361 msgid "Importing LinuxDoc SGML file `" msgstr "Importerer LinuxDoc SGML fil `" #. TeX output asked -#: src/lyx_cb.C:1285 +#: src/lyx_cb.C:1369 msgid "Converting LinuxDoc SGML to TeX file..." msgstr "Konverterer LinuxDox SGML fil til TeX fil..." #. dvi output asked -#: src/lyx_cb.C:1292 +#: src/lyx_cb.C:1376 msgid "Converting LinuxDoc SGML to dvi file..." msgstr "Konverterer LinuxDoc SGML fil til dvi fil..." -#: src/lyx_cb.C:1345 +#: src/lyx_cb.C:1429 msgid "Converting DocBook SGML to dvi file..." msgstr "Konverterer DocBook SGML til DVI..." -#: src/lyx_cb.C:1461 +#: src/lyx_cb.C:1567 msgid "Character Style" msgstr "Tegn stil" -#: src/lyx_cb.C:1667 +#: src/lyx_cb.C:1897 msgid "Paragraph Environment" msgstr "Avsnittsomgivelse" -#: src/lyx_cb.C:1922 +#: src/lyx_cb.C:2152 msgid "Document Layout" msgstr "Dokumentstil" -#: src/lyx_cb.C:1961 +#: src/lyx_cb.C:2191 msgid "Quotes" msgstr "Sitattegn" -#: src/lyx_cb.C:2008 +#: src/lyx_cb.C:2238 msgid "LaTeX Preamble" msgstr "LaTeX Preamble" -#: src/lyx_cb.C:2025 +#: src/lyx_cb.C:2255 msgid "Do you want to save the current settings" msgstr "Ønsker du å lagre de nåværende innstillingene?" -#: src/lyx_cb.C:2026 +#: src/lyx_cb.C:2256 msgid "for Character, Document, Paper and Quotes" msgstr "for Fonter, Document, Ark og Sitering" -#: src/lyx_cb.C:2027 +#: src/lyx_cb.C:2257 msgid "as default for new documents?" msgstr "som standardverdier for nye dokumenter?" -#: src/lyx_cb.C:2043 src/lyx_cb.C:2056 +#: src/lyx_cb.C:2275 src/lyx_cb.C:2295 msgid "Open/Close..." msgstr "Åpne/Lukk..." -#: src/lyx_cb.C:2079 +#: src/lyx_cb.C:2326 src/lyx_cb.C:2332 msgid "No further undo information" msgstr "Ikke mer \"Angre\" informasjon" -#: src/lyx_cb.C:2089 +#: src/lyx_cb.C:2344 msgid "Redo not yet supported in math mode" msgstr "\"Gjør om\" er ennå ikke støttet i matte modus" -#: src/lyx_cb.C:2099 +#: src/lyx_cb.C:2355 src/lyx_cb.C:2361 msgid "No further redo information" msgstr "Ikke mer \"Gjør om\" informasjon" -#: src/lyx_cb.C:2288 +#: src/lyx_cb.C:2593 src/lyx_cb.C:2613 msgid "Font: " msgstr "Font: " -#: src/lyx_cb.C:2292 +#: src/lyx_cb.C:2597 src/lyx_cb.C:2617 msgid ", Depth: " msgstr ", Dybde: " -#: src/lyx_cb.C:2320 +#: src/lyx_cb.C:2653 msgid "Inserting margin note..." msgstr "Setter inn note i margen..." -#: src/lyx_cb.C:2361 +#: src/lyx_cb.C:2702 src/lyx_cb.C:2709 msgid "Paragraph environment type copied" msgstr "Avsnittsomgivelse kopiert" -#: src/lyx_cb.C:2370 +#: src/lyx_cb.C:2721 src/lyx_cb.C:2725 msgid "Paragraph environment type set" msgstr "Avsnittsomgivelse satt" -#: src/lyx_cb.C:2461 +#: src/lyx_cb.C:2867 msgid "Changed environment depth (in possible range, maybe not)" msgstr "Endret omgivelsesdybde (kanskje mulig, kanskje ikke)" -#: src/lyx_cb.C:2698 +#: src/lyx_cb.C:3117 msgid "Paragraph layout set" msgstr "Avsnittstil satt" -#: src/lyx_cb.C:2768 +#: src/lyx_cb.C:3187 msgid "Should I set some parameters to" msgstr "Skal jeg sette noen paramtere til" -#: src/lyx_cb.C:2770 +#: src/lyx_cb.C:3189 msgid "the defaults of this document class?" msgstr "sette standardverdiene for denne tekstklassen?" #. unable to load new style -#: src/lyx_cb.C:2779 src/lyx_cb.C:2898 src/lyx_cb.C:2905 +#: src/lyx_cb.C:3198 src/lyx_cb.C:3326 src/lyx_cb.C:3333 msgid "Conversion Errors!" msgstr "Konverteringsfeil!" -#: src/lyx_cb.C:2780 src/lyx_cb.C:2906 +#: src/lyx_cb.C:3199 src/lyx_cb.C:3334 msgid "Unable to switch to new document class." msgstr "Kan ikke bytte til ny dokument klasse." -#: src/lyx_cb.C:2781 src/lyx_cb.C:2907 +#: src/lyx_cb.C:3200 src/lyx_cb.C:3335 msgid "Reverting to original document class." msgstr "Går tilbake til opprinnelig dokument klasse." -#: src/lyx_cb.C:2881 +#: src/lyx_cb.C:3300 msgid "Converting document to new document class..." msgstr "Konverterer dokument til ny tekstklasse..." -#: src/lyx_cb.C:2893 +#: src/lyx_cb.C:3321 msgid "One paragraph couldn't be converted" msgstr "Ett avsnitt var umulig å konvertere" -#: src/lyx_cb.C:2896 +#: src/lyx_cb.C:3324 msgid " paragraphs couldn't be converted" msgstr " avsnitt var umulig å konvertere" -#: src/lyx_cb.C:2899 +#: src/lyx_cb.C:3327 msgid "into chosen document class" msgstr "til valgete tekstklasse" -#: src/lyx_cb.C:2985 +#: src/lyx_cb.C:3413 msgid "Document layout set" msgstr "Dokument stil satt" -#: src/lyx_cb.C:3035 src/lyx_cb.C:3039 +#: src/lyx_cb.C:3465 src/lyx_cb.C:3469 src/lyx_cb.C:3499 src/lyx_cb.C:3503 msgid "No more notes" msgstr "Ingen flere notiser" -#: src/lyx_cb.C:3070 +#: src/lyx_cb.C:3542 msgid "Quotes type set" msgstr "Sitattegn stil satt" -#: src/lyx_cb.C:3134 +#: src/lyx_cb.C:3606 msgid "LaTeX preamble set" msgstr "LaTeX preamble satt" -#: src/lyx_cb.C:3155 +#: src/lyx_cb.C:3628 src/lyx_cb.C:3706 msgid "Cannot insert table in table." msgstr "Kan ikke sette inn tabell i tabell." -#: src/lyx_cb.C:3160 +#: src/lyx_cb.C:3633 src/lyx_cb.C:3711 msgid "Inserting table..." msgstr "Setter inn tabell..." -#: src/lyx_cb.C:3222 +#: src/lyx_cb.C:3695 src/lyx_cb.C:3773 msgid "Table inserted" msgstr "Tabell satt inn" -#: src/lyx_cb.C:3278 src/lyx_cb.C:3296 +#: src/lyx_cb.C:3829 src/lyx_cb.C:3847 msgid "ERROR! Unable to print!" msgstr "FEIL! Kan ikke skrive ut!" -#: src/lyx_cb.C:3279 +#: src/lyx_cb.C:3830 msgid "Check 'range of pages'!" msgstr "Sjekk 'sideintervall'!" -#: src/lyx_cb.C:3297 +#: src/lyx_cb.C:3848 msgid "Check 'number of copies'!" msgstr "Sjekk 'antall kopier'!" -#: src/lyx_cb.C:3407 +#: src/lyx_cb.C:3957 msgid "Error:" msgstr "Feil:" -#: src/lyx_cb.C:3408 +#: src/lyx_cb.C:3958 msgid "Unable to print" msgstr "Kan ikke lese skrive ut!" -#: src/lyx_cb.C:3409 +#: src/lyx_cb.C:3959 msgid "Check that your parameters are correct" msgstr "Sjekk at parameterene er riktige" -#: src/lyx_cb.C:3431 +#: src/lyx_cb.C:3981 src/lyx_cb.C:4050 msgid "Inserting figure..." msgstr "Setter inn figur..." -#: src/lyx_cb.C:3436 src/lyx_cb.C:3487 +#: src/lyx_cb.C:3986 src/lyx_cb.C:4037 src/lyx_cb.C:4055 src/lyx_cb.C:4106 msgid "Figure inserted" msgstr "Figur satt inn" -#: src/lyx_cb.C:3517 +#: src/lyx_cb.C:4136 msgid "Screen options set" msgstr "Skjemrm opsjoner satt" -#: src/lyx_cb.C:3547 +#: src/lyx_cb.C:4166 msgid "LaTeX Options" msgstr "LaTeX Opsjoner" -#: src/lyx_cb.C:3556 +#: src/lyx_cb.C:4175 msgid "Running configure..." msgstr "Kjører \"configure\"..." -#: src/lyx_cb.C:3563 +#: src/lyx_cb.C:4182 msgid "Reloading configuration..." msgstr "Leser konfigurasjon om igjen..." -#: src/lyx_cb.C:3565 +#: src/lyx_cb.C:4184 msgid "The system has been reconfigured." msgstr "Systemed har blitt rekonfigurert." -#: src/lyx_cb.C:3566 +#: src/lyx_cb.C:4185 msgid "You need to restart LyX to make use of any" msgstr "Du må restarte LyX for å kunne bruke de" -#: src/lyx_cb.C:3567 +#: src/lyx_cb.C:4186 msgid "updated document class specifications." msgstr "oppdaterte textklasse spesifikasjonene." -#: src/lyx_cb.C:3685 +#: src/lyx_cb.C:4358 msgid "Couldn't find this label" msgstr "Klarte ikke å finne dette referansemerket" -#: src/lyx_cb.C:3686 +#: src/lyx_cb.C:4359 msgid "in current document." msgstr "i gjeldende dokument." -#: src/lyx_cb.C:3718 +#: src/lyx_cb.C:4391 msgid "*** No Document ***" msgstr "*** Intet Dokument ***" -#: src/lyx_cb.C:3885 +#: src/lyx_cb.C:4556 msgid "*** No labels found in document ***" msgstr "*** Ingen referansemerker funnet i dokumentet ***" @@ -2699,170 +2701,170 @@ msgstr "Matte" msgid "Inset" msgstr "Inset" -#: src/lyxfont.C:358 +#: src/lyxfont.C:359 msgid "Emphasis " msgstr "Uthevet " -#: src/lyxfont.C:360 +#: src/lyxfont.C:361 msgid "Underline " msgstr "Understreket " -#: src/lyxfont.C:362 +#: src/lyxfont.C:363 msgid "Noun " msgstr "Substantiv " -#: src/lyxfont.C:364 +#: src/lyxfont.C:365 msgid "Latex " msgstr "LaTeX " -#: src/lyxfont.C:366 +#: src/lyxfont.C:367 msgid "Default" msgstr "Standard" -#: src/lyxfr1.C:154 src/lyxfr1.C:195 +#: src/lyxfr1.C:157 src/lyxfr1.C:213 msgid "Sorry!" msgstr "Beklager!" -#: src/lyxfr1.C:154 src/lyxfr1.C:195 +#: src/lyxfr1.C:157 src/lyxfr1.C:213 msgid "You cannot replace a single space, nor an empty character." msgstr "Du kan ikke erstatte et enkelt mellomrom, heller ikke et tomt tegn." -#: src/lyxfr1.C:225 src/lyxfr1.C:274 +#: src/lyxfr1.C:263 src/lyxfr1.C:328 msgid "String not found!" msgstr "Streng ikke funnet!" -#: src/lyxfr1.C:228 +#: src/lyxfr1.C:266 msgid "1 string has been replaced." msgstr "1 streng har blitt erstattet." -#: src/lyxfr1.C:231 +#: src/lyxfr1.C:269 msgid " strings have been replaced." msgstr " strenger har blitt erstattet." -#: src/lyxfr1.C:270 +#: src/lyxfr1.C:324 msgid "Found." msgstr "Funnet." -#: src/lyxfunc.C:280 +#: src/lyxfunc.C:295 msgid "Unknown sequence:" msgstr "Ukent sekvens:" -#: src/lyxfunc.C:323 src/lyxfunc.C:2489 +#: src/lyxfunc.C:338 src/lyxfunc.C:2521 src/lyxfunc.C:4605 msgid "Unknown action" msgstr "Ukjent operasjon" #. no -#: src/lyxfunc.C:337 +#: src/lyxfunc.C:352 msgid "Document is read-only" msgstr "Dokumentet er ikke skrivbart." #. no -#: src/lyxfunc.C:342 +#: src/lyxfunc.C:357 msgid "Command not allowed without any document open" msgstr "Kommandoen er ikke lov uten åpne dokumenter" -#: src/lyxfunc.C:560 +#: src/lyxfunc.C:586 src/lyxfunc.C:2669 msgid "Text mode" msgstr "Tekst modus" -#: src/lyxfunc.C:811 +#: src/lyxfunc.C:837 src/lyxfunc.C:2920 msgid "Document exported as HTML to file `" msgstr "Dokumentet eksportert som HTML til fil `" -#: src/lyxfunc.C:814 +#: src/lyxfunc.C:840 src/lyxfunc.C:2923 msgid "Unable to convert to HTML the file `" msgstr "Kan ikke konvertere til HTML. `" -#: src/lyxfunc.C:820 +#: src/lyxfunc.C:846 src/lyxfunc.C:2929 msgid "Unknown export type: " msgstr "Ukjent eksport type: " -#: src/lyxfunc.C:844 +#: src/lyxfunc.C:870 src/lyxfunc.C:2953 msgid "Unknown import type: " msgstr "Ukjent import type: " -#: src/lyxfunc.C:1173 +#: src/lyxfunc.C:1199 src/lyxfunc.C:3282 msgid "Layout " msgstr "Stil " -#: src/lyxfunc.C:1174 +#: src/lyxfunc.C:1200 src/lyxfunc.C:3283 msgid " not known" msgstr " ukjent" -#: src/lyxfunc.C:1316 +#: src/lyxfunc.C:1342 src/lyxfunc.C:3425 msgid "No cross-reference to toggle" msgstr "Ingen kryssreferanse å endre!" -#: src/lyxfunc.C:1668 +#: src/lyxfunc.C:1693 src/lyxfunc.C:3777 msgid "Mark removed" msgstr "Fjernet merke" -#: src/lyxfunc.C:1673 +#: src/lyxfunc.C:1698 src/lyxfunc.C:3782 msgid "Mark set" msgstr "Merke satt" -#: src/lyxfunc.C:1776 +#: src/lyxfunc.C:1801 src/lyxfunc.C:3885 msgid "Mark off" msgstr "Merke slått av" -#: src/lyxfunc.C:1786 +#: src/lyxfunc.C:1811 src/lyxfunc.C:3895 msgid "Mark on" msgstr "Merke på" -#: src/lyxfunc.C:2087 +#: src/lyxfunc.C:2112 src/lyxfunc.C:4196 msgid "Push-toolbar needs argument > 0" msgstr "\"push-toolbar\" trenger argument > 0" -#: src/lyxfunc.C:2105 +#: src/lyxfunc.C:2130 src/lyxfunc.C:4214 msgid "Usage: toolbar-add-to " msgstr "Bruk: toolbar-add-to " -#: src/lyxfunc.C:2129 src/mathed/formula.C:873 +#: src/lyxfunc.C:2154 src/lyxfunc.C:4238 src/mathed/formula.C:874 msgid "Math greek mode on" msgstr "Gresk matte modus på" -#: src/lyxfunc.C:2140 src/mathed/formula.C:884 +#: src/lyxfunc.C:2165 src/lyxfunc.C:4249 src/mathed/formula.C:885 msgid "Math greek keyboard on" msgstr "Gresk matte keyboard på" -#: src/lyxfunc.C:2142 src/mathed/formula.C:886 +#: src/lyxfunc.C:2167 src/lyxfunc.C:4251 src/mathed/formula.C:887 msgid "Math greek keyboard off" msgstr "Gresk matte keyboard av" -#: src/lyxfunc.C:2177 +#: src/lyxfunc.C:2202 src/lyxfunc.C:4286 msgid "Missing argument" msgstr "Mangler argument" #. / what appears in the minibuffer when opening -#: src/lyxfunc.C:2193 src/mathed/formula.h:73 +#: src/lyxfunc.C:2218 src/lyxfunc.C:4302 src/mathed/formula.h:73 msgid "Math editor mode" msgstr "Matte editerings modus" -#: src/lyxfunc.C:2200 +#: src/lyxfunc.C:2225 src/lyxfunc.C:4309 msgid "This is only allowed in math mode!" msgstr "Dette er bare tillatt i mattemodus!" -#: src/lyxfunc.C:2354 +#: src/lyxfunc.C:2379 src/lyxfunc.C:4463 msgid "Opening child document " msgstr "Åpner subdokument " -#: src/lyxfunc.C:2386 +#: src/lyxfunc.C:2411 src/lyxfunc.C:4495 msgid "Unknown kind of footnote" msgstr "Ukjent fotnote slag" -#: src/lyxfunc.C:2448 +#: src/lyxfunc.C:2480 src/lyxfunc.C:4564 msgid "Document is read only" msgstr "Dokumentet er ikke skrivbart:" -#: src/lyxfunc.C:2541 +#: src/lyxfunc.C:4657 msgid "Enter Filename for new document" msgstr "Skriv inn filnavn for nytt dokument" -#: src/lyxfunc.C:2542 +#: src/lyxfunc.C:4658 msgid "newfile" msgstr "nyfil" -#: src/lyxfunc.C:2561 src/lyxfunc.C:2700 src/lyxfunc.C:2779 +#: src/lyxfunc.C:4677 src/lyxfunc.C:4816 src/lyxfunc.C:4895 msgid "" "Do you want to close that document now?\n" "('No' will just switch to the open version)" @@ -2870,105 +2872,105 @@ msgstr "" "Ønsker du å lukke det dokumentet nå?\n" "('Nei' vil bare bytte til den versjonen som er åpnet)" -#: src/lyxfunc.C:2584 +#: src/lyxfunc.C:4700 msgid "Do you want to open the document?" msgstr "Ønsker du å åpne dokumentet?" #. loads document -#: src/lyxfunc.C:2586 src/lyxfunc.C:2649 +#: src/lyxfunc.C:4702 src/lyxfunc.C:4765 msgid "Opening document" msgstr "Ønsker du å åpne dokumentet?" -#: src/lyxfunc.C:2593 src/lyxfunc.C:2656 +#: src/lyxfunc.C:4709 src/lyxfunc.C:4772 msgid "opened." msgstr "åpnet" -#: src/lyxfunc.C:2602 +#: src/lyxfunc.C:4718 msgid "Choose template" msgstr "Velg mal" -#: src/lyxfunc.C:2630 src/lyxfunc.C:2679 src/lyxfunc.C:2752 src/lyxfunc.C:2853 +#: src/lyxfunc.C:4746 src/lyxfunc.C:4795 src/lyxfunc.C:4868 src/lyxfunc.C:4969 msgid "Examples" msgstr "Eksempler" -#: src/lyxfunc.C:2632 +#: src/lyxfunc.C:4748 msgid "Select Document to Open" msgstr "Vel dokument som skal åpnes" -#: src/lyxfunc.C:2658 +#: src/lyxfunc.C:4774 msgid "Could not open document" msgstr "Kunne ikke åpne dokumentet" -#: src/lyxfunc.C:2681 +#: src/lyxfunc.C:4797 msgid "Select ASCII file to Import" msgstr "Velg ASCII fil som skal importeres" -#: src/lyxfunc.C:2719 src/lyxfunc.C:2799 +#: src/lyxfunc.C:4835 src/lyxfunc.C:4915 msgid "A document by the name" msgstr "Ett annet dokument med navnet" -#: src/lyxfunc.C:2721 src/lyxfunc.C:2801 +#: src/lyxfunc.C:4837 src/lyxfunc.C:4917 msgid "already exists. Overwrite?" msgstr "finnes allerede. Overskrive?" -#: src/lyxfunc.C:2727 +#: src/lyxfunc.C:4843 msgid "Importing ASCII file" msgstr "Importerer ASCII fil" -#: src/lyxfunc.C:2731 +#: src/lyxfunc.C:4847 msgid "ASCII file " msgstr "ASCII fil " -#: src/lyxfunc.C:2733 src/lyxfunc.C:2824 +#: src/lyxfunc.C:4849 src/lyxfunc.C:4940 msgid "imported." msgstr "importert." -#: src/lyxfunc.C:2756 +#: src/lyxfunc.C:4872 msgid "Select Noweb file to Import" msgstr "Velg Noweb fil som skal importeres" -#: src/lyxfunc.C:2759 +#: src/lyxfunc.C:4875 msgid "Select LaTeX file to Import" msgstr "Velg LaTeX fil som skal importeres" -#: src/lyxfunc.C:2809 +#: src/lyxfunc.C:4925 msgid "Importing LaTeX file" msgstr "Importerer LaTeX fil" -#: src/lyxfunc.C:2814 +#: src/lyxfunc.C:4930 msgid "Importing Noweb file" msgstr "Importerer Noweb fil" -#: src/lyxfunc.C:2822 +#: src/lyxfunc.C:4938 msgid "Noweb file " msgstr "Noweb fil " -#: src/lyxfunc.C:2822 +#: src/lyxfunc.C:4938 msgid "LateX file " msgstr "LaTeX fil " -#: src/lyxfunc.C:2827 +#: src/lyxfunc.C:4943 msgid "Could not import Noweb file" msgstr "Kunne ikke importere Noweb filen" -#: src/lyxfunc.C:2828 +#: src/lyxfunc.C:4944 msgid "Could not import LaTeX file" msgstr "Kunne ikke importere LaTeX filen" -#: src/lyxfunc.C:2855 +#: src/lyxfunc.C:4971 msgid "Select Document to Insert" msgstr "Velg dokument som skal settes inn" #. Inserts document -#: src/lyxfunc.C:2873 +#: src/lyxfunc.C:4989 msgid "Inserting document" msgstr "Setter inn dokumentet" -#: src/lyxfunc.C:2879 +#: src/lyxfunc.C:4995 msgid "inserted." msgstr "satt inn." -#: src/lyxfunc.C:2881 +#: src/lyxfunc.C:4997 msgid "Could not insert document" msgstr "Kunne ikke sette inn dokumentet" @@ -3068,105 +3070,105 @@ msgstr "Endringer vil bli ignorert" msgid "The document is read-only:" msgstr "Dokumentet er skrivebeskyttet:" -#: src/lyx_main.C:167 +#: src/lyx_main.C:177 msgid "Warning: could not determine path of binary." msgstr "Advarsel: Fant ikke sti til binærfilen." -#: src/lyx_main.C:169 +#: src/lyx_main.C:179 msgid "If you have problems, try starting LyX with an absolute path." msgstr "Hvis du har problemer prøv å start LyX med absolutt filsti." -#: src/lyx_main.C:260 +#: src/lyx_main.C:269 msgid "LYX_DIR_11x environment variable no good." msgstr "LYX_DIR_11x miljøvariabel er ikke god." -#: src/lyx_main.C:262 +#: src/lyx_main.C:271 msgid "System directory set to: " msgstr "System folder satt til: " -#: src/lyx_main.C:270 +#: src/lyx_main.C:279 msgid "LyX Warning! Couldn't determine system directory." msgstr "LyX Advarsel! Fant ikke system folder." -#: src/lyx_main.C:271 +#: src/lyx_main.C:280 msgid "Try the '-sysdir' command line parameter or" msgstr "Forsøk '-sysdir' som parameter eller" -#: src/lyx_main.C:272 +#: src/lyx_main.C:281 msgid "set the environment variable LYX_DIR_11x to the LyX system directory" msgstr "sett miljøvariablen LYX_DIR_11x til å peke på LyX' systemfolder som" -#: src/lyx_main.C:274 +#: src/lyx_main.C:283 msgid "containing the file `chkconfig.ltx'." msgstr "inneholder filen `chkconfig.ltx'." -#: src/lyx_main.C:276 +#: src/lyx_main.C:285 msgid "Using built-in default " msgstr "Bruker innebygd standard " -#: src/lyx_main.C:277 +#: src/lyx_main.C:286 msgid " but expect problems." msgstr " men forvent problemer." -#: src/lyx_main.C:280 +#: src/lyx_main.C:289 msgid "Expect problems." msgstr "Forvent problemer." #. Nope -#: src/lyx_main.C:379 +#: src/lyx_main.C:388 msgid "You don't have a personal LyX directory." msgstr "Du har ikke en personlig LyX folder." -#: src/lyx_main.C:380 +#: src/lyx_main.C:389 msgid "It is needed to keep your own configuration." msgstr "Den trengs for å ta vare på din egen konfigurasjon." -#: src/lyx_main.C:381 +#: src/lyx_main.C:390 msgid "Should I try to set it up for you (recommended)?" msgstr "Skal jeg prøve å sette den opp for deg (anbefalt)?" -#: src/lyx_main.C:382 +#: src/lyx_main.C:391 msgid "Running without personal LyX directory." msgstr "Kjører uten personlig LyX folder." #. Tell the user what is going on -#: src/lyx_main.C:389 +#: src/lyx_main.C:398 msgid "LyX: Creating directory " msgstr "LyX: Lager folder " -#: src/lyx_main.C:390 +#: src/lyx_main.C:399 msgid " and running configure..." msgstr " og kjører \"configure\"..." -#: src/lyx_main.C:396 +#: src/lyx_main.C:405 msgid "Failed. Will use " msgstr "Feilet. Bruker " -#: src/lyx_main.C:397 +#: src/lyx_main.C:406 msgid " instead." msgstr " isteden." -#: src/lyx_main.C:404 +#: src/lyx_main.C:413 msgid "Done!" msgstr "Ferdig!" -#: src/lyx_main.C:418 +#: src/lyx_main.C:427 msgid "LyX Warning!" msgstr "LyX Advarsel!" -#: src/lyx_main.C:419 +#: src/lyx_main.C:428 msgid "Error while reading " msgstr "Feil under lesing " -#: src/lyx_main.C:420 +#: src/lyx_main.C:429 msgid "Using built-in defaults." msgstr "Bruker innebygde standarer." -#: src/lyx_main.C:430 +#: src/lyx_main.C:439 msgid "Setting debug level to " msgstr "Setter debug nivå til " -#: src/lyx_main.C:453 +#: src/lyx_main.C:450 msgid "" "Usage: lyx [ command line switches ] [ name.lyx ... ]\n" "Command line switches (case sensitive):\n" @@ -3176,8 +3178,9 @@ msgid "" "\t-height y set the height of the main window\n" "\t-xpos x set the x position of the main window\n" "\t-ypos y set the y position of the main window\n" -"\t-dbg n where n is a sum of debugging options. Try -dbg 65535 " -"-help\n" +"\t-dbg feature[,feature]...\n" +" select the features to debug.\n" +" Type `lyx -dbg' to see the list of features\n" "\t-Reverse swaps foreground & background colors\n" "\t-Mono runs LyX in black and white mode\n" "\t-FastSelection use a fast routine for drawing selections\n" @@ -3192,22 +3195,43 @@ msgstr "" " -height y sett høyden på hovedvinduet\n" " -xpos x sett x posisjonen til hovedvinduet\n" " -ypos y sett y posisjonen til hovedvinduet\n" -" -dbg n hvor n er summen av debug optsjonene. Prøv -dbg " -"65535 -help\n" +" -dbg egenskap[,egenskap]...\n" +" velg egenskapene som skal debugges.\n" +" Prøv `lyx -dbg' for å se listen over egenskaper.\n" " -Reverse bytter op forgrunns- og bakgrunns farger\n" " -Mono kjører LyX i svart/hvitt modus\n" " -FastSelection bruker en rask rutine for merking\n" "\n" "Les manual siden til LyX for flere opsjoner." -#: src/lyx_main.C:486 -msgid "Missing number for -dbg switch!" -msgstr "Mangler verdi for -dbg parameter!" +#: src/lyx_main.C:485 +msgid "List of supported debug flags:" +msgstr "Liste over debug flagg some støttes:" -#: src/lyx_main.C:501 +#: src/lyx_main.C:504 msgid "Missing directory for -sysdir switch!" msgstr "Mangler folder for -sysdir parameter!" +#: src/lyx_main.C:530 +msgid "Missing command string after -x switch!" +msgstr "Mangler kommando streng etter -x switch!" + +#: src/lyx_main.C:556 +msgid "Unknown file type '" +msgstr "Ukjent fil type '" + +#: src/lyx_main.C:557 +msgid "' after " +msgstr "' etter " + +#: src/lyx_main.C:558 src/lyx_main.C:563 +msgid " switch!" +msgstr " endring!" + +#: src/lyx_main.C:561 +msgid "Missing file type [eg latex, ps...] after " +msgstr "Mangler fil type [eks. latex, ps...] etter " + #: src/lyx_sendfax.C:21 msgid "Fax no.:|#F" msgstr "Faks no.:|#F" @@ -3336,31 +3360,31 @@ msgstr "Ingen VC historie!" msgid "VC History" msgstr "VC historie" -#: src/LyXView.C:371 src/minibuffer.C:218 +#: src/LyXView.C:379 src/minibuffer.C:218 msgid " (Changed)" msgstr " (Endret)" -#: src/LyXView.C:373 +#: src/LyXView.C:381 msgid " (read only)" msgstr " (skrivebeskyttet)" -#: src/mathed/formula.C:901 src/mathed/formula.C:1188 +#: src/mathed/formula.C:902 src/mathed/formula.C:1193 msgid "TeX mode" msgstr "TeX modus" -#: src/mathed/formula.C:916 +#: src/mathed/formula.C:917 msgid "No number" msgstr "Inget tall" -#: src/mathed/formula.C:919 +#: src/mathed/formula.C:920 msgid "Number" msgstr "Tall" -#: src/mathed/formula.C:1077 +#: src/mathed/formula.C:1078 msgid "math text mode" msgstr "Matte tekstmodus" -#: src/mathed/formula.C:1086 +#: src/mathed/formula.C:1087 msgid "Invalid action in math mode!" msgstr "Ugyldig operasjon i matte modus!" @@ -3465,11 +3489,11 @@ msgstr "Mellomrom" msgid "Matrix" msgstr "Matrise" -#: src/mathed/math_panel.C:313 +#: src/mathed/math_panel.C:312 msgid "Top | Center | Bottom" msgstr "Topp | Senter | Bunn" -#: src/mathed/math_panel.C:365 +#: src/mathed/math_panel.C:364 msgid "Math Panel" msgstr "Matte panel" @@ -3708,7 +3732,7 @@ msgstr "" msgid "New...|New from template...|Open...%l|Import%m%l|Exit%l" msgstr "Ny fil...|Ny fil med mal...|Åpne...%l|Importer%m%l|Avslutt%l" -#: src/menus.C:818 +#: src/menus.C:818 src/menus.C:1139 msgid "" "Floats & Insets%t|Open/Close%x21|Melt%x22|Open All Footnotes/Margin " "Notes%x23|Close All Footnotes/Margin Notes%x24|Open All " @@ -3719,265 +3743,265 @@ msgstr "" "figurer/tabeller%x25|Lukk alle figurer tabeller%x26%l|Fjern alle feil " "bokser%x27" -#: src/menus.C:827 +#: src/menus.C:827 src/menus.C:1148 msgid "EMF|Oo#o#O" msgstr "EMF|pP#p#P" -#: src/menus.C:828 +#: src/menus.C:828 src/menus.C:1149 msgid "EMF|Mm#m#M" msgstr "EMF|Ss#S#s" -#: src/menus.C:829 +#: src/menus.C:829 src/menus.C:1150 msgid "EMF|Aa#a#A" msgstr "EMF|aA#a#A" -#: src/menus.C:830 +#: src/menus.C:830 src/menus.C:1151 msgid "EMF|Cc#c#C" msgstr "EMF|Ll#L#l" -#: src/menus.C:831 +#: src/menus.C:831 src/menus.C:1152 msgid "EMF|Ff#f#F" msgstr "EMF|fF#f#F" -#: src/menus.C:832 +#: src/menus.C:832 src/menus.C:1153 msgid "EMF|Tt#t#T" msgstr "EMF|tT#t#T" -#: src/menus.C:833 +#: src/menus.C:833 src/menus.C:1154 msgid "EMF|Rr#r#R" msgstr "EMF|bB#b#B" -#: src/menus.C:841 src/menus.C:939 +#: src/menus.C:841 src/menus.C:939 src/menus.C:1162 src/menus.C:1260 msgid "Table%t" msgstr "Tabell%t" -#: src/menus.C:849 +#: src/menus.C:849 src/menus.C:1170 msgid "|Multicolumn%B%x44%l" msgstr "Multikolonne%B%x44%l" -#: src/menus.C:851 +#: src/menus.C:851 src/menus.C:1172 msgid "|Multicolumn%b%x44%l" msgstr "Multikolonne%b%x44%l" -#: src/menus.C:852 +#: src/menus.C:852 src/menus.C:1173 msgid "EMT|Mm#m#M" msgstr "EMT|Mm#M#m" -#: src/menus.C:860 +#: src/menus.C:860 src/menus.C:1181 msgid "|Line Top%B%x36" msgstr "|Topp linje%B%x36" -#: src/menus.C:862 +#: src/menus.C:862 src/menus.C:1183 msgid "|Line Top%b%x36" msgstr "|Topp linje%b%x36" -#: src/menus.C:863 +#: src/menus.C:863 src/menus.C:1184 msgid "EMT|Tt#t#T" msgstr "EMT|Tt#T#t" -#: src/menus.C:871 +#: src/menus.C:871 src/menus.C:1192 msgid "|Line Bottom%B%x37" msgstr "|Bunn linje%B%x37" -#: src/menus.C:873 +#: src/menus.C:873 src/menus.C:1194 msgid "|Line Bottom%b%x37" msgstr "|Bunn linje%b%x37" -#: src/menus.C:874 +#: src/menus.C:874 src/menus.C:1195 msgid "EMT|Bb#b#B" msgstr "EMT|Bb#B#b" -#: src/menus.C:882 +#: src/menus.C:882 src/menus.C:1203 msgid "|Line Left%B%x38" msgstr "|Venstre linje%B%x38" -#: src/menus.C:884 +#: src/menus.C:884 src/menus.C:1205 msgid "|Line Left%b%x38" msgstr "|Venstre linje%b%x38" -#: src/menus.C:885 +#: src/menus.C:885 src/menus.C:1206 msgid "EMT|Ll#l#L" msgstr "EMT|Vv#V#V" -#: src/menus.C:893 +#: src/menus.C:893 src/menus.C:1214 msgid "|Line Right%B%x39%l" msgstr "|Høyre linje%B%x39%l" -#: src/menus.C:895 +#: src/menus.C:895 src/menus.C:1216 msgid "|Line Right%b%x39%l" msgstr "|Høyre linje%b%x39%l" -#: src/menus.C:896 +#: src/menus.C:896 src/menus.C:1217 msgid "EMT|Rr#r#R" msgstr "EMT|Hh#H#h" -#: src/menus.C:905 +#: src/menus.C:905 src/menus.C:1226 msgid "|Align Left%R%x40" msgstr "|Juster venstre%R%x40" -#: src/menus.C:907 +#: src/menus.C:907 src/menus.C:1228 msgid "|Align Left%r%x40" msgstr "|Juster venstre%r%x40" -#: src/menus.C:908 +#: src/menus.C:908 src/menus.C:1229 msgid "EMT|eE#e#E" msgstr "EMT|eE#e#E" -#: src/menus.C:911 +#: src/menus.C:911 src/menus.C:1232 msgid "|Align Right%R%x41" msgstr "|Juster Høyre%R%x41" -#: src/menus.C:913 +#: src/menus.C:913 src/menus.C:1234 msgid "|Align Right%r%x41" msgstr "|Juster Høyre%r%x41" -#: src/menus.C:914 +#: src/menus.C:914 src/menus.C:1235 msgid "EMT|iI#i#I" msgstr "EMT|yY#y#Y" -#: src/menus.C:917 +#: src/menus.C:917 src/menus.C:1238 msgid "|Align Center%R%x42%l" msgstr "|Sentrer%R%x42%l" -#: src/menus.C:919 +#: src/menus.C:919 src/menus.C:1240 msgid "|Align Center%r%x42%l" msgstr "Sentrer%r%x42%l" -#: src/menus.C:920 +#: src/menus.C:920 src/menus.C:1241 msgid "EMT|Cc#c#C" msgstr "EMT|Ss#S#s" -#: src/menus.C:923 +#: src/menus.C:923 src/menus.C:1244 #, no-c-format msgid "|Append Row%x32" msgstr "|Legg til rad%x32" -#: src/menus.C:924 +#: src/menus.C:924 src/menus.C:1245 msgid "EMT|oO#o#O" msgstr "EMT|rR#r#R" -#: src/menus.C:926 +#: src/menus.C:926 src/menus.C:1247 #, no-c-format msgid "|Append Column%x33%l" msgstr "|Legg til kolonne%x33%l" -#: src/menus.C:927 +#: src/menus.C:927 src/menus.C:1248 msgid "EMT|uU#u#U" msgstr "EMT|kK#k#K" -#: src/menus.C:929 +#: src/menus.C:929 src/menus.C:1250 #, no-c-format msgid "|Delete Row%x34" msgstr "|Slett rad%x34" -#: src/menus.C:930 +#: src/menus.C:930 src/menus.C:1251 msgid "EMT|wW#w#W" msgstr "EMT|dD#d#D" -#: src/menus.C:932 +#: src/menus.C:932 src/menus.C:1253 #, no-c-format msgid "|Delete Column%x35%l" msgstr "|Slett kolonne%x35%l" -#: src/menus.C:933 +#: src/menus.C:933 src/menus.C:1254 msgid "EMT|nN#n#N" msgstr "EMT|nN#n#N" -#: src/menus.C:935 +#: src/menus.C:935 src/menus.C:1256 #, no-c-format msgid "|Delete Table%x43" msgstr "|Slett tabell%x43" -#: src/menus.C:936 +#: src/menus.C:936 src/menus.C:1257 msgid "EMT|Dd#d#D" msgstr "EMT|Ss#S#s" -#: src/menus.C:941 +#: src/menus.C:941 src/menus.C:1262 #, no-c-format msgid "|Insert table%x31" msgstr "|Sett inn tabell%x31" -#: src/menus.C:942 +#: src/menus.C:942 src/menus.C:1263 msgid "EMT|Ii#i#I" msgstr "EMT|Ss#S#s" -#: src/menus.C:946 +#: src/menus.C:946 src/menus.C:1267 msgid "Version Control%t" msgstr "Versjons kontroll%t" -#: src/menus.C:949 +#: src/menus.C:949 src/menus.C:1270 #, no-c-format msgid "|Register%d%x51" msgstr "|Registrer%d%x51" #. signifies that the file is not checked out -#: src/menus.C:953 +#: src/menus.C:953 src/menus.C:1274 #, no-c-format msgid "|Check In Changes%d%x52" msgstr "|Sjekk inn endringer%d%x52" -#: src/menus.C:955 +#: src/menus.C:955 src/menus.C:1276 #, no-c-format msgid "|Check Out for Edit%x53" msgstr "|Sjekk ut for endring%x53" #. signifies that the file is checked out -#: src/menus.C:959 +#: src/menus.C:959 src/menus.C:1280 #, no-c-format msgid "|Check In Changes%x52" msgstr "|Sjekk inn endringer%x52" -#: src/menus.C:961 +#: src/menus.C:961 src/menus.C:1282 #, no-c-format msgid "|Check Out for Edit%d%x53" msgstr "|Sjekk ut for endringer%d%x53" -#: src/menus.C:964 +#: src/menus.C:964 src/menus.C:1285 #, no-c-format msgid "|Revert to last version%x54" msgstr "|Tilbake til siste versjon%x54" -#: src/menus.C:966 +#: src/menus.C:966 src/menus.C:1287 #, no-c-format msgid "|Undo last check in%x55" msgstr "|Angre siste innsjekking%x55" -#: src/menus.C:968 +#: src/menus.C:968 src/menus.C:1289 #, no-c-format msgid "|Show History%x56" msgstr "|Vis Historie%x56" -#: src/menus.C:971 +#: src/menus.C:971 src/menus.C:1292 #, no-c-format msgid "|Register%x51" msgstr "|Registrer%x51" #. the shortcuts are not good. -#: src/menus.C:974 +#: src/menus.C:974 src/menus.C:1295 msgid "EMV|Rr#r#R" msgstr "EMV|Rr#R#r" -#: src/menus.C:975 +#: src/menus.C:975 src/menus.C:1296 msgid "EMV|Ii#i#I" msgstr "EMV|iI#i#I" -#: src/menus.C:976 +#: src/menus.C:976 src/menus.C:1297 msgid "EMV|Oo#o#O" msgstr "EMV|uU#u#U" -#: src/menus.C:977 +#: src/menus.C:977 src/menus.C:1298 msgid "EMV|lL#l#l" msgstr "EMV|Tt#T#t" -#: src/menus.C:978 +#: src/menus.C:978 src/menus.C:1299 msgid "EMV|Uu#u#U" msgstr "EMV|Aa#A#a" -#: src/menus.C:979 +#: src/menus.C:979 src/menus.C:1300 msgid "EMV|Hh#h#H" msgstr "EMV|Hh#H#h" -#: src/menus.C:982 +#: src/menus.C:982 src/menus.C:1303 msgid "" "Undo|Redo %l|Cut|Copy|Paste%l|Find & Replace...|Go to Error|Go to " "Note|Floats & Insets%m|Table%m|Spellchecker....|Check TeX|Table of " @@ -3990,75 +4014,75 @@ msgstr "" "fil%l|Lim inn primær seleksjon som linjer|Lim inn primær seleksjon som " "avsnitt" -#: src/menus.C:1001 +#: src/menus.C:1001 src/menus.C:1322 msgid "EM|Uu#u#U" msgstr "EM|Aa#a#A" -#: src/menus.C:1002 +#: src/menus.C:1002 src/menus.C:1323 msgid "EM|Rr#r#R" msgstr "EM|Gg#g#G" -#: src/menus.C:1003 +#: src/menus.C:1003 src/menus.C:1324 msgid "EM|Cc#c#C" msgstr "EM|Kk#K#k" -#: src/menus.C:1004 +#: src/menus.C:1004 src/menus.C:1325 msgid "EM|oO#o#O" msgstr "EM|oO#o#O" -#: src/menus.C:1005 +#: src/menus.C:1005 src/menus.C:1326 msgid "EM|Pp#p#P" msgstr "EM|Ll#L#l" -#: src/menus.C:1006 +#: src/menus.C:1006 src/menus.C:1327 msgid "EM|Ff#f#F" msgstr "EM|Ee#E#e" -#: src/menus.C:1007 +#: src/menus.C:1007 src/menus.C:1328 msgid "EM|Ee#e#E" msgstr "EM|Ff#F#f" -#: src/menus.C:1008 +#: src/menus.C:1008 src/menus.C:1329 msgid "EM|Nn#n#N" msgstr "EM|Nn#N#n" -#: src/menus.C:1009 +#: src/menus.C:1009 src/menus.C:1330 msgid "EM|Ii#i#I" msgstr "EM|Ii#I#i" -#: src/menus.C:1010 +#: src/menus.C:1010 src/menus.C:1331 msgid "EM|Tt#t#T" msgstr "EM|Tt#T#t" -#: src/menus.C:1011 +#: src/menus.C:1011 src/menus.C:1332 msgid "EM|Ss#s#S" msgstr "EM|Ss#S#s" -#: src/menus.C:1012 +#: src/menus.C:1012 src/menus.C:1333 msgid "EM|hH#h#H" msgstr "EM|Xx#X#x" -#: src/menus.C:1013 +#: src/menus.C:1013 src/menus.C:1334 msgid "EM|aA#a#A" msgstr "EM|hH#h#H" -#: src/menus.C:1014 +#: src/menus.C:1014 src/menus.C:1335 msgid "EM|Vv#v#V" msgstr "EM|Vv#V#v" -#: src/menus.C:1015 +#: src/menus.C:1015 src/menus.C:1336 msgid "EM|wW#w#W" msgstr "EM|pP#p#P" -#: src/menus.C:1016 +#: src/menus.C:1016 src/menus.C:1337 msgid "EM|Ll#l#L" msgstr "EM|Ll#l#L" -#: src/menus.C:1017 +#: src/menus.C:1017 src/menus.C:1338 msgid "EM|gG#g#G" msgstr "EM|gG#g#G" -#: src/menus.C:1142 +#: src/menus.C:1464 msgid "" "Character...|Paragraph...|Document...|Paper...|Table...|Quotes...%l|Emphasize" " Style%b|Noun Style%b|Bold Style%b|TeX Style%b|Change Environment " @@ -4068,71 +4092,71 @@ msgstr "" "stil%b|Substantiv stil%b|Fet stil%b|TeX stil%b|Endre omgivelsesdybde|LaTeX " "preamble...%l|Lagre stil som standard" -#: src/menus.C:1155 +#: src/menus.C:1477 msgid "LM|Cc#c#C" msgstr "LM|Bb#B#b" -#: src/menus.C:1156 +#: src/menus.C:1478 msgid "LM|Pp#p#P" msgstr "LM|Aa#A#a" -#: src/menus.C:1157 +#: src/menus.C:1479 msgid "LM|Dd#d#D" msgstr "LM|Dd#D#d" -#: src/menus.C:1158 +#: src/menus.C:1480 msgid "LM|aA#a#A" msgstr "LM|rR#r#R" -#: src/menus.C:1159 +#: src/menus.C:1481 msgid "LM|eE#e#E" msgstr "LM|Tt#T#t" -#: src/menus.C:1160 +#: src/menus.C:1482 msgid "LM|Qq#q#Q" msgstr "LM|Ss#S#s" -#: src/menus.C:1161 +#: src/menus.C:1483 msgid "LM|mM#m#M" msgstr "LM|Uu#U#u" -#: src/menus.C:1162 +#: src/menus.C:1484 msgid "LM|Nn#n#N" msgstr "LM|nN#n#N" -#: src/menus.C:1163 +#: src/menus.C:1485 msgid "LM|Bb#b#B" msgstr "LM|Ff#F#f" -#: src/menus.C:1164 +#: src/menus.C:1486 msgid "LM|Tt#t#T" msgstr "LM|Xx#X#x" -#: src/menus.C:1165 +#: src/menus.C:1487 msgid "LM|vV#v#V" msgstr "LM§Ee#E#e" -#: src/menus.C:1166 +#: src/menus.C:1488 msgid "LM|Ll#l#L" msgstr "LM|Ll#L#l" -#: src/menus.C:1167 +#: src/menus.C:1489 msgid "LM|Ss#s#S" msgstr "LM|gG#g#G" -#: src/menus.C:1232 +#: src/menus.C:1563 msgid "Import ASCII file%t|As Lines%x41|As Paragraphs%x42" msgstr "Importer ASCII fil%t|Som linjer%x41|Som avsnitt%x42" -#: src/menus.C:1236 +#: src/menus.C:1567 msgid "IMA|Ll#l#L" msgstr "IMA|lL#l#L" -#: src/menus.C:1237 +#: src/menus.C:1568 msgid "IMA|Pp#p#P" msgstr "IMA|aA#a#A" -#: src/menus.C:1240 +#: src/menus.C:1571 msgid "" "Lists & TOC%t|Table of Contents%x21|List of Figures%x22|List of " "Tables%x23|List of Algorithms%x24|Index List%x25|BibTeX Reference%x26" @@ -4141,31 +4165,31 @@ msgstr "" "figurer%x22|Liste over Tabeller%x23|Liste over " "algoritmer%x24|Register%x25|Referanseliste%x26" -#: src/menus.C:1248 +#: src/menus.C:1579 msgid "IMT|Cc#c#C" msgstr "IMT|Ii#I#i" -#: src/menus.C:1249 +#: src/menus.C:1580 msgid "IMT|Ff#f#F" msgstr "IMT|fF#f#F" -#: src/menus.C:1250 +#: src/menus.C:1581 msgid "IMT|Tt#t#T" msgstr "IMT|Tt#T#t" -#: src/menus.C:1251 +#: src/menus.C:1582 msgid "IMT|Aa#a#A" msgstr "IMT|aA#a#A" -#: src/menus.C:1252 +#: src/menus.C:1583 msgid "IMT|Ii#i#I" msgstr "IMT|Rr#R#r" -#: src/menus.C:1253 +#: src/menus.C:1584 msgid "IMT|Bb#b#B" msgstr "IMT|fF#f#F" -#: src/menus.C:1256 +#: src/menus.C:1587 msgid "" "Floats%t|Figure Float%x71|Table Float%x72|Wide Figure Float%x73|Wide Table " "Float%l%x74|Algorithm Float%x75" @@ -4173,27 +4197,27 @@ msgstr "" "Floats%t|Figur float%x71|Tabell float%l%x72|Vid Figur float%x73|Vid Tabell " "float%l%x74|Algoritme float%x75" -#: src/menus.C:1263 +#: src/menus.C:1594 msgid "IMF|gG#g#G" msgstr "IMF|gG#g#G" -#: src/menus.C:1264 +#: src/menus.C:1595 msgid "IMF|Tt#t#T" msgstr "IMF|Tt#T#t" -#: src/menus.C:1265 +#: src/menus.C:1596 msgid "IMF|Ww#w#W" msgstr "IMF|bB#b#B" -#: src/menus.C:1266 +#: src/menus.C:1597 msgid "IMF|iI#i#I" msgstr "IM|fF#f#F" -#: src/menus.C:1267 +#: src/menus.C:1598 msgid "IMF|Aa#a#A" msgstr "IMF|gG#g#G" -#: src/menus.C:1270 +#: src/menus.C:1601 msgid "" "Special Character%t|HFill%x31|Hyphenation Point%x32|Protected " "Blank%x33|Linebreak%x34|Ellipsis (...)%x35|End of sentence " @@ -4204,39 +4228,39 @@ msgstr "" "(...)%x35|Avsnittssluttpunktum%x36|Vanlige gåseøyne " "(\")%x37|Menyseparator%x38" -#: src/menus.C:1280 +#: src/menus.C:1611 msgid "IMS|Hh#h#H" msgstr "IMS|Hh#H#h" -#: src/menus.C:1281 +#: src/menus.C:1612 msgid "IMS|Pp#p#P" msgstr "IMS|Oo#O#o" -#: src/menus.C:1282 +#: src/menus.C:1613 msgid "IMS|Bb#b#B" msgstr "IMS|mM#m#M" -#: src/menus.C:1283 +#: src/menus.C:1614 msgid "IMS|Ll#l#L" msgstr "IMS|Ll#L#l" -#: src/menus.C:1284 +#: src/menus.C:1615 msgid "IMS|iI#i#I" msgstr "IMS|Ee#E#e" -#: src/menus.C:1285 +#: src/menus.C:1616 msgid "IMS|Ee#e#E" msgstr "IMS|Aa#A#a" -#: src/menus.C:1286 +#: src/menus.C:1617 msgid "IMS|Qq#q#Q" msgstr "IMS|Vv#V#v" -#: src/menus.C:1287 +#: src/menus.C:1618 msgid "IMS|Mm#m#M" msgstr "IMS|Mm#m#M" -#: src/menus.C:1290 +#: src/menus.C:1621 msgid "" "Figure...|Table...%l|Include File...|Import ASCII File%m|Insert LyX " "File...%l|Footnote|Margin Note|Floats%m%l|Lists & TOC%m%l|Special " @@ -4248,79 +4272,79 @@ msgstr "" "tegn%m%l|Notis...|Referansemerke...|Kryssreferanse...|Siterings " "referanse...|Index referanse...|Indeks referanse siste ord" -#: src/menus.C:1311 +#: src/menus.C:1642 msgid "IM|gG#g#G" msgstr "IM|Ff#F#f" -#: src/menus.C:1312 +#: src/menus.C:1643 msgid "IM|bB#b#B" msgstr "IM|Tt#T#t" -#: src/menus.C:1313 +#: src/menus.C:1644 msgid "IM|cC#c#C" msgstr "IM|Ii#I#i" -#: src/menus.C:1314 +#: src/menus.C:1645 msgid "IM|Aa#a#A" msgstr "IM|Aa#A#a" -#: src/menus.C:1315 +#: src/menus.C:1646 msgid "IM|Xx#x#X" msgstr "IM|Xx#X#x" -#: src/menus.C:1316 +#: src/menus.C:1647 msgid "IM|Ff#f#F" msgstr "IM|nN#n#N" -#: src/menus.C:1317 +#: src/menus.C:1648 msgid "IM|Mm#m#M" msgstr "IM|Mm#M#m" -#: src/menus.C:1318 +#: src/menus.C:1649 msgid "IM|oO#o#O" msgstr "IM|oO#o#O" -#: src/menus.C:1319 +#: src/menus.C:1650 msgid "IM|Tt#t#T" msgstr "IM|Ll#L#l" -#: src/menus.C:1320 +#: src/menus.C:1651 msgid "IM|Ss#s#S" msgstr "IM|Ss#S#s" -#: src/menus.C:1321 +#: src/menus.C:1652 msgid "IM|Nn#n#N" msgstr "IM|eE#e#E" -#: src/menus.C:1322 +#: src/menus.C:1653 msgid "IM|Ll#l#L" msgstr "IM|Rr#r#R" -#: src/menus.C:1323 +#: src/menus.C:1654 msgid "IM|rR#r#R" msgstr "IM|Kk#K#k" -#: src/menus.C:1324 +#: src/menus.C:1655 msgid "IM|iI#i#I" msgstr "IM|fF#f#F" -#: src/menus.C:1325 +#: src/menus.C:1656 msgid "IM|dD#d#D" msgstr "IM|dD#d#D" -#: src/menus.C:1326 +#: src/menus.C:1657 msgid "IM|wW#w#W" msgstr "IM|wW#w#W" -#: src/menus.C:1328 +#: src/menus.C:1659 msgid "|URL..." msgstr "|URL..." -#: src/menus.C:1329 +#: src/menus.C:1660 msgid "IM|Uu#u#U" msgstr "IM|Uu#U#u" -#: src/menus.C:1435 +#: src/menus.C:1766 msgid "" "Fraction|Square root|Exponent|Index|Sum|Integral%l|Math mode|Display%l|Math " "Panel..." @@ -4328,70 +4352,70 @@ msgstr "" "Brøk|Kvadratrot|Eksponent|Indeks|Sum|Integral%l|Matte modus|Display%l|Matte " "panel..." -#: src/menus.C:1445 +#: src/menus.C:1776 msgid "MM|Ff#f#F" msgstr "MM|Bb#B#b" -#: src/menus.C:1446 +#: src/menus.C:1777 msgid "MM|Ss#s#S" msgstr "MM|Kk#K#k" -#: src/menus.C:1447 +#: src/menus.C:1778 msgid "MM|Ee#e#E" msgstr "MM|Ee#E#e" -#: src/menus.C:1448 +#: src/menus.C:1779 msgid "MM|xX#x#X" msgstr "MM|nN#n#N" -#: src/menus.C:1449 +#: src/menus.C:1780 msgid "MM|uU#u#U" msgstr "MM|Ss#S#s" -#: src/menus.C:1450 +#: src/menus.C:1781 msgid "MM|Ii#i#I" msgstr "MM|Ii#I#i" -#: src/menus.C:1451 +#: src/menus.C:1782 msgid "MM|Mm#m#M" msgstr "MM|Mm#M#m" -#: src/menus.C:1452 +#: src/menus.C:1783 msgid "MM|Dd#d#D" msgstr "MM|Dd#D#d" -#: src/menus.C:1453 +#: src/menus.C:1784 msgid "MM|Pp#p#P" msgstr "MM|pP#p#P" -#: src/menus.C:1519 +#: src/menus.C:1850 msgid "" "Screen Fonts...|Spellchecker Options...|Keyboard...|LaTeX...%l|Reconfigure" msgstr "" "Skjerm fonter...|Opsjoner til " "stavekontroll...|Tastatur...|LaTeX...%l|Rekonfigurer" -#: src/menus.C:1525 +#: src/menus.C:1856 msgid "OM|Ff#f#F" msgstr "OM|Ss#S#s" -#: src/menus.C:1526 +#: src/menus.C:1857 msgid "OM|Ss#s#S" msgstr "OM|Oo#O#o" -#: src/menus.C:1527 +#: src/menus.C:1858 msgid "OM|Kk#k#K" msgstr "OM|Tt#T#t" -#: src/menus.C:1528 +#: src/menus.C:1859 msgid "OM|Ll#l#L" msgstr "OM|Ll#L#l" -#: src/menus.C:1529 +#: src/menus.C:1860 msgid "OM|Rr#r#R" msgstr "OM|Rr#R#r" -#: src/menus.C:1598 +#: src/menus.C:1929 msgid "" "Introduction|Tutorial|User's Guide|Extended Features|Customization|Reference " "Manual|Known Bugs|LaTeX Configuration%l|Copyright and " @@ -4401,67 +4425,67 @@ msgstr "" "Manual|Known Bugs|LaTeX Configuration%l|Copyright and " "Warranty...|Credits...|Version..." -#: src/menus.C:1610 +#: src/menus.C:1941 msgid "HM|Ii#I#i" msgstr "HM|Ii#I#i" -#: src/menus.C:1611 +#: src/menus.C:1942 msgid "HM|Tt#T#t" msgstr "HM|Tt#T#t" -#: src/menus.C:1612 +#: src/menus.C:1943 msgid "HM|Uu#U#u" msgstr "HM|Uu#U#u" -#: src/menus.C:1613 +#: src/menus.C:1944 msgid "HM|xX#x#X" msgstr "HM|xX#x#X" -#: src/menus.C:1614 +#: src/menus.C:1945 msgid "HM|Cc#C#c" msgstr "HM|Cc#C#c" -#: src/menus.C:1615 +#: src/menus.C:1946 msgid "HM|Rr#R#r" msgstr "HM|Rr#R#r" -#: src/menus.C:1616 +#: src/menus.C:1947 msgid "HM|Kk#K#k" msgstr "HM|Kk#K#k" -#: src/menus.C:1617 +#: src/menus.C:1948 msgid "HM|Ll#L#l" msgstr "HM|Ll#L#l" -#: src/menus.C:1618 +#: src/menus.C:1949 msgid "HM|oO#o#O" msgstr "HM|oO#o#O" -#: src/menus.C:1619 +#: src/menus.C:1950 msgid "HM|eE#e#E" msgstr "HM|eE#e#E" -#: src/menus.C:1620 +#: src/menus.C:1951 msgid "HM|Vv#v#V" msgstr "HM|Vv#v#V" -#: src/menus.C:1643 +#: src/menus.C:1974 msgid "LyX Version " msgstr "LyX Versjon " -#: src/menus.C:1644 +#: src/menus.C:1975 msgid " of " msgstr " av " -#: src/menus.C:1645 +#: src/menus.C:1976 msgid "Library directory: " msgstr "Bibliotek folder: " -#: src/menus.C:1647 +#: src/menus.C:1978 msgid "User directory: " msgstr "Bruker folder: " -#: src/menus.C:1659 +#: src/menus.C:1990 msgid "Opening help file" msgstr "Åpner hjelpe fil" @@ -4490,28 +4514,28 @@ msgstr "Arkinnstillinger" msgid "Paper layout set" msgstr "Arkinnstillinger satt" -#: src/PaperLayout.C:269 src/ParagraphExtra.C:297 src/TableLayout.C:300 -#: src/TableLayout.C:473 +#: src/PaperLayout.C:269 src/ParagraphExtra.C:309 src/TableLayout.C:500 +#: src/TableLayout.C:686 msgid "Warning: Invalid Length (valid example: 10mm)" msgstr "Advarsel: Ugyldig lengde (gyldig eksempel: 10mm)" -#: src/paragraph.C:1962 +#: src/paragraph.C:1964 msgid "Senseless with this layout!" msgstr "Uten mening for denne stilen!" -#: src/ParagraphExtra.C:143 +#: src/ParagraphExtra.C:147 msgid "Document is read-only. No changes to layout permitted." msgstr "Dokumentet er skrivebeskyttet. Stil endringer er ikke tillatt." -#: src/ParagraphExtra.C:162 +#: src/ParagraphExtra.C:166 msgid "ParagraphExtra Layout" msgstr "Ekstra Avsnittsinnstillinger" -#: src/ParagraphExtra.C:201 +#: src/ParagraphExtra.C:213 msgid "ParagraphExtra layout set" msgstr "Ekstra Avsnittsinnstillinger satt" -#: src/ParagraphExtra.C:307 +#: src/ParagraphExtra.C:319 msgid "Warning: Invalid percent value (0-100)" msgstr "Advarsel: Ugyldig prosent verdi (0-100)" @@ -4723,48 +4747,48 @@ msgstr "100 %" msgid "Replace word|#R" msgstr "Erstatt ord?" -#: src/support/filetools.C:165 src/support/filetools.C:174 -#: src/support/filetools.C:181 +#: src/support/filetools.C:178 src/support/filetools.C:187 +#: src/support/filetools.C:194 msgid "LyX Internal Error!" msgstr "LyX intern feil!" -#: src/support/filetools.C:166 +#: src/support/filetools.C:179 msgid "Could not test if directory is writeable" msgstr "Kunne ikke avgjøre om foldern er skrivebeskyttet" -#: src/support/filetools.C:175 +#: src/support/filetools.C:188 msgid "Cannot open directory test file" msgstr "Kan ikke åpne folder testfil" -#: src/support/filetools.C:182 +#: src/support/filetools.C:195 msgid "Created test file but cannot remove it?" msgstr "Laget testfil, men kan ikke fjerne den?" -#: src/support/filetools.C:349 +#: src/support/filetools.C:360 msgid "Error! Cannot open directory:" msgstr "Feil! Kan ikke åpne folder:" -#: src/support/filetools.C:361 +#: src/support/filetools.C:373 msgid "Error! Could not remove file:" msgstr "Feil: Klarte ikke å fjerne fil:" -#: src/support/filetools.C:375 +#: src/support/filetools.C:387 msgid "Error! Couldn't create temporary directory:" msgstr "Feil: Klarte ikke å lage temporær folder:" -#: src/support/filetools.C:391 +#: src/support/filetools.C:403 msgid "Error! Couldn't delete temporary directory:" msgstr "Feil: Klarte ikke å slette temporær folder:" -#: src/support/filetools.C:446 +#: src/support/filetools.C:456 msgid "Internal error!" msgstr "Intern feil!" -#: src/support/filetools.C:447 +#: src/support/filetools.C:457 msgid "Call to createDirectory with invalid name" msgstr "Kall til createDirectory men ugyldig navn" -#: src/support/filetools.C:452 +#: src/support/filetools.C:462 msgid "Error! Couldn't create directory:" msgstr "Feil! Kunne ikke lage folder:" @@ -4780,19 +4804,19 @@ msgstr "Feil: Kunne ikke bytte til folde: " msgid "Error: Dir already popped: " msgstr "Feil: Området er allerede poppet: " -#: src/TableLayout.C:232 +#: src/TableLayout.C:416 msgid "Table Extra Form" msgstr "Ekstra tabell skjema" -#: src/TableLayout.C:252 +#: src/TableLayout.C:436 msgid "Table Layout" msgstr "Tabell stil" -#: src/TableLayout.C:280 +#: src/TableLayout.C:460 src/TableLayout.C:479 msgid "Warning: Wrong Cursor position, updated window" msgstr "Advarsel: Feil markør posisjon, oppdaterte vindu" -#: src/TableLayout.C:335 +#: src/TableLayout.C:535 msgid "Confirm: press Delete-Button again" msgstr "Bekreft: trykk sletteknapp igjen" @@ -4853,11 +4877,11 @@ msgstr "Multikolonner kan bare v #. * we need to rebreak perhaps. If there is a protected #. * blank at the end of a row we have to force #. * a rebreak. -#: src/text.C:2249 src/text.C:2268 +#: src/text.C:2240 src/text.C:2259 msgid "You cannot type two spaces this way. Please read the Tutorial." msgstr "Det er ikke mulig e bruke to mellomrom pe denne meten. Les 'Tutorial.'" -#: src/text.C:2266 +#: src/text.C:2257 msgid "" "You cannot insert a space at the beginning of a paragraph. Please read the " "Tutorial." diff --git a/src/LString.h b/src/LString.h index bdb5512c01..f98bc7d9b5 100644 --- a/src/LString.h +++ b/src/LString.h @@ -4,8 +4,8 @@ * * LyX, The Document Processor * - * Copyright (C) 1995 Matthias Ettrich - * Copyright (C) 1995-1999 The LyX Team. + * Copyright 1995 Matthias Ettrich + * Copyright 1995-1999 The LyX Team. * * ====================================================== */ @@ -25,7 +25,7 @@ typedef lyxstring string; // __get_c_string() ourselves since SGI expects it to exist and block // their string declarations as best we can. ARRae. # define __SGI_STL_STRING_FWD_H -static const char* __get_c_string(const string&); +static char const * __get_c_string(string const &); #endif // HAVE_STL_STRING_FWD_H #endif #endif diff --git a/src/Literate.C b/src/Literate.C index 010dc0914d..f23042cdbc 100644 --- a/src/Literate.C +++ b/src/Literate.C @@ -70,7 +70,7 @@ int Literate::weave(TeXErrors & terr, MiniBuffer * minib) } -int Literate::build(TeXErrors & terr, MiniBuffer * minib) +int Literate::build(TeXErrors & /*terr*/, MiniBuffer * minib) // We know that this function will only be run if the lyx buffer // has been changed. { diff --git a/src/bmtable.C b/src/bmtable.C index 98438f3a4f..3491478962 100644 --- a/src/bmtable.C +++ b/src/bmtable.C @@ -260,7 +260,12 @@ void fl_set_bmtable_pixmap_data(FL_OBJECT * ob, int nx, int ny, sp->maxi = sp->nx * sp->ny; sp->bdata = 0; Pixmap dummy_shapemask = 0; - XpmAttributes dumb_attributes= {0}; +#if 0 + // I can't see why this initalization is needed. (Lgb) + XpmAttributes dumb_attributes = {0}; +#else + XpmAttributes dumb_attributes; +#endif dumb_attributes.colormap = color_map; dumb_attributes.closeness = 30000; dumb_attributes.valuemask = XpmColormap | XpmCloseness; @@ -324,7 +329,11 @@ void fl_set_bmtable_pixmap_file(FL_OBJECT *ob, int nx, int ny, char const *filen sp->bdata = 0; Pixmap dummy_shapemask = 0; - XpmAttributes dumb_attributes= {0}; +#if 0 + XpmAttributes dumb_attributes = {0}; +#else + XpmAttributes dumb_attributes; +#endif dumb_attributes.colormap = color_map; dumb_attributes.closeness = 30000; dumb_attributes.valuemask = XpmColormap | XpmCloseness; diff --git a/src/buffer.C b/src/buffer.C index e0c81f2b3c..76258303f8 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -1240,7 +1240,7 @@ bool Buffer::writeFile(string const & filename, bool flag) lyxerr << _("Error! Cannot open file: ") << filename << endl; else - WriteFSAlert(_("Error! Canno open file:"), + WriteFSAlert(_("Error! Cannot open file: "), filename); return false; } @@ -1611,7 +1611,7 @@ void Buffer::makeLaTeXFile(string const & filename, ofstream ofs(filename.c_str()); if (!ofs) { - WriteFSAlert(_("Error: Cannot open file:"), filename); + WriteFSAlert(_("Error: Cannot open file: "), filename); return; } @@ -2534,7 +2534,7 @@ void linux_doc_line_break(ostream & os, unsigned int & colcount, void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par, - int desc_on, int const depth) + int desc_on, int const /*depth*/) { LyXFont font1, font2; char c; diff --git a/src/debug.C b/src/debug.C index 3d4d54d382..4e34e35f3f 100644 --- a/src/debug.C +++ b/src/debug.C @@ -40,8 +40,10 @@ static error_item errorTags[] = { { Debug::ANY, "any", "All debugging messages"} }; + static const int numErrorTags = sizeof(errorTags)/sizeof(error_item); + Debug::type Debug::value(string const & val) { type l = Debug::NONE; @@ -56,7 +58,7 @@ Debug::type Debug::value(string const & val) l |= static_cast(strToInt(tmp)); else // Search for an explicit name - for (int i = 0 ; i Print each of the slots into buf. */ - for( ; (tabPt->code & 0xffff) != NoSymbol; tabPt++) { + for( ; (tabPt->code & 0xffff) != NoSymbol; ++tabPt) { if ( maxLen <= 0 ) break; ksym = tabPt->code; @@ -128,21 +125,21 @@ int printKeyTab( kb_key *tabPt, char *buf, int maxLen ) int kb_sequence::addkey(KeySym key, unsigned int mod, unsigned int nmod /*= 0*/) { - if(length<0) length = 0; + if(length < 0) length = 0; - if(length+1 >= size) { - unsigned int *nseq = new unsigned int[size+KB_PREALLOC]; + if(length + 1 >= size) { + unsigned int * nseq = new unsigned int[size+KB_PREALLOC]; size += KB_PREALLOC; - memcpy(nseq, sequence, length*sizeof(unsigned int)); + memcpy(nseq, sequence, length * sizeof(unsigned int)); if(sequence != staticseq) delete sequence; sequence = nseq; nseq = new unsigned int[size]; - memcpy(nseq, modifiers, length*sizeof(unsigned int)); + memcpy(nseq, modifiers, length * sizeof(unsigned int)); if(modifiers != staticmod) delete modifiers; modifiers = nseq; } - modifiers[length] = mod + (nmod<<16); + modifiers[length] = mod + (nmod << 16); sequence[length++] = key; if(curmap) @@ -163,7 +160,7 @@ int kb_sequence::addkey(KeySym key, unsigned int mod, unsigned int nmod /*= 0*/) Prefixes are S-, C-, M- for shift, control, meta \* ---F------------------------------------------------------------------- */ -int kb_sequence::parse(char const*s) +int kb_sequence::parse(char const * s) { int i = 0; unsigned int mod = 0, nmod = 0; @@ -173,7 +170,7 @@ int kb_sequence::parse(char const*s) if(!s[0]) return 1; while(s[i]) { - if(s[i] && (s[i]) <= ' ') i++; + if(s[i] && (s[i]) <= ' ') ++i; if(!s[i]) break; if(s[i+1] == '-') { // is implicit that s[i] == true @@ -212,7 +209,7 @@ int kb_sequence::parse(char const*s) } } else { int j = 0; - for(j = i; s[j] && (s[j])>' '; j++) + for(j = i; s[j] && (s[j])>' '; ++j) tbuf[j-i] = s[j]; // (!!!check bounds :-) tbuf[j-i] = '\0'; @@ -245,15 +242,15 @@ int kb_sequence::parse(char const*s) Returns : 0, if ok, -1 if string too long \* ---F------------------------------------------------------------------- */ -int kb_sequence::print(char *buf, int maxlen, bool when_defined) const +int kb_sequence::print(char * buf, int maxlen, bool when_defined) const { KeySym key; unsigned int mod; int len; int l = length; - if ( l<0 && !when_defined ) l = -l; + if ( l < 0 && !when_defined ) l = -l; - for(int i = 0; i < l; i++) { + for(int i = 0; i < l; ++i) { key = sequence[i]; mod = modifiers[i] & 0xffff; @@ -286,12 +283,10 @@ int kb_sequence::print(char *buf, int maxlen, bool when_defined) const Returns : 0, if ok, -1 if string too long \* ---F------------------------------------------------------------------- */ -int kb_sequence::printOptions(char *buf, int maxlen) const +int kb_sequence::printOptions(char * buf, int maxlen) const { - int len; - - print( buf, maxlen, true ); - len = strlen( buf ); + print(buf, maxlen, true); + int len = strlen(buf); maxlen -= len; buf += len; @@ -338,7 +333,7 @@ KeySym kb_sequence::getsym() { int l = length; if(l == 0) return NoSymbol; - if(l<0) l = -l; + if(l < 0) l = -l; return sequence[l-1]; } @@ -380,7 +375,7 @@ void kb_sequence::reset() // === kb_keymap methods ================================================== // This binds a key to an action -int kb_keymap::bind(char const *seq, int action) +int kb_keymap::bind(char const * seq, int action) { kb_sequence k; @@ -405,10 +400,10 @@ int kb_keymap::bind(char const *seq, int action) Returns : user defined action; 0 for prefix key, -1 if key not found \* ---F------------------------------------------------------------------- */ -int kb_keymap::lookup(KeySym key, unsigned int mod, kb_sequence *seq) +int kb_keymap::lookup(KeySym key, unsigned int mod, kb_sequence * seq) { unsigned int hashval, ksym, msk1, msk0; - kb_key *tab; + kb_key * tab; //suppress modifier bits we do not handle mod &= ModsMask; @@ -433,12 +428,12 @@ int kb_keymap::lookup(KeySym key, unsigned int mod, kb_sequence *seq) // --- now search the list of keys --- - for( ; (tab->code & 0xffff) != NoSymbol; tab++) { + for( ; (tab->code & 0xffff) != NoSymbol; ++tab) { ksym = tab->code; msk1 = tab->mod & 0xffff; - msk0 = (tab->mod>>16) & 0xffff; + msk0 = (tab->mod >> 16) & 0xffff; - if(ksym == key && (mod&~msk0) == msk1) { + if(ksym == key && (mod & ~msk0) == msk1) { // match found: if(tab->table) { // this is a prefix key - set new map @@ -469,10 +464,8 @@ int kb_keymap::lookup(KeySym key, unsigned int mod, kb_sequence *seq) Returns : updated maxLen. \* ---F------------------------------------------------------------------- */ -int kb_keymap::print(char *buf, int maxLen) const +int kb_keymap::print(char * buf, int maxLen) const { - int len; - /* -----> Return when running out of string space or when keymap has no table. Else, place a terminating newline in case no other output is generated. */ @@ -482,16 +475,16 @@ int kb_keymap::print(char *buf, int maxLen) const /* -------> Hash table. Process each of its slots recursively and return. */ if ( size < 0 ) { - for ( int ix = 0; (ix < KB_HASHSIZE) && (maxLen > 1); ix++ ) { + for ( int ix = 0; (ix < KB_HASHSIZE) && (maxLen > 1); ++ix ) { if ( htable[ix] ) { - len = printKeyTab( htable[ix], buf, maxLen ); + int len = printKeyTab( htable[ix], buf, maxLen ); maxLen -= len; buf += len; } } } else { /* -------> Normal table. */ - len = printKeyTab( table, buf, maxLen ); + int len = printKeyTab( table, buf, maxLen ); maxLen -= len; buf += len; } @@ -511,14 +504,11 @@ int kb_keymap::print(char *buf, int maxLen) const int kb_keymap::defkey(kb_sequence *seq, int action, int idx /*= 0*/) { - int tsize; - unsigned int code, modmsk; - kb_key *tab, **ptab; - - code = seq->sequence[idx]; - modmsk = seq->modifiers[idx]; + unsigned int code = seq->sequence[idx]; if(code == NoSymbol) return -1; + unsigned int modmsk = seq->modifiers[idx]; + kb_key *tab, **ptab; // --- get list------------------------------------------------------ if(!table) { // If we don't have any yet, make an empty one @@ -545,8 +535,9 @@ int kb_keymap::defkey(kb_sequence *seq, int action, int idx /*= 0*/) // --- check if key is already there -------------------------------- - kb_key *t; - for(t = tab, tsize = 1; t->code != NoSymbol; t++, tsize++) { + kb_key * t; + int tsize; + for(t = tab, tsize = 1; t->code != NoSymbol; ++t, ++tsize) { if(code == t->code && modmsk == t->mod) { // -- overwrite binding --- if(idx+1 == seq->length) { char buf[20]; buf[0] = 0; @@ -578,14 +569,14 @@ int kb_keymap::defkey(kb_sequence *seq, int action, int idx /*= 0*/) // --- extend list if necessary ------------------------------------- if(tsize % KB_PREALLOC == 0) { - kb_key *nt = new kb_key[tsize+KB_PREALLOC]; + kb_key * nt = new kb_key[tsize+KB_PREALLOC]; // Set to 0 as table is used uninitialised later (thornley) nt[tsize].table = 0; - memcpy(nt, tab, tsize*sizeof(kb_key)); + memcpy(nt, tab, tsize * sizeof(kb_key)); *ptab = nt; delete[] tab; tab = nt; - if(size>= 0) size = tsize+KB_PREALLOC; + if(size>= 0) size = tsize + KB_PREALLOC; } // --- add action --------------------------------------------------- @@ -593,24 +584,24 @@ int kb_keymap::defkey(kb_sequence *seq, int action, int idx /*= 0*/) tab[tsize--].code = NoSymbol; tab[tsize].code = code; tab[tsize].mod = modmsk; - kb_key *newone = &tab[tsize]; + kb_key * newone = &tab[tsize]; // --- convert list to hash table if necessary ---------------------- - if(size>= 0 && tsize>= 32) { - kb_key *oldtab = tab; - kb_key **nht = new kb_key*[KB_HASHSIZE]; - for(int i = 0; i < KB_HASHSIZE; i++) + if(size >= 0 && tsize >= 32) { + kb_key * oldtab = tab; + kb_key ** nht = new kb_key*[KB_HASHSIZE]; + for(int i = 0; i < KB_HASHSIZE; ++i) nht[i] = 0; htable = nht; size = -KB_HASHSIZE; // --- copy old keys to new hash table --- int hashval; - for(kb_key *tu = oldtab; tu->code != NoSymbol; tu++){ + for(kb_key * tu = oldtab; tu->code != NoSymbol; ++tu) { // copy values from oldtab to htable - hashval = (tu->code&0xffff); - hashval = ((hashval&0xff) ^ ((hashval>>8)&0xff)) % KB_HASHSIZE; + hashval = (tu->code & 0xffff); + hashval = ((hashval & 0xff) ^ ((hashval>>8) & 0xff)) % KB_HASHSIZE; tab = htable[hashval]; if(!tab){ @@ -618,12 +609,12 @@ int kb_keymap::defkey(kb_sequence *seq, int action, int idx /*= 0*/) tab->code = NoSymbol; } int ts = 1; - for(kb_key *tt = tab; tt->code != NoSymbol; tt++) - ts++; + for(kb_key * tt = tab; tt->code != NoSymbol; ++tt) + ++ts; if(ts % KB_PREALLOC == 0){ // extend table - kb_key *nt = new kb_key[ts+KB_PREALLOC]; - memcpy(nt, tab, ts*sizeof(kb_key)); + kb_key * nt = new kb_key[ts+KB_PREALLOC]; + memcpy(nt, tab, ts * sizeof(kb_key)); htable[hashval] = nt; delete[] tab; tab = nt; @@ -665,10 +656,11 @@ int kb_keymap::defkey(kb_sequence *seq, int action, int idx /*= 0*/) kb_keymap::~kb_keymap() { if(!table) return; - if(size<0) { - for(int i = 0; i < KB_HASHSIZE; i++) { + if(size < 0) { + for(int i = 0; i < KB_HASHSIZE; ++i) { if(htable[i]) { - for(kb_key *t = htable[i]; t->code != NoSymbol; t++) + for(kb_key * t = htable[i]; + t->code != NoSymbol; ++t) if(t->table) delete t->table; delete htable[i]; @@ -676,7 +668,7 @@ kb_keymap::~kb_keymap() } delete htable; } else { - for(kb_key *t = table; t->code != NoSymbol; t++) + for(kb_key * t = table; t->code != NoSymbol; ++t) if(t->table) delete t->table; delete table; @@ -695,10 +687,11 @@ string kb_keymap::findbinding(int act) const { if (!table) return res; - if (size<0) { - for(int i = 0; i < KB_HASHSIZE; i++) { + if (size < 0) { + for(int i = 0; i < KB_HASHSIZE; ++i) { if(htable[i]) { - for(kb_key *t = htable[i]; t->code != NoSymbol; t++) { + for(kb_key * t = htable[i]; + t->code != NoSymbol; ++t) { if(t->table) { string suffix = t->table->findbinding(act); suffix = strip(suffix, ' '); @@ -714,7 +707,7 @@ string kb_keymap::findbinding(int act) const { } } } else { - for(kb_key *t = table; t->code != NoSymbol; t++) { + for(kb_key * t = table; t->code != NoSymbol; ++t) { if(t->table) { string suffix = t->table->findbinding(act); suffix = strip(suffix, ' '); diff --git a/src/kbmap.h b/src/kbmap.h index 8f41d2484c..d61f539695 100644 --- a/src/kbmap.h +++ b/src/kbmap.h @@ -33,7 +33,7 @@ struct kb_key { unsigned int mod; /// Keymap for prefix keys - kb_keymap *table; + kb_keymap * table; /// Action for !prefix keys int action; @@ -54,19 +54,19 @@ public: /// Bind a key-sequence to an action /** Returns 0 on success. Otherwise, position in string where error occured. */ - int bind(char const* seq, int action); + int bind(char const * seq, int action); /// - int print(char* buf, int maxlen) const; + int print(char * buf, int maxlen) const; /// Look up a key in the keymap - int lookup(KeySym key, unsigned mod, kb_sequence *seq); + int lookup(KeySym key, unsigned mod, kb_sequence * seq); /// Given an action, find all keybindings. string findbinding(int action) const; private: /// Define a new key sequence - int defkey(kb_sequence *seq, int action, int idx = 0); + int defkey(kb_sequence * seq, int action, int idx = 0); /// Size of the table (<0: hashtab) int size; @@ -76,10 +76,10 @@ private: union { /// Table for linear array - kb_key *table; + kb_key * table; /// Hash table holding key lists - kb_key **htable; + kb_key ** htable; }; }; @@ -114,10 +114,10 @@ public: int addkey(KeySym key, unsigned mod, unsigned nmod = 0); /// - int print(char *buf, int maxlen, bool when_defined = false) const; //RVDK_PATCH_5 + int print(char * buf, int maxlen, bool when_defined = false) const; //RVDK_PATCH_5 /// - int printOptions(char *buf, int maxlen) const; + int printOptions(char * buf, int maxlen) const; /// Make length negative to mark the sequence as deleted void delseq(); @@ -132,20 +132,20 @@ public: void reset(); /// - int parse(char const *s); + int parse(char const * s); /// Keymap to use if a new sequence is starting - kb_keymap *stdmap; + kb_keymap * stdmap; /// Keymap to use for the next key - kb_keymap *curmap; + kb_keymap * curmap; /// Array holding the current key sequence /** If sequence[length-1] < 0xff it can be used as ISO8859 char */ - unsigned int *sequence; + unsigned int * sequence; /// - unsigned int *modifiers; + unsigned int * modifiers; /// Current length of key sequence int length; diff --git a/src/layout.C b/src/layout.C index 3952d4bb4c..7e32f86952 100644 --- a/src/layout.C +++ b/src/layout.C @@ -26,9 +26,11 @@ using std::sort; #include "gettext.h" #include "support/LAssert.h" + // Global variable: textclass table. LyXTextClassList textclasslist; + // Reads the style files void LyXSetStyle() { @@ -380,6 +382,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass) return error; } + enum AlignTags { AT_BLOCK = 1, AT_LEFT, @@ -388,6 +391,7 @@ enum AlignTags { AT_LAYOUT }; + static keyword_item alignTags[] = { { "block", AT_BLOCK }, { "center", AT_CENTER }, @@ -461,6 +465,7 @@ void LyXLayout::readAlignPossible(LyXLex & lexrc) lexrc.popTable(); } + enum LabelTypeTags { LA_NO_LABEL = 1, LA_MANUAL, @@ -481,6 +486,7 @@ enum LabelTypeTags { LA_BIBLIO }; + static keyword_item labelTypeTags[] = { { "bibliography", LA_BIBLIO }, { "centered_top_environment", LA_CENTERED_TOP_ENVIRONMENT }, @@ -501,6 +507,7 @@ static keyword_item labelTypeTags[] = { { "top_environment", LA_TOP_ENVIRONMENT } }; + void LyXLayout::readLabelType(LyXLex & lexrc) { pushpophelper pph(lexrc, labelTypeTags, LA_BIBLIO); @@ -566,6 +573,7 @@ void LyXLayout::readLabelType(LyXLex & lexrc) } } + enum MarginTags { MT_STATIC = 1, MT_MANUAL, @@ -574,6 +582,7 @@ enum MarginTags { MT_RIGHT_ADDRESS_BOX }; + static keyword_item marginTags[] = { { "dynamic", MT_DYNAMIC }, { "first_dynamic", MT_FIRST_DYNAMIC }, @@ -582,6 +591,7 @@ static keyword_item marginTags[] = { { "static", MT_STATIC } }; + void LyXLayout::readMargin(LyXLex & lexrc) { pushpophelper pph(lexrc, marginTags, MT_RIGHT_ADDRESS_BOX); @@ -611,6 +621,7 @@ void LyXLayout::readMargin(LyXLex & lexrc) } } + enum LatexTypeTags { LX_PARAGRAPH = 1, LX_COMMAND, @@ -619,6 +630,7 @@ enum LatexTypeTags { LX_LIST_ENVIRONMENT }; + static keyword_item latexTypeTags[] = { { "command", LX_COMMAND }, { "environment", LX_ENVIRONMENT }, @@ -627,6 +639,7 @@ static keyword_item latexTypeTags[] = { { "paragraph", LX_PARAGRAPH } }; + void LyXLayout::readLatexType(LyXLex & lexrc) { pushpophelper pph(lexrc, latexTypeTags, LX_LIST_ENVIRONMENT); @@ -656,6 +669,7 @@ void LyXLayout::readLatexType(LyXLex & lexrc) } } + enum SpacingTags { ST_SPACING_SINGLE = 1, ST_SPACING_ONEHALF, @@ -663,6 +677,7 @@ enum SpacingTags { ST_OTHER }; + static keyword_item spacingTags[] = { {"double", ST_SPACING_DOUBLE }, {"onehalf", ST_SPACING_ONEHALF }, @@ -670,6 +685,7 @@ static keyword_item spacingTags[] = { {"single", ST_SPACING_SINGLE } }; + void LyXLayout::readSpacing(LyXLex & lexrc) { pushpophelper pph(lexrc, spacingTags, ST_OTHER); @@ -697,6 +713,7 @@ void LyXLayout::readSpacing(LyXLex & lexrc) } } + /* ******************************************************************* */ LyXTextClass::LyXTextClass(string const & fn, string const & cln, @@ -755,6 +772,7 @@ enum TextClassTags { TC_RIGHTMARGIN }; + static keyword_item textClassTags[] = { { "classoptions", TC_CLASSOPTIONS }, { "columns", TC_COLUMNS }, @@ -776,6 +794,7 @@ static keyword_item textClassTags[] = { { "tocdepth", TC_TOCDEPTH } }; + // Reads a textclass structure from file. bool LyXTextClass::Read(string const & filename, bool merge) { @@ -952,6 +971,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) return error; } + enum OutputTypeTags { OT_OTLATEX = 1, OT_OTLINUXDOC, @@ -959,6 +979,7 @@ enum OutputTypeTags { OT_OTLITERATE }; + static keyword_item outputTypeTags[] = { { "docbook", OT_OTDOCBOOK }, { "latex", OT_OTLATEX }, @@ -966,6 +987,7 @@ static keyword_item outputTypeTags[] = { { "literate", OT_OTLITERATE } }; + void LyXTextClass::readOutputType(LyXLex & lexrc) { pushpophelper pph(lexrc, outputTypeTags, OT_OTLITERATE); @@ -992,6 +1014,7 @@ void LyXTextClass::readOutputType(LyXLex & lexrc) } } + enum MaxCounterTags { MC_COUNTER_CHAPTER = 1, MC_COUNTER_SECTION, @@ -1005,6 +1028,7 @@ enum MaxCounterTags { MC_COUNTER_ENUMIV }; + static keyword_item maxCounterTags[] = { {"counter_chapter", MC_COUNTER_CHAPTER }, {"counter_enumi", MC_COUNTER_ENUMI }, @@ -1018,6 +1042,7 @@ static keyword_item maxCounterTags[] = { {"counter_subsubsection", MC_COUNTER_SUBSUBSECTION } }; + void LyXTextClass::readMaxCounter(LyXLex & lexrc) { pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV); @@ -1062,6 +1087,7 @@ void LyXTextClass::readMaxCounter(LyXLex & lexrc) } } + enum ClassOptionsTags { CO_FONTSIZE = 1, CO_PAGESTYLE, @@ -1069,6 +1095,7 @@ enum ClassOptionsTags { CO_END }; + static keyword_item classOptionsTags[] = { {"end", CO_END }, {"fontsize", CO_FONTSIZE }, @@ -1076,6 +1103,7 @@ static keyword_item classOptionsTags[] = { {"pagestyle", CO_PAGESTYLE } }; + void LyXTextClass::readClassOptions(LyXLex & lexrc) { lexrc.pushTable(classOptionsTags, CO_END); diff --git a/src/lyx_gui.C b/src/lyx_gui.C index 80cde4bacb..1cd33780bf 100644 --- a/src/lyx_gui.C +++ b/src/lyx_gui.C @@ -121,13 +121,13 @@ char selection_color[32]; FL_resource res[] = { - {"width", "widthClass", FL_INT, &width, "690"}, - {"height", "heightClass", FL_INT, &height, "510"}, - {"xpos", "xposClass", FL_INT, &xpos, "-1"}, - {"ypos", "yposClass", FL_INT, &ypos, "-1"}, - {"Reverse", "reverseClass", FL_INT, &reverse_video, "0"}, - {"Mono", "monoClass", FL_INT, &mono_video, "0"}, - {"FastSelection", "selectionClass", FL_INT, &fast_selection, "0"}, + {"width", "widthClass", FL_INT, &width, "690", 0}, + {"height", "heightClass", FL_INT, &height, "510", 0}, + {"xpos", "xposClass", FL_INT, &xpos, "-1", 0}, + {"ypos", "yposClass", FL_INT, &ypos, "-1", 0}, + {"Reverse", "reverseClass", FL_INT, &reverse_video, "0", 0}, + {"Mono", "monoClass", FL_INT, &mono_video, "0", 0}, + {"FastSelection", "selectionClass", FL_INT, &fast_selection, "0", 0}, {"MathColor", "colorClass", FL_STRING, math_color, "blue", 31}, {"MathFrameColor", "colorClass", FL_STRING, math_frame_color, "magenta", 31}, {"FootColor", "colorClass", FL_STRING, foot_color, "red", 31}, diff --git a/src/mathed/math_hash.C b/src/mathed/math_hash.C index 9692a6bd6b..19ff2b7a62 100644 --- a/src/mathed/math_hash.C +++ b/src/mathed/math_hash.C @@ -38,23 +38,23 @@ math_hash (register char const *str, register int len) return len + asso_values[str[len - 1]] + asso_values[str[0]]; } -static struct latexkeys wordlist[] = +static latexkeys wordlist[] = { - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",0,0}, {"",0,0}, {"",0,0}, {"",0,0}, {"",0,0}, {"",0,0}, {"",0,0}, {"",0,0}, {"setminus", LM_TK_SYM, LM_setminus}, {"ldots", LM_TK_DOTS, LM_ldots}, {"limits", LM_TK_LIMIT, 1 }, - {"stackrel", LM_TK_STACK}, + {"stackrel", LM_TK_STACK, 0}, {"ll", LM_TK_SYM, LM_ll}, - {"label", LM_TK_LABEL}, + {"label", LM_TK_LABEL, 0}, {"lceil", LM_TK_SYM, LM_lceil}, - {"sqrt", LM_TK_SQRT}, + {"sqrt", LM_TK_SQRT, 0}, {"times", LM_TK_SYM, LM_times}, {"subset", LM_TK_SYM, LM_subset}, {"supset", LM_TK_SYM, LM_supset}, {"spadesuit", LM_TK_SYM, LM_spadesuit}, {"Re", LM_TK_SYM, LM_Re}, - {"left", LM_TK_LEFT}, + {"left", LM_TK_LEFT, 0}, {"smile", LM_TK_SYM, LM_smile}, {"exists", LM_TK_SYM, LM_exists}, {"Vert", LM_TK_SYM, LM_Vert}, @@ -65,8 +65,8 @@ static struct latexkeys wordlist[] = {"scriptscriptstyle", LM_TK_STY, LM_ST_SCRIPTSCRIPT}, {"zeta", LM_TK_SYM, LM_zeta}, {"sigma", LM_TK_SYM, LM_sigma}, - {"arccos", LM_TK_FUNC}, - {"sup", LM_TK_FUNCLIM}, + {"arccos", LM_TK_FUNC, 0}, + {"sup", LM_TK_FUNCLIM, 0}, {"sharp", LM_TK_SYM, LM_sharp}, {"sqcup", LM_TK_SYM, LM_sqcup}, {"sqcap", LM_TK_SYM, LM_sqcap}, @@ -79,7 +79,7 @@ static struct latexkeys wordlist[] = {"triangle", LM_TK_SYM, LM_triangle}, {"textstyle", LM_TK_STY, LM_ST_TEXT}, {"tau", LM_TK_SYM, LM_tau}, - {"limsup", LM_TK_FUNCLIM}, + {"limsup", LM_TK_FUNCLIM, 0}, {"partial", LM_TK_SYM, LM_partial}, {"parallel", LM_TK_SYM, LM_parallel}, {"infty", LM_TK_SYM, LM_infty}, @@ -97,7 +97,7 @@ static struct latexkeys wordlist[] = {"eta", LM_TK_SYM, LM_eta}, {"acute", LM_TK_ACCENT, LM_acute}, {"angle", LM_TK_SYM, LM_angle}, - {"exp", LM_TK_FUNC}, + {"exp", LM_TK_FUNC, 0}, {"leftarrow", LM_TK_SYM, LM_leftarrow}, {"prime", LM_TK_SYM, LM_prime}, {"int", LM_TK_BIGSYM, LM_int}, @@ -111,12 +111,12 @@ static struct latexkeys wordlist[] = {"longleftrightarrow", LM_TK_SYM, LM_longleftrightarrow}, {"alpha", LM_TK_SYM, LM_alpha}, {"widehat", LM_TK_WIDE, LM_widehat}, - {"sin", LM_TK_FUNC}, + {"sin", LM_TK_FUNC, 0}, {"asymp", LM_TK_SYM, LM_asymp}, {"nolimits", LM_TK_LIMIT, 0 }, {"perp", LM_TK_MACRO, LM_perp}, {"wedge", LM_TK_SYM, LM_wedge}, - {"ln", LM_TK_FUNC}, + {"ln", LM_TK_FUNC, 0}, {"widetilde", LM_TK_WIDE, LM_widetilde}, {"Omega", LM_TK_SYM, LM_Omega}, {"natural", LM_TK_SYM, LM_natural}, @@ -131,33 +131,33 @@ static struct latexkeys wordlist[] = {"leftharpoondown", LM_TK_SYM, LM_leftharpoondown}, {"wp", LM_TK_SYM, LM_wp}, {"not", LM_TK_ACCENT, LM_not}, - {"tan", LM_TK_FUNC}, + {"tan", LM_TK_FUNC, 0}, {"Theta", LM_TK_SYM, LM_Theta}, {"rceil", LM_TK_SYM, LM_rceil}, {"lfloor", LM_TK_SYM, LM_lfloor}, {"rightleftharpoons", LM_TK_SYM, LM_rightleftharpoons}, - {"cos", LM_TK_FUNC}, - {"sec", LM_TK_FUNC}, + {"cos", LM_TK_FUNC, 0}, + {"sec", LM_TK_FUNC, 0}, {"succ", LM_TK_SYM, LM_succ}, {"cdots", LM_TK_DOTS, LM_cdots}, {"epsilon", LM_TK_SYM, LM_epsilon}, - {"ker", LM_TK_FUNC}, + {"ker", LM_TK_FUNC, 0}, {"nu", LM_TK_SYM, LM_nu}, {"Delta", LM_TK_SYM, LM_Delta}, {"forall", LM_TK_SYM, LM_forall}, - {"liminf", LM_TK_FUNCLIM}, + {"liminf", LM_TK_FUNCLIM, 0}, {"Uparrow", LM_TK_SYM, LM_Uparrow}, {"upsilon", LM_TK_SYM, LM_upsilon}, - {"right", LM_TK_RIGHT}, + {"right", LM_TK_RIGHT, 0}, {"Updownarrow", LM_TK_SYM, LM_Updownarrow}, - {"Pr", LM_TK_FUNCLIM}, + {"Pr", LM_TK_FUNCLIM, 0}, {"nabla", LM_TK_SYM, LM_nabla}, - {"arcsin", LM_TK_FUNC}, - {"arctan", LM_TK_FUNC}, + {"arcsin", LM_TK_FUNC, 0}, + {"arctan", LM_TK_FUNC, 0}, {"flat", LM_TK_SYM, LM_flat}, {"check", LM_TK_ACCENT, LM_check}, {"rangle", LM_TK_SYM, LM_rangle}, - {"cot", LM_TK_FUNC}, + {"cot", LM_TK_FUNC, 0}, {"cdot", LM_TK_SYM, LM_cdot}, {"clubsuit", LM_TK_SYM, LM_clubsuit}, {"in", LM_TK_SYM, LM_in}, @@ -169,9 +169,9 @@ static struct latexkeys wordlist[] = {"models", LM_TK_SYM, LM_models}, {"nearrow", LM_TK_SYM, LM_nearrow}, {"nwarrow", LM_TK_SYM, LM_nwarrow}, - {"max", LM_TK_FUNCLIM}, + {"max", LM_TK_FUNCLIM, 0}, {"Im", LM_TK_SYM, LM_Im}, - {"lim", LM_TK_FUNCLIM}, + {"lim", LM_TK_FUNCLIM, 0}, {"rightharpoonup", LM_TK_SYM, LM_rightharpoonup}, {"mathcal", LM_TK_FONT, LM_TC_CAL}, {"cap", LM_TK_SYM, LM_cap}, @@ -179,7 +179,7 @@ static struct latexkeys wordlist[] = {"prec", LM_TK_SYM, LM_prec}, {"mathnormal", LM_TK_FONT, LM_TC_NORMAL}, {"wr", LM_TK_SYM, LM_wr}, - {"inf", LM_TK_FUNCLIM}, + {"inf", LM_TK_FUNCLIM, 0}, {"bigoplus", LM_TK_BIGSYM, LM_oplus}, {"biguplus", LM_TK_BIGSYM, LM_biguplus}, {"bigotimes", LM_TK_BIGSYM, LM_otimes}, @@ -202,31 +202,31 @@ static struct latexkeys wordlist[] = {"bot", LM_TK_SYM, LM_bot}, {"bullet", LM_TK_SYM, LM_bullet}, {"bigodot", LM_TK_BIGSYM, LM_bigodot}, - {"sinh", LM_TK_FUNC}, + {"sinh", LM_TK_FUNC, 0}, {"jmath", LM_TK_SYM, LM_jmath}, {"mp", LM_TK_SYM, LM_mp}, {"pm", LM_TK_SYM, LM_pm}, - {"nonumber", LM_TK_NONUM}, + {"nonumber", LM_TK_NONUM, 0}, {"breve", LM_TK_ACCENT, LM_breve}, {"bigvee", LM_TK_BIGSYM, LM_vee}, {"bowtie", LM_TK_SYM, LM_bowtie}, {"bigwedge", LM_TK_BIGSYM, LM_wedge}, {"frown", LM_TK_SYM, LM_frown}, {"rightharpoondown", LM_TK_SYM, LM_rightharpoondown}, - {"det", LM_TK_FUNCLIM}, + {"det", LM_TK_FUNCLIM, 0}, {"dot", LM_TK_ACCENT, LM_dot}, {"ddot", LM_TK_ACCENT, LM_ddot}, - {"lg", LM_TK_FUNC}, - {"log", LM_TK_FUNC}, + {"lg", LM_TK_FUNC, 0}, + {"log", LM_TK_FUNC, 0}, {"oplus", LM_TK_SYM, LM_oplus}, {"ominus", LM_TK_SYM, LM_ominus}, {"otimes", LM_TK_SYM, LM_otimes}, {"beta", LM_TK_SYM, LM_beta}, {"diamondsuit", LM_TK_SYM, LM_diamondsuit}, {"rfloor", LM_TK_SYM, LM_rfloor}, - {"end", LM_TK_END}, + {"end", LM_TK_END, 0}, {"hat", LM_TK_ACCENT, LM_hat}, - {"tanh", LM_TK_FUNC}, + {"tanh", LM_TK_FUNC, 0}, {"vdots", LM_TK_DOTS, LM_vdots}, {"bigcap", LM_TK_BIGSYM, LM_cap}, {"bigcup", LM_TK_BIGSYM, LM_cup}, @@ -240,15 +240,15 @@ static struct latexkeys wordlist[] = {"odot", LM_TK_SYM, LM_odot}, {"oint", LM_TK_BIGSYM, LM_oint}, {"grave", LM_TK_ACCENT, LM_grave}, - {"pmod", LM_TK_PMOD}, + {"pmod", LM_TK_PMOD, 0}, {"prod", LM_TK_BIGSYM, LM_prod}, - {"frac", LM_TK_FRAC}, - {"csc", LM_TK_FUNC}, + {"frac", LM_TK_FRAC, 0}, + {"csc", LM_TK_FUNC, 0}, {"circ", LM_TK_SYM, LM_circ}, {"aleph", LM_TK_SYM, LM_aleph}, - {"min", LM_TK_FUNCLIM}, + {"min", LM_TK_FUNCLIM, 0}, {"overline", LM_TK_WIDE, LM_overline}, - {"arg", LM_TK_FUNC}, + {"arg", LM_TK_FUNC, 0}, {"overbrace", LM_TK_WIDE, LM_overbrace}, {"amalg", LM_TK_SYM, LM_amalg}, {"gamma", LM_TK_SYM, LM_gamma}, @@ -258,7 +258,7 @@ static struct latexkeys wordlist[] = {"downarrow", LM_TK_SYM, LM_downarrow}, {"imath", LM_TK_SYM, LM_imath}, {"propto", LM_TK_SYM, LM_propto}, - {"begin", LM_TK_BEGIN}, + {"begin", LM_TK_BEGIN, 0}, {"Lambda", LM_TK_SYM, LM_Lambda}, {"varsigma", LM_TK_SYM, LM_varsigma}, {"vartheta", LM_TK_SYM, LM_vartheta}, @@ -271,7 +271,7 @@ static struct latexkeys wordlist[] = {"bar", LM_TK_ACCENT, LM_bar}, {"varpi", LM_TK_SYM, LM_varpi}, {"varphi", LM_TK_SYM, LM_varphi}, - {"newcommand", LM_TK_NEWCOMMAND }, + {"newcommand", LM_TK_NEWCOMMAND, 0 }, {"overleftarrow", LM_TK_WIDE, LM_overleftarrow}, {"overrightarrow", LM_TK_WIDE, LM_overightarrow}, {"Leftarrow", LM_TK_SYM, LM_Leftarrow}, @@ -287,15 +287,15 @@ static struct latexkeys wordlist[] = {"coprod", LM_TK_BIGSYM, LM_coprod}, {"mathrm", LM_TK_FONT, LM_TC_RM}, {"varepsilon", LM_TK_SYM, LM_varepsilon}, - {"cosh", LM_TK_FUNC}, - {"coth", LM_TK_FUNC}, + {"cosh", LM_TK_FUNC, 0}, + {"coth", LM_TK_FUNC, 0}, {"rho", LM_TK_SYM, LM_rho}, {"cong", LM_TK_SYM, LM_cong}, {"vec", LM_TK_ACCENT, LM_vec}, - {"dim", LM_TK_FUNC}, + {"dim", LM_TK_FUNC, 0}, {"mid", LM_TK_SYM, LM_mid}, - {"hom", LM_TK_FUNC}, - {"bmod", LM_TK_FUNC}, + {"hom", LM_TK_FUNC, 0}, + {"bmod", LM_TK_FUNC, 0}, {"quad", LM_TK_SPACE, LM_quad}, {"doteq", LM_TK_SYM, LM_doteq}, {"qquad", LM_TK_SPACE, LM_qquad}, @@ -303,8 +303,8 @@ static struct latexkeys wordlist[] = {"backslash", LM_TK_SYM, LM_backslash}, {"diamond", LM_TK_SYM, LM_diamond}, {"geq", LM_TK_SYM, LM_geq}, - {"deg", LM_TK_FUNC}, - {"gcd", LM_TK_FUNCLIM}, + {"deg", LM_TK_FUNC, 0}, + {"gcd", LM_TK_FUNCLIM, 0}, {"gg", LM_TK_SYM, LM_gg}, {"div", LM_TK_SYM, LM_div}, {"dashv", LM_TK_SYM, LM_dashv}, diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h index a3131f8888..913aad0212 100644 --- a/src/mathed/math_parser.h +++ b/src/mathed/math_parser.h @@ -67,17 +67,21 @@ enum MathTokenEnum }; /// -struct latexkeys { char const * name; short token; int id; }; +struct latexkeys { + char const * name; + short token; + int id; +}; /// -struct latexkeys * +latexkeys * in_word_set (register char const * str, register int len); /// -struct latexkeys * lm_get_key(int index); +latexkeys * lm_get_key(int index); /// -struct latexkeys * lm_get_key_by_id(int id, short tc = LM_TK_SYM); +latexkeys * lm_get_key_by_id(int id, short tc = LM_TK_SYM); /// typedef union{ diff --git a/src/support/lyxstring.C b/src/support/lyxstring.C index 47f3e8d587..022e7f58eb 100644 --- a/src/support/lyxstring.C +++ b/src/support/lyxstring.C @@ -16,7 +16,8 @@ #pragma implementation "lyxstring.h" #endif -#include "LString.h" +//#include "LString.h" +#include "lyxstring.h" #include #include #include @@ -59,6 +60,27 @@ using std::min; // Lgb. + +#if 0 +// I have no clue why this function is needed at all, it is static and +// confined to this filescope. How can any other file/fuction/module +// get access to it at all?? Perhaps the forward declaration in LString.h +// is enough. ARRae, any clues? Lgb. + +#ifdef HAVE_STL_STRING_FWD_H +// SGI's STL > 3.13 expects string to provide __get_c_string. +// Due to a clash with SGI's forward declaration of string we have +// to provide this ourselves and block their string declarations +// as best we can. ARRae. + +static char const * __get_c_string(string const & s) +{ + return s.c_str(); +} +#endif +#endif + + /////////////////////////////////////// // The internal string representation /////////////////////////////////////// @@ -1445,19 +1467,6 @@ lyxstring::size_type lyxstring::copy(value_type * buf, size_type len, } -#ifdef HAVE_STL_STRING_FWD_H -// SGI's STL > 3.13 expects string to provide __get_c_string. -// Due to a clash with SGI's forward declaration of string we have -// to provide this ourselves and block their string declarations -// as best we can. ARRae. - -static const char* __get_c_string(const string & s) -{ - return s.c_str(); -} -#endif - - //////////////////// // Comparisons //////////////////// diff --git a/src/support/syscall.C b/src/support/syscall.C index 2ea868f73d..f9264cd96f 100644 --- a/src/support/syscall.C +++ b/src/support/syscall.C @@ -73,7 +73,7 @@ int Systemcalls::startscript() { return retval; } -void Systemcalls::kill(int tolerance) { +void Systemcalls::kill(int /*tolerance*/) { if (getpid() == 0) { lyxerr << "LyX: Can't kill non-existing process." << endl; return; diff --git a/src/trans.C b/src/trans.C index f543bbd2e6..b738b63e9e 100644 --- a/src/trans.C +++ b/src/trans.C @@ -162,7 +162,7 @@ void Trans::AddDeadkey(tex_accent accent, string const & keys, for(string::size_type i = 0; i < keys.length(); ++i) { char * temp = - keymap_[static_cast(keys[i])] = + keymap_[static_cast(keys[i])] = new char[2]; temp[0] = 0; temp[1] = accent; } @@ -347,7 +347,7 @@ string Trans::process(char c, TransManager & k) { char dummy[2] = "?"; char * dt = dummy; - char * t = Match(c); + char * t = Match(static_cast(c)); if ((t == 0 && (*dt = c)) || (t[0] != 0 && (dt = t)) ){ return k.normalkey(c, dt); diff --git a/src/trans.h b/src/trans.h index 917260d6ce..3c7628bd71 100644 --- a/src/trans.h +++ b/src/trans.h @@ -77,7 +77,7 @@ private: /// int Load(LyXLex &); /// - inline char * Match(unsigned int c); + inline char * Match(unsigned char c); /// void InsertException(keyexc & exclist, char c, string const & data, bool = false, @@ -95,7 +95,7 @@ private: }; -char * Trans::Match(unsigned int c) +char * Trans::Match(unsigned char c) { return keymap_[c]; } -- 2.39.5