svn: /phpdoc/doc-base/trunk/scripts/ apply/fix_modelines.php genPHP_INI_ENTRY.php reference-split.php xml_proto.php zendapi_macros.php
zendapi_protos.php

From: Date: Fri, 29 Jul 2011 15:33:16 +0000
Subject: svn: /phpdoc/doc-base/trunk/scripts/ apply/fix_modelines.php genPHP_INI_ENTRY.php reference-split.php xml_proto.php zendapi_macros.php
zendapi_protos.php
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-8563@lists.php.net to get a copy of this message
rquadling Fri, 29 Jul 2011 15:33:16 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313932 Log: sgml-default-dtd-file:"~/.phpdoc/manual.ced" Changed paths: U phpdoc/doc-base/trunk/scripts/apply/fix_modelines.php U phpdoc/doc-base/trunk/scripts/genPHP_INI_ENTRY.php U phpdoc/doc-base/trunk/scripts/reference-split.php U phpdoc/doc-base/trunk/scripts/xml_proto.php U phpdoc/doc-base/trunk/scripts/zendapi_macros.php U phpdoc/doc-base/trunk/scripts/zendapi_protos.php Modified: phpdoc/doc-base/trunk/scripts/apply/fix_modelines.php =================================================================== --- phpdoc/doc-base/trunk/scripts/apply/fix_modelines.php 2011-07-29 15:05:26 UTC (rev 313931) +++ phpdoc/doc-base/trunk/scripts/apply/fix_modelines.php 2011-07-29 15:33:16 UTC (rev 313932) @@ -29,14 +29,13 @@ } if ($modeline_started) { - if (ereg("sgml-default-dtd-file(.*)manual\.ced", $line, $regs)) { - $manual_ced_line = "sgml-default-dtd-file$regs[1]manual.ced\""; + $found_ced = preg_match("sgml-default-dtd-file:.*manual\.ced", $line); } } - if (!$modeline_started) { + if (1 !== $found_ced) { $output .= "$line\n"; } } @@ -47,7 +46,6 @@ if (!$manual_ced_line) { echo "WARNING: did NOT found a ced-line!\n"; - $manual_ced_line = 'sgml-default-dtd-file:"../../manual.ced"'; } $output .= <<<HEREDOC @@ -62,10 +60,7 @@ sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil - -HEREDOC; - $output .= "$manual_ced_line\n"; - $output .= <<<HEREDOC +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil Modified: phpdoc/doc-base/trunk/scripts/genPHP_INI_ENTRY.php =================================================================== --- phpdoc/doc-base/trunk/scripts/genPHP_INI_ENTRY.php 2011-07-29 15:05:26 UTC (rev 313931) +++ phpdoc/doc-base/trunk/scripts/genPHP_INI_ENTRY.php 2011-07-29 15:33:16 UTC (rev 313932) @@ -53,7 +53,7 @@ sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil Modified: phpdoc/doc-base/trunk/scripts/reference-split.php =================================================================== --- phpdoc/doc-base/trunk/scripts/reference-split.php 2011-07-29 15:05:26 UTC (rev 313931) +++ phpdoc/doc-base/trunk/scripts/reference-split.php 2011-07-29 15:33:16 UTC (rev 313932) @@ -119,8 +119,10 @@ // convert numbered sections to generic ones, prep. for hierachical ref $line = ereg_replace("(</?)sect[123456]","\\1section",$line); + /* Use fixed location for manual.ced. // file will move one level down, so path to emacs dtd-file needs one more .. $line = str_replace('../../manual.ced','../../../manual.ced',$line); + */ if (strstr($line,("<?xml"))&&($lineno==1)) { // remember xml header $xmlhead=$line; @@ -187,7 +189,7 @@ sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil Modified: phpdoc/doc-base/trunk/scripts/xml_proto.php =================================================================== --- phpdoc/doc-base/trunk/scripts/xml_proto.php 2011-07-29 15:05:26 UTC (rev 313931) +++ phpdoc/doc-base/trunk/scripts/xml_proto.php 2011-07-29 15:33:16 UTC (rev 313932) @@ -194,7 +194,7 @@ "sgml-indent-data:t\n" . "indent-tabs-mode:nil\n" . "sgml-parent-document:nil\n" . - "sgml-default-dtd-file:\"../../../manual.ced\"\n" . + "sgml-default-dtd-file:\"~/.phpdoc/manual.ced\"\n" . "sgml-exposed-tags:nil\n" . "sgml-local-catalogs:nil\n" . "sgml-local-ecat-files:nil\n" . @@ -383,7 +383,7 @@ "sgml-indent-data:t\n" . "indent-tabs-mode:nil\n" . "sgml-parent-document:nil\n" . - "sgml-default-dtd-file:\"../../../../manual.ced\"\n" . + "sgml-default-dtd-file:\"~/.phpdoc/manual.ced\"\n" . "sgml-exposed-tags:nil\n" . "sgml-local-catalogs:nil\n" . "sgml-local-ecat-files:nil\n" . @@ -545,7 +545,7 @@ "sgml-indent-data:t\n" . "indent-tabs-mode:nil\n" . "sgml-parent-document:nil\n" . - "sgml-default-dtd-file:\"../../../../manual.ced\"\n" . + "sgml-default-dtd-file:\"~/.phpdoc/manual.ced\"\n" . "sgml-exposed-tags:nil\n" . "sgml-local-catalogs:nil\n" . "sgml-local-ecat-files:nil\n" . Modified: phpdoc/doc-base/trunk/scripts/zendapi_macros.php =================================================================== --- phpdoc/doc-base/trunk/scripts/zendapi_macros.php 2011-07-29 15:05:26 UTC (rev 313931) +++ phpdoc/doc-base/trunk/scripts/zendapi_macros.php 2011-07-29 15:33:16 UTC (rev 313932) @@ -141,7 +141,7 @@ sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil Modified: phpdoc/doc-base/trunk/scripts/zendapi_protos.php =================================================================== --- phpdoc/doc-base/trunk/scripts/zendapi_protos.php 2011-07-29 15:05:26 UTC (rev 313931) +++ phpdoc/doc-base/trunk/scripts/zendapi_protos.php 2011-07-29 15:33:16 UTC (rev 313932) @@ -268,7 +268,7 @@ sgml-indent-data:t indent-tabs-mode:nil sgml-parent-document:nil -sgml-default-dtd-file:"../../../../manual.ced" +sgml-default-dtd-file:"~/.phpdoc/manual.ced" sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil

« previous php.doc.cvs (#8563) next »