diff --git a/ChangeLog b/ChangeLog index 500d63fc3d..19bd400f23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2000-02-08 Jean-Marc Lasgouttes + + * src/lyx_gui.C (create_forms): make combo box taller (from Dekel + Tsur). + * src/toolbar.C (set): ditto + * src/insets/insetbib.C (create_form_citation_form): ditto + + * lib/CREDITS: added Dekel Tsur. + + * lib/kbd/hebrew.kmap, lib/kbd/null.kmap, + lib/layouts/heb-article.layout, lib/layouts/heb-letter.layout: new + hebrew supports files from Dekel Tsur. + + * lib/kbd/iso8859-8.cdef: new file, from Tzafrir Cohen + + + * src/lyxrc.C: put \date_insert_format at the right place. + + * src/buffer.C (makeLaTeXFile): fix the handling of + BufferParams::sides when writing out latex files. + + * src/BufferView2.C: add a "using" directive. + + * src/support/lyxsum.C (sum): when we use lyxstring, + ostringstream::str needs an additional .c_str(). + 2000-02-07 Lars Gullik Bjønnes * src/support/filetools.C (ChangeExtension): patch from Etienne diff --git a/lib/CREDITS b/lib/CREDITS index c94bf5f94c..3acc5bc329 100644 --- a/lib/CREDITS +++ b/lib/CREDITS @@ -151,12 +151,16 @@ @iE-mail: kayvan@sylvan.com noweb2lyx and reLyX integration of noweb files. Added Import->Noweb and key bindings to menus. +@bDekel Tsur +@iE-mail: dekel@math.tau.ac.il + Hebrew support. + Few bug fixes. @bMatthias Ulrichs @iE-mail: urlichs@smurf.noris.de bug reports and small fixes @bH. Turgut Uyar @iE-mail: uyar@cs.itu.edu.tr - turkish kbmnaps + turkish kbmaps @bMartin Vermeer @iE-mail: mv@fgi.fi ejour2 document class diff --git a/lib/kbd/hebrew.kmap b/lib/kbd/hebrew.kmap new file mode 100644 index 0000000000..c0f1f332f0 --- /dev/null +++ b/lib/kbd/hebrew.kmap @@ -0,0 +1,69 @@ +# +# Hebrew keyboard definition for LyX +# +# (C)2000 by Dekel Tsur, dekel@math.tau.ac.il +# +\kmap ` ; +\kmap q / +\kmap w ' +\kmap e ÷ +\kmap r ø +\kmap t à +\kmap y è +\kmap u å +\kmap i ï +\kmap o í +\kmap p ô + +\kmap a ù +\kmap s ã +\kmap d â +\kmap f ë +\kmap g ò +\kmap h é +\kmap j ç +\kmap k ì +\kmap l ê +\kmap ; ó +\kmap ' "," + +\kmap z æ +\kmap x ñ +\kmap c á +\kmap v ä +\kmap b ð +\kmap n î +\kmap m ö +\kmap "," ú +\kmap . õ +\kmap / . + +# The following lines prevent entering capitals letters in a Hebrew text +\kmap Q / +\kmap W ' +\kmap E ÷ +\kmap R ø +\kmap T à +\kmap Y è +\kmap U å +\kmap I ï +\kmap O í +\kmap P ô + +\kmap A ù +\kmap S ã +\kmap D â +\kmap F ë +\kmap G ò +\kmap H é +\kmap J ç +\kmap K ì +\kmap L ê + +\kmap Z æ +\kmap X ñ +\kmap C á +\kmap V ä +\kmap B ð +\kmap N î +\kmap M ö diff --git a/lib/kbd/iso8859-8.cdef b/lib/kbd/iso8859-8.cdef new file mode 100644 index 0000000000..be575e05c0 --- /dev/null +++ b/lib/kbd/iso8859-8.cdef @@ -0,0 +1,106 @@ +# +# Character definition file for iso8859-8 character set +# +# By Tzafrir Cohen +# +# Based on the iso8859-1 charset file: +# (c)1996 by Ivan Schreter, schreter@ccsun.tuke.sk +# +# Any takers to complete the stuff? +# + +161 "!`" # mirrored ! +#162 Cent sign? +163 "\pounds{}" # pound sign +#164 String sign? +#165 Yen sign? +#166 What's this? +167 "\S{}" # paragraph +168 "\"{}" # umlaut +169 "\copyright{}" +170 "\b{a}" # a macron +171 "\guillemotleft{}" +#172 What's this? +#173 horiz. line? +#174 Registered? +#175 horiz. line at the top? +176 "\b{}" # circle +#177 Plusminus? +#178 ^2? +#179 ^3? +180 "\'{}" # acute +181 "$\mu$" # micro +#182 Paragraph? +183 "$\cdot$" +184 "\c{}" # cedilla +185 "${^1}$" +186 "\b{o}" # o macron +187 "\guillemotright{}" +188 "\ensuremath{\frac14}" +189 "\ensuremath{\frac12}" +190 "\ensuremath{\frac34}" # "0BE +191 "?`" # mirrored ? +192 "\`{A}" +193 "\'{A}" +194 "\^{A}" +195 "\~{A}" +196 "\"{A}" +197 "\AA{}" # A with circle +198 "\AE{}" # AE cat'ed together +199 "\c{C}" # C cedilla +200 "\`{E}" +201 "\'{E}" +202 "\^{E}" +203 "\"{E}" +204 "\`{I}" +205 "\'{I}" +206 "\^{I}" +207 "\"{I}" +208 "\DH{}" +209 "\~{N}" +210 "\`{O}" +211 "\'{O}" +212 "\^{O}" +213 "\~{O}" +214 "\"{O}" +215 "$\times$" +216 "\O{}" +217 "\`{U}" +218 "\'{U}" +219 "\^{U}" +220 "\"{U}" +221 "\'{Y}" +222 "\TH{}" +223 "\ss{}" # German sharp S +224 "à" +225 "á" +226 "â" +227 "ã" +228 "ä" +229 "å" # a with circle +230 "æ" +231 "ç" # c cedilla +232 "è" +233 "é" +234 "ê" +235 "ë" +236 "ì" +237 "í" +238 "î" +239 "ï" +240 "ð" +241 "ñ" +242 "ò" +243 "ó" +244 "ô" +245 "õ" +246 "ö" +247 "÷" +248 "ø" +249 "ù" +250 "ú" +251 "\^{u}" +252 "\"{u}" +253 "\'{y}" +254 "\th{}" +255 "\"{y}" diff --git a/lib/kbd/null.kmap b/lib/kbd/null.kmap new file mode 100644 index 0000000000..3c76dd4211 --- /dev/null +++ b/lib/kbd/null.kmap @@ -0,0 +1,3 @@ +# The following null keyboard definition is used as primary keymap when +# using the Hebrew support of LyX +# \ No newline at end of file diff --git a/lib/layouts/heb-article.layout b/lib/layouts/heb-article.layout new file mode 100644 index 0000000000..cf167affcd --- /dev/null +++ b/lib/layouts/heb-article.layout @@ -0,0 +1,96 @@ +#% Do not delete the line below; configure depends on this +# \DeclareLaTeXClass[article]{article (Hebrew)} +# Hebrew article textclass definition file. +# Author: Dekel Tsur + +Input article + +Preamble +\newtheorem{theorem}{\R{\mem\shin\pe\tet}}[section] +\newtheorem{lemma}[theorem]{\R{\lamed\mem\he}} +\newtheorem{claim}[theorem]{\R{\tet\ayin\nun\he}} +\newtheorem{corollary}[theorem]{\R{\mem\samekh\qof\nun\he}} +\newenvironment{proof}{\R{\em \he\vav\kaf\het\he:}}{\hfill\rule{2mm}{2mm}\par\vspace{2mm}} +EndPreamble + +# Proof style declaration +Style Proof + Margin First_Dynamic + LatexType Environment + LatexName proof + NextNoIndent 1 + LabelSep xx + ParIndent MMM + ParSkip 0.4 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Static + LabelString ":äçëåä" + # standard font definition + Font + Shape Up + Size Normal + EndFont + # label font definition + LabelFont + Shape Italic + EndFont +End + +Style Theorem + Margin First_Dynamic + LatexType Environment + LatexName theorem + NextNoIndent 1 + LabelSep xx + ParIndent MMM + ParSkip 0.4 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Static + LabelString ".# èôùî" + # standard font definition + Font + Shape Italic + Size Normal + EndFont + # label font definition + LabelFont + Shape Up + Series Bold + EndFont +End + +Style Corollary + CopyStyle Theorem + LatexName corollary + LabelString ".# äð÷ñî" +End + +Style Lemma + CopyStyle Theorem + LatexName lemma + LabelString ".# äîì" +End + +Style Claim + CopyStyle Theorem + LatexName claim + LabelString ".# äðòè" +End + +Style Comment + LabelString ": äøòä" +End + +Style Abstract + LabelString "øéö÷ú" +End \ No newline at end of file diff --git a/lib/layouts/heb-letter.layout b/lib/layouts/heb-letter.layout new file mode 100644 index 0000000000..854b0c854e --- /dev/null +++ b/lib/layouts/heb-letter.layout @@ -0,0 +1,27 @@ +#% Do not delete the line below; configure depends on this +# \DeclareLaTeXClass[letter]{letter (Hebrew)} +# Hebrew letter textclass definition file. +# Author: Dekel Tsur + +Input letter + +Style My_Address + Align Right +End + +Style Send_To_Address + Align Right +End + +Style Opening + LabelString :äçéúô +End + +Style Closing + LabelString :íåéñ +End + +Style Signature + + LabelString :äîéúç +End diff --git a/po/fr.po b/po/fr.po index be608181bd..2678855332 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1047,7 +1047,7 @@ msgstr "" #: src/insets/insetindex.C:139 msgid "PrintIndex" -msgstr "Imclure l'index" +msgstr "Inclure l'index" #: src/insets/insetinfo.C:70 src/insets/insetinfo.C:89 #: src/insets/insetinfo.C:209 diff --git a/src/BufferView2.C b/src/BufferView2.C index aa56e43f34..a085889f00 100644 --- a/src/BufferView2.C +++ b/src/BufferView2.C @@ -25,6 +25,8 @@ extern BufferList bufferlist; +using std::ifstream; + // Inserts a file into current document bool BufferView::insertLyXFile(string const & filen) // diff --git a/src/Bullet.h b/src/Bullet.h index f52794f20d..8e753ce14e 100644 --- a/src/Bullet.h +++ b/src/Bullet.h @@ -27,7 +27,7 @@ class Bullet { public: /// - Bullet(int f = -1, int c = -1, int s = -1); + Bullet(const int f = -1, const int c = -1, const int s = -1); /// Bullet(string const &); diff --git a/src/buffer.C b/src/buffer.C index caca4c182b..5bf5c4851f 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -1186,7 +1186,7 @@ void Buffer::writeFileAscii(string const & fname, int linelen) ofs << " "; currlinelen = depth * 2; switch(ltype) { - case 0: /* Standart */ + case 0: /* Standard */ case 4: /* (Sub)Paragraph */ case 5: /* Description */ break; @@ -1466,10 +1466,15 @@ void Buffer::makeLaTeXFile(string const & fname, // if needed if (params.sides != tclass.sides()) { - if (params.sides == 2) - options += "twoside,"; - else + switch (params.sides) { + case LyXTextClass::OneSide: options += "oneside,"; + break; + case LyXTextClass::TwoSides: + options += "twoside,"; + break; + } + } // if needed diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C index 57a6e31b1b..26bc362f67 100644 --- a/src/insets/insetbib.C +++ b/src/insets/insetbib.C @@ -84,7 +84,7 @@ FD_citation_form * create_form_citation_form(void) fl_set_object_lalign(obj, FL_ALIGN_RIGHT); bibcombox = new Combox(FL_COMBOX_INPUT); - bibcombox->add(80, 10, 130, 30, 120); + bibcombox->add(80, 10, 130, 30, 300); obj = fl_add_button(FL_RETURN_BUTTON, 20, 90, 90, 30, _("OK")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); diff --git a/src/lyx_gui.C b/src/lyx_gui.C index f810c1dd3f..be68c68d14 100644 --- a/src/lyx_gui.C +++ b/src/lyx_gui.C @@ -422,7 +422,7 @@ void LyXGUI::create_forms() fl_addto_form(fd_form_document->form_document); combo_language = new Combox(FL_COMBOX_DROPLIST); FL_OBJECT * ob = fd_form_document->choice_language; - combo_language->add(ob->x, ob->y, ob->w, ob->h, 200); + combo_language->add(ob->x, ob->y, ob->w, ob->h, 250); combo_language->shortcut("#G", 1); fl_end_form(); int n; // declared here because DEC cxx does not like multiple diff --git a/src/lyxrc.C b/src/lyxrc.C index 7f5fd051d2..c3eb369387 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -158,6 +158,7 @@ static keyword_item lyxrcTags[] = { { "\\cursor_follows_scrollbar", RC_CURSOR_FOLLOWS_SCROLLBAR }, { "\\custom_export_command", RC_CUSTOM_EXPORT_COMMAND }, { "\\custom_export_format", RC_CUSTOM_EXPORT_FORMAT }, + { "\\date_insert_format", RC_DATE_INSERT_FORMAT }, { "\\default_papersize", RC_DEFAULT_PAPERSIZE }, { "\\display_shortcuts", RC_DISPLAY_SHORTCUTS }, { "\\document_path", RC_DOCUMENTPATH }, @@ -170,7 +171,6 @@ static keyword_item lyxrcTags[] = { { "\\font_encoding", RC_FONT_ENCODING }, { "\\html_command", RC_HTML_COMMAND }, { "\\input", RC_INPUT }, - { "\\date_insert_format", RC_DATE_INSERT_FORMAT }, { "\\kbmap", RC_KBMAP }, { "\\kbmap_primary", RC_KBMAP_PRIMARY }, { "\\kbmap_secondary", RC_KBMAP_SECONDARY }, diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C index 267413ce42..26028bb103 100644 --- a/src/support/lyxsum.C +++ b/src/support/lyxsum.C @@ -119,7 +119,9 @@ unsigned long lyx::sum(char const * file) #ifdef HAVE_SSTREAM ostringstream ostr; ostr << ifs.rdbuf(); - string w = ostr.str(); + // The .c_str() is here in case we use our lyxstring class + // instead of standard string. + string w = ostr.str().c_str(); return do_crc(w.begin(), w.end()); #else ostrstream ostr; diff --git a/src/toolbar.C b/src/toolbar.C index 05b6d00ed5..5ceb7a800f 100644 --- a/src/toolbar.C +++ b/src/toolbar.C @@ -302,7 +302,7 @@ void Toolbar::set(bool doingmain) xpos += standardspacing; if (!combox) combox = new Combox(FL_COMBOX_DROPLIST); - combox->add(xpos, ypos, 135, height, 300); + combox->add(xpos, ypos, 135, height, 400); combox->setcallback(LayoutsCB); combox->resize(FL_RESIZE_ALL); combox->gravity(NorthWestGravity, NorthWestGravity);