Update of /home/spip-cvs/spip/ecrire
In directory miel:/tmp/cvs-serv24842/ecrire
Modified Files:
articles.php3 inc_texte.php3 inc_version.php3
Log Message:
activer_revision_nbsp devient une option de mes_options.php3 (pratique parfois, mais généralement laid et perturbant)
Index: articles.php3
RCS file: /home/spip-cvs/spip/ecrire/articles.php3,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- articles.php3 22 Feb 2004 16:36:03 -0000 1.158
+++ articles.php3 25 Feb 2004 10:29:41 -0000 1.159
@@ -1479,7 +1479,7 @@
}
else {
echo "<div $dir_lang><b>";
- $revision_nbsp = ($options == "avancees"); // a regler pour relecture des nbsp dans les articles
+ $revision_nbsp = $activer_revision_nbsp;
echo justifier(propre($chapo));
echo "</b></div>\n\n";
Index: inc_texte.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_texte.php3,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- inc_texte.php3 24 Feb 2004 17:49:16 -0000 1.189
+++ inc_texte.php3 25 Feb 2004 10:29:41 -0000 1.190
@@ -160,9 +160,9 @@
$letexte = corriger_caracteres($letexte);
$letexte = str_replace("'", "’", $letexte);
- // relecture des
- // if ($GLOBALS['flag_ecrire'] AND $GLOBALS['revision_nbsp'])
- // $letexte = ereg_replace(' ', '<span class="spip-nbsp"> </span>', $letexte);
+ relecture des
+ if ($GLOBALS['flag_ecrire'] AND $GLOBALS['revision_nbsp'])
+ $letexte = ereg_replace(' ', '<span class="spip-nbsp"> </span>', $letexte);
return $letexte;
}
@@ -442,12 +442,6 @@
include_ecrire('inc_lang.php3');
$lang = lang_typo($spip_lang);
}
-
- // relecture des
- if ($GLOBALS['flag_ecrire'] AND $GLOBALS['revision_nbsp'])
- $letexte = ereg_replace(" *~+ *", '<span class="spip-nbsp"> </span>', $letexte);
-
-
if ($lang == 'fr')
$letexte = typo_fr($letexte);
Index: inc_version.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_version.php3,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- inc_version.php3 24 Feb 2004 22:30:55 -0000 1.296
+++ inc_version.php3 25 Feb 2004 10:29:41 -0000 1.297
@@ -122,6 +122,9 @@
// faut-il afficher en rouge les chaines non traduites ?
$test_i18n = false;
+// faut-il souligner en gris, dans ecrire/articles.php3, les espaces insecables ?
+$activer_revision_nbsp = false;
+
// gestion des extras (voir ecrire/inc_extra.php3 pour plus d'informations)
$champs_extra = false;
$champs_extra_proposes = false;