From 8efc63752d27719a28437e04a584eeee81c5a143 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sun, 21 Sep 2008 21:09:38 +0000 Subject: [PATCH] - Math.lyx: - update math bold description to the new shortcuts - new section about colored formulas - menus.bind: update shortcut Alt-c b according to the discussed new handling git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26482 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/bind/de/menus.bind | 38 +++++------ lib/bind/fi/menus.bind | 22 +++---- lib/bind/menus.bind | 2 +- lib/bind/pt/menus.bind | 24 +++---- lib/bind/sv/menus.bind | 28 ++++---- lib/doc/Math.lyx | 142 ++++++++++++++++++++++++++++++++++++---- lib/doc/de/Math.lyx | 145 ++++++++++++++++++++++++++++++++++++++--- lib/doc/es/Math.lyx | 4 +- lib/doc/fr/Math.lyx | 4 +- 9 files changed, 326 insertions(+), 83 deletions(-) diff --git a/lib/bind/de/menus.bind b/lib/bind/de/menus.bind index c5010cf6b2..4515d0ba00 100644 --- a/lib/bind/de/menus.bind +++ b/lib/bind/de/menus.bind @@ -4,12 +4,12 @@ # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. -# author Lars Gullik Bjønnes +# author Lars Gullik Bjønnes # author Jean-Marc Lasgouttes -# author André Pönitz +# author André Pönitz # author Michael Gerz -# author Jürgen Spitzmüller -# author Pit Sütterlin +# author Jürgen Spitzmüller +# author Pit Sütterlin # Full author contact details are available in file CREDITS. @@ -17,26 +17,26 @@ # Adapted to the german internationalisation 98-1-31 pit@uni-sw.gwdg.de # Diese Datei ist die deutsche Version der systemweiten Datei -# /usr/local/share/lyx/bind/menus.bind. Sie ist für diejenigen +# /usr/local/share/lyx/bind/menus.bind. Sie ist für diejenigen # gedacht, die die Deutsche Internationalisierung verwenden und legt # Menuefunktionen konsistent zu den deutschen Namen der Menues # fest. # # ACHTUNG! # -# Die Belegung der Sequenz ALT-D für die Funktionen des Menues "Datei" -# verträgt sich nicht mit einer Definition der Dateien (x)emacs.bind -# Wer diese verwendet, muß entweder die Definitionen in dieser Datei -# ändern, oder aber die entsprechende bind-datei ebenfalls in das +# Die Belegung der Sequenz ALT-D für die Funktionen des Menues "Datei" +# verträgt sich nicht mit einer Definition der Dateien (x)emacs.bind +# Wer diese verwendet, muß entweder die Definitionen in dieser Datei +# ändern, oder aber die entsprechende bind-datei ebenfalls in das # private Verzeichnis kopieren und dort die Definition veraendern. # Ich verwende z.B. in emacs.bind anstelle der normalen Definition -# \bind "M-d" "word-delete-forward" die leicht veränderte Variante -# \bind "M-S-D" "word-delete-forward", wodurch die Funktion "Löschen +# \bind "M-d" "word-delete-forward" die leicht veränderte Variante +# \bind "M-S-D" "word-delete-forward", wodurch die Funktion "Löschen # eines Wortes" auf die Tastenkombination ALT-SHIFT-D gelegt wird # -# Menue Schrifgröße +# Menü Schriftgröße # \bind "M-s t" "font-size tiny" \bind "M-s S-S" "font-size footnotesize" @@ -62,7 +62,7 @@ \bind "M-s minus" "font-size decrease" # -# Menue Absatztyp +# Menü Absatztyp # \bind "M-a 0" "layout Part" \bind "M-a 1" "layout Chapter" @@ -110,17 +110,17 @@ \bind "M-a Up" "outline-up" \bind "M-a Down" "outline-down" -# Obsolete Tastenbelegung: in die persönliche *.bind Datei kopieren und -# auskommentieren wenn diese Tastenbelegung gewünscht ist. +# Obsolete Tastenbelegung: in die persönliche *.bind Datei kopieren und +# auskommentieren wenn diese Tastenbelegung gewünscht ist. # \bind "M-a S-quotedbl" "layout Section*" # M-a S-2 -# \bind "M-a S-§" "layout Subsection*" # M-a S-3 +# \bind "M-a S-§" "layout Subsection*" # M-a S-3 # \bind "M-a S-dollar" "layout Subsubsection*" # M-a S-4 # -# Menue Zeichensatz +# Menü Zeichensatz # -\bind "M-z f" "font-bold" +\bind "M-z f" "font-boldsymbol" \bind "M-z k" "font-noun" \bind "M-z h" "font-emph" \bind "M-z i" "font-emph" @@ -138,7 +138,7 @@ \bind "M-z space" "font-default" # -# Menue Tastatur +# Menü Tastatur # \bind "M-t 1" "keymap-primary" \bind "M-t 2" "keymap-secondary" diff --git a/lib/bind/fi/menus.bind b/lib/bind/fi/menus.bind index 0a309f687a..de89d56548 100644 --- a/lib/bind/fi/menus.bind +++ b/lib/bind/fi/menus.bind @@ -5,7 +5,7 @@ # Licence details can be found in the file COPYING. # author Pauli Virtanen -# author Lars Gullik Bjønnes +# author Lars Gullik Bjønnes # author Jean-Marc Lasgouttes # Full author contact details are available in file CREDITS. @@ -72,10 +72,10 @@ # Paragraph style menu # -# abcdefghij mn qrs uvwxyzåäö -# a cdefghij mnopqrs uvwxyzåäö (S) -# abcdefghij lmnopqrstuvwxyzåäö (M) -# abcdefghij lmn pqrstuvwxyzåäö (C) +# abcdefghij mn qrs uvwxyzåäö +# a cdefghij mnopqrs uvwxyzåäö (S) +# abcdefghij lmnopqrstuvwxyzåäö (M) +# abcdefghij lmn pqrstuvwxyzåäö (C) # # @@ -89,13 +89,13 @@ \bind "M-p 5" "layout Paragraph" # Osakappale \bind "M-p 6" "layout Subparagraph" # Aliosakappale -\bind "M-p t" "layout Author" # Tekijä +\bind "M-p t" "layout Author" # Tekijä \bind "M-p S-T" "layout Title" # Teoksen nimi \bind "M-p o" "layout Address" # Osoite \bind "M-p S-O" "layout Right_Address" # Oikea osoite -\bind "M-p v" "layout Date" # Päiväys -\bind "M-p M-c" "layout Abstract" # Tiivistelmä -\bind "M-p b" "layout Bibliography" # Lähdeviitteet +\bind "M-p v" "layout Date" # Päiväys +\bind "M-p M-c" "layout Abstract" # Tiivistelmä +\bind "M-p b" "layout Bibliography" # Lähdeviitteet \bind "M-p l" "layout Itemize" # Luettelo \bind "M-p S-L" "layout Enumerate" # Numeroitu luettelo @@ -106,7 +106,7 @@ \bind "M-p C-k" "layout Description" # Kuvaus \bind "M-p a" "layout Quote" # Lainaus \bind "M-p s" "layout Quotation" # Sitaatti -\bind "M-p S-S" "layout Verse" # Säe +\bind "M-p S-S" "layout Verse" # Säe \bind "M-p x" "layout LaTeX" # LaTeX \bind "M-p f" "layout ShortFoilhead" # Foils!! @@ -134,7 +134,7 @@ # Character style menu # -\bind "M-c b" "font-bold" # Lihavoi +\bind "M-c b" "font-boldsymbol" # Lihavoi \bind "M-c c" "font-noun" # Nimityyli \bind "M-c e" "font-emph" # Korosta \bind "M-c m" "math-mode" # Matematiikkatila diff --git a/lib/bind/menus.bind b/lib/bind/menus.bind index 03983e9924..cf4532aaa7 100644 --- a/lib/bind/menus.bind +++ b/lib/bind/menus.bind @@ -127,7 +127,7 @@ # Character style menu # -\bind "M-c b" "font-bold" +\bind "M-c b" "font-boldsymbol" \bind "M-c c" "font-noun" \bind "M-c e" "font-emph" \bind "M-c m" "math-mode" diff --git a/lib/bind/pt/menus.bind b/lib/bind/pt/menus.bind index cad6d7225c..84ff089476 100644 --- a/lib/bind/pt/menus.bind +++ b/lib/bind/pt/menus.bind @@ -5,7 +5,7 @@ # Licence details can be found in the file COPYING. # author unknown -# author Lars Gullik Bjønnes +# author Lars Gullik Bjønnes # author Jean-Marc Lasgouttes # Full author contact details are available in file CREDITS. @@ -13,9 +13,9 @@ # Key bindings for menus, both invisible and visible. # Note que trocamos a tecla f10 para Control para abrir os menus -# Pedro Kröger +# Pedro Kröger # 03/22/1999 -# 0.3 version [não-revisada] +# 0.3 version [não-revisada] # @@ -59,7 +59,7 @@ # -# Parágrafo +# Parágrafo # \bind "M-p 1" "layout Chapter" @@ -70,13 +70,13 @@ \bind "M-p 6" "layout Subparagraph" \bind "M-p r" "layout Abstract" # resumo \bind "M-p S-A" "layout Author" -\bind "M-p e" "layout Address" # endereço -\bind "M-p S-E" "layout Right_Address" # endereço à direita +\bind "M-p e" "layout Address" # endereço +\bind "M-p S-E" "layout Right_Address" # endereço à direita \bind "M-p m" "layout Itemize" # lista com Marcadores \bind "M-p S-B" "layout Bibliography" # Bibliografia \bind "M-p y" "layout LyX-Code" -\bind "M-p S-C" "layout Comment" # cometário -\bind "M-p d" "layout Description" # descrição +\bind "M-p S-C" "layout Comment" # cometário +\bind "M-p d" "layout Description" # descrição \bind "M-p S-D" "layout Date" # Data \bind "M-p n" "layout Enumerate" # lista Numerada \bind "M-p f" "layout ShortFoilhead" # Foils!! @@ -85,13 +85,13 @@ \bind "M-p l" "layout List" # \bind "M-p S-X" "layout LaTeX" \bind "M-p n" "layout Enumerate" # numbered list -\bind "M-p S-C" "layout Quote" # Citação +\bind "M-p S-C" "layout Quote" # Citação \bind "M-p c" "layout Quotation" \bind "M-p r" "layout ShortRotatefoilhead" # Foils!! \bind "M-p S-R" "layout Rotatefoilhead" # Foils!! -\bind "M-p p" "layout Standard" # Padrão +\bind "M-p p" "layout Standard" # Padrão \bind "M-p t" "layout Title" \bind "M-p x" "layout LaTeX" \bind "M-p space" "drop-layouts-choice" @@ -110,10 +110,10 @@ # Estilo do Caractere # -\bind "M-c n" "font-bold" # Negrito +\bind "M-c n" "font-boldsymbol" # Negrito \bind "M-c S-S" "font-noun" # substantivo \bind "M-c e" "font-emph" # -\bind "M-c m" "math-mode" # modo matemático +\bind "M-c m" "math-mode" # modo matemático \bind "M-c p" "font-typewriter" \bind "M-c r" "font-roman" \bind "M-c s" "font-sans" diff --git a/lib/bind/sv/menus.bind b/lib/bind/sv/menus.bind index d124911967..2919cbf738 100644 --- a/lib/bind/sv/menus.bind +++ b/lib/bind/sv/menus.bind @@ -5,7 +5,7 @@ # Licence details can be found in the file COPYING. # author unknown -# author Lars Gullik Bjønnes +# author Lars Gullik Bjønnes # author Jean-Marc Lasgouttes # author Allan Rae @@ -18,12 +18,12 @@ ################################# # Menu key bindings for Swedish locale. # -# Denna är avsedd för användning tillsammans med svensk lokalisering av LyX. +# Denna är avsedd för användning tillsammans med svensk lokalisering av LyX. # Placeras i LYXDIR/bind, eller ~/.lyx/bind under namnet sv_menus.bind och -# laddas automatiskt av LyX i stället för menus.bind då LANG=sv +# laddas automatiskt av LyX i stället för menus.bind dÃ¥ LANG=sv # Dessa bindningar kan krocka med andra bindningar; betrakta detta som ett -# prov. Observera att namnen på menyerna måste stämma med de översatta -# (File/Fil, Edit/Redigera osv.), för "menu-open" +# prov. Observera att namnen pÃ¥ menyerna mÃ¥ste stämma med de översatta +# (File/Fil, Edit/Redigera osv.), för "menu-open" # Wed Dec 9 17:15:45 GMT+0100 1998, Joacim Persson # # @@ -37,9 +37,9 @@ \bind "M-s s" "font-size liten" \bind "M-s n" "font-size normal" \bind "M-s l" "font-size stor" -\bind "M-s S-L" "font-size större" -\bind "M-s h" "font-size störst" -\bind "M-s S-H" "font-size störstare" +\bind "M-s S-L" "font-size större" +\bind "M-s h" "font-size störst" +\bind "M-s S-H" "font-size störstare" \bind "M-s 1" "font-size pytteliten" \bind "M-s 2" "font-size minst" @@ -47,12 +47,12 @@ \bind "M-s 4" "font-size liten" \bind "M-s 5" "font-size normal" \bind "M-s 6" "font-size stor" -\bind "M-s 7" "font-size större" -\bind "M-s 8" "font-size störst" -\bind "M-s 9" "font-size störstare" -\bind "M-s 0" "font-size störstast" +\bind "M-s 7" "font-size större" +\bind "M-s 8" "font-size störst" +\bind "M-s 9" "font-size störstare" +\bind "M-s 0" "font-size störstast" -\bind "M-s plus" "font-size öka" +\bind "M-s plus" "font-size öka" \bind "M-s minus" "font-size minska" @@ -118,7 +118,7 @@ # Character style menu # -\bind "M-c b" "font-bold" +\bind "M-c b" "font-boldsymbol" \bind "M-c c" "font-noun" \bind "M-c e" "font-emph" \bind "M-c m" "math-mode" diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index c20a3f1121..6c13a88a92 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -17883,7 +17883,7 @@ AbC \begin_inset Text \begin_layout Plain Layout -- +Ctrl-b \end_layout \end_inset @@ -17934,7 +17934,7 @@ AbC \begin_inset Text \begin_layout Plain Layout -Alt-c b +Alt-c b or Ctrl-Alt-b \end_layout \end_inset @@ -18524,6 +18524,133 @@ unboldmath \end_inset +\end_layout + +\begin_layout Subsection +Colored Formulas +\begin_inset Index +status collapsed + +\begin_layout Plain Layout +Formula ! colored +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +Formulas can be colored like normal text: Highlight a formula or a formula + part and use the +\family sans +Text Style +\family default + dialog. + Here is a formula in magenta: +\begin_inset Formula \[ +{\color{magenta}\int A\,\mathrm{d}x=\frac{\sqrt[5]{B}}{\ln\left(\frac{1}{3}\right)}}\] + +\end_inset + + +\end_layout + +\begin_layout Standard +You can also define your own colors as described in +\begin_inset CommandInset ref +LatexCommand ref +reference "sub:Colored-Boxes" + +\end_inset + +. + They can be used with the TeX code command +\series bold + +\backslash +textcolor +\series default + +\begin_inset Index +status collapsed + +\begin_layout Plain Layout +Commands ! T ! +\backslash +textcolor +\end_layout + +\end_inset + + in the scheme +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +textcolor{color}{characters or formula} +\end_layout + +\begin_layout Standard +The following example was colored completely dark green and partly red: +\end_layout + +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +textcolor{darkgreen}{ +\end_layout + +\end_inset + + +\begin_inset Formula \[ +\int A\,\mathrm{d}x=\frac{{\color{red}\sqrt[5]{B}}}{\ln\left(\frac{1}{3}\right)}\] + +\end_inset + + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +Due to a bug in LyX only complete formulas can be colored with self-defined + colors. +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout +\begin_inset CommandInset href +LatexCommand href +name "LyX-bug #5269" +target "http://bugzilla.lyx.org/show_bug.cgi?id=5269" + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Subsection @@ -21277,13 +21404,6 @@ bot \end_inset -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - \end_layout \begin_layout Subsection @@ -24168,10 +24288,6 @@ sin(x)+B \end_inset -\begin_inset Newpage pagebreak -\end_inset - - \end_layout \begin_layout Standard diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx index b70da3928a..bc6e11d44d 100644 --- a/lib/doc/de/Math.lyx +++ b/lib/doc/de/Math.lyx @@ -17914,7 +17914,7 @@ AbC \begin_inset Text \begin_layout Plain Layout -- +Strg-b \end_layout \end_inset @@ -17965,7 +17965,7 @@ AbC \begin_inset Text \begin_layout Plain Layout -Alt-z f +Alt-z f oder Strg-Alt-b \end_layout \end_inset @@ -18555,6 +18555,133 @@ unboldmath \end_inset +\end_layout + +\begin_layout Subsection +Farbige Formeln +\begin_inset Index +status collapsed + +\begin_layout Plain Layout +Formel ! farbige +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +Formeln können wie normaler Text gefärbt werden: Markieren Sie eine Formel + oder Formelteile und verwenden dann den +\family sans +Textstil +\family default + Dialog. + Hier ist eine Formel in Magenta: +\begin_inset Formula \[ +{\color{magenta}\int A\,\mathrm{d}x=\frac{\sqrt[5]{B}}{\ln\left(\frac{1}{3}\right)}}\] + +\end_inset + + +\end_layout + +\begin_layout Standard +Man kann auch eigene Farben definieren, wie in +\begin_inset CommandInset ref +LatexCommand ref +reference "sub:Farbige-Boxen" + +\end_inset + + erklärt ist. + Diese können dann mit dem TeX-Code Befehl +\series bold + +\backslash +textcolor +\series default + +\begin_inset Index +status collapsed + +\begin_layout Plain Layout +Befehle! T ! +\backslash +textcolor +\end_layout + +\end_inset + + verwendet werden, dass folgendes Schema besitzt: +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +textcolor{Farbe}{Zeichen oder Formel} +\end_layout + +\begin_layout Standard +Das folgende Beispiel wurde komplett dunkelgrün und teilweise rot eingefärbt: +\end_layout + +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +textcolor{dunkelgruen}{ +\end_layout + +\end_inset + + +\begin_inset Formula \[ +\int A\,\mathrm{d}x=\frac{{\color{red}\sqrt[5]{B}}}{\ln\left(\frac{1}{3}\right)}\] + +\end_inset + + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +Aufgrund eines Fehlers in LyX können nur komplette Formeln mit selbst definierte +n Farben gefärbt werden. +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout +\begin_inset CommandInset href +LatexCommand href +name "LyX-bug #5269" +target "http://bugzilla.lyx.org/show_bug.cgi?id=5269" + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Subsection @@ -18909,13 +19036,6 @@ Kann ein Symbol nicht in verschiedenen Größen dargestellt werden, wird es immer in der Standardgröße dargestellt. \end_layout -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - \begin_layout Section Griechische Buchstaben \begin_inset Index @@ -21335,6 +21455,13 @@ bot \end_inset +\end_layout + +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + \end_layout \begin_layout Subsection diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx index 1b43392b4f..a42f875dfe 100644 --- a/lib/doc/es/Math.lyx +++ b/lib/doc/es/Math.lyx @@ -18058,7 +18058,7 @@ AbC \begin_inset Text \begin_layout Plain Layout -- +Ctrl-b \end_layout \end_inset @@ -18109,7 +18109,7 @@ AbC \begin_inset Text \begin_layout Plain Layout -Alt-c b +Alt-c b o Ctrl-Alt-b \end_layout \end_inset diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index 56bf7453c7..5efbbc715c 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -17849,7 +17849,7 @@ AbC \begin_inset Text \begin_layout Plain Layout -- +Ctrl-b \end_layout \end_inset @@ -17896,7 +17896,7 @@ AbC \begin_inset Text \begin_layout Plain Layout -Alt-c b +Alt-c b ou Ctrl-Alt-b \end_layout \end_inset -- 2.39.2