Index: formatters/classes/typografica.php
===================================================================
--- formatters/classes/typografica.php	(revision 485)
+++ formatters/classes/typografica.php	(working copy)
@@ -61,6 +61,7 @@
   var $glueright = array( "���\.", "���\.", "�\.�\.", "���\." );
 
   var $settings = array ( "inches" => 1, // ������������� ��� � "
+  						  "apostroph" => 1, // ������������� ����������
                           "laquo" => 1,  // �����-�����
                           "farlaquo" => 0,  // �����-����� �� ���� (����� "����-����")
                           "quotes" => 1, // �����-���������� �����
@@ -229,6 +230,9 @@
     // 0. ��� � �������
     if ($this->settings["inches"])
       $data = preg_replace( "/(?<=\s)(([0-9]{1,2}([\.,][0-9]{1,2})?))\"/i", "\\1&quot;", $data );
+    // 0a. ��������
+    if ($this->settings["apostroph"])
+      $data = preg_replace( "/([\s\"][~0-9�����������'A-Za-z�-��-�\-:\/\.]+)'([~�����������������][~0-9�����������'A-Za-z�-��-�\-:\/\.]+[\s\.,:;\)<=\"])/i", "\\1�\\2", $data );
     // 1. �����
     if ($this->settings["quotes"])
     {
@@ -246,17 +250,17 @@
     if ($this->settings["laquo"])
     {
       $data = preg_replace( "/\"\"/i", "&quot;&quot;", $data );
-      $data = preg_replace( "/(^|\s|\201|\200|>|\()\"((\201|\200)*[~0-9��A-Za-z�-��-�\-:\/\.])/i", "\\1&laquo;\\2", $data );
+      $data = preg_replace( "/(^|\s|\201|\200|>|\()\"((\201|\200)*[~0-9�����������'A-Za-z�-��-�\-:\/\.])/i", "\\1&laquo;\\2", $data );
       // nb: wacko only regexp follows:
-      $data = preg_replace( "/(^|\s|\201|\200|>|\()\"((\201|\200|\/&nbsp;|\/|\!)*[~0-9��A-Za-z�-��-�\-:\/\.])/i", "\\1&laquo;\\2", $data );
+      $data = preg_replace( "/(^|\s|\201|\200|>|\()\"((\201|\200|\/&nbsp;|\/|\!)*[~0-9���������'A-Za-z�-��-�\-:\/\.])/i", "\\1&laquo;\\2", $data );
       $_data = "\"\"";
       while ($_data != $data)
       {  
         $_data = $data;
-        $data = preg_replace( "/(\&laquo\;([^\"]*)[��A-Za-z�-��-�0-9\.\-:\/](\201|\200)*)\"/si", "\\1&raquo;", $data );
+        $data = preg_replace( "/(\&laquo\;([^\"]*)[�����������'A-Za-z�-��-�0-9\.\-:\/](\201|\200)*)\"/si", "\\1&raquo;", $data );
         // nb: wacko only regexps follows:
-        $data = preg_replace( "/(\&laquo\;([^\"]*)[��A-Za-z�-��-�0-9\.\-:\/](\201|\200)*\?(\201|\200)*)\"/si", "\\1&raquo;", $data );
-        $data = preg_replace( "/(\&laquo\;([^\"]*)[��A-Za-z�-��-�0-9\.\-:\/](\201|\200|\/|\!)*)\"/si", "\\1&raquo;", $data );
+        $data = preg_replace( "/(\&laquo\;([^\"]*)[�����������'A-Za-z�-��-�0-9\.\-:\/](\201|\200)*\?(\201|\200)*)\"/si", "\\1&raquo;", $data );
+        $data = preg_replace( "/(\&laquo\;([^\"]*)[�����������'A-Za-z�-��-�0-9\.\-:\/](\201|\200|\/|\!)*)\"/si", "\\1&raquo;", $data );
       }
     }
       // 2a. ����� �� FAR manager