diff options
author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2017-01-26 18:28:06 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2017-01-26 18:28:06 +0000 |
commit | 93331e17aeecbfb33ec9c48521ade7aed914e609 (patch) | |
tree | 7f0e0c0163bdf88a25f6a7d19e60ad656b60acc5 /regress | |
parent | ed8098d9ded7c0223cd86a93edde73daf3d18c5c (diff) |
Fix -man -Thtml formatting after .nf (which has nothing to do
with "literal", by the way, it means "no fill"):
* Use <pre> such that whitespace is preserved.
* Preserve lines breaks.
* For font alternating macros, avoid node recursion which required
scary juggling with the fill state. Instead, simply print the text
children directly.
Missing feature first noticed by kristaps@ in 2011,
the again reported by afresh1@ in 2016,
and finally reported here: https://github.com/Debian/debiman/issues/21 ,
which i only found because of Shane Kerr's comment here:
https://plus.google.com/110314300533310775053/posts/H1eaw9Yskoc
Diffstat (limited to 'regress')
7 files changed, 1 insertions, 344 deletions
diff --git a/regress/usr.bin/mandoc/char/space/zerowidth.out_html b/regress/usr.bin/mandoc/char/space/zerowidth.out_html index 2ff8ab0d5b3..f317aafda4b 100644 --- a/regress/usr.bin/mandoc/char/space/zerowidth.out_html +++ b/regress/usr.bin/mandoc/char/space/zerowidth.out_html @@ -1,11 +1,6 @@ BEGINTEST -<br/> zero width space \& between A and B: AB -<br/> hyphenation allowed \% between A and B: AB -<br/> half-narrow (1/12) space \^ between A and B: AB -<br/> narrow space (1/6) \| between A and B: AB -<br/> ENDTEST diff --git a/regress/usr.bin/mandoc/char/unicode/ascii.out_html b/regress/usr.bin/mandoc/char/unicode/ascii.out_html index 1f9453e17c2..deef5bcbf37 100644 --- a/regress/usr.bin/mandoc/char/unicode/ascii.out_html +++ b/regress/usr.bin/mandoc/char/unicode/ascii.out_html @@ -1,43 +1,22 @@ BEGINTEST -<br/> """ QUOTATION MARK -<br/> ### NUMBER SIGN -<br/> $$$ DOLLAR SIGN -<br/> ''' APOSTROPHE -<br/> +++ PLUS SIGN -<br/> -- HYPHEN-MINUS -<br/> .. FULL STOP -<br/> /// SOLIDUS -<br/> === EQUALS SIGN -<br/> @@@ COMMERCIAL AT -<br/> [[[ LEFT SQUARE BRACKET -<br/> \\\\ REVERSE SOLIDUS -<br/> ]]] RIGHT SQUARE BRACKET -<br/> ^^^^ CIRCUMFLEX ACCENT -<br/> ___ LOW LINE -<br/> ```` GRAVE ACCENT -<br/> {{{ LEFT CURLY BRACKET -<br/> |||| VERTICAL LINE -<br/> }}} RIGHT CURLY BRACKET -<br/> ~~~~ TILDE -<br/> ENDTEST diff --git a/regress/usr.bin/mandoc/char/unicode/latin1.out_html b/regress/usr.bin/mandoc/char/unicode/latin1.out_html index 5178895f17c..d8fbf958aa2 100644 --- a/regress/usr.bin/mandoc/char/unicode/latin1.out_html +++ b/regress/usr.bin/mandoc/char/unicode/latin1.out_html @@ -1,171 +1,86 @@ BEGINTEST -<br/> ¢¢ CENT SIGN -<br/> ¤¤ CURRENCY SIGN -<br/> ¥¥ YEN SIGN -<br/> ¦¦ BROKEN BAR -<br/> ¨¨ DIAERESIS -<br/> ©© COPYRIGHT SIGN -<br/> ª FEMININE ORDINAL INDICATOR -<br/> «« LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -<br/> ¬¬¬ NOT SIGN -<br/> -­ SOFT HYPHEN -<br/> +­ SOFT HYPHEN ®® REGISTERED SIGN -<br/> ±±± PLUS-MINUS SIGN -<br/> ² SUPERSCRIPT TWO -<br/> ³ SUPERSCRIPT THREE -<br/> ´´´ ACUTE ACCENT -<br/> µµ MICRO SIGN -<br/> ·· MIDDLE DOT -<br/> ¸¸ CEDILLA -<br/> ¹ SUPERSCRIPT ONE -<br/> º MASCULINE ORDINAL INDICATOR -<br/> »» RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -<br/> ¼¼ VULGAR FRACTION ONE QUARTER -<br/> ½½ VULGAR FRACTION ONE HALF -<br/> ¾¾ VULGAR FRACTION THREE QUARTERS -<br/> ÀÀ LATIN CAPITAL LETTER A WITH GRAVE -<br/> ÁÁ LATIN CAPITAL LETTER A WITH ACUTE -<br/>  LATIN CAPITAL LETTER A WITH CIRCUMFLEX -<br/> Ãà LATIN CAPITAL LETTER A WITH TILDE -<br/> ÄÄ LATIN CAPITAL LETTER A WITH DIAERESIS -<br/> ÅÅ LATIN CAPITAL LETTER A WITH RING ABOVE -<br/> ÆÆ LATIN CAPITAL LETTER AE -<br/> ÇÇ LATIN CAPITAL LETTER C WITH CEDILLA -<br/> ÈÈ LATIN CAPITAL LETTER E WITH GRAVE -<br/> ÉÉ LATIN CAPITAL LETTER E WITH ACUTE -<br/> ÊÊ LATIN CAPITAL LETTER E WITH CIRCUMFLEX -<br/> ËË LATIN CAPITAL LETTER E WITH DIAERESIS -<br/> ÌÌ LATIN CAPITAL LETTER I WITH GRAVE -<br/> ÍÍ LATIN CAPITAL LETTER I WITH ACUTE -<br/> ÎÎ LATIN CAPITAL LETTER I WITH CIRCUMFLEX -<br/> ÏÏ LATIN CAPITAL LETTER I WITH DIAERESIS -<br/> ÐÐ LATIN CAPITAL LETTER ETH -<br/> ÑÑ LATIN CAPITAL LETTER N WITH TILDE -<br/> ÒÒ LATIN CAPITAL LETTER O WITH GRAVE -<br/> ÓÓ LATIN CAPITAL LETTER O WITH ACUTE -<br/> ÔÔ LATIN CAPITAL LETTER O WITH CIRCUMFLEX -<br/> ÕÕ LATIN CAPITAL LETTER O WITH TILDE -<br/> ÖÖ LATIN CAPITAL LETTER O WITH DIAERESIS -<br/> ××× MULTIPLICATION SIGN -<br/> ØØ LATIN CAPITAL LETTER O WITH STROKE -<br/> ÙÙ LATIN CAPITAL LETTER U WITH GRAVE -<br/> ÚÚ LATIN CAPITAL LETTER U WITH ACUTE -<br/> ÛÛ LATIN CAPITAL LETTER U WITH CIRCUMFLEX -<br/> ÜÜ LATIN CAPITAL LETTER U WITH DIAERESIS -<br/> Ý LATIN CAPITAL LETTER Y WITH ACUTE -<br/> àà LATIN SMALL LETTER A WITH GRAVE -<br/> áá LATIN SMALL LETTER A WITH ACUTE -<br/> ââ LATIN SMALL LETTER A WITH CIRCUMFLEX -<br/> ãã LATIN SMALL LETTER A WITH TILDE -<br/> ää LATIN SMALL LETTER A WITH DIAERESIS -<br/> åå LATIN SMALL LETTER A WITH RING ABOVE -<br/> ææ LATIN SMALL LETTER AE -<br/> çç LATIN SMALL LETTER C WITH CEDILLA -<br/> èè LATIN SMALL LETTER E WITH GRAVE -<br/> éé LATIN SMALL LETTER E WITH ACUTE -<br/> êê LATIN SMALL LETTER E WITH CIRCUMFLEX -<br/> ëë LATIN SMALL LETTER E WITH DIAERESIS -<br/> ìì LATIN SMALL LETTER I WITH GRAVE -<br/> íí LATIN SMALL LETTER I WITH ACUTE -<br/> îî LATIN SMALL LETTER I WITH CIRCUMFLEX -<br/> ïï LATIN SMALL LETTER I WITH DIAERESIS -<br/> ññ LATIN SMALL LETTER N WITH TILDE -<br/> òò LATIN SMALL LETTER O WITH GRAVE -<br/> óó LATIN SMALL LETTER O WITH ACUTE -<br/> ôô LATIN SMALL LETTER O WITH CIRCUMFLEX -<br/> õõ LATIN SMALL LETTER O WITH TILDE -<br/> öö LATIN SMALL LETTER O WITH DIAERESIS -<br/> ÷÷÷ DIVISION SIGN -<br/> øø LATIN SMALL LETTER O WITH STROKE -<br/> ùù LATIN SMALL LETTER U WITH GRAVE -<br/> úú LATIN SMALL LETTER U WITH ACUTE -<br/> ûû LATIN SMALL LETTER U WITH CIRCUMFLEX -<br/> üü LATIN SMALL LETTER U WITH DIAERESIS -<br/> ý LATIN SMALL LETTER Y WITH ACUTE -<br/> ÿÿ LATIN SMALL LETTER Y WITH DIAERESIS -<br/> ENDTEST diff --git a/regress/usr.bin/mandoc/char/unicode/latin1diff.out_html b/regress/usr.bin/mandoc/char/unicode/latin1diff.out_html index fa1a48657da..8d3265c73a5 100644 --- a/regress/usr.bin/mandoc/char/unicode/latin1diff.out_html +++ b/regress/usr.bin/mandoc/char/unicode/latin1diff.out_html @@ -1,25 +1,13 @@ BEGINTEST -<br/> ¡¡ INVERTED EXCLAMATION MARK -<br/> ££ POUND SIGN -<br/> §§ SECTION SIGN -<br/> ¯¯ MACRON -<br/> °° DEGREE SIGN -<br/> ¶¶ PILCROW SIGN -<br/> ¿¿ INVERTED QUESTION MARK -<br/> ÞÞ LATIN CAPITAL LETTER THORN -<br/> ßß LATIN SMALL LETTER SHARP S -<br/> ðð LATIN SMALL LETTER ETH -<br/> þþ LATIN SMALL LETTER THORN -<br/> ENDTEST diff --git a/regress/usr.bin/mandoc/char/unicode/named.out_html b/regress/usr.bin/mandoc/char/unicode/named.out_html index 8ee47dbf77b..c4de9a5b2d1 100644 --- a/regress/usr.bin/mandoc/char/unicode/named.out_html +++ b/regress/usr.bin/mandoc/char/unicode/named.out_html @@ -1,297 +1,149 @@ BEGINTEST -<br/> ıı LATIN SMALL LETTER DOTLESS I -<br/> IJIJ LATIN CAPITAL LIGATURE IJ -<br/> ijij LATIN SMALL LIGATURE IJ -<br/> ŁŁ LATIN CAPITAL LETTER L WITH STROKE -<br/> łł LATIN SMALL LETTER L WITH STROKE -<br/> ŒŒ LATIN CAPITAL LIGATURE OE -<br/> œœ LATIN SMALL LIGATURE OE -<br/> ƒƒ LATIN SMALL LETTER F WITH HOOK -<br/> ˇˇ CARON -<br/> ˘˘ BREVE -<br/> ˚˚ RING ABOVE -<br/> ˛˛ OGONEK -<br/> ˝˝ DOUBLE ACUTE ACCENT -<br/> ΑΑ GREEK CAPITAL LETTER ALPHA -<br/> ΒΒ GREEK CAPITAL LETTER BETA -<br/> ΔΔ GREEK CAPITAL LETTER DELTA -<br/> ΕΕ GREEK CAPITAL LETTER EPSILON -<br/> ΖΖ GREEK CAPITAL LETTER ZETA -<br/> ΗΗ GREEK CAPITAL LETTER ETA -<br/> ΘΘ GREEK CAPITAL LETTER THETA -<br/> ΙΙ GREEK CAPITAL LETTER IOTA -<br/> ΚΚ GREEK CAPITAL LETTER KAPPA -<br/> ΛΛ GREEK CAPITAL LETTER LAMDA -<br/> ΜΜ GREEK CAPITAL LETTER MU -<br/> ΝΝ GREEK CAPITAL LETTER NU -<br/> ΞΞ GREEK CAPITAL LETTER XI -<br/> ΟΟ GREEK CAPITAL LETTER OMICRON -<br/> ΠΠ GREEK CAPITAL LETTER PI -<br/> ΡΡ GREEK CAPITAL LETTER RHO -<br/> ΤΤ GREEK CAPITAL LETTER TAU -<br/> ΥΥ GREEK CAPITAL LETTER UPSILON -<br/> ΦΦ GREEK CAPITAL LETTER PHI -<br/> ΧΧ GREEK CAPITAL LETTER CHI -<br/> ΨΨ GREEK CAPITAL LETTER PSI -<br/> ΩΩ GREEK CAPITAL LETTER OMEGA -<br/> αα GREEK SMALL LETTER ALPHA -<br/> ββ GREEK SMALL LETTER BETA -<br/> γγ GREEK SMALL LETTER GAMMA -<br/> δδ GREEK SMALL LETTER DELTA -<br/> εε GREEK SMALL LETTER EPSILON -<br/> ζζ GREEK SMALL LETTER ZETA -<br/> ηη GREEK SMALL LETTER ETA -<br/> θθ GREEK SMALL LETTER THETA -<br/> ιι GREEK SMALL LETTER IOTA -<br/> κκ GREEK SMALL LETTER KAPPA -<br/> λλ GREEK SMALL LETTER LAMDA -<br/> μμ GREEK SMALL LETTER MU -<br/> νν GREEK SMALL LETTER NU -<br/> ξξ GREEK SMALL LETTER XI -<br/> οο GREEK SMALL LETTER OMICRON -<br/> ππ GREEK SMALL LETTER PI -<br/> ρρ GREEK SMALL LETTER RHO -<br/> ςς GREEK SMALL LETTER FINAL SIGMA -<br/> σσ GREEK SMALL LETTER SIGMA -<br/> ττ GREEK SMALL LETTER TAU -<br/> υυ GREEK SMALL LETTER UPSILON -<br/> φφ GREEK SMALL LETTER PHI -<br/> χχ GREEK SMALL LETTER CHI -<br/> ψψ GREEK SMALL LETTER PSI -<br/> ωω GREEK SMALL LETTER OMEGA -<br/> ϑϑ GREEK THETA SYMBOL -<br/> ϕϕ GREEK PHI SYMBOL -<br/> ϖϖ GREEK PI SYMBOL -<br/> ϵϵ GREEK LUNATE EPSILON SYMBOL -<br/> ‐‐ HYPHEN -<br/> –– EN DASH -<br/> —— EM DASH -<br/> ‘‘ LEFT SINGLE QUOTATION MARK -<br/> ’’ RIGHT SINGLE QUOTATION MARK -<br/> ‚‚ SINGLE LOW-9 QUOTATION MARK -<br/> ““ LEFT DOUBLE QUOTATION MARK -<br/> ”” RIGHT DOUBLE QUOTATION MARK -<br/> „„ DOUBLE LOW-9 QUOTATION MARK -<br/> †† DAGGER -<br/> ‡‡ DOUBLE DAGGER -<br/> •• BULLET -<br/> ‰‰ PER MILLE SIGN -<br/> ′′ PRIME -<br/> ″″ DOUBLE PRIME -<br/> ‹‹ SINGLE LEFT-POINTING ANGLE QUOTATION MARK -<br/> ›› SINGLE RIGHT-POINTING ANGLE QUOTATION MARK -<br/> ⁄⁄ FRACTION SLASH -<br/> €€€ EURO SIGN -<br/> ℑℑ BLACK-LETTER CAPITAL I -<br/> ℜℜ BLACK-LETTER CAPITAL R -<br/> ™™ TRADE MARK SIGN -<br/> ℵℵ ALEF SYMBOL -<br/> ←← LEFTWARDS ARROW -<br/> ↑↑ UPWARDS ARROW -<br/> →→ RIGHTWARDS ARROW -<br/> ↓↓ DOWNWARDS ARROW -<br/> ↔↔ LEFT RIGHT ARROW -<br/> ↵↵ DOWNWARDS ARROW WITH CORNER LEFTWARDS -<br/> ⇐⇐ LEFTWARDS DOUBLE ARROW -<br/> ⇑⇑ UPWARDS DOUBLE ARROW -<br/> ⇒⇒ RIGHTWARDS DOUBLE ARROW -<br/> ⇓⇓ DOWNWARDS DOUBLE ARROW -<br/> ⇔⇔ LEFT RIGHT DOUBLE ARROW -<br/> ∀∀ FOR ALL -<br/> ∂∂ PARTIAL DIFFERENTIAL -<br/> ∃∃ THERE EXISTS -<br/> ∅∅ EMPTY SET -<br/> ∈∈ ELEMENT OF -<br/> ∋∋ CONTAINS AS MEMBER -<br/> −− MINUS SIGN -<br/> ∓∓ MINUS-OR-PLUS SIGN -<br/> ∗∗ ASTERISK OPERATOR -<br/> √√ SQUARE ROOT -<br/> ∝∝ PROPORTIONAL TO -<br/> ∞∞ INFINITY -<br/> ∠∠ ANGLE -<br/> ∧∧ LOGICAL AND -<br/> ∨∨ LOGICAL OR -<br/> ∩∩ INTERSECTION -<br/> ∪∪ UNION -<br/> ∫∫ INTEGRAL -<br/> ∴∴∴ THEREFORE -<br/> ∼∼ TILDE OPERATOR -<br/> ≃≃ ASYMPTOTICALLY EQUAL TO -<br/> ≅≅ APPROXIMATELY EQUAL TO -<br/> ≈≈≈ ALMOST EQUAL TO -<br/> ≠≠ NOT EQUAL TO -<br/> ≡≡ IDENTICAL TO -<br/> ≢≢ NOT IDENTICAL TO -<br/> ≤≤ LESS-THAN OR EQUAL TO -<br/> ≥≥ GREATER-THAN OR EQUAL TO -<br/> ⊂⊂ SUBSET OF -<br/> ⊃⊃ SUPERSET OF -<br/> ⊆⊆ SUBSET OF OR EQUAL TO -<br/> ⊇⊇ SUPERSET OF OR EQUAL TO -<br/> ⊕⊕ CIRCLED PLUS -<br/> ⊗⊗ CIRCLED TIMES -<br/> ⊥⊥ UP TACK -<br/> ⋅⋅ DOT OPERATOR -<br/> ⌈⌈ LEFT CEILING -<br/> ⌉⌉ RIGHT CEILING -<br/> ⌊⌊ LEFT FLOOR -<br/> ⌋⌋ RIGHT FLOOR -<br/> ⎪⎪ CURLY BRACKET EXTENSION -<br/> ││ BOX DRAWINGS LIGHT VERTICAL -<br/> □□ WHITE SQUARE -<br/> ◊◊ LOZENGE -<br/> ○○ WHITE CIRCLE -<br/> ☜☜ WHITE LEFT POINTING INDEX -<br/> ☞☞ WHITE RIGHT POINTING INDEX -<br/> ⟨⟨ MATHEMATICAL LEFT ANGLE BRACKET -<br/> ⟩⟩ MATHEMATICAL RIGHT ANGLE BRACKET -<br/> ENDTEST diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.out_html b/regress/usr.bin/mandoc/char/unicode/namediff.out_html index 6c4946295ba..d682ffbe116 100644 --- a/regress/usr.bin/mandoc/char/unicode/namediff.out_html +++ b/regress/usr.bin/mandoc/char/unicode/namediff.out_html @@ -1,73 +1,37 @@ BEGINTEST -<br/> ȷȷ LATIN SMALL LETTER DOTLESS J -<br/> ˙˙ DOT ABOVE -<br/> ΓΓ GREEK CAPITAL LETTER GAMMA -<br/> ΣΣ GREEK CAPITAL LETTER SIGMA -<br/> ‾‾ OVERLINE -<br/> ℏℏ PLANCK CONSTANT OVER TWO PI -<br/> ↕↕ UP DOWN ARROW -<br/> ⇕⇕ UP DOWN DOUBLE ARROW -<br/> ∇∇ NABLA -<br/> ∉∉ NOT AN ELEMENT OF -<br/> ∏∏ N-ARY PRODUCT -<br/> ∐∐ N-ARY COPRODUCT -<br/> ∑∑ N-ARY SUMMATION -<br/> ⊄⊄ NOT A SUBSET OF -<br/> ⊅⊅ NOT A SUPERSET OF -<br/> ⎛⎛ LEFT PARENTHESIS UPPER HOOK -<br/> ⎜⎜ LEFT PARENTHESIS EXTENSION -<br/> ⎝⎝ LEFT PARENTHESIS LOWER HOOK -<br/> ⎞⎞ RIGHT PARENTHESIS UPPER HOOK -<br/> ⎟⎟ RIGHT PARENTHESIS EXTENSION -<br/> ⎠⎠ RIGHT PARENTHESIS LOWER HOOK -<br/> ⎡⎡ LEFT SQUARE BRACKET UPPER CORNER -<br/> ⎢⎢ LEFT SQUARE BRACKET EXTENSION -<br/> ⎣⎣ LEFT SQUARE BRACKET LOWER CORNER -<br/> ⎤⎤ RIGHT SQUARE BRACKET UPPER CORNER -<br/> ⎥⎥ RIGHT SQUARE BRACKET EXTENSION -<br/> ⎦⎦ RIGHT SQUARE BRACKET LOWER CORNER -<br/> ⎧⎧ LEFT CURLY BRACKET UPPER HOOK -<br/> ⎨⎨ LEFT CURLY BRACKET MIDDLE PIECE -<br/> ⎩⎩ LEFT CURLY BRACKET LOWER HOOK -<br/> ⎪⎪⎪⎪ CURLY BRACKET EXTENSION -<br/> ⎫⎫ RIGHT CURLY BRACKET UPPER HOOK -<br/> ⎬⎬ RIGHT CURLY BRACKET MIDDLE PIECE -<br/> ⎭⎭ RIGHT CURLY BRACKET LOWER HOOK -<br/> ✓✓ CHECK MARK -<br/> ENDTEST diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.out_html b/regress/usr.bin/mandoc/char/unicode/nogroff.out_html index 849f8b07aef..56e1fe7e760 100644 --- a/regress/usr.bin/mandoc/char/unicode/nogroff.out_html +++ b/regress/usr.bin/mandoc/char/unicode/nogroff.out_html @@ -1,73 +1,37 @@ BEGINTEST -<br/> �� <control> NULL -<br/> �� <control> START OF HEADING -<br/> �� <control> BELL -<br/> �� <control> BACKSPACE -<br/> <control> CHARACTER TABULATION -<br/> �� <control> LINE FEED -<br/> �� <control> LINE TABULATION -<br/> �� <control> FORM FEED -<br/> �� <control> CARRIAGE RETURN -<br/> �� <control> ESCAPE -<br/> �� <control> DELETE -<br/> �� <control> 0x80 -<br/> �� <control> 0x81 -<br/> �� <control> BREAK PERMITTED HERE -<br/> �� <control> NO BREAK HERE -<br/> �� <control> PRIVACY MESSAGE -<br/> �� <control> APPLICATION PROGRAM COMMAND -<br/> ≪≪ MUCH LESS-THAN -<br/> ≫≫ MUCH GREATER-THAN -<br/> ffff LATIN SMALL LIGATURE FF -<br/> fifi LATIN SMALL LIGATURE FI -<br/> flfl LATIN SMALL LIGATURE FL -<br/> ffiffi LATIN SMALL LIGATURE FFI -<br/> fflffl LATIN SMALL LIGATURE FFL -<br/> � REPLACEMENT CHARACTER -<br/>  <undefined> -<br/>  <undefined> -<br/> 𐀀 LINEAR B SYLLABLE B008 A -<br/> 󿿽 <Plane 15 Private Use, Last> -<br/>  <undefined> -<br/>  <undefined> -<br/> 􀀀 <Plane 16 Private Use, First> -<br/> 􏿽 <Plane 16 Private Use, Last> -<br/>  <undefined> -<br/>  <undefined> -<br/> ENDTEST |