Update of /var/cvs/cjk/texinput
In directory genba:/tmp/cvs-serv20259/texinput

Modified Files:
        CJKutf8.sty 
Log Message:


* texinput/CJKutf8.sty ([EMAIL PROTECTED]): New function.
([EMAIL PROTECTED]): Use [EMAIL PROTECTED] so that values > U+FFFF are correctly
represented as surrogates.


Index: CJKutf8.sty
===================================================================
RCS file: /var/cvs/cjk/texinput/CJKutf8.sty,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CJKutf8.sty 30 Sep 2006 15:41:49 -0000      1.6
--- CJKutf8.sty 5 Oct 2006 08:32:36 -0000       1.7
***************
*** 104,124 ****
         \fi}}
  
    [EMAIL PROTECTED]
!     \expandafter\ifx\csname [EMAIL PROTECTED]@#1\endcsname \relax
        \immediate\pdfobj stream {
!         /CIDInit /ProcSet findresource begin                    %
!           12 dict begin                                         %
!             begincmap                                           %
!               /CIDSystemInfo <<                                 %
!                 /Registry (TeX)                                 %
!                 /Ordering (Uni#1)                               %
!                 /Supplement 0 >> def                            %
!               /CMapName /TeX-Uni#1-0 def                        %
!               1 begincodespacerange <00> <FF> endcodespacerange %
!               1 beginbfrange <00> <FF> <#100> endbfrange        %
!             endcmap                                             %
!             CMapName currentdict /CMap defineresource           %
!             pop                                                 %
!           end                                                   %
          end }
        \expandafter\xdef\csname [EMAIL PROTECTED]@#1\endcsname{
--- 104,152 ----
         \fi}}
  
+   % Convert a CJK plane #2 to the corresponding surrogate value, if any.
+   % The result is returned in global macro #1.
+   [EMAIL PROTECTED]
+     [EMAIL PROTECTED] "0#2\relax}
+      \ifnum [EMAIL PROTECTED] > "0FF\relax
+        % prepare for surrogate
+        [EMAIL PROTECTED] -"0100\relax
+ 
+        % high surrogate value
+        [EMAIL PROTECTED] [EMAIL PROTECTED]
+        [EMAIL PROTECTED] 4\relax
+        [EMAIL PROTECTED] "0D800\relax
+        [EMAIL PROTECTED]@[EMAIL PROTECTED]
+        [EMAIL PROTECTED]@gtemp}
+ 
+        % upper byte of low surrogate value
+        [EMAIL PROTECTED] [EMAIL PROTECTED]
+        [EMAIL PROTECTED] 4\relax
+        [EMAIL PROTECTED] 4\relax
+        [EMAIL PROTECTED] [EMAIL PROTECTED]
+        [EMAIL PROTECTED] "0DC\relax
+        [EMAIL PROTECTED]@[EMAIL PROTECTED]
+        [EMAIL PROTECTED]@gtemp}
+      \else
+        \xdef#1{#2}
+      \fi}}
+ 
    [EMAIL PROTECTED]
!     {\expandafter\ifx\csname [EMAIL PROTECTED]@#1\endcsname \relax
!      [EMAIL PROTECTED]@gtemp}{#1}
        \immediate\pdfobj stream {
!         /CIDInit /ProcSet findresource begin                      %
!           12 dict begin                                           %
!             begincmap                                             %
!               /CIDSystemInfo <<                                   %
!                 /Registry (TeX)                                   %
!                 /Ordering (Uni#1)                                 %
!                 /Supplement 0 >> def                              %
!               /CMapName /TeX-Uni#1-0 def                          %
!               1 begincodespacerange <00> <FF> endcodespacerange   %
!               1 beginbfrange <00> <FF> <[EMAIL PROTECTED] 00> endbfrange %
!             endcmap                                               %
!             CMapName currentdict /CMap defineresource             %
!             pop                                                   %
!           end                                                     %
          end }
        \expandafter\xdef\csname [EMAIL PROTECTED]@#1\endcsname{
***************
*** 126,130 ****
      \fi
      [EMAIL PROTECTED]
!       /ToUnicode \csname [EMAIL PROTECTED]@#1\endcsname\space 0 R}}
  \fi
  
--- 154,158 ----
      \fi
      [EMAIL PROTECTED]
!       /ToUnicode \csname [EMAIL PROTECTED]@#1\endcsname\space 0 R}}}
  \fi
  


_______________________________________________
Cjk-commit maillist  -  [email protected]
http://lists.ffii.org/mailman/listinfo/cjk-commit

Reply via email to