[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: LaTeX.pm: set code in preformatted code commands.
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: LaTeX.pm: set code in preformatted code commands. |
|
Date: |
Sun, 22 Aug 2021 06:31:59 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 9251c78 LaTeX.pm: set code in preformatted code commands.
9251c78 is described below
commit 9251c7811f9ca25dcd3e652f46842244eea0425b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 22 12:31:14 2021 +0200
LaTeX.pm: set code in preformatted code commands.
---
tp/Texinfo/Convert/LaTeX.pm | 100 +++---
.../res_latex/quotation_author_in_example.tex | 4 +-
.../res_parser/formatting_latex/formatting.tex | 372 ++++++++++-----------
3 files changed, 248 insertions(+), 228 deletions(-)
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index cd2c0f4..4cd5293 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -476,14 +476,14 @@ my $small_font_size = 'footnotesize';
# LaTeX, as, in addition to come from a possibly different margin,
# the test is not filled at all, each line is left as is. LaTeX
# flushleft and flushright are filled but not aligned.
-my %LaTeX_block_commands = (
+my %LaTeX_environment_commands = (
'raggedright' => ['flushleft'],
'quotation' => ['quote'],
'smallquotation' => ['quote', $small_font_size],
);
foreach my $environment_command (@LaTeX_same_block_commands) {
- $LaTeX_block_commands{$environment_command} = [$environment_command];
+ $LaTeX_environment_commands{$environment_command} = [$environment_command];
}
my %ignorable_space_types;
@@ -1083,6 +1083,7 @@ sub _push_new_context($$)
push @{$self->{'style_context'}},
{
'context' => ['text'],
+ 'preformatted_context' => [],
'math_style' => [],
'code' => 0,
'dot_not_end_sentence' => 0,
@@ -1134,6 +1135,16 @@ sub _protect_text($$)
return $text;
}
+sub _start_mainmatter_after_titlepage($)
+{
+ my $self = shift;
+
+ my $result = _set_headings($self, 'on');
+ $result .= "\\GNUTexinfomainmatter\n";
+ $self->{'titlepage_done'} = 1;
+ return $result;
+}
+
# TODO translation
my $default_odd_heading = 'No Title';
sub _set_headings($$)
@@ -1239,9 +1250,11 @@ foreach my $small_font_preformatted_command (
$small_font_preformatted_commands{$small_font_preformatted_command} = 1;
}
-sub _open_preformatted($)
+sub _open_preformatted($$)
{
+ my $self = shift;
my $command = shift;
+
my $result = '';
$result .= '\\par\\begingroup\\obeylines\\obeyspaces\\frenchspacing';
# TODO indent block correct amount
@@ -1249,40 +1262,48 @@ sub _open_preformatted($)
if ($preformatted_code_commands{$command}) {
$result .= '\\ttfamily';
+ $self->{'style_context'}->[-1]->{'code'} += 1;
}
if ($small_font_preformatted_commands{$command}) {
$result .= "\\$small_font_size";
}
$result .= '{}'."%\n";
+ push @{$self->{'style_context'}->[-1]->{'preformatted_context'}}, $command;
return $result;
}
-sub _close_preformatted()
+sub _close_preformatted($$)
{
+ my $self = shift;
+ my $command = shift;
+ if ($preformatted_code_commands{$command}) {
+ $self->{'style_context'}->[-1]->{'code'} -= 1;
+ }
+ my $old_context = pop
@{$self->{'style_context'}->[-1]->{'preformatted_context'}};
+ die if ($old_context ne $command);
return "\\endgroup{}%\n"; # \obeylines
}
-sub _open_preformatted_stack($)
+sub _open_preformatted_stack($$)
{
+ my $self = shift;
my $stack = shift;
+
my $result = '';
- foreach my $stack_comand (@$stack) {
- if ($preformatted_commands{$stack_comand}) {
- $result .= _open_preformatted($stack_comand);
- }
+ foreach my $preformatted_command (@$stack) {
+ $result .= _open_preformatted($self, $preformatted_command);
}
return $result;
}
-sub _close_preformatted_stack($)
+sub _close_preformatted_stack($$)
{
- # should close in reverse, but it doesn't depend on the command
+ my $self = shift;
my $stack = shift;
+
my $result = '';
- foreach my $stack_comand (@$stack) {
- if ($preformatted_commands{$stack_comand}) {
- $result .= _close_preformatted();
- }
+ foreach my $preformatted_command (reverse @$stack) {
+ $result .= _close_preformatted($self, $preformatted_command);
}
return $result;
}
@@ -1402,6 +1423,8 @@ sub _convert($$)
}
}
+ # for displaymath that closes the preformatted
+ my $preformatted_to_reopen;
if ($command) {
my $unknown_command;
my $command_context = 'text';
@@ -1541,7 +1564,8 @@ sub _convert($$)
if (defined($self->{'conf'}->{'kbdinputstyle'})
and ($self->{'conf'}->{'kbdinputstyle'} eq 'code'
or ($self->{'conf'}->{'kbdinputstyle'} eq 'example'
- and
$preformatted_commands{$self->{'style_context'}->[-1]->{'context'}->[-1]}))) {
+ and
(scalar(@{$self->{'style_context'}->[-1]->{'preformatted_context'}})
+ and
$preformatted_code_commands{$self->{'style_context'}->[-1]->{'preformatted_context'}->[-1]}))))
{
$code_font = 1;
}
if ($code_font) {
@@ -2002,7 +2026,8 @@ sub _convert($$)
if ($command eq 'displaymath') {
push @{$self->{'style_context'}->[-1]->{'math_style'}}, 'one-line';
# close all preformatted formats
- $result .=
_close_preformatted_stack($self->{'style_context'}->[-1]->{'context'});
+ $preformatted_to_reopen =
[@{$self->{'style_context'}->[-1]->{'preformatted_context'}}];
+ $result .= _close_preformatted_stack($self, $preformatted_to_reopen);
$result .= "\$\$\n";
}
}
@@ -2015,7 +2040,7 @@ sub _convert($$)
my $shortcaption;
if ($command eq 'shortcaption') {
if ($float->{'extra'}->{'caption'}) {
- # nothing to do, will do @caption
+ # nothing to do, will use @shortcaption when converting @caption
return $result;
} else {
# shortcaption used as caption;
@@ -2084,17 +2109,15 @@ sub _convert($$)
return $result;
# block commands
} elsif (exists($block_commands{$command})) {
- if ($LaTeX_block_commands{$command}) {
- foreach my $environment (@{$LaTeX_block_commands{$command}}) {
+ if ($LaTeX_environment_commands{$command}) {
+ foreach my $environment (@{$LaTeX_environment_commands{$command}}) {
$result .= "\\begin{".$environment."}\n";
}
- } elsif ($preformatted_commands{$command}) {
- $result .= _open_preformatted($command);
}
- if ($block_raw_commands{$command}) {
+ if ($preformatted_commands{$command}) {
+ $result .= _open_preformatted($self, $command);
+ } elsif ($block_raw_commands{$command}) {
push @{$self->{'style_context'}->[-1]->{'context'}}, 'raw';
- } elsif ($preformatted_commands{$command}) {
- push @{$self->{'style_context'}->[-1]->{'context'}}, $command;
}
if ($command eq 'titlepage') {
# start a group such that the changes are forgotten when closed
@@ -2310,6 +2333,7 @@ sub _convert($$)
}
return $result;
} elsif ($command eq 'shorttitlepage') {
+ # FIXME ignore if there is alreadu a @titlepage?
my $title_text = _title_font($self, $root);
$result .= "\\begin{titlepage}\n";
$result .= "{\\raggedright $title_text}\n";
@@ -2317,6 +2341,8 @@ sub _convert($$)
# adds a blank page
$result .= "\\newpage{}\n\\phantom{blabla}\\newpage{}\n";
$result .= "\\end{titlepage}\n";
+ $result .= _start_mainmatter_after_titlepage($self);
+ return $result;
} elsif ($command eq 'title') {
my $title_text = _title_font($self, $root);
#$result .= "\\begin{flushleft}\n";
@@ -2669,12 +2695,13 @@ sub _convert($$)
$result .= "\\endgroup\n";
$self->{'titlepage_formatting'}->{'in_titlepage'} = 0;
}
- if ($LaTeX_block_commands{$command}) {
- foreach my $environment (reverse @{$LaTeX_block_commands{$command}}) {
+ if ($LaTeX_environment_commands{$command}) {
+ foreach my $environment (reverse
@{$LaTeX_environment_commands{$command}}) {
$result .= "\\end{".$environment."}\n";
}
- } elsif ($preformatted_commands{$command}) {
- $result .= _close_preformatted();
+ }
+ if ($preformatted_commands{$command}) {
+ $result .= _close_preformatted($self, $command);
}
if ($command eq 'float') {
my $normalized_float_type = '';
@@ -2706,20 +2733,13 @@ sub _convert($$)
}
}
$self->{'style_context'}->[-1]->{'in_quotation'} -= 1;
- }
+ } elsif ($command eq 'titlepage') {
# as explained in the Texinfo manual start headers after titlepage
- if ($command eq 'titlepage' or $command eq 'shorttitlepage') {
- $result .= _set_headings($self, 'on');
- $self->{'titlepage_done'} = 1;
- $result .= "\\GNUTexinfomainmatter\n";
+ $result .= _start_mainmatter_after_titlepage($self);
}
# close the contexts and register the cells
- if ($preformatted_commands{$command}) {
- my $old_context = pop @{$self->{'style_context'}->[-1]->{'context'}};
- die "Not a preformatted context: $old_context"
- if (!$preformatted_commands{$old_context});
- } elsif ($block_raw_commands{$command}) {
+ if ($block_raw_commands{$command}) {
my $old_context = pop @{$self->{'style_context'}->[-1]->{'context'}};
die if ($old_context ne 'raw');
} elsif ($block_math_commands{$command}) {
@@ -2728,7 +2748,7 @@ sub _convert($$)
if ($command eq 'displaymath') {
$result .= "\$\$\n";
# reopen all preformatted commands
- $result .=
_open_preformatted_stack($self->{'style_context'}->[-1]->{'context'});
+ $result .= _open_preformatted_stack($self, $preformatted_to_reopen);
}
my $old_math_style = pop
@{$self->{'style_context'}->[-1]->{'math_style'}};
die if ($old_math_style ne 'one-line');
diff --git
a/tp/t/results/quotation/quotation_author_in_example/res_latex/quotation_author_in_example.tex
b/tp/t/results/quotation/quotation_author_in_example/res_latex/quotation_author_in_example.tex
index 4b0ef2a..3eee344 100644
---
a/tp/t/results/quotation/quotation_author_in_example/res_latex/quotation_author_in_example.tex
+++
b/tp/t/results/quotation/quotation_author_in_example/res_latex/quotation_author_in_example.tex
@@ -69,10 +69,10 @@
\begin{document}
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
\begin{quote}
-A quot---ation
+A quot{-}{-}{-}ation
\end{quote}
\begin{center}
---- \emph{Some One}
+{-}{-}{-} \emph{Some One}
\end{center}
\endgroup{}%
\end{document}
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 28a2515..5ba36cd 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -481,7 +481,7 @@ lone mu--ltitable item
truc bidule
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-e--xample some
+e{-}{-}xample some
text
\endgroup{}%
@@ -522,7 +522,7 @@ example with empty and non empty args mix
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--mallexample
+s{-}{-}mallexample
\endgroup{}%
\texttt{@noindent} after smallexample.
@@ -541,11 +541,11 @@ s--malldisplay
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-l--isp
+l{-}{-}isp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--malllisp
+s{-}{-}malllisp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax{}%
@@ -1379,7 +1379,7 @@ lone mu--ltitable item
truc bidule
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-e--xample some
+e{-}{-}xample some
text
\endgroup{}%
@@ -1420,7 +1420,7 @@ example with empty and non empty args mix
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--mallexample
+s{-}{-}mallexample
\endgroup{}%
\texttt{@noindent} after smallexample.
@@ -1439,11 +1439,11 @@ s--malldisplay
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-l--isp
+l{-}{-}isp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--malllisp
+s{-}{-}malllisp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax{}%
@@ -2292,7 +2292,7 @@ lone mu--ltitable item
truc bidule
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-e--xample some
+e{-}{-}xample some
text
\endgroup{}%
@@ -2333,7 +2333,7 @@ example with empty and non empty args mix
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--mallexample
+s{-}{-}mallexample
\endgroup{}%
\texttt{@noindent} after smallexample.
@@ -2352,11 +2352,11 @@ s--malldisplay
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-l--isp
+l{-}{-}isp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--malllisp
+s{-}{-}malllisp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax{}%
@@ -3188,7 +3188,7 @@ lone mu--ltitable item
truc bidule
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-e--xample some
+e{-}{-}xample some
text
\endgroup{}%
@@ -3229,7 +3229,7 @@ example with empty and non empty args mix
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--mallexample
+s{-}{-}mallexample
\endgroup{}%
\texttt{@noindent} after smallexample.
@@ -3248,11 +3248,11 @@ s--malldisplay
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-l--isp
+l{-}{-}isp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--malllisp
+s{-}{-}malllisp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax{}%
@@ -3704,13 +3704,13 @@ In example.
'
`
-``simple-double--three---four----''\leavevmode{}\\
+``simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-''\leavevmode{}\\
code: \texttt{``simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-''}
\leavevmode{}\\
-asis: ``simple-double--three---four----'' \leavevmode{}\\
-strong: \textbf{``simple-double--three---four----''} \leavevmode{}\\
+asis: ``simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-'' \leavevmode{}\\
+strong: \textbf{``simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-''}
\leavevmode{}\\
kbd: {\ttfamily\textsl{``simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-''}}
\leavevmode{}\\
-`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
+`\hbox{}`simple-double-\hbox{}-three{-}{-}{-}four{-}{-}{-}-'\hbox{}'\leavevmode{}\\
@"u \"{u}
@@ -3812,83 +3812,83 @@ but , ,\@
@leq $\leq{}$
@geq $\geq{}$
-\texttt{@acronym\{{-}{-}a,an accronym\}} --a (an accronym)
-\texttt{@acronym\{{-}{-}a\}} --a
-\texttt{@abbr\{@'E{-}{-}. @comma\{\}A., @'Etude Autonome \}} \'{E}--.\@ ,A.\@
(\'{E}tude Autonome)
-\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}--.\@ ,A.\@
-\texttt{@asis\{{-}{-}a\}} --a
-\texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \textit{--a}
+\texttt{@acronym\{{-}{-}a,an accronym\}} {-}{-}a (an accronym)
+\texttt{@acronym\{{-}{-}a\}} {-}{-}a
+\texttt{@abbr\{@'E{-}{-}. @comma\{\}A., @'Etude Autonome \}} \'{E}{-}{-}.\@
,A.\@ (\'{E}tude Autonome)
+\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}{-}{-}.\@ ,A.\@
+\texttt{@asis\{{-}{-}a\}} {-}{-}a
+\texttt{@b\{{-}{-}a\}} \textbf{{-}{-}a}
+\texttt{@cite\{{-}{-}a\}} \textit{{-}{-}a}
\texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@dfn\{{-}{-}a\}} \emph{--a}
-\texttt{@dmn\{{-}{-}a\}} --a
-\texttt{@email\{{-}{-}a,{-}{-}b\}} \href{mailto:--a}{--b}
-\texttt{@email\{,{-}{-}b\}} --b
+\texttt{@dfn\{{-}{-}a\}} \emph{{-}{-}a}
+\texttt{@dmn\{{-}{-}a\}} {-}{-}a
+\texttt{@email\{{-}{-}a,{-}{-}b\}} \href{mailto:--a}{{-}{-}b}
+\texttt{@email\{,{-}{-}b\}} {-}{-}b
\texttt{@email\{{-}{-}a\}} \href{mailto:--a}{\nolinkurl{--a}}
-\texttt{@emph\{{-}{-}a\}} \emph{--a}
+\texttt{@emph\{{-}{-}a\}} \emph{{-}{-}a}
\texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@i\{{-}{-}a\}} \textit{--a}
+\texttt{@i\{{-}{-}a\}} \textit{{-}{-}a}
\texttt{@kbd\{{-}{-}a\}} {\ttfamily\textsl{{-}{-}a}}
\texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\} @minus\{\}\}} $--a
{\frac{1}{2}} -$
\texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@r\{{-}{-}a\}} \textrm{--a}
+\texttt{@r\{{-}{-}a\}} \textrm{{-}{-}a}
\texttt{@samp\{{-}{-}a\}} `\texttt{{-}{-}a}'
-\texttt{@sc\{{-}{-}a\}} \textsc{--a}
-\texttt{@strong\{{-}{-}a\}} \textbf{--a}
+\texttt{@sc\{{-}{-}a\}} \textsc{{-}{-}a}
+\texttt{@strong\{{-}{-}a\}} \textbf{{-}{-}a}
\texttt{@t\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@sansserif\{{-}{-}a\}} \textsf{--a}
-\texttt{@slanted\{{-}{-}a\}} \textsl{--a}
-\texttt{@titlefont\{{-}{-}a\}} {\huge \bfseries --a}
+\texttt{@sansserif\{{-}{-}a\}} \textsf{{-}{-}a}
+\texttt{@slanted\{{-}{-}a\}} \textsl{{-}{-}a}
+\texttt{@titlefont\{{-}{-}a\}} {\huge \bfseries {-}{-}a}
\texttt{@indicateurl\{{-}{-}a\}} `\texttt{{-}{-}a}'
-\texttt{@uref\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@uref\{{-}{-}a,{-}{-}b\}} \href{--a}{{-}{-}b (\nolinkurl{--a})}
\texttt{@uref\{{-}{-}a\}} \url{--a}
-\texttt{@uref\{,{-}{-}b\}} --b
-\texttt{@uref\{{-}{-}a,{-}{-}b,{-}{-}c\}} --c
-\texttt{@uref\{,{-}{-}b,{-}{-}c\}} --c
-\texttt{@uref\{{-}{-}a,,{-}{-}c\}} --c
-\texttt{@uref\{,,{-}{-}c\}} --c
-\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@uref\{,{-}{-}b\}} {-}{-}b
+\texttt{@uref\{{-}{-}a,{-}{-}b,{-}{-}c\}} {-}{-}c
+\texttt{@uref\{,{-}{-}b,{-}{-}c\}} {-}{-}c
+\texttt{@uref\{{-}{-}a,,{-}{-}c\}} {-}{-}c
+\texttt{@uref\{,,{-}{-}c\}} {-}{-}c
+\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{{-}{-}b (\nolinkurl{--a})}
\texttt{@url\{{-}{-}a,\}} \url{--a}
-\texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \emph{--a}
+\texttt{@url\{,{-}{-}b\}} {-}{-}b
+\texttt{@var\{{-}{-}a\}} \emph{{-}{-}a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
\texttt{@verb\{:a < \& @ \% " {-}{-} b:\}} \verb:a < & @ % " -- b:
\texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}
\texttt{@H\{a\}} \H{a}
-\texttt{@H\{{-}{-}a\}} \H{--a}
+\texttt{@H\{{-}{-}a\}} \H{{-}{-}a}
\texttt{@dotaccent\{a\}} \.{a}
-\texttt{@dotaccent\{{-}{-}a\}} \.{--a}
+\texttt{@dotaccent\{{-}{-}a\}} \.{{-}{-}a}
\texttt{@ringaccent\{a\}} \r{a}
-\texttt{@ringaccent\{{-}{-}a\}} \r{--a}
+\texttt{@ringaccent\{{-}{-}a\}} \r{{-}{-}a}
\texttt{@tieaccent\{a\}} \t{a}
-\texttt{@tieaccent\{{-}{-}a\}} \t{--a}
+\texttt{@tieaccent\{{-}{-}a\}} \t{{-}{-}a}
\texttt{@u\{a\}} \u{a}
-\texttt{@u\{{-}{-}a\}} \u{--a}
+\texttt{@u\{{-}{-}a\}} \u{{-}{-}a}
\texttt{@ubaraccent\{a\}} \b{a}
-\texttt{@ubaraccent\{{-}{-}a\}} \b{--a}
+\texttt{@ubaraccent\{{-}{-}a\}} \b{{-}{-}a}
\texttt{@udotaccent\{a\}} \d{a}
-\texttt{@udotaccent\{{-}{-}a\}} \d{--a}
+\texttt{@udotaccent\{{-}{-}a\}} \d{{-}{-}a}
\texttt{@v\{a\}} \v{a}
-\texttt{@v\{{-}{-}a\}} \v{--a}
+\texttt{@v\{{-}{-}a\}} \v{{-}{-}a}
\texttt{@,\{c\}} \c{c}
-\texttt{@,\{{-}{-}c\}} \c{--c}
+\texttt{@,\{{-}{-}c\}} \c{{-}{-}c}
\texttt{@ogonek\{a\}} \k{a}
-\texttt{@ogonek\{{-}{-}a\}} \k{--a}
+\texttt{@ogonek\{{-}{-}a\}} \k{{-}{-}a}
\texttt{a@sup\{h\}@sub\{l\}} a\textsuperscript{h}\textsubscript{l}
\texttt{@footnote\{in footnote\}} \footnote{in footnote}
\texttt{@footnote\{in footnote2\}} \footnote{in footnote2}
-\texttt{@image\{f{-}{-}ile\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,l{-}{-}i\}}
\includegraphics[width=l--i]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}}
\includegraphics[height=l--e]{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{layout/f--ile}
-\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}}
\includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile\}} \includegraphics{layout/f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,l{-}{-}i\}}
\includegraphics[width=l--i]{layout/f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,,l{-}{-}e\}}
\includegraphics[height=l--e]{layout/f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,,,alt\}} \includegraphics{layout/f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,,,,.e-d-xt\}} \includegraphics{layout/f{-}{-}ile}
+\texttt{@image\{f{-}{-}ile,aze,az,alt,.e{-}{-}xt\}}
\includegraphics[width=aze,height=az]{layout/f{-}{-}ile}
\texttt{@image\{f-ile,aze,,a{-}{-}lt\}} \includegraphics[width=aze]{f-ile}
-\texttt{@image\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\}
e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f--ile@.}
+\texttt{@image\{@file\{f{-}{-}ile\}@@@.,aze,az,alt,@file\{.file ext\}
e{-}{-}xt@\}} \includegraphics[width=aze,height=az]{f{-}{-}ile@.}
\texttt{@sp 2}\leavevmode{}\\
\vskip 2\baselineskip %
@@ -3968,7 +3968,7 @@ $$
\endgroup{}%
\begin{quote}
-A quot---ation
+A quot{-}{-}{-}ation
\end{quote}
\begin{quote}
@@ -4027,7 +4027,7 @@ A quot---ation
aaa quotation
\end{quote}
\begin{center}
---- \emph{quotation author}
+{-}{-}{-} \emph{quotation author}
\end{center}
\begin{quote}
@@ -4036,7 +4036,7 @@ indent in quotation
\begin{quote}
\begin{footnotesize}
-A small quot---ation
+A small quot{-}{-}{-}ation
\end{footnotesize}
\end{quote}
@@ -4054,48 +4054,48 @@ A small quot---ation
\textbullet{}
-i--temize
+i{-}{-}temize
+
-i--tem +
+i{-}{-}tem +
\textbullet{}
-b--ullet
+b{-}{-}ullet
-
-minu--s
+minu{-}{-}s
\emph{}
-e--mph item
+e{-}{-}mph item
\emph{after emph}
-e--mph item
+e{-}{-}mph item
-\textbullet{} a--n itemize line
+\textbullet{} a{-}{-}n itemize line
-i--tem 1
-\textbullet{} a--n itemize line
+i{-}{-}tem 1
+\textbullet{} a{-}{-}n itemize line
-i--tem 2
+i{-}{-}tem 2
1.
-e--numerate
+e{-}{-}numerate
-mu--ltitable headitem another tab
-mu--ltitable item multitable tab
-mu--ltitable item 2 multitable tab 2
-lone mu--ltitable item
+mu{-}{-}ltitable headitem another tab
+mu{-}{-}ltitable item multitable tab
+mu{-}{-}ltitable item 2 multitable tab 2
+lone mu{-}{-}ltitable item
truc bidule
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-e--xample some
+e{-}{-}xample some
text
\endgroup{}%
@@ -4136,7 +4136,7 @@ example with empty and non empty args mix
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--mallexample
+s{-}{-}mallexample
\endgroup{}%
\texttt{@noindent} after smallexample.
@@ -4147,27 +4147,27 @@ s--mallexample
\noindent{}Less recent versions are also present.
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax{}%
-d--isplay
+d{-}{-}isplay
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\footnotesize{}%
-s--malldisplay
+s{-}{-}malldisplay
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-l--isp
+l{-}{-}isp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily\footnotesize{}%
-s--malllisp
+s{-}{-}malllisp
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax{}%
-f--ormat
+f{-}{-}ormat
\endgroup{}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\footnotesize{}%
-s--mallformat
+s{-}{-}mallformat
\endgroup{}%
\endgroup{}%
@@ -4177,188 +4177,188 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over
2}\left({x-\mu \over \sigma}\rig
$$
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-\hbox{}-- c--ategory: d--effn\_name a--rguments...
+\hbox{}{-}{-} c{-}{-}ategory: d{-}{-}effn\_name a{-}{-}rguments...
-d--effn
+d{-}{-}effn
-\hbox{}-- cate--gory: de--ffn\_name ar--guments more args \leavevmode{}\\
even more so
+\hbox{}{-}{-} cate{-}{-}gory: de{-}{-}ffn\_name ar{-}{-}guments more args
\leavevmode{}\\ even more so
-def--fn
+def{-}{-}fn
-\hbox{}-- fset: \emph{i} a g
+\hbox{}{-}{-} fset: \emph{i} a g
-\hbox{}-- cmde: truc
+\hbox{}{-}{-} cmde: truc
-\hbox{}-- Command: log trap
+\hbox{}{-}{-} Command: log trap
-\hbox{}-- Command: log trap1
+\hbox{}{-}{-} Command: log trap1
-\hbox{}-- Command: log trap2
+\hbox{}{-}{-} Command: log trap2
-\hbox{}-- cmde: \textbf{id ule} truc
+\hbox{}{-}{-} cmde: \textbf{id ule} truc
-\hbox{}-- cmde2: \textbf{id `\texttt{i}' ule} truc
+\hbox{}{-}{-} cmde2: \textbf{id `\texttt{i}' ule} truc
-\hbox{}-- \textbf{id `\texttt{i}' ule}:
+\hbox{}{-}{-} \textbf{id `\texttt{i}' ule}:
-\hbox{}-- aaa:
+\hbox{}{-}{-} aaa:
-\hbox{}-- :
+\hbox{}{-}{-} :
-\hbox{}-- :
+\hbox{}{-}{-} :
-\hbox{}-- : machin
+\hbox{}{-}{-} : machin
-\hbox{}-- : bidule machin
+\hbox{}{-}{-} : bidule machin
-\hbox{}-- truc: machin
+\hbox{}{-}{-} truc: machin
-\hbox{}-- truc:
+\hbox{}{-}{-} truc:
-\hbox{}-- truc: followed by a comment
+\hbox{}{-}{-} truc: followed by a comment
-\hbox{}-- truc:
+\hbox{}{-}{-} truc:
-\hbox{}-- :
+\hbox{}{-}{-} :
-\hbox{}-- truc: a b c d e \textbf{f g} h i
+\hbox{}{-}{-} truc: a b c d e \textbf{f g} h i
-\hbox{}-- truc: deffnx before end deffn
+\hbox{}{-}{-} truc: deffnx before end deffn
-\hbox{}-- empty: deffn
+\hbox{}{-}{-} empty: deffn
-\hbox{}-- empty: deffn with deffnx
+\hbox{}{-}{-} empty: deffn with deffnx
-\hbox{}-- empty: deffnx
+\hbox{}{-}{-} empty: deffnx
-\hbox{}-- fset: \emph{i} a g
+\hbox{}{-}{-} fset: \emph{i} a g
-\hbox{}-- cmde: truc
+\hbox{}{-}{-} cmde: truc
text in def item for second def item
-\hbox{}-- c--ategory: d--efvr\_name
+\hbox{}{-}{-} c{-}{-}ategory: d{-}{-}efvr\_name
-d--efvr
+d{-}{-}efvr
-\hbox{}-- c--ategory: t--ype d--eftypefn\_name a--rguments...
+\hbox{}{-}{-} c{-}{-}ategory: t{-}{-}ype d{-}{-}eftypefn\_name
a{-}{-}rguments...
-d--eftypefn
+d{-}{-}eftypefn
-\hbox{}-- c--ategory on c--lass: t--ype d--eftypeop\_name a--rguments...
+\hbox{}{-}{-} c{-}{-}ategory on c{-}{-}lass: t{-}{-}ype d{-}{-}eftypeop\_name
a{-}{-}rguments...
-d--eftypeop
+d{-}{-}eftypeop
-\hbox{}-- c--ategory: t--ype d--eftypevr\_name
+\hbox{}{-}{-} c{-}{-}ategory: t{-}{-}ype d{-}{-}eftypevr\_name
-d--eftypevr
+d{-}{-}eftypevr
-\hbox{}-- c--ategory of c--lass: d--efcv\_name
+\hbox{}{-}{-} c{-}{-}ategory of c{-}{-}lass: d{-}{-}efcv\_name
-d--efcv
+d{-}{-}efcv
-\hbox{}-- c--ategory on c--lass: d--efop\_name a--rguments...
+\hbox{}{-}{-} c{-}{-}ategory on c{-}{-}lass: d{-}{-}efop\_name
a{-}{-}rguments...
-d--efop
+d{-}{-}efop
-\hbox{}-- c--ategory: d--eftp\_name a--ttributes...
+\hbox{}{-}{-} c{-}{-}ategory: d{-}{-}eftp\_name a{-}{-}ttributes...
-d--eftp
+d{-}{-}eftp
-\hbox{}-- Function: d--efun\_name a--rguments...
+\hbox{}{-}{-} Function: d{-}{-}efun\_name a{-}{-}rguments...
-d--efun
+d{-}{-}efun
-\hbox{}-- Macro: d--efmac\_name a--rguments...
+\hbox{}{-}{-} Macro: d{-}{-}efmac\_name a{-}{-}rguments...
-d--efmac
+d{-}{-}efmac
-\hbox{}-- Special Form: d--efspec\_name a--rguments...
+\hbox{}{-}{-} Special Form: d{-}{-}efspec\_name a{-}{-}rguments...
-d--efspec
+d{-}{-}efspec
-\hbox{}-- Variable: d--efvar\_name argvar argvar1
+\hbox{}{-}{-} Variable: d{-}{-}efvar\_name argvar argvar1
-d--efvar
+d{-}{-}efvar
-\hbox{}-- User Option: d--efopt\_name
+\hbox{}{-}{-} User Option: d{-}{-}efopt\_name
-d--efopt
+d{-}{-}efopt
-\hbox{}-- Function: t--ype d--eftypefun\_name a--rguments...
+\hbox{}{-}{-} Function: t{-}{-}ype d{-}{-}eftypefun\_name a{-}{-}rguments...
-d--eftypefun
+d{-}{-}eftypefun
-\hbox{}-- Variable: t--ype d--eftypevar\_name
+\hbox{}{-}{-} Variable: t{-}{-}ype d{-}{-}eftypevar\_name
-d--eftypevar
+d{-}{-}eftypevar
-\hbox{}-- Instance Variable of c--lass: d--efivar\_name
+\hbox{}{-}{-} Instance Variable of c{-}{-}lass: d{-}{-}efivar\_name
-d--efivar
+d{-}{-}efivar
-\hbox{}-- Instance Variable of c--lass: t--ype d--eftypeivar\_name
+\hbox{}{-}{-} Instance Variable of c{-}{-}lass: t{-}{-}ype
d{-}{-}eftypeivar\_name
-d--eftypeivar
+d{-}{-}eftypeivar
-\hbox{}-- Method on c--lass: d--efmethod\_name a--rguments...
+\hbox{}{-}{-} Method on c{-}{-}lass: d{-}{-}efmethod\_name a{-}{-}rguments...
-d--efmethod
+d{-}{-}efmethod
-\hbox{}-- Method on c--lass: t--ype d--eftypemethod\_name a--rguments...
+\hbox{}{-}{-} Method on c{-}{-}lass: t{-}{-}ype d{-}{-}eftypemethod\_name
a{-}{-}rguments...
-d--eftypemethod
+d{-}{-}eftypemethod
-\texttt{@xref\{c{-}{-}{-}hapter@@, cross r{-}{-}{-}ef name@@,
t{-}{-}{-}itle@@, file n{-}{-}{-}ame@@, ma{-}{-}{-}nual@@\}} See Section
``t---itle@'' in \textit{ma---nual@}.
+\texttt{@xref\{c{-}{-}{-}hapter@@, cross r{-}{-}{-}ef name@@,
t{-}{-}{-}itle@@, file n{-}{-}{-}ame@@, ma{-}{-}{-}nual@@\}} See Section
``t{-}{-}{-}itle@'' in \textit{ma{-}{-}{-}nual@}.
\texttt{@ref\{chapter, cross ref name, title, file name, manual\}} Section
``title'' in \textit{manual}
\texttt{@pxref\{chapter, cross ref name, title, file name, manual\}} see
Section ``title'' in \textit{manual}
\texttt{@inforef\{chapter, cross ref name, file name\}} Section ``chapter'' in
\texttt{file name}
@@ -4366,7 +4366,7 @@ d--eftypemethod
\texttt{@ref\{chapter\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
\texttt{@xref\{chapter\}} See
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}.
\texttt{@pxref\{chapter\}} see
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
-\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
\hyperref[anchor:s_002d_002dect_002cion]{Section~\ref*{anchor:s_002d_002dect_002cion}
[s--ect,ion], page~\pageref*{anchor:s_002d_002dect_002cion}}
+\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
\hyperref[anchor:s_002d_002dect_002cion]{Section~\ref*{anchor:s_002d_002dect_002cion}
[s{-}{-}ect,ion], page~\pageref*{anchor:s_002d_002dect_002cion}}
\texttt{@ref\{s{-}{-}ect@comma\{\}ion, a @comma\{\} in cross
ref, a comma@comma\{\} in title, a comma@comma\{\} in file, a @comma\{\} in
manual name \}}
@@ -4416,7 +4416,7 @@ Section ``a comma, in title'' in \textit{a , in manual
name}
\texttt{@inforef\{s{-}{-}ect@comma\{\}ion, a @comma\{\} in cross
ref, a comma@comma\{\} in file\}}
-Section ``s--ect,ion'' in \texttt{a comma, in file}
+Section ``s{-}{-}ect,ion'' in \texttt{a comma, in file}
`\texttt{\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}}'.
@@ -4424,32 +4424,32 @@ Section ``title with uref2
\href{href://http/myhost.com/index2.html}{uref2 (\nol
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title with uref2
\href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}],
page~\pageref*{anchor:chapter}}
a
-l--ine
+l{-}{-}ine
a
b
-l--ine
+l{-}{-}ine
a
b
-l--ine
+l{-}{-}ine
-c--artouche
+c{-}{-}artouche
-g--roupe
+g{-}{-}roupe
-f--lushleft
+f{-}{-}lushleft
more text
-f--lushright
+f{-}{-}lushright
more text
\begin{center}
-ce--ntered line
+ce{-}{-}ntered line
\end{center}
\begin{flushleft}
-r--raggedright
+r{-}{-}raggedright
more text
\end{flushleft}
@@ -4488,14 +4488,14 @@ $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
\GNUTexinfonopagebreakheading{\subsubsection*}{subsubheading}
-\texttt{@acronym\{{-}{-}a,an accronym @comma\{\} @enddots\{\}\}} --a (an
accronym , \dots{})
-\texttt{@abbr\{@'E{-}{-}. @comma\{\}A., @'Etude{-}{-}@comma\{\} @b\{Autonome\}
\}} \'{E}--.\@ ,A.\@ (\'{E}tude--, \textbf{Autonome})
-\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}--.\@ ,A.\@
+\texttt{@acronym\{{-}{-}a,an accronym @comma\{\} @enddots\{\}\}} {-}{-}a (an
accronym , \dots{})
+\texttt{@abbr\{@'E{-}{-}. @comma\{\}A., @'Etude{-}{-}@comma\{\} @b\{Autonome\}
\}} \'{E}{-}{-}.\@ ,A.\@ (\'{E}tude{-}{-}, \textbf{Autonome})
+\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}{-}{-}.\@ ,A.\@
\texttt{@math\{{-}{-}a@minus\{\} \{\textbackslash{}frac\{1\}\{2\}\}\}} $--a-
{\frac{1}{2}}$
\texttt{@image\{f-ile,,,alt@verb\{:jk \_" \%\@\}\}} \includegraphics{f-ile}
-\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{layout/f--ile}
+\texttt{@image\{f{-}{-}ile,aze,az,@verb\{:jk \_" \%@:\} @b\{in b
"\},e{-}{-}xt\}} \includegraphics[width=aze,height=az]{layout/f{-}{-}ile}
\texttt{@image\{file@verb\{:jk \_" \%@:\},,,alt@verb\{:jk \_" \%@:\}\}}
\includegraphics{filejk \_" \%@}
@@ -4513,7 +4513,7 @@ Invalid use of @':\leavevmode{}\\
@dotless\{truc\} truc
@dotless\{ij\} ij
-\texttt{@dotless\{{-}{-}a\}} --a
+\texttt{@dotless\{{-}{-}a\}} \{-\}\{-\}a
\texttt{@dotless\{a\}} a
@U, without braces @U\{\}, with empty arg
@@ -4523,7 +4523,7 @@ Invalid use of @':\leavevmode{}\\
@TeX, but without brace \TeX{}\texttt{@\#} \#
-\texttt{@w\{{-}{-}a\}} \hbox{--a}
+\texttt{@w\{{-}{-}a\}} \hbox{{-}{-}a}
\texttt{@image\{,1{-}{-}xt\}}
\texttt{@image\{,,2{-}{-}xt\}}
@@ -4532,35 +4532,35 @@ Invalid use of @':\leavevmode{}\\
\emph{} after emph
-e--mph item
+e{-}{-}mph item
-\textbullet{} a--n itemize line
+\textbullet{} a{-}{-}n itemize line
-i--tem 1
-\textbullet{} a--n itemize line
+i{-}{-}tem 1
+\textbullet{} a{-}{-}n itemize line
-i--tem 2
+i{-}{-}tem 2
-\hbox{}-- fun:
+\hbox{}{-}{-} fun:
-\hbox{}-- truc: machin bidule chose and
+\hbox{}{-}{-} truc: machin bidule chose and
-\hbox{}-- truc: machin bidule chose and after
+\hbox{}{-}{-} truc: machin bidule chose and after
-\hbox{}-- truc: machin bidule chose and
+\hbox{}{-}{-} truc: machin bidule chose and
-\hbox{}-- truc: machin bidule chose and and after
+\hbox{}{-}{-} truc: machin bidule chose and and after
-\hbox{}-- truc: followed by a comment
+\hbox{}{-}{-} truc: followed by a comment
Various deff lines
-\hbox{}-- truc: after a deff item
+\hbox{}{-}{-} truc: after a deff item
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: LaTeX.pm: set code in preformatted code commands.,
Patrice Dumas <=