From bc8c959ad61aa50b1956d8a9223ad0ebec39a09d Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 7 Mar 2001 16:45:20 +0000
Subject: [PATCH] Recognize international characters in WikiWords.

We do this by using POSIX character classes (like [[:upper:]]) in the
perl regexps.  Getting this to work involves calling setlocale().
(See comments in lib/config.php for more details.)

I suspect my current hacks will not work in all PHP environments.  I'd
appreciate success/failure reports.


git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@468 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 index.php         |  4 ++--
 lib/config.php    | 24 +++++++++++++++++++++++-
 lib/transform.php |  4 ++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index eff3e63c0..ab1160c5b 100644
--- a/index.php
+++ b/index.php
@@ -11,7 +11,7 @@
 /////////////////////////////////////////////////////////////////////
 define ('PHPWIKI_VERSION', '1.3.0pre');
 require "lib/prepend.php";
-rcs_id('$Id: index.php,v 1.12 2001-02-17 18:05:47 wainstead Exp $');
+rcs_id('$Id: index.php,v 1.13 2001-03-07 16:45:19 dairiki Exp $');
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -176,7 +176,7 @@ $InlineImages = "png|jpg|gif";
 
 // Perl regexp for WikiNames ("bumpy words")
 // (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
-$WikiNameRegexp = "(?<![A-Za-z0-9])([A-Z][a-z]+){2,}(?![A-Za-z0-9])";
+$WikiNameRegexp = "(?<![[:alnum:]])([[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])";
 
 // InterWiki linking -- wiki-style links to other wikis on the web
 //
diff --git a/lib/config.php b/lib/config.php
index eb7e7c6c2..131ea3a9e 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.34 2001-02-16 04:43:07 dairiki Exp $');
+rcs_id('$Id: config.php,v 1.35 2001-03-07 16:45:20 dairiki Exp $');
 /*
  * NOTE: the settings here should probably not need to be changed.
  *
@@ -95,6 +95,28 @@ else
    textdomain ("phpwiki");
 }
 
+// To get the POSIX character classes in the PCRE's (e.g.
+// [[:upper:]]) to match extended characters (e.g. GrüßGott), we have
+// to set the locale, using setlocale().
+//
+// The problem is which locale to set?  We would like to recognize all
+// upper-case characters in the iso-8859-1 character set as upper-case
+// characters --- not just the one's which are in the current $LANG.
+//
+// As it turns out, at least on my system (Linux/glibc-2.2) as long as
+// you setlocale() to anything but "C" it works fine.  (I'm not sure
+// whether this is how it's supposed to be, or whether this is a bug
+// in the libc...)
+//
+// We don't currently use the locale setting for anything else, so for
+// now, just set the locale to US English.
+//
+// FIXME: Not all environments may support en_US?  We should probably
+// have a list of locales to try.
+
+if (setlocale('LC_CTYPE', 0) == 'C')
+   setlocale('LC_CTYPE', 'en_US.iso-8859-1');
+
 //////////////////////////////////////////////////////////////////
 // Autodetect URL settings:
 //
diff --git a/lib/transform.php b/lib/transform.php
index fabc19e8d..8d362e2c4 100644
--- a/lib/transform.php
+++ b/lib/transform.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: transform.php,v 1.19 2001-03-02 21:16:05 dairiki Exp $');
+<?php rcs_id('$Id: transform.php,v 1.20 2001-03-07 16:45:20 dairiki Exp $');
 
 define('WT_SIMPLE_MARKUP', 0);
 define('WT_TOKENIZER', 1);
@@ -283,7 +283,7 @@ $transform->register(WT_TOKENIZER, 'wtt_urls',
 
 if (function_exists('wtt_interwikilinks')) {
    $transform->register(WT_TOKENIZER, 'wtt_interwikilinks',
-			"!?(?<![A-Za-z0-9])$InterWikiLinkRegexp:$WikiNameRegexp");
+			"!?(?<![[:alnum:]])$InterWikiLinkRegexp:$WikiNameRegexp");
 }
 $transform->register(WT_TOKENIZER, 'wtt_bumpylinks', "!?$WikiNameRegexp");
 
-- 
2.45.2