svn: /phd/trunk/phpdotnet/phd/Package/ Generic/XHTML.php PEAR/XHTML.php
| From: | Alexey Borzov | Date: | Sun, 05 Feb 2012 07:47:43 +0000 |
| Subject: | svn: /phd/trunk/phpdotnet/phd/Package/ Generic/XHTML.php PEAR/XHTML.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-9544@lists.php.net to get a copy of this message | ||
avb Sun, 05 Feb 2012 07:47:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323069
Log:
Make refsections linkable in Package_PEAR_XHTML, fix obviously wrong namespace in
Package_Generic_XHTML
Changed paths:
U phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php
U phd/trunk/phpdotnet/phd/Package/PEAR/XHTML.php
Modified: phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php 2012-02-05 06:09:22 UTC (rev 323068)
+++ phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php 2012-02-05 07:47:43 UTC (rev 323069)
@@ -35,7 +35,7 @@
'copyright' => 'format_copyright',
'date' => array(
/* DEFAULT */ 'p',
- 'revision' => 'format_entry',
+ 'revision' => 'format_entry',
),
'editor' => 'format_editor',
'edition' => 'format_suppressed_tags',
@@ -361,7 +361,7 @@
'contrib' => 'format_suppressed_text',
'shortaffil' => 'format_suppressed_text',
'edition' => 'format_suppressed_text',
-
+
'programlisting' => 'format_programlisting_text',
'screen' => 'format_screen_text',
'alt' => 'format_alt_text',
@@ -439,7 +439,7 @@
"footnote" => array(
),
"tablefootnotes" => array(
- ),
+ ),
"chunk_id" => null,
"varlistentry" => array(
"listitems" => array(),
@@ -458,7 +458,7 @@
$this->registerPIHandlers($this->pihandlers);
$this->setExt(Config::ext() === null ? ".html" : Config::ext());
}
-
+
public function getDefaultElementMap() {
return $this->myelementmap;
}
@@ -483,7 +483,7 @@
if ($header) {
$toc .= $this->getTocHeader($props);
}
- $toc .= "<ul class=\"chunklist chunklist_$name\">\n";
+ $toc .= "<ul class=\"chunklist chunklist_$name\">\n";
foreach ($this->getChildren($id) as $child) {
$isLDesc = null;
$isSDesc = null;
@@ -509,7 +509,7 @@
{
return '<strong>' . $this->autogen('toc',
$props['lang']) . '</strong>';
}
-
+
/**
* Handle a <phd:toc> tag.
*/
@@ -555,7 +555,7 @@
protected function fetchStylesheet($name = null) {
if (!$this->isChunked()) {
foreach ((array)Config::css() as $css) {
- if ($style = file_get_contents($css)) {
+ if ($style = file_get_contents($css)) {
$this->stylesheets[] = $style;
} else {
v("Stylesheet %s not fetched.", $css, E_USER_WARNING);
@@ -587,8 +587,8 @@
}
}
}
-
-/* Functions format_* */
+
+/* Functions format_* */
public function format_suppressed_tags($open, $name, $attrs, $props) {
/* Ignore it */
return "";
@@ -744,7 +744,7 @@
$this->CURRENT_CHUNK = $id;
$this->notify(Render::CHUNK, Render::CLOSE);
$toc = "";
- if (!in_array($id, $this->TOC_WRITTEN)) {
+ if (!in_array($id, $this->TOC_WRITTEN)) {
$toc = $this->createTOC($id, $name, $props);
}
@@ -797,7 +797,7 @@
public function format_section_chunk($open, $name, $attrs, $props) {
if ($open) {
if (!isset($attrs[Reader::XMLNS_XML]["id"])) {
- $this->isSectionChunk[] = false;
+ $this->isSectionChunk[] = false;
return $this->transformFromMap($open, "div", $name, $attrs, $props);
}
$this->isSectionChunk[] = true;
@@ -805,7 +805,7 @@
}
if (array_pop($this->isSectionChunk)) {
return $this->format_chunk($open, $name, $attrs, $props);
- }
+ }
return $this->transformFromMap($open, "div", $name, $attrs, $props);
}
public function format_chunk($open, $name, $attrs, $props) {
@@ -864,8 +864,8 @@
}
$this->role = $role = $attrs[Reader::XMLNS_DOCBOOK]["role"];
- if (isset($attrs[Reader::XMLNS_DOCBOOK]["id"])) {
- $id = $attrs[Reader::XMLNS_DOCBOOK]["id"];
+ if (isset($attrs[Reader::XMLNS_XML]["id"])) {
+ $id = $attrs[Reader::XMLNS_XML]["id"];
}
else {
$id = $name. "-" . $this->CURRENT_CHUNK . "-" . $role;
@@ -1280,7 +1280,7 @@
return "<b><tt>";
}
return "</tt></b>";
- }
+ }
public function admonition_title($title, $lang) {
return '<b class="' .(strtolower($title)). '">'
.($this->autogen($title, $lang)). '</b>';
}
@@ -1607,7 +1607,7 @@
public function format_screen_text($value, $tag) {
return nl2br($this->TEXT($value));
}
-
+
/**
* Renders a <tag class=""> tag.
*
@@ -1634,7 +1634,7 @@
if ($props['empty']) {
return '';
}
-
+
$class = 'starttag';
if (isset($attrs['class'])) {
$class = $attrs['class'];
@@ -1650,7 +1650,7 @@
return '<code>' . $arFixes[$class][0];
}
-
+
public function format_dl($open, $name, $attrs, $props) {
if ($open) {
return '<dl class="' . $name . '">';
Modified: phd/trunk/phpdotnet/phd/Package/PEAR/XHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/PEAR/XHTML.php 2012-02-05 06:09:22 UTC (rev 323068)
+++ phd/trunk/phpdotnet/phd/Package/PEAR/XHTML.php 2012-02-05 07:47:43 UTC (rev 323069)
@@ -152,7 +152,7 @@
'refname' => 'format_refname',
'refnamediv' => 'format_suppressed_tags',
'refpurpose' => 'format_refpurpose',
- 'refsection' => 'format_div',
+ 'refsection' => 'format_refsect',
'refsynopsisdiv' => 'format_refsynopsisdiv',
'row' => 'format_row',
'screen' => 'format_screen',