Re: Format 63

[Scott Kostyshak]

On Thu, Sep 20, 2018 at 10:45:42AM +0200, Jürgen Spitzmüller wrote:

> Thank you very much for taking this task, Andrew! Much appreciated.

+1 thanks for taking the dive into Git, Andrew!

Scott


signature.asc
Description: PGP signature

Re: Format 63

[Jürgen Spitzmüller]

Am Do., 20. Sep. 2018 um 12:50 Uhr schrieb Andrew Parsloe <
ajpars...@gmail.com>:

> I've attached the new diff, after accepting the changes, with change
> tracking off. (It appears to have acquired some extra lines, 38--60. I
> accepted all changes where perhaps I should have accepted my changes
> individually?)
>

Thanks. I actually meant: only accept your own changes, not the other ones
(those still need to be transferred to the translations). But never mind, I
did that now and also updated the respective LyX version mentionings in the
fr, ja, and es manuals (which still was 2.2).

Committed for 2.3.2.

Jürgen


>
> Andrew
>
>
> 
>  Virus-free.
> www.avast.com
> 
> <#m_765167843810618319_DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
>

Re: Format 63

[Andrew Parsloe]

On 20/09/2018 8:45 p.m., Jürgen Spitzmüller wrote:


Thank you very much for taking this task, Andrew! Much appreciated. 
The patch looks good. I do not think that we need to track this 
uncontroversial change, though. If it is not too much of additional 
work, can you just accept those changes and re-diff?

(otherwise I will do it).

Jürgen

I've attached the new diff, after accepting the changes, with change 
tracking off. (It appears to have acquired some extra lines, 38--60. I 
accepted all changes where perhaps I should have accepted my changes 
individually?)


Andrew


---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 7b81ff850e..e0956370c7 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -129,7 +129,6 @@ logicalmkup
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
 \end_header
 
 \begin_body
@@ -2518,14 +2517,10 @@ value
 
 \begin_layout Labeling
 \labelwidthstring 00.00.
-
-\change_inserted -712698321 1523206314
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-
-\change_inserted -712698321 1523206193
 hyperref-driver
 \end_layout
 
@@ -2652,35 +2647,11 @@ $$b
 \end_layout
 
 \begin_layout Standard
-
-\change_inserted -712698321 1523206384
 A suitable hyperref-driver is set for some converters that are installed
  with \SpecialChar LyX
 .
- 
-\change_deleted -712698321 1523206388
-None of these
-\change_inserted -712698321 1523206389
-The
-\change_unchanged
- last three
-\change_inserted -712698321 1523206400
- flags, however,
-\change_unchanged
- are presently 
-\change_inserted -712698321 1523206407
-not 
-\change_unchanged
-used in any of the 
-\change_inserted -712698321 1523206437
-pre-installed 
-\change_unchanged
-converters
-\change_deleted -712698321 1523206442
- that are installed with \SpecialChar LyX
-
-\change_unchanged
-.
+ The last three flags, however, are presently not used in any of the 
pre-install
+ed converters.
  
 \end_layout
 
@@ -6864,7 +6835,7 @@ Format
  Any format is acceptable, but one would normally use the format current
  at the time.
  (In \SpecialChar LyX
- 2.3, the current layout format is 63.)
+ 2.3, the current layout format is 66.)
 \end_layout
 
 \begin_layout Standard
@@ -7234,7 +7205,7 @@ DeclareLyXModule{My Class}
 \end_layout
 
 \begin_layout LyX-Code
-Format 63
+Format 66
 \begin_inset Newline newline
 \end_inset
 
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 0420dad76e..ab656bb166 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -5401,7 +5401,7 @@ Format
 u.).
  Dabei ist jedes (bekannte) Format möglich, sinnvollerweise sollten Sie
  aber das jeweils aktuelle verwenden (das aktuelle Format in \SpecialChar LyX
- 2.3 ist 63).
+ 2.3 ist 66).
 \end_layout
 
 \begin_layout Standard
@@ -5808,7 +5808,7 @@ DeclareLyXModule{My Class}
 \end_layout
 
 \begin_layout LyX-Code
-Format 63
+Format 66
 \begin_inset Newline newline
 \end_inset
 
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index 4904591a08..bed4afd07f 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -6428,7 +6428,7 @@ Format
  Cualquier formato es aceptable, pero debería usarse normalmente el actual
  formato.
  (En \SpecialChar LyX
- 2.2 el formato actual es 60).
+ 2.2 el formato actual es 66).
 \end_layout
 
 \begin_layout Standard
@@ -6809,7 +6809,7 @@ DeclareLyXModule{My Package}
 \end_layout
 
 \begin_layout LyX-Code
-Format 60
+Format 66
 \begin_inset Newline newline
 \end_inset
 
@@ -8366,7 +8366,7 @@ Format
 
 .
  El número para la versión actual de \SpecialChar LyX
- es formato 60.
+ es formato 66.
  Cada versión de \SpecialChar LyX
  es capaz de leer los formatos de versiones anteriores,
  de la misma forma que puede leer archivos producidos con versiones de 
\SpecialChar LyX
diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index c6e5ed2116..519a2fc282 100644
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -6489,7 +6489,7 @@ Format
  N'importe quel format est admissible, mais on utilise d'habitude le format
  de la version de \SpecialChar LyX
  utilisée (pour \SpecialChar LyX
- 2.2, le format porte le numéro 60).
+ 2.2, le format porte le numéro 66).
 \end_layout
 
 \begin_layout Standard
@@ -6885,7 +6885,7 @@ DeclareLyXModule{mon paquetage}
 \begin_layout LyX-Code
 
 \lang english
-Format 60
+Format 66
 \begin_inset Newline newline
 \end_inset
 
@@ -8532,7 +8532,7 @@ Format
 
 \lang french
 .
- Le numéro de format du présent fichier est le numéro 60.
+ Le numéro de format du présent fichier est le numéro 66.
  mais chaque version de \SpecialChar LyX
  peut lire les fichiers de format d'une version
  plus ancienne, comme elle peut lire les documents crées avec une version
diff -

Re: Format 63

[Jürgen Spitzmüller]

Am Do., 20. Sep. 2018 um 10:45 Uhr schrieb Jürgen Spitzmüller :

> Thank you very much for taking this task, Andrew! Much appreciated. The
> patch looks good. I do not think that we need to track this uncontroversial
> change, though. If it is not too much of additional work, can you just
> accept those changes and re-diff?
> (otherwise I will do it).
>

For master, I have just implemented layout format information via
info-insets. This updates itself to the current format, so we do not need
to bother about this in the future.

Jürgen

Re: Format 63

[Jean-Marc Lasgouttes]

Le 20/09/2018 à 08:17, Andrew Parsloe a écrit :
I have studiously avoided git to date. I pondered the matter for a 
couple of days then bravely set forth, following the instructions at 
https://www.lyx.org/HowToUseGIT, section 4, to create a clone of the lyx 
repository on my computer, and then section 7 on changing the source.


Congratulations!

JMarc

Re: Format 63

[Jürgen Spitzmüller]

Am Do., 20. Sep. 2018 um 08:18 Uhr schrieb Andrew Parsloe <
ajpars...@gmail.com>:

> I have studiously avoided git to date. I pondered the matter for a
> couple of days then bravely set forth, following the instructions at
> https://www.lyx.org/HowToUseGIT, section 4, to create a clone of the lyx
> repository on my computer, and then section 7 on changing the source. I
> first did git pull. The second bullet point of section 7 blithely
> states: "Change the files". That meant finding the files -- did so under
> lyx/lib/doc. Then, Jürgen, you suggest I change the format numbers in
> the translations. I counted 26 folders, potentially 26 customization
> manuals, but actual exploration of their contents revealed only four --
> de, es, fr, ja -- had a customization manual, plus the English one, five
> in all. Phew! Change tracking was turned on in the English manual; I
> turned it on in the others before making the changes.
>
> I attach a patch in which the format number has been changed from 63 to
> 66 in the English and German customization manuals (2 occurrences in
> each) and from 60 to 66 in the Spanish, French and Japanese
> customization manuals (3 occurrences in each). (I was charmed to find
> "60" nestled among the characters in the Japanese manual.)
>
> I hope this is what is wanted.
>

Thank you very much for taking this task, Andrew! Much appreciated. The
patch looks good. I do not think that we need to track this uncontroversial
change, though. If it is not too much of additional work, can you just
accept those changes and re-diff?
(otherwise I will do it).

Jürgen


>
> Andrew
>

Re: Format 63

[Andrew Parsloe]

On 18/09/2018 5:36 a.m., Jürgen Spitzmüller wrote:

Am Freitag, den 14.09.2018, 13:12 +1200 schrieb Andrew Parsloe:

In two places in the Customization manual, Format 63 is mentioned as
the
current format, rather than 66. (Subsecs 5.2.1.1 and 5.2.2)

Could you submit a patch? The numbers are probably also wrong in the
translated versions.

Jürgen


Andrew


---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
I have studiously avoided git to date. I pondered the matter for a 
couple of days then bravely set forth, following the instructions at 
https://www.lyx.org/HowToUseGIT, section 4, to create a clone of the lyx 
repository on my computer, and then section 7 on changing the source. I 
first did git pull. The second bullet point of section 7 blithely 
states: "Change the files". That meant finding the files -- did so under 
lyx/lib/doc. Then, Jürgen, you suggest I change the format numbers in 
the translations. I counted 26 folders, potentially 26 customization 
manuals, but actual exploration of their contents revealed only four -- 
de, es, fr, ja -- had a customization manual, plus the English one, five 
in all. Phew! Change tracking was turned on in the English manual; I 
turned it on in the others before making the changes.


I attach a patch in which the format number has been changed from 63 to 
66 in the English and German customization manuals (2 occurrences in 
each) and from 60 to 66 in the Spanish, French and Japanese 
customization manuals (3 occurrences in each). (I was charmed to find 
"60" nestled among the characters in the Japanese manual.)


I hope this is what is wanted.

Andrew
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 7b81ff850e..5dbb9dd972 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -130,6 +130,7 @@ logicalmkup
 \html_css_as_file 0
 \html_be_strict true
 \author -712698321 "Jürgen Spitzmüller"
+\author 1129461342 "Andrew" ajpars...@gmail.com
 \end_header
 
 \begin_body
@@ -6864,7 +6865,13 @@ Format
  Any format is acceptable, but one would normally use the format current
  at the time.
  (In \SpecialChar LyX
- 2.3, the current layout format is 63.)
+ 2.3, the current layout format is 
+\change_deleted 1129461342 1537420076
+63
+\change_inserted 1129461342 1537420076
+66
+\change_unchanged
+.)
 \end_layout
 
 \begin_layout Standard
@@ -7234,7 +7241,13 @@ DeclareLyXModule{My Class}
 \end_layout
 
 \begin_layout LyX-Code
-Format 63
+Format 
+\change_deleted 1129461342 1537420047
+63
+\change_inserted 1129461342 1537420047
+66
+\change_unchanged
+
 \begin_inset Newline newline
 \end_inset
 
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 0420dad76e..13c8018702 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -132,11 +132,12 @@ logicalmkup
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
-\tracking_changes false
+\tracking_changes true
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
+\author 1129461342 "Andrew" ajpars...@gmail.com
 \end_header
 
 \begin_body
@@ -5401,7 +5402,13 @@ Format
 u.).
  Dabei ist jedes (bekannte) Format möglich, sinnvollerweise sollten Sie
  aber das jeweils aktuelle verwenden (das aktuelle Format in \SpecialChar LyX
- 2.3 ist 63).
+ 2.3 ist 
+\change_inserted 1129461342 1537421043
+66
+\change_deleted 1129461342 1537421043
+63
+\change_unchanged
+).
 \end_layout
 
 \begin_layout Standard
@@ -5808,7 +5815,13 @@ DeclareLyXModule{My Class}
 \end_layout
 
 \begin_layout LyX-Code
-Format 63
+Format 
+\change_inserted 1129461342 1537421043
+66
+\change_deleted 1129461342 1537421043
+63
+\change_unchanged
+
 \begin_inset Newline newline
 \end_inset
 
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index 4904591a08..45ad931925 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -123,11 +123,12 @@ logicalmkup
 \papercolumns 1
 \papersides 2
 \paperpagestyle headings
-\tracking_changes false
+\tracking_changes true
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
+\author 1129461342 "Andrew" ajpars...@gmail.com
 \end_header
 
 \begin_body
@@ -6428,7 +6429,13 @@ Format
  Cualquier formato es aceptable, pero debería usarse normalmente el actual
  formato.
  (En \SpecialChar LyX
- 2.2 el formato actual es 60).
+ 2.2 el formato actual es 
+\change_inserted 1129461342 1537421288
+66
+\change_deleted 1129461342 1537421288
+60
+\change_unchanged
+).
 \end_layout
 
 \begin_layout Standard
@@ -6809,7 +6816,13 @@ DeclareLyXModule{My Package}
 \end_layout
 
 \begin_layout LyX-Code
-Format 60
+Format 
+\change_inserted 1129461342 1537421288
+66
+\change_deleted 1129461342 1537421288
+60
+\change_unchanged
+
 \begin_inset Newline newline
 \end_inset
 
@@ -8366,7 +8379,13 @@ Format
 
 .
  El número para la vers

Re: Format 63

[Jürgen Spitzmüller]

Am Freitag, den 14.09.2018, 13:12 +1200 schrieb Andrew Parsloe:
> In two places in the Customization manual, Format 63 is mentioned as
> the 
> current format, rather than 66. (Subsecs 5.2.1.1 and 5.2.2)

Could you submit a patch? The numbers are probably also wrong in the
translated versions.

Jürgen

> 
> Andrew
> 
> 
> ---
> This email has been checked for viruses by Avast antivirus software.
> https://www.avast.com/antivirus
> 


signature.asc
Description: This is a digitally signed message part

Format 63

[Andrew Parsloe]

In two places in the Customization manual, Format 63 is mentioned as the 
current format, rather than 66. (Subsecs 5.2.1.1 and 5.2.2)


Andrew


---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus