The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 67dcc67daeba31ee48723c56193881d475e7c72d Author: Uwe Stöhr <[email protected]> Date: Sun Jan 20 22:49:22 2013 +0100 Additional.lyx: correct a description - also use another paragraph shape to fix #8512 diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index b3a8d81..dfbf656 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -24103,8 +24103,8 @@ arg "specialchar-insert hyphenation" \end_layout \begin_layout Standard -Shapepar paragraphs are always placed on the page that their left border - touches the left page margin. +Shapepar paragraphs are either always centered or placed on the page so + that their left border touches the left page margin. You can therefore not use the paragraph dialog to align such paragraphs. A solution is to put the paragraph into a minipage or parbox and align the box. @@ -24112,8 +24112,8 @@ Shapepar paragraphs are always placed on the page that their left border Because if it is too wide and you center the box, the paragraph is not centered too because it sticks at the left side of the box. So you might have to play a bit with the width until it fits. - Here are two triangular paragraphs, the first one is not aligned, the second - one is centered: + Here are two heart-shaped paragraphs, the first one is not aligned, the + second one is right-aligned: \end_layout \begin_layout Standard @@ -24123,7 +24123,8 @@ Shapepar paragraphs are always placed on the page that their left border \end_layout -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- @@ -24143,7 +24144,8 @@ rem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy \end_layout \begin_layout Standard -\align center +\noindent +\align right \begin_inset Box Frameless position "t" hor_pos "c" @@ -24157,7 +24159,8 @@ height "1in" height_special "totalheight" status open -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx index 0396a3c..8dfdcdd 100644 --- a/lib/doc/de/Additional.lyx +++ b/lib/doc/de/Additional.lyx @@ -26358,8 +26358,8 @@ nungsmechanismus für Text in den Spitzen versagt. \end_layout \begin_layout Standard -Shapepar-Absätze werden immer so auf die Seite platziert, dass ihre linke - Kante den linken Seitenrand berührt. +Shapepar-Absätze werden immer entweder zentriert oder so auf die Seite platziert +, dass ihre linke Kante den linken Seitenrand berührt. Man kann daher nicht den Absatzdialog verwenden, um solche Absätze auszurichten. Eine Lösung ist den Absatz in eine Minipage oder Parbox zu setzen und dann die Box auszurichten. @@ -26367,8 +26367,8 @@ Shapepar-Absätze werden immer so auf die Seite platziert, dass ihre linke Denn ist sie zu breit und man zentriert die Box, ist der Absatz nicht ebenfalls zentriert, da er an der linken Seite der Box haftet. Daher muss man eventuell etwas mit der Breite spielen bis es passt. - Hier sind zwei dreieckige Absätze, der erste ist nicht ausgerichtet, der - zweite ist zentriert: + Hier sind zwei herzförmige Absätze, der erste ist nicht ausgerichtet, der + zweite ist rechts ausgerichtet: \end_layout \begin_layout Standard @@ -26378,7 +26378,8 @@ Shapepar-Absätze werden immer so auf die Seite platziert, dass ihre linke \end_layout -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- @@ -26398,7 +26399,8 @@ rem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy \end_layout \begin_layout Standard -\align center +\noindent +\align right \begin_inset Box Frameless position "t" hor_pos "c" @@ -26412,7 +26414,8 @@ height "1in" height_special "totalheight" status open -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx index 27d1f96..7c1eb49 100644 --- a/lib/doc/es/Additional.lyx +++ b/lib/doc/es/Additional.lyx @@ -25922,17 +25922,17 @@ arg "specialchar-insert hyphenation" \begin_layout Standard \lang english -Shapepar paragraphs are always placed on the page that their left border - touches the left page margin. - You can therefore not use the paragraph dialog to align such paragraphs. +Shapepar paragraphs are either always centered or placed on the page so + that their left border touches the left page margin.You can therefore not + use the paragraph dialog to align such paragraphs. A solution is to put the paragraph into a minipage or parbox and align the box. The problem is hereby to find the right width for the box. Because if it is too wide and you center the box, the paragraph is not centered too because it sticks at the left side of the box. So you might have to play a bit with the width until it fits. - Here are two triangular paragraphs, the first one is not aligned, the second - one is centered: + Here are two heart-shaped paragraphs, the first one is not aligned, the + second one is right-aligned: \end_layout \begin_layout Standard @@ -25942,7 +25942,8 @@ Shapepar paragraphs are always placed on the page that their left border \end_layout -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- @@ -25962,7 +25963,8 @@ rem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy \end_layout \begin_layout Standard -\align center +\noindent +\align right \begin_inset Box Frameless position "t" hor_pos "c" @@ -25976,7 +25978,8 @@ height "1in" height_special "totalheight" status open -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index b646f58..8521792 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -26312,8 +26312,8 @@ arg "specialchar-insert hyphenation" \begin_layout Standard \lang english -Shapepar paragraphs are always placed on the page that their left border - touches the left page margin. +Shapepar paragraphs are either always centered or placed on the page so + that their left border touches the left page margin. You can therefore not use the paragraph dialog to align such paragraphs. A solution is to put the paragraph into a minipage or parbox and align the box. @@ -26321,8 +26321,8 @@ Shapepar paragraphs are always placed on the page that their left border Because if it is too wide and you center the box, the paragraph is not centered too because it sticks at the left side of the box. So you might have to play a bit with the width until it fits. - Here are two triangular paragraphs, the first one is not aligned, the second - one is centered: + Here are two heart-shaped paragraphs, the first one is not aligned, the + second one is right-aligned: \end_layout \begin_layout Standard @@ -26332,7 +26332,8 @@ Shapepar paragraphs are always placed on the page that their left border \end_layout -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- @@ -26352,7 +26353,8 @@ rem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy \end_layout \begin_layout Standard -\align center +\noindent +\align right \begin_inset Box Frameless position "t" hor_pos "c" @@ -26366,7 +26368,8 @@ height "1in" height_special "totalheight" status open -\begin_layout Triangle up +\begin_layout Heart +\noindent \lang latin Lo\SpecialChar \- diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index 3c29666..a67be74 100644 --- a/lib/doc/ja/Additional.lyx +++ b/lib/doc/ja/Additional.lyx @@ -22386,8 +22386,8 @@ arg "specialchar-insert hyphenation" \begin_layout Standard \lang english -Shapepar paragraphs are always placed on the page that their left border - touches the left page margin. +Shapepar paragraphs are either always centered or placed on the page so + that their left border touches the left page margin. You can therefore not use the paragraph dialog to align such paragraphs. A solution is to put the paragraph into a minipage or parbox and align the box. @@ -22395,8 +22395,8 @@ Shapepar paragraphs are always placed on the page that their left border Because if it is too wide and you center the box, the paragraph is not centered too because it sticks at the left side of the box. So you might have to play a bit with the width until it fits. - Here are two triangular paragraphs, the first one is not aligned, the second - one is centered: + Here are two heart-shaped paragraphs, the first one is not aligned, the + second one is right-aligned: \end_layout \begin_layout Standard @@ -22407,6 +22407,7 @@ Shapepar paragraphs are always placed on the page that their left border \end_layout \begin_layout Triangle up +\noindent \lang latin Lo\SpecialChar \- @@ -22426,7 +22427,8 @@ rem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy \end_layout \begin_layout Standard -\align center +\noindent +\align right \begin_inset Box Frameless position "t" hor_pos "c" @@ -22441,6 +22443,7 @@ height_special "totalheight" status open \begin_layout Triangle up +\noindent \lang latin Lo\SpecialChar \- ----------------------------------------------------------------------- Summary of changes: lib/doc/Additional.lyx | 17 ++++++++++------- lib/doc/de/Additional.lyx | 17 ++++++++++------- lib/doc/es/Additional.lyx | 19 +++++++++++-------- lib/doc/fr/Additional.lyx | 17 ++++++++++------- lib/doc/ja/Additional.lyx | 13 ++++++++----- 5 files changed, 49 insertions(+), 34 deletions(-) hooks/post-receive -- The LyX Source Repository
