cope with macro value sorting implemented in dba.c rev. 1.6

8 files changed, 14 insertions, 14 deletions

diff --git a/regress/usr.bin/mandoc/db/out/all.mout b/regress/usr.bin/mandoc/db/out/all.mout
index 21404fa377e..9287fb34fd1 100644
--- a/regress/usr.bin/mandoc/db/out/all.mout
+++ b/regress/usr.bin/mandoc/db/out/all.mout
@@ -23,7 +23,7 @@ man1/third.1
 > Xr=one
 man1/empty.1
 > Xr~^t
-empty(1) - two(2) # three(3) # one(1)
+empty(1) - one(1) # three(3) # two(2)
 
 >>> sortpages
 one, empty(1) - no title
diff --git a/regress/usr.bin/mandoc/db/out/fn.dout b/regress/usr.bin/mandoc/db/out/fn.dout
index 9daa753e0c4..d7048d7dc29 100644
--- a/regress/usr.bin/mandoc/db/out/fn.dout
+++ b/regress/usr.bin/mandoc/db/out/fn.dout
@@ -15,15 +15,15 @@ macro 00 entry count 0
 macro 01 entry count 0
 macro 02 entry count 2
 === MACRO 02 ===
-macro 02 # fo_arg # fn 
 macro 02 # fn_arg # fn 
+macro 02 # fo_arg # fn 
 === END OF MACRO 02 ===
 macro 03 entry count 0
 macro 04 entry count 0
 macro 05 entry count 2
 === MACRO 05 ===
-macro 05 # fo_name # fn 
 macro 05 # fn_func # fn 
+macro 05 # fo_name # fn 
 === END OF MACRO 05 ===
 macro 06 entry count 0
 macro 07 entry count 0
@@ -34,8 +34,8 @@ macro 11 entry count 0
 macro 12 entry count 0
 macro 13 entry count 2
 === MACRO 13 ===
-macro 13 # fo_type # fn 
 macro 13 # fn_type # fn 
+macro 13 # fo_type # fn 
 === END OF MACRO 13 ===
 macro 14 entry count 0
 macro 15 entry count 0
diff --git a/regress/usr.bin/mandoc/db/out/padfentry.dout b/regress/usr.bin/mandoc/db/out/padfentry.dout
index 90f1e08068a..cc72e882163 100644
--- a/regress/usr.bin/mandoc/db/out/padfentry.dout
+++ b/regress/usr.bin/mandoc/db/out/padfentry.dout
@@ -14,7 +14,7 @@ macros count  36
 macro 00 entry count 2
 === MACRO 00 ===
 macro 00 # three(3) # empty 
-macro 00 # one(1) # empty 
+macro 00 # two(2) # empty 
 === END OF MACRO 00 ===
 macro 01 entry count 0
 macro 02 entry count 0
diff --git a/regress/usr.bin/mandoc/db/out/padientry.dout b/regress/usr.bin/mandoc/db/out/padientry.dout
index b8041ea3e2a..cb322b6e1c1 100644
--- a/regress/usr.bin/mandoc/db/out/padientry.dout
+++ b/regress/usr.bin/mandoc/db/out/padientry.dout
@@ -13,7 +13,7 @@ macros count  36
 === MACROS ===
 macro 00 entry count 2
 === MACRO 00 ===
-macro 00 # two(2) # empty 
+macro 00 # one(1) # empty 
 macro 00 # three(3) # empty 
 === END OF MACRO 00 ===
 macro 01 entry count 0
diff --git a/regress/usr.bin/mandoc/db/out/padmentry.dout b/regress/usr.bin/mandoc/db/out/padmentry.dout
index 4dad3ee81e5..2fe2f4334af 100644
--- a/regress/usr.bin/mandoc/db/out/padmentry.dout
+++ b/regress/usr.bin/mandoc/db/out/padmentry.dout
@@ -13,8 +13,8 @@ macros count  36
 === MACROS ===
 macro 00 entry count 2
 === MACRO 00 ===
-macro 00 # two(2) # empty 
 macro 00 # one(1) # empty 
+macro 00 # two(2) # empty 
 === END OF MACRO 00 ===
 macro 01 entry count 0
 macro 02 entry count 0
diff --git a/regress/usr.bin/mandoc/db/out/threemacros.dout b/regress/usr.bin/mandoc/db/out/threemacros.dout
index e16005cb01d..96825da047f 100644
--- a/regress/usr.bin/mandoc/db/out/threemacros.dout
+++ b/regress/usr.bin/mandoc/db/out/threemacros.dout
@@ -13,9 +13,9 @@ macros count  36
 === MACROS ===
 macro 00 entry count 3
 === MACRO 00 ===
-macro 00 # two(2) # empty 
-macro 00 # three(3) # empty 
 macro 00 # one(1) # empty 
+macro 00 # three(3) # empty 
+macro 00 # two(2) # empty 
 === END OF MACRO 00 ===
 macro 01 entry count 0
 macro 02 entry count 0
diff --git a/regress/usr.bin/mandoc/db/out/va.dout b/regress/usr.bin/mandoc/db/out/va.dout
index 03da04dfd26..d2c2e19b656 100644
--- a/regress/usr.bin/mandoc/db/out/va.dout
+++ b/regress/usr.bin/mandoc/db/out/va.dout
@@ -25,9 +25,9 @@ macro 10 entry count 0
 macro 11 entry count 0
 macro 12 entry count 3
 === MACRO 12 ===
-macro 12 # va_one # va 
-macro 12 # int va_two # va 
 macro 12 # block vt_two # va 
+macro 12 # int va_two # va 
+macro 12 # va_one # va 
 === END OF MACRO 12 ===
 macro 13 entry count 0
 macro 14 entry count 0
@@ -52,10 +52,10 @@ macro 32 entry count 0
 macro 33 entry count 0
 macro 34 entry count 4
 === MACRO 34 ===
-macro 34 # struct vt_two # va 
+macro 34 # block vt_two # va 
 macro 34 # int va_two # va 
+macro 34 # struct vt_two # va 
 macro 34 # vt_one # va 
-macro 34 # block vt_two # va 
 === END OF MACRO 34 ===
 macro 35 entry count 0
 === END OF MACROS ===
diff --git a/regress/usr.bin/mandoc/db/out/xr.dout b/regress/usr.bin/mandoc/db/out/xr.dout
index 1d92c3f70fb..c68fc7cb7ce 100644
--- a/regress/usr.bin/mandoc/db/out/xr.dout
+++ b/regress/usr.bin/mandoc/db/out/xr.dout
@@ -13,8 +13,8 @@ macros count  36
 === MACROS ===
 macro 00 entry count 2
 === MACRO 00 ===
-macro 00 # page(1) # xr 
 macro 00 # bare # xr 
+macro 00 # page(1) # xr 
 === END OF MACRO 00 ===
 macro 01 entry count 0
 macro 02 entry count 0