From: Uwe Stöhr <uwestoehr@web.de>
Date: Tue, 12 Oct 2010 00:38:55 +0000 (+0000)
Subject: - UserGuide.lyx: update section about preventing hyphenations
X-Git-Tag: 2.0.0~2426
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b4238828cec0bd299b576229ec71877cb9003b6e;p=features.git

- UserGuide.lyx: update section about preventing hyphenations
- mbox.png: this image is no longer needed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35604 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 321db06d94..ea1ce139c2 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2186,7 +2186,6 @@ lib_doc_clipart_files = Split('''
     macrobox.png
     MacroToolbar.png
     macrouse.png
-    mbox.png
     mobius.eps
     platypus.eps
     referenceQt4.png
diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index 0f3a22fa01..3c61e796b3 100644
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -47,7 +47,6 @@ dist_clipartdoc_DATA = \
 	clipart/macrobox.png \
 	clipart/MacroToolbar.png \
 	clipart/macrouse.png \
-	clipart/mbox.png \
 	clipart/referenceQt4.png \
 	clipart/SpaceMarker.png \
 	clipart/StandardToolbar.png \
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index e828672721..e3574a7770 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -13928,46 +13928,20 @@ A-b c
 
  as hyphenation possibility.
  Hyphenating at this point would look ugly.
- To prevent the shortcut from being hyphenated, you can put it into the
- argument of the LaTeX-box-command 
-\series bold
-
-\backslash
-mbox
-\series default
-, because text within LaTeX-boxes can't be hyphenated.
- As LyX doesn't support 
-\series bold
-
-\backslash
-mbox
-\series default
-, you have to use TeX Code.
- The result looks in LyX like:
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename clipart/mbox.png
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-To learn more about TeX Code, have a look at section
-\begin_inset space ~
+ To prevent the shortcut from being hyphenated, you can put it into a makebox
+ as described in section 
+\begin_inset Quotes eld
 \end_inset
 
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:TeX-Code"
-
+Prevent Hyphenation
+\begin_inset Quotes erd
 \end_inset
 
-.
+ of the 
+\emph on
+EmbeddedObjects
+\emph default
+ manual.
 \end_layout
 
 \begin_layout Subsection
diff --git a/lib/doc/clipart/mbox.png b/lib/doc/clipart/mbox.png
deleted file mode 100644
index 314b274fc6..0000000000
Binary files a/lib/doc/clipart/mbox.png and /dev/null differ
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 5b7c514e88..f559eb11d8 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -1,5 +1,5 @@
 #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 401
+\lyxformat 402
 \begin_document
 \begin_header
 \textclass scrbook
@@ -29649,7 +29649,7 @@ Boxen ! für Buchstaben
 \end_layout
 
 \begin_layout Subsection
-Silbentrennung unterbinden 
+Silbentrennung unterbinden
 \begin_inset CommandInset label
 LatexCommand label
 name "abs:Silbentrennung-unterbinden"
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 5083f472dd..fb9fd640b5 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -16653,30 +16653,20 @@ Strg+
 
 \begin_layout Standard
 Manchmal will man verhindern, dass etwas getrennt wird.
- Dann schreibt man den Begriff am besten in eine 
-\family typewriter
-
-\backslash
-mbox
-\family default
- als TeX-Code, zum Beispiel 
-\begin_inset Graphics
-	filename ../clipart/mbox.png
-	scale 70
-	BoundingBox 0bp 6bp 102bp 22bp
-
-\end_inset
-
-.
- In diesem Fall würde 
+ Dann schreibt man den Begriff am besten in eine Makebox wie in Abschnitt
+ 
 \begin_inset Quotes gld
 \end_inset
 
-A-b c
+Silbentrennung unterbinden
 \begin_inset Quotes grd
 \end_inset
 
- in einer Zeile gedruckt werden.
+ des 
+\emph on
+EingebetteteObjekte
+\emph default
+ Handbuchs beschrieben.
 \end_layout
 
 \begin_layout Description
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 1846133f43..4cb5c5736b 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -14146,46 +14146,25 @@ A-b c
 
  y lo interpreta como posibilidad de ruptura, lo que en este caso quedaría
  feo.
- Para impedir que se parta esa secuencia de letras, la pondremos como argumento
- en un comando de cuadro LaTeX 
-\series bold
-
-\backslash
-mbox
-\series default
-, porque el texto dentro de cuadros LaTeX no se puede partir.
- Como LyX no soporta 
-\series bold
-
-\backslash
-mbox
-\series default
-, hemos de usar código TeX.
- El resultado se ve así en LyX:
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename ../clipart/mbox.png
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Para saber más sobre código TeX, mira en la sección
-\begin_inset space ~
+ Para impedir que se parta esa secuencia de letras, 
+\lang english
+you can put it into a makebox as described in section
+\lang spanish
+ 
+\begin_inset Quotes fld
 \end_inset
 
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:Código-TeX"
-
+Evitar la partición de palabras
+\begin_inset Quotes frd
 \end_inset
 
-.
+ 
+\lang english
+of the 
+\emph on
+EmbeddedObjects
+\emph default
+ manual.
 \end_layout
 
 \begin_layout Subsection
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 1d56be79dd..c1ea769bdf 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -14889,46 +14889,25 @@ A-b c
 .
  LaTeX considère le tiret comme une possibilité de césure, or une césure
  à cet endroit serait peu judicieuse.
- Pour empêcher le raccourci d'être coupe en deux, vous pouvez le mettre
- comme argument de la commande LaTeX 
-\series bold
-
-\backslash
-mbox
-\series default
-, parce que le texte qui est dans une boîte LaTeX ne peut pas être coupé.
- Comme LyX ne gère pas la commande 
-\series bold
-
-\backslash
-mbox
-\series default
- vous devez utiliser du code TeX.
- Le résultat, dans LyX, ressemble à ceci :
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename ../clipart/mbox.png
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Pour en apprendre plus sur le code TeX, jettez un coup d'œil à la section
-\begin_inset space ~
+ Pour empêcher le raccourci d'être coupe en deux, 
+\lang english
+you can put it into a makebox as described in section
+\lang french
+ 
+\begin_inset Quotes fld
 \end_inset
 
-
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:Code-TeX"
-
+Empêcher la Césure
+\begin_inset Quotes frd
 \end_inset
 
-.
+ 
+\lang english
+of the 
+\emph on
+EmbeddedObjects
+\emph default
+ manual.
 \end_layout
 
 \begin_layout Subsection
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 8debc89947..c0ea41bc93 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -21124,33 +21124,43 @@ LaTeXは、ハイフネーションをほとんど完璧にこなしますが、
 \end_layout
 
 \begin_layout Standard
-ときには、単語や複合語がハイフンで区切られることを避けたい場合があるかもしれません。たとえば文書中で、キー割り当てや短絡キーを「A-b c」のように表すものとし
-ましょう。するとLaTeXは、ハイフン「-」をハイフネーション位置の候補として考えます。しかし、この場所でのハイフネーションは醜悪です。この短絡キー表記がハイフ
-ンで区切られるのを避けるには、それをLaTeXのボックスコマンド
-\backslash
-mboxの引数に入れると、LaTeXボックス内の字句はハイフンネーションの対象とならないので、うまく回避できます。LyXは
-\backslash
-mboxをサポートしていないので、TeXコードを使わなくてはなりません。その結果、以下のような外観になるでしょう。
-\end_layout
 
-\begin_layout Standard
-\begin_inset Graphics
-	filename ../clipart/mbox.png
+\lang english
+Sometimes you want to prevent words or constructs to be hyphenated.
+ Imagine that you are describing keybindings/shortcuts in your document
+ in the form 
+\begin_inset Quotes eld
+\end_inset
 
+A-b c
+\begin_inset Quotes erd
 \end_inset
 
+.
+ LaTeX would then see the hyphen 
+\begin_inset Quotes eld
+\end_inset
 
-\end_layout
+-
+\begin_inset Quotes erd
+\end_inset
 
-\begin_layout Standard
-TeXコードの詳細に関しては、第
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sec:TeXコード"
+ as hyphenation possibility.
+ Hyphenating at this point would look ugly.
+ To prevent the shortcut from being hyphenated, you can put it into a makebox
+ as described in section 
+\begin_inset Quotes eld
+\end_inset
 
+Prevent Hyphenation
+\begin_inset Quotes erd
 \end_inset
 
-節を参照してください。
+ of the 
+\emph on
+EmbeddedObjects
+\emph default
+ manual.
 \end_layout
 
 \begin_layout Subsection