Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and$$...$$ through reLyX unchanged)
On Fri, 7 Feb 2003, Andre Poenitz wrote: Currently it looks like neither Asger, Angus and John could come if we insisted June 20th. Currently I have (5 - ok, 0 - not ok): I think I'm going to be a 0 for all dates this year unless I win the lottery. I am however making good progress on my thesis -- but I have a cunning plan to get me a new distraction this Friday. Allan. (ARRae)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Wed, Feb 12, 2003 at 02:14:32PM +1000, Allan Rae wrote: I think I'm going to be a 0 for all dates this year unless I win the lottery. Is that the price of spending the whole life upside down? I wonder whether RyanAir will go beyond Europe some time. Yesterday I've seen Frankfurt-Glasgow for 7 EUR... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and$$...$$ through reLyX unchanged)
On Wed, 12 Feb 2003, Andre Poenitz wrote: On Wed, Feb 12, 2003 at 02:14:32PM +1000, Allan Rae wrote: I think I'm going to be a 0 for all dates this year unless I win the lottery. Is that the price of spending the whole life upside down? No the price for spending my life upside down is that it takes about 7 hours of flying in a 747 to leave the Australian land-mass behind and be flying over water (toward Singapore or Hong Kong) -- and no, the wheels are not in contact with terra firma during those 7 hours. About 7.5hrs to Singapore or 8.5hrs to Hong Kong (I think -- never been that way before). Then 12.5hrs Singapore to Milan or maybe Munich a little longer to Frankfurt. Actually the main reason for the 0 rating is that I've quit my job and am surviving on what little savings I have in an effort to get this thesis finished without too many distractions. I wonder whether RyanAir will go beyond Europe some time. Yesterday I've seen Frankfurt-Glasgow for 7 EUR... How much extra for a seat? And how much on top of that for a seat belt? And how much more on top of that for a pressurised cabin? Allan. (ARRae)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Wed, Feb 12, 2003 at 04:36:43PM +1000, Allan Rae wrote: I wonder whether RyanAir will go beyond Europe some time. Yesterday I've seen Frankfurt-Glasgow for 7 EUR... How much extra for a seat? And how much on top of that for a seat belt? And how much more on top of that for a pressurised cabin? I believe these are included. I still don't know how they earn any money and I've never actually tried RyanAir which is aid to be the cheapest. Maybe being profitable not the reason of the exercise. My last trip a few weeks ago was Berlin-London for ~50 EUR (one way, including taxes) with a company called buzz and it was ok. No food on board (well, there was, but you would have to pay extra) but I really don't care about that for a two hours journey... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and$$...$$ through reLyX unchanged)
On Wed, 12 Feb 2003, Andre Poenitz wrote: My last trip a few weeks ago was Berlin-London for ~50 EUR (one way, including taxes) with a company called buzz and it was ok. No food on board (well, there was, but you would have to pay extra) but I really don't care about that for a two hours journey... That's about what we pay here for a similar length domestic flight (between capital cities -- Brisbane to Melbourne (usually 2hrs in a 767)). That's flying about half the length of the eastern seaboard of Australia -- just so you get some feel for the scale. Flying anywhere other than between capital cities the prices get much more hideous. Allan. (ARRae)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and$$...$$ through reLyX unchanged)
On Fri, 7 Feb 2003, Andre Poenitz wrote: > Currently it looks like neither Asger, Angus and John could come if we > insisted June 20th. > > Currently I have (5 - "ok", 0 - "not ok"): I think I'm going to be a 0 for all dates this year unless I win the lottery. I am however making good progress on my thesis -- but I have a cunning plan to get me a new distraction this Friday. Allan. (ARRae)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Wed, Feb 12, 2003 at 02:14:32PM +1000, Allan Rae wrote: > I think I'm going to be a 0 for all dates this year unless I win the > lottery. Is that the price of spending the whole life upside down? I wonder whether RyanAir will go beyond Europe some time. Yesterday I've seen Frankfurt-Glasgow for 7 EUR... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and$$...$$ through reLyX unchanged)
On Wed, 12 Feb 2003, Andre Poenitz wrote: > On Wed, Feb 12, 2003 at 02:14:32PM +1000, Allan Rae wrote: > > I think I'm going to be a 0 for all dates this year unless I win the > > lottery. > > Is that the price of spending the whole life upside down? No the price for spending my life upside down is that it takes about 7 hours of flying in a 747 to leave the Australian land-mass behind and be flying over water (toward Singapore or Hong Kong) -- and no, the wheels are not in contact with terra firma during those 7 hours. About 7.5hrs to Singapore or 8.5hrs to Hong Kong (I think -- never been that way before). Then 12.5hrs Singapore to Milan or maybe Munich a little longer to Frankfurt. Actually the main reason for the "0" rating is that I've quit my job and am surviving on what little savings I have in an effort to get this thesis finished without too many distractions. > I wonder whether RyanAir will go beyond Europe some time. Yesterday I've > seen Frankfurt-Glasgow for 7 EUR... How much extra for a seat? And how much on top of that for a seat belt? And how much more on top of that for a pressurised cabin? Allan. (ARRae)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Wed, Feb 12, 2003 at 04:36:43PM +1000, Allan Rae wrote: > > I wonder whether RyanAir will go beyond Europe some time. Yesterday I've > > seen Frankfurt-Glasgow for 7 EUR... > > How much extra for a seat? > And how much on top of that for a seat belt? > And how much more on top of that for a pressurised cabin? I believe these are included. I still don't know how they earn any money and I've never actually tried RyanAir which is aid to be the cheapest. Maybe being profitable not the reason of the exercise. My last trip a few weeks ago was Berlin-London for ~50 EUR (one way, including taxes) with a company called "buzz" and it was ok. No food on board (well, there was, but you would have to pay extra) but I really don't care about that for a two hours journey... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and$$...$$ through reLyX unchanged)
On Wed, 12 Feb 2003, Andre Poenitz wrote: > My last trip a few weeks ago was Berlin-London for ~50 EUR (one way, > including taxes) with a company called "buzz" and it was ok. No food on > board (well, there was, but you would have to pay extra) but I really don't > care about that for a two hours journey... That's about what we pay here for a similar length domestic flight (between capital cities -- Brisbane to Melbourne (usually 2hrs in a 767)). That's flying about half the length of the eastern seaboard of Australia -- just so you get some feel for the scale. Flying anywhere other than between capital cities the prices get much more hideous. Allan. (ARRae)
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and$$...$$ through reLyX unchanged)
On Fri, 7 Feb 2003, Andre Poenitz wrote: OK, my response follows in the first column: Lars John José 0 earlier131 0 May 3105 0 May10105 0 May17105 0 May24105 0 June1155 0 June8455 0 June 15545 0 June 22515 0 July5505 2 July 12544 4 July 19545 5 July 26545 5 August 2530 5 August 9435 5 August 16435 5 August 23430 5 August 30435 5 Sep 6444 5 Sep13444 5 Sep20444 5 Sep27444 5 Oct 4343 5 Oct10333 5 Oct17102 5 later 0?1 I'm sorry for the delay, but I am travelling. This is send from Texas, BTW. Regards, Asger
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and$$...$$ through reLyX unchanged)
On Fri, 7 Feb 2003, Andre Poenitz wrote: OK, my response follows in the first column: > Lars John José 0 > 131 0 > May 3105 0 > May10105 0 > May17105 0 > May24105 0 > June1155 0 > June8455 0 > June 15545 0 > June 22515 0 > July5505 2 > July 12544 4 > July 19545 5 > July 26545 5 > August 2530 5 > August 9435 5 > August 16435 5 > August 23430 5 > August 30435 5 > Sep 6444 5 > Sep13444 5 > Sep20444 5 > Sep27444 5 > Oct 4343 5 > Oct10333 5 > Oct17102 5 > 0?1 I'm sorry for the delay, but I am travelling. This is send from Texas, BTW. Regards, Asger
[patch]: pass $...$ and $$...$$ through reLyX unchanged
This one has been in my tree for a while. It does not fix the
'$ blah$$ foo $
problem, but it doesn't break anything either.
It works by setting a switch, $inside_math, so that reLyX knows whether to
enter or leave math mode when it receives a '$' or '$$' token.
Ok to apply? And to 1.3.x?
--
Angus
Index: lib/reLyX//BasicLyX.pm
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/BasicLyX.pm,v
retrieving revision 1.5
diff -u -p -r1.5 BasicLyX.pm
--- lib/reLyX//BasicLyX.pm 7 Jan 2003 14:30:52 - 1.5
+++ lib/reLyX//BasicLyX.pm 5 Feb 2003 12:14:45 -
@@ -290,6 +290,42 @@ sub call_parser {
return;
} # end subroutine call_parser
+# This is used as a toggle so that we know what to do when basic_lyx is
+# passed a '$' or '$$' token.
+my $inside_math=0;
+
+sub starting_math {
+my $name = shift;
+
+if ($name eq '\(' || $name eq '\[' ||
+ # These tokens bound both ends of a math environment so we must check
+ # $inside_math to know what action to take.
+ ($name eq '$' || $name eq '$$') !$inside_math) {
+
+ $inside_math = 1;
+ return 1;
+}
+
+# All other tokens
+return 0;
+}
+
+sub ending_math {
+my $name = shift;
+
+if ($name eq '\)' || $name eq '\]' ||
+ # These tokens bound both ends of a math environment so we must check
+ # $inside_math to know what action to take.
+ ($name eq '$' || $name eq '$$') $inside_math) {
+
+ $inside_math = 0;
+ return 1;
+}
+
+# All other tokens
+return 0;
+}
+
## MAIN TRANSLATOR SUBROUTINE #
sub basic_lyx {
# This subroutine is called by Text::TeX::process each time subroutine
@@ -388,7 +424,7 @@ sub basic_lyx {
\n\n\\end_inset \n\n;
# Math -- copy verbatim until you're done
- } elsif ($name eq '\(' || $name eq '\[') {
+ } elsif (starting_math($name)) {
print \nCopying math beginning with '$name'\n if $debug_on;
# copy everything until end text
$dummy = Verbatim::copy_verbatim($fileobject, $eaten);
@@ -399,7 +435,7 @@ sub basic_lyx {
print $dummy if $debug_on;
print OUTFILE $dummy;
- } elsif ($name eq '\)' || $name eq '\]') {
+ } elsif (ending_math($name)) {
# end math
print OUTFILE $name\n\\end_inset \n\n;
print \nDone copying math ending with '$name' if $debug_on;
Index: lib/reLyX//CleanTeX.pm
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/CleanTeX.pm,v
retrieving revision 1.2
diff -u -p -r1.2 CleanTeX.pm
--- lib/reLyX//CleanTeX.pm 29 Mar 2000 23:02:36 - 1.2
+++ lib/reLyX//CleanTeX.pm 5 Feb 2003 12:14:46 -
@@ -81,20 +81,6 @@ sub clean_tex {
my($eaten,$txt) = (shift,shift);
my ($outstr, $type);
-# Sub translate is given a string and one of the translation tables below.
-# It returns the translation, or just the string if there's no translation
-# Translation table for TT::Begin::Group tokens
-my %begtranstbl = (
- '$' = '\(', # LyX math mode doesn't
- '$$' = '\[', # understand \$ or $$
- );
-
-# Translation table for TT::End::Group tokens
-my %endtranstbl = (
- '$' = '\)',
- '$$' = '\]',
- );
-
# Translation table for TT::Token tokens whose translations should
#NOT have whitespace after them! See sub translate...
# Note that tokens of type TT::EndLocal are always translated to '}'. So,
@@ -135,8 +121,7 @@ sub clean_tex {
# Handle the end of a local font command - insert a '}'
if (/EndLocal/) {
- # we could just say $printstr='}'
- $printstr = translate('}', \%endtranstbl);
+ $printstr = '}';
last SWITCH;
}
@@ -242,13 +227,13 @@ sub clean_tex {
# Handle opening groups, like '{' and '$'.
if (/Begin::Group$/) {
- $printstr = translate($outstr,\%begtranstbl);
+ $printstr = $outstr;
last SWITCH;
}
# Handle closing groups, like '}' and '$'.
if (/End::Group$/) {
- $printstr = translate($outstr, \%endtranstbl);
+ $printstr = $outstr;
last SWITCH;
}
Index: lib/reLyX//Verbatim.pm
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/Verbatim.pm,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Verbatim.pm
--- lib/reLyX//Verbatim.pm 27 Sep 1999 18:44:34 - 1.1.1.1
+++ lib/reLyX//Verbatim.pm 5 Feb 2003 12:14:47 -
@@ -12,6 +12,8 @@
package Verbatim;
use strict;
+my $debug_on; # package-wide variable set if -d option is given
+
sub copy_verb {
# This subroutine handles a \verb token. Text is guaranteed to be on one line.
# \verb must be followed by a non-letter, then copy anything until the next
@@ -27,6 +29,9 @@ sub copy_verb {
}
sub copy_verbatim {
+# Was -d option given?
+$debug_on = (defined($main::opt_d) $main::opt_d);
+
# This subroutine eats
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
On Friday 07 February 2003 11:39, Angus Leeming wrote: This one has been in my tree for a while. It does not fix the '$ blah$$ foo $ problem, but it doesn't break anything either. It works by setting a switch, $inside_math, so that reLyX knows whether to enter or leave math mode when it receives a '$' or '$$' token. Ok to apply? And to 1.3.x? I would say apply it for 1.4.x. Regarding 1.3.x we should be paranoid. ;-) (by Jean:marc advice's) ;-) -- José Abílio
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
José Matos wrote: On Friday 07 February 2003 11:39, Angus Leeming wrote: This one has been in my tree for a while. It does not fix the '$ blah$$ foo $ problem, but it doesn't break anything either. It works by setting a switch, $inside_math, so that reLyX knows whether to enter or leave math mode when it receives a '$' or '$$' token. Ok to apply? And to 1.3.x? I would say apply it for 1.4.x. Regarding 1.3.x we should be paranoid. ;-) (by Jean:marc advice's) ;-) Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. -- Angus
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
Angus == Angus Leeming [EMAIL PROTECTED] writes: Ok to apply? And to 1.3.x? I would say apply it for 1.4.x. Regarding 1.3.x we should be paranoid. ;-) (by Jean:marc advice's) ;-) Angus Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. What kind of problems does it fix? We have to weight the risk/benefit ratio. JMarc
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
On Fri, Feb 07, 2003 at 01:43:33PM +0100, Jean-Marc Lasgouttes wrote: Angus Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. What kind of problems does it fix? We have to weight the risk/benefit ratio. I think having it just for 1.4 is ok. Andre' PS: Jean-Marc, could you fill in the list with the dates, too? -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
Andre == Andre Poenitz [EMAIL PROTECTED] writes: Andre On Fri, Feb 07, 2003 at 01:43:33PM +0100, Jean-Marc Lasgouttes Andre wrote: Angus Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. What kind of problems does it fix? We have to weight the risk/benefit ratio. Andre I think having it just for 1.4 is ok. OK. Andre PS: Jean-Marc, could you fill in the list with the dates, too? We have the ChangeLogs for that already, don't we? The list is what I use to make the list of features in the announcement. What we could add though (when relevant) is the bug number. JMarc
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
Jean-Marc Lasgouttes wrote: Angus == Angus Leeming [EMAIL PROTECTED] writes: Ok to apply? And to 1.3.x? I would say apply it for 1.4.x. Regarding 1.3.x we should be paranoid. ;-) (by Jean:marc advice's) ;-) Angus Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. What kind of problems does it fix? We have to weight the risk/benefit ratio. Sure. It fixes nothing since André can cope equally well with both \(...\) and $...$. He merely said that he'd prefer to receive math as it is in the original LaTeX file. -- Angus
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
On Fri, Feb 07, 2003 at 12:51:37PM +, Angus Leeming wrote: Sure. It fixes nothing since André can cope equally well with both \(...\) and $...$. He merely said that he'd prefer to receive math as it is in the original LaTeX file. And the only reason for that is the goal of a lossless .tex - .lyx - .tex roundtrip. That's rather theoretical anyway... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus Sure. It fixes nothing since André can cope equally well with Angus both \(...\) and $...$. He merely said that he'd prefer to Angus receive math as it is in the original LaTeX file. Let's drop it, then. JMarc
Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Fri, Feb 07, 2003 at 01:49:48PM +0100, Jean-Marc Lasgouttes wrote: Andre PS: Jean-Marc, could you fill in the list with the dates, too? We have the ChangeLogs for that already, don't we? The list is what I use to make the list of features in the announcement. What we could add though (when relevant) is the bug number. No, I mean the list with the dates you might be able to come to Chemnitz. Currently it looks like neither Asger, Angus and John could come if we insisted June 20th. Currently I have (5 - ok, 0 - not ok): Lars John José earlier131 May 3105 May10105 May17105 May24105 June1155 June8455 June 15545 June 22515 July5505 July 12544 July 19545 July 26545 August 2530 August 9435 August 16435 August 23430 August 30435 Sep 6444 Sep13444 Sep20444 Sep27444 Oct 4343 Oct10333 Oct17102 later 0?1 Angus and Asger should respond as well.. Andre'
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
Andre == Andre Poenitz [EMAIL PROTECTED] writes: Andre On Fri, Feb 07, 2003 at 01:49:48PM +0100, Jean-Marc Lasgouttes Andre wrote: PS: Jean-Marc, could you fill in the list with the Andre dates, too? We have the ChangeLogs for that already, don't we? The list is what I use to make the list of features in the announcement. What we could add though (when relevant) is the bug number. Andre No, I mean the list with the dates you might be able to come to Andre Chemnitz. Can you wait until tomorrow? JMarc
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Friday 07 February 2003 1:17 pm, Andre Poenitz wrote: On Fri, Feb 07, 2003 at 01:49:48PM +0100, Jean-Marc Lasgouttes wrote: Andre PS: Jean-Marc, could you fill in the list with the dates, too? We have the ChangeLogs for that already, don't we? The list is what I use to make the list of features in the announcement. What we could add though (when relevant) is the bug number. No, I mean the list with the dates you might be able to come to Chemnitz. Currently it looks like neither Asger, Angus and John could come if we insisted June 20th. Currently I have (5 - ok, 0 - not ok): I'm going to say 'no' to anything between end May and 12July w/e inclusive. Thereafter, I'm away for the w/es of 16, 23 August and 13 September. Give me [5] for the remaning w/e after 12 July and [3] for those before end May. Angus Lars John José earlier131 May 3105 May10105 May17105 May24105 June1155 June8455 June 15545 June 22515 July5505 July 12544 July 19545 July 26545 August 2530 August 9435 August 16435 August 23430 August 30435 Sep 6444 Sep13444 Sep20444 Sep27444 Oct 4343 Oct10333 Oct17102 later 0?1 Angus and Asger should respond as well.. Andre'
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Fri, Feb 07, 2003 at 02:28:25PM +0100, Jean-Marc Lasgouttes wrote: Andre No, I mean the list with the dates you might be able to come to Andre Chemnitz. Can you wait until tomorrow? Sure. Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
[patch]: pass $...$ and $$...$$ through reLyX unchanged
This one has been in my tree for a while. It does not fix the
'$ blah$$ foo $
problem, but it doesn't break anything either.
It works by setting a switch, $inside_math, so that reLyX knows whether to
enter or leave math mode when it receives a '$' or '$$' token.
Ok to apply? And to 1.3.x?
--
Angus
Index: lib/reLyX//BasicLyX.pm
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/BasicLyX.pm,v
retrieving revision 1.5
diff -u -p -r1.5 BasicLyX.pm
--- lib/reLyX//BasicLyX.pm 7 Jan 2003 14:30:52 - 1.5
+++ lib/reLyX//BasicLyX.pm 5 Feb 2003 12:14:45 -
@@ -290,6 +290,42 @@ sub call_parser {
return;
} # end subroutine call_parser
+# This is used as a toggle so that we know what to do when basic_lyx is
+# passed a '$' or '$$' token.
+my $inside_math=0;
+
+sub starting_math {
+my $name = shift;
+
+if ($name eq '\(' || $name eq '\[' ||
+ # These tokens bound both ends of a math environment so we must check
+ # $inside_math to know what action to take.
+ ($name eq '$' || $name eq '$$') && !$inside_math) {
+
+ $inside_math = 1;
+ return 1;
+}
+
+# All other tokens
+return 0;
+}
+
+sub ending_math {
+my $name = shift;
+
+if ($name eq '\)' || $name eq '\]' ||
+ # These tokens bound both ends of a math environment so we must check
+ # $inside_math to know what action to take.
+ ($name eq '$' || $name eq '$$') && $inside_math) {
+
+ $inside_math = 0;
+ return 1;
+}
+
+# All other tokens
+return 0;
+}
+
## MAIN TRANSLATOR SUBROUTINE #
sub basic_lyx {
# This subroutine is called by Text::TeX::process each time subroutine
@@ -388,7 +424,7 @@ sub basic_lyx {
"\n\n\\end_inset \n\n";
# Math -- copy verbatim until you're done
- } elsif ($name eq '\(' || $name eq '\[') {
+ } elsif (starting_math($name)) {
print "\nCopying math beginning with '$name'\n" if $debug_on;
# copy everything until end text
$dummy = ::copy_verbatim($fileobject, $eaten);
@@ -399,7 +435,7 @@ sub basic_lyx {
print $dummy if $debug_on;
print OUTFILE $dummy;
- } elsif ($name eq '\)' || $name eq '\]') {
+ } elsif (ending_math($name)) {
# end math
print OUTFILE "$name\n\\end_inset \n\n";
print "\nDone copying math ending with '$name'" if $debug_on;
Index: lib/reLyX//CleanTeX.pm
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/CleanTeX.pm,v
retrieving revision 1.2
diff -u -p -r1.2 CleanTeX.pm
--- lib/reLyX//CleanTeX.pm 29 Mar 2000 23:02:36 - 1.2
+++ lib/reLyX//CleanTeX.pm 5 Feb 2003 12:14:46 -
@@ -81,20 +81,6 @@ sub clean_tex {
my($eaten,$txt) = (shift,shift);
my ($outstr, $type);
-# Sub translate is given a string and one of the translation tables below.
-# It returns the translation, or just the string if there's no translation
-# Translation table for TT::Begin::Group tokens
-my %begtranstbl = (
- '$' => '\(', # LyX math mode doesn't
- '$$' => '\[', # understand \$ or $$
- );
-
-# Translation table for TT::End::Group tokens
-my %endtranstbl = (
- '$' => '\)',
- '$$' => '\]',
- );
-
# Translation table for TT::Token tokens whose translations should
#NOT have whitespace after them! See sub translate...
# Note that tokens of type TT::EndLocal are always translated to '}'. So,
@@ -135,8 +121,7 @@ sub clean_tex {
# Handle the end of a local font command - insert a '}'
if (/EndLocal/) {
- # we could just say $printstr='}'
- $printstr = ('}', \%endtranstbl);
+ $printstr = '}';
last SWITCH;
}
@@ -242,13 +227,13 @@ sub clean_tex {
# Handle opening groups, like '{' and '$'.
if (/Begin::Group$/) {
- $printstr = ($outstr,\%begtranstbl);
+ $printstr = $outstr;
last SWITCH;
}
# Handle closing groups, like '}' and '$'.
if (/End::Group$/) {
- $printstr = ($outstr, \%endtranstbl);
+ $printstr = $outstr;
last SWITCH;
}
Index: lib/reLyX//Verbatim.pm
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/Verbatim.pm,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Verbatim.pm
--- lib/reLyX//Verbatim.pm 27 Sep 1999 18:44:34 - 1.1.1.1
+++ lib/reLyX//Verbatim.pm 5 Feb 2003 12:14:47 -
@@ -12,6 +12,8 @@
package Verbatim;
use strict;
+my $debug_on; # package-wide variable set if -d option is given
+
sub copy_verb {
# This subroutine handles a \verb token. Text is guaranteed to be on one line.
# \verb must be followed by a non-letter, then copy anything until the next
@@ -27,6 +29,9 @@ sub copy_verb {
}
sub copy_verbatim {
+# Was -d option given?
+$debug_on = (defined($main::opt_d) && $main::opt_d);
+
# This subroutine eats text verbatim until
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
On Friday 07 February 2003 11:39, Angus Leeming wrote: > This one has been in my tree for a while. It does not fix the > '$ blah$$ foo $ > problem, but it doesn't break anything either. > > It works by setting a switch, $inside_math, so that reLyX knows whether to > enter or leave math mode when it receives a '$' or '$$' token. > > Ok to apply? And to 1.3.x? I would say apply it for 1.4.x. Regarding 1.3.x we should be paranoid. ;-) (by Jean:marc advice's) ;-) -- José Abílio
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
José Matos wrote: > On Friday 07 February 2003 11:39, Angus Leeming wrote: >> This one has been in my tree for a while. It does not fix the >> '$ blah$$ foo $ >> problem, but it doesn't break anything either. >> >> It works by setting a switch, $inside_math, so that reLyX knows whether >> to enter or leave math mode when it receives a '$' or '$$' token. >> >> Ok to apply? And to 1.3.x? > > I would say apply it for 1.4.x. Regarding 1.3.x we should be paranoid. > ;-) > (by Jean:marc advice's) ;-) Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. -- Angus
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: >>> Ok to apply? And to 1.3.x? >> I would say apply it for 1.4.x. Regarding 1.3.x we should be >> paranoid. ;-) (by Jean:marc advice's) ;-) Angus> Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. What kind of problems does it fix? We have to weight the risk/benefit ratio. JMarc
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
On Fri, Feb 07, 2003 at 01:43:33PM +0100, Jean-Marc Lasgouttes wrote: > Angus> Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. > > What kind of problems does it fix? We have to weight the risk/benefit > ratio. I think having it just for 1.4 is ok. Andre' PS: Jean-Marc, could you fill in the list with the dates, too? -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
> "Andre" == Andre Poenitz <[EMAIL PROTECTED]> writes: Andre> On Fri, Feb 07, 2003 at 01:43:33PM +0100, Jean-Marc Lasgouttes Andre> wrote: Angus> Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. >> What kind of problems does it fix? We have to weight the >> risk/benefit ratio. Andre> I think having it just for 1.4 is ok. OK. Andre> PS: Jean-Marc, could you fill in the list with the dates, too? We have the ChangeLogs for that already, don't we? The list is what I use to make the list of features in the announcement. What we could add though (when relevant) is the bug number. JMarc
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
Jean-Marc Lasgouttes wrote: >> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: > Ok to apply? And to 1.3.x? >>> I would say apply it for 1.4.x. Regarding 1.3.x we should be >>> paranoid. ;-) (by Jean:marc advice's) ;-) > > Angus> Ok, I'll apply it to 1.4.x and store the patch in my 1.3.x dir. > > What kind of problems does it fix? We have to weight the risk/benefit > ratio. Sure. It fixes nothing since André can cope equally well with both \(...\) and $...$. He merely said that he'd prefer to receive math as it is in the original LaTeX file. -- Angus
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
On Fri, Feb 07, 2003 at 12:51:37PM +, Angus Leeming wrote: > Sure. It fixes nothing since André can cope equally well with both \(...\) > and $...$. He merely said that he'd prefer to receive math as it is in the > original LaTeX file. And the only reason for that is the goal of a lossless .tex -> .lyx -> .tex roundtrip. That's rather theoretical anyway... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Sure. It fixes nothing since André can cope equally well with Angus> both \(...\) and $...$. He merely said that he'd prefer to Angus> receive math as it is in the original LaTeX file. Let's drop it, then. JMarc
Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Fri, Feb 07, 2003 at 01:49:48PM +0100, Jean-Marc Lasgouttes wrote: > Andre> PS: Jean-Marc, could you fill in the list with the dates, too? > > We have the ChangeLogs for that already, don't we? The list is what I > use to make the list of features in the announcement. What we could > add though (when relevant) is the bug number. No, I mean the list with the dates you might be able to come to Chemnitz. Currently it looks like neither Asger, Angus and John could come if we insisted June 20th. Currently I have (5 - "ok", 0 - "not ok"): Lars John José 131 May 3105 May10105 May17105 May24105 June1155 June8455 June 15545 June 22515 July5505 July 12544 July 19545 July 26545 August 2530 August 9435 August 16435 August 23430 August 30435 Sep 6444 Sep13444 Sep20444 Sep27444 Oct 4343 Oct10333 Oct17102 0?1 Angus and Asger should respond as well.. Andre'
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
> "Andre" == Andre Poenitz <[EMAIL PROTECTED]> writes: Andre> On Fri, Feb 07, 2003 at 01:49:48PM +0100, Jean-Marc Lasgouttes Andre> wrote: PS: Jean-Marc, could you fill in the list with the Andre> dates, too? >> We have the ChangeLogs for that already, don't we? The list is >> what I use to make the list of features in the announcement. What >> we could add though (when relevant) is the bug number. Andre> No, I mean the list with the dates you might be able to come to Andre> Chemnitz. Can you wait until tomorrow? JMarc
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Friday 07 February 2003 1:17 pm, Andre Poenitz wrote: > On Fri, Feb 07, 2003 at 01:49:48PM +0100, Jean-Marc Lasgouttes wrote: > > Andre> PS: Jean-Marc, could you fill in the list with the dates, too? > > > > We have the ChangeLogs for that already, don't we? The list is what I > > use to make the list of features in the announcement. What we could > > add though (when relevant) is the bug number. > > No, I mean the list with the dates you might be able to come to Chemnitz. > > Currently it looks like neither Asger, Angus and John could come if we > insisted June 20th. > > Currently I have (5 - "ok", 0 - "not ok"): I'm going to say 'no' to anything between end May and 12July w/e inclusive. Thereafter, I'm away for the w/es of 16, 23 August and 13 September. Give me [5] for the remaning w/e after 12 July and [3] for those before end May. Angus > > Lars John José > > 131 > May 3105 > May10105 > May17105 > May24105 > June1155 > June8455 > June 15545 > June 22515 > July5505 > July 12544 > July 19545 > July 26545 > August 2530 > August 9435 > August 16435 > August 23430 > August 30435 > Sep 6444 > Sep13444 > Sep20444 > Sep27444 > Oct 4343 > Oct10333 > Oct17102 > 0?1 > > > Angus and Asger should respond as well.. > > > Andre'
Re: Angus, Asger, Jean-Marc...! (was: Re: [patch]: pass $...$ and $$...$$ through reLyX unchanged)
On Fri, Feb 07, 2003 at 02:28:25PM +0100, Jean-Marc Lasgouttes wrote: > Andre> No, I mean the list with the dates you might be able to come to > Andre> Chemnitz. > > Can you wait until tomorrow? Sure. Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
