diff --git a/lib/ChangeLog b/lib/ChangeLog index 5fbf3f6493..c1a8dae8c3 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2002-10-29 Dekel Tsur + + * configure.m4: Use -dCompatibilityLevel=1.3 with ps2pdf + Add a check for kdeprintfax. + 2002-10-24 Dekel Tsur * layouts/llncs.layout: Fix the Bibliography layout diff --git a/lib/configure.m4 b/lib/configure.m4 index df88fd48f1..d73854788b 100644 --- a/lib/configure.m4 +++ b/lib/configure.m4 @@ -257,7 +257,7 @@ SEARCH_PROG([for a HTML previewer],HTML_VIEWER, netscape) # Search for a program to convert ps to pdf SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command,ps2pdf) -test $ps_to_pdf_command = "ps2pdf" && ps_to_pdf_command="ps2pdf \$\$i" +test $ps_to_pdf_command = "ps2pdf" && ps_to_pdf_command="ps2pdf -dCompatibilityLevel=1.3 \$\$i" # Search for a program to convert dvi to ps SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command,dvips) @@ -292,7 +292,8 @@ dnl fax_command="none" dnl fi # Search a GUI Fax program -SEARCH_PROG([for a fax program], fax_command, ksendfax) +SEARCH_PROG([for a fax program], fax_command, kdeprintfax ksendfax) +test $fax_command = "kdeprintfax" && fax_command="kdeprintfax \$\$i" test $fax_command = "ksendfax" && fax_command="ksendfax \$\$i" # Search for LinuxDoc support diff --git a/po/ChangeLog b/po/ChangeLog index fbac4cb13f..a7ce7c9af2 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2002-11-04 Jean-Marc Lasgouttes + + * de.po: update from Michael Scmitt + 2002-10-07 Adrien Rebollo * fr.po: update diff --git a/po/de.po b/po/de.po index 042ed9af28..d2f3f7c549 100644 --- a/po/de.po +++ b/po/de.po @@ -729,7 +729,7 @@ msgstr "Meldungen von Tabellen/Insettext" #: src/debug.C:58 msgid "Graphics conversion and loading" -msgstr "Laden und Umwandlung von Abbildungen" +msgstr "Laden und Umwandeln einer Grafik" #: src/debug.C:59 msgid "All debugging messages" @@ -1659,7 +1659,7 @@ msgstr "LaTeX Information" #: src/frontends/qt2/QGraphics.C:46 src/frontends/xforms/FormGraphics.C:56 msgid "Graphics" -msgstr "Abbildungen" +msgstr "Grafik" #: src/frontends/qt2/QInclude.C:30 src/insets/insetinclude.C:175 msgid "Include" @@ -3539,7 +3539,7 @@ msgstr "in Farbe|#F" #: src/frontends/xforms/form_preferences.C:521 msgid "Display Graphics" -msgstr "Abbildungen" +msgstr "Grafik anzeigen" #: src/frontends/xforms/form_preferences.C:547 msgid "Spell command|#S" @@ -4909,7 +4909,7 @@ msgstr "kann nicht in das Tempor #. at least we send the filename #: src/insets/insetgraphics.C:809 msgid "Graphic file:" -msgstr "Graphik Datei:" +msgstr "Grafikdatei:" #: src/insets/insetinclude.C:172 msgid "Input" @@ -5165,7 +5165,7 @@ msgstr "Mathematik (Hintergrund)" #: src/LColor.C:75 msgid "graphics background" -msgstr "Abbildungen (Hintergrund)" +msgstr "Grafik (Hintergrund)" #: src/LColor.C:76 msgid "Math macro background" @@ -5417,7 +5417,7 @@ msgstr "Neue Externe Einf #: src/LyXAction.C:198 msgid "Insert Graphics" -msgstr "Abbildung einfügen" +msgstr "Grafik einfügen" #: src/LyXAction.C:200 msgid "Insert ASCII files as lines" @@ -6642,7 +6642,7 @@ msgstr "" #: src/lyxrc.C:1920 msgid "Select how LyX will display any graphics." -msgstr "Legt fest wie LyX Abbildungen darstellt." +msgstr "Legt fest, wie LyX Grafiken darstellt." #: src/lyxrc.C:1924 msgid "" @@ -7429,7 +7429,7 @@ msgstr "Minipage|p" #: src/ext_l10n.h:111 msgid "Graphics...|G" -msgstr "Abbildungen...|A" +msgstr "Grafik...|G" #: src/ext_l10n.h:112 msgid "Tabular Material...|b" diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 06708e83cf..bbffab1934 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,8 @@ +2002-10-31 Jean-Marc Lasgouttes + + * math_hullinset.C (write): never output \label{} and \nonumber at + the same time + 2002-10-29 André Pönitz * math_arrayinset.C (write): Do not write \n at the end of an array diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C index 0f69d4683e..561768dead 100644 --- a/src/mathed/math_hullinset.C +++ b/src/mathed/math_hullinset.C @@ -712,7 +712,7 @@ void MathHullInset::write(WriteStream & os) const for (col_type col = 0; col < ncols(); ++col) os << cell(index(row, col)) << eocString(col); if (n) { - if (!label_[row].empty()) + if (!label_[row].empty() && !nonum_[row]) os << "\\label{" << label_[row] << "}"; if (nonum_[row]) os << "\\nonumber "; diff --git a/status.12x b/status.12x index ee9bf1f3d0..aabe29c274 100644 --- a/status.12x +++ b/status.12x @@ -65,6 +65,8 @@ What's new - fix bad latex output with math array environment included in an eqnarray environment +- do not output labels in latex when numbering is off + - harmonize the behavior of delete and backspace in main text, insettext, and tabulars, i.e. don't put stuff into the clipboard