loncom/interface/entities.pm - diff

Return to entities.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/entities.pm between versions 1.4 and 1.5

-version 1.4, 2008/04/01 10:45:44
+version 1.5, 2008/04/09 10:24:32
  Line 837  my %entities = {
     => '\\ensuremath\{\\boxminus\}',
     => '\\ensuremath\{\\boxtimes\}',
     => '\\ensuremath\{\\boxdot\}',
+     'vdash'  => '\\ensuremath\{\\vdash\}',
+    => '\\ensuremath\{\\vdash\}',
+     'dashv'  => '\\ensuremath\{\\dashv\}',
+    => '\\ensuremath\{\\dashv\}',
+     'perp'   => '\\ensuremath\{\\perp\}',
+    => '\\ensuremath\{\\perp\}',
+    => '\\ensuremath\{\\models\}',
+    => '\\ensuremath\{\\vDash\}',
+    => '\\ensuremath\{\\Vdash\}',
+    => '\\ensuremath\{\\Vvdash\}',
+    => '\\ensuremath\{\\nvdash\}',
+    => '\\ensuremath\{\\nvDash\}',
+    => '\\ensuremath\{\\nVdash\}',
+    => '\\ensuremath\{\\prec\}',
+    => '\\ensuremath\{\\succ\}',
+    => '\\ensuremath\{\\vartriangleleft\}',
+    => '\\ensuremath\{\\vartriangleright\}',
+    => '\\ensuremath\{\\trianglelefteq\}',
+    => '\\ensuremath\{\\trianglerighteq\}',
+    => '\\ensuremath\{\\veebar\}',
+    => '\\ensuremath\{\\land\}',
+    => '\\ensuremath\{\\lor\}',
+    => '\\ensuremath\{\\cap\}',
+    => '\\ensuremath\{\\cup\}',
+    => '\\ensuremath\{\\diamond\}',
+     'sdot'   => '\\ensuremath\{\\cdot\}',
+    => '\\ensuremath\{\\cdot\}',
+    => '\\ensuremath\{\\star\}',
+    => '\\ensuremath\{\\divideontimes\}',
+    => '\\ensuremath\{\\bowtie\}',
+    => '\\ensuremath\{\\ltimes\}',
+    => '\\ensuremath\{\\rtimes\}',
+    => '\\ensuremath\{\\leftthreetimes\}',
+    => '\\ensuremath\{\\rightthreetimes\}',
+    => '\\ensuremath\{\\simeq\}',
+    => '\\ensuremath\{\\curlyvee\}',
+    => '\\ensuremath\{\\curlywedge\}',
+    => '\\ensuremath\{\\Subset\}',
+    => '\\ensuremath\{\\Supset\}',
+    => '\\ensuremath\{\\Cap\}',
+    => '\\ensuremath\{\\Cup\}',
+    => '\\ensuremath\{\\pitchfork\}',
+    => '\\ensuremath\{\\lessdot\}',
+    => '\\ensuremath\{\\gtrdot\}',
+    => '\\ensuremath\{\\lll\}',
+    => '\\ensuremath\{\\ggg\}',
+    => '\\ensuremath\{\\gtreqless\}',
+    => '\\ensuremath\{\\lesseqgtr\}',
+    => '\\ensuremath\{\\eqslantless\}',
+    => '\\ensuremath\{\\eqslantgtr\}',
+    => '\\ensuremath\{\\curlyeqprec\}',
+    => '\\ensuremath\{\\curlyeqsucc\}',
+    => '\\ensuremath\{\\not\\preccurlyeq\}',
+    => '\\ensuremath\{\\not\\succurlyeq\}',
+    => '\\ensuremath\{\\not\\sqsupseteq\}',
+    => '\\ensuremath\{\\not\\sqsubseteq\}',
+    => '\\ensuremath\{\\not\\vartriangleleft\}',
+    => '\\ensuremath\{\\not\vartriangleright\}',
+    => '\\ensuremath\{\\not\trianglelefteq\}',
+    => '\\ensuremath\{\\not\trianglerighteq\}',
+    => '\\ensuremath\{\\vdots\}',
+    => '\\ensuremath\{\\varnothing\}',
+     'lceil'  => '\\ensuremath\{\\lceil\}',
+    => '\\ensuremath\{\\lceil\}',
+     'rceil'  => '\\ensuremath\{\\rceil\}',
+    => '\\ensuremath\{\\rceil\}',
+     'lfloor' => '\\ensuremath\{\\lfloor\}',
+    => '\\ensuremath\{\\lfloor\}',
+     'rfloor' => '\\ensuremath\{\\rfloor}',
+    => '\\ensuremath\{\\rfloor}',
+     'lang'   => '\\ensuremath\{\\langle\}',
+    => '\\ensuremath\{\\langle\}',
+     'rang'   => '\\ensuremath\{\\rangle\}',
+    => '\\ensuremath\{\\rangle\}',
+     'loz'    => '\\ensuremath\{\\lozenge\}',
+    => '\\ensuremath\{\\lozenge\}',
+     'spades' => '\\ensuremath\{\\spadesuit\}',
+    => '\\ensuremath\{\\spadesuit\}',
+    => '\\ensuremath\{\\heartsuit\}',
+    => '\\ensuremath\{\\diamondsuit\}',
+     'clubs'  => '\\ensuremath\{\\clubsuit\}',
+    => '\\ensuremath\{\\clubsuit\}',
+     'diams'  => '\\ensuremath\{\\blacklozenge\}',
+    => '\\ensuremath\{\\blacklozenge\}'
  };
- Line 850  my %entities = {
+ Line 930  my %entities = {
  #  This allows us to support, to some extent, any entity for which
  #  dvipdf can find a gylph (given that LaTeX is now UTF-8 clean).
  #
+ # Parameters:
+ #   unicode  - The unicode for the character.  This is assumed to
+ #              be a decimal value
+ # Returns:
+ #   The UTF-8 equiavalent of the value.
+ #
  sub entity_to_utf8 {
+     my ($unicode) = @_;
+     return pack("U", $unicode);
  }
- Line 861  sub entity_to_utf8 {
+ Line 950  sub entity_to_utf8 {
  #  to UTF-8 which should display as long as dvipdf can find the
  #  appropriate glyph.
  #
+ #  The entity is assumed to have already had the
+ #  &# ;  or & ; removed
+ #
+ # Parameters:
+ #   entity    - Name of entity to convert.
+ # Returns:
+ #  One of the following:
+ #   - Latex string that produces the entity.
+ #   - UTF-8 equivalent of a numeric entity for which we don't have a latex string.
+ #   - ' ' for text entities for which there's no latex equivalent.
+ #
  sub entity_to_latex {
+     my ($entity) = @_;
+     # Try to look up the entity (text or numeric) in the hash:
+     my $latex = $entities{$entity};
+     if ($latex) {
+ 	return $latex;
+     }
+     # If the text is purely numeric we can do the UTF-8 conversion:
+     if ($entity =~ /^\d$/) {
+ 	return &entity_to_utf8($entity);
+     }
+     #  Can't do the conversion ...
+     return " ";
+ }
+ #
+ #  Convert all the entities in a string.
+ #  We locate all the entities, pass them into entity_to_latex and
+ #  and replace occurences in the input string.
+ #  The assumption is that there are few entities in any string/document
+ #  so this looping is not too bad.  The advantage of looping vs. regexping is
+ #  that we now can use lookup tables for the translation in entity_to_latex above.
+ #
+ # Parameters:
+ #   input   - Input string/document
+ # Returns
+ #   input with entities replaced by latexable stuff (UTF-8 encodings or
+ #   latex control strings to produce the entity.
+ #
+ #
+ sub replace_entities {
+     my ($input)  = @_;
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.4
changed lines
	Added in v.1.5