[SCM] GeoGebra: Dynamic mathematics software for education branch, patch/jlatexmath, updated. upstream/3.2.47.0+dfsg1-159-ga384fe5

[Giovanni Mascellani]

The following commit has been merged in the patch/jlatexmath branch:
commit a384fe5d21620925d9723da3931f0d42fbde4a6b
Merge: 31d381427634fb1964156b8ea6bde0df75ec5247 4896c42db17a526df4a8fa382826c3f16231acab
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 11 12:07:04 2012 +0100

    Merge commit 'refs/top-bases/patch/jlatexmath' into patch/jlatexmath

diff --combined geogebra/euclidian/DrawEquation.java
index 93b559a,a60dbb1..60c7614
--- a/geogebra/euclidian/DrawEquation.java
+++ b/geogebra/euclidian/DrawEquation.java
@@@ -80,6 -80,10 +80,10 @@@ public class DrawEquation 
  			TeXFormula.registerExternalFont(Character.UnicodeBlock.of('\u0681'), "Sans Serif", "Serif");
  			// Korean is in standard Java fonts, so we don't need to search for a font
  			TeXFormula.registerExternalFont(Character.UnicodeBlock.of('\uB458'), "Sans Serif", "Serif");
+ 			// Japanese is in standard Java fonts, so we don't need to search for
+ 			// a font
+ 			TeXFormula.registerExternalFont(
+ 					Character.UnicodeBlock.of('\u30ea'), "Sans Serif", "Serif");
  
  			// Other codeblocks (currency, symbols etc)
  			TeXFormula.registerExternalFont(Character.UnicodeBlock.of('\u20a0'), "Sans Serif", "Serif");			
@@@ -127,7 -131,7 +131,7 @@@
  				formula = TeXFormula.getPartialTeXFormula(text);
  				icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3, style, fgColor);
  				
 -				 formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 15, TeXConstants.UNIT_CM, 4f, TeXConstants.ALIGN_LEFT, TeXConstants.UNIT_CM, 0.5f);
 +				 formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 15f, TeXConstants.UNIT_CM, 4f, TeXConstants.ALIGN_LEFT, TeXConstants.UNIT_CM, 0.5f);
  
  				//Rectangle rec = drawMultiLineText(e.getMessage()+"\n"+text, x, y + g2.getFont().getSize(), g2);
  				//return new Dimension(rec.width, rec.height);
@@@ -137,7 -141,7 +141,7 @@@
  				// Write error message to Graphics View
  
  				formula = TeXFormula.getPartialTeXFormula(text);
 -				icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3, style, fgColor);
 +				icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3f, style, fgColor);
  
  				//Rectangle rec = drawMultiLineText(e.getMessage()+"\n"+text, x, y + g2.getFont().getSize(), g2);
  				//return new Dimension(rec.width, rec.height);

-- 
GeoGebra: Dynamic mathematics software for education