advertising:

- support leftish and centered text
- support arbitrary bold text with ml-like syntax <b>foo</b> in strings
- simplify get_text_coord and unexport it, no one else than wrap_paragraph uses it nowadays

3 files changed, 14 insertions, 17 deletions

diff --git a/perl-install/share/advertising/dwd-01.pl b/perl-install/share/advertising/dwd-01.pl
index 679ba742a..46f4253d1 100644
--- a/perl-install/share/advertising/dwd-01.pl
+++ b/perl-install/share/advertising/dwd-01.pl
@@ -4,11 +4,10 @@ $width = 556;
 $height = 303;
 
 $y_start = 80;
+$border = 10;  #- for leftish text
 
-$title = N("Congratulations for choosing Mandrake Linux!");
-
-@text = (N("Welcome to the Open Source world!"),
-         '',
-         N("Mandrake Linux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrake Linux contributors."),
-		 '',
-		 N("We would like to thank everyone who participated in the development of this latest release.")); 
+@text = ([ N("Congratulations for choosing <b>Mandrake Linux</b>!"), center => 1 ],
+         ' ',
+         N("Mandrake Linux is committed to the Open Source Model and fully respects the <b>General Public License</b>. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrake Linux <b>contributors</b>."),
+         ' ',
+         [ N("We would like to thank everyone who participated in the development of this latest release."), center => 1 ]);
diff --git a/perl-install/share/advertising/dwd-02.pl b/perl-install/share/advertising/dwd-02.pl
index 2768b792a..c3f47fcf6 100644
--- a/perl-install/share/advertising/dwd-02.pl
+++ b/perl-install/share/advertising/dwd-02.pl
@@ -4,9 +4,8 @@ $width = 556;
 $height = 303;
 
 $y_start = 80;
+$border = 10;
 
-$title = N("Join the Mandrake Linux community!");
-
-@text = (N("If you would like to get involved, please subscribe to the \"Cooker\" mailing list by visiting mandrake-linux.com/cooker"),
-         '',
-		 N("To learn more about our dynamic community, please visit www.mandrake-linux.com!")); 
+@text = (N("If you would like to get involved, please subscribe to the \"Cooker\" mailing list by visiting <b>mandrake-linux.com/cooker</b>"),
+         ' ',
+         N("To learn more about our dynamic community, please visit <b>www.mandrake-linux.com</b>!")); 
diff --git a/perl-install/share/advertising/dwd-03.pl b/perl-install/share/advertising/dwd-03.pl
index f7caea9d6..2cd6d45ff 100644
--- a/perl-install/share/advertising/dwd-03.pl
+++ b/perl-install/share/advertising/dwd-03.pl
@@ -4,9 +4,8 @@ $width = 556;
 $height = 303;
 
 $y_start = 80;
+$border = 10;
 
-$title = N("What is Mandrake Linux?");
-
-@text = (N("Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrake Linux is one of the most widely used Linux distributions worldwide!"),
-         '',
-		 N("Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications.")); 
+@text = (N("Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the <b>Free Software</b> world. Mandrake Linux is one of the most widely used Linux distributions worldwide!"),
+         ' ',
+         N("Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications."));