On Mon, Oct 22, 2001 at 06:20:37PM +0200, Jean-Marc Lasgouttes wrote:
> >>>>> "adrien" == adrien rebollo <[EMAIL PROTECTED]> writes:
>
> adrien> I have backported the patches to handle latin3, 4 and 9 to the
> adrien> 1.1.6 branch. I'm sending the patch. It should not disturb
> adrien> much.
>
> The only part that bothers me is insetquote. For example, you added the
> code to show extra space on screen for french language(s), but you did
> not add the corresponding code to the latex export. I think you should
> remove this part (although I know this feature is badly missing for
> french users of LyX...).
> Other than that, did you test the patch?
>
I agree with you. I had tested the patch, but had been satisfied with
the spaces being inserted in the LyX display, without thinking of
latex export.
I resend the patch without the problematic part, and with a ChangeLog...
The 3 cdef files I have already sent are OK, and I don't send them again.
However I will try to check more thoroughly the changes to add this
extra space, and to send a patch for 1.1.6 later.
Adrien Rebollo
--
Index: ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/ChangeLog,v
retrieving revision 1.757.2.119
diff -u -r1.757.2.119 ChangeLog
--- ChangeLog 2001/10/19 10:29:14 1.757.2.119
+++ ChangeLog 2001/10/22 20:08:36
@@ -1,3 +1,18 @@
+2001-10-22 Adrien Rebollo <[EMAIL PROTECTED]>
+
+ * lib/kbd/iso8859-1.cdef: overhaul
+ * lib/kbd/iso8859-3.cdef:
+ * lib/kbd/iso8859-4.cdef:
+ * lib/kbd/iso8859-15.cdef: new files
+ * src/lyxrc.C (set_font_norm_type): recognizes latin3, 4 and 9
+ * src/lyxrc.h: added ISO_8859_3, ISO_8859_4 and ISO_8859_15
+ * src/paragraph.C (SimpleTeXSpecialChars): protects math-only
+ characters in latin9 too
+ * src/frontends/xforms/FormDocument.C (build): added latin3, latin4
+ and latin9 options
+ * src/insets/insetquotes.C (DispString): beautifying single and
+ double quotes in latin1, 3, 4 and 9
+
2001-10-19 Juergen Vigna <[EMAIL PROTECTED]>
* src/insets/insettext.C (SetFont): fixed problem of marking
Index: lib/kbd/iso8859-1.cdef
===================================================================
RCS file: /cvs/lyx/lyx-devel/lib/kbd/iso8859-1.cdef,v
retrieving revision 1.5
diff -u -r1.5 iso8859-1.cdef
--- lib/kbd/iso8859-1.cdef 2000/02/17 19:58:57 1.5
+++ lib/kbd/iso8859-1.cdef 2001/10/22 20:08:38
@@ -6,44 +6,44 @@
# Any takers to complete the stuff?
#
-160 "\nobreakspace"
-161 "\textexclamdown"
-#162 "\textcent"
+160 "\nobreakspace{}"
+161 "\textexclamdown{}"
+162 "\textcent{}" # with package "eurofont"
163 "\pounds{}" # pound sign
-#164 "\textcurrency"
-#165 "\textyen"
-#166 "\textbrokenbar"
+164 "\textcurrency{}" # with package "eurofont"
+165 "\textyen{}" # with package "eurofont"
+166 "\textbrokenbar{}" # with package "eurofont"
167 "\S{}" # paragraph
168 "\"{}" # umlaut
169 "\copyright{}"
-170 "\textordfeminine"
+170 "\textordfeminine{}"
171 "\guillemotleft{}"
172 "$\lnot$"
173 "\-{}"
-174 "\textregistered"
+174 "\textregistered{}"
175 "\={}"
-176 "\textdegree" # circle
+176 "\textdegree{}" # circle
177 "$\pm$"
-178 "$\mathtwosuperios$"
+178 "$\mathtwosuperior$"
179 "$\maththreesuperior$"
180 "\'{}" # acute
181 "$\mu$" # micro
182 "\P{}"
-183 "$\cdot$"
+183 "$\cdot$" # or \textperiodcentered
184 "\c{}" # cedilla
185 "$\mathonesuperior$"
-186 "\textordmasculine"
+186 "\textordmasculine{}"
187 "\guillemotright{}"
-188 "\textonequarter"
-189 "\textonehalf"
-190 "\textthreequarters" # "0BE
-191 "\textquestiondown" # mirrored ?
+188 "\textonequarter{}"
+189 "\textonehalf{}"
+190 "\textthreequarters{}" # "0BE
+191 "\textquestiondown{}" # mirrored ?
192 "\`{A}"
193 "\'{A}"
194 "\^{A}"
195 "\~{A}"
196 "\"{A}"
-197 "\AA{}" # A with circle
+197 "\r{A}" # A with circle
198 "\AE{}" # AE cat'ed together
199 "\c{C}" # C cedilla
200 "\`{E}"
@@ -75,7 +75,7 @@
226 "\^{a}"
227 "\~{a}"
228 "\"{a}"
-229 "\aa{}" # a with circle
+229 "\r{a}" # a with circle
230 "\ae{}"
231 "\c{c}" # c cedilla
232 "\`{e}"
Index: src/lyxrc.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lyxrc.C,v
retrieving revision 1.78.2.3
diff -u -r1.78.2.3 lyxrc.C
--- src/lyxrc.C 2001/05/14 16:44:10 1.78.2.3
+++ src/lyxrc.C 2001/10/22 20:08:43
@@ -1626,10 +1626,16 @@
font_norm_type = ISO_10646_1;
else if (font_norm == "iso8859-1")
font_norm_type = ISO_8859_1;
+ else if (font_norm == "iso8859-3")
+ font_norm_type = ISO_8859_3;
+ else if (font_norm == "iso8859-4")
+ font_norm_type = ISO_8859_4;
else if (font_norm == "iso8859-6.8x")
font_norm_type = ISO_8859_6_8;
else if (font_norm == "iso8859-9")
font_norm_type = ISO_8859_9;
+ else if (font_norm == "iso8859-15")
+ font_norm_type = ISO_8859_15;
else
font_norm_type = OTHER_ENCODING;
}
Index: src/lyxrc.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/lyxrc.h,v
retrieving revision 1.43.2.1
diff -u -r1.43.2.1 lyxrc.h
--- src/lyxrc.h 2001/05/14 16:44:10 1.43.2.1
+++ src/lyxrc.h 2001/10/22 20:08:43
@@ -249,9 +249,15 @@
///
ISO_8859_1,
///
+ ISO_8859_3,
+ ///
+ ISO_8859_4,
+ ///
ISO_8859_6_8,
///
ISO_8859_9,
+ ///
+ ISO_8859_15,
///
OTHER_ENCODING
};
Index: src/paragraph.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/paragraph.C,v
retrieving revision 1.118.2.7
diff -u -r1.118.2.7 paragraph.C
--- src/paragraph.C 2001/09/30 22:46:56 1.118.2.7
+++ src/paragraph.C 2001/10/22 20:08:50
@@ -2950,10 +2950,13 @@
case '°': case '±': case '²': case '³':
case '×': case '÷': case '¹': case 'ª':
case 'º': case '¬': case 'µ':
- if (bparams.inputenc == "latin1" ||
+ if ((bparams.inputenc == "latin1" ||
+ bparams.inputenc == "latin9") ||
(bparams.inputenc == "auto" &&
- font.language()->encoding()->LatexName()
- == "latin1")) {
+ (font.language()->encoding()->LatexName()
+ == "latin1" ||
+ font.language()->encoding()->LatexName()
+ == "latin9"))) {
os << "\\ensuremath{"
<< c
<< '}';
Index: src/frontends/xforms/FormDocument.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormDocument.C,v
retrieving revision 1.35
diff -u -r1.35 FormDocument.C
--- src/frontends/xforms/FormDocument.C 2001/01/09 20:17:06 1.35
+++ src/frontends/xforms/FormDocument.C 2001/10/22 20:08:53
@@ -210,8 +210,8 @@
// the document language form
language_ = build_doc_language();
fl_addto_choice(language_->choice_inputenc,
- "default|auto|latin1|latin2|latin5"
- "|koi8-r|koi8-u|cp866|cp1251|iso88595");
+ "default|auto|latin1|latin2|latin3|latin4|latin5"
+ "|latin9|koi8-r|koi8-u|cp866|cp1251|iso88595");
// The language is a combo-box and has to be inserted manually
obj = language_->choice_language;
Index: src/insets/insetquotes.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/insets/insetquotes.C,v
retrieving revision 1.40.2.3
diff -u -r1.40.2.3 insetquotes.C
--- src/insets/insetquotes.C 2001/09/12 16:43:36 1.40.2.3
+++ src/insets/insetquotes.C 2001/10/22 20:08:55
@@ -146,12 +146,24 @@
if (times == InsetQuotes::DoubleQ)
disp += disp;
- if (lyxrc.font_norm_type == LyXRC::ISO_8859_1)
+ if (lyxrc.font_norm_type == LyXRC::ISO_8859_1
+ || lyxrc.font_norm_type == LyXRC::ISO_8859_3
+ || lyxrc.font_norm_type == LyXRC::ISO_8859_4
+ || lyxrc.font_norm_type == LyXRC::ISO_8859_9) {
+ if (disp == "'")
+ disp = "´";
+ else if (disp == "''")
+ disp = "´´";
+ }
+ if (lyxrc.font_norm_type == LyXRC::ISO_8859_1
+ || lyxrc.font_norm_type == LyXRC::ISO_8859_9
+ || lyxrc.font_norm_type == LyXRC::ISO_8859_15) {
if (disp == "<<")
disp = '«';
else if (disp == ">>")
disp = '»';
-
+ }
+
return disp;
}
