[Aptitude-devel] r3209 - in branches/aptitude-0.3/aptitude: . src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 30 20:01:05 2005
New Revision: 3209

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
Log:
Fix various formatting problems

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 30 20:01:05 2005
@@ -1,5 +1,10 @@
 2005-04-30  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_resolver.cc:
+
+	  Remove an unneeded flowbox, make indentation work correctly
+	  (remember: indentboxes go *outside* flowboxes).
+
 	* src/cmdline/cmdline_do_action.cc:
 
 	  Support the new action flags and stuff in the name-mangling

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	Sat Apr 30 20:01:05 2005
@@ -79,58 +79,58 @@
     }
 }
 
-static fragment *flowindentbox(int i1, int irest, fragment *f)
+static inline fragment *flowindentbox(int i1, int irest, fragment *f)
 {
-  return flowbox(indentbox(i1, irest, f));
+  return indentbox(i1, irest, flowbox(f));
 }
 
 static void resolver_help(ostream &out)
 {
-  fragment *f=flowbox(indentbox(2, 2,
-				fragf(_("y: %F"
-					"n: %F"
-					"q: %F"
-					",: %F"
-					".: %F"
-					"<ACTION> pkg... : %F%n"
-					"%F"
-					"%F"
-					"%F"
-					"%F"
-					"%F"
-					"%F"
-					"%F"
-					"%F"),
-				      flowindentbox(0, 3,
-						fragf(_("accept the proposed changes"))),
-				      flowindentbox(0, 3,
-						fragf(_("reject the proposed changes and search for another solution"))),
-				      flowindentbox(0, 3,
-						fragf(_("give up and quit the program"))),
-				      flowindentbox(0, 3,
-						fragf(_("move to the next solution"))),
-				      flowindentbox(0, 3,
-						fragf(_("move to the previous solution"))),
-				      flowindentbox(0, 3,
-						fragf(_("adjust the state of the listed packages, where ACTION is one of:"))),
-				      flowindentbox(0, 4,
-						fragf(_("'+' to install packages"))),
-				      flowindentbox(0, 4,
-						    fragf(_("'+M' to install packages and immediately flag them as automatically installed"))),
-				      flowindentbox(0, 4,
-						fragf(_("'-' to remove packages"))),
-				      flowindentbox(0, 4,
-						    fragf(_("'_' to purge packages"))),
-				      flowindentbox(0, 4,
-						    fragf(_("'=' to place packages on hold"))),
-				      flowindentbox(0, 4,
-						    fragf(_("':' to keep packages in their current state without placing them on hold"))),
-				      flowindentbox(0, 4,
-						    fragf(_("'&M' to mark packages as automatically installed"))),
-				      flowindentbox(0, 4,
-						    fragf(_("'&m' to mark packages as manually installed"))),
-				      flowindentbox(0, 3,
-						    fragf(_("Adjustments will cause the current solution to be discarded and recalculated as necessary."))))));
+  fragment *f=indentbox(2, 2,
+			fragf(_("y: %F"
+				"n: %F"
+				"q: %F"
+				",: %F"
+				".: %F"
+				"<ACTION> pkg... : %F%n"
+				"%F"
+				"%F"
+				"%F"
+				"%F"
+				"%F"
+				"%F"
+				"%F"
+				"%F"),
+			      flowindentbox(0, 3,
+					    fragf(_("accept the proposed changes"))),
+			      flowindentbox(0, 3,
+					    fragf(_("reject the proposed changes and search for another solution"))),
+			      flowindentbox(0, 3,
+					    fragf(_("give up and quit the program"))),
+			      flowindentbox(0, 3,
+					    fragf(_("move to the next solution"))),
+			      flowindentbox(0, 3,
+					    fragf(_("move to the previous solution"))),
+			      flowindentbox(0, 3,
+					    fragf(_("adjust the state of the listed packages, where ACTION is one of:"))),
+			      flowindentbox(0, 4,
+					    fragf(_("'+' to install packages"))),
+			      flowindentbox(0, 5,
+					    fragf(_("'+M' to install packages and immediately flag them as automatically installed"))),
+			      flowindentbox(0, 4,
+					    fragf(_("'-' to remove packages"))),
+			      flowindentbox(0, 4,
+					    fragf(_("'_' to purge packages"))),
+			      flowindentbox(0, 4,
+					    fragf(_("'=' to place packages on hold"))),
+			      flowindentbox(0, 4,
+					    fragf(_("':' to keep packages in their current state without placing them on hold"))),
+			      flowindentbox(0, 4,
+					    fragf(_("'&M' to mark packages as automatically installed"))),
+			      flowindentbox(0, 4,
+					    fragf(_("'&m' to mark packages as manually installed"))),
+			      flowindentbox(0, 3,
+					    fragf(_("Adjustments will cause the current solution to be discarded and recalculated as necessary.")))));
 
   update_screen_width();
   out << f->layout(screen_width, screen_width);