From eebda223db6a28e4c5f913a5fe3a2e8c66d70ab5 Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Fri, 17 Dec 2004 13:34:02 +0000 Subject: [PATCH] =?utf8?q?The=20=EF=BF=BD=EF=BF=BDngstr=EF=BF=BD=EF=BF=BDm?= =?utf8?q?,=20=EF=BF=BD=EF=BF=BDrsted=20patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9394 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 5 +++++ lib/images/math/textrm_AA.xpm | 27 +++++++++++++++++++++++++ lib/images/math/textrm_Oe.xpm | 24 ++++++++++++++++++++++ lib/symbols | 3 +++ src/frontends/controllers/ChangeLog | 4 ++++ src/frontends/controllers/ControlMath.C | 6 +++--- 6 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 lib/images/math/textrm_AA.xpm create mode 100644 lib/images/math/textrm_Oe.xpm diff --git a/lib/ChangeLog b/lib/ChangeLog index df78e4ad5d..3a94f6d504 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2004-12-17 Martin Vermer + + * images/math/textrm_*.xpm: renamed to textrm_AA, textrm_Oe + * symbols: added Ångström, Ørsted + 2004-12-16 Jean-Marc Lasgouttes * configure.m4: remove code for checking languages in the LaTeX diff --git a/lib/images/math/textrm_AA.xpm b/lib/images/math/textrm_AA.xpm new file mode 100644 index 0000000000..ee58d5c658 --- /dev/null +++ b/lib/images/math/textrm_AA.xpm @@ -0,0 +1,27 @@ +/* XPM */ +static char *a[] = { +/* columns rows colors chars-per-pixel */ +"12 19 2 1", +" c #000000", +". c None", +/* pixels */ +".... .....", +"... ... ....", +"... ... ....", +"... ... ....", +"... ... ....", +".... .....", +"..... .....", +".... .....", +".... . ....", +"... .. ....", +"... ... ...", +"... ... ...", +".. .... ...", +".. ..... ..", +".. ..", +".. ..... ..", +". ....... .", +". ....... .", +" ..... " +}; diff --git a/lib/images/math/textrm_Oe.xpm b/lib/images/math/textrm_Oe.xpm new file mode 100644 index 0000000000..59db0bb4c7 --- /dev/null +++ b/lib/images/math/textrm_Oe.xpm @@ -0,0 +1,24 @@ +/* XPM */ +static char *a[] = { +/* columns rows colors chars-per-pixel */ +"13 16 2 1", +" c #000000", +". c None", +/* pixels */ +"...... .... ", +".... .. . .", +"... ..... ..", +".. ..... . .", +". ...... . .", +". ..... ... ", +" ..... .... ", +" ..... .... ", +" .... ..... ", +" ... ...... ", +". ... ...... ", +". . ....... ", +".. ....... ", +".. ...... .", +".. . .... ..", +". ... ..." +}; diff --git a/lib/symbols b/lib/symbols index 3c391055df..343fee1287 100644 --- a/lib/symbols +++ b/lib/symbols @@ -811,6 +811,9 @@ iffont msb \def\Join{\ltimes\kern-18.5mu\rtimes} endif \def\mathcircumflex{\mbox{\^{}}}{\^} +# Fixme: latin-1 chars in text file +\def\AA{\AA}{Å} +\def\O{\O}{Ø} textdegree lyxsymbol 176 0 mathord x diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index fecfea49ea..527c1c5491 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2004-12-17 Martin Vermeer + + * ControlMath.C: fixed Ångström, Ørsted. + 2004-12-02 Georg Baum * ControlTabular.[Ch], ControlTabularCreate.h: use size_t-like diff --git a/src/frontends/controllers/ControlMath.C b/src/frontends/controllers/ControlMath.C index ffdf67d49a..dd2260f9e5 100644 --- a/src/frontends/controllers/ControlMath.C +++ b/src/frontends/controllers/ControlMath.C @@ -177,7 +177,7 @@ char const * latex_misc[] = { "angle", "top", "bot", "Vert", "neg", "flat", "natural", "sharp", "surd", "triangle", "diamondsuit", "heartsuit", "clubsuit", "spadesuit", - "textrm Å", "textrm Ø", "mathcircumflex", "_", + "textrm \\AA", "textrm \\O", "mathcircumflex", "_", "mathrm T", "mathbb N", "mathbb Z", "mathbb Q", "mathbb R", "mathbb C", "mathbb H", @@ -333,8 +333,8 @@ XPMmap sorted_xpm_map[] = { { "nRightarrow", "nrightarrow2" }, { "nVDash", "nvdash3" }, { "nvDash", "nvdash2" }, - { "textrm_Å", "textrm_A" }, - { "textrm_Ø", "textrm_0" }, + { "textrm \\AA", "textrm_AA"}, + { "textrm \\O", "textrm_Oe"}, { "vDash", "vdash2" } }; -- 2.39.2