diff options
| author | petko <petko@524c5546-5005-0410-9a3e-e25e191bd360> | 2014-12-29 16:43:38 +0000 |
|---|---|---|
| committer | petko <petko@524c5546-5005-0410-9a3e-e25e191bd360> | 2014-12-29 16:43:38 +0000 |
| commit | 3de15d26197b70a44a51f3c9bd98983eb3ddea86 (patch) | |
| tree | d48b787b094f81f5ceaf9bd7898c35f8a60a2efb | |
| parent | 149c87e0fa6909ac832b563cd1888fc15a42d30f (diff) | |
| download | pmwiki.svn-3de15d26197b70a44a51f3c9bd98983eb3ddea86.tar.bz2 | |
Un-hardwrap PmWiki (:markup:) examples, PITS:01360
git-svn-id: svn://pmwiki.org/pmwiki/trunk@3019 524c5546-5005-0410-9a3e-e25e191bd360
| -rw-r--r-- | scripts/stdmarkup.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/stdmarkup.php b/scripts/stdmarkup.php index 28ca1203..78cef5c6 100644 --- a/scripts/stdmarkup.php +++ b/scripts/stdmarkup.php @@ -441,9 +441,9 @@ function MarkupMarkup($pagename, $text, $opt = '') { "<caption>{$opt['caption']}</caption>"); $class = preg_replace('/[^-\\s\\w]+/', ' ', @$opt['class']); $sep = (strpos($class, 'horiz') !== false) ? '' : '</tr><tr>'; - + $pretext = str_replace(" ", " ", nl2br($text)); return Keep(@"<table class='markup $class' align='center'>$caption - <tr><td class='markup1' valign='top'><pre>$text</pre></td>$sep<td + <tr><td class='markup1' valign='top'><code>$pretext</code></td>$sep<td class='markup2' valign='top'>$html</td></tr></table>"); } @@ -459,7 +459,6 @@ SDV($HTMLStylesFmt['markup'], " td.markup1, td.markup2 { padding-left:10px; padding-right:10px; } table.vert td.markup1 { border-bottom:1px solid #ccf; } table.horiz td.markup1 { width:23em; border-right:1px solid #ccf; } - td.markup1 pre { width:100%; overflow: auto;} table.markup caption { text-align:left; } div.faq p, div.faq pre { margin-left:2em; } div.faq p.question { margin:1em 0 0.75em 0; font-weight:bold; } |