Merge branch 'master' into biblatex2

[lyx.git] / lib / doc / Math.lyx

diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index fca41b3e2c754373dae610bf86cb81fb2dfcc411..dbb03f10a324367ea9fa89079d254659ff8e6e67 100644 (file)
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -311,7 +311,7 @@ The latest PDF-version of this document can be found here:
 
 
 \series bold
-http://wiki.lyx.org/LyX/DocumentationDevelopment#Math
+http://wiki.lyx.org/LyX/Manuals#Math
 \end_layout
 
 \end_inset
@@ -13213,8 +13213,6 @@ raisebox
 \end_inset
 
 
-\series default
-
 \end_layout
 
 \begin_layout Standard
@@ -13592,8 +13590,6 @@ white
  and 
 \series bold
 yellow
-\series default
-
 \end_layout
 
 \begin_layout Standard
@@ -18126,15 +18122,12 @@ Latin letters in formulas can be set in one of the following font styles:
 
 \begin_layout Standard
 \align center
-\begin_inset space \hfill{}
-\end_inset
-
-
 \begin_inset Tabular
-<lyxtabular version="3" rows="6" columns="2">
+<lyxtabular version="3" rows="6" columns="3">
 <features booktabs="true" tabularvalignment="middle">
 <column alignment="center" valignment="top" width="0pt">
 <column alignment="center" valignment="top">
+<column alignment="center" valignment="top">
 <row>
 <cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
@@ -18152,6 +18145,15 @@ Command
 Result
 \end_layout
 
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Shortcut
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -18185,6 +18187,15 @@ ABC
 
 \end_layout
 
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+-
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -18216,6 +18227,20 @@ AbC
 \end_inset
 
 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Info
+type  "shortcut"
+arg   "font-bold"
+\end_inset
+
+
 \end_layout
 
 \end_inset
@@ -18249,6 +18274,20 @@ AbC
 \end_inset
 
 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Info
+type  "shortcut"
+arg   "font-boldsymbol"
+\end_inset
+
+
 \end_layout
 
 \end_inset
@@ -18284,6 +18323,15 @@ ABC
 
 \end_layout
 
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+-
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -18317,6 +18365,15 @@ AbC
 
 \end_layout
 
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+-
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -18325,15 +18382,16 @@ AbC
 \end_inset
 
 
-\begin_inset space \hfill{}
-\end_inset
-
+\end_layout
 
+\begin_layout Standard
+\align center
 \begin_inset Tabular
-<lyxtabular version="3" rows="6" columns="2">
+<lyxtabular version="3" rows="6" columns="3">
 <features booktabs="true" tabularvalignment="middle">
 <column alignment="center" valignment="top" width="0pt">
 <column alignment="center" valignment="top">
+<column alignment="center" valignment="top">
 <row>
 <cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
 \begin_inset Text
@@ -18351,6 +18409,15 @@ Command
 Result
 \end_layout
 
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Shortcut
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -18384,6 +18451,15 @@ AbC
 
 \end_layout
 
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+-
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -18415,6 +18491,20 @@ AbC
 \end_inset
 
 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Info
+type  "shortcut"
+arg   "font-roman"
+\end_inset
+
+
 \end_layout
 
 \end_inset
@@ -18448,6 +18538,20 @@ AbC
 \end_inset
 
 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Info
+type  "shortcut"
+arg   "font-sans"
+\end_inset
+
+
 \end_layout
 
 \end_inset
@@ -18481,6 +18585,20 @@ AbC
 \end_inset
 
 
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Info
+type  "shortcut"
+arg   "font-typewriter"
+\end_inset
+
+
 \end_layout
 
 \end_inset
@@ -18518,13 +18636,18 @@ ABC
 
 \end_inset
 </cell>
-</row>
-</lyxtabular>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
 
-\end_inset
+\begin_layout Plain Layout
+-
+\end_layout
 
+\end_inset
+</cell>
+</row>
+</lyxtabular>
 
-\begin_inset space \hfill{}
 \end_inset
 
 
@@ -21824,13 +21947,6 @@ bot
 \end_inset
 
 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsection
@@ -23057,13 +23173,6 @@ fi
 \end_inset
 
 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -28099,6 +28208,13 @@ C & \ne & A
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsubsection
@@ -30885,6 +31001,13 @@ makeatother
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection
@@ -32396,6 +32519,13 @@ Manuals
 .
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
 \begin_layout Section
 User-defined Commands
 \begin_inset Index idx