The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 9d4bef01827e4dc881c29cd24a81d22bb9998afe Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Oct 16 02:32:05 2012 +0200 UserGuide.lyx: Add info how to handle special characters in nomenclatures Fixes bug 8366. diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index cb71f93..d70f747 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -28328,6 +28328,39 @@ emph . \end_layout +\begin_layout Standard +If the characters | +\begin_inset space \space{} +\end_inset + +, +\begin_inset space \space{} +\end_inset + +! +\begin_inset space \space{} +\end_inset + +, @ and +\begin_inset space \space{} +\end_inset + +" +\begin_inset space \space{} +\end_inset + +should appear in nomenclature entries they need to be escaped by adding + a quote character in front of them. +\begin_inset CommandInset nomenclature +LatexCommand nomenclature +symbol "\"@, \"|, \"!, \"\"" +description "The quote sign is output by writing ' \"\"\"\" '" + +\end_inset + + +\end_layout + \begin_layout Subsection Sort Order of Nomenclature Entries \begin_inset Index idx diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 5ee6e8c..99659ba 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -29060,6 +29060,41 @@ emph . \end_layout +\begin_layout Standard +Sollen die Zeichen | +\begin_inset space \space{} +\end_inset + +, +\begin_inset space \space{} +\end_inset + +! +\begin_inset space \space{} +\end_inset + +, @ und +\begin_inset space \space{} +\end_inset + +" +\begin_inset space \space{} +\end_inset + +in Nomenklatureinträgen erscheinen, müssen sie geschützt werden. + indem man ein Anführungszeichen davor setzt. + Um zu verhindern, dass das Zeichen " nachfolgende Zeichen beeinflusst, + wird es mit einem leeren TeX-Klammerpaar abgeschlossen: ""{} +\begin_inset CommandInset nomenclature +LatexCommand nomenclature +symbol "\"@, \"|, \"!, \"\"{}" +description "Das Anführungszeichen wird mit der Sequenz ' \"\"{}\"\"{} ' ausgegeben" + +\end_inset + + +\end_layout + \begin_layout Subsection Nomenklatur-Einträge sortieren \begin_inset Index idx diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index 151c25b..072d603 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -28805,7 +28805,9 @@ reference "sub:LaTeX-Sintaxis" \end_layout \begin_layout Standard -El diálogo Estilo +El diálogo +\family sans +Estilo \begin_inset space ~ \end_inset @@ -28813,9 +28815,7 @@ del \begin_inset space ~ \end_inset -t -\family sans -exto +texto \family default no se puede emplear para formatear la descripción, hay que usar comandos LaTeX. @@ -28886,6 +28886,51 @@ emph . \end_layout +\begin_layout Standard + +\lang english +If the characters | +\begin_inset space \space{} +\end_inset + +, +\begin_inset space \space{} +\end_inset + +! +\begin_inset space \space{} +\end_inset + +, @ and +\begin_inset space \space{} +\end_inset + +" +\begin_inset space \space{} +\end_inset + +should appear in nomenclature entries they need to be escaped by adding + a quote character in front of them. + To avoid that the +\begin_inset space \space{} +\end_inset + +" +\begin_inset space \space{} +\end_inset + +character influences the following characters the sequence is ended by an + empty pair of braces: ""{} +\begin_inset CommandInset nomenclature +LatexCommand nomenclature +symbol "\"@, \"|, \"!, \"\"{}" +description "The quote sign is output by writing ' \"\"{}\"\"{} '" + +\end_inset + + +\end_layout + \begin_layout Subsection Orden de las entradas de la nomenclatura \begin_inset Index idx diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index f3308a7..a786ca9 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -4579,7 +4579,7 @@ Entrée que la profondeur actuels, utilisez \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset . @@ -5560,7 +5560,7 @@ Standard la profondeur d'emboîtement courante, vous pouvez utiliser \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset pour séparer les paragraphes. @@ -7486,7 +7486,7 @@ Entrée \family default est la fonction \family typewriter -paragraph-break +break-paragraph \family default , et les lignes d'une adresse, prises isolément, ne sont pas des paragraphes. Ainsi, vous vous servirez de @@ -9368,7 +9368,7 @@ Liste; Nous l'avons obtenu avec \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset suivi de @@ -9398,7 +9398,7 @@ arg "depth-increment" Nous aurions pu le créer de la même manière que le précédent, avec \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset suivi de @@ -9429,7 +9429,7 @@ Standard Nous l'avons obtenu avec \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset , puis @@ -9467,7 +9467,7 @@ Standard , également au niveau n°4, obtenu juste avec \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset . @@ -9479,7 +9479,7 @@ arg "paragraph-break inverse" Nous avons tapé \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset et remis l'environnement de paragraphe à @@ -9527,7 +9527,7 @@ pouvons Tapez \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset puis @@ -9545,7 +9545,7 @@ arg "depth-decrement" 4-b Après un autre \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset suivi de @@ -9736,7 +9736,7 @@ Voici le niveau n°2. Nous avons fait \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset suivi de @@ -9773,7 +9773,7 @@ ListePuces \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset , puis @@ -9794,7 +9794,7 @@ ListePuces Voici le niveau n°4, obtenu avec \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset , puis @@ -9856,7 +9856,7 @@ pas Au fait, vous aurez deviné que nous utilisons \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset pour conserver le même environnement et la même profondeur mais créer un @@ -9873,7 +9873,7 @@ arg "depth-decrement" pour diminuer la profondeur après le prochain \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset . @@ -9912,7 +9912,7 @@ toujours Après un autre \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset suivi de @@ -9937,7 +9937,7 @@ Gauche Nous obtenons la même chose avec une autre suite \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -10071,7 +10071,7 @@ PooPooPiDoo ! ( \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset ) @@ -10148,7 +10148,7 @@ poisson bleu ( \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset , @@ -10164,7 +10164,7 @@ arg "depth-increment" 3 fois, \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset , @@ -10241,7 +10241,7 @@ Citation Nous utilisons \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset pour préserver la profondeur. @@ -29591,6 +29591,41 @@ emph . \end_layout +\begin_layout Standard + +\lang english +If the characters | +\begin_inset space \space{} +\end_inset + +, +\begin_inset space \space{} +\end_inset + +! +\begin_inset space \space{} +\end_inset + +, @ and +\begin_inset space \space{} +\end_inset + +" +\begin_inset space \space{} +\end_inset + +should appear in nomenclature entries they need to be escaped by adding + a quote character in front of them. +\begin_inset CommandInset nomenclature +LatexCommand nomenclature +symbol "\"@, \"|, \"!, \"\"" +description "The quote sign is output by writing ' \"\"\"\" '" + +\end_inset + + +\end_layout + \begin_layout Subsection Ordre de tri des entrées de glossaire \begin_inset Index idx diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 4d1a686..93bad45 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -6015,7 +6015,7 @@ Return \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -7895,7 +7895,7 @@ Return \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -11433,7 +11433,7 @@ Return \bar default \noun default \color inherit -paragraph-break +break-paragraph \family roman \series medium \shape up @@ -14106,7 +14106,7 @@ status collapsed \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -14211,7 +14211,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -14291,7 +14291,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -14416,7 +14416,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -14454,7 +14454,7 @@ arg "paragraph-break inverse" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -14591,7 +14591,7 @@ arg "paragraph-break inverse" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -14636,7 +14636,7 @@ arg "depth-decrement" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -14972,7 +14972,7 @@ status collapsed ããã¯ç¬¬2é層ã§ãã \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset ã®å¾ã« @@ -15052,7 +15052,7 @@ arg "depth-increment" ç°å¢ãªã®ã§ãã©ãã«ãé»ä¸¸ã«ãªãã®ã§ãï¼ããã«æ¥ãã«ã¯ã \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset ã®å¾ã« @@ -15096,7 +15096,7 @@ arg "depth-increment" ããã¯ç¬¬4é層ã§ãã \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset ã®å¾ã« @@ -15260,7 +15260,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -15288,7 +15288,7 @@ arg "paragraph-break inverse" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset ã¨æ¼ãã¦ãã @@ -15394,7 +15394,7 @@ arg "depth-increment" ããä¸åº¦ \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset 㨠@@ -15438,7 +15438,7 @@ arg "depth-decrement" ããä¸åº¦ \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset 㨠@@ -15698,7 +15698,7 @@ arg "depth-increment" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -15802,7 +15802,7 @@ arg "paragraph-break inverse" \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset @@ -16023,7 +16023,7 @@ Return ç°å¢ã使ãã¾ããé層ãä¿æããããã«ã¯ \begin_inset Info type "shortcut" -arg "paragraph-break inverse" +arg "break-paragraph inverse" \end_inset ã使ããã¨ã«ãã¾ãã @@ -36862,6 +36862,41 @@ emph ã³ãã³ãã使ç¨ãã¾ãã \end_layout +\begin_layout Standard + +\lang english +If the characters | +\begin_inset space \space{} +\end_inset + +, +\begin_inset space \space{} +\end_inset + +! +\begin_inset space \space{} +\end_inset + +, @ and +\begin_inset space \space{} +\end_inset + +" +\begin_inset space \space{} +\end_inset + +should appear in nomenclature entries they need to be escaped by adding + a quote character in front of them. +\begin_inset CommandInset nomenclature +LatexCommand nomenclature +symbol "\"@, \"|, \"!, \"\"" +description "The quote sign is output by writing ' \"\"\"\" '" + +\end_inset + + +\end_layout + \begin_layout Subsection ç¨èªéé ç®ã®æ´åºé \begin_inset Index idx ----------------------------------------------------------------------- Summary of changes: lib/doc/UserGuide.lyx | 33 +++++++++++++++++++ lib/doc/de/UserGuide.lyx | 35 +++++++++++++++++++++ lib/doc/es/UserGuide.lyx | 53 +++++++++++++++++++++++++++++-- lib/doc/fr/UserGuide.lyx | 77 +++++++++++++++++++++++++++++++++------------ lib/doc/ja/UserGuide.lyx | 75 ++++++++++++++++++++++++++++++++------------ 5 files changed, 228 insertions(+), 45 deletions(-) hooks/post-receive -- The LyX Source Repository